Skip to content

Commit f66dc3f

Browse files
committed
More script fixes
1 parent 3461d04 commit f66dc3f

File tree

3 files changed

+4
-3
lines changed

3 files changed

+4
-3
lines changed

build.nix

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ in rec {
5757
# Update scripts use the internal nix-tools and cabal-install (compiled with a fixed GHC version)
5858
nix-tools = haskell.internal-nix-tools;
5959
cabal-install = haskell.internal-cabal-install;
60+
inherit (haskell) cabal-issue-8352-workaround;
6061
};
6162
update-pins = haskell.callPackage ./scripts/update-pins.nix {};
6263
update-docs = pkgs.buildPackages.callPackage ./scripts/update-docs.nix {

scripts/update-external.nix

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

55
{ name, script }:
66

@@ -16,7 +16,7 @@ in
1616
1717
set -euo pipefail
1818
19-
export PATH="${makeBinPath ([ coreutils curl findutils gawk bash git openssh nix-tools cabal-install nixFlakes ] ++ optional stdenv.isLinux glibc)}"
19+
export PATH="${makeBinPath ([ coreutils curl findutils gawk bash git openssh nix-tools cabal-install cabal-issue-8352-workaround nixFlakes ] ++ optional stdenv.isLinux glibc)}"
2020
2121
${script}
2222

scripts/update-stackage.nix

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

55
import ./update-external.nix args {
66
name = "stackage";

0 commit comments

Comments
 (0)