From e98029e0d8cebd42bf4ba6fcbebfcbf3f5fa994c Mon Sep 17 00:00:00 2001 From: Michael Daniels Date: Sat, 14 Jun 2025 14:28:11 -0400 Subject: [PATCH 1/3] maintainers: add mdaniels5757 --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index d70b31081b98..e0b3a51a960d 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -15892,6 +15892,12 @@ githubId = 1377571; name = "Matthew S. Daiter"; }; + mdaniels5757 = { + email = "nix@mdaniels.me"; + github = "mdaniels5757"; + githubId = 8762511; + name = "Michael Daniels"; + }; mdarocha = { email = "marek@mdarocha.pl"; github = "mdarocha"; From dcb742ed4a57869091e456adad72adc480aeb6af Mon Sep 17 00:00:00 2001 From: Michael Daniels Date: Sat, 14 Jun 2025 14:28:16 -0400 Subject: [PATCH 2/3] which: add passthru.updateScript, switch to finalAttrs --- pkgs/by-name/wh/which/package.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/wh/which/package.nix b/pkgs/by-name/wh/which/package.nix index a739a54f474d..b58c7fa85ae7 100644 --- a/pkgs/by-name/wh/which/package.nix +++ b/pkgs/by-name/wh/which/package.nix @@ -2,20 +2,26 @@ lib, stdenv, fetchurl, + directoryListingUpdater, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "which"; version = "2.23"; src = fetchurl { - url = "mirror://gnu/which/which-${version}.tar.gz"; + url = "mirror://gnu/which/which-${finalAttrs.version}.tar.gz"; hash = "sha256-osVYIm/E2eTOMxvS/Tw/F/lVEV0sAORHYYpO+ZeKKnM="; }; strictDeps = true; enableParallelBuilding = true; + passthru.updateScript = directoryListingUpdater { + inherit (finalAttrs) pname version; + url = "https://ftp.gnu.org/gnu/which/"; + }; + meta = { homepage = "https://www.gnu.org/software/which/"; description = "Shows the full path of (shell) commands"; @@ -23,4 +29,4 @@ stdenv.mkDerivation rec { mainProgram = "which"; platforms = lib.platforms.all; }; -} +}) From 91e5b8158cda97bfda7850039b4e8e643a548016 Mon Sep 17 00:00:00 2001 From: Michael Daniels Date: Sat, 14 Jun 2025 14:28:21 -0400 Subject: [PATCH 3/3] which: add mdaniels5757 as maintainer --- pkgs/by-name/wh/which/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/wh/which/package.nix b/pkgs/by-name/wh/which/package.nix index b58c7fa85ae7..c03d7a711da9 100644 --- a/pkgs/by-name/wh/which/package.nix +++ b/pkgs/by-name/wh/which/package.nix @@ -26,6 +26,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://www.gnu.org/software/which/"; description = "Shows the full path of (shell) commands"; license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ mdaniels5757 ]; mainProgram = "which"; platforms = lib.platforms.all; };