git.iko.soy/nixpkgs-stackage
on master help sign in
Pass cacheVersion to update script
commit6e22272e960e8324123f6adc479d7d142438d2c3 authorDmitry Bushev <bushevdv@gmail.com> dateSat 30 Dec 2017, 20:20 (9 years ago) parent540debd
2 files changed+9−9
compare with master
unifiedsplit
stackage2nix/lib.nix+4−4 update.nix+5−5
stackage2nix/lib.nix+4−4
@@ -1,10 +1,10 @@
11{ stdenv, cacert, git, curl
2−, _cacheVersion ? "0" }:
2+, cacheVersion ? "0" }:
33
44{
55 hackage-db = stdenv.mkDerivation {
66 name = "hackage-db";
7− version = _cacheVersion;
7+ version = cacheVersion;
88 phases = [ "installPhase" ];
99 buildInputs = [ curl ];
1010 installPhase = ''
@@ -18,7 +18,7 @@
1818 };
1919 all-cabal-hashes = stdenv.mkDerivation rec {
2020 name = "all-cabal-hashes";
21− version = _cacheVersion;
21+ version = cacheVersion;
2222 phases = [ "installPhase" ];
2323 buildInputs = [ git ];
2424 installPhase = ''
@@ -29,7 +29,7 @@
2929 };
3030 stackage-lts = stdenv.mkDerivation {
3131 name = "stackage-lts";
32− version = _cacheVersion;
32+ version = cacheVersion;
3333 phases = [ "installPhase" ];
3434 buildInputs = [ git ];
3535 installPhase = ''
update.nix+5−5
@@ -1,9 +1,9 @@
1−{ nixpkgs ? import <nixpkgs> {} }:
1+{ nixpkgs ? import <nixpkgs> {}
2+, cacheVersion ? "0" }:
23
34let
45 pkgs = import ./default.nix { inherit nixpkgs; };
5− lib = pkgs.callPackage ./stackage2nix/lib.nix {};
6− # updateScript = pkgs.callPackage ./update-stackage/update.nix { inherit (lib) stackage-lts; };
6+ lib = pkgs.callPackage ./stackage2nix/lib.nix { inherit cacheVersion; };
77in pkgs.stdenv.mkDerivation rec {
88 name = "nixpkgs-typeable-update-script";
99
@@ -31,12 +31,12 @@ in pkgs.stdenv.mkDerivation rec {
3131 pushd stackage
3232 echo '{ callPackage }:' > default.nix
3333 echo '{' >> default.nix
34− for dir in $(find . -mindepth 1 -type d | sort); do
34+ for dir in $(find . -mindepth 1 -type d | sort --version-sort); do
3535 resolver=$(basename $dir)
3636 echo " ''${resolver//.} = callPackage $dir {};" >> default.nix
3737 done
3838 echo '}' >> default.nix
39− popd # stackage
39+ popd
4040 '';
4141
4242 shellHook = ''