From 3919afbc628c6ab5e8805d839146c2edc24331e5 Mon Sep 17 00:00:00 2001 From: Rahul Gopinath Date: Mon, 4 Jul 2016 17:51:28 -0700 Subject: [PATCH 1/2] gnurl: 7.35 -> 7.48 --- pkgs/development/libraries/libgnurl/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/libgnurl/default.nix b/pkgs/development/libraries/libgnurl/default.nix index f055b4f5a953..f35447ff38c3 100644 --- a/pkgs/development/libraries/libgnurl/default.nix +++ b/pkgs/development/libraries/libgnurl/default.nix @@ -1,15 +1,17 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, perl }: stdenv.mkDerivation rec { - version = "7.35.0"; + version = "7.48.0"; name = "libgnurl-${version}"; src = fetchurl { - url = "https://gnunet.org/sites/default/files/gnurl-${version}.tar.bz2"; - sha256 = "0dzj22f5z6ppjj1aq1bml64iwbzzcd8w1qy3bgpk6gnzqslsxknf"; + url = "https://gnunet.org/sites/default/files/gnurl-7_48_0.tar.bz2"; + sha256 = "14gch4rdibrc8qs4mijsczxvl45dsclf234g17dk6c8nc2s4bm0a"; }; + buildInputs = [ perl ]; + preConfigure = '' sed -e 's|/usr/bin|/no-such-path|g' -i.bak configure ''; @@ -17,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A fork of libcurl used by GNUnet"; homepage = https://gnunet.org/gnurl; - maintainers = with maintainers; [ falsifian ]; + maintainers = with maintainers; [ falsifian vrthra ]; hydraPlatforms = platforms.linux; }; } From 01d9081cc348228659410aadb6052df53d10902e Mon Sep 17 00:00:00 2001 From: Rahul Gopinath Date: Mon, 4 Jul 2016 19:29:58 -0700 Subject: [PATCH 2/2] gnurl: enable additional functionalities --- pkgs/development/libraries/libgnurl/default.nix | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libgnurl/default.nix b/pkgs/development/libraries/libgnurl/default.nix index f35447ff38c3..943f276ed78d 100644 --- a/pkgs/development/libraries/libgnurl/default.nix +++ b/pkgs/development/libraries/libgnurl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl }: +{ stdenv, fetchurl, perl, zlib, gnutls, gss, openssl, libssh2, libidn, libpsl, openldap }: stdenv.mkDerivation rec { version = "7.48.0"; @@ -10,12 +10,22 @@ stdenv.mkDerivation rec { sha256 = "14gch4rdibrc8qs4mijsczxvl45dsclf234g17dk6c8nc2s4bm0a"; }; - buildInputs = [ perl ]; + buildInputs = [ perl gnutls gss openssl zlib libidn libssh2 libpsl openldap ]; preConfigure = '' sed -e 's|/usr/bin|/no-such-path|g' -i.bak configure ''; + configureFlags = [ + "--with-zlib" + "--with-gssapi" + "--with-libssh2" + "--with-libidn" + "--with-libpsl" + "--enable-ldap" + "--enable-ldaps" + ]; + meta = with stdenv.lib; { description = "A fork of libcurl used by GNUnet"; homepage = https://gnunet.org/gnurl;