public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #67520 from jonringer/bump-gnurl 

gnurl: 7.64.0 -> 7.65.0
This commit is contained in:
Marek Mahut 2019-08-27 10:35:29 +02:00 committed by GitHub
parent 992d662deb f92e0a962e
commit b222ee44f2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 37 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
pkgs/applications/networking/p2p/gnunet/default.nix
View File

@ -1,20 +1,24 @@
{ stdenv, fetchurl, adns, curl, gettext, gmp, gnutls, libextractor { stdenv, fetchurl, adns, curl, gettext, gmp, gnutls, libextractor
, libgcrypt, libgnurl, libidn, libmicrohttpd, libtool, libunistring , libgcrypt, libgnurl, libidn, libmicrohttpd, libtool, libunistring
, makeWrapper, ncurses, pkgconfig, libxml2, sqlite, zlib , makeWrapper, ncurses, pkgconfig, libxml2, sqlite, zlib
, libpulseaudio, libopus, libogg }: , libpulseaudio, libopus, libogg, jansson }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "gnunet-0.11.0"; pname = "gnunet";
version = "0.11.6";
src = fetchurl { src = fetchurl {
url = "mirror://gnu/gnunet/${name}.tar.gz"; url = "mirror://gnu/gnunet/${pname}-${version}.tar.gz";
sha256 = "16kydkrjlf2vxflgls46bwaf9kjczf621p456q0qlphd7cy7lixp"; sha256 = "1gspr1lh885sb9r2anh7bi4zan3zjqx33lpyhq9hm2g0n5ip187q";
}; };
enableParallelBuilding = true;
nativeBuildInputs = [ pkgconfig libtool makeWrapper ];
buildInputs = [ buildInputs = [
adns curl gettext gmp gnutls libextractor libgcrypt libgnurl libidn adns curl gmp gnutls libextractor libgcrypt libgnurl libidn
libmicrohttpd libtool libunistring libxml2 makeWrapper ncurses libmicrohttpd libunistring libxml2 ncurses gettext
pkgconfig sqlite zlib libpulseaudio libopus libogg sqlite zlib libpulseaudio libopus libogg jansson
]; ];
preConfigure = '' preConfigure = ''
@ -29,26 +33,18 @@ stdenv.mkDerivation rec {
find . \( -iname \*test\*.c -or -name \*.conf \) | \ find . \( -iname \*test\*.c -or -name \*.conf \) | \
xargs sed -ie "s|/tmp|$TMPDIR|g" xargs sed -ie "s|/tmp|$TMPDIR|g"
# Ensure NSS installation works fine
configureFlags="$configureFlags --with-nssdir=$out/lib"
patchShebangs src/gns/nss/install-nss-plugin.sh
sed -ie 's|@LDFLAGS@|@LDFLAGS@ $(Z_LIBS)|g' \ sed -ie 's|@LDFLAGS@|@LDFLAGS@ $(Z_LIBS)|g' \
src/regex/Makefile.in \ src/regex/Makefile.in \
src/fs/Makefile.in src/fs/Makefile.in
''; '';
# unfortunately, there's still a few failures with impure tests
doCheck = false; doCheck = false;
checkPhase = ''
/* FIXME: Tests must be run this way, but there are still a couple of export GNUNET_PREFIX="$out"
failures. export PATH="$out/bin:$PATH"
make -k check
postInstall = '';
'' export GNUNET_PREFIX="$out"
export PATH="$out/bin:$PATH"
make -k check
'';
*/
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "GNU's decentralized anonymous and censorship-resistant P2P framework"; description = "GNU's decentralized anonymous and censorship-resistant P2P framework";
@ -69,9 +65,7 @@ stdenv.mkDerivation rec {
''; '';
homepage = https://gnunet.org/; homepage = https://gnunet.org/;
license = licenses.gpl2Plus; license = licenses.gpl2Plus;
maintainers = with maintainers; [ vrthra ]; maintainers = with maintainers; [ vrthra ];
platforms = platforms.gnu ++ platforms.linux; platforms = platforms.gnu ++ platforms.linux;
}; };

25
pkgs/development/libraries/libgnurl/default.nix
View File

@ -2,23 +2,38 @@
libidn2, libunistring, nghttp2 }: libidn2, libunistring, nghttp2 }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "7.64.0"; pname = "libgnurl";
version = "7.65.3";
name = "libgnurl-${version}";
src = fetchurl { src = fetchurl {
url = "mirror://gnu/gnunet/gnurl-${version}.tar.gz"; url = "mirror://gnu/gnunet/gnurl-${version}.tar.gz";
sha256 = "0pvmbi32lixcpk10prplmwrmi4wzp3bc1aiyhr552kx0wqdqmdk8"; sha256 = "19l7jw3x83qk7yay5968pc39vzvxl55mhn1nmjh51miyda405qa9";
}; };
nativeBuildInputs = [ libtool groff perl pkgconfig python2 ]; nativeBuildInputs = [ libtool groff perl pkgconfig python2 ];
buildInputs = [ gnutls zlib libidn2 libunistring nghttp2 ]; buildInputs = [ gnutls zlib libidn2 libunistring nghttp2 ];
configureFlags = [ configureFlags = [
"--disable-ntlm-wb" "--disable-ntlm-wb"
"--without-ca-bundle" "--without-ca-bundle"
"--with-ca-fallback" "--with-ca-fallback"
# below options will cause errors if enabled
"--disable-ftp"
"--disable-tftp"
"--disable-file"
"--disable-ldap"
"--disable-dict"
"--disable-rtsp"
"--disable-telnet"
"--disable-pop3"
"--disable-imap"
"--disable-smb"
"--disable-smtp"
"--disable-gopher"
"--without-ssl" # disables only openssl, not ssl in general
"--without-libpsl"
"--without-librtmp"
]; ];
meta = with stdenv.lib; { meta = with stdenv.lib; {