From c21d5fdc23ee721ea7750f3228a5d76621694dd2 Mon Sep 17 00:00:00 2001 From: Mike Pilgrem Date: Mon, 2 Mar 2026 00:00:45 +0000 Subject: [PATCH] Update Nix in CI --- .github/workflows/integration-tests.yml | 4 ++-- .../tests/4095-utf8-pure-nix/files/stack.yaml | 14 ++++++++++---- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml index c3ffc0dae7..bd20431e2c 100644 --- a/.github/workflows/integration-tests.yml +++ b/.github/workflows/integration-tests.yml @@ -136,10 +136,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-23.05 nixpkgs + nix-channel --add https://nixos.org/channels/nixos-25.11 nixpkgs # Download the Nix expressions for all subscribed channels... # - # As at 2023-08-21, nixos-23.05 provides GHC 9.2.8. + # As at 2026-03-01, nixos-25.11 provides GHC 9.10.2. 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 59a3225477..acc9a9581d 100644 --- a/tests/integration/tests/4095-utf8-pure-nix/files/stack.yaml +++ b/tests/integration/tests/4095-utf8-pure-nix/files/stack.yaml @@ -1,4 +1,10 @@ -# As of 20 August 2023, there is no Nix package haskell.compiler.ghc946. -# Available options include ghc92 (GHC 9.2.8), ghc926, ghc927, -# ghc94 (GHC 9.4.5), ghc942, ghc943 or ghc944. -snapshot: lts-20.26 # GHC 9.2.8 +# As of 2026-03-01, with channel nixos-25.11, 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). +snapshot: lts-24.32 # GHC 9.10.3