diff options
| author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-01-26 15:27:03 +0000 |
|---|---|---|
| committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-01-26 15:27:03 +0000 |
| commit | 5b132f6e96a9794018ae1c085da482b381d1e039 (patch) | |
| tree | ff54ae514799540c093adcfeca0d501b75cde506 /pkgs/tools/package-management | |
| parent | f878980c8b78a639b3feabd1f8f9ed9f1b7c388c (diff) | |
| parent | d9de74edd67f7dc31f5297bc785712afb322dbdd (diff) | |
svn merge ^/nixpkgs/trunk
Conflicts: cups, all-packages.nix (gcc45_debug) svn path=/nixpkgs/branches/stdenv-updates/; revision=31863
Diffstat (limited to 'pkgs/tools/package-management')
| -rw-r--r-- | pkgs/tools/package-management/disnix/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/tools/package-management/disnix/disnixos/default.nix | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/tools/package-management/disnix/default.nix b/pkgs/tools/package-management/disnix/default.nix index 815ec864626af..13534b7dbd4bd 100644 --- a/pkgs/tools/package-management/disnix/default.nix +++ b/pkgs/tools/package-management/disnix/default.nix @@ -1,16 +1,16 @@ { stdenv, fetchurl, pkgconfig, dbus_glib, libxml2, libxslt, getopt, nixUnstable, gettext, libiconv }: stdenv.mkDerivation { - name = "disnix-0.3pre29816"; + name = "disnix-0.3pre30527"; src = fetchurl { - url = http://hydra.nixos.org/build/1453079/download/4/disnix-0.3pre29816.tar.gz; - sha256 = "13gi0zs0a8pvgmgh3h431ydran3qf3px5m3d6vddd9b225kbkgwz"; + url = http://hydra.nixos.org/build/1926928/download/4/disnix-0.3pre30527.tar.gz; + sha256 = "1mdcxyrz60nxcyn116i41nhh94r9hacvyilkjyjfiyf8d58pji1y"; }; buildInputs = [ pkgconfig dbus_glib libxml2 libxslt getopt nixUnstable ] ++ stdenv.lib.optional (!stdenv.isLinux) libiconv - ++ stdenv.lib.optional (!stdenv.isLinux) gettext; + ++ stdenv.lib.optional (!stdenv.isLinux) gettext; dontStrip = true; diff --git a/pkgs/tools/package-management/disnix/disnixos/default.nix b/pkgs/tools/package-management/disnix/disnixos/default.nix index 843304d967304..f9c9aa8c593eb 100644 --- a/pkgs/tools/package-management/disnix/disnixos/default.nix +++ b/pkgs/tools/package-management/disnix/disnixos/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, disnix, socat, pkgconfig }: stdenv.mkDerivation { - name = "disnixos-0.2pre29928"; + name = "disnixos-0.2pre31830"; src = fetchurl { - url = http://hydra.nixos.org/build/1464065/download/3/disnixos-0.2pre29928.tar.gz; - sha256 = "0l7kszbpi8lzq95khi45fbq71l5csf8kamds4va6bxsyfwxrx6sm"; + url = http://hydra.nixos.org/build/1934498/download/3/disnixos-0.2pre31830.tar.gz; + sha256 = "02f2b4lk1gr24rqs56az82b3h3mnqrk1m48bcj21x109g4vrlpmm"; }; buildInputs = [ socat pkgconfig disnix ]; |