git.iko.soy/haskell.nix
on iko/ghcjs-patch-master help sign in
bump scripts
commit2232e06112b6d72770da149d077a0e07b2aea35f authorMoritz Angermann <moritz.angermann@gmail.com> dateFri 6 Mar 2020, 21:52 (7 years ago) parentae8e4e3
3 files changed+11−19
compare with iko/ghcjs-patch-master
unifiedsplit
scripts/update-external.nix+3−2 scripts/update-hackage.nix+4−1 scripts/update-stackage.nix+4−16
scripts/update-external.nix+3−2
@@ -1,5 +1,6 @@
11{ stdenv, writeScript, glibc, coreutils, git, openssh
2−, nix-tools, cabal-install, nix-prefetch-git }:
2+, nix-tools, cabal-install, nix-prefetch-git
3+, bash, curl, findutils, gawk }:
34
45{ name, script }:
56
@@ -15,7 +16,7 @@ in
1516
1617 set -euo pipefail
1718
18− export PATH="${makeBinPath [ coreutils glibc git openssh nix-tools cabal-install nix-prefetch-git ]}"
19+ export PATH="${makeBinPath ([ coreutils curl findutils gawk bash git openssh nix-tools cabal-install nix-prefetch-git ] ++ optional stdenv.isLinux glibc)}"
1920
2021 ${script}
2122
scripts/update-hackage.nix+4−1
@@ -1,4 +1,7 @@
1−{ stdenv, writeScript, coreutils, glibc, git, openssh, nix-tools, cabal-install, nix-prefetch-git, update-index-state-hashes }@args:
1+{ stdenv, writeScript, coreutils, glibc, git, openssh
2+, nix-tools, cabal-install, nix-prefetch-git
3+, gawk, bash, curl, findutils
4+, update-index-state-hashes }@args:
25
36import ./update-external.nix
47(removeAttrs args ["update-index-state-hashes"]) {
scripts/update-stackage.nix+4−16
@@ -1,4 +1,6 @@
1−{ stdenv, writeScript, coreutils, glibc, git, openssh, nix-tools, cabal-install, nix-prefetch-git }@args:
1+{ stdenv, writeScript, coreutils, glibc, git, openssh
2+, nix-tools, cabal-install, nix-prefetch-git
3+, gawk, bash, curl, findutils }@args:
24
35import ./update-external.nix args {
46 name = "stackage";
@@ -20,20 +22,6 @@ import ./update-external.nix args {
2022
2123 echo "Running lts-to-nix for all snapshots..."
2224
23− for lts in {lts-haskell,stackage-nightly}/*.yaml
24− do
25− if [[ ! -f $(basename ''${lts%.yaml}.nix) ]]; then
26− lts-to-nix $lts > $(basename ''${lts%.yaml}.nix)
27− fi
28− done
29−
30− # update nightlies
31− echo "{" > nightlies.nix;
32− for a in nightly-*.nix; do echo " \"''${a%%.nix}\" = import ./$a;" >> nightlies.nix; done;
33− echo "}" >> nightlies.nix
34− # update lts
35− echo "{" > ltss.nix;
36− for a in $(ls lts-*.nix | sort -Vtx -k 1,1); do echo " \"''${a%%.nix}\" = import ./$a;" >> ltss.nix; done;
37− echo "}" >> ltss.nix
25+ LTS_TO_NIX=lts-to-nix ./update.sh
3826 '';
3927}