From 001389279cfd2cde7f0c6b5c39a087119079d9ec Mon Sep 17 00:00:00 2001 From: figsoda Date: Sun, 25 Dec 2022 11:31:00 -0500 Subject: [PATCH 1/3] nix-update: 0.11.0 -> 0.12.0 Diff: https://github.com/Mic92/nix-update/compare/0.11.0...0.12.0 Changelog: https://github.com/Mic92/nix-update/releases/tag/0.12.0 --- pkgs/tools/package-management/nix-update/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/package-management/nix-update/default.nix b/pkgs/tools/package-management/nix-update/default.nix index 45fbd7a6a1d7..8fa7ed61c53a 100644 --- a/pkgs/tools/package-management/nix-update/default.nix +++ b/pkgs/tools/package-management/nix-update/default.nix @@ -8,14 +8,14 @@ buildPythonApplication rec { pname = "nix-update"; - version = "0.11.0"; + version = "0.12.0"; format = "setuptools"; src = fetchFromGitHub { owner = "Mic92"; repo = pname; rev = version; - sha256 = "sha256-nBLNMQKLgx5m5VyxTdSLBE9kNhUPdaRzVi5BQx83m+4="; + sha256 = "sha256-7Co8mKG3eyM5WmGoAskyYleeutH4/kygSkvFpSg7Y04="; }; makeWrapperArgs = [ From cb219cb6d71955f9c14a19f59ec7e57be72d0271 Mon Sep 17 00:00:00 2001 From: figsoda Date: Sun, 25 Dec 2022 11:31:33 -0500 Subject: [PATCH 2/3] nix-update-script: make attrPath optional --- pkgs/common-updater/nix-update.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/common-updater/nix-update.nix b/pkgs/common-updater/nix-update.nix index bb547302b79a..269e1b6e6455 100644 --- a/pkgs/common-updater/nix-update.nix +++ b/pkgs/common-updater/nix-update.nix @@ -1,7 +1,7 @@ -{ nix-update }: +{ lib, nix-update }: -{ attrPath -, extraArgs ? [] +{ attrPath ? null +, extraArgs ? [ ] }: -[ "${nix-update}/bin/nix-update" ] ++ extraArgs ++ [ attrPath ] +[ "${nix-update}/bin/nix-update" ] ++ extraArgs ++ lib.optional (attrPath != null) attrPath From 49c8bc02d127e2b0427ea1cec7eaffb35cdba984 Mon Sep 17 00:00:00 2001 From: figsoda Date: Sun, 25 Dec 2022 11:34:08 -0500 Subject: [PATCH 3/3] fish: omit attrPath in nix-update-script --- pkgs/shells/fish/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/shells/fish/default.nix b/pkgs/shells/fish/default.nix index 4f53883cb77a..f391076900e4 100644 --- a/pkgs/shells/fish/default.nix +++ b/pkgs/shells/fish/default.nix @@ -327,7 +327,7 @@ let ${fish}/bin/fish ${fishScript} && touch $out ''; }; - updateScript = nix-update-script { attrPath = pname; }; + updateScript = nix-update-script { }; }; }; in