cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #299075 from wegank/gnunet-bump

Browse source 
gnunet: 0.20.0 -> 0.21.1
This commit is contained in:
Weijia Wang 2024-04-13 21:12:59 +02:00 committed by GitHub
commit e87abac607
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 21 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
pkgs/applications/networking/p2p/gnunet/default.nix
View file

@ -7,11 +7,11 @@
stdenv.mkDerivation rec {
pname = "gnunet";
version = "0.20.0";
version = "0.21.1";
src = fetchurl {
url = "mirror://gnu/gnunet/${pname}-${version}.tar.gz";
sha256 = "sha256-VgKeeKmcBNUrE1gJSuUHTkzY6puYz2hV9XrZryeslRg=";
url = "mirror://gnu/gnunet/gnunet-${version}.tar.gz";
hash = "sha256-k+aLPqynCHJz49doX+auOLLoBV5MnnANNg3UBVJJeFw=";
};
enableParallelBuilding = true;
@ -34,10 +34,6 @@ stdenv.mkDerivation rec {
# builds.
find . \( -iname \*test\*.c -or -name \*.conf \) | \
xargs sed -ie "s|/tmp|$TMPDIR|g"
sed -ie 's|@LDFLAGS@|@LDFLAGS@ $(Z_LIBS)|g' \
src/regex/Makefile.in \
src/fs/Makefile.in
'';
# unfortunately, there's still a few failures with impure tests

6
pkgs/applications/networking/p2p/gnunet/gtk.nix
View file

@ -13,11 +13,11 @@
stdenv.mkDerivation rec {
pname = "gnunet-gtk";
version = "0.20.0";
version = "0.21.0";
src = fetchurl {
url = "mirror://gnu/gnunet/${pname}-${version}.tar.gz";
sha256 = "sha256-6ZHlDIKrTmr/aRz4k5FtRVxZ7B9Hlh2w42QT4YRsVi0=";
url = "mirror://gnu/gnunet/gnunet-gtk-${version}.tar.gz";
hash = "sha256-vQFtKFI57YG64WpKVngx1kq687hI+f1kpP9ooK53/aw=";
};
nativeBuildInputs= [

24
pkgs/applications/networking/taler/default.nix
View file

@ -1,15 +1,15 @@
{ lib, stdenv, fetchgit, curl, gnunet, jansson, libgcrypt, libmicrohttpd
, qrencode, libsodium, libtool, libunistring, pkg-config, postgresql
, autoreconfHook, python39, recutils, wget, jq, gettext, texinfo
, autoreconfHook, python3, recutils, wget, jq, gettext, texinfo
}:
let
version = "0.9.3";
version = "0.10.1";
taler-wallet-core = fetchgit {
url = "https://git.taler.net/wallet-core.git";
rev = "v${version}";
sha256 = "sha256-oL8vi8gxPjKxRpioMs0GLvkzlTkrm1kyvhsXOgrtvVQ=";
hash = "sha256-sgiJd1snN9JDqS7IUeORKL60Gcm7XwL/JCX3sNRDTdY=";
};
taler-exchange = stdenv.mkDerivation {
@ -20,7 +20,7 @@ let
url = "https://git.taler.net/exchange.git";
rev = "v${version}";
fetchSubmodules = true;
sha256 = "sha256-NgDZF6LNeJI4ZuXEwoRdFG6g0S9xNTVhszzlfAnzVOs=";
hash = "sha256-SKnMep8bMQaJt4r3u0SrzwYSuFbzv4RnflbutSqwtPg=";
# When fetching submodules without the .git folder we get the following error:
# "Server does not allow request for unadvertised object"
@ -45,14 +45,20 @@ let
gettext
texinfo # Fix 'makeinfo' is missing on your system.
libunistring
python39.pkgs.jinja2
python3.pkgs.jinja2
# jq is necessary for some tests and is checked by configure script
jq
];
propagatedBuildInputs = [ gnunet ];
preConfigure = ''
# From ./bootstrap
preAutoreconf = ''
./contrib/gana-generate.sh
pushd contrib
find wallet-core/aml-backoffice/ -type f -printf ' %p \\\n' | sort > Makefile.am.ext
truncate -s -2 Makefile.am.ext
cat Makefile.am.in Makefile.am.ext >> Makefile.am
popd
'';
enableParallelBuilding = true;
@ -87,7 +93,7 @@ let
url = "https://git.taler.net/merchant.git";
rev = "v${version}";
fetchSubmodules = true;
sha256 = "sha256-HewCqyO/7nnIQY9Tgva0k1nTk2LuwLyGK/UUxvx9BG0=";
hash = "sha256-8VpoyloLpd/HckSIRU6IclWUXQyEHqlcNdoJI9U3t0Y=";
};
postUnpack = ''
ln -s ${taler-wallet-core}/spa.html $sourceRoot/contrib/
@ -104,11 +110,11 @@ let
# From ./bootstrap
preAutoreconf = ''
cd contrib
pushd contrib
find wallet-core/backoffice/ -type f -printf ' %p \\\n' | sort > Makefile.am.ext
truncate -s -2 Makefile.am.ext
cat Makefile.am.in Makefile.am.ext >> Makefile.am
cd ..
popd
'';
configureFlags = [
"--with-gnunet=${gnunet}"