diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2014-03-29 19:44:30 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2014-03-29 19:44:30 +0100 |
| commit | 22c04a2fe121edfdc7950fea293c0ed2eea769e7 (patch) | |
| tree | 527a0cd2ee07bc501ec700afd1ee02fc9c5cad2d /pkgs/servers/shishi | |
| parent | a7980953d218a31566ebd5e9fe83545c9689d639 (diff) | |
| download | nixpkgs-22c04a2fe121edfdc7950fea293c0ed2eea769e7.tar nixpkgs-22c04a2fe121edfdc7950fea293c0ed2eea769e7.tar.gz nixpkgs-22c04a2fe121edfdc7950fea293c0ed2eea769e7.tar.bz2 nixpkgs-22c04a2fe121edfdc7950fea293c0ed2eea769e7.tar.lz nixpkgs-22c04a2fe121edfdc7950fea293c0ed2eea769e7.tar.xz nixpkgs-22c04a2fe121edfdc7950fea293c0ed2eea769e7.tar.zst nixpkgs-22c04a2fe121edfdc7950fea293c0ed2eea769e7.zip | |
shishi: minor update to fix build with new libtasn1
Diffstat (limited to 'pkgs/servers/shishi')
| -rw-r--r-- | pkgs/servers/shishi/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/servers/shishi/no-gets.patch | 20 |
2 files changed, 2 insertions, 24 deletions
diff --git a/pkgs/servers/shishi/default.nix b/pkgs/servers/shishi/default.nix index a5d31ca354d..2e0a4e84f6c 100644 --- a/pkgs/servers/shishi/default.nix +++ b/pkgs/servers/shishi/default.nix @@ -1,15 +1,13 @@ { fetchurl, stdenv, libtasn1, libgcrypt, gnutls }: stdenv.mkDerivation rec { - name = "shishi-1.0.1"; + name = "shishi-1.0.2"; src = fetchurl { url = "mirror://gnu/shishi/${name}.tar.gz"; - sha256 = "13c6w9rpaqb3am65nrn86byvmll5r78pld2vb0i68491vww4fzlx"; + sha256 = "032qf72cpjdfffq1yq54gz3ahgqf2ijca4vl31sfabmjzq9q370d"; }; - patches = [ ./no-gets.patch ]; - buildInputs = [ libtasn1 libgcrypt gnutls ] ; NIX_CFLAGS_COMPILE diff --git a/pkgs/servers/shishi/no-gets.patch b/pkgs/servers/shishi/no-gets.patch deleted file mode 100644 index 12137204f45..00000000000 --- a/pkgs/servers/shishi/no-gets.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/gl/stdio.in.h b/gl/stdio.in.h -index 06d9780..fa04a10 100644 ---- a/gl/stdio.in.h -+++ b/gl/stdio.in.h -@@ -713,10 +713,13 @@ _GL_CXXALIAS_SYS (gets, char *, (char *s)); - # endif - _GL_CXXALIASWARN (gets); - /* It is very rare that the developer ever has full control of stdin, -- so any use of gets warrants an unconditional warning. Assume it is -- always declared, since it is required by C89. */ -+ so any use of gets warrants an unconditional warning; besides C11 -+ removed it. */ -+#ifdef gets -+#undef gets - _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead"); - #endif -+#endif - - - #if @GNULIB_OBSTACK_PRINTF@ || @GNULIB_OBSTACK_PRINTF_POSIX@ |