git.iko.soy/typeable/nixpkgs-stackage
on master help sign in
Pass cacheVersion to update script
6e22272Dmitry Bushev
stackage2nix/lib.nix+4−4
compare with master
unifiedsplit
@@ -1,10 +1,10 @@
1{ stdenv, cacert, git, curl
1{ stdenv, cacert, git, curl
2−, _cacheVersion ? "0" }:
2+, cacheVersion ? "0" }:
3
3
4{
4{
5 hackage-db = stdenv.mkDerivation {
5 hackage-db = stdenv.mkDerivation {
6 name = "hackage-db";
6 name = "hackage-db";
7− version = _cacheVersion;
7+ version = cacheVersion;
8 phases = [ "installPhase" ];
8 phases = [ "installPhase" ];
9 buildInputs = [ curl ];
9 buildInputs = [ curl ];
10 installPhase = ''
10 installPhase = ''
@@ -18,7 +18,7 @@
18 };
18 };
19 all-cabal-hashes = stdenv.mkDerivation rec {
19 all-cabal-hashes = stdenv.mkDerivation rec {
20 name = "all-cabal-hashes";
20 name = "all-cabal-hashes";
21− version = _cacheVersion;
21+ version = cacheVersion;
22 phases = [ "installPhase" ];
22 phases = [ "installPhase" ];
23 buildInputs = [ git ];
23 buildInputs = [ git ];
24 installPhase = ''
24 installPhase = ''
@@ -29,7 +29,7 @@
29 };
29 };
30 stackage-lts = stdenv.mkDerivation {
30 stackage-lts = stdenv.mkDerivation {
31 name = "stackage-lts";
31 name = "stackage-lts";
32− version = _cacheVersion;
32+ version = cacheVersion;
33 phases = [ "installPhase" ];
33 phases = [ "installPhase" ];
34 buildInputs = [ git ];
34 buildInputs = [ git ];
35 installPhase = ''
35 installPhase = ''
update.nix+5−5
@@ -1,9 +1,9 @@
1−{ nixpkgs ? import <nixpkgs> {} }:
1+{ nixpkgs ? import <nixpkgs> {}
2+, cacheVersion ? "0" }:
2
3
3let
4let
4 pkgs = import ./default.nix { inherit nixpkgs; };
5 pkgs = import ./default.nix { inherit nixpkgs; };
5− lib = pkgs.callPackage ./stackage2nix/lib.nix {};
6+ lib = pkgs.callPackage ./stackage2nix/lib.nix { inherit cacheVersion; };
6− # updateScript = pkgs.callPackage ./update-stackage/update.nix { inherit (lib) stackage-lts; };
7in pkgs.stdenv.mkDerivation rec {
7in pkgs.stdenv.mkDerivation rec {
8 name = "nixpkgs-typeable-update-script";
8 name = "nixpkgs-typeable-update-script";
9
9
@@ -31,12 +31,12 @@ in pkgs.stdenv.mkDerivation rec {
31 pushd stackage
31 pushd stackage
32 echo '{ callPackage }:' > default.nix
32 echo '{ callPackage }:' > default.nix
33 echo '{' >> default.nix
33 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
35 resolver=$(basename $dir)
35 resolver=$(basename $dir)
36 echo " ''${resolver//.} = callPackage $dir {};" >> default.nix
36 echo " ''${resolver//.} = callPackage $dir {};" >> default.nix
37 done
37 done
38 echo '}' >> default.nix
38 echo '}' >> default.nix
39− popd # stackage
39+ popd
40 '';
40 '';
41
41
42 shellHook = ''
42 shellHook = ''