Skip to content

Commit

Permalink
flake.{nix,lock}: Update to JDK23 (temporarily uninclude jextract)
Browse files Browse the repository at this point in the history
NixPkgs has removed JDK 22 as "unsupported" and now provides jdk23. The
jextract package has not been upgraded and is marked as `broken`.

Given that `jextract` is not needed to build `secp256k1-jdk` from source,
it is commented out for now.
(jextract is included in the `nix develop` environment for updating the generated
wrapper manually)

The flake.lock file is also updated to the latest hashes.
  • Loading branch information
msgilligan committed Nov 14, 2024
1 parent 320a709 commit 2d8292b
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 13 deletions.
18 changes: 9 additions & 9 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 5 additions & 4 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,11 @@
# ];
inputsFrom = with pkgs ; [ secp256k1 ];
packages = with pkgs ; [
jdk22 # JDK 22 will be in $JAVA_HOME (and in javaToolchains)
jextract # jextract (Nix package) contains a jlinked executable and bundles its own JDK 22
(gradle.override { # Gradle 8.x (Nix package) depends-on and directly uses JDK 21 to launch Gradle itself
javaToolchains = [ jdk22 ]; # Put JDK 22 in Gradle's javaToolchain configuration
jdk23 # JDK 23 will be in $JAVA_HOME (and in javaToolchains)
# current jextract in nixpkgs is broken, see: https://github.com/NixOS/nixpkgs/issues/354591
# jextract # jextract (Nix package) contains a jlinked executable and bundles its own JDK
(gradle.override { # Gradle 8.x (Nix package) depends-on and directly uses JDK XX to launch Gradle itself
javaToolchains = [ jdk23 ]; # Put JDK 23 in Gradle's javaToolchain configuration
})
];
};
Expand Down

0 comments on commit 2d8292b

Please sign in to comment.