Conversation
Drop an upstreamed patch, and update another for upstream changes.
So this is fun: the hash here is actually the hash we had previously for 17.0.6+3. 614dc61 bumped to this version, with the correct hash, but then the conversion to use the Gradle setup hook in e6f8a3b regressed it back, presumably due to a merge issue, and of course nobody noticed until now. Drop an upstreamed WebKit Ruby compatibility fix that should never have been needed for the version we advertised this as being at the time. Fixes: e6f8a3b
Purely cosmetic change; these versions are identical.
Drop a backported patch that was upstreamed.
emilazy
force-pushed
the
push-utllwszlktxz
branch
from
cd6816f to
1b0dadd
Compare
| patches = lib.optionals (!atLeast23) ( | ||
| if atLeast21 then |
There was a problem hiding this comment.
Nitpick, but I think this double version check with an inversion makes the code kinda difficult to understand.
There was a problem hiding this comment.
Yeah, I’m still going back and forth on how to represent these multi‐versioned patches in these derivations. I have a prototype scheme that takes some inspiration from LLVM. The alternatives here would be if featureVersion == "21" then … else if featureVersion == "17" then … else [ ] or if atLeast21 && !atLeast23 then … else if atLeast17 then … else [ ], both of which are sort of awkward in their own ways. I’ll see if I can’t make it nicer for 25.05.
thiagokokada
left a comment
thiagokokada
left a comment
There was a problem hiding this comment.
Nice, let's get this through the rails to get at least one version of stable with an up-to-date version of Java 🎉 .
Infinidoge
left a comment
Infinidoge
left a comment
There was a problem hiding this comment.
Code looks good and builds just fine! Sliding in just under 24.11, hopefully!
|
Technically nothing here should really be a breaking change, but I’m gonna hit the button now to avoid worrying about the technicality of |
3 participants
The first round of update script runs. The
openjfx17commit is fun.I have elected not to do any thorough clean‐up beyond dropping support for the now‐absent
gaversion suffixes, with the 24.11 freeze deadline in a few hours and these derivations so baroque; this is it for the upcoming release cycle, modulo version bumps. I already have plans to rewrite large portions of these packages for 25.05, so it’s not worth spending the churn and risk (albeit slight) to refactor the derivations further, when anyway superficial clean‐ups would just further expose the need for deeper ones.Things done
nix.conf? (See Nix manual)sandbox = relaxedsandbox = truenix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)Add a 👍 reaction to pull requests you find important.