diff options
| author | Theodore Ni <3806110+tjni@users.noreply.github.com> | 2023-08-26 16:08:02 -0700 |
|---|---|---|
| committer | Theodore Ni <3806110+tjni@users.noreply.github.com> | 2023-08-26 16:08:02 -0700 |
| commit | 80a74ec050766415beb2f5765155ab425ac86af3 (patch) | |
| tree | e3a5baa5e6a6f65822aad855b7e00364b661d6bd /pkgs/top-level | |
| parent | 8adf696a5431332893f14e019a560703000ed648 (diff) | |
| parent | a7d27e87ee8a2b5b5a6bd39e5c3cdf7549606923 (diff) | |
Merge branch 'master' into staging-next
Manually fixed a merge conflict between https://github.com/NixOS/nixpkgs/pull/227900 and https://github.com/NixOS/nixpkgs/pull/246022.
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/aliases.nix | 1 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 6 |
2 files changed, 3 insertions, 4 deletions
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index a440ec395e513..70b39b5c52b72 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -855,6 +855,7 @@ mapAliases ({ kubei = kubeclarity; # Added 2023-05-20 kubeless = throw "kubeless is deprecated and archived by upstream"; # Added 2022-04-05 kubicorn = throw "kubicorn has been dropped due to the lack of maintenance from upstream since 2019"; # Added 2022-05-30 + kuma-prometheus-sd = throw "kuma-prometheus-sd has been deprecated upstream"; # Added 2023-07-02 kvm = throw "'kvm' has been renamed to/replaced by 'qemu_kvm'"; # Converted to throw 2022-02-22 ### L ### diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b41cf6aebc2ef..d55d5d799cf76 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -676,6 +676,8 @@ with pkgs; goda = callPackage ../development/tools/goda { }; + gokrazy = callPackage ../development/misc/gokrazy { }; + gojq = callPackage ../development/tools/gojq { }; govulncheck = callPackage ../tools/security/govulncheck { }; @@ -33356,10 +33358,6 @@ with pkgs; components = ["kuma-dp"]; pname = "kuma-dp"; }; - kuma-prometheus-sd = callPackage ../applications/networking/cluster/kuma { - components = ["kuma-prometheus-sd"]; - pname = "kuma-prometheus-sd"; - }; kile-wl = callPackage ../applications/misc/kile-wl { }; |