Author: ludo
Date: Mon Apr  9 20:51:54 2012
New Revision: 33709
URL: https://nixos.org/websvn/nix/?rev=33709&sc=1

Log:
GNU Shishi 1.0.1.

Modified:
   nixpkgs/trunk/pkgs/servers/shishi/default.nix
   nixpkgs/trunk/pkgs/top-level/all-packages.nix

Modified: nixpkgs/trunk/pkgs/servers/shishi/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/servers/shishi/default.nix       Mon Apr  9 20:51:50 
2012        (r33708)
+++ nixpkgs/trunk/pkgs/servers/shishi/default.nix       Mon Apr  9 20:51:54 
2012        (r33709)
@@ -1,11 +1,11 @@
 { fetchurl, stdenv, libtasn1, libgcrypt, gnutls }:
 
 stdenv.mkDerivation rec {
-  name = "shishi-1.0.0";
+  name = "shishi-1.0.1";
 
   src = fetchurl {
     url = "mirror://gnu/shishi/${name}.tar.gz";
-    sha256 = "1j8jbfsdpwqqfv7938gy4b6kvdai3l2nk8267sv18rbp95k9j7ig";
+    sha256 = "13c6w9rpaqb3am65nrn86byvmll5r78pld2vb0i68491vww4fzlx";
   };
 
   buildInputs = [ libtasn1 libgcrypt gnutls ] ;

Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix       Mon Apr  9 20:51:50 
2012        (r33708)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix       Mon Apr  9 20:51:54 
2012        (r33709)
@@ -5276,10 +5276,7 @@
     openldap = null;
   };
 
-  shishi = callPackage ../servers/shishi {
-    # GNU Shishi 1.0.0 fails to build with GnuTLS 3.x.
-    gnutls = gnutls2;
-  };
+  shishi = callPackage ../servers/shishi { };
 
   sipwitch = callPackage ../servers/sip/sipwitch { };
 
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits

Reply via email to