about summary refs log tree commit diff
path: root/pkgs/development/libraries
diff options
context:
space:
mode:
authorChristian Ulrich <post@rechenwerk.org>2018-10-23 22:33:17 +0200
committerxeji <36407913+xeji@users.noreply.github.com>2018-10-23 22:33:17 +0200
commit516681c8726018fecd0e31ae755cb9a9c01a75e5 (patch)
treedcd6c9eafacc28bc403c144cf0165b42006c42f8 /pkgs/development/libraries
parent3122976238e04e91e7fc547f9238dffcfad0c271 (diff)
downloadnixlib-516681c8726018fecd0e31ae755cb9a9c01a75e5.tar
nixlib-516681c8726018fecd0e31ae755cb9a9c01a75e5.tar.gz
nixlib-516681c8726018fecd0e31ae755cb9a9c01a75e5.tar.bz2
nixlib-516681c8726018fecd0e31ae755cb9a9c01a75e5.tar.lz
nixlib-516681c8726018fecd0e31ae755cb9a9c01a75e5.tar.xz
nixlib-516681c8726018fecd0e31ae755cb9a9c01a75e5.tar.zst
nixlib-516681c8726018fecd0e31ae755cb9a9c01a75e5.zip
libgnurl: 7.54.1 -> 7.61.1. (#48792)
* libgnurl: 7.54.1 -> 7.61.1.

- fetch url updated (the mirror on gnunet.org seems no longer
maintained).
- most configure flags are not needed anymore since version 7.56.1 as
announced in the README
- flags -- without-ca-bundle and --with-ca-fallback are needed for
finding the CA certificates
- dependencies updated (copied from the guix package)
- license corrected

* libgnurl: fix idn support; use mirror url; add http2 support
Diffstat (limited to 'pkgs/development/libraries')
-rw-r--r--pkgs/development/libraries/libgnurl/default.nix31
1 files changed, 12 insertions, 19 deletions
diff --git a/pkgs/development/libraries/libgnurl/default.nix b/pkgs/development/libraries/libgnurl/default.nix
index 752d2ce5a1e7..6938cfd8c51d 100644
--- a/pkgs/development/libraries/libgnurl/default.nix
+++ b/pkgs/development/libraries/libgnurl/default.nix
@@ -1,31 +1,24 @@
-{ stdenv, fetchurl, autoreconfHook, perl, zlib, gnutls, gss, openssl
-, libidn }:
+{ stdenv, fetchurl, libtool, groff, perl, pkgconfig, python2, zlib, gnutls,
+  libidn2, libunistring, nghttp2 }:
 
 stdenv.mkDerivation rec {
-  version = "7.54.1";
+  version = "7.61.1";
 
   name = "libgnurl-${version}";
 
   src = fetchurl {
-    url = "https://gnunet.org/sites/default/files/gnurl-${version}.tar.bz2";
-    sha256 = "0szbj352h95sgc9kbx9wzkgjksmg3g5k6cvlc7hz3wrbdh5gb0a4";
+    url = "mirror://gnu/gnunet/gnurl-${version}.tar.gz";
+    sha256 = "0y56k15vp3m2r8q6mnc6ivflwq9lv6npdhbbvxxcf4r8vwjhv91q";
   };
 
-  nativeBuildInputs = [ autoreconfHook ];
-  buildInputs = [ perl gnutls gss openssl zlib libidn ];
-
-  preConfigure = ''
-    sed -e 's|/usr/bin|/no-such-path|g' -i.bak configure
-  '';
+  nativeBuildInputs = [ libtool groff perl pkgconfig python2 ];
+    
+  buildInputs = [ gnutls zlib libidn2 libunistring nghttp2 ];
 
   configureFlags = [
-    "--enable-ipv6" "--with-gnutls" "--without-libmetalink" "--without-winidn"
-    "--without-librtmp" "--without-nghttp2" "--without-nss" "--without-cyassl"
-    "--without-polarssl" "--without-ssl" "--without-winssl"
-    "--without-darwinssl" "--disable-sspi" "--disable-ntlm-wb" "--disable-ldap"
-    "--disable-rtsp" "--disable-dict" "--disable-telnet" "--disable-tftp"
-    "--disable-pop3" "--disable-imap" "--disable-smtp" "--disable-gopher"
-    "--disable-file" "--disable-ftp" "--disable-smb"
+    "--disable-ntlm-wb"
+    "--without-ca-bundle"
+    "--with-ca-fallback"
   ];
 
   meta = with stdenv.lib; {
@@ -33,6 +26,6 @@ stdenv.mkDerivation rec {
     homepage    = https://gnunet.org/gnurl;
     maintainers = with maintainers; [ falsifian vrthra ];
     platforms = platforms.linux;
-    license = with licenses; [ bsdOriginal mit ];
+    license = licenses.curl;
   };
 }