diff options
author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-02-13 19:47:36 +0000 |
---|---|---|
committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-02-13 19:47:36 +0000 |
commit | f7886ac78be476514a390e3c1fd4cd95f0bcb522 (patch) | |
tree | 7cb4f7ab8e89a0917f89cfc941edf4fd76906594 /pkgs/tools/package-management/disnix | |
parent | fc21cca549d6051b9956d93be2e10e247b05fb02 (diff) | |
parent | 19dde94ddcd74eb683057ca8898e5550d7054f3b (diff) | |
download | nixlib-f7886ac78be476514a390e3c1fd4cd95f0bcb522.tar nixlib-f7886ac78be476514a390e3c1fd4cd95f0bcb522.tar.gz nixlib-f7886ac78be476514a390e3c1fd4cd95f0bcb522.tar.bz2 nixlib-f7886ac78be476514a390e3c1fd4cd95f0bcb522.tar.lz nixlib-f7886ac78be476514a390e3c1fd4cd95f0bcb522.tar.xz nixlib-f7886ac78be476514a390e3c1fd4cd95f0bcb522.tar.zst nixlib-f7886ac78be476514a390e3c1fd4cd95f0bcb522.zip |
svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=32265
Diffstat (limited to 'pkgs/tools/package-management/disnix')
-rw-r--r-- | pkgs/tools/package-management/disnix/activation-scripts/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/tools/package-management/disnix/activation-scripts/default.nix b/pkgs/tools/package-management/disnix/activation-scripts/default.nix index 8725f5d12508..23906fb3aff0 100644 --- a/pkgs/tools/package-management/disnix/activation-scripts/default.nix +++ b/pkgs/tools/package-management/disnix/activation-scripts/default.nix @@ -16,10 +16,10 @@ assert enableSubversionRepository -> subversion != null; assert enableEjabberdDump -> ejabberd != null; stdenv.mkDerivation { - name = "disnix-activation-scripts-0.3pre29887"; + name = "disnix-activation-scripts-0.3pre30423"; src = fetchurl { - url = http://hydra.nixos.org/build/1461490/download/1/disnix-activation-scripts-0.3pre29887.tar.gz; - sha256 = "034mx096iz9dqjsrxh6jkvcwch399gfsahrm6vfnswz9jfvfdcw0"; + url = http://hydra.nixos.org/build/1842091/download/1/disnix-activation-scripts-0.3pre30423.tar.gz; + sha256 = "11b569bflknjbjddam4mv07bpmihbfx5acxzxzhnshj6x8sv6064"; }; preConfigure = if enableEjabberdDump then "export PATH=$PATH:${ejabberd}/sbin" else ""; |