Skip to content

Commit 126ed1c

Browse files
committed
Fix update scripts to use nixVersions.stable
1 parent 0d8eadf commit 126ed1c

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

build.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,14 +77,14 @@ in rec {
7777
maintainer-scripts = pkgs.dontRecurseIntoAttrs {
7878
update-hackage = import ./scripts/update-hackage.nix {
7979
inherit (pkgs) stdenv lib writeScript coreutils glibc git
80-
openssh nixFlakes gawk bash curl findutils;
80+
openssh nixVersions gawk bash curl findutils;
8181
# Update scripts use the internal nix-tools (compiled with a fixed GHC version)
8282
nix-tools = haskell.nix-tools-unchecked;
8383
inherit (haskell) update-index-state-hashes cabal-issue-8352-workaround;
8484
};
8585
update-stackage = haskell.callPackage ./scripts/update-stackage.nix {
8686
inherit (pkgs) stdenv lib writeScript coreutils glibc git
87-
openssh nixFlakes gawk bash curl findutils;
87+
openssh nixVersions gawk bash curl findutils;
8888
# Update scripts use the internal nix-tools (compiled with a fixed GHC version)
8989
nix-tools = haskell.nix-tools-unchecked;
9090
inherit (haskell) cabal-issue-8352-workaround;

scripts/update-external.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{ stdenv, lib, writeScript, glibc, coreutils, git, openssh
2-
, nix-tools, nixFlakes
2+
, nix-tools, nixVersions
33
, bash, curl, findutils, gawk, cabal-issue-8352-workaround }:
44

55
{ name, script }:
@@ -15,7 +15,7 @@ in
1515
1616
set -euo pipefail
1717
18-
export PATH="${makeBinPath ([ coreutils curl findutils gawk bash git openssh nix-tools nixFlakes ] ++ cabal-issue-8352-workaround ++ optional stdenv.isLinux glibc)}"
18+
export PATH="${makeBinPath ([ coreutils curl findutils gawk bash git openssh nix-tools nixVersions.stable ] ++ cabal-issue-8352-workaround ++ optional stdenv.isLinux glibc)}"
1919
2020
${script}
2121

scripts/update-hackage.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{ stdenv, lib, writeScript, coreutils, glibc, git, openssh
2-
, nix-tools, nixFlakes
2+
, nix-tools, nixVersions
33
, gawk, bash, curl, findutils
44
, update-index-state-hashes, cabal-issue-8352-workaround }@args:
55

scripts/update-stackage.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{ stdenv, lib, writeScript, coreutils, glibc, git, openssh
2-
, nix-tools, nixFlakes
2+
, nix-tools, nixVersions
33
, gawk, bash, curl, findutils, cabal-issue-8352-workaround }@args:
44

55
import ./update-external.nix args {

0 commit comments

Comments
 (0)