on iko/ghcjs-patch-master help sign in
update-stackage: update submodules on fresh checkout

otherwise we are missing out on new lts/nightlies. Also: - skip re-generation for existing resolver - better lts ordering in ltss.nix

commit2a88d56aa40cb6d808e4360eedd28c1de1a378b1 authorJean-Baptiste Giraudeau <jb@giraudeau.info> dateThu 21 Mar 2019, 23:38 (8 years ago) parent2615bd7
1 file changed+6−11
scripts/update-stackage.nix+6−11
scripts/update-stackage.nix+6−11
@@ -15,30 +15,25 @@ import ./update-external.nix args {
1515 git clone git@github.com:input-output-hk/stackage.nix.git
1616 cd stackage.nix
1717 git submodule update --init
18+ git submodule foreach git pull origin master
1819 fi
1920
2021 echo "Running lts-to-nix for all snapshots..."
2122
22− # update them all in parallel...
23− N=$(getconf _NPROCESSORS_ONLN)
2423 for lts in {lts-haskell,stackage-nightly}/*.yaml
2524 do
26− lts-to-nix $lts > $(basename ''${lts%.yaml}.nix) &
27− while [[ $(jobs -r -p | wc -l) -gt $N ]]; do
28− # can't use `wait -n` on older bash versions.
29− # e.g. what ships with macOS High Sierra
30− sleep 1;
31− done
25+ if [[ ! -f $(basename ''${lts%.yaml}.nix) ]]; then
26+ lts-to-nix $lts > $(basename ''${lts%.yaml}.nix)
27+ fi
3228 done
33− wait
34−
29+
3530 # update nightlies
3631 echo "{" > nightlies.nix;
3732 for a in nightly-*.nix; do echo " \"''${a%%.nix}\" = import ./$a;" >> nightlies.nix; done;
3833 echo "}" >> nightlies.nix
3934 # update lts
4035 echo "{" > ltss.nix;
41− for a in lts-*.nix; do echo " \"''${a%%.nix}\" = import ./$a;" >> ltss.nix; done;
36+ for a in $(ls lts-*.nix | sort -Vtx -k 1,1); do echo " \"''${a%%.nix}\" = import ./$a;" >> ltss.nix; done;
4237 echo "}" >> ltss.nix
4338 '';
4439}