diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-07-04 12:12:04 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-04 12:12:04 +0000 |
| commit | 03ce3f8c08213785aefaf90e466605f238a3a38e (patch) | |
| tree | e0b36e2e4d955dd55cc7bce2e8ee5772f0c81443 /pkgs/top-level/all-packages.nix | |
| parent | cc670b5c955f2fe905612455eb21af5aeb5718df (diff) | |
| parent | 33b3f971a7f6c774fb69a4c9a37eb11e3129e465 (diff) | |
| download | nixpkgs-03ce3f8c08213785aefaf90e466605f238a3a38e.tar nixpkgs-03ce3f8c08213785aefaf90e466605f238a3a38e.tar.gz nixpkgs-03ce3f8c08213785aefaf90e466605f238a3a38e.tar.bz2 nixpkgs-03ce3f8c08213785aefaf90e466605f238a3a38e.tar.lz nixpkgs-03ce3f8c08213785aefaf90e466605f238a3a38e.tar.xz nixpkgs-03ce3f8c08213785aefaf90e466605f238a3a38e.tar.zst nixpkgs-03ce3f8c08213785aefaf90e466605f238a3a38e.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/top-level/all-packages.nix')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5c08d95f487..12355bbf177 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -406,6 +406,10 @@ with pkgs; eclipse-mat = callPackage ../development/tools/eclipse-mat { }; + edgedb = callPackage ../tools/networking/edgedb { + inherit (darwin.apple_sdk.frameworks) CoreServices Security; + }; + efficient-compression-tool = callPackage ../tools/compression/efficient-compression-tool { }; evans = callPackage ../development/tools/evans { }; @@ -14768,6 +14772,8 @@ with pkgs; pythonDocs = recurseIntoAttrs (callPackage ../development/interpreters/python/cpython/docs {}); + check-jsonschema = callPackage ../development/tools/check-jsonschema {}; + pypi2nix = callPackage ../development/tools/pypi2nix {}; pypi-mirror = callPackage ../development/tools/pypi-mirror {}; @@ -14868,6 +14874,8 @@ with pkgs; inherit (darwin) libiconv libobjc libunwind; inherit (darwin.apple_sdk.frameworks) Foundation; }) + mkRubyVersion + mkRuby ruby_2_7 ruby_3_0 ruby_3_1; @@ -33146,9 +33154,7 @@ with pkgs; astral = callPackage ../applications/science/biology/astral { }; - archimedes = callPackage ../applications/science/electronics/archimedes { - stdenv = gcc6Stdenv; - }; + archimedes = callPackage ../applications/science/electronics/archimedes { }; bayescan = callPackage ../applications/science/biology/bayescan { }; @@ -34509,7 +34515,7 @@ with pkgs; idsk = callPackage ../tools/filesystems/idsk { stdenv = gcc10StdenvCompat; }; - colima = callPackage ../applications/virtualization/colima { }; + colima = callPackage ../applications/virtualization/colima { buildGoModule = buildGo118Module; }; lima = callPackage ../applications/virtualization/lima { }; |