Commit Graph

716 Commits

Author SHA1 Message Date
R. Ryantm
b587f2c7fc jdk23: 23.0.1+11 -> 23.0.2+7 2025-02-17 09:54:11 +00:00
R. Ryantm
970afe19fa jdk11: 11.0.25+9 -> 11.0.26+4 2025-02-17 09:53:25 +00:00
Silvan Mosberger
84d4f874c2 treewide: format all inactive Nix files
After final improvements to the official formatter implementation,
this commit now performs the first treewide reformat of Nix files using it.
This is part of the implementation of RFC 166.

Only "inactive" files are reformatted, meaning only files that
aren't being touched by any PR with activity in the past 2 months.
This is to avoid conflicts for PRs that might soon be merged.
Later we can do a full treewide reformat to get the rest,
which should not cause as many conflicts.

A CI check has already been running for some time to ensure that new and
already-formatted files are formatted, so the files being reformatted here
should also stay formatted.

This commit was automatically created and can be verified using

    nix-build a08b3a4d19.tar.gz \
      --argstr baseRev 78e9caf153
    result/bin/apply-formatting $NIXPKGS_PATH
2024-12-10 20:23:58 +01:00
FliegendeWurst
41f52f8a05 openjdk8: fix build with GCC 14 2024-11-27 08:55:49 +01:00
github-actions[bot]
d400562006 Merge staging-next into staging 2024-11-11 00:15:07 +00:00
github-actions[bot]
81f60ef90d Merge master into staging-next 2024-11-11 00:14:46 +00:00
Artturin
74dd18743f openjdk: Fix cross for most versions (#353952) 2024-11-09 21:21:20 +02:00
Tomo
c04d7170e0 team-list: establish java team
As discussed in #jdk:nixos.org on Matrix, the maintainers of the
Java ecosystem in Nixpkgs feel that a team for Java would be helpful.
2024-11-09 18:26:59 +00:00
Artturin
fc46586422 openjdk: Fix cross for most versions
`jdk8` cross still broken

Using `__spliced.depsBuildBuild` to reduce rebuilds/space usage because it does not seem to matter if
it's that or `buildHost`

`depsBuildBuild` `configure: error: Could not find required tool for BUILD_CC`

`zlib` in `nativeBuildInputs`

```
/build/source/src/java.base/share/native/libzip/Adler32.c:33:10: fatal error: zlib.h: No such file or directory
   33 | #include <zlib.h>
      |          ^~~~~~~~
compilation terminated.
make[4]: *** [lib/CoreLibraries.gmk:88: /build/source/build/linux-aarch64-server-release/buildjdk/support/native/java.base/libzip/Adler32.o] Error 1
make[4]: *** Waiting for unfinished jobs....
/build/source/src/java.base/share/native/libzip/CRC32.c:32:10: fatal error: zlib.h: No such file or directory
   32 | #include <zlib.h>
      |          ^~~~~~~~
compilation terminated.
/build/source/src/java.base/share/native/libzip/Deflater.c:35:10: fatal error: zlib.h: No such file or directory
   35 | #include <zlib.h>
      |          ^~~~~~~~
compilation terminated.
make[4]: *** [lib/CoreLibraries.gmk:88: /build/source/build/linux-aarch64-server-release/buildjdk/support/native/java.base/libzip/CRC32.o] Error 1
make[4]: *** [lib/CoreLibraries.gmk:88: /build/source/build/linux-aarch64-server-release/buildjdk/support/native/java.base/libzip/Deflater.o] Error 1
make[3]: *** [Main.gmk:191: java.base-libs] Error 2
make[2]: *** [make/Main.gmk:589: create-buildjdk-interim-image] Error 2
make[2]: *** Waiting for unfinished jobs....
ERROR: Build failed for target 'images' in configuration 'linux-aarch64-server-release' (exit code 2)
Stopping javac server
```
2024-11-08 21:59:38 +02:00
github-actions[bot]
bdce452570 Merge staging-next into staging 2024-10-25 12:06:07 +00:00
Steven Keuchel
b006420383 openjdk: add riscv64-linux to platforms 2024-10-25 10:15:04 +02:00
Emily
7bc545f5a8 openjdk{8,11,17,21,23}: remove obsolete version logic 2024-10-24 20:44:00 +01:00
Emily
860924d704 openjdk23: 23-ga -> 23.0.1+11 2024-10-24 20:44:00 +01:00
Emily
fc8beb4a6a openjdk21: 21.0.4+7 -> 21.0.5+11 2024-10-24 20:44:00 +01:00
Emily
fe4e4a1ae2 openjdk17: 17.0.12+7 -> 17.0.13+11
Drop an upstreamed patch, and update another for upstream changes.
2024-10-24 20:44:00 +01:00
Emily
afa5f90984 openjdk11: 11.0.24+8 -> 11.0.25+9 2024-10-24 19:25:30 +01:00
Emily
d831e4c17b openjdk8: 8u422-ga -> 8u432-b06 2024-10-24 19:25:30 +01:00
Emily
bb161ee138 openjdk{8,11,17,21,23}: add update script 2024-10-24 15:04:56 +01:00
Emily
f2569008ab openjfx{17,21,23}: move to pkgs/by-name 2024-10-24 15:04:56 +01:00
Emily
f05216c373 openjfx{17,21,23}: deduplicate into generic.nix 2024-10-24 15:04:56 +01:00
Emily
058999318f openjfx: format generic.nix with nixfmt-rfc-style 2024-10-24 15:04:56 +01:00
Emily
1801f90bee openjfx: copy latest version into generic.nix 2024-10-24 15:04:56 +01:00
Emily
9bad08529e openjdk{8,11,17,21,23}: deduplicate into generic.nix 2024-10-24 15:04:55 +01:00
Emily
77acd709f9 openjdk: format generic.nix with nixfmt-rfc-style 2024-10-23 16:42:34 +01:00
Emily
a25242518c openjdk: copy latest version into generic.nix 2024-10-23 16:42:34 +01:00
Emily
cd2eaf83ec openjdk: remove existing update script 2024-10-23 16:42:34 +01:00
Emily
09f30d20bc openjdk: remove unused patch 2024-10-23 16:42:34 +01:00
Emily
85faae5e12 Merge staging-next into staging 2024-10-08 01:24:14 +01:00
Emily
df769e85f3 Merge master into staging-next 2024-10-08 01:23:55 +01:00
Emily
c979637f24 openjfx11: drop
OpenJFX 11 reached end‐of‐life in 2023.
2024-10-07 20:22:30 +01:00
Emily
732642b891 {openjdk,openjfx}22: drop 2024-09-26 16:46:04 +01:00
Emily
00a8a1c7f3 {openjdk,openjfx}23: init at 23-ga 2024-09-26 16:46:04 +01:00
Emily
fac90a74ac openjdk21: 21.0.3+9 -> 21.0.4+7 2024-09-26 16:46:04 +01:00
Emily
64e24d184d openjdk17: 17.0.11+9 -> 17.0.12+7 2024-09-26 16:45:54 +01:00
Emily
0a94520cc7 openjdk11: 11.0.23+9 -> 11.0.24+8 2024-09-26 16:45:40 +01:00
Emily
bc12b04da7 openjdk8: 8u412-ga -> 8u422-ga 2024-09-26 11:58:47 +01:00
Emily
45bb402313 openjdk21: remove from info.json
The derivation doesn’t use this, so it’s confusing and misleading
to have it in there.
2024-09-26 11:58:47 +01:00
Emily
adf045901d openjdk: remove unused bootstrap files
These will still be available in the Git history if anyone wants to
try resurrecting a source‐based OpenJDK bootstrap in the future. In
the meantime they’re just confusing to have around unreferenced.
2024-09-26 11:58:47 +01:00
K900
a9128ce2f2 Merge remote-tracking branch 'origin/master' into staging-next 2024-09-25 21:07:19 +03:00
Emily
6cdbe938ed openjfx17: fix build with Ruby 3 (#343130) 2024-09-25 15:01:53 +01:00
Artturin
f0e657f3b1 Merge branch 'master' into staging-next 2024-09-25 06:05:01 +03:00
Artturin
e0464e4788 treewide: replace stdenv.is with stdenv.hostPlatform.is
In preparation for the deprecation of `stdenv.isX`.

These shorthands are not conducive to cross-compilation because they
hide the platforms.

Darwin might get cross-compilation for which the continued usage of `stdenv.isDarwin` will get in the way

One example of why this is bad and especially affects compiler packages
https://www.github.com/NixOS/nixpkgs/pull/343059

There are too many files to go through manually but a treewide should
get users thinking when they see a `hostPlatform.isX` in a place where it
doesn't make sense.

```
fd --type f "\.nix" | xargs sd --fixed-strings "stdenv.is" "stdenv.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "stdenv'.is" "stdenv'.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "clangStdenv.is" "clangStdenv.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "gccStdenv.is" "gccStdenv.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "stdenvNoCC.is" "stdenvNoCC.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "inherit (stdenv) is" "inherit (stdenv.hostPlatform) is"
fd --type f "\.nix" | xargs sd --fixed-strings "buildStdenv.is" "buildStdenv.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "effectiveStdenv.is" "effectiveStdenv.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "originalStdenv.is" "originalStdenv.hostPlatform.is"
```
2024-09-25 00:04:37 +03:00
Emily
e1ac53d9d6 {gyroflow,openjfx{11,17,21,22}}: unpin FFmpeg 7
These pins landed on `master` after the mass unpin on `staging`
in 61922738bb.
2024-09-21 21:34:40 +01:00
FliegendeWurst
1db3e7534b openjfx17: fix build with Ruby 3 2024-09-20 08:21:46 +02:00
Thiago Kenji Okada
b34e8e9ce1 openjfx22: 22.0.1-ga -> 22.0.2-ga; openjfx{11,17,21,22}: add upstream patch for FFmpeg 7 (#339357) 2024-09-16 16:51:07 +01:00
José Luis Lafuente
b839e6963f openjdk22: add version test 2024-09-09 09:04:42 +03:00
Emily
19d7a635e8 openjfx{11,17,21,22}: add upstream patch for FFmpeg 7 2024-09-03 22:58:37 +01:00
Emily
ca7cb5d6ea openjfx22: 22.0.1-ga -> 22.0.2-ga 2024-09-03 22:58:20 +01:00
tomberek
b973af57ae Merge pull request #328278 from r-ryantm/auto-update/jdk22
jdk22: 22.0.1-ga -> 22.0.2-ga
2024-08-04 15:47:05 -04:00
Sandro
e700287f93 Merge pull request #299046 from ShamrockLee/jre-minimal-fix
jre_minimal: convert `passthru.tests` to an attribute set and fix pre/post hook running
2024-08-02 00:16:53 +02:00