From 0abc8ab42fbed14131dc0d1da43411a69838792f Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Sun, 17 Apr 2022 00:26:38 +0000 Subject: [PATCH 01/19] docker-credential-gcr: 2.0.5 -> 2.1.2 --- .../admin/docker-credential-gcr/default.nix | 27 ++++++++++++++----- 1 file changed, 21 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/admin/docker-credential-gcr/default.nix b/pkgs/tools/admin/docker-credential-gcr/default.nix index ee2efb206af..c13c62c62cd 100644 --- a/pkgs/tools/admin/docker-credential-gcr/default.nix +++ b/pkgs/tools/admin/docker-credential-gcr/default.nix @@ -1,16 +1,31 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub, testers, docker-credential-gcr }: -buildGoPackage rec { +buildGoModule rec { pname = "docker-credential-gcr"; - version = "2.0.5"; - - goPackagePath = "github.com/GoogleCloudPlatform/docker-credential-gcr"; + version = "2.1.2"; src = fetchFromGitHub { owner = "GoogleCloudPlatform"; repo = "docker-credential-gcr"; rev = "v${version}"; - sha256 = "sha256-WrcGTXy5SMWDHJWddXUuvUvEWjOsJcoB1zBg02p5ggY="; + sha256 = "sha256-gb9c8qTHQWUOlaXAKfpwm0Pwa/N4iu48jWIwPYXD00k="; + }; + + vendorSha256 = "sha256-e7XNTizZYp/tS7KRvB9KxY3Yurphnm6Ehz4dHZNReK8="; + + CGO_ENABLED = 0; + + ldflags = [ + "-s" + "-w" + "-X github.com/GoogleCloudPlatform/docker-credential-gcr/config.Version=${version}" + ]; + + checkFlags = [ "-short" ]; + + passthru.tests.version = testers.testVersion { + package = docker-credential-gcr; + command = "docker-credential-gcr version"; }; meta = with lib; { From 6a836ddfa1e388a5724f76e6320c2dbaa2277322 Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Sun, 15 May 2022 09:53:02 +0000 Subject: [PATCH 02/19] goreplay: 1.1.0 -> 1.3.3 --- pkgs/tools/networking/goreplay/default.nix | 23 ++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/pkgs/tools/networking/goreplay/default.nix b/pkgs/tools/networking/goreplay/default.nix index 14d0a16366b..dab5bee882c 100644 --- a/pkgs/tools/networking/goreplay/default.nix +++ b/pkgs/tools/networking/goreplay/default.nix @@ -1,21 +1,24 @@ -{ lib, buildGoPackage, fetchFromGitHub, libpcap }: +{ lib, buildGoModule, fetchFromGitHub, libpcap }: -buildGoPackage rec { +buildGoModule rec { pname = "goreplay"; - version = "1.1.0"; - rev = "v${version}"; - - goPackagePath = "github.com/buger/goreplay"; + version = "1.3.3"; src = fetchFromGitHub { - inherit rev; - owner = "buger"; - repo = "goreplay"; - sha256 = "07nsrx5hwmk6l8bqp48gqk40i9bxf0g4fbmpqbngx6j5f7lpbk2n"; + owner = "buger"; + repo = "goreplay"; + rev = version; + sha256 = "sha256-FiY9e5FgpPu+K8eoO8TsU3xSaSoPPDxYEu0oi/S8Q1w="; }; + vendorSha256 = "sha256-jDMAtcq3ZowFdky5BdTkVNxq4ltkhklr76nXYJgGALg="; + + ldflags = [ "-s" "-w" ]; + buildInputs = [ libpcap ]; + doCheck = false; + meta = { homepage = "https://github.com/buger/goreplay"; license = lib.licenses.lgpl3Only; From 032433e98586be0f8404d8d720d088c9d0bd785b Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 18 May 2022 04:20:00 +0000 Subject: [PATCH 03/19] yt-dlp: 2022.04.08 -> 2022.05.18 https://github.com/yt-dlp/yt-dlp/releases/tag/2022.05.18 --- pkgs/tools/misc/yt-dlp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/yt-dlp/default.nix b/pkgs/tools/misc/yt-dlp/default.nix index d67678f6ee5..51cf42fa6da 100644 --- a/pkgs/tools/misc/yt-dlp/default.nix +++ b/pkgs/tools/misc/yt-dlp/default.nix @@ -20,12 +20,12 @@ buildPythonPackage rec { # The websites yt-dlp deals with are a very moving target. That means that # downloads break constantly. Because of that, updates should always be backported # to the latest stable release. - version = "2022.04.08"; + version = "2022.05.18"; src = fetchPypi { inherit pname; version = builtins.replaceStrings [ ".0" ] [ "." ] version; - sha256 = "sha256-h1jQFlCdRXS5D73pdapwra73HtXnoZUUFYj21pRSBbo="; + sha256 = "sha256-OntZ0vtLOc6LqOC5xaN/4g5WJPRqI0a0rmarEyDjUTQ="; }; propagatedBuildInputs = [ brotli certifi mutagen pycryptodomex websockets ]; From 74fb021e95955ca3084d20de6eb977c23722553a Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 18 May 2022 04:20:00 +0000 Subject: [PATCH 04/19] yt-dlp: add marsam to maintainers --- pkgs/tools/misc/yt-dlp/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/yt-dlp/default.nix b/pkgs/tools/misc/yt-dlp/default.nix index 51cf42fa6da..0eab77c5ab6 100644 --- a/pkgs/tools/misc/yt-dlp/default.nix +++ b/pkgs/tools/misc/yt-dlp/default.nix @@ -67,6 +67,6 @@ buildPythonPackage rec { you can modify it, redistribute it or use it however you like. ''; license = licenses.unlicense; - maintainers = with maintainers; [ mkg20001 SuperSandro2000 ]; + maintainers = with maintainers; [ mkg20001 SuperSandro2000 marsam ]; }; } From 6517fa5378051030e1b8b925ee1f00153498ec9b Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 18 May 2022 04:20:00 +0000 Subject: [PATCH 05/19] aria2: fix completions install --- pkgs/tools/networking/aria2/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/networking/aria2/default.nix b/pkgs/tools/networking/aria2/default.nix index 8fabea35ba9..bb70c66b320 100644 --- a/pkgs/tools/networking/aria2/default.nix +++ b/pkgs/tools/networking/aria2/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchpatch, fetchFromGitHub, pkg-config, autoreconfHook +{ lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook , openssl, c-ares, libxml2, sqlite, zlib, libssh2 , cppunit, sphinx , Security @@ -26,6 +26,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-ca-bundle=/etc/ssl/certs/ca-certificates.crt" "--enable-libaria2" + "--with-bashcompletiondir=${placeholder "bin"}/share/bash-completion/completions" ]; prePatch = '' From c3427edcc820e13a088d6dd6403382da4d6c03dd Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 18 May 2022 04:20:00 +0000 Subject: [PATCH 06/19] vale: 2.16.0 -> 2.17.0 https://github.com/errata-ai/vale/releases/tag/v2.17.0 --- pkgs/tools/text/vale/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/text/vale/default.nix b/pkgs/tools/text/vale/default.nix index dac2cfc0d96..f53816c46f2 100644 --- a/pkgs/tools/text/vale/default.nix +++ b/pkgs/tools/text/vale/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "vale"; - version = "2.16.0"; + version = "2.17.0"; subPackages = [ "cmd/vale" ]; outputs = [ "out" "data" ]; @@ -11,10 +11,10 @@ buildGoModule rec { owner = "errata-ai"; repo = "vale"; rev = "v${version}"; - sha256 = "sha256-kqyktQxQX4/jBj6vBw1VXRzD5D3wfLwnfi+QKgEqN5A="; + sha256 = "sha256-PUaIx6rEaLz0HUxkglsVHw0Kx/ovI2f4Yhknuysr5Gs="; }; - vendorSha256 = "sha256-EFuzbSVIhsGUJ8a2YoQHOq7BQpOHV43r9VKynR8UZ7k="; + vendorSha256 = "sha256-zdgLWEArmtHTDM844LoSJwKp0UGoAR8bHnFOSlrrjdg="; postInstall = '' mkdir -p $data/share/vale From 20b513e1afc63cba60583db4315920cec814cad5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 18 May 2022 22:38:33 +0200 Subject: [PATCH 07/19] apkid: 2.1.1 -> 2.1.3 --- pkgs/development/tools/apkid/default.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/apkid/default.nix b/pkgs/development/tools/apkid/default.nix index 2cb1c4e8d00..71e1efa0524 100644 --- a/pkgs/development/tools/apkid/default.nix +++ b/pkgs/development/tools/apkid/default.nix @@ -5,13 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "apkid"; - version = "2.1.1"; + version = "2.1.3"; + format = "setuptools"; src = fetchFromGitHub { owner = "rednaga"; repo = "APKiD"; rev = "v${version}"; - sha256 = "1p6kdjjw2jhwr875445w43k46n6zwpz0l0phkl8d3y1v4gi5l6dx"; + hash = "sha256-U4CsPTA0fXCzj5iLTbLFGudAvewVCzxe4xl0osoBy5A="; }; propagatedBuildInputs = with python3.pkgs; [ @@ -28,12 +29,14 @@ python3.pkgs.buildPythonApplication rec { ''; postPatch = '' - # The next release will have support for later yara-python releases + # We have dex support enabled in yara-python substituteInPlace setup.py \ - --replace "yara-python==3.11.0" "yara-python" + --replace "yara-python-dex>=1.0.1" "yara-python" ''; - pythonImportsCheck = [ "apkid" ]; + pythonImportsCheck = [ + "apkid" + ]; meta = with lib; { description = "Android Application Identifier"; From dacec9c55699f509e54ad342ad75d9415db6d2b0 Mon Sep 17 00:00:00 2001 From: techknowlogick Date: Wed, 18 May 2022 19:50:20 -0400 Subject: [PATCH 08/19] goreleaser: 1.8.3 -> 1.9.0 --- pkgs/tools/misc/goreleaser/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/goreleaser/default.nix b/pkgs/tools/misc/goreleaser/default.nix index 412f2733304..9b9505c9beb 100644 --- a/pkgs/tools/misc/goreleaser/default.nix +++ b/pkgs/tools/misc/goreleaser/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "goreleaser"; - version = "1.8.3"; + version = "1.9.0"; src = fetchFromGitHub { owner = "goreleaser"; repo = pname; rev = "v${version}"; - sha256 = "sha256-EqUaJHlZupk8CP0ob8pL5tAW/bzG38eZmA4hgTg1jYY="; + sha256 = "sha256-R20mzPpbFDUw/wrif3ZJCt2wgmV+yqSkGaxyuw/9z0E="; }; - vendorSha256 = "sha256-UAApPni4zIAQVOmPAah5vEE8kTrGaJ3irjtsukBNVHo="; + vendorSha256 = "sha256-+Rj2hb9Sul5ntVGfuWf7JibKdG03zALiMWaaNTJFC8k="; ldflags = [ "-s" From cf4234201ca369c594cf62b587706bb177c35e1a Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Sun, 15 May 2022 03:52:48 +0000 Subject: [PATCH 09/19] temporal-cli: init at 1.16.1 --- .../cluster/temporal-cli/default.nix | 38 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++ 2 files changed, 42 insertions(+) create mode 100644 pkgs/applications/networking/cluster/temporal-cli/default.nix diff --git a/pkgs/applications/networking/cluster/temporal-cli/default.nix b/pkgs/applications/networking/cluster/temporal-cli/default.nix new file mode 100644 index 00000000000..49d64283ca0 --- /dev/null +++ b/pkgs/applications/networking/cluster/temporal-cli/default.nix @@ -0,0 +1,38 @@ +{ lib, fetchFromGitHub, fetchpatch, buildGoModule, testers, temporal-cli }: + +buildGoModule rec { + pname = "temporal-cli"; + version = "1.16.1"; + + src = fetchFromGitHub { + owner = "temporalio"; + repo = "tctl"; + rev = "v${version}"; + sha256 = "sha256-WNdu/62/VmxTmzAvzx3zIlcAAlEmpN0yKzQOSUtrL8s="; + }; + + patches = [ + # Fix tests + (fetchpatch { + name = "fix-tests.patch"; + url = "https://github.com/temporalio/tctl/pull/203/commits/2b113da137a3a925e8fbd7c18bdaaefc31397db4.patch"; + sha256 = "sha256-HFPwbmLZ2uPHzaHvYoB4MTZvMVyzvUKggA76/bh50DQ="; + }) + ]; + + vendorSha256 = "sha256-WF3T+HNisfR0JoKkHCC77kmHmsGZ9NfQ7UCwOmpCG/o="; + + ldflags = [ "-s" "-w" ]; + + passthru.tests.version = testers.testVersion { + package = temporal-cli; + }; + + meta = with lib; { + description = "Temporal CLI"; + homepage = "https://temporal.io"; + license = licenses.mit; + maintainers = with maintainers; [ aaronjheng ]; + mainProgram = "tctl"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0bd1d924d51..ad3a0a5b949 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -29916,6 +29916,10 @@ with pkgs; temporal = callPackage ../applications/networking/cluster/temporal { }; + temporal-cli = callPackage ../applications/networking/cluster/temporal-cli { + buildGoModule = buildGo118Module; + }; + tenacity = callPackage ../applications/audio/tenacity { wxGTK = wxGTK31-gtk3; }; tendermint = callPackage ../tools/networking/tendermint { }; From b0eb7ab1d0073e73a01d5f6fe840947e3cca60e0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 19 May 2022 02:47:16 +0000 Subject: [PATCH 10/19] python310Packages.pex: 2.1.88 -> 2.1.89 --- pkgs/development/python-modules/pex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pex/default.nix b/pkgs/development/python-modules/pex/default.nix index 214f5f8bf40..6fba5f820d9 100644 --- a/pkgs/development/python-modules/pex/default.nix +++ b/pkgs/development/python-modules/pex/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "pex"; - version = "2.1.88"; + version = "2.1.89"; format = "flit"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-lDUmudfs3Py4ytHsEvgnTiMvVQkom9X+uCeZHhTshjc="; + hash = "sha256-7/rJe/A6CbkminjFuL+8eIdj0kYzNMKynWX0umAMRAA="; }; nativeBuildInputs = [ From aefa8f6546fa3cea0af73d993fec091893a2fb08 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 18 May 2022 20:47:11 +0200 Subject: [PATCH 11/19] =?UTF-8?q?webkitgtk:=202.36.1=20=E2=86=92=202.36.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://webkitgtk.org/2022/05/18/webkitgtk2.36.2-released.html --- pkgs/development/libraries/webkitgtk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix index 2359625a4f7..8181e6982c6 100644 --- a/pkgs/development/libraries/webkitgtk/default.nix +++ b/pkgs/development/libraries/webkitgtk/default.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { pname = "webkitgtk"; - version = "2.36.1"; + version = "2.36.2"; outputs = [ "out" "dev" ]; @@ -73,7 +73,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://webkitgtk.org/releases/${pname}-${version}.tar.xz"; - sha256 = "sha256-AUnqX7HSDyqZgWd9RclSoEczAAHqJKjcKQNSOfEsDI8="; + sha256 = "/pO920oCwONvkm77boHSiv0oi4gk9sXPanXPQCKOAI4="; }; patches = lib.optionals stdenv.isLinux [ From 158386e5a3e648e0c950c51eb815859ec0250f92 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 19 May 2022 03:20:04 +0200 Subject: [PATCH 12/19] webkitgtk: re-enable WPE_RENDERER Build with WPE renderer is no longer tested upstream https://bugs.webkit.org/show_bug.cgi?id=238513#c10 and that configuration is extremely buggy since 2.36.0: https://github.com/NixOS/nixpkgs/issues/169201 Previously it was disabled in c0d053ea0ee2a1ff35f3251376fbca44e33a37c3. --- pkgs/development/libraries/webkitgtk/default.nix | 13 ++++++++++++- .../libraries/webkitgtk/fdo-backend-path.patch | 11 +++++++++++ 2 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/libraries/webkitgtk/fdo-backend-path.patch diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix index 8181e6982c6..d111ee8ed0b 100644 --- a/pkgs/development/libraries/webkitgtk/default.nix +++ b/pkgs/development/libraries/webkitgtk/default.nix @@ -19,6 +19,8 @@ , gtk3 , wayland , libwebp +, libwpe +, libwpe-fdo , enchant2 , xorg , libxkbcommon @@ -82,7 +84,15 @@ stdenv.mkDerivation rec { inherit (builtins) storeDir; inherit (addOpenGLRunpath) driverLink; }) + ./libglvnd-headers.patch + + # Hardcode path to WPE backend + # https://github.com/NixOS/nixpkgs/issues/110468 + (substituteAll { + src = ./fdo-backend-path.patch; + wpebackend_fdo = libwpe-fdo; + }) ]; preConfigure = lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' @@ -160,6 +170,8 @@ stdenv.mkDerivation rec { libseccomp libmanette wayland + libwpe + libwpe-fdo xdg-dbus-proxy ] ++ lib.optionals systemdSupport [ systemd @@ -180,7 +192,6 @@ stdenv.mkDerivation rec { "-DENABLE_INTROSPECTION=ON" "-DPORT=GTK" "-DUSE_LIBHYPHEN=OFF" - "-DUSE_WPE_RENDERER=OFF" "-DUSE_SOUP2=${cmakeBool (lib.versions.major libsoup.version == "2")}" "-DUSE_LIBSECRET=${cmakeBool withLibsecret}" ] ++ lib.optionals stdenv.isDarwin [ diff --git a/pkgs/development/libraries/webkitgtk/fdo-backend-path.patch b/pkgs/development/libraries/webkitgtk/fdo-backend-path.patch new file mode 100644 index 00000000000..9ddef67f1c1 --- /dev/null +++ b/pkgs/development/libraries/webkitgtk/fdo-backend-path.patch @@ -0,0 +1,11 @@ +--- a/Source/WebKit/UIProcess/glib/WebProcessPoolGLib.cpp ++++ b/Source/WebKit/UIProcess/glib/WebProcessPoolGLib.cpp +@@ -89,7 +89,7 @@ + #if PLATFORM(WAYLAND) + if (WebCore::PlatformDisplay::sharedDisplay().type() == WebCore::PlatformDisplay::Type::Wayland) { + #if USE(WPE_RENDERER) +- wpe_loader_init("libWPEBackend-fdo-1.0.so.1"); ++ wpe_loader_init("@wpebackend_fdo@/lib/libWPEBackend-fdo-1.0.so.1"); + if (AcceleratedBackingStoreWayland::checkRequirements()) { + parameters.hostClientFileDescriptor = IPC::Attachment(UnixFileDescriptor(wpe_renderer_host_create_client(), UnixFileDescriptor::Adopt)); + parameters.implementationLibraryName = FileSystem::fileSystemRepresentation(String::fromLatin1(wpe_loader_get_loaded_implementation_library_name())); From a0e8b9daf6d781a881ddfc1d580ce1f056d9a23e Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 19 May 2022 03:25:15 +0200 Subject: [PATCH 13/19] libwpe: inherit maintainers from webkitgtk --- pkgs/development/libraries/libwpe/default.nix | 6 ++++-- pkgs/development/libraries/libwpe/fdo.nix | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/libwpe/default.nix b/pkgs/development/libraries/libwpe/default.nix index 66de5847d78..18134f18d99 100644 --- a/pkgs/development/libraries/libwpe/default.nix +++ b/pkgs/development/libraries/libwpe/default.nix @@ -6,7 +6,9 @@ , libxkbcommon , libGL , ninja -, libX11 }: +, libX11 +, webkitgtk +}: stdenv.mkDerivation rec { pname = "libwpe"; @@ -33,7 +35,7 @@ stdenv.mkDerivation rec { description = "General-purpose library for WPE WebKit"; license = licenses.bsd2; homepage = "https://wpewebkit.org"; - maintainers = with maintainers; [ matthewbauer ]; + maintainers = webkitgtk.meta.maintainers ++ (with maintainers; [ matthewbauer ]); platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/libwpe/fdo.nix b/pkgs/development/libraries/libwpe/fdo.nix index a711fab6314..df6a57d2d7f 100644 --- a/pkgs/development/libraries/libwpe/fdo.nix +++ b/pkgs/development/libraries/libwpe/fdo.nix @@ -10,7 +10,9 @@ , libwpe , libxkbcommon , libGL -, libX11 }: +, libX11 +, webkitgtk + }: stdenv.mkDerivation rec { pname = "wpebackend-fdo"; @@ -46,7 +48,7 @@ stdenv.mkDerivation rec { description = "Freedesktop.org backend for WPE WebKit"; license = licenses.bsd2; homepage = "https://wpewebkit.org"; - maintainers = with maintainers; [ matthewbauer ]; + maintainers = webkitgtk.meta.maintainers ++ (with maintainers; [ matthewbauer ]); platforms = platforms.linux; }; } From 85bed48e820c8c7b011fe0363c7113ef4c74af39 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 26 Apr 2022 14:16:37 +0200 Subject: [PATCH 14/19] networkmanager_strongswan: Format the expression And use placeholders instead of Makefile variable interpolation. Also move environment variable near each other. --- .../networkmanager/strongswan/default.nix | 41 ++++++++++++++----- 1 file changed, 30 insertions(+), 11 deletions(-) diff --git a/pkgs/tools/networking/networkmanager/strongswan/default.nix b/pkgs/tools/networking/networkmanager/strongswan/default.nix index be0dcf234ff..cdeae80bb68 100644 --- a/pkgs/tools/networking/networkmanager/strongswan/default.nix +++ b/pkgs/tools/networking/networkmanager/strongswan/default.nix @@ -1,5 +1,15 @@ -{ lib, stdenv, fetchurl, intltool, pkg-config, networkmanager, strongswanNM -, gtk3, gnome, libsecret, libnma }: +{ stdenv +, lib +, fetchurl +, intltool +, pkg-config +, networkmanager +, strongswanNM +, gtk3 +, gnome +, libsecret +, libnma +}: stdenv.mkDerivation rec { pname = "NetworkManager-strongswan"; @@ -10,26 +20,35 @@ stdenv.mkDerivation rec { sha256 = "0sc1yzlxjfvl58hjjw99bchqc4061i3apw254z61v22k4sajnif8"; }; - buildInputs = [ networkmanager strongswanNM libsecret gtk3 libnma ]; - - nativeBuildInputs = [ intltool pkg-config ]; + nativeBuildInputs = [ + intltool + pkg-config + ]; - # glib-2.62 deprecations - NIX_CFLAGS_COMPILE = "-DGLIB_DISABLE_DEPRECATION_WARNINGS"; + buildInputs = [ + networkmanager + strongswanNM + libsecret + gtk3 + libnma + ]; configureFlags = [ "--without-libnm-glib" "--with-charon=${strongswanNM}/libexec/ipsec/charon-nm" - "--with-nm-libexecdir=$(out)/libexec" - "--with-nm-plugindir=$(out)/lib/NetworkManager" + "--with-nm-libexecdir=${placeholder "out"}/libexec" + "--with-nm-plugindir=${placeholder "out"}/lib/NetworkManager" ]; + PKG_CONFIG_LIBNM_VPNSERVICEDIR = "${placeholder "out"}/lib/NetworkManager/VPN"; + + # glib-2.62 deprecations + NIX_CFLAGS_COMPILE = "-DGLIB_DISABLE_DEPRECATION_WARNINGS"; + passthru = { networkManagerPlugin = "VPN/nm-strongswan-service.name"; }; - PKG_CONFIG_LIBNM_VPNSERVICEDIR = "$(out)/lib/NetworkManager/VPN"; - meta = with lib; { description = "NetworkManager's strongswan plugin"; inherit (networkmanager.meta) platforms; From df4846fb6113cee0d05ccb844a2e5961b2ee7b2f Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 26 Apr 2022 14:27:58 +0200 Subject: [PATCH 15/19] networkmanager_strongswan: Remove unnecessary cflag --- pkgs/tools/networking/networkmanager/strongswan/default.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/tools/networking/networkmanager/strongswan/default.nix b/pkgs/tools/networking/networkmanager/strongswan/default.nix index cdeae80bb68..3201169e87e 100644 --- a/pkgs/tools/networking/networkmanager/strongswan/default.nix +++ b/pkgs/tools/networking/networkmanager/strongswan/default.nix @@ -42,9 +42,6 @@ stdenv.mkDerivation rec { PKG_CONFIG_LIBNM_VPNSERVICEDIR = "${placeholder "out"}/lib/NetworkManager/VPN"; - # glib-2.62 deprecations - NIX_CFLAGS_COMPILE = "-DGLIB_DISABLE_DEPRECATION_WARNINGS"; - passthru = { networkManagerPlugin = "VPN/nm-strongswan-service.name"; }; From 8fae44de8fe6fd91f3db75c99958a57d529e27b1 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 26 Apr 2022 16:53:47 +0200 Subject: [PATCH 16/19] =?UTF-8?q?networkmanager=5Fstrongswan:=201.5.2=20?= =?UTF-8?q?=E2=86=92=201.6.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://github.com/strongswan/strongswan/blob/846201a686cc1bab1405b0ea23d360279f49c2c4/src/frontends/gnome/NEWS#L1-L5 --- .../networking/networkmanager/strongswan/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/networkmanager/strongswan/default.nix b/pkgs/tools/networking/networkmanager/strongswan/default.nix index 3201169e87e..e080ca17db1 100644 --- a/pkgs/tools/networking/networkmanager/strongswan/default.nix +++ b/pkgs/tools/networking/networkmanager/strongswan/default.nix @@ -6,18 +6,20 @@ , networkmanager , strongswanNM , gtk3 +, gtk4 , gnome , libsecret , libnma +, libnma-gtk4 }: stdenv.mkDerivation rec { pname = "NetworkManager-strongswan"; - version = "1.5.2"; + version = "1.6.0"; src = fetchurl { url = "https://download.strongswan.org/NetworkManager/${pname}-${version}.tar.bz2"; - sha256 = "0sc1yzlxjfvl58hjjw99bchqc4061i3apw254z61v22k4sajnif8"; + sha256 = "bbyA9qCboM9hBKMXhJWXgEFN13Fl4pY6zWZXwowlRMI="; }; nativeBuildInputs = [ @@ -30,14 +32,16 @@ stdenv.mkDerivation rec { strongswanNM libsecret gtk3 + gtk4 libnma + libnma-gtk4 ]; configureFlags = [ - "--without-libnm-glib" "--with-charon=${strongswanNM}/libexec/ipsec/charon-nm" "--with-nm-libexecdir=${placeholder "out"}/libexec" "--with-nm-plugindir=${placeholder "out"}/lib/NetworkManager" + "--with-gtk4" ]; PKG_CONFIG_LIBNM_VPNSERVICEDIR = "${placeholder "out"}/lib/NetworkManager/VPN"; From e764a614f870ab1a7b140a856e178081f33385dd Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 15 May 2022 10:13:47 +0200 Subject: [PATCH 17/19] networkmanager-l2tp: format the expression --- .../networkmanager/l2tp/default.nix | 48 +++++++++++++++---- 1 file changed, 38 insertions(+), 10 deletions(-) diff --git a/pkgs/tools/networking/networkmanager/l2tp/default.nix b/pkgs/tools/networking/networkmanager/l2tp/default.nix index 889f1565959..e08415f902e 100644 --- a/pkgs/tools/networking/networkmanager/l2tp/default.nix +++ b/pkgs/tools/networking/networkmanager/l2tp/default.nix @@ -1,7 +1,22 @@ -{ lib, stdenv, substituteAll, fetchFromGitHub, autoreconfHook, libtool, intltool, pkg-config +{ stdenv +, lib +, substituteAll +, fetchFromGitHub +, autoreconfHook +, libtool +, intltool +, pkg-config , file -, gtk3, networkmanager, ppp, xl2tpd, strongswan, libsecret -, withGnome ? true, libnma, glib }: +, gtk3 +, networkmanager +, ppp +, xl2tpd +, strongswan +, libsecret +, withGnome ? true +, libnma +, glib +}: stdenv.mkDerivation rec { name = "${pname}${if withGnome then "-gnome" else ""}-${version}"; @@ -22,14 +37,23 @@ stdenv.mkDerivation rec { }) ]; - buildInputs = [ networkmanager ppp glib ] - ++ lib.optionals withGnome [ gtk3 libsecret libnma ]; - - nativeBuildInputs = [ autoreconfHook libtool intltool pkg-config file ]; + nativeBuildInputs = [ + autoreconfHook + libtool + intltool + pkg-config + file + ]; - preConfigure = '' - intltoolize -f - ''; + buildInputs = [ + networkmanager + ppp + glib + ] ++ lib.optionals withGnome [ + gtk3 + libsecret + libnma + ]; configureFlags = [ "--without-libnm-glib" @@ -41,6 +65,10 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + preConfigure = '' + intltoolize -f + ''; + passthru = { networkManagerPlugin = "VPN/nm-l2tp-service.name"; }; From 34554f6a3bdedb398aec86b9579c3603922bbba3 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 15 May 2022 10:15:49 +0200 Subject: [PATCH 18/19] networkmanager-l2tp: correct license --- pkgs/tools/networking/networkmanager/l2tp/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/networking/networkmanager/l2tp/default.nix b/pkgs/tools/networking/networkmanager/l2tp/default.nix index e08415f902e..5c7a4e7804b 100644 --- a/pkgs/tools/networking/networkmanager/l2tp/default.nix +++ b/pkgs/tools/networking/networkmanager/l2tp/default.nix @@ -77,7 +77,7 @@ stdenv.mkDerivation rec { description = "L2TP plugin for NetworkManager"; inherit (networkmanager.meta) platforms; homepage = "https://github.com/nm-l2tp/network-manager-l2tp"; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = with maintainers; [ abbradar obadz ]; }; } From e8d262d4ce382d68bb76d7467fe055ca5fc31832 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 15 May 2022 10:14:33 +0200 Subject: [PATCH 19/19] =?UTF-8?q?networkmanager-l2tp:=201.2.12=20=E2=86=92?= =?UTF-8?q?=201.20.4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Adds support for GNOME 42. - Allows using go-l2tp instead of xl2tpd but we do not have the former packaged. - Removes some old cruft, allowing us to simplify the expression. https://github.com/nm-l2tp/NetworkManager-l2tp/blob/1.20.4/NEWS --- .../networkmanager/l2tp/default.nix | 25 ++++++------- .../networkmanager/l2tp/fix-paths.patch | 36 +++++++++---------- 2 files changed, 29 insertions(+), 32 deletions(-) diff --git a/pkgs/tools/networking/networkmanager/l2tp/default.nix b/pkgs/tools/networking/networkmanager/l2tp/default.nix index 5c7a4e7804b..11a414a8a6a 100644 --- a/pkgs/tools/networking/networkmanager/l2tp/default.nix +++ b/pkgs/tools/networking/networkmanager/l2tp/default.nix @@ -3,11 +3,9 @@ , substituteAll , fetchFromGitHub , autoreconfHook -, libtool -, intltool , pkg-config -, file , gtk3 +, gtk4 , networkmanager , ppp , xl2tpd @@ -15,19 +13,22 @@ , libsecret , withGnome ? true , libnma +, libnma-gtk4 , glib +, openssl +, nss }: stdenv.mkDerivation rec { name = "${pname}${if withGnome then "-gnome" else ""}-${version}"; pname = "NetworkManager-l2tp"; - version = "1.2.12"; + version = "1.20.4"; src = fetchFromGitHub { owner = "nm-l2tp"; repo = "network-manager-l2tp"; rev = version; - sha256 = "0cq07kvlm98s8a7l4a3zmqnif8x3307kv7n645zx3f1r7x72b8m4"; + sha256 = "VoqPjMQILBYemRE5VD/XwhWi9zL9QxxHZJ2JKtGglFo="; }; patches = [ @@ -39,36 +40,32 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook - libtool - intltool pkg-config - file ]; buildInputs = [ networkmanager ppp glib + openssl + nss ] ++ lib.optionals withGnome [ gtk3 + gtk4 libsecret libnma + libnma-gtk4 ]; configureFlags = [ - "--without-libnm-glib" "--with-gnome=${if withGnome then "yes" else "no"}" + "--with-gtk4=${if withGnome then "yes" else "no"}" "--localstatedir=/var" - "--sysconfdir=$(out)/etc" "--enable-absolute-paths" ]; enableParallelBuilding = true; - preConfigure = '' - intltoolize -f - ''; - passthru = { networkManagerPlugin = "VPN/nm-l2tp-service.name"; }; diff --git a/pkgs/tools/networking/networkmanager/l2tp/fix-paths.patch b/pkgs/tools/networking/networkmanager/l2tp/fix-paths.patch index 531672c3936..d9ee0dd4997 100644 --- a/pkgs/tools/networking/networkmanager/l2tp/fix-paths.patch +++ b/pkgs/tools/networking/networkmanager/l2tp/fix-paths.patch @@ -1,22 +1,22 @@ diff --git a/shared/utils.c b/shared/utils.c -index c978a1f..d2c36cd 100644 +index 453e277..28716a5 100644 --- a/shared/utils.c +++ b/shared/utils.c -@@ -52,7 +52,7 @@ nm_find_ipsec (void) +@@ -39,7 +39,7 @@ check_ipsec_daemon(const char *path) + const char * + nm_find_ipsec(void) { - static const char *ipsec_binary_paths[] = - { -- "/sbin/ipsec", -+ "@strongswan@/bin/ipsec", - "/usr/sbin/ipsec", - "/usr/local/sbin/ipsec", - "/sbin/strongswan", -@@ -77,7 +77,7 @@ nm_find_l2tpd (void) - { - static const char *l2tp_binary_paths[] = - { -- "/sbin/xl2tpd", -+ "@xl2tpd@/bin/xl2tpd", - "/usr/sbin/xl2tpd", - "/usr/local/sbin/xl2tpd", - NULL +- static const char *ipsec_binary_paths[] = {"/usr/bin/ipsec", ++ static const char *ipsec_binary_paths[] = {"@strongswan@/bin/ipsec", + "/sbin/ipsec", + "/usr/sbin/ipsec", + "/usr/local/sbin/ipsec", +@@ -70,7 +70,7 @@ nm_find_l2tpd(NML2tpL2tpDaemon *l2tp_daemon) + "/usr/local/sbin/kl2tpd", + NULL}; + +- static const char *xl2tp_binary_paths[] = {"/usr/bin/xl2tpd", ++ static const char *xl2tp_binary_paths[] = {"@xl2tpd@/bin/xl2tpd", + "/sbin/xl2tpd", + "/usr/sbin/xl2tpd", + "/usr/local/sbin/xl2tpd",