summary refs log tree commit diff
path: root/pkgs/top-level
diff options
context:
space:
mode:
authorgithub-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>2022-07-21 00:03:40 +0000
committerGitHub <noreply@github.com>2022-07-21 00:03:40 +0000
commitf09c3603458787f3185de4da012ddf342df06943 (patch)
tree9ef9f8eb06104e9cea8505c56b36a1254f5484d6 /pkgs/top-level
parente84301980da702882c3838936f9198616047b11b (diff)
parentbc970e700dee86a056e5b4013c5e67197ca450df (diff)
downloadnixpkgs-f09c3603458787f3185de4da012ddf342df06943.tar
nixpkgs-f09c3603458787f3185de4da012ddf342df06943.tar.gz
nixpkgs-f09c3603458787f3185de4da012ddf342df06943.tar.bz2
nixpkgs-f09c3603458787f3185de4da012ddf342df06943.tar.lz
nixpkgs-f09c3603458787f3185de4da012ddf342df06943.tar.xz
nixpkgs-f09c3603458787f3185de4da012ddf342df06943.tar.zst
nixpkgs-f09c3603458787f3185de4da012ddf342df06943.zip
Merge staging-next into staging
Diffstat (limited to 'pkgs/top-level')
-rw-r--r--pkgs/top-level/all-packages.nix6
1 files changed, 5 insertions, 1 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b6b8cb31962..fd0ae7da977 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16115,7 +16115,9 @@ with pkgs;
 
   kubeaudit = callPackage ../tools/security/kubeaudit { };
 
-  kubectx = callPackage ../development/tools/kubectx { };
+  kubectx = callPackage ../development/tools/kubectx {
+    buildGoModule = buildGo117Module;
+  };
 
   kube-linter = callPackage ../development/tools/kube-linter { };
 
@@ -16959,6 +16961,8 @@ with pkgs;
 
   arrow-cpp = callPackage ../development/libraries/arrow-cpp {};
 
+  arrow-glib = callPackage ../development/libraries/arrow-glib {};
+
   arsenal = callPackage ../tools/security/arsenal { };
 
   assimp = callPackage ../development/libraries/assimp { };