Skip to content

Commit 9abd89e

Browse files
dougchgoatgoose
andauthored
chore: Nix Corretto version bump/upstream (#5427)
Co-authored-by: Sam Clark <3758302+goatgoose@users.noreply.github.com>
1 parent 42a5d6d commit 9abd89e

File tree

3 files changed

+7
-88
lines changed

3 files changed

+7
-88
lines changed

flake.lock

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flake.nix

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@
2121
aws-lc = awslc.packages.${system}.aws-lc;
2222
aws-lc-fips-2022 = awslcfips2022.packages.${system}.aws-lc-fips-2022;
2323
aws-lc-fips-2024 = awslcfips2024.packages.${system}.aws-lc-fips-2024;
24-
# TODO: submit a flake PR
25-
corretto = import nix/amazon-corretto-17.nix { pkgs = pkgs; };
2624
pythonEnv = import ./nix/pyenv.nix { pkgs = pkgs; };
2725
# Note: we're rebuilding, not importing from nixpkgs for the mkShells.
2826
openssl_1_0_2 = import ./nix/openssl_1_0_2.nix { pkgs = pkgs; };
@@ -34,7 +32,7 @@
3432
# We're not including openssl1.1.1 in our package list to avoid confusing cmake.
3533
# It will be in the PATH of our devShell for use in tests.
3634
pythonEnv
37-
corretto
35+
pkgs.corretto21
3836
pkgs.iproute2
3937
pkgs.apacheHttpd
4038
pkgs.procps

nix/amazon-corretto-17.nix

Lines changed: 0 additions & 79 deletions
This file was deleted.

0 commit comments

Comments
 (0)