git.iko.soy/typeable/cabal2nix
on master help sign in
update-nixpkgs.sh: add another "git pull" immediately before overwriting the hackage-packages.nix file

This reduces the time window in which a "git push" from somewhere else can cause conflicts.

commit07e2ff1f54e3595f1e478590c02b62ce4cae656f authorPeter Simons <simons@cryp.to> dateThu 18 Jun 2015, 11:50 (11 years ago) parent9e36260
1 file changed+2−1
compare with master
unifiedsplit
update-nixpkgs.sh+2−1
update-nixpkgs.sh+2−1
@@ -36,9 +36,10 @@ rm -rf dist
3636make --quiet cabal2nix.cabal
3737cabal build -v0 -j hackage2nix
3838dist/build/hackage2nix/hackage2nix >hackage-packages.nix 2>/dev/null
39−mv hackage-packages.nix nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix
4039
4140cd nixpkgs
41+git pull -q
42+mv ../hackage-packages.nix pkgs/development/haskell-modules/hackage-packages.nix
4243if [ -n "$(git status --porcelain)" ]; then
4344 git commit -q -m "hackage-packages.nix: update to https://github.com/commercialhaskell/all-cabal-files/commit/$hackage with hackage2nix revision $cabal2nix" -- pkgs/development/haskell-modules/hackage-packages.nix
4445 git push -q