diff options
Diffstat (limited to 'pkgs/development')
16 files changed, 309 insertions, 123 deletions
diff --git a/pkgs/development/compilers/corretto/17.nix b/pkgs/development/compilers/corretto/17.nix index c3c55a93f0201..c557012e8cdb8 100644 --- a/pkgs/development/compilers/corretto/17.nix +++ b/pkgs/development/compilers/corretto/17.nix @@ -30,5 +30,5 @@ corretto.overrideAttrs (final: prev: { url = "https://git.alpinelinux.org/aports/plain/community/openjdk17/FixNullPtrCast.patch?id=41e78a067953e0b13d062d632bae6c4f8028d91c"; sha256 = "sha256-LzmSew51+DyqqGyyMw2fbXeBluCiCYsS1nCjt9hX6zo="; }) - prev.patches; + (prev.patches or [ ]); }) diff --git a/pkgs/development/compilers/gnu-smalltalk/0000-fix_mkorder.patch b/pkgs/development/compilers/gnu-smalltalk/0000-fix_mkorder.patch new file mode 100644 index 0000000000000..7b6fae2d5f03e --- /dev/null +++ b/pkgs/development/compilers/gnu-smalltalk/0000-fix_mkorder.patch @@ -0,0 +1,21 @@ +--- a/packages/gtk/mkorder.awk ++++ b/packages/gtk/mkorder.awk +@@ -33,6 +33,9 @@ + paths[1] = "." + n_paths = 1 + n_prefixes = split(_prefixes, prefixes) ++ ++ ignored_files = [ "glib/gwin32.h" ] ++ + split(_libs, libs) + split(_files, files) + for (i = 1; (i in libs); i++) +@@ -60,7 +63,7 @@ + + function process_file(name, file) { + file = find_file(name) +- if (file in processed) ++ if ((name in ignored_files) or (file in processed)) + return + processed[file] = 1 + if (file == "") diff --git a/pkgs/development/compilers/gnu-smalltalk/default.nix b/pkgs/development/compilers/gnu-smalltalk/default.nix index 1caf96c715cbb..c6d9109031208 100644 --- a/pkgs/development/compilers/gnu-smalltalk/default.nix +++ b/pkgs/development/compilers/gnu-smalltalk/default.nix @@ -25,6 +25,12 @@ in stdenv.mkDerivation rec { sha256 = "1k2ssrapfzhngc7bg1zrnd9n2vyxp9c9m70byvsma6wapbvib6l1"; }; + patches = [ + # The awk script incorrectly parsed `glib/glib.h` and was trying to find `glib/gwin32.h`, + # that isn't included since we're building only for linux. + ./0000-fix_mkorder.patch + ]; + # The dependencies and their justification are explained at # http://smalltalk.gnu.org/download nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/compilers/semeru-bin/generate-sources.py b/pkgs/development/compilers/semeru-bin/generate-sources.py index da23559955d92..44ad583ab48f7 100755 --- a/pkgs/development/compilers/semeru-bin/generate-sources.py +++ b/pkgs/development/compilers/semeru-bin/generate-sources.py @@ -6,10 +6,10 @@ import re import requests import sys -feature_versions = (8, 11, 16, 17) +feature_versions = (8, 11, 16, 17, 21) oses = ("mac", "linux") types = ("jre", "jdk") -impls = ("openj9") +impls = ("openj9",) arch_to_nixos = { "x64": ("x86_64",), diff --git a/pkgs/development/compilers/semeru-bin/jdk-darwin.nix b/pkgs/development/compilers/semeru-bin/jdk-darwin.nix index f58fec3a84c0d..2e9bde029f2d9 100644 --- a/pkgs/development/compilers/semeru-bin/jdk-darwin.nix +++ b/pkgs/development/compilers/semeru-bin/jdk-darwin.nix @@ -3,14 +3,18 @@ let sources = (lib.importJSON ./sources.json).openj9.mac; common = opts: callPackage (import ./jdk-darwin-base.nix opts) {}; + + EOL = [ "This JDK/JRE version has reached End of Life." ]; in { jdk-8 = common { sourcePerArch = sources.jdk.openjdk8; }; jre-8 = common { sourcePerArch = sources.jre.openjdk8; }; jdk-11 = common { sourcePerArch = sources.jdk.openjdk11; }; jre-11 = common { sourcePerArch = sources.jre.openjdk11; }; - jdk-16 = common { sourcePerArch = sources.jdk.openjdk16; }; - jre-16 = common { sourcePerArch = sources.jre.openjdk16; }; + jdk-16 = common { sourcePerArch = sources.jdk.openjdk16; knownVulnerabilities = EOL; }; + jre-16 = common { sourcePerArch = sources.jre.openjdk16; knownVulnerabilities = EOL; }; jdk-17 = common { sourcePerArch = sources.jdk.openjdk17; }; jre-17 = common { sourcePerArch = sources.jre.openjdk17; }; + jdk-21 = common { sourcePerArch = sources.jdk.openjdk21; }; + jre-21 = common { sourcePerArch = sources.jre.openjdk21; }; } diff --git a/pkgs/development/compilers/semeru-bin/jdk-linux.nix b/pkgs/development/compilers/semeru-bin/jdk-linux.nix index c80dd991bf042..59c6a4862d913 100644 --- a/pkgs/development/compilers/semeru-bin/jdk-linux.nix +++ b/pkgs/development/compilers/semeru-bin/jdk-linux.nix @@ -3,14 +3,18 @@ let sources = (lib.importJSON ./sources.json).openj9.linux; common = opts: callPackage (import ./jdk-linux-base.nix opts) {}; + + EOL = [ "This JDK/JRE version has reached End of Life." ]; in { jdk-8 = common { sourcePerArch = sources.jdk.openjdk8; }; jre-8 = common { sourcePerArch = sources.jre.openjdk8; }; jdk-11 = common { sourcePerArch = sources.jdk.openjdk11; }; jre-11 = common { sourcePerArch = sources.jre.openjdk11; }; - jdk-16 = common { sourcePerArch = sources.jdk.openjdk16; }; - jre-16 = common { sourcePerArch = sources.jre.openjdk16; }; + jdk-16 = common { sourcePerArch = sources.jdk.openjdk16; knownVulnerabilities = EOL; }; + jre-16 = common { sourcePerArch = sources.jre.openjdk16; knownVulnerabilities = EOL; }; jdk-17 = common { sourcePerArch = sources.jdk.openjdk17; }; jre-17 = common { sourcePerArch = sources.jre.openjdk17; }; + jdk-21 = common { sourcePerArch = sources.jdk.openjdk21; }; + jre-21 = common { sourcePerArch = sources.jre.openjdk21; }; } diff --git a/pkgs/development/compilers/semeru-bin/sources.json b/pkgs/development/compilers/semeru-bin/sources.json index 5e04fa90af748..ccca4a2ee7ad5 100644 --- a/pkgs/development/compilers/semeru-bin/sources.json +++ b/pkgs/development/compilers/semeru-bin/sources.json @@ -4,18 +4,18 @@ "jdk": { "openjdk11": { "aarch64": { - "build": "8", - "sha256": "488739171f84e3949df6ccb1c40eaf1b73541748b123d88780329648d6b383d0", - "url": "https://github.com/ibmruntimes/semeru11-binaries/releases/download/jdk-11.0.16%2B8_openj9-0.33.0/ibm-semeru-open-jdk_aarch64_linux_11.0.16_8_openj9-0.33.0.tar.gz", - "version": "11.0.16" + "build": "9", + "sha256": "23e280da1ce418692323f8aad94069ef34bae6566a98ffd349fc2cbb9fa285af", + "url": "https://github.com/ibmruntimes/semeru11-binaries/releases/download/jdk-11.0.23%2B9_openj9-0.44.0/ibm-semeru-open-jdk_aarch64_linux_11.0.23_9_openj9-0.44.0.tar.gz", + "version": "11.0.23" }, "packageType": "jdk", "vmType": "openj9", "x86_64": { - "build": "8", - "sha256": "eeca01d4e245a001d01663c5c20a8d50ef3d572b47a9b3689a5154f2a37bf005", - "url": "https://github.com/ibmruntimes/semeru11-binaries/releases/download/jdk-11.0.16%2B8_openj9-0.33.0/ibm-semeru-open-jdk_x64_linux_11.0.16_8_openj9-0.33.0.tar.gz", - "version": "11.0.16" + "build": "9", + "sha256": "033261124af247f944f820cad158df2b9db58945b4998750258c37d62fac99ff", + "url": "https://github.com/ibmruntimes/semeru11-binaries/releases/download/jdk-11.0.23%2B9_openj9-0.44.0/ibm-semeru-open-jdk_x64_linux_11.0.23_9_openj9-0.44.0.tar.gz", + "version": "11.0.23" } }, "openjdk16": { @@ -36,52 +36,68 @@ }, "openjdk17": { "aarch64": { - "build": "8", - "sha256": "18d291411ee4a956018b4dcefe436971e73694128782617f1b44beca991956c5", - "url": "https://github.com/ibmruntimes/semeru17-binaries/releases/download/jdk-17.0.4%2B8_openj9-0.33.0/ibm-semeru-open-jdk_aarch64_linux_17.0.4_8_openj9-0.33.0.tar.gz", - "version": "17.0.4" + "build": "9", + "sha256": "cfdff21ce44ae6af494cba75c1f323bef83a982f2c11944988bab2125f85b906", + "url": "https://github.com/ibmruntimes/semeru17-binaries/releases/download/jdk-17.0.9%2B9_openj9-0.41.0/ibm-semeru-open-jdk_aarch64_linux_17.0.9_9_openj9-0.41.0.tar.gz", + "version": "17.0.9" }, "packageType": "jdk", "vmType": "openj9", "x86_64": { - "build": "8", - "sha256": "78ae15d9e01fce3a473f4d6a90c331fb766211b950931088c2a85590f178ad39", - "url": "https://github.com/ibmruntimes/semeru17-binaries/releases/download/jdk-17.0.4%2B8_openj9-0.33.0/ibm-semeru-open-jdk_x64_linux_17.0.4_8_openj9-0.33.0.tar.gz", - "version": "17.0.4" + "build": "9", + "sha256": "9b945e58f024108a20eb907015cca4a452332b7644e8dd8e051149a3ec62e3a3", + "url": "https://github.com/ibmruntimes/semeru17-binaries/releases/download/jdk-17.0.9%2B9_openj9-0.41.0/ibm-semeru-open-jdk_x64_linux_17.0.9_9_openj9-0.41.0.tar.gz", + "version": "17.0.9" + } + }, + "openjdk21": { + "aarch64": { + "build": "9", + "sha256": "718e465d1b22034d889445e8ae371fc58dfc733c454cf344fa5e10db0ab8a775", + "url": "https://github.com/ibmruntimes/semeru21-binaries/releases/download/jdk-21.0.3%2B9_openj9-0.44.0/ibm-semeru-open-jdk_aarch64_linux_21.0.3_9_openj9-0.44.0.tar.gz", + "version": "21.0.3" + }, + "packageType": "jdk", + "vmType": "openj9", + "x86_64": { + "build": "9", + "sha256": "5cccb39dc7ca6c61a11bd7179c4c3c30b747f9f22129576feef921b59725af25", + "url": "https://github.com/ibmruntimes/semeru21-binaries/releases/download/jdk-21.0.3%2B9_openj9-0.44.0/ibm-semeru-open-jdk_x64_linux_21.0.3_9_openj9-0.44.0.tar.gz", + "version": "21.0.3" } }, "openjdk8": { "aarch64": { - "build": "01", - "sha256": "6b89e648899709459b7c7dbe0a5b1ea480a88da84c6163f01255d638dbdd051b", - "url": "https://github.com/ibmruntimes/semeru8-binaries/releases/download/8u345-b01_openj9-0.33.0/ibm-semeru-open-jdk_aarch64_linux_8u345b01_openj9-0.33.0.tar.gz", - "version": "8.0.345" + "build": "08", + "sha256": "2baa88e7ed0ea9f72310fb4adfe99ee06fdb514cc04517b0e0be3c0646493ea3", + "url": "https://github.com/ibmruntimes/semeru8-binaries/releases/download/jdk8u412-b08_openj9-0.44.0/ibm-semeru-open-jdk_aarch64_linux_8u412b08_openj9-0.44.0.tar.gz", + "version": "8.0.412" }, "packageType": "jdk", "vmType": "openj9", "x86_64": { - "build": "01", - "sha256": "82c8232a5cb420246457d65a5014602feb8b288079cdae896e22a2eb6e390b58", - "url": "https://github.com/ibmruntimes/semeru8-binaries/releases/download/8u345-b01_openj9-0.33.0/ibm-semeru-open-jdk_x64_linux_8u345b01_openj9-0.33.0.tar.gz", - "version": "8.0.345" + "build": "08", + "sha256": "85af2c57078aab240ce31ba3f7a8e86696ff5bdf4c30f3c37f107986f07b23a6", + "url": "https://github.com/ibmruntimes/semeru8-binaries/releases/download/jdk8u412-b08_openj9-0.44.0/ibm-semeru-open-jdk_x64_linux_8u412b08_openj9-0.44.0.tar.gz", + "version": "8.0.412" } } }, "jre": { "openjdk11": { "aarch64": { - "build": "8", - "sha256": "49dc05a3e9f3f99c5f8fa466261aa3e33a753694c67cabfa7d3f682e5a2e3685", - "url": "https://github.com/ibmruntimes/semeru11-binaries/releases/download/jdk-11.0.16%2B8_openj9-0.33.0/ibm-semeru-open-jre_aarch64_linux_11.0.16_8_openj9-0.33.0.tar.gz", - "version": "11.0.16" + "build": "9", + "sha256": "8613dc2b6c403f48d2a8e25da92ab9f8a7b5dd63cb81d1917e4cb070ae371557", + "url": "https://github.com/ibmruntimes/semeru11-binaries/releases/download/jdk-11.0.23%2B9_openj9-0.44.0/ibm-semeru-open-jre_aarch64_linux_11.0.23_9_openj9-0.44.0.tar.gz", + "version": "11.0.23" }, "packageType": "jre", "vmType": "openj9", "x86_64": { - "build": "8", - "sha256": "ba09711193b8b8664478f3f949b5320232f65c1bdf61f32a885d84de73c02767", - "url": "https://github.com/ibmruntimes/semeru11-binaries/releases/download/jdk-11.0.16%2B8_openj9-0.33.0/ibm-semeru-open-jre_x64_linux_11.0.16_8_openj9-0.33.0.tar.gz", - "version": "11.0.16" + "build": "9", + "sha256": "b9558416d6d773fce0d9b4d3f875fdfc5ffc1afd922570b0f7a6f7cbab7468ab", + "url": "https://github.com/ibmruntimes/semeru11-binaries/releases/download/jdk-11.0.23%2B9_openj9-0.44.0/ibm-semeru-open-jre_x64_linux_11.0.23_9_openj9-0.44.0.tar.gz", + "version": "11.0.23" } }, "openjdk16": { @@ -102,34 +118,50 @@ }, "openjdk17": { "aarch64": { - "build": "8", - "sha256": "6c40c1e0d7ee0509c44465e9f26dd970904137a95fd751e6447b1d6a9ef5092a", - "url": "https://github.com/ibmruntimes/semeru17-binaries/releases/download/jdk-17.0.4%2B8_openj9-0.33.0/ibm-semeru-open-jre_aarch64_linux_17.0.4_8_openj9-0.33.0.tar.gz", - "version": "17.0.4" + "build": "9", + "sha256": "9760aa27a5790a8c20a702ff5f036535f3df51d3fb291bb5254b5ae76e096bad", + "url": "https://github.com/ibmruntimes/semeru17-binaries/releases/download/jdk-17.0.9%2B9_openj9-0.41.0/ibm-semeru-open-jre_aarch64_linux_17.0.9_9_openj9-0.41.0.tar.gz", + "version": "17.0.9" + }, + "packageType": "jre", + "vmType": "openj9", + "x86_64": { + "build": "9", + "sha256": "1caf409f33f7738efe37742197525b5ae6244d6383b2017e7b8e925dc0b6a329", + "url": "https://github.com/ibmruntimes/semeru17-binaries/releases/download/jdk-17.0.9%2B9_openj9-0.41.0/ibm-semeru-open-jre_x64_linux_17.0.9_9_openj9-0.41.0.tar.gz", + "version": "17.0.9" + } + }, + "openjdk21": { + "aarch64": { + "build": "9", + "sha256": "0222dc3749e1c94bd1b047cdb02eb18310aefd9f7965b66196da06e4e3844b7a", + "url": "https://github.com/ibmruntimes/semeru21-binaries/releases/download/jdk-21.0.3%2B9_openj9-0.44.0/ibm-semeru-open-jre_aarch64_linux_21.0.3_9_openj9-0.44.0.tar.gz", + "version": "21.0.3" }, "packageType": "jre", "vmType": "openj9", "x86_64": { - "build": "8", - "sha256": "b2c176f8aa8cc7138d4c22ce9298d8f49597e1d8e3fdd33125898e5ee0182c93", - "url": "https://github.com/ibmruntimes/semeru17-binaries/releases/download/jdk-17.0.4%2B8_openj9-0.33.0/ibm-semeru-open-jre_x64_linux_17.0.4_8_openj9-0.33.0.tar.gz", - "version": "17.0.4" + "build": "9", + "sha256": "b831e8c418374ccec13c51f60c36f4c32266f3cc83cb31f32286f89c26d66e00", + "url": "https://github.com/ibmruntimes/semeru21-binaries/releases/download/jdk-21.0.3%2B9_openj9-0.44.0/ibm-semeru-open-jre_x64_linux_21.0.3_9_openj9-0.44.0.tar.gz", + "version": "21.0.3" } }, "openjdk8": { "aarch64": { - "build": "01", - "sha256": "03caff41622e84a6e7fa66a225414a9b6eefb38dd215f830cae0bc4bbfc55b5c", - "url": "https://github.com/ibmruntimes/semeru8-binaries/releases/download/8u345-b01_openj9-0.33.0/ibm-semeru-open-jre_aarch64_linux_8u345b01_openj9-0.33.0.tar.gz", - "version": "8.0.345" + "build": "08", + "sha256": "08a41a48b79881590d65a09c62c56d8bcd9b8453f03420bcfd5dd3165bbba3c1", + "url": "https://github.com/ibmruntimes/semeru8-binaries/releases/download/jdk8u412-b08_openj9-0.44.0/ibm-semeru-open-jre_aarch64_linux_8u412b08_openj9-0.44.0.tar.gz", + "version": "8.0.412" }, "packageType": "jre", "vmType": "openj9", "x86_64": { - "build": "01", - "sha256": "0d4fe62716b9da2ccce324b5b46d57e8d47e5dfb5d128f87e16135ee9bc36cdc", - "url": "https://github.com/ibmruntimes/semeru8-binaries/releases/download/8u345-b01_openj9-0.33.0/ibm-semeru-open-jre_x64_linux_8u345b01_openj9-0.33.0.tar.gz", - "version": "8.0.345" + "build": "08", + "sha256": "ac5022b52b33b22c51d8370655f6157fd999e5e24c6525f91d1e778f34abcb8b", + "url": "https://github.com/ibmruntimes/semeru8-binaries/releases/download/jdk8u412-b08_openj9-0.44.0/ibm-semeru-open-jre_x64_linux_8u412b08_openj9-0.44.0.tar.gz", + "version": "8.0.412" } } } @@ -138,18 +170,18 @@ "jdk": { "openjdk11": { "aarch64": { - "build": "8", - "sha256": "9881b292142a129f6f5c6b21608b090f8f94625052b4f7d0ce5bd982c054ca2e", - "url": "https://github.com/ibmruntimes/semeru11-binaries/releases/download/jdk-11.0.16%2B8_openj9-0.33.0/ibm-semeru-open-jdk_aarch64_mac_11.0.16_8_openj9-0.33.0.tar.gz", - "version": "11.0.16" + "build": "9", + "sha256": "451336700a8b219d219e2e3b26b60154c44e8ab209056cc3466b0fcd4b15e53d", + "url": "https://github.com/ibmruntimes/semeru11-binaries/releases/download/jdk-11.0.23%2B9_openj9-0.44.0/ibm-semeru-open-jdk_aarch64_mac_11.0.23_9_openj9-0.44.0.tar.gz", + "version": "11.0.23" }, "packageType": "jdk", "vmType": "openj9", "x86_64": { - "build": "8", - "sha256": "8638735d2cae3efff212f898728685380355bb0a298076e9e46244d0bf3d4a64", - "url": "https://github.com/ibmruntimes/semeru11-binaries/releases/download/jdk-11.0.16%2B8_openj9-0.33.0/ibm-semeru-open-jdk_x64_mac_11.0.16_8_openj9-0.33.0.tar.gz", - "version": "11.0.16" + "build": "9", + "sha256": "6a225f3024d1919528107ece20256e8a8594523ea2204d93a041c012cbf1e2d2", + "url": "https://github.com/ibmruntimes/semeru11-binaries/releases/download/jdk-11.0.23%2B9_openj9-0.44.0/ibm-semeru-open-jdk_x64_mac_11.0.23_9_openj9-0.44.0.tar.gz", + "version": "11.0.23" } }, "openjdk16": { @@ -164,46 +196,62 @@ }, "openjdk17": { "aarch64": { - "build": "8", - "sha256": "bf22628b54115dff9939b94751531544ab735b7cbbc8d6ddfe83d1b04df3a532", - "url": "https://github.com/ibmruntimes/semeru17-binaries/releases/download/jdk-17.0.4%2B8_openj9-0.33.0/ibm-semeru-open-jdk_aarch64_mac_17.0.4_8_openj9-0.33.0.tar.gz", - "version": "17.0.4" + "build": "9", + "sha256": "5fed15250cb613a4024f2b2e75ccb54e6526ffa5ff78d955a6e2a11ae330f003", + "url": "https://github.com/ibmruntimes/semeru17-binaries/releases/download/jdk-17.0.9%2B9_openj9-0.41.0/ibm-semeru-open-jdk_aarch64_mac_17.0.9_9_openj9-0.41.0.tar.gz", + "version": "17.0.9" }, "packageType": "jdk", "vmType": "openj9", "x86_64": { - "build": "8", - "sha256": "a935f20564e347a9292955c04eb57e51efdb1853ae7f0b4fe759b22c9fe248be", - "url": "https://github.com/ibmruntimes/semeru17-binaries/releases/download/jdk-17.0.4%2B8_openj9-0.33.0/ibm-semeru-open-jdk_x64_mac_17.0.4_8_openj9-0.33.0.tar.gz", - "version": "17.0.4" + "build": "9", + "sha256": "585f48be83935a44ef980249aaab024119d4ea6ef0937a2cd2d97d0c77cda1c2", + "url": "https://github.com/ibmruntimes/semeru17-binaries/releases/download/jdk-17.0.9%2B9_openj9-0.41.0/ibm-semeru-open-jdk_x64_mac_17.0.9_9_openj9-0.41.0.tar.gz", + "version": "17.0.9" + } + }, + "openjdk21": { + "aarch64": { + "build": "9", + "sha256": "a95896a4ca7b69050a25b1557520f430abc66d098e9fd15cd394e20c4c93e5cf", + "url": "https://github.com/ibmruntimes/semeru21-binaries/releases/download/jdk-21.0.3%2B9_openj9-0.44.0/ibm-semeru-open-jdk_aarch64_mac_21.0.3_9_openj9-0.44.0.tar.gz", + "version": "21.0.3" + }, + "packageType": "jdk", + "vmType": "openj9", + "x86_64": { + "build": "9", + "sha256": "95640346ef677fbdbf40efa0298cc61314cffed0c43d1b3bd329b84d445db869", + "url": "https://github.com/ibmruntimes/semeru21-binaries/releases/download/jdk-21.0.3%2B9_openj9-0.44.0/ibm-semeru-open-jdk_x64_mac_21.0.3_9_openj9-0.44.0.tar.gz", + "version": "21.0.3" } }, "openjdk8": { "packageType": "jdk", "vmType": "openj9", "x86_64": { - "build": "01", - "sha256": "c69086950c006b17484a70ef7bc85e92d121be15e69e282e1446fd238d42b6b4", - "url": "https://github.com/ibmruntimes/semeru8-binaries/releases/download/8u345-b01_openj9-0.33.0/ibm-semeru-open-jdk_x64_mac_8u345b01_openj9-0.33.0.tar.gz", - "version": "8.0.345" + "build": "08", + "sha256": "4e8a34442fc0c1c1288ca4d251ecfe744c201ec6494103d8dafa52e785d3f8ae", + "url": "https://github.com/ibmruntimes/semeru8-binaries/releases/download/jdk8u412-b08_openj9-0.44.0/ibm-semeru-open-jdk_x64_mac_8u412b08_openj9-0.44.0.tar.gz", + "version": "8.0.412" } } }, "jre": { "openjdk11": { "aarch64": { - "build": "8", - "sha256": "39802020896476342dc11486e3cbdf10f6311c172abeb4a1e2931b472da4417e", - "url": "https://github.com/ibmruntimes/semeru11-binaries/releases/download/jdk-11.0.16%2B8_openj9-0.33.0/ibm-semeru-open-jre_aarch64_mac_11.0.16_8_openj9-0.33.0.tar.gz", - "version": "11.0.16" + "build": "9", + "sha256": "be6ba7e6904e8ca2fab9dab38607af1e4d36f6a391584eb8c4de0804493f3626", + "url": "https://github.com/ibmruntimes/semeru11-binaries/releases/download/jdk-11.0.23%2B9_openj9-0.44.0/ibm-semeru-open-jre_aarch64_mac_11.0.23_9_openj9-0.44.0.tar.gz", + "version": "11.0.23" }, "packageType": "jre", "vmType": "openj9", "x86_64": { - "build": "8", - "sha256": "92f87a3c2fb5fe60d3d51020ff95b9c234b2ae2677b79aebbe749dda717c9cdd", - "url": "https://github.com/ibmruntimes/semeru11-binaries/releases/download/jdk-11.0.16%2B8_openj9-0.33.0/ibm-semeru-open-jre_x64_mac_11.0.16_8_openj9-0.33.0.tar.gz", - "version": "11.0.16" + "build": "9", + "sha256": "9f9505e9ee5082c070de965c790d51758a9969b7bb9ca49057d0d5afb5cfc99b", + "url": "https://github.com/ibmruntimes/semeru11-binaries/releases/download/jdk-11.0.23%2B9_openj9-0.44.0/ibm-semeru-open-jre_x64_mac_11.0.23_9_openj9-0.44.0.tar.gz", + "version": "11.0.23" } }, "openjdk16": { @@ -218,28 +266,44 @@ }, "openjdk17": { "aarch64": { - "build": "8", - "sha256": "4057c94cd46b814cc5a4d683d5f0b95dbd0b9e13e8c2e11155561ad0d8bec85b", - "url": "https://github.com/ibmruntimes/semeru17-binaries/releases/download/jdk-17.0.4%2B8_openj9-0.33.0/ibm-semeru-open-jre_aarch64_mac_17.0.4_8_openj9-0.33.0.tar.gz", - "version": "17.0.4" + "build": "9", + "sha256": "fbd093ab7218c916aa4f49ac851635020dd1c8a98a98158fc44a6565e3d182ed", + "url": "https://github.com/ibmruntimes/semeru17-binaries/releases/download/jdk-17.0.9%2B9_openj9-0.41.0/ibm-semeru-open-jre_aarch64_mac_17.0.9_9_openj9-0.41.0.tar.gz", + "version": "17.0.9" + }, + "packageType": "jre", + "vmType": "openj9", + "x86_64": { + "build": "9", + "sha256": "f5781de29132c04f54341349e99954ec3cfbdbc65fdebdd00feff47c68793299", + "url": "https://github.com/ibmruntimes/semeru17-binaries/releases/download/jdk-17.0.9%2B9_openj9-0.41.0/ibm-semeru-open-jre_x64_mac_17.0.9_9_openj9-0.41.0.tar.gz", + "version": "17.0.9" + } + }, + "openjdk21": { + "aarch64": { + "build": "9", + "sha256": "55650c3825a22dc1caabf672ee8e2ef3ce4cee32df92e7317780d3eae18f17a5", + "url": "https://github.com/ibmruntimes/semeru21-binaries/releases/download/jdk-21.0.3%2B9_openj9-0.44.0/ibm-semeru-open-jre_aarch64_mac_21.0.3_9_openj9-0.44.0.tar.gz", + "version": "21.0.3" }, "packageType": "jre", "vmType": "openj9", "x86_64": { - "build": "8", - "sha256": "8e957d2eb47eaca64516ac669272c6e5186155ed8ee4d6a77e0d4b7811cd7bb6", - "url": "https://github.com/ibmruntimes/semeru17-binaries/releases/download/jdk-17.0.4%2B8_openj9-0.33.0/ibm-semeru-open-jre_x64_mac_17.0.4_8_openj9-0.33.0.tar.gz", - "version": "17.0.4" + "build": "9", + "sha256": "4b4d6da4da96dfa233d0c262bcaecb15b29162a81c802179f56e4084141c6fd8", + "url": "https://github.com/ibmruntimes/semeru21-binaries/releases/download/jdk-21.0.3%2B9_openj9-0.44.0/ibm-semeru-open-jre_x64_mac_21.0.3_9_openj9-0.44.0.tar.gz", + "version": "21.0.3" } }, "openjdk8": { "packageType": "jre", "vmType": "openj9", "x86_64": { - "build": "01", - "sha256": "019e08dea8fbd54517dacbeac791d85717902800dd8bba77fbca1dfc6b0abd9e", - "url": "https://github.com/ibmruntimes/semeru8-binaries/releases/download/8u345-b01_openj9-0.33.0/ibm-semeru-open-jre_x64_mac_8u345b01_openj9-0.33.0.tar.gz", - "version": "8.0.345" + "build": "08", + "sha256": "baf7d026012acc234fb1c2e64adf544a84449c856ee25a130c5aec32fbe34e3a", + "url": "https://github.com/ibmruntimes/semeru8-binaries/releases/download/jdk8u412-b08_openj9-0.44.0/ibm-semeru-open-jre_x64_mac_8u412b08_openj9-0.44.0.tar.gz", + "version": "8.0.412" } } } diff --git a/pkgs/development/python-modules/okonomiyaki/default.nix b/pkgs/development/python-modules/okonomiyaki/default.nix index d68f9d5b92831..5845857ea1650 100644 --- a/pkgs/development/python-modules/okonomiyaki/default.nix +++ b/pkgs/development/python-modules/okonomiyaki/default.nix @@ -12,6 +12,7 @@ mock, packaging, testfixtures, + pythonAtLeast, }: buildPythonPackage rec { @@ -58,5 +59,6 @@ buildPythonPackage rec { description = "An experimental library aimed at consolidating a lot of low-level code used for Enthought's eggs"; maintainers = with maintainers; [ genericnerdyusername ]; license = licenses.bsd3; + broken = pythonAtLeast "3.12"; # multiple tests are failing }; } diff --git a/pkgs/development/python-modules/pystray/default.nix b/pkgs/development/python-modules/pystray/default.nix index 07cd05cad5277..a448933fcc78f 100644 --- a/pkgs/development/python-modules/pystray/default.nix +++ b/pkgs/development/python-modules/pystray/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, + fetchpatch, pillow, xlib, six, @@ -15,19 +16,28 @@ buildPythonPackage rec { pname = "pystray"; - version = "0.19.2"; - format = "pyproject"; + version = "0.19.5"; + pyproject = true; src = fetchFromGitHub { owner = "moses-palmer"; repo = "pystray"; rev = "v${version}"; - hash = "sha256-8B178MSe4ujlnGBmQhIu+BoAh1doP9V5cL0ermLQTvs="; + hash = "sha256-CZhbaXwKFrRBEomzfFPMQdMkTOl5lbgI64etfDRiRu4="; }; + patches = [ + # fix test_menu_construct_from_none test case + # https://github.com/moses-palmer/pystray/pull/133 + (fetchpatch { + url = "https://github.com/moses-palmer/pystray/commit/813007e3034d950d93a2f3e5b029611c3c9c98ad.patch"; + hash = "sha256-m2LfZcWXSfgxb73dac21VDdMDVz3evzcCz5QjdnfM1U="; + }) + ]; + postPatch = '' substituteInPlace setup.py \ - --replace "'sphinx >=1.3.1'" "" + --replace-fail "'sphinx >=1.3.1'" "" ''; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pyxnat/default.nix b/pkgs/development/python-modules/pyxnat/default.nix index b905ba64bead3..b6f0944cfa5ac 100644 --- a/pkgs/development/python-modules/pyxnat/default.nix +++ b/pkgs/development/python-modules/pyxnat/default.nix @@ -9,13 +9,14 @@ networkx, pandas, requests, - six, + setuptools, }: buildPythonPackage rec { pname = "pyxnat"; - version = "1.6"; - format = "setuptools"; + version = "1.6.2"; + pyproject = true; + disabled = pythonOlder "3.8"; # PyPI dist missing test configuration files: @@ -23,21 +24,19 @@ buildPythonPackage rec { owner = "pyxnat"; repo = "pyxnat"; rev = "refs/tags/${version}"; - hash = "sha256-QejYisvQFN7CsDOx9wAgTHmRZcSEqgIr8twG4XucfZ4="; + hash = "sha256-21nTIYbIYlFWNJTxqsuijamqRunpdc7/VBawvrWadWI="; }; + build-system = [ setuptools ]; + propagatedBuildInputs = [ lxml requests - six ]; - # future is not used, and pathlib is installed part of python38+ - # w/o an external package + # pathlib is installed part of python38+ w/o an external package prePatch = '' - substituteInPlace setup.py \ - --replace "pathlib>=1.0" "" \ - --replace "future>=0.16" "" + substituteInPlace setup.py --replace-fail "pathlib>=1.0" "" sed -i '/--cov/d' setup.cfg ''; @@ -52,15 +51,24 @@ buildPythonPackage rec { ''; pytestFlagsArray = [ "pyxnat" ]; disabledTestPaths = [ - # try to access network even though PYXNAT_SKIP_NETWORK_TESTS is set: + # require a running local XNAT instance e.g. in a docker container: + "pyxnat/tests/attributes_test.py" + "pyxnat/tests/custom_variables_test.py" + "pyxnat/tests/interfaces_test.py" "pyxnat/tests/pipelines_test.py" + "pyxnat/tests/provenance_test.py" + "pyxnat/tests/prearchive_test.py" + "pyxnat/tests/repr_test.py" + "pyxnat/tests/resources_test.py" "pyxnat/tests/search_test.py" + "pyxnat/tests/sessionmirror_test.py" + "pyxnat/tests/test_resource_functions.py" "pyxnat/tests/user_and_project_management_test.py" ]; disabledTests = [ # try to access network even though PYXNAT_SKIP_NETWORK_TESTS is set: - "test_ashs_volumes" "test_inspector_structure" + "test_project_manager" ]; pythonImportsCheck = [ "pyxnat" ]; diff --git a/pkgs/development/python-modules/scikit-fmm/default.nix b/pkgs/development/python-modules/scikit-fmm/default.nix index c1a9ba9abcab7..aa97c1b9bb7a5 100644 --- a/pkgs/development/python-modules/scikit-fmm/default.nix +++ b/pkgs/development/python-modules/scikit-fmm/default.nix @@ -1,7 +1,9 @@ { lib, buildPythonPackage, + fetchpatch, fetchPypi, + meson-python, numpy, python, }: @@ -9,14 +11,42 @@ buildPythonPackage rec { pname = "scikit-fmm"; version = "2023.4.2"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit pname version; hash = "sha256-14ccR/ggdyq6kvJWUe8U5NJ96M45PArjwCqzxuJCPAs="; }; - propagatedBuildInputs = [ numpy ]; + # TODO: Remove these patches after another stable release is made. + # For now, these allow us to build with Python 3.12+ by switching to Meson + # and off the deprecated distutils. + patches = [ + (fetchpatch { + name = "first-try-at-meson-build.patch"; + hash = "sha256-Kclg4YrQZL6ZSVsLh6X6DqdztPjDK35L5dp5PqYjzaY="; + url = "https://github.com/scikit-fmm/scikit-fmm/commit/a52c0eccb70077553607a5084152316d136b668b.patch"; + }) + (fetchpatch { + name = "work-in-progress-on-meson-build.patch"; + hash = "sha256-WvSwBz7exqe1H+CqdoMfT5jEoIHnyt/nbc/CryuEKiA="; + url = "https://github.com/scikit-fmm/scikit-fmm/commit/db0e7a5f51541745027c3d081d7841e74587793e.patch"; + }) + (fetchpatch { + name = "re-cythonize-the-heap-wrapper.patch"; + hash = "sha256-ro97+06R0szXQ9I8/sR4JAnFxoQwJeiImDcl1Yp9P0Y="; + url = "https://github.com/scikit-fmm/scikit-fmm/commit/4168323e209343facd5f6ba93a85893242e781a2.patch"; + }) + ]; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "oldest-supported-numpy" "numpy" + ''; + + build-system = [ meson-python ]; + + dependencies = [ numpy ]; checkPhase = '' mkdir testdir; cd testdir diff --git a/pkgs/development/python-modules/vnoise/default.nix b/pkgs/development/python-modules/vnoise/default.nix new file mode 100644 index 0000000000000..02f917bc17aca --- /dev/null +++ b/pkgs/development/python-modules/vnoise/default.nix @@ -0,0 +1,35 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, numpy +, pytestCheckHook +, setuptools +}: + +buildPythonPackage rec { + pname = "vnoise"; + version = "0.1.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "plottertools"; + repo = "vnoise"; + rev = version; + hash = "sha256-nflAh3vj48wneM0wy/+M+XD6GC63KZEIFb1x4SS46YI="; + }; + + nativeBuildInputs = [ setuptools ]; + + propagatedBuildInputs = [ numpy ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "vnoise" ]; + + meta = with lib; { + description = "Vectorized, pure-Python Perlin noise library"; + homepage = "https://github.com/plottertools/vnoise"; + license = licenses.mit; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/pkgs/development/python-modules/xyzservices/default.nix b/pkgs/development/python-modules/xyzservices/default.nix index 5d9e1d4d48e1d..1e808d5875376 100644 --- a/pkgs/development/python-modules/xyzservices/default.nix +++ b/pkgs/development/python-modules/xyzservices/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "xyzservices"; version = "2024.4.0"; - format = "pyproject"; + pyproject = true; src = fetchPypi { inherit pname version; @@ -24,9 +24,9 @@ buildPythonPackage rec { setuptools-scm ]; - disabledTests = [ + pytestFlagsArray = [ # requires network connections - "test_free_providers" + "-m 'not request'" ]; pythonImportsCheck = [ "xyzservices.providers" ]; @@ -37,11 +37,11 @@ buildPythonPackage rec { requests ]; - meta = with lib; { + meta = { changelog = "https://github.com/geopandas/xyzservices/releases/tag/${version}"; description = "Source of XYZ tiles providers"; homepage = "https://github.com/geopandas/xyzservices"; - license = licenses.bsd3; - maintainers = with maintainers; [ ]; + license = lib.licenses.bsd3; + maintainers = lib.teams.geospatial.members; }; } diff --git a/pkgs/development/python-modules/zipfile2/default.nix b/pkgs/development/python-modules/zipfile2/default.nix index e16a0cc6b25b1..967497c009665 100644 --- a/pkgs/development/python-modules/zipfile2/default.nix +++ b/pkgs/development/python-modules/zipfile2/default.nix @@ -2,6 +2,7 @@ buildPythonPackage, fetchFromGitHub, lib, + pythonAtLeast, }: buildPythonPackage rec { @@ -25,5 +26,6 @@ buildPythonPackage rec { description = "A backwards-compatible improved zipfile class"; maintainers = with maintainers; [ genericnerdyusername ]; license = licenses.psfl; + broken = pythonAtLeast "3.12"; # tests are failing because the signature of ZipInfo._decodeExtra changed }; } diff --git a/pkgs/development/rocm-modules/5/rocm-runtime/default.nix b/pkgs/development/rocm-modules/5/rocm-runtime/default.nix index f94f49d00bd4c..58730f40817fe 100644 --- a/pkgs/development/rocm-modules/5/rocm-runtime/default.nix +++ b/pkgs/development/rocm-modules/5/rocm-runtime/default.nix @@ -7,7 +7,7 @@ , xxd , rocm-device-libs , rocm-thunk -, libelf +, elfutils , libdrm , numactl , valgrind @@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ rocm-thunk - libelf + elfutils libdrm numactl valgrind diff --git a/pkgs/development/rocm-modules/6/rocm-runtime/default.nix b/pkgs/development/rocm-modules/6/rocm-runtime/default.nix index f603b708265de..1e728fb73cf79 100644 --- a/pkgs/development/rocm-modules/6/rocm-runtime/default.nix +++ b/pkgs/development/rocm-modules/6/rocm-runtime/default.nix @@ -8,7 +8,7 @@ , xxd , rocm-device-libs , rocm-thunk -, libelf +, elfutils , libdrm , numactl , valgrind @@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ rocm-thunk - libelf + elfutils libdrm numactl valgrind |