temurin-{,jre-}bin-24: drop, open{jdk,jfx}24: drop (#448547) (c7cab2f3) · Commits · nix / nixpkgs

pkgs/by-name/ed/ed-odyssey-materials-helper/deps.json

+67 −80

Original line number	Diff line number	Diff line
		@@ -37,16 +37,16 @@
		"jar": "sha256-a9QQVOJuuuiLDaWNxj7BEKcO+tXxLYcESTRwx8VJcZA=",
		"pom": "sha256-uFQ5wq04pYG40n+nWy+zC3HN4dT8A8ZE4yMvhN8kWqE="
		},
		"io/freefair/gradle#lombok-plugin/8.14.2": {
		"jar": "sha256-RIQV1/8vImNj813kxhix6Tr78NdFBRUUu0cbIvm1jy4=",
		"module": "sha256-QIzhHR3PUEV4oli/obkCfo0zRgScjdqxQ6wtebqKAJE=",
		"pom": "sha256-l7zUYFZjH9+YzMEwgxFkf71USZWWLXAoZLGmJn9/0XQ="
		"io/freefair/gradle#lombok-plugin/9.0.0": {
		"jar": "sha256-ztdLsqK5Eze6lAo1h7uXFujWXlUp49JEqlo8cOXED7Q=",
		"module": "sha256-9FXPosuixaovzcBl0zcaRAKsxf/Jlfrq67a3IrQLd0Q=",
		"pom": "sha256-Wx4uVjwtS7zUTDZNBfTQEV63SCsI/VA2NeyNfEW0Knk="
		},
		"io/freefair/jsass-java#io.freefair.jsass-java.gradle.plugin/6.5.0.2": {
		"pom": "sha256-hoEYwHzaHj3q/o0bF3HzOgyN0lEIEAu/pjFl3hzTvmg="
		},
		"io/freefair/lombok#io.freefair.lombok.gradle.plugin/8.14.2": {
		"pom": "sha256-OKIER1//te7+8mJmN+ZtdKjo5reqEZ3SRXpwcZ3oVvU="
		"io/freefair/lombok#io.freefair.lombok.gradle.plugin/9.0.0": {
		"pom": "sha256-s5rb7ywLx0jun0EFww8MhaElzsdorWrNDp+UKogG2w8="
		},
		"jakarta/platform#jakarta.jakartaee-bom/9.1.0": {
		"pom": "sha256-35jgJmIZ/buCVigm15o6IHdqi6Aqp4fw8HZaU4ZUyKQ="
		@@ -168,13 +168,13 @@
		"org/gradle/toolchains/foojay-resolver-convention#org.gradle.toolchains.foojay-resolver-convention.gradle.plugin/1.0.0": {
		"pom": "sha256-8TMkmhh1Suah0nAdANhJsa+6ewaD3bX8GxinAHHOwvo="
		},
		"org/gradlex#extra-java-module-info/1.13": {
		"jar": "sha256-EIqHsSfToameWdHmEEo+kdCx/5aWGM+1s54+J/H+r20=",
		"module": "sha256-1kT0XN5oN003+pNhhJWZK6ZBHyJFhklk50VlHpffJhE=",
		"pom": "sha256-sYMue36yP41a32LHkXcuPp/IhIMUnKjd5QIbsQPUQlo="
		"org/gradlex#extra-java-module-info/1.13.1": {
		"jar": "sha256-u7wZoNvtKQxcMt17/vhxh+Qn/yGBqKfkcA3XtXrOQbM=",
		"module": "sha256-lQeTGglcI3ZzTFxnOo/zK7qBerkAQAivjFdihR1/YaY=",
		"pom": "sha256-i4Q6pFeUxi2dsJOBdGrchkKKphFx++KSAqld7WzYN6A="
		},
		"org/gradlex/extra-java-module-info#org.gradlex.extra-java-module-info.gradle.plugin/1.13": {
		"pom": "sha256-ll4caPhrb0fP4cqP2rYTPRxz0w4eerkuTHirvGnFs4c="
		"org/gradlex/extra-java-module-info#org.gradlex.extra-java-module-info.gradle.plugin/1.13.1": {
		"pom": "sha256-ho1RzTt31f/rmHPol6rnYlphPx2wP60fTiHtBti4vDQ="
		},
		"org/jsonschema2pojo#org.jsonschema2pojo.gradle.plugin/1.2.2": {
		"pom": "sha256-OS098xRtN26kokx+XtNhLennIcfT6+T3vzq5oiSVhds="
		@@ -365,22 +365,15 @@
		"jar": "sha256-JMkjNyxY410LnxagKJKbua7cd1IYZ8J08r0HNd9bofU=",
		"pom": "sha256-TKWjXWEjXhZUmsNG0eNFUc3w/ifoSqV+A8vrJV6k5do="
		},
		"com/google/errorprone#error_prone_annotations/2.36.0": {
		"jar": "sha256-d0QOJwsLyaJJkDxaB2w2pyLEiGyk9CZ18pA6HFPtYaU=",
		"pom": "sha256-15z9N8hfdta3VMdQHuHchEe3smQsI4LXeCUhZr0zHpw="
		},
		"com/google/errorprone#error_prone_annotations/2.38.0": {
		"jar": "sha256-ZmHVM1CQpfxh3YadIJW8bB4hVuOqR6bkq6vfZMmaeIk=",
		"pom": "sha256-MAe++K/zro6hLYHD/qy08Vl5ss9cPjj8kYmpjeoUEWc="
		"com/google/errorprone#error_prone_annotations/2.41.0": {
		"jar": "sha256-pW54K1tQgRrCBAc6NVoh2RWiEH/OE+xxEzGtA29mD8w=",
		"pom": "sha256-oVHfHi4LSGGNiwahgHSKKbOrs5sbI5b2och5pydIjG4="
		},
		"com/google/errorprone#error_prone_parent/2.27.0": {
		"pom": "sha256-+oGCnQSVWd9pJ/nJpv1rvQn4tQ5tRzaucsgwC2w9dlQ="
		},
		"com/google/errorprone#error_prone_parent/2.36.0": {
		"pom": "sha256-Okz8imvtYetI6Wl5b8MeoNJwtj5nBZmUamGIOttwlNw="
		},
		"com/google/errorprone#error_prone_parent/2.38.0": {
		"pom": "sha256-5iRYpqPmMIG8fFezwPrJ8E92zjL2BlMttp/is9R7k0w="
		"com/google/errorprone#error_prone_parent/2.41.0": {
		"pom": "sha256-xTg4jXYKXByY3PBvbtPP5fEaZRgn21y9LtgojHlcrUI="
		},
		"com/google/guava#failureaccess/1.0.3": {
		"jar": "sha256-y/w5BrGbj1XdfP1t/gqkUy6DQlDX8IC9jSEaPiRrWcs=",
		@@ -392,13 +385,13 @@
		"com/google/guava#guava-parent/33.4.0-android": {
		"pom": "sha256-ciDt5hAmWW+8cg7kuTJG+i0U8ygFhTK1nvBT3jl8fYM="
		},
		"com/google/guava#guava-parent/33.4.8-jre": {
		"pom": "sha256-oDxRmaG+FEQ99/1AuoZzscaq4E3u9miM59Vz6kieOiA="
		"com/google/guava#guava-parent/33.5.0-jre": {
		"pom": "sha256-aHGeaHxuTJ/z4P7L73vSCJbw9PezFHQ+0zxy+WJWghU="
		},
		"com/google/guava#guava/33.4.8-jre": {
		"jar": "sha256-89f1f2f9Yi9NRo391pKzpeOQkkbCgBesMmNAXw/mF+0=",
		"module": "sha256-WKM1cwMGmiGTDnuf6bhk3ov7i9RgdDPb5IJjRZYgz/w=",
		"pom": "sha256-BDZdS27yLIz5NJ/mKAafw+gaLIODUUAu9OlfnnV77rw="
		"com/google/guava#guava/33.5.0-jre": {
		"jar": "sha256-HjAfDFKsJIsLFP3D0SKDx3JS1Nb0hSHVcufYxMLMSsc=",
		"module": "sha256-d+1CyMiyzru5OsngdUP/ZBiqJL24UXWAz1Mk6aZRCVY=",
		"pom": "sha256-BHj6eKkIs8Mf5td76ZeKqmIeKhgduEAH49OzdCSirGE="
		},
		"com/google/guava#listenablefuture/9999.0-empty-to-avoid-conflict-with-guava": {
		"jar": "sha256-s3KgN9QjCqV/vv/e8w/WEj+cDC24XQrO0AyRuXTzP5k=",
		@@ -474,16 +467,16 @@
		"module": "sha256-iNmRuo7VjChtey18CPn2Mg/5novWYXPDaDkhAEb8f2I=",
		"pom": "sha256-oYHFieNi4sRp6IRc/PIKFaiQ9ISUoPny4T9ZSglq0Kk="
		},
		"io/freefair/gradle#lombok-plugin/8.14.2": {
		"jar": "sha256-RIQV1/8vImNj813kxhix6Tr78NdFBRUUu0cbIvm1jy4=",
		"module": "sha256-QIzhHR3PUEV4oli/obkCfo0zRgScjdqxQ6wtebqKAJE=",
		"pom": "sha256-l7zUYFZjH9+YzMEwgxFkf71USZWWLXAoZLGmJn9/0XQ="
		"io/freefair/gradle#lombok-plugin/9.0.0": {
		"jar": "sha256-ztdLsqK5Eze6lAo1h7uXFujWXlUp49JEqlo8cOXED7Q=",
		"module": "sha256-9FXPosuixaovzcBl0zcaRAKsxf/Jlfrq67a3IrQLd0Q=",
		"pom": "sha256-Wx4uVjwtS7zUTDZNBfTQEV63SCsI/VA2NeyNfEW0Knk="
		},
		"io/freefair/jsass-java#io.freefair.jsass-java.gradle.plugin/6.5.0.2": {
		"pom": "sha256-1C1ePfUKHTe6qhRrpb0ai7I5YZksPt9Fw6M5zqCTLd8="
		},
		"io/freefair/lombok#io.freefair.lombok.gradle.plugin/8.14.2": {
		"pom": "sha256-KVgYYy7l/xiWwKYPuI2ghuPXyFHGxIUcQU/VSETWfYI="
		"io/freefair/lombok#io.freefair.lombok.gradle.plugin/9.0.0": {
		"pom": "sha256-xWt36BjHjUZoXWbQ/2UJ85G5KE3+hrueEnARHrwBJYI="
		},
		"io/github/classgraph#classgraph/4.8.181": {
		"jar": "sha256-YqZDbWlxDvX6tuwkN4HOTFspkEftGEG1+SdGroUs5UU=",
		@@ -507,10 +500,10 @@
		"io/projectreactor#reactor-bom/Bismuth-SR7": {
		"pom": "sha256-8V34qRAvk+7YOr1Aw5XxauNsUKmmB+llR0KUKr49NDk="
		},
		"io/reactivex/rxjava3#rxjava/3.1.11": {
		"jar": "sha256-bipWqYGdD8L+DXjv7NPXyBpjxjneM8qlY5KTvP/umXo=",
		"module": "sha256-tDIZwIxsAgw+sN8lRtrqd5IZP4lgRtVcozqZhfvajuc=",
		"pom": "sha256-fpMFhj0zE0zUpy0It/Evre4hda2ef3Jzi0nIptw8BVA="
		"io/reactivex/rxjava3#rxjava/3.1.12": {
		"jar": "sha256-GAikM+9V3MKWVSPlEquRSl0NcnIoomg+11WdfMz0Tjc=",
		"module": "sha256-2jn02k/u133+ELmAnVyysvO0Ra6nG2nhUjKkJpiThzs=",
		"pom": "sha256-chJrr7gKEse1WFJNCRkj5pYSODxHQay34Aw1ybBUazQ="
		},
		"io/sentry#sentry/8.20.0": {
		"jar": "sha256-G5KZBtERVbA9gwY1XrEGlWL2elwljF0R0h0vnT1GMbQ=",
		@@ -558,22 +551,16 @@
		"jar": "sha256-jklbY0Rp1k+4rPo0laBly6zIoP/1XOHjEAe+TBbcV9M=",
		"pom": "sha256-Vptpd+5GA8llwcRsMFj6bpaSkbAWDraWTdCSzYnq3ZQ="
		},
		"net/bytebuddy#byte-buddy-agent/1.17.6": {
		"jar": "sha256-ioCVlGW7CYSM1BqJMBSQxVudlA3G7DDYq6wPY7Of1dA=",
		"pom": "sha256-Zw0Cz7w5b05+ZhTd3PSghC+vF/l5k3PX4Mt7aq3Njm8="
		},
		"net/bytebuddy#byte-buddy-parent/1.15.11": {
		"pom": "sha256-jcUZ16PnkhEqfNhB6vvsTwDbxjPQha3SDEXwq0dspJY="
		},
		"net/bytebuddy#byte-buddy-parent/1.17.6": {
		"pom": "sha256-3RX5X9VgUmPwZdncuOzuzEjr5NZmw3KY/0RgAUlCQL0="
		"net/bytebuddy#byte-buddy-agent/1.17.7": {
		"jar": "sha256-qbqIfcolKtYbfVFTKU805vO99LJzawQ3PRNhWmlfwP8=",
		"pom": "sha256-gU7kLWsBF/S40etrHWLBbbTAtZfYOzrY2qV4HrFF19w="
		},
		"net/bytebuddy#byte-buddy/1.15.11": {
		"pom": "sha256-IFuLJUGWcX6B2tZyu4aacZr8lt8pf5fYEe/+H0NlPa4="
		"net/bytebuddy#byte-buddy-parent/1.17.7": {
		"pom": "sha256-ilfiDczgDaccM+8+GdndhY/p0gQsouK8onhxcA1SaYw="
		},
		"net/bytebuddy#byte-buddy/1.17.6": {
		"jar": "sha256-0mOCqDnLJtXGKgsPBHFbzvVaUx+WrGzkDeRSocBTnnA=",
		"pom": "sha256-UExH3b8VsOc8ymO52woBwSp83n+LM6DF2dW1BtGUaz4="
		"net/bytebuddy#byte-buddy/1.17.7": {
		"jar": "sha256-NXXcuKmPr5Q9PBWVxHoWBHxPzoqD67smJi8aL2dUY1c=",
		"pom": "sha256-7n+6hWnDu1wekeWBL9n0oPMb4n5WjVNU4a39GRGfl7M="
		},
		"net/java#jvnet-parent/1": {
		"pom": "sha256-KBRAgRJo5l2eJms8yJgpfiFOBPCXQNA4bO60qJI9Y78="
		@@ -584,13 +571,13 @@
		"net/java#jvnet-parent/5": {
		"pom": "sha256-GvaZ+Nndq2f5oNIC+9eRXrA2Klpt/V/8VMr6NGXJywo="
		},
		"net/java/dev/jna#jna-platform/5.17.0": {
		"jar": "sha256-t+PUbIe60utAmw5wSRa82BIGFo41cxLf3dDiU2ec2eA=",
		"pom": "sha256-CjC3l622giFH75jLJJ7z+/SiQ1QqqGv59C+tnmgwWkQ="
		"net/java/dev/jna#jna-platform/5.18.0": {
		"jar": "sha256-eH7Jywp2Eh/1TTVI8GKNsJAB8TVSHj7b+/rJV953qzw=",
		"pom": "sha256-4zkW2g+tjn0EZgihqx3/6RzJ4trVsUqY4LpkD//iP58="
		},
		"net/java/dev/jna#jna/5.17.0": {
		"jar": "sha256-s6lAjnxR4I7w47/MCPRD9uwPYZG6jNfBjVPSsi5b28A=",
		"pom": "sha256-UBoP8F2EpK0Q9t4lvpT0k5i3CjG+jzoO2fTGtE++/uQ="
		"net/java/dev/jna#jna/5.18.0": {
		"jar": "sha256-/ifB5eNKasqEy0TaXxUnHNaQabHPcBq1unMgxXxVxDk=",
		"pom": "sha256-SIq1HOC+VwAYcI0M0VtfpPp9Kx022BzvdTfVG9TXsDs="
		},
		"net/rdrei/android/buildtimetracker#gradle-plugin/0.11.1": {
		"jar": "sha256-VTLp3rXka/R3KpkXFRrW4TqRLj8jZH8ffuoi/DsLTsg=",
		@@ -698,10 +685,10 @@
		"org/apache/logging#logging-parent/11.3.0": {
		"pom": "sha256-pcmFtW/hxYQzOTtQkabznlufeFGN2PySE0aQWZtk19A="
		},
		"org/apache/logging/log4j#log4j-api/2.25.1": {
		"jar": "sha256-ILnHfAqeVNEGOjnlUdyvmMfY56SZRkj4TQueFMcfchU=",
		"module": "sha256-6tMmKCISCzyfiiDNDZnVY1lg1SeyBD1n//Zr6HeDHJo=",
		"pom": "sha256-up6JUpGBShh506YMLUEReZMk64R5seASpHs1GjeIMcM="
		"org/apache/logging/log4j#log4j-api/2.25.2": {
		"jar": "sha256-n9Zsn+C+oG+pZmwUeYmkbK+qkrSoh1NpfTlFzEMzjLs=",
		"module": "sha256-WPeF66u6zDA/Ow5aSF91X9qzKQ9p5JsDT4lj0ngjZV4=",
		"pom": "sha256-CVYJaiUCQIyVioMXTytqV9yy5bB7uRTISHMrRLirvcM="
		},
		"org/apache/logging/log4j#log4j-bom/2.10.0": {
		"pom": "sha256-8CEjRUmwLxK23xRaaw5ixrl4FCfjDjckmgX2XF3R7WY="
		@@ -712,11 +699,11 @@
		"org/apache/logging/log4j#log4j-bom/2.24.3": {
		"pom": "sha256-sXq38yj0WGt+cfjJT8NaXaK86AcFpdYwBAIsGSiDNVg="
		},
		"org/apache/logging/log4j#log4j-bom/2.25.1": {
		"pom": "sha256-uKwjMoSXEbL3R0QVk3vbuWfSuTAO9M/+PzW+Oxqhik4="
		"org/apache/logging/log4j#log4j-bom/2.25.2": {
		"pom": "sha256-Tym32cLZcP0qZpcXa/fd3EFQifYNaW0ov98xsk6S8Rw="
		},
		"org/apache/logging/log4j#log4j/2.25.1": {
		"pom": "sha256-CuZl9wnhMQboIwM2+GzYMrgbytXAWQlyXD/3dD3U/10="
		"org/apache/logging/log4j#log4j/2.25.2": {
		"pom": "sha256-HYBXBY0LBcj3clyhrbpoc5y+rHWJjsoGpIymEVRsA+w="
		},
		"org/apache/pdfbox#fontbox/2.0.26": {
		"jar": "sha256-lGdMfRDqRdmw3BA4eJJjf8jvtcadLnJpTxxm/rm7btc=",
		@@ -762,9 +749,9 @@
		"module": "sha256-4IAoExN1s1fR0oc06aT7QhbahLJAZByz7358fWKCI/w=",
		"pom": "sha256-MjVQgdEJCVw9XTdNWkO09MG3XVSemD71ByPidy5TAqA="
		},
		"org/assertj#assertj-core/3.27.4": {
		"jar": "sha256-zGmqhPeTVstjXD+f8/ht/w+djufve2hKLJqZgE/0UAg=",
		"pom": "sha256-nLMcgATISEPShMQCqBRTvupFCb+neP9CKmcvfny/Ygw="
		"org/assertj#assertj-core/3.27.6": {
		"jar": "sha256-snhysEmryI4jyFPOWReUXdV9Q70xF12FLjlB0qb9AjE=",
		"pom": "sha256-sPgJRcedY8PDPWEL2HVNXppUNpVfev1oPQFg2GErquw="
		},
		"org/controlsfx#controlsfx/11.2.2": {
		"jar": "sha256-BDwGYtUmljR9r4T8aQJ0xhIuD4CjFXo1St086oPA3qk=",
		@@ -913,17 +900,17 @@
		"org/mockito#mockito-bom/4.11.0": {
		"pom": "sha256-2FMadGyYj39o7V8YjN6pRQBq6pk+xd+eUk4NJ9YUkdo="
		},
		"org/mockito#mockito-core/5.19.0": {
		"jar": "sha256-2HX/I0pLcuDu3+Fw3YBHl6S4e6THYgfJZZ1vRrUnh3s=",
		"pom": "sha256-NlnpFp4TwLUT6D7c1R6vqlcdYMYq9YGOzQkhqi0M0Bg="
		"org/mockito#mockito-core/5.20.0": {
		"jar": "sha256-0altJSEo06QkfP2KLnZBLvo8wQOXe+F5M8lCEXok83Q=",
		"pom": "sha256-mQPiB1XAxIh6q5xPEAYft/ERUdOp+t2WTp+6QnIm0TU="
		},
		"org/mockito#mockito-inline/5.2.0": {
		"jar": "sha256-7lLhwpmmMhhPuidKk3CZPgkUBCn15RbmxVcP1ldLKX8=",
		"pom": "sha256-cG00cOVtMaO1YwaY0Qeb79uYMUWwGE5LorhNo4eo9oQ="
		},
		"org/mockito#mockito-junit-jupiter/5.19.0": {
		"jar": "sha256-fPu3qcEZgFPGmcZjR5/Ug2rMIsJlAAPI3uIOf7xVplo=",
		"pom": "sha256-x+4XLR/ALo/I/I8EPIfHGzXLfXR+kJNGQ9SSCTrXoUs="
		"org/mockito#mockito-junit-jupiter/5.20.0": {
		"jar": "sha256-/WxwPCsAuRTzrbwnsYB3pwjz1pkvGSQsRE5zfGzOAk4=",
		"pom": "sha256-gaVJ/8nISoefwe5k1jAHqwClOk75avtTaQ8oRWker5g="
		},
		"org/objenesis#objenesis-parent/3.3": {
		"pom": "sha256-MFw4SqLx4cf+U6ltpBw+w1JDuX1CjSSo93mBjMEL5P8="
		@@ -1024,9 +1011,9 @@
		"jar": "sha256-j4ds4qmqTpWx8ZUpUCVRA+JIdCUFCmVPMoVEe6YBwVQ=",
		"pom": "sha256-dVdRq2w3oaMa+1ueSllcDdLv0rUNcDshJVuCfFDtYVM="
		},
		"org/projectlombok#lombok/1.18.38": {
		"jar": "sha256-Hh5CfDb/Y8RP0w7yktnnc+oxVEYKtiZdP+1+b1vFD7k=",
		"pom": "sha256-gWXuhymafa8GmnyYG3u4YENCE7mvyqurC0abO6v0jm0="
		"org/projectlombok#lombok/1.18.40": {
		"jar": "sha256-t2TDobDIZ0jJ4ugNZOA9RUAs4+3rYx+oHjCla/+m2vM=",
		"pom": "sha256-1nxojbairP4dHNGr2cCKgSec4IFnu6k5gG+CqijxcF8="
		},
		"org/rauschig#jarchivelib/0.6.0": {
		"jar": "sha256-u/9XGPF0HRYkJreWaPJKznhTPHicnEBJtbewxTF39BQ=",

pkgs/by-name/ed/ed-odyssey-materials-helper/package.nix

+8 −5

Original line number	Diff line number	Diff line
		@@ -2,8 +2,8 @@
		stdenv,
		lib,
		fetchFromGitHub,
		gradle,
		jdk24,
		gradle_9,
		jdk25,
		wrapGAppsHook3,
		libXxf86vm,
		libXtst,
		@@ -16,15 +16,18 @@
		makeDesktopItem,
		writeScript,
		}:
		let
		gradle = gradle_9;
		in
		stdenv.mkDerivation rec {
		pname = "ed-odyssey-materials-helper";
		version = "3.0.1";
		version = "3.0.6";

		src = fetchFromGitHub {
		owner = "jixxed";
		repo = "ed-odyssey-materials-helper";
		tag = version;
		hash = "sha256-tdpt0/TO7K1bK6OMCR9s5TbN1/v1ZywCzO/IvdOfsSA=";
		hash = "sha256-4VxaQF1kmBo/9M0psr7jvshy1XhS02zUSMSuWvyEcoo=";
		};

		nativeBuildInputs = [
		@@ -63,7 +66,7 @@ stdenv.mkDerivation rec {
		};

		gradleFlags = [
		"-Dorg.gradle.java.home=${jdk24}"
		"-Dorg.gradle.java.home=${jdk25}"
		"--stacktrace"
		];

pkgs/by-name/op/openjfx/package.nix

+0 −2

Original line number	Diff line number	Diff line
		@@ -36,14 +36,12 @@
		jdk17_headless,
		jdk21_headless,
		jdk23_headless,
		jdk24_headless,
		jdk25_headless,
		jdk-bootstrap ?
		{
		"17" = jdk17_headless;
		"21" = jdk21_headless;
		"23" = jdk23_headless;
		"24" = jdk24_headless;
		"25" = jdk25_headless;
		}
		.${featureVersion},

pkgs/by-name/we/weasis/package.nix

+4 −4

Original line number	Diff line number	Diff line
		@@ -2,7 +2,7 @@
		lib,
		stdenv,
		fetchzip,
		jdk24,
		jdk25,
		unzip,
		copyDesktopItems,
		makeDesktopItem,
		@@ -60,7 +60,7 @@ stdenv.mkDerivation (finalAttrs: {
		buildPhase = ''
		runHook preBuild

		./build/script/package-weasis.sh --no-installer --jdk ${jdk24}
		./build/script/package-weasis.sh --no-installer --jdk ${jdk25}

		runHook postBuild
		'';
		@@ -70,12 +70,12 @@ stdenv.mkDerivation (finalAttrs: {
		''
		+ lib.optionalString stdenv.isLinux ''
		mkdir -p $out/share/{applications,pixmaps}
		mv weasis-${platform}-jdk${lib.versions.major jdk24.version}-${finalAttrs.version}/Weasis/* $out/
		mv weasis-${platform}-jdk${lib.versions.major jdk25.version}-${finalAttrs.version}/Weasis/* $out/
		mv $out/lib/*.png $out/share/pixmaps/
		''
		+ lib.optionalString stdenv.isDarwin ''
		mkdir -p $out/Applications
		mv weasis-${platform}-jdk${lib.versions.major jdk24.version}-${finalAttrs.version}/Weasis.app $out/Applications/
		mv weasis-${platform}-jdk${lib.versions.major jdk25.version}-${finalAttrs.version}/Weasis.app $out/Applications/
		''
		+ ''
		runHook postInstall

pkgs/development/compilers/openjdk/24/source.json

deleted100644 → 0

+0 −6

Original line number	Diff line number	Diff line
		{
		"hash": "sha256-YgkTSh7U/tJxiJIi8fxCkVgcogMQbcN4PgjmlcHcOBE=",
		"owner": "openjdk",
		"repo": "jdk24u",
		"rev": "refs/tags/jdk-24.0.2+12"
		}

Admin message