diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2024-04-14 00:05:19 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-04-14 00:05:19 +0000 |
commit | 598389768a4d172a910f34e65b3f1df812bf98f1 (patch) | |
tree | 7ee5128afc186942e4a23c41ef1160179476cad8 /pkgs/applications/networking | |
parent | 3b46a82c2db28a894b161d5f36fe9b92b5484dc5 (diff) | |
parent | 1b691969594504eabec53a11a366acf1c75387d1 (diff) |
Merge master into staging-next
Diffstat (limited to 'pkgs/applications/networking')
6 files changed, 33 insertions, 31 deletions
diff --git a/pkgs/applications/networking/cluster/bosh-cli/default.nix b/pkgs/applications/networking/cluster/bosh-cli/default.nix index 0daf7ae97ba12..cbd2512acba59 100644 --- a/pkgs/applications/networking/cluster/bosh-cli/default.nix +++ b/pkgs/applications/networking/cluster/bosh-cli/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "bosh-cli"; - version = "7.5.5"; + version = "7.5.6"; src = fetchFromGitHub { owner = "cloudfoundry"; repo = pname; rev = "v${version}"; - sha256 = "sha256-LjqMCkEIl+0psxIys/tvJPkEQqDRzLOsaFUfAVG+RrE="; + sha256 = "sha256-aw1iS7iAs8Xj7K7gTRp1bvq4po3Aq8zakm7FLKC0DEY="; }; vendorHash = null; diff --git a/pkgs/applications/networking/instant-messengers/signal-cli/default.nix b/pkgs/applications/networking/instant-messengers/signal-cli/default.nix index 2f62a08f46256..792b51ef47158 100644 --- a/pkgs/applications/networking/instant-messengers/signal-cli/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-cli/default.nix @@ -1,13 +1,13 @@ -{ stdenv, lib, fetchurl, makeWrapper, openjdk17_headless, libmatthew_java, dbus, dbus_java }: +{ stdenv, lib, fetchurl, makeWrapper, openjdk21_headless, libmatthew_java, dbus, dbus_java }: stdenv.mkDerivation rec { pname = "signal-cli"; - version = "0.12.8"; + version = "0.13.2"; # Building from source would be preferred, but is much more involved. src = fetchurl { url = "https://github.com/AsamK/signal-cli/releases/download/v${version}/signal-cli-${version}.tar.gz"; - hash = "sha256-jBz1D1Uz3z+QYj+zAOrbSIkZZeKWSwU3/pHI+sDjJHw="; + hash = "sha256-5+pIkRdcFWTNmsSN2tHSy6XMQfUpGSddGsdw5guWzjA="; }; buildInputs = lib.optionals stdenv.isLinux [ libmatthew_java dbus dbus_java ]; @@ -18,15 +18,15 @@ stdenv.mkDerivation rec { cp -r lib $out/lib cp bin/signal-cli $out/bin/signal-cli '' + (if stdenv.isLinux then '' - makeWrapper ${openjdk17_headless}/bin/java $out/bin/signal-cli \ - --set JAVA_HOME "${openjdk17_headless}" \ + makeWrapper ${openjdk21_headless}/bin/java $out/bin/signal-cli \ + --set JAVA_HOME "${openjdk21_headless}" \ --add-flags "-classpath '$out/lib/*:${libmatthew_java}/lib/jni'" \ --add-flags "-Djava.library.path=${libmatthew_java}/lib/jni:${dbus_java}/share/java/dbus:$out/lib" \ --add-flags "org.asamk.signal.Main" '' else '' wrapProgram $out/bin/signal-cli \ - --prefix PATH : ${lib.makeBinPath [ openjdk17_headless ]} \ - --set JAVA_HOME ${openjdk17_headless} + --prefix PATH : ${lib.makeBinPath [ openjdk21_headless ]} \ + --set JAVA_HOME ${openjdk21_headless} ''); # Execution in the macOS (10.13) sandbox fails with diff --git a/pkgs/applications/networking/iroh/default.nix b/pkgs/applications/networking/iroh/default.nix index ac525fd2fa11a..a436204999963 100644 --- a/pkgs/applications/networking/iroh/default.nix +++ b/pkgs/applications/networking/iroh/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "iroh"; - version = "0.11.0"; + version = "0.13.0"; src = fetchFromGitHub { owner = "n0-computer"; repo = pname; rev = "v${version}"; - hash = "sha256-b3XpKAV/K+69tQmjM1CGzoOTcaQHB6q3gpoSa/YFwak="; + hash = "sha256-lyDwvVPkHCHZtb/p5PixD31Rl9kXozHw/SxIH1MJPwo="; }; - cargoHash = "sha256-dnEEque40qi7vuUxY/UDZ5Kz8LTuz0GvYVjTxl8eMvI="; + cargoHash = "sha256-yCI6g/ZTC5JLxwICRDmH4TzUYQtj3PJXdhBD7JSGO1s="; buildInputs = lib.optionals stdenv.isDarwin ( with darwin.apple_sdk.frameworks; [ diff --git a/pkgs/applications/networking/p2p/gnunet/default.nix b/pkgs/applications/networking/p2p/gnunet/default.nix index 27476d3b48a78..3f5e2f7c58a23 100644 --- a/pkgs/applications/networking/p2p/gnunet/default.nix +++ b/pkgs/applications/networking/p2p/gnunet/default.nix @@ -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 diff --git a/pkgs/applications/networking/p2p/gnunet/gtk.nix b/pkgs/applications/networking/p2p/gnunet/gtk.nix index 94504f2b99563..640ffeef75880 100644 --- a/pkgs/applications/networking/p2p/gnunet/gtk.nix +++ b/pkgs/applications/networking/p2p/gnunet/gtk.nix @@ -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= [ diff --git a/pkgs/applications/networking/taler/default.nix b/pkgs/applications/networking/taler/default.nix index c1de12fb94275..babdff54f1856 100644 --- a/pkgs/applications/networking/taler/default.nix +++ b/pkgs/applications/networking/taler/default.nix @@ -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}" |