alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

nix: Update to 1.9

Browse source
This commit is contained in:
Eelco Dolstra 2015-06-12 13:19:35 +02:00
parent cbbefbdabb
commit 192d20e820
3 changed files with 10 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
pkgs/tools/package-management/nix/default.nix
View file

@ -1,22 +1,20 @@
{ stdenv, fetchurl, perl, curl, bzip2, sqlite, openssl ? null
, pkgconfig, boehmgc, perlPackages
{ lib, stdenv, fetchurl, perl, curl, bzip2, sqlite, openssl ? null
, pkgconfig, boehmgc, perlPackages, libsodium
, storeDir ? "/nix/store"
, stateDir ? "/nix/var"
}:
stdenv.mkDerivation rec {
name = "nix-1.8";
name = "nix-1.9";
src = fetchurl {
url = "http://nixos.org/releases/nix/${name}/${name}.tar.xz";
sha256 = "a30a5e801bc1cb1019cbc3456d961a307c45c9c588b8692cf1293ea6588ef01c";
sha256 = "8a47cd7c35dfa628a4acfaef387e7451013c61d250bbcf1f38067a7c73f9f3e1";
};
patches = [ ./xfs.patch ];
nativeBuildInputs = [ perl pkgconfig ];
buildInputs = [ curl openssl sqlite ];
buildInputs = [ curl openssl sqlite ] ++ lib.optional stdenv.isLinux libsodium;
propagatedBuildInputs = [ boehmgc ];

13
pkgs/tools/package-management/nix/xfs.patch
View file

@ -1,13 +0,0 @@
diff --git a/src/libexpr/primops.cc b/src/libexpr/primops.cc
index 119e71a..422ec97 100644
--- a/src/libexpr/primops.cc
+++ b/src/libexpr/primops.cc
@@ -796,7 +796,7 @@ static void prim_readDir(EvalState & state, const Pos & pos, Value * * args, Val
for (auto & ent : entries) {
Value * ent_val = state.allocAttr(v, state.symbols.create(ent.name));
if (ent.type == DT_UNKNOWN)
- ent.type = getFileType(path);
+ ent.type = getFileType(path + "/" + ent.name);
mkStringNoCopy(*ent_val,
ent.type == DT_REG ? "regular" :
ent.type == DT_DIR ? "directory" :

7
pkgs/top-level/all-packages.nix
View file

@ -14431,10 +14431,13 @@ let
stateDir = config.nix.stateDir or "/nix/var";
};
nixUnstable = callPackage ../tools/package-management/nix/unstable.nix {
nixUnstable = nixStable;
/*
nixUnstable = lowPrio (callPackage ../tools/package-management/nix/unstable.nix {
storeDir = config.nix.storeDir or "/nix/store";
stateDir = config.nix.stateDir or "/nix/var";
};
});
*/
nixops = callPackage ../tools/package-management/nixops { };