Skip to content

Commit d74c63b

Browse files
committed
temporal cabal.project.local
1 parent 78ccebd commit d74c63b

File tree

3 files changed

+16
-8
lines changed

3 files changed

+16
-8
lines changed

.github/workflows/build.yml

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,18 @@ jobs:
1414
fail-fast: false
1515
matrix:
1616
include:
17-
- { os: macOS-13, stack: lts-15.3, stack-extra-deps: "bytestring-0.11.3.0, file-io-0.1.4, filepath-1.4.100.0, unix-2.8.0.0" }
18-
- { os: macos-latest, stack: lts-22.7, stack-extra-deps: "bytestring-0.11.5.3, file-io-0.1.4, filepath-1.5.2.0, os-string-2.0.2, unix-2.8.5.1", stack-package-flags: "{directory: {os-string: true}, file-io: {os-string: true}, unix: {os-string: true}}", ghc-flags: -Werror=deprecations }
19-
- { os: ubuntu-latest, ghc: 8.10.7, cabal: 3.8.1.0 }
20-
- { os: ubuntu-latest, ghc: 9.0.2, cabal: 3.8.1.0 }
21-
- { os: ubuntu-latest, ghc: 9.2.4, cabal: 3.8.1.0 }
22-
- { os: ubuntu-latest, ghc: 9.4.3, cabal: 3.8.1.0 }
17+
# - { os: macOS-13, stack: lts-15.3, stack-extra-deps: "bytestring-0.11.3.0, file-io-0.1.4, filepath-1.4.100.0, unix-2.8.0.0" }
18+
# - { os: macos-latest, stack: lts-22.7, stack-extra-deps: "bytestring-0.11.5.3, file-io-0.1.4, filepath-1.5.2.0, os-string-2.0.2, unix-2.8.5.1", stack-package-flags: "{directory: {os-string: true}, file-io: {os-string: true}, unix: {os-string: true}}", ghc-flags: -Werror=deprecations }
19+
# - { os: ubuntu-latest, ghc: 8.10.7, cabal: 3.8.1.0 }
20+
# - { os: ubuntu-latest, ghc: 9.0.2, cabal: 3.8.1.0 }
21+
# - { os: ubuntu-latest, ghc: 9.2.4, cabal: 3.8.1.0 }
22+
# - { os: ubuntu-latest, ghc: 9.4.3, cabal: 3.8.1.0 }
2323
# TODO: Unpin cabal from 3.12.10 after https://github.com/haskell/cabal/issues/10718 is fixed.
24-
- { os: ubuntu-latest, ghc: latest, cabal: 3.12.1.0, cabal-package-flags: +os-string, ghc-flags: -Werror=deprecations }
24+
# - { os: ubuntu-latest, ghc: latest, cabal: 3.12.1.0, cabal-package-flags: +os-string, ghc-flags: -Werror=deprecations }
2525
- { os: windows-latest, stack: lts-15.3, stack-extra-deps: "bytestring-0.11.3.0, file-io-0.1.4, filepath-1.4.100.0, time-1.9.3, Win32-2.14.1.0", overrides: "before_prepare() { sed -i.bak -e /CreateSymbolicLinkW/d -e /GetFinalPathNameByHandleW/d configure.ac; }" }
2626
- { os: windows-latest, stack: lts-17.5, stack-extra-deps: "bytestring-0.11.3.0, file-io-0.1.4, filepath-1.4.100.0, time-1.9.3, Win32-2.14.1.0" }
2727
- { os: windows-latest, stack: lts-22.7, stack-extra-deps: "bytestring-0.11.5.3, file-io-0.1.4, filepath-1.5.2.0, os-string-2.0.2, time-1.14, Win32-2.14.1.0", stack-package-flags: "{directory: {os-string: true}, file-io: {os-string: true}, Win32: {os-string: true}}", ghc-flags: -Werror=deprecations }
28+
- { os: windows-latest, ghc: latest, cabal: 3.12.1.0, cabal-package-flags: +os-string, ghc-flags: -Werror=deprecations }
2829
runs-on: ${{ matrix.os }}
2930
env:
3031
CABAL_PACKAGE_FLAGS: ${{ matrix.cabal-package-flags }}

System/Directory/OsPath.hs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ module System.Directory.OsPath
5252
, copyFile
5353
, copyFileWithMetadata
5454
, getFileSize
55+
, replaceFile
5556

5657
, canonicalizePath
5758
, makeAbsolute
@@ -731,7 +732,7 @@ renamePath opath npath =
731732
-- The replaced file could not be deleted. The replaced and replacement files
732733
-- retain their original file names.
733734
replaceFile :: OsPath -> OsPath -> IO ()
734-
replaceFile = replaceFileInternal Nothing
735+
replaceFile opath npath = replaceFileInternal opath npath Nothing
735736

736737
-- | Copy a file with its permissions. If the destination file already exists,
737738
-- it is replaced atomically. Neither path may refer to an existing

cabal.project

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
packages: .
2+
3+
source-repository-package
4+
type: git
5+
location: https://github.com/zlonast/win32.git
6+
tag: 48a0c6ca789e6bba1c6fc76ed885b56a65154991

0 commit comments

Comments
 (0)