From 957aec0e510399d3244a5d4d434a1883330edb04 Mon Sep 17 00:00:00 2001 From: Mike Pilgrem Date: Tue, 7 Jul 2026 23:55:25 +0100 Subject: [PATCH] Update Nix-related CI for passage of time --- .github/workflows/integration-tests.yml | 4 ++-- .../integration/tests/4095-utf8-pure-nix/files/stack.yaml | 6 +++--- tests/unit/Stack/NixSpec.hs | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml index 76fb094f37..0cdeddb9ed 100644 --- a/.github/workflows/integration-tests.yml +++ b/.github/workflows/integration-tests.yml @@ -128,10 +128,10 @@ jobs: # Enter the Nix environment... . ~/.nix-profile/etc/profile.d/nix.sh # Add a channel named 'nixpkgs' to the list of subscribed channels... - nix-channel --add https://nixos.org/channels/nixos-25.11 nixpkgs + nix-channel --add https://nixos.org/channels/nixos-26.05 nixpkgs # Download the Nix expressions for all subscribed channels... # - # As at 2026-03-01, nixos-25.11 provides GHC 9.10.2. + # As at 2026-07-07, nixos-26.05 provides GHC 9.10.3. nix-channel --update # The NIX_PATH environment variable sets a list of directories used to # look up the location of Nix expressions using paths enclosed in diff --git a/tests/integration/tests/4095-utf8-pure-nix/files/stack.yaml b/tests/integration/tests/4095-utf8-pure-nix/files/stack.yaml index 6eed06afb0..71e4c2b032 100644 --- a/tests/integration/tests/4095-utf8-pure-nix/files/stack.yaml +++ b/tests/integration/tests/4095-utf8-pure-nix/files/stack.yaml @@ -1,10 +1,10 @@ -# As of 2026-03-01, with channel nixos-25.11, avaiable Nix packages +# As of 2026-07-07, with channel nixos-26.05, avaiable Nix packages # haskell.compiler.ghc*, based on: # # $ nix-instantiate --eval -E "with import {}; lib.attrNames haskell.compiler" # # are: # -# 948 (GHC 9.4.8), 967 (GHC 9.6.7), 984 (GHC 9.8.4), 9102 (GHC 9.10.2), -# 9103 (GHC 9.10.3), 9122 (GHC 9.12.2). +# 948 (GHC 9.4.8), 967 (GHC 9.6.7), 984 (GHC 9.8.4), 9103 (GHC 9.10.3), +# 9123 (GHC 9.12.3), 9124 (GHC 9.12.4), 9141 (GHC 9.14.1). snapshot: ghc-9.10.3 diff --git a/tests/unit/Stack/NixSpec.hs b/tests/unit/Stack/NixSpec.hs index 9a317f6139..f1783bc708 100644 --- a/tests/unit/Stack/NixSpec.hs +++ b/tests/unit/Stack/NixSpec.hs @@ -32,7 +32,7 @@ import Test.Hspec ( Spec, around_, beforeAll, describe, it, shouldBe ) sampleConfigNixEnabled :: String sampleConfigNixEnabled = - "snapshot: lts-19.22\n" ++ + "snapshot: lts-24.49\n" ++ "packages: ['.']\n" ++ "system-ghc: true\n" ++ "nix:\n" ++ @@ -41,7 +41,7 @@ sampleConfigNixEnabled = sampleConfigNixDisabled :: String sampleConfigNixDisabled = - "snapshot: lts-19.22\n" ++ + "snapshot: lts-24.49\n" ++ "packages: ['.']\n" ++ "nix:\n" ++ " enable: False" @@ -111,6 +111,6 @@ spec = beforeAll setup $ do config.nix.enable `shouldBe` trueOnNonWindows it "sees that the only package asked for is glpk and asks for the correct GHC derivation" $ loadConfig' mempty $ \config -> do config.nix.packages `shouldBe` ["glpk"] - v <- parseVersionThrowing "9.0.2" + v <- parseVersionThrowing "9.10.3" ghc <- either throwIO pure $ nixCompiler (WCGhc v) - ghc `shouldBe` "haskell.compiler.ghc902" + ghc `shouldBe` "haskell.compiler.ghc9103"