diff options
| author | Matt McHenry <github@matt.mchenryfamily.org> | 2022-11-02 15:36:52 -0400 |
|---|---|---|
| committer | Matt McHenry <github@matt.mchenryfamily.org> | 2022-11-02 16:01:02 -0400 |
| commit | dca850e3a2c8686dab126886ca0b275caf0dea50 (patch) | |
| tree | cc81018b5c27fc60ddf08c12b52cc9e23ec7cea6 /pkgs/development/python-modules/python-mapnik/python-mapnik_std_optional.patch | |
| parent | d40fea9aeb8840fea0d377baa4b38e39b9582458 (diff) | |
adoptopenjdk 17: remove (again)
this was originally replaced with temurin in c74221839b5, which landed
in staging in acf46b05697 (#140364)
but it was also added in b6cb656c0d8 (in support of openjdk 18 in
da40a449e9e), which landed directly on master in 9413ebb2e1d
(#165354).
those two conflicted when master was merged into staging-next in
a5dfac88d5893514bcd204ed7f820a0f42ac177c (#191339), and adoptopenjdk
17 was mistakenly kept during the conflict resolution.
the net result is that one would get:
$ nix-build -A pkgs.adoptopenjdk-hotspot-bin-17
error: Alias adoptopenjdk-hotspot-bin-17 is still in all-packages.nix
... instead of the desired:
$ nix-build -A pkgs.adoptopenjdk-hotspot-bin-17
error: AdoptOpenJDK is now Temurin. Use temurin-bin-17
Diffstat (limited to 'pkgs/development/python-modules/python-mapnik/python-mapnik_std_optional.patch')
0 files changed, 0 insertions, 0 deletions