diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-12-11 00:02:20 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-11 00:02:20 +0000 |
| commit | b826485d293df9b6625cc545c2785f66a391fc85 (patch) | |
| tree | a315afa69a9b06aebb6b20daa929f492958ab695 /pkgs/top-level | |
| parent | 1e8386407cedca4b7f39ba561a3b3d5c335ac781 (diff) | |
| parent | 0838486e9183ce39398f01b221766e68b50f405c (diff) | |
| download | nixlib-b826485d293df9b6625cc545c2785f66a391fc85.tar nixlib-b826485d293df9b6625cc545c2785f66a391fc85.tar.gz nixlib-b826485d293df9b6625cc545c2785f66a391fc85.tar.bz2 nixlib-b826485d293df9b6625cc545c2785f66a391fc85.tar.lz nixlib-b826485d293df9b6625cc545c2785f66a391fc85.tar.xz nixlib-b826485d293df9b6625cc545c2785f66a391fc85.tar.zst nixlib-b826485d293df9b6625cc545c2785f66a391fc85.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 60d00fb9884e..f768ef41cfd1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11252,6 +11252,7 @@ with pkgs; nomad_1_4 nomad_1_5 nomad_1_6 + nomad_1_7 ; nomad-autoscaler = callPackage ../applications/networking/cluster/nomad-autoscaler { }; @@ -39217,7 +39218,7 @@ with pkgs; flintqs = callPackage ../development/libraries/science/math/flintqs { }; - getdp = callPackage ../applications/science/math/getdp { stdenv = gcc10StdenvCompat; }; + getdp = callPackage ../applications/science/math/getdp { }; gurobi = callPackage ../applications/science/math/gurobi { }; @@ -40458,8 +40459,6 @@ with pkgs; utsushi-networkscan = callPackage ../misc/drivers/utsushi/networkscan.nix { }; - idsk = callPackage ../tools/filesystems/idsk { stdenv = gcc10StdenvCompat; }; - colima = callPackage ../applications/virtualization/colima { }; lima = callPackage ../applications/virtualization/lima { |