Fix log message

Bump to nightly-2022-07-30

Remove redundant import in Stack.Package

Bump to nightly-2022-08-02 (GHC 9.2.4)

Fix 4101-dependency-tree test

Maybe fix the ghc-install-hooks test

process-1.6.15.0 now available

Includes fix haskell/process#250

.github/workflows/integration-tests.yml

@@ -38,8 +38,8 @@ jobs:
       with:
         path: ~/.stack
         key: ${{ runner.os }}-${{ hashFiles('stack.yaml') }}${{ matrix.cache-bust }}
-    - shell: bash
-      name: Install deps and run checks
+    - name: Install deps and run checks
+      shell: bash
       run: |
         set -ex
 
@@ -82,8 +82,8 @@ jobs:
 
         set +ex
 
-    - shell: bash
-      name: Build bindist
+    - name: Build bindist
+      shell: bash
       run: stack etc/scripts/release.hs build ${{ matrix.release-args }}
 
     - name: Upload bindist

etc/scripts/build-stack-installer.hs

@@ -1,5 +1,5 @@
 {- stack script
-    --resolver nightly-2022-06-10
+    --resolver nightly-2022-08-02
     --install-ghc
     --package nsis
 -}

etc/scripts/release.hs

@@ -1,5 +1,5 @@
 {- stack script
-    --resolver nightly-2022-06-10
+    --resolver nightly-2022-08-02
     --system-ghc
     --ghc-options -Wall
     --package Cabal

src/Stack/Package.hs

@@ -32,9 +32,6 @@ import           Data.List (find, isPrefixOf, unzip)
 import qualified Data.Map.Strict as M
 import qualified Data.Set as S
 import qualified Data.Text as T
-#if MIN_VERSION_Cabal(3,6,0)
-import Distribution.Utils.Path (getSymbolicPath)
-#endif
 #if MIN_VERSION_Cabal(3,4,0)
 import           Distribution.CabalSpecVersion
 #endif

src/Stack/PackageDump.hs

@@ -64,6 +64,7 @@ ghcPkgCmdArgs pkgexe@(GhcPkgExe pkgPath) cmd mpkgDbs sink = do
     case reverse mpkgDbs of
         (pkgDb:_) -> createDatabase pkgexe pkgDb -- TODO maybe use some retry logic instead?
         _ -> return ()
+    -- https://github.com/haskell/process/issues/251
     snd <$> sinkProcessStderrStdout (toFilePath pkgPath) args CL.sinkNull sink'
   where
     args = concat

src/Stack/Script.hs

@@ -146,6 +146,7 @@ scriptCmd opts = do
             -- already. If all needed packages are available, we can
             -- skip the (rather expensive) build call below.
             GhcPkgExe pkg <- view $ compilerPathsL.to cpPkg
+            -- https://github.com/haskell/process/issues/251
             bss <- snd <$> sinkProcessStderrStdout (toFilePath pkg)
                 ["list", "--simple-output"] CL.sinkNull CL.consume -- FIXME use the package info from envConfigPackages, or is that crazy?
             let installed = Set.fromList

stack-ghc-902.yaml

@@ -4,6 +4,18 @@ resolver: lts-19.16
 packages:
 - .
 
+extra-deps:
+# mustache absent from lts-19.16
+- mustache-2.4.1@sha256:dc92ddbf90e3a64c3f2ec7785cf2937d6dcf6ffcebbc38ad9c8b33b6a70bb298,3180
+# lts-19.16 is limited to hpack-0.34.7
+- hpack-0.35.0@sha256:8cd6146fae269390f41dc7237ebd2c479074d4163806d349a41f5a7751d6cea5,4726
+# See https://github.com/commercialhaskell/pantry/pull/53
+- pantry-0.5.6@rev:0
+
+drop-packages:
+# See https://github.com/commercialhaskell/stack/pull/4712
+- cabal-install
+
 docker:
   enable: false
   repo: psibi/alpine-haskell-stack:9.2.3v2
@@ -20,15 +32,3 @@ flags:
 
 ghc-options:
   "$locals": -fhide-source-paths
-
-extra-deps:
-# mustache absent from lts-19.16
-- mustache-2.4.1@sha256:dc92ddbf90e3a64c3f2ec7785cf2937d6dcf6ffcebbc38ad9c8b33b6a70bb298,3180
-# lts-19.16 is limited to hpack-0.34.7
-- hpack-0.35.0@sha256:8cd6146fae269390f41dc7237ebd2c479074d4163806d349a41f5a7751d6cea5,4726
-# See https://github.com/commercialhaskell/pantry/pull/53
-- pantry-0.5.6@rev:0
-
-drop-packages:
-# See https://github.com/commercialhaskell/stack/pull/4712
-- cabal-install

stack-macos.yaml

@@ -1,47 +1,32 @@
-<<<<<<< HEAD:stack-ghc-923.yaml
-# GHC 9.2.3
-resolver: nightly-2022-07-29
-=======
-resolver: nightly-2022-06-10 # GHC 9.2.3
->>>>>>> 3f6774fd (Fix MacOS specific issue):stack-macos.yaml
+# GHC 9.2.4
+resolver: nightly-2022-08-02
 
 packages:
 - .
 
+extra-deps:
+# GHC 9.2.4 comes with process-1.6.13.2, which lacks important bug fixes
+- process-1.6.15.0@sha256:04df32d9497add5f0b90a27a3eceffa4bad5c2f41d038bd12ed6efc454db3faf,2845
+# Although Cabal-3.6.3.0 is a global package, it depends on process
+- Cabal-3.6.3.0@sha256:ff97c442b0c679c1c9876acd15f73ac4f602b973c45bde42b43ec28265ee48f4,12459
+
+drop-packages:
+# See https://github.com/commercialhaskell/stack/pull/4712
+- cabal-install
+
 docker:
   enable: false
   repo: psibi/alpine-haskell-stack:9.2.3v2
 
 nix:
   # --nix on the command-line to enable.
   packages:
-<<<<<<< HEAD:stack-ghc-923.yaml
   - zlib
   - unzip
 
-=======
-    - zlib
-    - unzip
->>>>>>> 3f6774fd (Fix MacOS specific issue):stack-macos.yaml
 flags:
   stack:
     developer-mode: true
 
 ghc-options:
   "$locals": -fhide-source-paths
-
-<<<<<<< HEAD:stack-ghc-923.yaml
-extra-deps:
-# See https://github.com/commercialhaskell/pantry/pull/53
-- pantry-0.5.6@rev:0
-=======
-# Contains macos specific fix for https://github.com/haskell/process/issues/247
-extra-deps:
-- git: https://github.com/haskell/process.git
-  commit: b95e5fbdeb74e0cc36b6878b60f9807bd0001fa8
-- Cabal-3.6.3.0@sha256:ff97c442b0c679c1c9876acd15f73ac4f602b973c45bde42b43ec28265ee48f4,12459
->>>>>>> 3f6774fd (Fix MacOS specific issue):stack-macos.yaml
-
-drop-packages:
-# See https://github.com/commercialhaskell/stack/pull/4712
-- cabal-install

stack.yaml

@@ -1,12 +1,14 @@
-resolver: nightly-2022-06-10 # GHC 9.2.3
+# GHC 9.2.4
+resolver: nightly-2022-08-02
 
 packages:
 - .
 
 extra-deps:
-- hpack-0.35.0@rev:0
-- pantry-0.5.6@rev:0 # https://github.com/commercialhaskell/pantry/pull/53
-- rio-0.1.21.0@rev:0
+# GHC 9.2.4 comes with process-1.6.13.2, which lacks important bug fixes
+- process-1.6.15.0@sha256:04df32d9497add5f0b90a27a3eceffa4bad5c2f41d038bd12ed6efc454db3faf,2845
+# Although Cabal-3.6.3.0 is a global package, it depends on process
+- Cabal-3.6.3.0@sha256:ff97c442b0c679c1c9876acd15f73ac4f602b973c45bde42b43ec28265ee48f4,12459
 
 docker:
   enable: false

test/integration/lib/StackTest.hs

@@ -279,7 +279,7 @@ isMacOSX = os == "darwin"
 -- the main @stack.yaml@.
 --
 defaultResolverArg :: String
-defaultResolverArg = "--resolver=nightly-2022-06-10"
+defaultResolverArg = "--resolver=nightly-2022-08-02"
 
 -- | Remove a file and ignore any warnings about missing files.
 removeFileIgnore :: HasCallStack => FilePath -> IO ()

test/integration/tests/1265-extensible-snapshots/files/snapshot-modify-lts.yaml

@@ -1,4 +1,4 @@
-resolver: nightly-2022-06-10
+resolver: nightly-2022-08-02
 name: snapshot-modify-lts
 drop-packages:
 - zlib

test/integration/tests/1265-extensible-snapshots/files/snapshots/local-snapshot.yaml

@@ -1,5 +1,5 @@
 ---
-resolver: nightly-2022-06-10
+resolver: nightly-2022-08-02
 name: local-snapshot
 packages:
 - archive: package-0.1.2.3.tar.gz

test/integration/tests/1265-extensible-snapshots/files/snapshots/remote-snapshot.yaml

@@ -1,5 +1,5 @@
 ---
-resolver: nightly-2022-06-10
+resolver: nightly-2022-08-02
 name: remote-snapshot
 packages:
 - archive: https://s3.amazonaws.com/hackage.fpcomplete.com/package/ghc-prim-0.8.0.tar.gz

test/integration/tests/1337-unicode-everywhere/files/stack.yaml

@@ -1,4 +1,4 @@
-resolver: nightly-2022-06-10
+resolver: nightly-2022-08-02
 packages:
 - '.'
 extra-deps: []

test/integration/tests/1659-skip-component/files/stack.yaml

@@ -1,4 +1,4 @@
-resolver: nightly-2022-06-10
+resolver: nightly-2022-08-02
 packages:
 - '.'
 extra-deps: []

test/integration/tests/1884-url-to-tarball/files/stack.yaml

@@ -2,4 +2,4 @@ extra-deps:
 - location: https://hackage.haskell.org/package/half-0.2.2.3/half-0.2.2.3.tar.gz
   sha256: 85c244c80d1c889a3d79073a6f5a99d9e769dbe3c574ca11d992b2b4f7599a5c
   size: 6050
-resolver: nightly-2022-06-10
+resolver: nightly-2022-08-02

test/integration/tests/2195-depend-on-exe/files/stack.yaml

@@ -1 +1 @@
-resolver: nightly-2022-06-10
+resolver: nightly-2022-08-02

test/integration/tests/32-unlisted-module/files/stack.yaml

@@ -2,4 +2,4 @@ flags: {}
 packages:
 - '.'
 extra-deps: []
-resolver: nightly-2022-06-10
+resolver: nightly-2022-08-02

test/integration/tests/3315-multi-ghc-options/files/stack.yaml

@@ -1,3 +1,3 @@
-resolver: nightly-2022-06-10
+resolver: nightly-2022-08-02
 packages:
 - '.'

test/integration/tests/335-multi-package-flags/files/stack.yaml

@@ -2,4 +2,4 @@ flags: {}
 packages:
 - '.'
 extra-deps: []
-resolver: nightly-2022-06-10
+resolver: nightly-2022-08-02

test/integration/tests/345-override-bytestring/files/stack.yaml

@@ -1,4 +1,4 @@
-resolver: nightly-2022-06-10
+resolver: nightly-2022-08-02
 extra-deps:
 - bytestring-0.11.3.1
 - binary-0.8.9.0

test/integration/tests/3533-extra-deps-solver/files/orig-stack.yaml

@@ -1,4 +1,4 @@
-resolver: nightly-2022-06-10
+resolver: nightly-2022-08-02
 
 packages:
 - ./local-mmorph

test/integration/tests/3591-cabal-warnings-once/files/stack.yaml

@@ -1 +1 @@
-resolver: nightly-2022-06-10
+resolver: nightly-2022-08-02

test/integration/tests/365-invalid-success/files/stack.yaml

@@ -2,4 +2,4 @@ flags: {}
 packages:
 - '.'
 extra-deps: []
-resolver: nightly-2022-06-10
+resolver: nightly-2022-08-02

test/integration/tests/366-non-root-dir/files/stack.yaml

@@ -2,4 +2,4 @@ flags: {}
 packages:
 - '.'
 extra-deps: []
-resolver: nightly-2022-06-10
+resolver: nightly-2022-08-02

test/integration/tests/3787-internal-libs-with-no-main-lib/files/stack.yaml

@@ -1 +1 @@
-resolver: nightly-2022-06-10
+resolver: nightly-2022-08-02

test/integration/tests/3863-purge-command/files/stack.yaml

@@ -2,4 +2,4 @@ flags: {}
 packages:
 - '.'
 extra-deps: []
-resolver: nightly-2022-06-10
+resolver: nightly-2022-08-02

test/integration/tests/3940-base-upgrade-warning/files/no-base-upgrade.yaml

@@ -1,3 +1,3 @@
-resolver: nightly-2022-06-10
+resolver: nightly-2022-08-02
 extra-deps:
 - base-4.10.1.0

test/integration/tests/3940-base-upgrade-warning/files/unattainable-base.yaml

@@ -1 +1 @@
-resolver: nightly-2022-06-10
+resolver: nightly-2022-08-02

test/integration/tests/3942-solver-error-output/files/test-stack.yml

@@ -1,4 +1,4 @@
-resolver: nightly-2022-06-10
+resolver: nightly-2022-08-02
 
 packages: []
 

test/integration/tests/3959-order-of-flags/files/stack.yaml

@@ -1 +1 @@
-resolver: nightly-2022-06-10
+resolver: nightly-2022-08-02

test/integration/tests/397-case-insensitive-flags/files/stack.yaml

@@ -1 +1 @@
-resolver: nightly-2022-06-10
+resolver: nightly-2022-08-02

test/integration/tests/3997-coverage-with-cabal-3/files/stack.yaml

@@ -1 +1 @@
-resolver: nightly-2022-06-10
+resolver: nightly-2022-08-02

test/integration/tests/4095-utf8-pure-nix/files/stack.yaml

@@ -1 +1 @@
-resolver: nightly-2022-06-10
+resolver: nightly-2022-08-02

test/integration/tests/4101-dependency-tree/Main.hs

@@ -12,28 +12,28 @@ main =
   stackCheckStdout ["ls", "dependencies", "tree"] $ \stdOut -> do
     let expected = unlines [ "Packages"
                            , "├─┬ files 0.1.0.0"
-                           , "│ ├─┬ base 4.16.2.0"
+                           , "│ ├─┬ base 4.16.3.0"
                            ]
     unless (expected `isPrefixOf` stdOut) $
       error $ unlines [ "Expected:", expected, "Actual:", stdOut ]
 
   stackCheckStdout ["ls", "dependencies", "tree", "--depth=1"] $ \stdOut -> do
     let expected = unlines [ "Packages"
                            , "├─┬ files 0.1.0.0"
-                           , "│ ├── base 4.16.2.0"
+                           , "│ ├── base 4.16.3.0"
                            , "│ ├── filelock 0.1.1.2"
                            , "│ ├── mtl 2.2.2"
                            , "│ └── subproject 0.1.0.0"
                            , "└─┬ subproject 0.1.0.0"
-                           , "  └── base 4.16.2.0"
+                           , "  └── base 4.16.3.0"
                            ]
     when (stdOut /= expected) $
       error $ unlines [ "Expected:", expected, "Actual:", stdOut ]
 
   stackCheckStdout ["ls", "dependencies", "tree", "subproject"] $ \stdOut -> do
     let expected = unlines [ "Packages"
                            , "└─┬ subproject 0.1.0.0"
-                           , "  └─┬ base 4.16.2.0"
+                           , "  └─┬ base 4.16.3.0"
                            ,"    ├─┬ ghc-bignum 1.2"
                            ,"    │ └─┬ ghc-prim 0.8.0"
                            ,"    │   └── rts 1.0.2"

test/integration/tests/4101-dependency-tree/files/stack.yaml

@@ -1,4 +1,4 @@
-resolver: nightly-2022-06-10
+resolver: nightly-2022-08-02
 packages:
 - .
 - subproject

test/integration/tests/4105-test-coverage-of-internal-lib/files/stack.yaml

@@ -1 +1 @@
-resolver: nightly-2022-06-10
+resolver: nightly-2022-08-02

test/integration/tests/4270-files-order/files/stack.yaml

@@ -1,4 +1,4 @@
-resolver: nightly-2022-06-10
+resolver: nightly-2022-08-02
 
 packages:
 - .

test/integration/tests/4453-detailed/files/stack.yaml

@@ -1,3 +1,3 @@
-resolver: nightly-2022-06-10
+resolver: nightly-2022-08-02
 packages:
 - '.'

test/integration/tests/4783-doctest-deps/files/snapshot.yaml

@@ -1,4 +1,4 @@
-resolver: nightly-2022-06-10
+resolver: nightly-2022-08-02
 name: foo
 packages:
 - acme-dont-1.1@sha256:8264ad3e5113d3e0417b46e71d5a9c0914a1f03b5b81319cc329f1dc0f49b96c,602

test/integration/tests/4897-boot-package-pruned/files/stack.yaml

@@ -1,3 +1,3 @@
-resolver: nightly-2022-06-10
+resolver: nightly-2022-08-02
 packages: [.]
 extra-deps: [./directory]

test/integration/tests/4938-non-ascii-module-names/files/stack.yaml

@@ -1 +1 @@
-resolver: nightly-2022-06-10
+resolver: nightly-2022-08-02

test/integration/tests/5180-ghc-rts-flags/files/stack.yaml

@@ -1,4 +1,4 @@
-resolver: nightly-2022-06-10
+resolver: nightly-2022-08-02
 packages:
 - .
 

test/integration/tests/5680-share-package-across-projects/files/package-a/stack.yaml

@@ -1,4 +1,4 @@
-resolver: nightly-2022-06-10
+resolver: nightly-2022-08-02
 packages:
 - .
 - ../package-c

test/integration/tests/5680-share-package-across-projects/files/package-b/stack.yaml

@@ -1,4 +1,4 @@
-resolver: nightly-2022-06-10
+resolver: nightly-2022-08-02
 packages:
 - .
 - ../package-c

test/integration/tests/5680-share-package-across-projects/files/package-c/stack.yaml

@@ -1,3 +1,3 @@
-resolver: nightly-2022-06-10
+resolver: nightly-2022-08-02
 packages:
 - .