diff --git a/pkgs/servers/shishi/default.nix b/pkgs/servers/shishi/default.nix index e9dfddb839de..b0ec3ee78b62 100644 --- a/pkgs/servers/shishi/default.nix +++ b/pkgs/servers/shishi/default.nix @@ -25,21 +25,15 @@ let in stdenv.mkDerivation rec { pname = "shishi"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { url = "mirror://gnu/shishi/shishi-${version}.tar.gz"; - sha256 = "032qf72cpjdfffq1yq54gz3ahgqf2ijca4vl31sfabmjzq9q370d"; + hash = "sha256-lXmP/RLdAaT4jgMR7gPKSibly05ekFmkDk/E2fKRfpI="; }; separateDebugInfo = true; - # Fixes support for gcrypt 1.6+ - patches = [ - ./gcrypt-fix.patch - ./freebsd-unistd.patch - ]; - nativeBuildInputs = [ pkg-config ]; buildInputs = [ libgcrypt diff --git a/pkgs/servers/shishi/freebsd-unistd.patch b/pkgs/servers/shishi/freebsd-unistd.patch deleted file mode 100644 index 9399e20205b9..000000000000 --- a/pkgs/servers/shishi/freebsd-unistd.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/gl/unistd.in.h b/gl/unistd.in.h -index 2ea9af4..ed58960 100644 ---- a/gl/unistd.in.h -+++ b/gl/unistd.in.h -@@ -116,6 +116,7 @@ - # include - #endif - -+#include "config.h" - _GL_INLINE_HEADER_BEGIN - #ifndef _GL_UNISTD_INLINE - # define _GL_UNISTD_INLINE _GL_INLINE diff --git a/pkgs/servers/shishi/gcrypt-fix.patch b/pkgs/servers/shishi/gcrypt-fix.patch deleted file mode 100644 index ccc37389401b..000000000000 --- a/pkgs/servers/shishi/gcrypt-fix.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff --git a/configure b/configure -index c9a442b..a596bfe 100755 ---- a/configure -+++ b/configure -@@ -24491,12 +24491,6 @@ else - /* end confdefs.h. */ - - #include --/* GCRY_MODULE_ID_USER was added in 1.4.4 and gc-libgcrypt.c -- will fail on startup if we don't have 1.4.4 or later, so -- test for it early. */ --#if !defined GCRY_MODULE_ID_USER --error too old libgcrypt --#endif - - int - main () -diff --git a/gl/m4/gc.m4 b/gl/m4/gc.m4 -index b352e33..4bab9f4 100644 ---- a/gl/m4/gc.m4 -+++ b/gl/m4/gc.m4 -@@ -12,12 +12,6 @@ AC_DEFUN([gl_GC], - if test "$libgcrypt" != no; then - AC_LIB_HAVE_LINKFLAGS([gcrypt], [gpg-error], [ - #include --/* GCRY_MODULE_ID_USER was added in 1.4.4 and gc-libgcrypt.c -- will fail on startup if we don't have 1.4.4 or later, so -- test for it early. */ --#if !defined GCRY_MODULE_ID_USER --error too old libgcrypt --#endif - ]) - fi - ])