summary refs log tree commit diff
path: root/pkgs/development/libraries/gnutls/default.nix
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2012-08-10 17:17:32 +0200
committerLudovic Courtès <ludo@gnu.org>2012-08-10 17:17:32 +0200
commita9764e7599d2be6f0355eea8c1084453d0ddd708 (patch)
treed8c4266e0715a20f749dc7d4205d9ad41cb4846d /pkgs/development/libraries/gnutls/default.nix
parentc88f2ecbcdddc2ba360dc63409ae44ee7fb51f81 (diff)
downloadnixpkgs-a9764e7599d2be6f0355eea8c1084453d0ddd708.tar
nixpkgs-a9764e7599d2be6f0355eea8c1084453d0ddd708.tar.gz
nixpkgs-a9764e7599d2be6f0355eea8c1084453d0ddd708.tar.bz2
nixpkgs-a9764e7599d2be6f0355eea8c1084453d0ddd708.tar.lz
nixpkgs-a9764e7599d2be6f0355eea8c1084453d0ddd708.tar.xz
nixpkgs-a9764e7599d2be6f0355eea8c1084453d0ddd708.tar.zst
nixpkgs-a9764e7599d2be6f0355eea8c1084453d0ddd708.zip
gnutls: update to 3.0.22
Diffstat (limited to 'pkgs/development/libraries/gnutls/default.nix')
-rw-r--r--pkgs/development/libraries/gnutls/default.nix14
1 files changed, 4 insertions, 10 deletions
diff --git a/pkgs/development/libraries/gnutls/default.nix b/pkgs/development/libraries/gnutls/default.nix
index 4bd0dfdc529..06dc0c40b34 100644
--- a/pkgs/development/libraries/gnutls/default.nix
+++ b/pkgs/development/libraries/gnutls/default.nix
@@ -1,15 +1,15 @@
 { fetchurl, stdenv, zlib, lzo, libtasn1, nettle
-, guileBindings, guile, perl, psmisc }:
+, guileBindings, guile, perl }:
 
 assert guileBindings -> guile != null;
 
 stdenv.mkDerivation rec {
 
-  name = "gnutls-3.0.18";
+  name = "gnutls-3.0.22";
 
   src = fetchurl {
     url = "mirror://gnu/gnutls/${name}.tar.xz";
-    sha256 = "1ynqnj1j6rrzplk2i64dik34829r0y7lwk4qlvjx993q3mj7z863";
+    sha256 = "1pp90fm27qi5cd0pq18xcmnl79xcbfwxc54bg1xi1wv0vryqdpcr";
   };
 
   configurePhase = ''
@@ -29,13 +29,7 @@ stdenv.mkDerivation rec {
 
   propagatedBuildInputs = [ nettle libtasn1 ];
 
-  # XXX: Disable tests on non-Linux because of the `mini-loss-time' hack
-  # below, which is Linux-specific.
-  doCheck = stdenv.isLinux;
-
-  postCheck =
-    # Kill a process that's left behind.
-    stdenv.lib.optionalString doCheck "${psmisc}/bin/killall mini-loss-time";
+  doCheck = true;
 
   meta = {
     description = "The GNU Transport Layer Security Library";