diff options
author | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-10-07 21:03:23 +0000 |
---|---|---|
committer | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-10-07 21:03:23 +0000 |
commit | 3c6e5ef88e4b8296e648794f00d1f119d5ee095b (patch) | |
tree | 0363c725f1f51097a52f4f550722b093722f5319 /release.nix | |
parent | c1e4586ed1a7f68fc2e0de0f0df9f8c84f463fd6 (diff) | |
download | nixpkgs-3c6e5ef88e4b8296e648794f00d1f119d5ee095b.tar nixpkgs-3c6e5ef88e4b8296e648794f00d1f119d5ee095b.tar.gz nixpkgs-3c6e5ef88e4b8296e648794f00d1f119d5ee095b.tar.bz2 nixpkgs-3c6e5ef88e4b8296e648794f00d1f119d5ee095b.tar.lz nixpkgs-3c6e5ef88e4b8296e648794f00d1f119d5ee095b.tar.xz nixpkgs-3c6e5ef88e4b8296e648794f00d1f119d5ee095b.tar.zst nixpkgs-3c6e5ef88e4b8296e648794f00d1f119d5ee095b.zip |
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
Diffstat (limited to 'release.nix')
-rw-r--r-- | release.nix | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/release.nix b/release.nix index dacbeab0cbe..8a48f46ad35 100644 --- a/release.nix +++ b/release.nix @@ -1,4 +1,4 @@ -{ nixpkgs ? ../nixpkgs }: +{ nixpkgs ? ../stdenv-updates-svn }: let @@ -66,6 +66,7 @@ let description = "NixOS system tarball for ${system} - ${stdenv.platform.name}"; maintainers = map (x: lib.getAttr x lib.maintainers) maintainers; }; + inherit config; }; |