From be1d3742e8a019eddc2c2fb99e7670fda16ea8fb Mon Sep 17 00:00:00 2001 From: Victor Hugo Borja Date: Thu, 29 Sep 2022 12:35:25 -0500 Subject: google-cloud-sdk: Fix default component arches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When a google-cloud-sdk component does not specify architectures on components.json we should fallback to all supported arches. Previously there was a bug where `allArches` were incorrectly taken from the `attrValues arches` (nixOS architectures) instead of the GCS ones using `attrNames arches`. Also added arm to the list of supported architectures. No changes needed on components.json since it looks urls and hashes were already there. Co-authored-by: Fabián Heredia Montiel --- pkgs/tools/admin/google-cloud-sdk/components.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs/tools') diff --git a/pkgs/tools/admin/google-cloud-sdk/components.nix b/pkgs/tools/admin/google-cloud-sdk/components.nix index 99069fe4fd9..4a57b99e2ba 100644 --- a/pkgs/tools/admin/google-cloud-sdk/components.nix +++ b/pkgs/tools/admin/google-cloud-sdk/components.nix @@ -11,7 +11,7 @@ let arches = { x86 = "i686"; x86_64 = "x86_64"; - # TODO arm + arm = "aarch64"; }; # Mapping from GCS component operating systems to Nix operating systems @@ -30,8 +30,8 @@ let in "${arch'}-${os'}"; - # All architectures that are supported - allArches = builtins.attrValues arches; + # All architectures that are supported by GCS + allArches = builtins.attrNames arches; # A description of all available google-cloud-sdk components. # It's a JSON file with a list of components, along with some metadata -- cgit 1.4.1 From 5a08000cad3e9ee1a0c66f94be0eff5355c6679a Mon Sep 17 00:00:00 2001 From: Solene Rapenne Date: Tue, 4 Oct 2022 22:38:42 +0200 Subject: pngquant: add srapenne as maintainer --- pkgs/tools/graphics/pngquant/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs/tools') diff --git a/pkgs/tools/graphics/pngquant/default.nix b/pkgs/tools/graphics/pngquant/default.nix index 5faab72d8fb..908ad26fa6a 100644 --- a/pkgs/tools/graphics/pngquant/default.nix +++ b/pkgs/tools/graphics/pngquant/default.nix @@ -27,6 +27,6 @@ stdenv.mkDerivation rec { changelog = "https://github.com/kornelski/pngquant/raw/${version}/CHANGELOG"; platforms = platforms.unix; license = with licenses; [ gpl3Plus hpnd bsd2 ]; - maintainers = [ ]; + maintainers = [ maintainers.srapenne ]; }; } -- cgit 1.4.1 From ab53d889c088351b3372994c112f2c552803384c Mon Sep 17 00:00:00 2001 From: Solene Rapenne Date: Tue, 4 Oct 2022 22:38:48 +0200 Subject: rlwrap: add srapenne as maintainer --- pkgs/tools/misc/rlwrap/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs/tools') diff --git a/pkgs/tools/misc/rlwrap/default.nix b/pkgs/tools/misc/rlwrap/default.nix index 7766237753f..3a050cf781e 100644 --- a/pkgs/tools/misc/rlwrap/default.nix +++ b/pkgs/tools/misc/rlwrap/default.nix @@ -25,6 +25,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/hanslub42/rlwrap"; license = licenses.gpl2Plus; platforms = platforms.unix; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ SuperSandro2000 srapenne ]; }; } -- cgit 1.4.1 From 7d3c04e5095a1b5ceec581ee65b03b32ff0285a5 Mon Sep 17 00:00:00 2001 From: Solene Rapenne Date: Tue, 4 Oct 2022 22:38:54 +0200 Subject: tmux: add srapenne as maintainer --- pkgs/tools/misc/tmux/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs/tools') diff --git a/pkgs/tools/misc/tmux/default.nix b/pkgs/tools/misc/tmux/default.nix index 44cbe713f09..0602f9d19d8 100644 --- a/pkgs/tools/misc/tmux/default.nix +++ b/pkgs/tools/misc/tmux/default.nix @@ -77,6 +77,6 @@ stdenv.mkDerivation rec { changelog = "https://github.com/tmux/tmux/raw/${version}/CHANGES"; license = lib.licenses.bsd3; platforms = lib.platforms.unix; - maintainers = with lib.maintainers; [ thammers fpletz SuperSandro2000 ]; + maintainers = with lib.maintainers; [ thammers fpletz SuperSandro2000 srapenne ]; }; } -- cgit 1.4.1 From 9b55c3361ab75e9415cd87f050d088ad0051bc59 Mon Sep 17 00:00:00 2001 From: Solene Rapenne Date: Tue, 4 Oct 2022 22:39:04 +0200 Subject: bwm-ng: add srapenne as maintainer --- pkgs/tools/networking/bwm-ng/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs/tools') diff --git a/pkgs/tools/networking/bwm-ng/default.nix b/pkgs/tools/networking/bwm-ng/default.nix index cfe0d4176a6..397fb30490a 100644 --- a/pkgs/tools/networking/bwm-ng/default.nix +++ b/pkgs/tools/networking/bwm-ng/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { homepage = "http://www.gropp.org/?id=projects&sub=bwm-ng"; license = licenses.gpl2Plus; platforms = platforms.unix; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ srapenne ]; longDescription = '' bwm-ng supports: - /proc/net/dev, netstat, getifaddr, sysctl, kstat, /proc/diskstats /proc/partitions, IOKit, -- cgit 1.4.1 From e979c208469c4fff8aef01a1aeefdf07c3c7b0e9 Mon Sep 17 00:00:00 2001 From: xrelkd <46590321+xrelkd@users.noreply.github.com> Date: Sat, 8 Oct 2022 15:17:41 +0800 Subject: eksctl: 0.113.0 -> 0.114.0 --- pkgs/tools/admin/eksctl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs/tools') diff --git a/pkgs/tools/admin/eksctl/default.nix b/pkgs/tools/admin/eksctl/default.nix index d324920a3f3..f62f1c4c687 100644 --- a/pkgs/tools/admin/eksctl/default.nix +++ b/pkgs/tools/admin/eksctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "eksctl"; - version = "0.113.0"; + version = "0.114.0"; src = fetchFromGitHub { owner = "weaveworks"; repo = pname; rev = version; - sha256 = "sha256-sHknZg34FHhYcf4l2oPQG6RGpybF0lC4n816YoVPeGk="; + sha256 = "sha256-m1R6g9KgbbdlBg7p1gVWpSu02azaqg7bQsFQ4gQB2hM="; }; - vendorSha256 = "sha256-z/3aUSuAZSVsQ67JgUy6z3T91vKHlBjjQS4oSljl/nk="; + vendorSha256 = "sha256-glMu2GwMWsuIjLjCwskH90wn690tosLTCThd4LUZobo="; doCheck = false; -- cgit 1.4.1