diff options
author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-01-19 21:31:51 +0000 |
---|---|---|
committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-01-19 21:31:51 +0000 |
commit | 84c018503859be28aded86677c9dbc54c7067e11 (patch) | |
tree | 44896c72bb5eaddc3b9ebc5e4701f40560774ff0 /pkgs/development/libraries/gnutls/default.nix | |
parent | 3980444b2b918ef74ac7b9f1128f399767d06fa1 (diff) | |
parent | b94fef3cbad6b3b830f8f7c4a987c65c81c9e93d (diff) | |
download | nixpkgs-84c018503859be28aded86677c9dbc54c7067e11.tar nixpkgs-84c018503859be28aded86677c9dbc54c7067e11.tar.gz nixpkgs-84c018503859be28aded86677c9dbc54c7067e11.tar.bz2 nixpkgs-84c018503859be28aded86677c9dbc54c7067e11.tar.lz nixpkgs-84c018503859be28aded86677c9dbc54c7067e11.tar.xz nixpkgs-84c018503859be28aded86677c9dbc54c7067e11.tar.zst nixpkgs-84c018503859be28aded86677c9dbc54c7067e11.zip |
svn merge ^/nixpkgs/trunk, one simple conflict in jruby
svn path=/nixpkgs/branches/stdenv-updates/; revision=31721
Diffstat (limited to 'pkgs/development/libraries/gnutls/default.nix')
-rw-r--r-- | pkgs/development/libraries/gnutls/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/libraries/gnutls/default.nix b/pkgs/development/libraries/gnutls/default.nix index e998887f591..243b4b0191d 100644 --- a/pkgs/development/libraries/gnutls/default.nix +++ b/pkgs/development/libraries/gnutls/default.nix @@ -5,11 +5,11 @@ assert guileBindings -> guile != null; stdenv.mkDerivation rec { - name = "gnutls-3.0.8"; + name = "gnutls-3.0.11"; src = fetchurl { url = "mirror://gnu/gnutls/${name}.tar.xz"; - sha256 = "0qcp7jm8c2fyk5kdb4fgyrv9hb745mcf066vwmlb8dchx15ijkms"; + sha256 = "1l8k96hms7891zl43qjd7lngjh23kxdq22l6ahm1ham7fyhhrh9r"; }; configurePhase = '' |