Updating from trunk.
I had to fix conflicts in the pcre expression, and as usual, all-packages.nix about stdenv2. svn path=/nixos/branches/stdenv-updates/; revision=24153
This commit is contained in:
parent
c1e4586ed1
commit
3c6e5ef88e
@ -1,4 +1,4 @@
|
|||||||
{ nixpkgs ? ../nixpkgs }:
|
{ nixpkgs ? ../stdenv-updates-svn }:
|
||||||
|
|
||||||
let
|
let
|
||||||
|
|
||||||
@ -66,6 +66,7 @@ let
|
|||||||
description = "NixOS system tarball for ${system} - ${stdenv.platform.name}";
|
description = "NixOS system tarball for ${system} - ${stdenv.platform.name}";
|
||||||
maintainers = map (x: lib.getAttr x lib.maintainers) maintainers;
|
maintainers = map (x: lib.getAttr x lib.maintainers) maintainers;
|
||||||
};
|
};
|
||||||
|
inherit config;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user