From cfcdc634df5924a5ac48fd12d41d300e6a0114a8 Mon Sep 17 00:00:00 2001 From: Kenichi Kamiya Date: Fri, 11 Apr 2025 13:55:39 +0900 Subject: [PATCH 1/4] wget2: update deprecated `substituteInPlace --replace` Remove the warning introduced in e07a2fab7f065c3fa084027f07dcf8cafbd19394 --- pkgs/by-name/wg/wget2/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/wg/wget2/package.nix b/pkgs/by-name/wg/wget2/package.nix index 07f3a999ee6c..de2845da6aa8 100644 --- a/pkgs/by-name/wg/wget2/package.nix +++ b/pkgs/by-name/wg/wget2/package.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { # wget2_noinstall contains forbidden reference to /build/ postPatch = '' substituteInPlace src/Makefile.am \ - --replace "bin_PROGRAMS = wget2 wget2_noinstall" "bin_PROGRAMS = wget2" + --replace-fail "bin_PROGRAMS = wget2 wget2_noinstall" "bin_PROGRAMS = wget2" ''; strictDeps = true; From 050ef976cbac7574e3620da78d2c7419ba04f41d Mon Sep 17 00:00:00 2001 From: Kenichi Kamiya Date: Fri, 11 Apr 2025 02:00:43 +0900 Subject: [PATCH 2/4] wget2: prefer tag rather than rev --- pkgs/by-name/wg/wget2/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/wg/wget2/package.nix b/pkgs/by-name/wg/wget2/package.nix index de2845da6aa8..f7886a0bf144 100644 --- a/pkgs/by-name/wg/wget2/package.nix +++ b/pkgs/by-name/wg/wget2/package.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { src = fetchFromGitLab { owner = "gnuwget"; repo = pname; - rev = "v${version}"; + tag = "v${version}"; hash = "sha256-+xw1nQMBs0m9RlunyrAYaSDPnLY1yRX8zt8hKOMXQT8="; }; From 82327f0a42c04d305bc54dabc060eb5d1a2ff315 Mon Sep 17 00:00:00 2001 From: Kenichi Kamiya Date: Fri, 11 Apr 2025 13:49:31 +0900 Subject: [PATCH 3/4] wget2: add versionCheckHook --- pkgs/by-name/wg/wget2/package.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/by-name/wg/wget2/package.nix b/pkgs/by-name/wg/wget2/package.nix index f7886a0bf144..c99b96b76424 100644 --- a/pkgs/by-name/wg/wget2/package.nix +++ b/pkgs/by-name/wg/wget2/package.nix @@ -24,6 +24,7 @@ xz, zlib, zstd, + versionCheckHook, }: stdenv.mkDerivation rec { @@ -97,6 +98,13 @@ stdenv.mkDerivation rec { (lib.withFeatureAs sslSupport "ssl" "openssl") ]; + nativeInstallCheckInputs = [ + versionCheckHook + ]; + doInstallCheck = true; + versionCheckProgram = "${placeholder "out"}/bin/${meta.mainProgram}"; + versionCheckProgramArg = "--version"; + meta = with lib; { description = "Successor of GNU Wget, a file and recursive website downloader"; longDescription = '' From 9e100b6593e2700a3079b2db2e0252cccaac9d67 Mon Sep 17 00:00:00 2001 From: Kenichi Kamiya Date: Fri, 11 Apr 2025 02:10:16 +0900 Subject: [PATCH 4/4] wget2: 2.1.0 -> 2.2.0 Diff: https://gitlab.com/gnuwget/wget2/-/compare/v2.1.0...v2.2.0 There is no GitLab release for this version, However announced in GNU mailing list. https://lists.gnu.org/archive/html/info-gnu/2024-11/msg00004.html --- pkgs/by-name/wg/wget2/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/wg/wget2/package.nix b/pkgs/by-name/wg/wget2/package.nix index c99b96b76424..5aa132e5ceba 100644 --- a/pkgs/by-name/wg/wget2/package.nix +++ b/pkgs/by-name/wg/wget2/package.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { pname = "wget2"; - version = "2.1.0"; + version = "2.2.0"; outputs = [ "out" @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { owner = "gnuwget"; repo = pname; tag = "v${version}"; - hash = "sha256-+xw1nQMBs0m9RlunyrAYaSDPnLY1yRX8zt8hKOMXQT8="; + hash = "sha256-0tOoStZHr5opehFmuQdFRPYvOv8IMrDTBNFtoweY3VM="; }; # wget2_noinstall contains forbidden reference to /build/