From 1e13bf5b12d39f47cc8f8012e82ec70771af7ce6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Mon, 9 Apr 2012 20:51:54 +0000
Subject: [PATCH] GNU Shishi 1.0.1.

svn path=/nixpkgs/trunk/; revision=33709
---
 pkgs/servers/shishi/default.nix | 4 ++--
 pkgs/top-level/all-packages.nix | 5 +----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/pkgs/servers/shishi/default.nix b/pkgs/servers/shishi/default.nix
index 60733275509..6779ac9e0c3 100644
--- a/pkgs/servers/shishi/default.nix
+++ b/pkgs/servers/shishi/default.nix
@@ -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 ] ;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f8f780c35eb..919b2f19642 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5276,10 +5276,7 @@ let
     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 { };