diff options
-rw-r--r-- | pkgs/tools/package-management/nix-static/builder.sh (renamed from pkgs/misc/nix-static/builder.sh) | 0 | ||||
-rw-r--r-- | pkgs/tools/package-management/nix-static/default.nix (renamed from pkgs/misc/nix-static/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/tools/package-management/nix-static/nix-0.10pre5679.patch (renamed from pkgs/misc/nix-static/nix-0.10pre5679.patch) | 0 | ||||
-rw-r--r-- | pkgs/tools/package-management/nix-static/nix-0.10pre5896-static.patch (renamed from pkgs/misc/nix-static/nix-0.10pre5896-static.patch) | 0 | ||||
-rw-r--r-- | pkgs/tools/package-management/nix/default.nix (renamed from pkgs/misc/nix/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/tools/package-management/nix/unstable.nix (renamed from pkgs/misc/nix/unstable.nix) | 6 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 6 |
7 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/misc/nix-static/builder.sh b/pkgs/tools/package-management/nix-static/builder.sh index 940e8b828e99e..940e8b828e99e 100644 --- a/pkgs/misc/nix-static/builder.sh +++ b/pkgs/tools/package-management/nix-static/builder.sh diff --git a/pkgs/misc/nix-static/default.nix b/pkgs/tools/package-management/nix-static/default.nix index e0380652defab..e0380652defab 100644 --- a/pkgs/misc/nix-static/default.nix +++ b/pkgs/tools/package-management/nix-static/default.nix diff --git a/pkgs/misc/nix-static/nix-0.10pre5679.patch b/pkgs/tools/package-management/nix-static/nix-0.10pre5679.patch index 4d72c1989416c..4d72c1989416c 100644 --- a/pkgs/misc/nix-static/nix-0.10pre5679.patch +++ b/pkgs/tools/package-management/nix-static/nix-0.10pre5679.patch diff --git a/pkgs/misc/nix-static/nix-0.10pre5896-static.patch b/pkgs/tools/package-management/nix-static/nix-0.10pre5896-static.patch index 749ee53bacd4a..749ee53bacd4a 100644 --- a/pkgs/misc/nix-static/nix-0.10pre5896-static.patch +++ b/pkgs/tools/package-management/nix-static/nix-0.10pre5896-static.patch diff --git a/pkgs/misc/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 657f4e4fce0ff..657f4e4fce0ff 100644 --- a/pkgs/misc/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix diff --git a/pkgs/misc/nix/unstable.nix b/pkgs/tools/package-management/nix/unstable.nix index 28d2da7f86900..6bd428a2612af 100644 --- a/pkgs/misc/nix/unstable.nix +++ b/pkgs/tools/package-management/nix/unstable.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation { - name = "nix-0.11pre8349"; + name = "nix-0.11pre8456"; src = fetchurl { - url = http://nix.cs.uu.nl/dist/nix/nix-0.11pre8349/nix-0.11pre8349.tar.bz2; - md5 = "5f09f4986399b60e35d1815d9c003a2e"; + url = http://nix.cs.uu.nl/dist/nix/nix-0.11pre8456/nix-0.11pre8456.tar.bz2; + md5 = "7c6939f94f2a5fe8586df3d39b0e1ab5"; }; buildInputs = [perl curl openssl]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3defbda5a1234..4f327befd25b9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3171,20 +3171,20 @@ rec { inherit stdenv fetchurl jdk; }; - nix = import ../misc/nix { + nix = import ../tools/package-management/nix { inherit fetchurl stdenv perl curl bzip2; aterm = aterm242fixes; db4 = db44; }; - nixStatic = import ../misc/nix-static { + nixStatic = import ../tools/package-management/nix-static { inherit fetchurl stdenv perl curl autoconf automake libtool; aterm = aterm242fixes; bdb = db4; }; # The bleeding edge. - nixUnstable = import ../misc/nix/unstable.nix { + nixUnstable = import ../tools/package-management/nix/unstable.nix { inherit fetchurl stdenv perl curl bzip2 openssl; aterm = aterm242fixes; db4 = db45; |