diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2024-06-26 12:01:11 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-06-26 12:01:11 +0000 |
commit | cf7e62516195327988b7896343fcba727e247d16 (patch) | |
tree | 91424905679672a853b33ae6eb53ef925c207a6b /pkgs/top-level | |
parent | 2849a5c036a1df757ba4ff2fc9dd7fe65c4e15f8 (diff) | |
parent | a6fc4a2bf6bf60ed09e156de5e902145324bb64b (diff) |
Merge master into staging-next
Diffstat (limited to 'pkgs/top-level')
-rw-r--r-- | pkgs/top-level/all-packages.nix | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0f42b579c2085..352825db8eb53 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21310,13 +21310,11 @@ with pkgs; icu-versions = callPackages ../development/libraries/icu { }; inherit (icu-versions) - icu58 icu60 icu63 icu64 icu66 icu67 - icu68 icu69 icu70 icu71 @@ -25074,6 +25072,17 @@ with pkgs; go = buildPackages.go_1_22; }; + # requires a newer Apple SDK + go_1_23 = darwin.apple_sdk_11_0.callPackage ../development/compilers/go/1.23.nix { + inherit (darwin.apple_sdk_11_0.frameworks) Foundation Security; + }; + buildGo123Module = darwin.apple_sdk_11_0.callPackage ../build-support/go/module.nix { + go = buildPackages.go_1_23; + }; + buildGo123Package = darwin.apple_sdk_11_0.callPackage ../build-support/go/package.nix { + go = buildPackages.go_1_23; + }; + leaps = callPackage ../development/tools/leaps { }; ### DEVELOPMENT / HARE |