git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #67520 from jonringer/bump-gnurl

gnurl: 7.64.0 -> 7.65.0

commitb222ee44f2bc636fa8561e127d73462ca4c69764 authorMarek Mahut <marek.mahut@gmail.com> dateTue 27 Aug 2019, 10:35 (7 years ago) parent992d662f92e0a9
2 files changed+37−28
pkgs/applications/networking/p2p/gnunet/default.nix+17−23 pkgs/development/libraries/libgnurl/default.nix+20−5
pkgs/applications/networking/p2p/gnunet/default.nix+17−23
@@ -1,20 +1,24 @@
11{ stdenv, fetchurl, adns, curl, gettext, gmp, gnutls, libextractor
22, libgcrypt, libgnurl, libidn, libmicrohttpd, libtool, libunistring
33, makeWrapper, ncurses, pkgconfig, libxml2, sqlite, zlib
4−, libpulseaudio, libopus, libogg }:
4+, libpulseaudio, libopus, libogg, jansson }:
55
66stdenv.mkDerivation rec {
7− name = "gnunet-0.11.0";
7+ pname = "gnunet";
8+ version = "0.11.6";
89
910 src = fetchurl {
10− url = "mirror://gnu/gnunet/${name}.tar.gz";
11− sha256 = "16kydkrjlf2vxflgls46bwaf9kjczf621p456q0qlphd7cy7lixp";
11+ url = "mirror://gnu/gnunet/${pname}-${version}.tar.gz";
12+ sha256 = "1gspr1lh885sb9r2anh7bi4zan3zjqx33lpyhq9hm2g0n5ip187q";
1213 };
1314
15+ enableParallelBuilding = true;
16+
17+ nativeBuildInputs = [ pkgconfig libtool makeWrapper ];
1418 buildInputs = [
15− adns curl gettext gmp gnutls libextractor libgcrypt libgnurl libidn
16− libmicrohttpd libtool libunistring libxml2 makeWrapper ncurses
17− pkgconfig sqlite zlib libpulseaudio libopus libogg
19+ adns curl gmp gnutls libextractor libgcrypt libgnurl libidn
20+ libmicrohttpd libunistring libxml2 ncurses gettext
21+ sqlite zlib libpulseaudio libopus libogg jansson
1822 ];
1923
2024 preConfigure = ''
@@ -29,26 +33,18 @@ stdenv.mkDerivation rec {
2933 find . \( -iname \*test\*.c -or -name \*.conf \) | \
3034 xargs sed -ie "s|/tmp|$TMPDIR|g"
3135
32− # Ensure NSS installation works fine
33− configureFlags="$configureFlags --with-nssdir=$out/lib"
34− patchShebangs src/gns/nss/install-nss-plugin.sh
35−
3636 sed -ie 's|@LDFLAGS@|@LDFLAGS@ $(Z_LIBS)|g' \
3737 src/regex/Makefile.in \
3838 src/fs/Makefile.in
3939 '';
4040
41+ # unfortunately, there's still a few failures with impure tests
4142 doCheck = false;
42−
43− /* FIXME: Tests must be run this way, but there are still a couple of
44− failures.
45−
46− postInstall =
47− '' export GNUNET_PREFIX="$out"
48− export PATH="$out/bin:$PATH"
49− make -k check
50− '';
51− */
43+ checkPhase = ''
44+ export GNUNET_PREFIX="$out"
45+ export PATH="$out/bin:$PATH"
46+ make -k check
47+ '';
5248
5349 meta = with stdenv.lib; {
5450 description = "GNU's decentralized anonymous and censorship-resistant P2P framework";
@@ -69,9 +65,7 @@ stdenv.mkDerivation rec {
6965 '';
7066
7167 homepage = https://gnunet.org/;
72−
7368 license = licenses.gpl2Plus;
74−
7569 maintainers = with maintainers; [ vrthra ];
7670 platforms = platforms.gnu ++ platforms.linux;
7771 };
pkgs/development/libraries/libgnurl/default.nix+20−5
@@ -2,23 +2,38 @@
22 libidn2, libunistring, nghttp2 }:
33
44stdenv.mkDerivation rec {
5− version = "7.64.0";
6−
7− name = "libgnurl-${version}";
5+ pname = "libgnurl";
6+ version = "7.65.3";
87
98 src = fetchurl {
109 url = "mirror://gnu/gnunet/gnurl-${version}.tar.gz";
11− sha256 = "0pvmbi32lixcpk10prplmwrmi4wzp3bc1aiyhr552kx0wqdqmdk8";
10+ sha256 = "19l7jw3x83qk7yay5968pc39vzvxl55mhn1nmjh51miyda405qa9";
1211 };
1312
1413 nativeBuildInputs = [ libtool groff perl pkgconfig python2 ];
15−
14+
1615 buildInputs = [ gnutls zlib libidn2 libunistring nghttp2 ];
1716
1817 configureFlags = [
1918 "--disable-ntlm-wb"
2019 "--without-ca-bundle"
2120 "--with-ca-fallback"
21+ # below options will cause errors if enabled
22+ "--disable-ftp"
23+ "--disable-tftp"
24+ "--disable-file"
25+ "--disable-ldap"
26+ "--disable-dict"
27+ "--disable-rtsp"
28+ "--disable-telnet"
29+ "--disable-pop3"
30+ "--disable-imap"
31+ "--disable-smb"
32+ "--disable-smtp"
33+ "--disable-gopher"
34+ "--without-ssl" # disables only openssl, not ssl in general
35+ "--without-libpsl"
36+ "--without-librtmp"
2237 ];
2338
2439 meta = with stdenv.lib; {