diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2009-03-16 12:45:27 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2009-03-16 12:45:27 +0000 |
| commit | 3593b97d631d554cfec9a5eec8966fadb3192de8 (patch) | |
| tree | c1a1f0bbb9270c83c803f501e14ea451e8f9fc74 /pkgs/tools/package-management | |
| parent | d574d882ccade3b159b16e7ea2b8aeffd9d13bcd (diff) | |
| parent | 808f12e36961b15c9662bb6e890f9045cdab43ce (diff) | |
| download | nixlib-3593b97d631d554cfec9a5eec8966fadb3192de8.tar nixlib-3593b97d631d554cfec9a5eec8966fadb3192de8.tar.gz nixlib-3593b97d631d554cfec9a5eec8966fadb3192de8.tar.bz2 nixlib-3593b97d631d554cfec9a5eec8966fadb3192de8.tar.lz nixlib-3593b97d631d554cfec9a5eec8966fadb3192de8.tar.xz nixlib-3593b97d631d554cfec9a5eec8966fadb3192de8.tar.zst nixlib-3593b97d631d554cfec9a5eec8966fadb3192de8.zip | |
* Sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=14557
Diffstat (limited to 'pkgs/tools/package-management')
| -rw-r--r-- | pkgs/tools/package-management/dpkg/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/tools/package-management/nix/unstable.nix | 8 |
2 files changed, 8 insertions, 6 deletions
diff --git a/pkgs/tools/package-management/dpkg/default.nix b/pkgs/tools/package-management/dpkg/default.nix index 1e6a809a8e98..2d8adc1350a1 100644 --- a/pkgs/tools/package-management/dpkg/default.nix +++ b/pkgs/tools/package-management/dpkg/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, perl, zlib, bzip2}: stdenv.mkDerivation { - name = "dpkg-1.14.22"; + name = "dpkg-1.14.25"; src = fetchurl { - url = mirror://debian/pool/main/d/dpkg/dpkg_1.14.22.tar.gz; - sha256 = "10ak9p7ylmfc76hfjqhzyblh2cgc5g4s8ljbxzya1yszsvb59sgq"; + url = mirror://debian/pool/main/d/dpkg/dpkg_1.14.25.tar.gz; + sha256 = "1111r1ijyh149h7vby9vc8137hl9778ja3dln7ilkxhc1y1yjp2l"; }; configureFlags = "--without-dselect --with-admindir=/var/lib/dpkg"; diff --git a/pkgs/tools/package-management/nix/unstable.nix b/pkgs/tools/package-management/nix/unstable.nix index c613f2f63f9c..3ce33f6f6be0 100644 --- a/pkgs/tools/package-management/nix/unstable.nix +++ b/pkgs/tools/package-management/nix/unstable.nix @@ -5,11 +5,11 @@ }: stdenv.mkDerivation { - name = "nix-0.13pre13641"; + name = "nix-0.13pre14422"; src = fetchurl { - url = http://hydra.nixos.org/download/546/1/nix-0.13pre13641.tar.bz2; - sha256 = "83936327ed7cfa6e6a103764c3f43c780b2727ed804721200811ba999c31c7e1"; + url = http://hydra.nixos.org/build/2775/download/1/nix-0.13pre14422.tar.bz2; + sha256 = "29362caa3fece6eae9d06a14930bf04fba41801b79a0f43eefb2ecc719fab934"; }; buildInputs = [perl curl openssl]; @@ -23,6 +23,8 @@ stdenv.mkDerivation { doCheck = true; + passthru = { inherit aterm; }; + meta = { description = "The Nix Deployment System"; homepage = http://nixos.org/; |