diff options
Diffstat (limited to 'nixpkgs/pkgs/development/compilers')
193 files changed, 5812 insertions, 3507 deletions
diff --git a/nixpkgs/pkgs/development/compilers/abcl/default.nix b/nixpkgs/pkgs/development/compilers/abcl/default.nix index 94f74e81906e..7d8e043101fb 100644 --- a/nixpkgs/pkgs/development/compilers/abcl/default.nix +++ b/nixpkgs/pkgs/development/compilers/abcl/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "abcl"; - version = "1.9.1"; + version = "1.9.2"; src = fetchurl { url = "https://common-lisp.net/project/armedbear/releases/${version}/${pname}-src-${version}.tar.gz"; - sha256 = "sha256-pbxnfJRB9KgzwgpUG93Rb/+SZIRmkd6aHa9mmfj/EeI="; + sha256 = "sha256-Ti9Lj4Xi2V2V5b282foXrWExoX4vzxK8Gf+5e0i8HTg="; }; configurePhase = '' @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { description = "A JVM-based Common Lisp implementation"; license = lib.licenses.gpl3 ; maintainers = lib.teams.lisp.members; - platforms = lib.platforms.linux; + platforms = lib.platforms.darwin ++ lib.platforms.linux; homepage = "https://common-lisp.net/project/armedbear/"; }; } diff --git a/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/sources.json b/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/sources.json index 54b75e8e73c7..18b8e683bc94 100644 --- a/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/sources.json +++ b/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/sources.json @@ -6,10 +6,10 @@ "packageType": "jdk", "vmType": "hotspot", "x86_64": { - "build": "101", - "sha256": "327b3bfd1c14e15bf6c7fb4d0c6c3f9406c1282a16e24b1424215d764f687cb6", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.16.1%2B1/OpenJDK11U-jdk_x64_alpine-linux_hotspot_11.0.16.1_1.tar.gz", - "version": "11.0.16" + "build": "7", + "sha256": "45f56d75da2f55b29e7307cc790958e379abbe6b5f160a3824dc26e320c718e5", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.19%2B7/OpenJDK11U-jdk_x64_alpine-linux_hotspot_11.0.19_7.tar.gz", + "version": "11.0.19" } } }, @@ -18,10 +18,10 @@ "packageType": "jre", "vmType": "hotspot", "x86_64": { - "build": "101", - "sha256": "4cdebb54ead80e6dff562ad51db850244b1b419ba72062782156df59854a6b22", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.16.1%2B1/OpenJDK11U-jre_x64_alpine-linux_hotspot_11.0.16.1_1.tar.gz", - "version": "11.0.16" + "build": "7", + "sha256": "b5d71cdf3032040e7d2a577712bf525e32e87686af3430219308a39878b98851", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.19%2B7/OpenJDK11U-jre_x64_alpine-linux_hotspot_11.0.19_7.tar.gz", + "version": "11.0.19" } } } @@ -30,36 +30,36 @@ "jdk": { "hotspot": { "aarch64": { - "build": "101", - "sha256": "79572f5172c6a040591d34632f98a20ed148702bbce2f57649e8ac01c0d2e3db", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.14.1%2B1/OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.14.1_1.tar.gz", - "version": "11.0.14" + "build": "7", + "sha256": "0c7763a19b4af4ef5fbae831781b5184e988d6f131d264482399eeaf51b6e254", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.19%2B7/OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.19_7.tar.gz", + "version": "11.0.19" }, "armv6l": { - "build": "101", - "sha256": "f4d53a1753cdde830d7872c6a1279df441f3f9aeb5d5037a568b3a392ebce9c2", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.14.1%2B1/OpenJDK11U-jdk_arm_linux_hotspot_11.0.14.1_1.tar.gz", - "version": "11.0.14" + "build": "7", + "sha256": "be07af349f0d2e1ffb7e01e1e8bac8bffd76e22f6cc1354e5b627222e3395f41", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.19%2B7/OpenJDK11U-jdk_arm_linux_hotspot_11.0.19_7.tar.gz", + "version": "11.0.19" }, "armv7l": { - "build": "101", - "sha256": "f4d53a1753cdde830d7872c6a1279df441f3f9aeb5d5037a568b3a392ebce9c2", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.14.1%2B1/OpenJDK11U-jdk_arm_linux_hotspot_11.0.14.1_1.tar.gz", - "version": "11.0.14" + "build": "7", + "sha256": "be07af349f0d2e1ffb7e01e1e8bac8bffd76e22f6cc1354e5b627222e3395f41", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.19%2B7/OpenJDK11U-jdk_arm_linux_hotspot_11.0.19_7.tar.gz", + "version": "11.0.19" }, "packageType": "jdk", "powerpc64le": { - "build": "101", - "sha256": "9750e11721282a9afd18a07743f19c699b2b71ce20d02f3f0a906088b9ae6d9a", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.14.1%2B1/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.14.1_1.tar.gz", - "version": "11.0.14" + "build": "7", + "sha256": "1e3704c8e155f8f894953c2a6708a52e6f449bbf5a85450be6fbb2ec76581700", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.19%2B7/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.19_7.tar.gz", + "version": "11.0.19" }, "vmType": "hotspot", "x86_64": { - "build": "101", - "sha256": "43fb84f8063ad9bf6b6d694a67b8f64c8827552b920ec5ce794dfe5602edffe7", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.14.1%2B1/OpenJDK11U-jdk_x64_linux_hotspot_11.0.14.1_1.tar.gz", - "version": "11.0.14" + "build": "7", + "sha256": "5f19fb28aea3e28fcc402b73ce72f62b602992d48769502effe81c52ca39a581", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.19%2B7/OpenJDK11U-jdk_x64_linux_hotspot_11.0.19_7.tar.gz", + "version": "11.0.19" } }, "openj9": { @@ -88,36 +88,36 @@ "jre": { "hotspot": { "aarch64": { - "build": "101", - "sha256": "6426ce7dfdacaa798ec7779e0bec30ec8510df491fb2c965e8e6bf2f88af27e9", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.14.1%2B1/OpenJDK11U-jre_aarch64_linux_hotspot_11.0.14.1_1.tar.gz", - "version": "11.0.14" + "build": "7", + "sha256": "1fe4b20d808f393422610818711c728331992a4455eeeb061d3d05b45412771d", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.19%2B7/OpenJDK11U-jre_aarch64_linux_hotspot_11.0.19_7.tar.gz", + "version": "11.0.19" }, "armv6l": { - "build": "101", - "sha256": "964a5d3c1f63209e5ad908a302220b3ba2e81a6574b7b7a5020f736e1496835f", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.14.1%2B1/OpenJDK11U-jre_arm_linux_hotspot_11.0.14.1_1.tar.gz", - "version": "11.0.14" + "build": "7", + "sha256": "cb754b055177381f9f6852b7e5469904a15edddd7f8e136043c28b1e33aee47c", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.19%2B7/OpenJDK11U-jre_arm_linux_hotspot_11.0.19_7.tar.gz", + "version": "11.0.19" }, "armv7l": { - "build": "101", - "sha256": "964a5d3c1f63209e5ad908a302220b3ba2e81a6574b7b7a5020f736e1496835f", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.14.1%2B1/OpenJDK11U-jre_arm_linux_hotspot_11.0.14.1_1.tar.gz", - "version": "11.0.14" + "build": "7", + "sha256": "cb754b055177381f9f6852b7e5469904a15edddd7f8e136043c28b1e33aee47c", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.19%2B7/OpenJDK11U-jre_arm_linux_hotspot_11.0.19_7.tar.gz", + "version": "11.0.19" }, "packageType": "jre", "powerpc64le": { - "build": "101", - "sha256": "8c9efc13680f43b742a54ecb3be614efd62749d401e780143fef3ac5403a6284", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.14.1%2B1/OpenJDK11U-jre_ppc64le_linux_hotspot_11.0.14.1_1.tar.gz", - "version": "11.0.14" + "build": "7", + "sha256": "8019d938e5525938ec8e68e2989c4413263b0d9b7b3f20fe0c45f6d967919cfb", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.19%2B7/OpenJDK11U-jre_ppc64le_linux_hotspot_11.0.19_7.tar.gz", + "version": "11.0.19" }, "vmType": "hotspot", "x86_64": { - "build": "101", - "sha256": "b5a6960bc6bb0b1a967e307f908ea9b06ad7adbbd9df0b8954ab51374faa8a98", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.14.1%2B1/OpenJDK11U-jre_x64_linux_hotspot_11.0.14.1_1.tar.gz", - "version": "11.0.14" + "build": "7", + "sha256": "32dcf760664f93531594b72ce9226e9216567de5705a23c9ff5a77c797948054", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.19%2B7/OpenJDK11U-jre_x64_linux_hotspot_11.0.19_7.tar.gz", + "version": "11.0.19" } }, "openj9": { @@ -147,13 +147,19 @@ "mac": { "jdk": { "hotspot": { + "aarch64": { + "build": "7", + "sha256": "f3b416ecccf51f45cc8c986975eb7bd35e7e1ad953656ab0a807125963fcf73b", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.19%2B7/OpenJDK11U-jdk_aarch64_mac_hotspot_11.0.19_7.tar.gz", + "version": "11.0.19" + }, "packageType": "jdk", "vmType": "hotspot", "x86_64": { - "build": "101", - "sha256": "8c69808f5d9d209b195575e979de0e43cdf5d0f1acec1853a569601fe2c1f743", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.14.1%2B1/OpenJDK11U-jdk_x64_mac_hotspot_11.0.14.1_1.tar.gz", - "version": "11.0.14" + "build": "7", + "sha256": "fc34c4f0e590071dcd65a0f93540913466ccac3aa8caa984826713b67afb696d", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.19%2B7/OpenJDK11U-jdk_x64_mac_hotspot_11.0.19_7.tar.gz", + "version": "11.0.19" } }, "openj9": { @@ -169,13 +175,19 @@ }, "jre": { "hotspot": { + "aarch64": { + "build": "7", + "sha256": "78a07bd60c278f65bafd0df93890d909ff60259ccbd22ad71a1c3b312906508e", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.19%2B7/OpenJDK11U-jre_aarch64_mac_hotspot_11.0.19_7.tar.gz", + "version": "11.0.19" + }, "packageType": "jre", "vmType": "hotspot", "x86_64": { - "build": "101", - "sha256": "1b2f792ad05af9dba876db962c189527e645b48f50ceb842b4e39169de553303", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.14.1%2B1/OpenJDK11U-jre_x64_mac_hotspot_11.0.14.1_1.tar.gz", - "version": "11.0.14" + "build": "7", + "sha256": "87e439b2193e1a2cf1a8782168bba83b558f54e2708f88ea8296184ea2735c89", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.19%2B7/OpenJDK11U-jre_x64_mac_hotspot_11.0.19_7.tar.gz", + "version": "11.0.19" } }, "openj9": { @@ -852,10 +864,10 @@ "packageType": "jdk", "vmType": "hotspot", "x86_64": { - "build": "101", - "sha256": "1a1706304c26da0d8d2e05127c5aa7dba00e5401b2c0228c8ae894d2812beee0", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.4.1%2B1/OpenJDK17U-jdk_x64_alpine-linux_hotspot_17.0.4.1_1.tar.gz", - "version": "17.0.4" + "build": "7", + "sha256": "b6edac2fa669876ef16b4895b36b61d01066626e7a69feba2acc19760c8d18cb", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.7%2B7/OpenJDK17U-jdk_x64_alpine-linux_hotspot_17.0.7_7.tar.gz", + "version": "17.0.7" } } }, @@ -864,10 +876,10 @@ "packageType": "jre", "vmType": "hotspot", "x86_64": { - "build": "101", - "sha256": "cd0300449a26b3141e313f6ab55b20edfa4b289dc44a7a3989fa2c29152bf7fb", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.4.1%2B1/OpenJDK17U-jre_x64_alpine-linux_hotspot_17.0.4.1_1.tar.gz", - "version": "17.0.4" + "build": "7", + "sha256": "711f837bacf8222dee9e8cd7f39941a4a0acf869243f03e6038ca3ba189f66ca", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.7%2B7/OpenJDK17U-jre_x64_alpine-linux_hotspot_17.0.7_7.tar.gz", + "version": "17.0.7" } } } @@ -876,60 +888,72 @@ "jdk": { "hotspot": { "aarch64": { - "build": "8", - "sha256": "302caf29f73481b2b914ba2b89705036010c65eb9bc8d7712b27d6e9bedf6200", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.2%2B8/OpenJDK17U-jdk_aarch64_linux_hotspot_17.0.2_8.tar.gz", - "version": "17.0.2" + "build": "7", + "sha256": "0084272404b89442871e0a1f112779844090532978ad4d4191b8d03fc6adfade", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.7%2B7/OpenJDK17U-jdk_aarch64_linux_hotspot_17.0.7_7.tar.gz", + "version": "17.0.7" }, "armv6l": { - "build": "8", - "sha256": "544936145a4a9b1a316ed3708cd91b3960d5e8e87578bea73ef674ca3047158e", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.2%2B8/OpenJDK17U-jdk_arm_linux_hotspot_17.0.2_8.tar.gz", - "version": "17.0.2" + "build": "7", + "sha256": "e7a84c3e59704588510d7e6cce1f732f397b54a3b558c521912a18a1b4d0abdc", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.7%2B7/OpenJDK17U-jdk_arm_linux_hotspot_17.0.7_7.tar.gz", + "version": "17.0.7" }, "armv7l": { - "build": "8", - "sha256": "544936145a4a9b1a316ed3708cd91b3960d5e8e87578bea73ef674ca3047158e", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.2%2B8/OpenJDK17U-jdk_arm_linux_hotspot_17.0.2_8.tar.gz", - "version": "17.0.2" + "build": "7", + "sha256": "e7a84c3e59704588510d7e6cce1f732f397b54a3b558c521912a18a1b4d0abdc", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.7%2B7/OpenJDK17U-jdk_arm_linux_hotspot_17.0.7_7.tar.gz", + "version": "17.0.7" }, "packageType": "jdk", + "powerpc64le": { + "build": "7", + "sha256": "8f4366ff1eddb548b1744cd82a1a56ceee60abebbcbad446bfb3ead7ac0f0f85", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.7%2B7/OpenJDK17U-jdk_ppc64le_linux_hotspot_17.0.7_7.tar.gz", + "version": "17.0.7" + }, "vmType": "hotspot", "x86_64": { - "build": "8", - "sha256": "288f34e3ba8a4838605636485d0365ce23e57d5f2f68997ac4c2e4c01967cd48", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.2%2B8/OpenJDK17U-jdk_x64_linux_hotspot_17.0.2_8.tar.gz", - "version": "17.0.2" + "build": "7", + "sha256": "e9458b38e97358850902c2936a1bb5f35f6cffc59da9fcd28c63eab8dbbfbc3b", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.7%2B7/OpenJDK17U-jdk_x64_linux_hotspot_17.0.7_7.tar.gz", + "version": "17.0.7" } } }, "jre": { "hotspot": { "aarch64": { - "build": "8", - "sha256": "6ef7a28d0d844fe347ab18f65a91db744547321fe8a101d883bd80722183ab64", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.2%2B8/OpenJDK17U-jre_aarch64_linux_hotspot_17.0.2_8.tar.gz", - "version": "17.0.2" + "build": "7", + "sha256": "2ff6a4fd1fa354047c93ba8c3179967156162f27bd683aee1f6e52a480bcbe6a", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.7%2B7/OpenJDK17U-jre_aarch64_linux_hotspot_17.0.7_7.tar.gz", + "version": "17.0.7" }, "armv6l": { - "build": "8", - "sha256": "4fd1d11f3008aba1c6c17e1d1c1cf15e2a54e68275ad0874b47a781eaf73450e", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.2%2B8/OpenJDK17U-jre_arm_linux_hotspot_17.0.2_8.tar.gz", - "version": "17.0.2" + "build": "7", + "sha256": "5b0401199c7c9163b8395ebf25195ed395fec7b7ef7158c36302420cf993825a", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.7%2B7/OpenJDK17U-jre_arm_linux_hotspot_17.0.7_7.tar.gz", + "version": "17.0.7" }, "armv7l": { - "build": "8", - "sha256": "4fd1d11f3008aba1c6c17e1d1c1cf15e2a54e68275ad0874b47a781eaf73450e", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.2%2B8/OpenJDK17U-jre_arm_linux_hotspot_17.0.2_8.tar.gz", - "version": "17.0.2" + "build": "7", + "sha256": "5b0401199c7c9163b8395ebf25195ed395fec7b7ef7158c36302420cf993825a", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.7%2B7/OpenJDK17U-jre_arm_linux_hotspot_17.0.7_7.tar.gz", + "version": "17.0.7" }, "packageType": "jre", + "powerpc64le": { + "build": "7", + "sha256": "cc25e74c0817cd4d943bba056b256b86e0e9148bf41d7600c5ec2e1eadb2e470", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.7%2B7/OpenJDK17U-jre_ppc64le_linux_hotspot_17.0.7_7.tar.gz", + "version": "17.0.7" + }, "vmType": "hotspot", "x86_64": { - "build": "8", - "sha256": "292ed702d95f5690e52e171afe9f3050b9d2fb803456b155c831735fad0f17c0", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.2%2B8/OpenJDK17U-jre_x64_linux_hotspot_17.0.2_8.tar.gz", - "version": "17.0.2" + "build": "7", + "sha256": "bb025133b96266f6415d5084bb9b260340a813968007f1d2d14690f20bd021ca", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.7%2B7/OpenJDK17U-jre_x64_linux_hotspot_17.0.7_7.tar.gz", + "version": "17.0.7" } } } @@ -938,36 +962,36 @@ "jdk": { "hotspot": { "aarch64": { - "build": "8", - "sha256": "157518e999d712b541b883c6c167f8faabbef1d590da9fe7233541b4adb21ea4", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.2%2B8/OpenJDK17U-jdk_aarch64_mac_hotspot_17.0.2_8.tar.gz", - "version": "17.0.2" + "build": "7", + "sha256": "1d6aeb55b47341e8ec33cc1644d58b88dfdcce17aa003a858baa7460550e6ff9", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.7%2B7/OpenJDK17U-jdk_aarch64_mac_hotspot_17.0.7_7.tar.gz", + "version": "17.0.7" }, "packageType": "jdk", "vmType": "hotspot", "x86_64": { - "build": "8", - "sha256": "3630e21a571b7180876bf08f85d0aac0bdbb3267b2ae9bd242f4933b21f9be32", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.2%2B8/OpenJDK17U-jdk_x64_mac_hotspot_17.0.2_8.tar.gz", - "version": "17.0.2" + "build": "7", + "sha256": "50d0e9840113c93916418068ba6c845f1a72ed0dab80a8a1f7977b0e658b65fb", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.7%2B7/OpenJDK17U-jdk_x64_mac_hotspot_17.0.7_7.tar.gz", + "version": "17.0.7" } } }, "jre": { "hotspot": { "aarch64": { - "build": "8", - "sha256": "f2f23d6629060eb1692c714bfda27dd5f100cc560578c7cdd9df920a8ac1d453", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.2%2B8/OpenJDK17U-jre_aarch64_mac_hotspot_17.0.2_8.tar.gz", - "version": "17.0.2" + "build": "7", + "sha256": "625d070a297a3c856badbaa5c65adaaa1adb3ea3813363fb8335c47709b69140", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.7%2B7/OpenJDK17U-jre_aarch64_mac_hotspot_17.0.7_7.tar.gz", + "version": "17.0.7" }, "packageType": "jre", "vmType": "hotspot", "x86_64": { - "build": "8", - "sha256": "4e2e5e9c079ccc48b056959b2808a96398ebbc92d6b13ee5beb3159b89469aa8", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.2%2B8/OpenJDK17U-jre_x64_mac_hotspot_17.0.2_8.tar.gz", - "version": "17.0.2" + "build": "7", + "sha256": "62559a927a8dbac2ea1d7879f590a62fea87d61bfaa92894e578d2045b8d921b", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.7%2B7/OpenJDK17U-jre_x64_mac_hotspot_17.0.7_7.tar.gz", + "version": "17.0.7" } } } @@ -980,10 +1004,10 @@ "packageType": "jdk", "vmType": "hotspot", "x86_64": { - "build": "1", - "sha256": "e5dcb8f947b687597f92fa80c008a2a17ce86f739dd6dce7ca741921621acb21", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u345-b01/OpenJDK8U-jdk_x64_alpine-linux_hotspot_8u345b01.tar.gz", - "version": "8.0.345" + "build": "7", + "sha256": "cfdf8e07c8eeb087b7a2895b90fc0a19986bcff85006f1e2b708e3964909aa8e", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u372-b07/OpenJDK8U-jdk_x64_alpine-linux_hotspot_8u372b07.tar.gz", + "version": "8.0.372" } } }, @@ -992,10 +1016,10 @@ "packageType": "jre", "vmType": "hotspot", "x86_64": { - "build": "1", - "sha256": "6352a4d55373266af90b2f2ec13f4397ada58f5cdc57944ea046c9c538341fd3", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u345-b01/OpenJDK8U-jre_x64_alpine-linux_hotspot_8u345b01.tar.gz", - "version": "8.0.345" + "build": "7", + "sha256": "95d8cb8b5375ec00a064ed728eb60d925d44c1a79fe92f6ca7385b5863d4f78c", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u372-b07/OpenJDK8U-jre_x64_alpine-linux_hotspot_8u372b07.tar.gz", + "version": "8.0.372" } } } @@ -1004,36 +1028,36 @@ "jdk": { "hotspot": { "aarch64": { - "build": "6", - "sha256": "42ed3ff5a859f9015a1362fb7e650026b913d688eab471714f795651120be173", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u322-b06/OpenJDK8U-jdk_aarch64_linux_hotspot_8u322b06.tar.gz", - "version": "8.0.322" + "build": "7", + "sha256": "195808eb42ab73535c84de05188914a52a47c1ac784e4bf66de95fe1fd315a5a", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u372-b07/OpenJDK8U-jdk_aarch64_linux_hotspot_8u372b07.tar.gz", + "version": "8.0.372" }, "armv6l": { - "build": "6", - "sha256": "0666c466b8aefcc66ab25aea9c0605f5c6eda3b174b1b817a4e4e74da0de0365", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u322-b06/OpenJDK8U-jdk_arm_linux_hotspot_8u322b06.tar.gz", - "version": "8.0.322" + "build": "7", + "sha256": "3f4848700a4bf856d3c138dc9c2b305b978879c8fbef5aa7df34a7c2fe1b64b8", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u372-b07/OpenJDK8U-jdk_arm_linux_hotspot_8u372b07.tar.gz", + "version": "8.0.372" }, "armv7l": { - "build": "6", - "sha256": "0666c466b8aefcc66ab25aea9c0605f5c6eda3b174b1b817a4e4e74da0de0365", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u322-b06/OpenJDK8U-jdk_arm_linux_hotspot_8u322b06.tar.gz", - "version": "8.0.322" + "build": "7", + "sha256": "3f4848700a4bf856d3c138dc9c2b305b978879c8fbef5aa7df34a7c2fe1b64b8", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u372-b07/OpenJDK8U-jdk_arm_linux_hotspot_8u372b07.tar.gz", + "version": "8.0.372" }, "packageType": "jdk", "powerpc64le": { - "build": "6", - "sha256": "c7cc9c5b237e9e1f1e3296593aba427375823592e4604fadf89a8c234c2574e1", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u322-b06/OpenJDK8U-jdk_ppc64le_linux_hotspot_8u322b06.tar.gz", - "version": "8.0.322" + "build": "7", + "sha256": "bb85303848fe402d4f1004f748f80ccb39cb11f356f50a513555d1083c3913b8", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u372-b07/OpenJDK8U-jdk_ppc64le_linux_hotspot_8u372b07.tar.gz", + "version": "8.0.372" }, "vmType": "hotspot", "x86_64": { - "build": "6", - "sha256": "3d62362a78c9412766471b05253507a4cfc212daea5cdf122860173ce902400e", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u322-b06/OpenJDK8U-jdk_x64_linux_hotspot_8u322b06.tar.gz", - "version": "8.0.322" + "build": "7", + "sha256": "78a0b3547d6f3d46227f2ad8c774248425f20f1cd63f399b713f0cdde2cc376c", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u372-b07/OpenJDK8U-jdk_x64_linux_hotspot_8u372b07.tar.gz", + "version": "8.0.372" } }, "openj9": { @@ -1062,36 +1086,36 @@ "jre": { "hotspot": { "aarch64": { - "build": "6", - "sha256": "22496d5e677aaccc5a85e90584d0a012c51a08898f0e09e259eabe67ed81da2b", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u322-b06/OpenJDK8U-jre_aarch64_linux_hotspot_8u322b06.tar.gz", - "version": "8.0.322" + "build": "7", + "sha256": "f8e440273c8feb3fcfaca88ba18fec291deae18a548adde8a37cd1db08107b95", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u372-b07/OpenJDK8U-jre_aarch64_linux_hotspot_8u372b07.tar.gz", + "version": "8.0.372" }, "armv6l": { - "build": "6", - "sha256": "48181f17b85a13c0e2f260c8f4b39483e61664cf07ea00e6210a666fb5210492", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u322-b06/OpenJDK8U-jre_arm_linux_hotspot_8u322b06.tar.gz", - "version": "8.0.322" + "build": "7", + "sha256": "e58e017012838ae4f0db78293e3246cc09958e6ea9a2393c5947ec003bf736dd", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u372-b07/OpenJDK8U-jre_arm_linux_hotspot_8u372b07.tar.gz", + "version": "8.0.372" }, "armv7l": { - "build": "6", - "sha256": "48181f17b85a13c0e2f260c8f4b39483e61664cf07ea00e6210a666fb5210492", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u322-b06/OpenJDK8U-jre_arm_linux_hotspot_8u322b06.tar.gz", - "version": "8.0.322" + "build": "7", + "sha256": "e58e017012838ae4f0db78293e3246cc09958e6ea9a2393c5947ec003bf736dd", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u372-b07/OpenJDK8U-jre_arm_linux_hotspot_8u372b07.tar.gz", + "version": "8.0.372" }, "packageType": "jre", "powerpc64le": { - "build": "6", - "sha256": "f15b536a97c27d114c0b59c86de07ca80a271d3979ed0aa056318ea329e31e5d", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u322-b06/OpenJDK8U-jre_ppc64le_linux_hotspot_8u322b06.tar.gz", - "version": "8.0.322" + "build": "7", + "sha256": "ba5f8141a16722e39576bf42b69d2b8ebf95fc2c05441e3200f609af4dd9f1ea", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u372-b07/OpenJDK8U-jre_ppc64le_linux_hotspot_8u372b07.tar.gz", + "version": "8.0.372" }, "vmType": "hotspot", "x86_64": { - "build": "6", - "sha256": "9c4607cee01919a21c57a36e8c009a7aca7aefd63010c64d7a3023fe8590ebe1", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u322-b06/OpenJDK8U-jre_x64_linux_hotspot_8u322b06.tar.gz", - "version": "8.0.322" + "build": "7", + "sha256": "b6fdfe32085a884c11b31f66aa67ac62811df7112fb6fb08beea61376a86fbb4", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u372-b07/OpenJDK8U-jre_x64_linux_hotspot_8u372b07.tar.gz", + "version": "8.0.372" } }, "openj9": { @@ -1124,10 +1148,10 @@ "packageType": "jdk", "vmType": "hotspot", "x86_64": { - "build": "6", - "sha256": "96a3124bf0f5ca777954239893cc89ea34c4bc9a9b7c1559aa2c69baa0ee84e3", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u322-b06/OpenJDK8U-jdk_x64_mac_hotspot_8u322b06.tar.gz", - "version": "8.0.322" + "build": "7", + "sha256": "9c33db312cc46b6bfe705770fdc5c08edb7d790ba70be4e8b12a98e79da5f4a1", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u372-b07/OpenJDK8U-jdk_x64_mac_hotspot_8u372b07.tar.gz", + "version": "8.0.372" } }, "openj9": { @@ -1146,10 +1170,10 @@ "packageType": "jre", "vmType": "hotspot", "x86_64": { - "build": "6", - "sha256": "42d4ada88e39b0f222ffdcf3c833f442af22852687992997eca82c573e65b86f", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u322-b06/OpenJDK8U-jre_x64_mac_hotspot_8u322b06.tar.gz", - "version": "8.0.322" + "build": "7", + "sha256": "6c876ea7bfa778ae78ec5a976e557b2b981a592a3639eb0d3dc3c8d3dda8d321", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u372-b07/OpenJDK8U-jre_x64_mac_hotspot_8u372b07.tar.gz", + "version": "8.0.372" } }, "openj9": { diff --git a/nixpkgs/pkgs/development/compilers/assemblyscript/default.nix b/nixpkgs/pkgs/development/compilers/assemblyscript/default.nix index 6fe1385bb3fe..a2b1954e645e 100644 --- a/nixpkgs/pkgs/development/compilers/assemblyscript/default.nix +++ b/nixpkgs/pkgs/development/compilers/assemblyscript/default.nix @@ -5,13 +5,13 @@ buildNpmPackage rec { pname = "assemblyscript"; - version = "0.27.5"; + version = "0.27.8"; src = fetchFromGitHub { owner = "AssemblyScript"; repo = pname; rev = "v${version}"; - sha256 = "sha256-3dWIYkiAA61xbUXJGmb/amjHmyXYoy16lLIAZR4sD5k="; + sha256 = "sha256-EwpIUD9+IjJlWOnUEXgvx60i59ftQyHcPTQVWVoOGNQ="; }; npmDepsHash = "sha256-9ILa1qY2GpP2RckcZYcCMmgCwdXIImOm+D8nldeoQL8="; diff --git a/nixpkgs/pkgs/development/compilers/ballerina/default.nix b/nixpkgs/pkgs/development/compilers/ballerina/default.nix index 80c272a08588..b16c5f32fbef 100644 --- a/nixpkgs/pkgs/development/compilers/ballerina/default.nix +++ b/nixpkgs/pkgs/development/compilers/ballerina/default.nix @@ -1,6 +1,6 @@ { ballerina, lib, writeText, runCommand, makeWrapper, fetchzip, stdenv, openjdk }: let - version = "2201.5.0"; + version = "2201.6.0"; codeName = "swan-lake"; in stdenv.mkDerivation { pname = "ballerina"; @@ -8,7 +8,7 @@ in stdenv.mkDerivation { src = fetchzip { url = "https://dist.ballerina.io/downloads/${version}/ballerina-${version}-${codeName}.zip"; - sha256 = "sha256-6UpUKoUHkYW9aPo2AbpP5uC1rCv578ultG9II1jZPRE="; + sha256 = "sha256-yttRswqNq8Tam1OwnC9klwrryDDqdHMzzRs9T9pYlnU="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/nixpkgs/pkgs/development/compilers/bfc/default.nix b/nixpkgs/pkgs/development/compilers/bfc/default.nix index 10c868c19ac5..2dbc5e97a557 100644 --- a/nixpkgs/pkgs/development/compilers/bfc/default.nix +++ b/nixpkgs/pkgs/development/compilers/bfc/default.nix @@ -8,18 +8,18 @@ , stdenv }: -rustPlatform.buildRustPackage { +rustPlatform.buildRustPackage rec { pname = "bfc"; - version = "unstable-2023-02-02"; + version = "1.11.0"; src = fetchFromGitHub { owner = "Wilfred"; repo = "bfc"; - rev = "647379de6ec36b64ba0a098589c8374d0ce32690"; - hash = "sha256-pPx9S7EnrL6aIvLlrCjGDKNYLhzd6ud1RvN+qCiZGXk="; + rev = version; + hash = "sha256-uRQP3LS7cpG85BilkSaI+2WbEp/6zZcFrryMNO+n6EA="; }; - cargoHash = "sha256-5RPB4biLB2BTmfgOGzvnnQjnGp3cTmJdU1CVTAFRvKE="; + cargoHash = "sha256-aQLUZzHBy5CBbp5SpsS5dFQYpD7Bc+4zTfLjA/nmMnE="; buildInputs = [ libxml2 diff --git a/nixpkgs/pkgs/development/compilers/binaryen/default.nix b/nixpkgs/pkgs/development/compilers/binaryen/default.nix index 73f32af28e19..5a139fb29064 100644 --- a/nixpkgs/pkgs/development/compilers/binaryen/default.nix +++ b/nixpkgs/pkgs/development/compilers/binaryen/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "binaryen"; - version = "112"; + version = "114"; src = fetchFromGitHub { owner = "WebAssembly"; repo = "binaryen"; rev = "version_${version}"; - hash = "sha256-xVumVmiLMHJp3SItE8eL8OBPeq58HtOOiK9LL8SP4CQ="; + hash = "sha256-bzHNIQy0AN8mIFGG+638p/MBSqlkWuaOzKGSsMDAPH4="; }; nativeBuildInputs = [ cmake python3 ]; diff --git a/nixpkgs/pkgs/development/compilers/blueprint/default.nix b/nixpkgs/pkgs/development/compilers/blueprint/default.nix index 0016c8a2c7d9..1e5dea00f4c4 100644 --- a/nixpkgs/pkgs/development/compilers/blueprint/default.nix +++ b/nixpkgs/pkgs/development/compilers/blueprint/default.nix @@ -1,23 +1,25 @@ -{ fetchFromGitLab +{ dbus +, fetchFromGitLab , gobject-introspection -, gtk4 , lib +, libadwaita , meson , ninja , python3 , stdenv , testers +, xvfb-run }: stdenv.mkDerivation (finalAttrs: { pname = "blueprint-compiler"; - version = "0.6.0"; + version = "0.10.0"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "jwestman"; repo = "blueprint-compiler"; rev = "v${finalAttrs.version}"; - hash = "sha256-L6EGterkZ8EB6xSnJDZ3IMuOumpTpEGnU74X3UgC7k0="; + hash = "sha256-pPrQc2ID84N+50j/A6VAJAOK+D1hjaokhFckOnOaeTw="; }; nativeBuildInputs = [ @@ -26,6 +28,7 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ + libadwaita (python3.withPackages (ps: with ps; [ pygobject3 ])) @@ -36,12 +39,23 @@ stdenv.mkDerivation (finalAttrs: { gobject-introspection ]; - doCheck = true; - nativeCheckInputs = [ - gtk4 + dbus + xvfb-run ]; + doCheck = true; + + checkPhase = '' + runHook preCheck + + xvfb-run dbus-run-session \ + --config-file=${dbus}/share/dbus-1/session.conf \ + meson test --no-rebuild --print-errorlogs + + runHook postCheck + ''; + passthru.tests.version = testers.testVersion { package = finalAttrs.finalPackage; }; @@ -50,7 +64,7 @@ stdenv.mkDerivation (finalAttrs: { description = "A markup language for GTK user interface files"; homepage = "https://gitlab.gnome.org/jwestman/blueprint-compiler"; license = licenses.lgpl3Plus; - maintainers = with maintainers; [ benediktbroich ranfdev ]; - platforms = platforms.unix; + maintainers = with maintainers; [ benediktbroich paveloom ranfdev ]; + platforms = platforms.linux; }; }) diff --git a/nixpkgs/pkgs/development/compilers/cairo/default.nix b/nixpkgs/pkgs/development/compilers/cairo/default.nix index b39c26d424a9..46eeaec16782 100644 --- a/nixpkgs/pkgs/development/compilers/cairo/default.nix +++ b/nixpkgs/pkgs/development/compilers/cairo/default.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "cairo"; - version = "1.1.0"; + version = "2.0.2"; src = fetchFromGitHub { owner = "starkware-libs"; repo = "cairo"; rev = "v${version}"; - hash = "sha256-8dzDe4Kw9OASD0i3bMooqEclStxS/Ta/tOVCcFhvwSI="; + hash = "sha256-tFWY4bqI+YVVu0E9EPl+c0UAsSn/cjgvEOQtyT9tkYg="; }; - cargoHash = "sha256-IY3RE+EeNRhUSZX+bqojhPl6y8qm+i9C0zQmNApmat8="; + cargoHash = "sha256-fnkzR07MIwzjvg2ZRhhzYIUhuidEBZt0mGfxwHyhyVE="; nativeCheckInputs = [ rustfmt diff --git a/nixpkgs/pkgs/development/compilers/chicken/5/chicken.nix b/nixpkgs/pkgs/development/compilers/chicken/5/chicken.nix index b1fdde8d8668..ed74dfd48239 100644 --- a/nixpkgs/pkgs/development/compilers/chicken/5/chicken.nix +++ b/nixpkgs/pkgs/development/compilers/chicken/5/chicken.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, makeWrapper, darwin, bootstrap-chicken ? null }: +{ lib, stdenv, fetchurl, makeWrapper, darwin, bootstrap-chicken ? null, testers }: let platform = with stdenv; @@ -8,30 +8,41 @@ let else if isSunOS then "solaris" else "linux"; # Should be a sane default in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "chicken"; version = "5.3.0"; binaryVersion = 11; src = fetchurl { - url = "https://code.call-cc.org/releases/${version}/chicken-${version}.tar.gz"; + url = "https://code.call-cc.org/releases/${finalAttrs.version}/chicken-${finalAttrs.version}.tar.gz"; sha256 = "sha256-w62Z2PnhftgQkS75gaw7DC4vRvsOzAM7XDttyhvbDXY="; }; + # Disable two broken tests: "static link" and "linking tests" + postPatch = '' + sed -i tests/runtests.sh -e "/static link/,+4 { s/^/# / }" + sed -i tests/runtests.sh -e "/linking tests/,+11 { s/^/# / }" + ''; + setupHook = lib.optional (bootstrap-chicken != null) ./setup-hook.sh; - # -fno-strict-overflow is not a supported argument in clang on darwin - hardeningDisable = lib.optionals stdenv.isDarwin ["strictoverflow"]; + # -fno-strict-overflow is not a supported argument in clang + hardeningDisable = lib.optionals stdenv.cc.isClang [ "strictoverflow" ]; makeFlags = [ - "PLATFORM=${platform}" "PREFIX=$(out)" - ] ++ (lib.optionals stdenv.isDarwin [ - "XCODE_TOOL_PATH=${darwin.binutils.bintools}/bin" + "PLATFORM=${platform}" + "PREFIX=$(out)" "C_COMPILER=$(CC)" "CXX_COMPILER=$(CXX)" + "TARGET_C_COMPILER=${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc" + "TARGET_CXX_COMPILER=${stdenv.cc}/bin/${stdenv.cc.targetPrefix}c++" + ] ++ (lib.optionals stdenv.isDarwin [ + "XCODE_TOOL_PATH=${darwin.binutils.bintools}/bin" "LINKER_OPTIONS=-headerpad_max_install_names" "POSTINSTALL_PROGRAM=install_name_tool" + ]) ++ (lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + "HOSTSYSTEM=${stdenv.hostPlatform.config}" ]); nativeBuildInputs = [ @@ -44,24 +55,16 @@ stdenv.mkDerivation rec { bootstrap-chicken ]; - postInstall = '' - for f in $out/bin/* - do - wrapProgram $f \ - --prefix PATH : ${lib.makeBinPath [ stdenv.cc ]} - done - ''; - doCheck = !stdenv.isDarwin; postCheck = '' ./csi -R chicken.pathname -R chicken.platform \ - -p "(assert (equal? \"${toString binaryVersion}\" (pathname-file (car (repository-path)))))" + -p "(assert (equal? \"${toString finalAttrs.binaryVersion}\" (pathname-file (car (repository-path)))))" ''; - doInstallCheck = true; - installCheckPhase = '' - $out/bin/chicken -version - ''; + passthru.tests.version = testers.testVersion { + package = finalAttrs.finalPackage; + command = "csi -version"; + }; meta = { homepage = "https://call-cc.org/"; @@ -77,4 +80,4 @@ stdenv.mkDerivation rec { Windows, and many Unix flavours. ''; }; -} +}) diff --git a/nixpkgs/pkgs/development/compilers/chicken/5/deps.toml b/nixpkgs/pkgs/development/compilers/chicken/5/deps.toml index 6b0cad35b05d..b61c38506bb5 100644 --- a/nixpkgs/pkgs/development/compilers/chicken/5/deps.toml +++ b/nixpkgs/pkgs/development/compilers/chicken/5/deps.toml @@ -107,16 +107,16 @@ version = "0.6" [apropos] dependencies = ["srfi-1", "utf8", "string-utils", "symbol-utils", "check-errors"] license = "bsd" -sha256 = "0graywcx94xvn9m4lk86f3qipsvnvr3vww6mqr37kd0ykj2rwrb7" +sha256 = "1xnqfnbnac4pzm4j3mphq09p18q962dxg11cfyxqk8k6v8qrv5nh" synopsis = "CHICKEN apropos" -version = "3.7.0" +version = "3.7.2" [arcadedb] dependencies = ["uri-common", "medea"] license = "zlib-acknowledgement" -sha256 = "0a6shlwd9zyrlyw8ayc0vxdlj6wbksi5ii8wfvxyi885b55bxk6g" +sha256 = "1s370xms0kf1z6a4pbg5lp931zr8yl0r5szwg3lji99cdm87cjij" synopsis = "An ArcadeDB database driver for CHICKEN Scheme." -version = "0.5" +version = "0.6" [args] dependencies = ["srfi-1", "srfi-13", "srfi-37"] @@ -219,9 +219,9 @@ version = "1.0" [beaker] dependencies = ["begin-syntax", "debugger-protocol", "schematic", "srfi-1", "srfi-13", "srfi-14", "srfi-69", "vector-lib", "with-current-directory", "module-declarations"] license = "bsd" -sha256 = "0clfw7z2j3b6hyj78g61n7nxf07bcksvdcbgs3jiv99rr1vaj9z5" +sha256 = "1nxzqjwh3bi2zyifdpn0wb86352rizjpfl3lfi34f3g6m95avmmg" synopsis = "Lab supplies for CHICKEN development" -version = "0.0.20" +version = "0.0.22" [begin-syntax] dependencies = ["matchable", "module-declarations"] @@ -303,9 +303,9 @@ version = "2.0.4" [bloom-filter] dependencies = ["iset", "message-digest-primitive", "message-digest-type", "message-digest-utils", "check-errors"] license = "bsd" -sha256 = "1ncxjfyv1hqbrls79pii7q4wxn0s8xkrp32khl3v0fq8mswbknzj" +sha256 = "1ljak0xscrywyl1sbv8yx9qkw1r2m94gyw3ag73p3z8m618valy3" synopsis = "Bloom Filter" -version = "2.3.1" +version = "2.3.4" [blosc] dependencies = ["srfi-13", "compile-file"] @@ -314,6 +314,13 @@ sha256 = "0m78rb2q0znixpiflcrndlk708g4mbw7yh1ynkvk3zzvln0d3wgi" synopsis = "Bindings to the Blosc multi-threaded meta-compressor library" version = "1.1" +[botan] +dependencies = ["srfi-1", "srfi-13", "srfi-14"] +license = "bsd-2-clause" +sha256 = "1j2h6hhvwdr7d7kgm5b0nc5nmx23a35av7rvwcajlxxv9iafmdh2" +synopsis = "Bindings to the Botan cryptographic library" +version = "2.13.20191214-0" + [box] dependencies = [] license = "bsd" @@ -324,16 +331,16 @@ version = "3.6.0" [breadcrumbs] dependencies = ["srfi-1"] license = "bsd" -sha256 = "1l49ahr6vkx0ihkmmgsy0z72k7livl9gsmdbyj2q1i25lb14kp6s" +sha256 = "1n60k0ryp447fh4f1an7ki8c1kc2ll1v1cbhgrxvmwcx3v03d767" synopsis = "Breadcrumbs for web pages" -version = "1.1" +version = "1.2" [breadline] dependencies = ["apropos", "srfi-18"] license = "gpl-3" -sha256 = "05mmfr38wydifz6i5h12y07p6vj8xn8nvrxpiazbnyh6zwbswfhk" +sha256 = "1rvppf2aci4dxn6a74nzzj1iw7is65ad38fbvrr9harazfx6j4jy" synopsis = "Bindings to readline" -version = "0.10" +version = "0.11" [brev-separate] dependencies = ["matchable", "miscmacros", "srfi-1", "srfi-69"] @@ -408,9 +415,9 @@ version = "0.4" [check-errors] dependencies = [] license = "bsd" -sha256 = "0zbax9k6k4m490vhkpvyj0dsq87i58l39lakldmd0yfqm7da3lfz" +sha256 = "1ra8pvs0qnfqsjbrsn0k94drwx5ydvhapziv6dcqcb118iimnrmd" synopsis = "Argument checks & errors" -version = "3.7.0" +version = "3.7.1" [checks] dependencies = ["simple-exceptions"] @@ -545,6 +552,13 @@ sha256 = "1047v7mk836mf4g6ba5a90lmgqql1ss1ap9kgk0mhzrffznjipgn" synopsis = "Download files (such as web comic images) by recursing on XPath" version = "1.21" +[commands] +dependencies = [] +license = "bsd" +sha256 = "13y49vrkd9rs98s9fk10g8w056xb9nnqxwn1372sayw64789i3ib" +synopsis = "Helpers for programs that dispatch commands" +version = "1.0.0" + [comparse] dependencies = ["lazy-seq", "trie", "matchable", "srfi-1", "srfi-13", "srfi-14", "srfi-69"] license = "bsd" @@ -569,9 +583,9 @@ version = "1.0" [condition-utils] dependencies = ["srfi-1", "srfi-69", "check-errors"] license = "bsd" -sha256 = "0v2k0spikmrwjb5j360hgi126k1zahnjswhfa2as4mlz6pwl5aqi" +sha256 = "11mkmbyciyrqyakp1gyfvmbfayglhzx2x6j6zyp9kj31vhi2y4hd" synopsis = "SRFI 12 Condition Utilities" -version = "2.2.1" +version = "2.2.3" [continuations] dependencies = [] @@ -751,9 +765,9 @@ version = "1.3.1" [dust] dependencies = ["http-client", "memory-mapped-files", "openssl", "posix-groups", "begin-syntax", "matchable", "module-declarations"] license = "bsd" -sha256 = "1invlk61z32x3f834qapwbqbjab04153c5rs06gaqa6ip83mraj6" +sha256 = "1r4yfs78az2p7szgsnlcnlfrqkivj9am7vm1sh2b29rjffkqnhp3" synopsis = "Fetch and install CHICKEN versions" -version = "0.0.15" +version = "0.0.16" [dwim-sort] dependencies = ["brev-separate", "sequences", "srfi-1", "match-generics"] @@ -783,6 +797,13 @@ sha256 = "166qm2vx5gj7bc57s1bnnbp55zhv19hnimmivhhdhsnq32wi3511" synopsis = "EDN data reader/writer." version = "1.0" +[edward] +dependencies = ["r7rs", "srfi-1", "srfi-14", "srfi-37", "matchable", "posix-regex"] +license = "gplv3" +sha256 = "0gfvjgg6c6hl2xmh63067xkh0sd2vmczwisirgglcm2inz4hjll3" +synopsis = "An extensible implementation of the ed text editor as defined in POSIX.1-2008" +version = "1.0.1" + [egg-tarballs] dependencies = ["simple-sha1", "srfi-1", "srfi-13"] license = "bsd" @@ -1374,9 +1395,9 @@ version = "0.3" [ipfs] dependencies = ["http-client", "intarweb", "medea", "srfi-1", "srfi-13", "srfi-189", "srfi-197", "uri-common"] license = "unlicense" -sha256 = "01ar16bzy0q56zbnv19f0p1y0ch182jjfr9jihfnbj0fgpz8bvxp" +sha256 = "1cxjbl5kl4xk42a4p8j3av6ip0gqvp5yxahsccvm0snc98n3ngqg" synopsis = "IPFS HTTP API for Scheme" -version = "0.0.10" +version = "0.0.12" [irc] dependencies = ["matchable", "regex", "srfi-1"] @@ -1430,9 +1451,9 @@ version = "7.0" [json-rpc] dependencies = ["r7rs", "srfi-1", "srfi-18", "srfi-69", "srfi-180"] license = "mit" -sha256 = "04488ykkh8qwzfly3i86m7vpx10s6ixr2s10m390f587ls15qkyd" +sha256 = "18qnp9ryp3s0i8363ny5c2v16csqq416smnzd3pls103zn47p44v" synopsis = "A JSON RPC library for R7RS scheme." -version = "0.2.10" +version = "0.4.0" [json-utils] dependencies = ["utf8", "srfi-1", "srfi-69", "vector-lib", "miscmacros", "moremacros"] @@ -1507,9 +1528,9 @@ version = "1.2" [levenshtein] dependencies = ["srfi-1", "srfi-13", "srfi-63", "srfi-69", "vector-lib", "utf8", "miscmacros", "record-variants", "check-errors"] license = "bsd" -sha256 = "1k32dfkn2m48icdgykm44a8c6y86qrim563y37c73rkxdzyjm9dy" +sha256 = "1v8g5ghilraz2lx0fif3yb1rlg3n51zvvik2l12ycqh0wj0pz59l" synopsis = "Levenshtein edit distance" -version = "2.2.5" +version = "2.2.8" [lexgen] dependencies = ["srfi-1", "utf8", "srfi-127"] @@ -1535,9 +1556,9 @@ version = "1.2.1" [list-utils] dependencies = ["utf8", "srfi-1", "check-errors"] license = "bsd" -sha256 = "0s48ps6ymi9h6xgx190y7bvipasspqm236fg7n1yiayjgyivgcpp" +sha256 = "0wqmsvh3sfgp8ssh98n8y615lxnjlcda1k375jfss7vf8k5xn032" synopsis = "list-utils" -version = "2.4.1" +version = "2.4.3" [live-define] dependencies = ["matchable"] @@ -1570,9 +1591,9 @@ version = "3.4" [lmdb] dependencies = ["srfi-1"] license = "openldap" -sha256 = "012gv5wblhaikd1r62dmjjqvyzxysbrs605hiw2xcfk1mx5ji7cz" +sha256 = "1ymy7ji9q7zvy8708f4zzavxkvajmq8l8m1z6v6873qkxgv6jkw8" synopsis = "Bindings to LMDB" -version = "1.0.5" +version = "1.0.6" [locale] dependencies = ["srfi-1", "utf8", "check-errors"] @@ -1605,9 +1626,9 @@ version = "3" [lsp-server] dependencies = ["apropos", "chicken-doc", "json-rpc", "nrepl", "r7rs", "srfi-1", "srfi-130", "srfi-133", "srfi-18", "srfi-69", "uri-generic", "utf8"] license = "mit" -sha256 = "1qxrfjmxr9azzsqamvlqr942835m1d8pr7k9a47zc9fkpgp1smy4" +sha256 = "0wbigf0s37377hjfxspwydhvnds165mhp2qa14iskvsw5zbp8g80" synopsis = "LSP Server for CHICKEN." -version = "0.2.2" +version = "0.4.1" [macaw] dependencies = [] @@ -1689,9 +1710,9 @@ version = "4.5.1" [matrico] dependencies = [] license = "zlib-acknowledgement" -sha256 = "0m7shfhmzzlqxspc97mbqdcr4zry7im1lrz8smr6wc7m9r8jf2p0" +sha256 = "0ng09xbk8229nhq4s8f8rxgrgigf81qr685mggvk2lm5p7kckpjq" synopsis = "A flonum matrix module for CHICKEN Scheme." -version = "0.3rel" +version = "0.5rel" [md5] dependencies = ["message-digest-primitive"] @@ -1773,9 +1794,9 @@ version = "0.7" [micro-benchmark] dependencies = ["micro-stats", "srfi-1"] license = "gplv3" -sha256 = "1dz9r9jbjq0zgpwmh2vl9wdkj57rprnmwarbk3x2y3ah5hn5m1nn" +sha256 = "0ahvxdm350bc9v80gnb8ccmjqqp60jznfjkx7w5ypf0q61mnj8sj" synopsis = "Easily create micro-benchmarks" -version = "0.0.18" +version = "0.0.19" [micro-stats] dependencies = ["srfi-1", "sequences", "sequences-utils"] @@ -1815,9 +1836,9 @@ version = "1.0.3" [module-declarations] dependencies = ["matchable", "srfi-1"] license = "bsd" -sha256 = "11jvzk59h8mmczh01p3s2dgdnrdd35ig55pw5whs7mw4fjjil6hz" +sha256 = "079zs0cc7bmc1macvsh79q1x4rbjqw25hcvlcis8xxg3952vlqfg" synopsis = "Module declarations" -version = "0.2.1" +version = "0.3.1" [monad] dependencies = ["srfi-1"] @@ -1826,6 +1847,13 @@ sha256 = "1xd24plxnwi9yssmw2in008biv2xf4iwwln6xswx781ankppqpg9" synopsis = "Monads" version = "5.0" +[monocypher] +dependencies = [] +license = "bsd-2-clause" +sha256 = "09q33a6b8v306j93kd67wk5gisca7sij0p98i7pd10xnimllc5hh" +synopsis = "Monocypher cryptographic library" +version = "4.0.1" + [moremacros] dependencies = ["srfi-69", "miscmacros", "check-errors"] license = "bsd" @@ -2207,9 +2235,9 @@ version = "0.1.1" [r7rs] dependencies = ["matchable", "srfi-1", "srfi-13"] license = "bsd" -sha256 = "0l9smsii64n6rxvxf0bgjnpx16341zv7xh7xr60nk6f88kdkl03q" +sha256 = "1rwx52mjsylvbkmpg0z7jbawaf87dsxdgwgq8z5nh8k5nb03b6v5" synopsis = "R7RS compatibility" -version = "1.0.7" +version = "1.0.9" [rabbit] dependencies = ["srfi-1"] @@ -2302,6 +2330,13 @@ sha256 = "18d0f37a13nsknay6vw27xvr1k0s4p4ss2dc29fhx89hsv5ycjsq" synopsis = "RIPE Message Digest" version = "2.1.2" +[rlimit] +dependencies = ["srfi-13"] +license = "bsd" +sha256 = "0jmz98253k3q9a6kyyby6jm722w3s74c5y3km7ih9ybjjmcdkyzv" +synopsis = "Setting resource limits" +version = "1.0.1" + [rocksdb] dependencies = [] license = "bsd" @@ -2330,6 +2365,13 @@ sha256 = "1vngrvh2b7rv5n5zvksfg27zikpc7d8xb8n1kd0pyfr7hna00wf9" synopsis = "Serialization of arbitrary data." version = "0.9.12" +[s9fes-char-graphics] +dependencies = ["srfi-1", "utf8", "format"] +license = "public-domain" +sha256 = "1h12l59860cyv8xwvvpf96dnlqwd25mrq2qapj9nyxv0vbkcs4p6" +synopsis = "Scheme 9 from Empty Space Char Graphics" +version = "1.3.3" + [salmonella-diff] dependencies = ["salmonella", "salmonella-html-report", "srfi-1", "srfi-13", "sxml-transforms"] license = "bsd" @@ -2604,18 +2646,25 @@ synopsis = "An implementation of skiplists" version = "1.0.2" [slib-arraymap] -dependencies = ["srfi-1", "srfi-63"] +dependencies = ["srfi-1", "srfi-63", "slib-compat"] license = "bsd" -sha256 = "157h7qrwqqkrd3xw88if054pi2719hkfm0pysq8v8w7yma65wvln" +sha256 = "08djsc0j6kacf07a59f58clka94wq4lp8ry3p8203sx3lbx1s8qw" synopsis = "The SLIB applicative routines for the arrays library" -version = "1.1.3" +version = "1.1.4" [slib-charplot] -dependencies = ["slib-arraymap", "srfi-63"] +dependencies = ["slib-arraymap", "srfi-63", "slib-compat"] license = "artistic" -sha256 = "0m9vjczx7w9m9kvm9vq1f6qxfdkxxh1f0msdrnyg5h4xn4dsnhww" +sha256 = "1ijcvs9y2vxmxg5834s4mprkinxhky0xdl3yksysmg9h9p82il2z" synopsis = "The SLIB character plotting library" -version = "1.2.1" +version = "1.2.2" + +[slib-compat] +dependencies = ["srfi-1"] +license = "artistic" +sha256 = "0pk00087wbxwyyrn0qa1261ry2c55mxz9jgh95adl6lvgdvajchy" +synopsis = "CHICKEN SLIB compatibility library" +version = "1.0.0" [slib-wt-tree] dependencies = ["typed-records"] @@ -2669,9 +2718,9 @@ version = "0.3.3" [sparse-vectors] dependencies = ["srfi-1", "record-variants"] license = "bsd" -sha256 = "1cqimy2qcjhzfjx1q7ids1wqg43wzpzz56cn193fwm75szqg0xdj" +sha256 = "0nmk6c9mhls38lyp0d8a9f3xh94jbl2dqbmqr9pab23pnx4hha1j" synopsis = "Arbitrarily large vectors" -version = "1.0.1" +version = "1.1.0" [spiffy-cgi-handlers] dependencies = ["spiffy", "intarweb", "uri-common", "socket", "records", "srfi-1", "srfi-18", "srfi-13", "miscmacros"] @@ -3019,9 +3068,9 @@ version = "1.0.3" [srfi-19] dependencies = ["srfi-1", "utf8", "srfi-18", "srfi-29", "srfi-69", "miscmacros", "locale", "record-variants", "check-errors"] license = "bsd" -sha256 = "02348j6zdp1nyh0f8jw1j848qlm0dv7p7q6rw7jdfzqi4bq5myva" +sha256 = "14nyv6m67k2angmhg028rd50mq77qi1zfr5f0praiyy07k2pmcpz" synopsis = "Time Data Types and Procedures" -version = "4.7.2" +version = "4.7.3" [srfi-193] dependencies = [] @@ -3079,6 +3128,13 @@ sha256 = "0ynasgp03kqd6nhqmcnp4cjf87p3pkjaqi2x860hma79xsslyp8n" synopsis = "SRFI 217: Integer Sets" version = "0.2" +[srfi-227] +dependencies = ["srfi-1"] +license = "mit" +sha256 = "0vrpgqdmwdaphy0szskxyl2x6xhwycgvi6flwi5v6m2zi5cd3j1c" +synopsis = "SRFI 227: Optional Arguments" +version = "1.1" + [srfi-232] dependencies = ["srfi-1"] license = "mit" @@ -3591,11 +3647,11 @@ synopsis = "tracing and breakpoints" version = "2.0" [transducers] -dependencies = ["srfi-1", "srfi-133", "srfi-143", "srfi-160", "check-errors"] +dependencies = ["srfi-1", "srfi-128", "srfi-133", "srfi-143", "srfi-146", "srfi-160", "check-errors"] license = "mit" -sha256 = "01xfqh94cn3qid9ydlmsyyh9drp8bzy8mp1q13b2vksm4yqp077w" +sha256 = "0mkrrfvskwgy5w8c9gz21np3p9857sm8fylq0hjz608jaxzybpcz" synopsis = "Transducers for working with foldable data types." -version = "0.3.1" +version = "0.4.0" [transmission] dependencies = ["http-client", "intarweb", "medea", "r7rs", "srfi-1", "srfi-189", "uri-common"] @@ -3733,9 +3789,9 @@ version = "3.6.3" [uuid-lib] dependencies = ["record-variants"] license = "bsd" -sha256 = "1788c9wilnwa21r27g9cfwjypbzgmv6rs5i93yrywg2fry9v45nd" +sha256 = "0da71k0f3j1l9wjnfk9gqs9gw3v1192xhxbxv2gfmah3fvxf203p" synopsis = "OSF DCE 1.1 UUID" -version = "0.0.9" +version = "0.0.10" [uuid] dependencies = [] diff --git a/nixpkgs/pkgs/development/compilers/chicken/5/eggDerivation.nix b/nixpkgs/pkgs/development/compilers/chicken/5/eggDerivation.nix index a85a98d46cb6..2d2462355928 100644 --- a/nixpkgs/pkgs/development/compilers/chicken/5/eggDerivation.nix +++ b/nixpkgs/pkgs/development/compilers/chicken/5/eggDerivation.nix @@ -17,14 +17,16 @@ in (stdenv.mkDerivation ({ name = "chicken-${name}"; propagatedBuildInputs = buildInputs; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ chicken makeWrapper ]; buildInputs = [ chicken ]; + strictDeps = true; + CSC_OPTIONS = lib.concatStringsSep " " cscOptions; buildPhase = '' runHook preBuild - chicken-install -cached -no-install ${lib.escapeShellArgs chickenInstallFlags} + chicken-install -cached -no-install -host ${lib.escapeShellArgs chickenInstallFlags} runHook postBuild ''; @@ -33,7 +35,7 @@ in export CHICKEN_INSTALL_PREFIX=$out export CHICKEN_INSTALL_REPOSITORY=$out/lib/chicken/${toString chicken.binaryVersion} - chicken-install -cached ${lib.escapeShellArgs chickenInstallFlags} + chicken-install -cached -host ${lib.escapeShellArgs chickenInstallFlags} for f in $out/bin/* do diff --git a/nixpkgs/pkgs/development/compilers/chicken/5/overrides.nix b/nixpkgs/pkgs/development/compilers/chicken/5/overrides.nix index b471dab135bd..29bfaec62d2e 100644 --- a/nixpkgs/pkgs/development/compilers/chicken/5/overrides.nix +++ b/nixpkgs/pkgs/development/compilers/chicken/5/overrides.nix @@ -1,6 +1,9 @@ { stdenv, pkgs, lib, chickenEggs }: let inherit (lib) addMetaAttrs; + addToNativeBuildInputs = pkg: old: { + nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ lib.toList pkg; + }; addToBuildInputs = pkg: old: { buildInputs = (old.buildInputs or [ ]) ++ lib.toList pkg; }; @@ -17,12 +20,17 @@ let (addPkgConfig old) // (addToPropagatedBuildInputs pkg old); broken = addMetaAttrs { broken = true; }; brokenOnDarwin = addMetaAttrs { broken = stdenv.isDarwin; }; -in { + addToCscOptions = opt: old: { + CSC_OPTIONS = lib.concatStringsSep " " ([ old.CSC_OPTIONS or "" ] ++ lib.toList opt); + }; +in +{ allegro = addToBuildInputsWithPkgConfig ([ pkgs.allegro5 pkgs.libglvnd ] ++ lib.optionals stdenv.isDarwin [ pkgs.darwin.apple_sdk.frameworks.OpenGL ]); breadline = addToBuildInputs pkgs.readline; blas = addToBuildInputsWithPkgConfig pkgs.blas; blosc = addToBuildInputs pkgs.c-blosc; + botan = addToBuildInputsWithPkgConfig pkgs.botan2; cairo = old: (addToBuildInputsWithPkgConfig pkgs.cairo old) // (addToPropagatedBuildInputs (with chickenEggs; [ srfi-1 srfi-13 ]) old); @@ -35,17 +43,15 @@ in { ezxdisp = addToBuildInputsWithPkgConfig pkgs.xorg.libX11; freetype = addToBuildInputsWithPkgConfig pkgs.freetype; fuse = addToBuildInputsWithPkgConfig pkgs.fuse; - # git = addToBuildInputsWithPkgConfig pkgs.libgit2; gl-utils = addPkgConfig; glfw3 = addToBuildInputsWithPkgConfig pkgs.glfw3; glls = addPkgConfig; iconv = addToBuildInputs (lib.optional stdenv.isDarwin pkgs.libiconv); icu = addToBuildInputsWithPkgConfig pkgs.icu; imlib2 = addToBuildInputsWithPkgConfig pkgs.imlib2; - lazy-ffi = old: - # fatal error: 'ffi/ffi.h' file not found - (brokenOnDarwin old) - // (addToBuildInputs pkgs.libffi old); + inotify = old: + (addToBuildInputs (lib.optional stdenv.isDarwin pkgs.libinotify-kqueue) old) + // lib.optionalAttrs stdenv.isDarwin (addToCscOptions "-L -linotify" old); leveldb = addToBuildInputs pkgs.leveldb; magic = addToBuildInputs pkgs.file; mdh = addToBuildInputs pkgs.pcre; @@ -53,15 +59,13 @@ in { ncurses = addToBuildInputsWithPkgConfig [ pkgs.ncurses ]; opencl = addToBuildInputs ([ pkgs.opencl-headers pkgs.ocl-icd ] ++ lib.optionals stdenv.isDarwin [ pkgs.darwin.apple_sdk.frameworks.OpenCL ]); - opengl = old: - # csc: invalid option `-framework OpenGL' - (brokenOnDarwin old) - // (addToBuildInputsWithPkgConfig [ pkgs.libGL pkgs.libGLU ] old); openssl = addToBuildInputs pkgs.openssl; plot = addToBuildInputs pkgs.plotutils; postgresql = addToBuildInputsWithPkgConfig pkgs.postgresql; rocksdb = addToBuildInputs pkgs.rocksdb; - scheme2c-compatibility = addPkgConfig; + scheme2c-compatibility = old: + addToNativeBuildInputs (lib.optionals (stdenv.system == "x86_64-darwin") [ pkgs.memorymappingHook ]) + (addPkgConfig old); sdl-base = addToBuildInputs pkgs.SDL; sdl2 = addToPropagatedBuildInputsWithPkgConfig pkgs.SDL2; sdl2-image = addToBuildInputs pkgs.SDL2_image; @@ -69,13 +73,11 @@ in { soil = addToPropagatedBuildInputsWithPkgConfig pkgs.libepoxy; sqlite3 = addToBuildInputs pkgs.sqlite; stemmer = old: - # Undefined symbols for architecture arm64: "_sb_stemmer_delete" - (brokenOnDarwin old) - // (addToBuildInputs pkgs.libstemmer old); + (addToBuildInputs pkgs.libstemmer old) + // (addToCscOptions "-L -lstemmer" old); stfl = old: - # Undefined symbols for architecture arm64: "_clearok" - (brokenOnDarwin old) - // (addToBuildInputs [ pkgs.ncurses pkgs.stfl ] old); + (addToBuildInputs [ pkgs.ncurses pkgs.stfl ] old) + // (addToCscOptions "-L -lncurses" old); taglib = addToBuildInputs [ pkgs.zlib pkgs.taglib ]; uuid-lib = addToBuildInputs pkgs.libuuid; ws-client = addToBuildInputs pkgs.zlib; @@ -85,6 +87,37 @@ in { zmq = addToBuildInputs pkgs.zeromq; zstd = addToBuildInputs pkgs.zstd; + # less trivial fixes, should be upstreamed + git = old: (addToBuildInputsWithPkgConfig pkgs.libgit2 old) // { + postPatch = '' + substituteInPlace libgit2.scm \ + --replace "asize" "reserved" + ''; + }; + lazy-ffi = old: (addToBuildInputs pkgs.libffi old) // { + postPatch = '' + substituteInPlace lazy-ffi.scm \ + --replace "ffi/ffi.h" "ffi.h" + ''; + }; + opengl = old: + (addToBuildInputsWithPkgConfig + (lib.optionals (!stdenv.isDarwin) [ pkgs.libGL pkgs.libGLU ] + ++ lib.optionals stdenv.isDarwin [ pkgs.darwin.apple_sdk.frameworks.Foundation pkgs.darwin.apple_sdk.frameworks.OpenGL ]) + old) + // { + postPatch = '' + substituteInPlace opengl.egg \ + --replace 'framework ' 'framework" "' + ''; + }; + posix-shm = old: { + postPatch = lib.optionalString stdenv.isDarwin '' + substituteInPlace build.scm \ + --replace "-lrt" "" + ''; + }; + # platform changes pledge = addMetaAttrs { platforms = lib.platforms.openbsd; }; unveil = addMetaAttrs { platforms = lib.platforms.openbsd; }; @@ -99,7 +132,6 @@ in { comparse = broken; coops-utils = broken; crypt = broken; - git = broken; hypergiant = broken; iup = broken; kiwi = broken; @@ -118,12 +150,8 @@ in { # mark broken darwin - # fatal error: 'sys/inotify.h' file not found - inotify = brokenOnDarwin; # fatal error: 'mqueue.h' file not found posix-mq = brokenOnDarwin; - # ld: library not found for -lrt - posix-shm = brokenOnDarwin; # Undefined symbols for architecture arm64: "_pthread_setschedprio" pthreads = brokenOnDarwin; # error: use of undeclared identifier 'B4000000' diff --git a/nixpkgs/pkgs/development/compilers/chicken/5/update.sh b/nixpkgs/pkgs/development/compilers/chicken/5/update.sh index 32f5fbf5608f..59f5337dbb6d 100755 --- a/nixpkgs/pkgs/development/compilers/chicken/5/update.sh +++ b/nixpkgs/pkgs/development/compilers/chicken/5/update.sh @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#! nix-shell -i oil -p oil chicken +#! nix-shell -I nixpkgs=../../../../.. -i oil -p oil chicken export URL_PREFIX="https://code.call-cc.org/egg-tarballs/5/" cd $(nix-prefetch-url \ diff --git a/nixpkgs/pkgs/development/compilers/ciao/default.nix b/nixpkgs/pkgs/development/compilers/ciao/default.nix index 171419a39e80..bc85f6e1009f 100644 --- a/nixpkgs/pkgs/development/compilers/ciao/default.nix +++ b/nixpkgs/pkgs/development/compilers/ciao/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "ciao"; - version = "1.22.0-m1"; + version = "1.22.0-m7"; src = fetchFromGitHub { owner = "ciao-lang"; repo = "ciao"; rev = "v${version}"; - sha256 = "sha256-p7QNSsDI8hVMPPfkX3PNjJo01hsPGKZ7jMR9Kmj2qxY="; + sha256 = "sha256-5LX+NVDAtdffQeLTD4Camp5aNm0K3Cwmavh7OF5XcZU="; }; configurePhase = '' diff --git a/nixpkgs/pkgs/development/compilers/circt/default.nix b/nixpkgs/pkgs/development/compilers/circt/default.nix index 552109b12da6..e53de0e4ee12 100644 --- a/nixpkgs/pkgs/development/compilers/circt/default.nix +++ b/nixpkgs/pkgs/development/compilers/circt/default.nix @@ -13,12 +13,12 @@ let in stdenv.mkDerivation rec { pname = "circt"; - version = "1.40.0"; + version = "1.49.0"; src = fetchFromGitHub { owner = "llvm"; repo = "circt"; rev = "firtool-${version}"; - sha256 = "sha256-L114Xh0O/Wu8IyrKohxalyXeSe/8oVcAXD4hpa6ocwU="; + sha256 = "sha256-pHMysxnczKilfjJafobU18/gaWnfrHMpPUd6RQ+CXSg="; fetchSubmodules = true; }; @@ -53,7 +53,10 @@ stdenv.mkDerivation rec { LIT_FILTER_OUT = if stdenv.cc.isClang then "CIRCT :: Target/ExportSystemC/.*\.mlir" else null; preConfigure = '' - substituteInPlace test/circt-reduce/test/annotation-remover.mlir --replace "/usr/bin/env" "${coreutils}/bin/env" + find ./test -name '*.mlir' -exec sed -i 's|/usr/bin/env|${coreutils}/bin/env|g' {} \; + # circt uses git to check its version, but when cloned on nix it can't access git. + # So this hard codes the version. + substituteInPlace cmake/modules/GenVersionFile.cmake --replace "unknown git version" "${src.rev}" ''; installPhase = '' diff --git a/nixpkgs/pkgs/development/compilers/clasp/default.nix b/nixpkgs/pkgs/development/compilers/clasp/default.nix index bd43970e55b8..c9fecafbd460 100644 --- a/nixpkgs/pkgs/development/compilers/clasp/default.nix +++ b/nixpkgs/pkgs/development/compilers/clasp/default.nix @@ -55,7 +55,7 @@ in llvmPackages_15.stdenv.mkDerivation { sbcl git pkg-config - fmt + fmt_9 gmpxx libelf boost diff --git a/nixpkgs/pkgs/development/compilers/codon/default.nix b/nixpkgs/pkgs/development/compilers/codon/default.nix index 65c177a7b957..70cd16327299 100644 --- a/nixpkgs/pkgs/development/compilers/codon/default.nix +++ b/nixpkgs/pkgs/development/compilers/codon/default.nix @@ -12,13 +12,13 @@ }: let - version = "0.15.5"; + version = "0.16.1"; src = fetchFromGitHub { owner = "exaloop"; repo = "codon"; rev = "v${version}"; - sha256 = "sha256-/IUGX5iSRvZzwyRdkGe0IVHp44D+GXZtbkdtswekwSU="; + hash = "sha256-s2GqiFcekXRts8BU5CSmTrkFZ9xLqq4A5MybhB1o1Gg="; }; depsDir = "deps"; @@ -31,7 +31,7 @@ let owner = "exaloop"; repo = "llvm-project"; rev = "55b0b8fa1c9f9082b535628fc9fa6313280c0b9a"; - sha256 = "sha256-03SPQgNdrpR6/JZ5aR/ntoh/FnZvCjT/6bTAcZaFafw="; + hash = "sha256-03SPQgNdrpR6/JZ5aR/ntoh/FnZvCjT/6bTAcZaFafw="; }; nativeBuildInputs = [ @@ -43,8 +43,6 @@ let ]; cmakeFlags = [ - "-DCMAKE_CXX_COMPILER=clang++" - "-DCMAKE_C_COMPILER=clang" "-DLLVM_ENABLE_RTTI=ON" "-DLLVM_ENABLE_TERMINFO=OFF" "-DLLVM_ENABLE_ZLIB=OFF" @@ -88,7 +86,12 @@ let _deps/googletest-subbuild/googletest-populate-prefix/src/*.zip ''; - outputHash = "sha256-a1zGSpbMjfQBrcgW/aiIdKX8+uI3p/S9pgZjHe2HtWs="; + outputHash = + if stdenv.hostPlatform.isDarwin then + "sha256-KfemYV42xBAhsPbwTkzdc3GxCVHiWRbyUZORPWxx4vg=" + else + "sha256-a1zGSpbMjfQBrcgW/aiIdKX8+uI3p/S9pgZjHe2HtWs="; + outputHashAlgo = "sha256"; }; in @@ -117,14 +120,15 @@ stdenv.mkDerivation { ''; cmakeFlags = [ - "-DCMAKE_BUILD_TYPE=Release" - "-DCMAKE_CXX_COMPILER=clang++" - "-DCMAKE_C_COMPILER=clang" "-DCPM_SOURCE_CACHE=${depsDir}" "-DLLVM_DIR=${codon-llvm}/lib/cmake/llvm" "-DLLVM_USE_LINKER=lld" ]; + postInstall = lib.optionalString stdenv.isDarwin '' + ln -s $out/lib/codon/*.dylib $out/lib/ + ''; + passthru.updateScript = nix-update-script { }; meta = { diff --git a/nixpkgs/pkgs/development/compilers/computecpp/default.nix b/nixpkgs/pkgs/development/compilers/computecpp/default.nix index 0f9e877201b4..4e6e7ad43416 100644 --- a/nixpkgs/pkgs/development/compilers/computecpp/default.nix +++ b/nixpkgs/pkgs/development/compilers/computecpp/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "computecpp"; - version = "2.3.0"; + version = "2.11.0"; src = fetchzip { url = "https://computecpp.codeplay.com/downloads/computecpp-ce/${version}/x86_64-linux-gnu.tar.gz"; - hash = "sha256-AUHSls4BOX20PVKzDAp3RqpeRDwgbgYzz6CRvRN+kdk="; + hash = "sha256-xHOPuijx5TZeHzRHPXcll0WqoBzHBryIoe3BnOxBVVY="; stripRoot = true; }; diff --git a/nixpkgs/pkgs/development/compilers/crystal/default.nix b/nixpkgs/pkgs/development/compilers/crystal/default.nix index f418d7a7af93..9f2e17dad09d 100644 --- a/nixpkgs/pkgs/development/compilers/crystal/default.nix +++ b/nixpkgs/pkgs/development/compilers/crystal/default.nix @@ -17,7 +17,8 @@ , libxml2 , libyaml , libffi -, llvmPackages +, llvmPackages_13 +, llvmPackages_15 , makeWrapper , openssl , pcre2 @@ -41,7 +42,6 @@ let }; arch = archs.${stdenv.system} or (throw "system ${stdenv.system} not supported"); - isAarch64Darwin = stdenv.system == "aarch64-darwin"; nativeCheckInputs = [ git gmp openssl readline libxml2 libyaml libffi ]; @@ -54,33 +54,34 @@ let "https://github.com/crystal-lang/crystal/releases/download/${version}/crystal-${version}-${toString rel}-${arch}.tar.gz"; genericBinary = { version, sha256s, rel ? 1 }: - stdenv.mkDerivation rec { - pname = "crystal-binary"; - inherit version; + stdenv.mkDerivation rec { + pname = "crystal-binary"; + inherit version; - src = fetchurl { - url = binaryUrl version rel; - sha256 = sha256s.${stdenv.system}; - }; + src = fetchurl { + url = binaryUrl version rel; + sha256 = sha256s.${stdenv.system}; + }; - buildCommand = '' - mkdir -p $out - tar --strip-components=1 -C $out -xf ${src} - patchShebangs $out/bin/crystal - ''; + buildCommand = '' + mkdir -p $out + tar --strip-components=1 -C $out -xf ${src} + patchShebangs $out/bin/crystal + ''; - meta.platforms = lib.attrNames sha256s; - }; + meta.platforms = lib.attrNames sha256s; + }; - generic = ( + generic = { version , sha256 , binary + , llvmPackages , doCheck ? true , extraBuildInputs ? [ ] , buildFlags ? [ "all" "docs" "release=1"] }: - lib.fix (compiler: stdenv.mkDerivation (finalAttrs: { + stdenv.mkDerivation (finalAttrs: { pname = "crystal"; inherit buildFlags doCheck version; @@ -235,7 +236,7 @@ let passthru.buildBinary = binary; passthru.buildCrystalPackage = callPackage ./build-package.nix { - crystal = compiler; + crystal = finalAttrs.finalPackage; }; meta = with lib; { @@ -243,11 +244,9 @@ let description = "A compiled language with Ruby like syntax and type inference"; homepage = "https://crystal-lang.org/"; license = licenses.asl20; - maintainers = with maintainers; [ david50407 manveru peterhoeg ]; + maintainers = with maintainers; [ david50407 manveru peterhoeg donovanglover ]; }; - })) - ); - + }); in rec { binaryCrystal_1_2 = genericBinary { @@ -264,6 +263,7 @@ rec { version = "1.2.2"; sha256 = "sha256-nyOXhsutVBRdtJlJHe2dALl//BUXD1JeeQPgHU4SwiU="; binary = binaryCrystal_1_2; + llvmPackages = llvmPackages_13; extraBuildInputs = [ libatomic_ops ]; }; @@ -271,13 +271,22 @@ rec { version = "1.7.3"; sha256 = "sha256-ULhLGHRIZbsKhaMvNhc+W74BwNgfEjHcMnVNApWY+EE="; binary = binaryCrystal_1_2; + llvmPackages = llvmPackages_13; }; crystal_1_8 = generic { - version = "1.8.1"; - sha256 = "sha256-t+1vM1m62UftCvfa90Dg6nqt6Zseh/GP/Gc1VfOa4+c="; + version = "1.8.2"; + sha256 = "sha256-YAORdipzpC9CrFgZUFlFfjzlJQ6ZeA2ekVu8IfPOxR8="; + binary = binaryCrystal_1_2; + llvmPackages = llvmPackages_15; + }; + + crystal_1_9 = generic { + version = "1.9.2"; + sha256 = "sha256-M1oUFs7/8ljszga3StzLOLM1aA4fSfVPQlsbuDHGd84="; binary = binaryCrystal_1_2; + llvmPackages = llvmPackages_15; }; - crystal = crystal_1_8; + crystal = crystal_1_9; } diff --git a/nixpkgs/pkgs/development/compilers/cudatoolkit/common.nix b/nixpkgs/pkgs/development/compilers/cudatoolkit/common.nix index 55d7e2fb64cd..1f934ef5d460 100644 --- a/nixpkgs/pkgs/development/compilers/cudatoolkit/common.nix +++ b/nixpkgs/pkgs/development/compilers/cudatoolkit/common.nix @@ -9,6 +9,7 @@ args@ , autoAddOpenGLRunpathHook , addOpenGLRunpath , alsa-lib +, curlMinimal , expat , fetchurl , fontconfig @@ -16,12 +17,14 @@ args@ , gdk-pixbuf , glib , glibc +, gst_all_1 , gtk2 , lib , libxkbcommon , libkrb5 , krb5 , makeWrapper +, markForCudatoolkitRootHook , ncurses5 , numactl , nss @@ -29,6 +32,7 @@ args@ , python3 # FIXME: CUDAToolkit 10 may still need python27 , pulseaudio , requireFile +, setupCudaHook , stdenv , backendStdenv # E.g. gcc11Stdenv, set in extension.nix , unixODBC @@ -40,6 +44,7 @@ args@ , libsForQt5 , libtiff , qt6Packages +, qt6 , rdma-core , ucx , rsync @@ -77,11 +82,15 @@ backendStdenv.mkDerivation rec { addOpenGLRunpath autoPatchelfHook autoAddOpenGLRunpathHook + markForCudatoolkitRootHook ] ++ lib.optionals (lib.versionOlder version "11") [ libsForQt5.wrapQtAppsHook ] ++ lib.optionals (lib.versionAtLeast version "11.8") [ qt6Packages.wrapQtAppsHook ]; + depsTargetTargetPropagated = [ + setupCudaHook + ]; buildInputs = lib.optionals (lib.versionOlder version "11") [ libsForQt5.qt5.qtwebengine freeglut @@ -126,10 +135,26 @@ backendStdenv.mkDerivation rec { (lib.getLib libtiff) qt6Packages.qtwayland rdma-core - ucx + (ucx.override { enableCuda = false; }) # Avoid infinite recursion xorg.libxshmfence xorg.libxkbfile - ]; + ] ++ (lib.optionals (lib.versionAtLeast version "12") (map lib.getLib ([ + # Used by `/target-linux-x64/CollectX/clx` and `/target-linux-x64/CollectX/libclx_api.so` for: + # - `libcurl.so.4` + curlMinimal + + # Used by `/host-linux-x64/Scripts/WebRTCContainer/setup/neko/server/bin/neko` + gst_all_1.gstreamer + gst_all_1.gst-plugins-base + ]) ++ (with qt6; [ + qtmultimedia + qttools + qtpositioning + qtscxml + qtsvg + qtwebchannel + qtwebengine + ]))); # Prepended to runpaths by autoPatchelf. # The order inherited from older rpath preFixup code @@ -158,7 +183,9 @@ backendStdenv.mkDerivation rec { "libcom_err.so.2" ]; - preFixup = '' + preFixup = if lib.versionOlder version "11" then '' + patchelf $out/targets/*/lib/libnvrtc.so --add-needed libnvrtc-builtins.so + '' else '' patchelf $out/lib64/libnvrtc.so --add-needed libnvrtc-builtins.so ''; @@ -241,6 +268,10 @@ backendStdenv.mkDerivation rec { rm -rf $out/lib ''} + ${lib.optionalString (lib.versionAtLeast version "12.0") '' + rm $out/host-linux-x64/libQt6* + ''} + # Remove some cruft. ${lib.optionalString ((lib.versionAtLeast version "7.0") && (lib.versionOlder version "10.1")) "rm $out/bin/uninstall*"} @@ -257,24 +288,12 @@ backendStdenv.mkDerivation rec { sed -i "1 i#define _BITS_FLOATN_H" "$out/include/host_defines.h" '' + # Point NVCC at a compatible compiler - # FIXME: redist cuda_nvcc copy-pastes this code - # Refer to comments in the overrides for cuda_nvcc for explanation # CUDA_TOOLKIT_ROOT_DIR is legacy, # Cf. https://cmake.org/cmake/help/latest/module/FindCUDA.html#input-variables - # NOTE: We unconditionally set -Xfatbin=-compress-all, which reduces the size of the compiled - # binaries. If binaries grow over 2GB, they will fail to link. This is a problem for us, as - # the default set of CUDA capabilities we build can regularly cause this to occur (for - # example, with Magma). '' mkdir -p $out/nix-support cat <<EOF >> $out/nix-support/setup-hook cmakeFlags+=' -DCUDA_TOOLKIT_ROOT_DIR=$out' - cmakeFlags+=' -DCUDA_HOST_COMPILER=${backendStdenv.cc}/bin' - cmakeFlags+=' -DCMAKE_CUDA_HOST_COMPILER=${backendStdenv.cc}/bin' - if [ -z "\''${CUDAHOSTCXX-}" ]; then - export CUDAHOSTCXX=${backendStdenv.cc}/bin; - fi - export NVCC_PREPEND_FLAGS+=' --compiler-bindir=${backendStdenv.cc}/bin -Xfatbin=-compress-all' EOF # Move some libraries to the lib output so that programs that diff --git a/nixpkgs/pkgs/development/compilers/cudatoolkit/extension.nix b/nixpkgs/pkgs/development/compilers/cudatoolkit/extension.nix index f14a55aa6cf7..93800a0dbc6b 100644 --- a/nixpkgs/pkgs/development/compilers/cudatoolkit/extension.nix +++ b/nixpkgs/pkgs/development/compilers/cudatoolkit/extension.nix @@ -38,10 +38,39 @@ final: prev: let cudaFlags = final.callPackage ./flags.nix {}; + # Internal hook, used by cudatoolkit and cuda redist packages + # to accommodate automatic CUDAToolkit_ROOT construction + markForCudatoolkitRootHook = (final.callPackage + ({ makeSetupHook }: + makeSetupHook + { name = "mark-for-cudatoolkit-root-hook"; } + ./hooks/mark-for-cudatoolkit-root-hook.sh) + { }); + + # Normally propagated by cuda_nvcc or cudatoolkit through their depsHostHostPropagated + setupCudaHook = (final.callPackage + ({ makeSetupHook, backendStdenv }: + makeSetupHook + { + name = "setup-cuda-hook"; + + substitutions.ccRoot = "${backendStdenv.cc}"; + + # Required in addition to ccRoot as otherwise bin/gcc is looked up + # when building CMakeCUDACompilerId.cu + substitutions.ccFullPath = "${backendStdenv.cc}/bin/${backendStdenv.cc.targetPrefix}c++"; + } + ./hooks/setup-cuda-hook.sh) + { }); + in { inherit backendStdenv cudatoolkit - cudaFlags; + cudaFlags + markForCudatoolkitRootHook + setupCudaHook; + + saxpy = final.callPackage ./saxpy { }; } diff --git a/nixpkgs/pkgs/development/compilers/cudatoolkit/hooks/mark-for-cudatoolkit-root-hook.sh b/nixpkgs/pkgs/development/compilers/cudatoolkit/hooks/mark-for-cudatoolkit-root-hook.sh new file mode 100644 index 000000000000..5c18760a3a2b --- /dev/null +++ b/nixpkgs/pkgs/development/compilers/cudatoolkit/hooks/mark-for-cudatoolkit-root-hook.sh @@ -0,0 +1,8 @@ +# shellcheck shell=bash + +markForCUDAToolkit_ROOT() { + mkdir -p "${prefix}/nix-support" + touch "${prefix}/nix-support/include-in-cudatoolkit-root" +} + +fixupOutputHooks+=(markForCUDAToolkit_ROOT) diff --git a/nixpkgs/pkgs/development/compilers/cudatoolkit/hooks/nvcc-setup-hook.sh b/nixpkgs/pkgs/development/compilers/cudatoolkit/hooks/nvcc-setup-hook.sh new file mode 100644 index 000000000000..89801eb7c21a --- /dev/null +++ b/nixpkgs/pkgs/development/compilers/cudatoolkit/hooks/nvcc-setup-hook.sh @@ -0,0 +1,5 @@ +# shellcheck shell=bash + +# CMake's enable_language(CUDA) runs a compiler test and it doesn't account for +# CUDAToolkit_ROOT. We have to help it locate libcudart +export NVCC_APPEND_FLAGS+=" -L@cudartRoot@/lib -I@cudartRoot@/include" diff --git a/nixpkgs/pkgs/development/compilers/cudatoolkit/hooks/setup-cuda-hook.sh b/nixpkgs/pkgs/development/compilers/cudatoolkit/hooks/setup-cuda-hook.sh new file mode 100644 index 000000000000..89256e86f789 --- /dev/null +++ b/nixpkgs/pkgs/development/compilers/cudatoolkit/hooks/setup-cuda-hook.sh @@ -0,0 +1,68 @@ +# shellcheck shell=bash + +echo Sourcing setup-cuda-hook >&2 + +extendCUDAToolkit_ROOT() { + if [[ -f "$1/nix-support/include-in-cudatoolkit-root" ]] ; then + addToSearchPathWithCustomDelimiter ";" CUDAToolkit_ROOT "$1" + + if [[ -d "$1/include" ]] ; then + addToSearchPathWithCustomDelimiter ";" CUDAToolkit_INCLUDE_DIR "$1/include" + fi + fi +} + +addEnvHooks "$targetOffset" extendCUDAToolkit_ROOT + +setupCUDAToolkitCompilers() { + echo Executing setupCUDAToolkitCompilers >&2 + + if [[ -n "${dontSetupCUDAToolkitCompilers-}" ]] ; then + return + fi + + # Point NVCC at a compatible compiler + + # For CMake-based projects: + # https://cmake.org/cmake/help/latest/module/FindCUDA.html#input-variables + # https://cmake.org/cmake/help/latest/envvar/CUDAHOSTCXX.html + # https://cmake.org/cmake/help/latest/variable/CMAKE_CUDA_HOST_COMPILER.html + + export cmakeFlags+=" -DCUDA_HOST_COMPILER=@ccFullPath@" + export cmakeFlags+=" -DCMAKE_CUDA_HOST_COMPILER=@ccFullPath@" + + # For non-CMake projects: + # We prepend --compiler-bindir to nvcc flags. + # Downstream packages can override these, because NVCC + # uses the last --compiler-bindir it gets on the command line. + # FIXME: this results in "incompatible redefinition" warnings. + # https://docs.nvidia.com/cuda/cuda-compiler-driver-nvcc/index.html#compiler-bindir-directory-ccbin + if [ -z "${CUDAHOSTCXX-}" ]; then + export CUDAHOSTCXX="@ccFullPath@"; + fi + + export NVCC_PREPEND_FLAGS+=" --compiler-bindir=@ccRoot@/bin" + + # NOTE: We set -Xfatbin=-compress-all, which reduces the size of the compiled + # binaries. If binaries grow over 2GB, they will fail to link. This is a problem for us, as + # the default set of CUDA capabilities we build can regularly cause this to occur (for + # example, with Magma). + # + # @SomeoneSerge: original comment was made by @ConnorBaker in .../cudatoolkit/common.nix + if [[ -z "${dontCompressFatbin-}" ]]; then + export NVCC_PREPEND_FLAGS+=" -Xfatbin=-compress-all" + fi + + # CMake's enable_language(CUDA) runs a compiler test and it doesn't account for + # CUDAToolkit_ROOT. We have to help it locate libcudart + if [[ -z "${nvccDontPrependCudartFlags-}" ]] ; then + export NVCC_APPEND_FLAGS+=" -L@cudartRoot@/lib -I@cudartRoot@/include" + fi +} + +setupCMakeCUDAToolkit_ROOT() { + export cmakeFlags+=" -DCUDAToolkit_INCLUDE_DIR=$CUDAToolkit_INCLUDE_DIR -DCUDAToolkit_ROOT=$CUDAToolkit_ROOT" +} + +postHooks+=(setupCUDAToolkitCompilers) +preConfigureHooks+=(setupCMakeCUDAToolkit_ROOT) diff --git a/nixpkgs/pkgs/development/compilers/cudatoolkit/redist/build-cuda-redist-package.nix b/nixpkgs/pkgs/development/compilers/cudatoolkit/redist/build-cuda-redist-package.nix index 3a6a16b1d769..ec2c9cf72a9e 100644 --- a/nixpkgs/pkgs/development/compilers/cudatoolkit/redist/build-cuda-redist-package.nix +++ b/nixpkgs/pkgs/development/compilers/cudatoolkit/redist/build-cuda-redist-package.nix @@ -4,6 +4,7 @@ , fetchurl , autoPatchelfHook , autoAddOpenGLRunpathHook +, markForCudatoolkitRootHook }: pname: @@ -28,6 +29,7 @@ backendStdenv.mkDerivation { # directory to the rpath of all ELF binaries. # Check e.g. with `patchelf --print-rpath path/to/my/binary autoAddOpenGLRunpathHook + markForCudatoolkitRootHook ]; buildInputs = [ diff --git a/nixpkgs/pkgs/development/compilers/cudatoolkit/redist/extension.nix b/nixpkgs/pkgs/development/compilers/cudatoolkit/redist/extension.nix index 32215b1360c8..730ee1d28f56 100644 --- a/nixpkgs/pkgs/development/compilers/cudatoolkit/redist/extension.nix +++ b/nixpkgs/pkgs/development/compilers/cudatoolkit/redist/extension.nix @@ -15,6 +15,7 @@ final: prev: let "11.8" = ./manifests/redistrib_11.8.0.json; "12.0" = ./manifests/redistrib_12.0.1.json; "12.1" = ./manifests/redistrib_12.1.1.json; + "12.2" = ./manifests/redistrib_12.2.0.json; }; # Function to build a single cudatoolkit redist package @@ -26,9 +27,7 @@ final: prev: let in lib.mapAttrs buildCudaToolkitRedistPackage attrs; # All cudatoolkit redist packages for the current cuda version - cudaToolkitRedistPackages = if - lib.hasAttr cudaVersion cudaToolkitRedistManifests - then buildCudaToolkitRedistPackages { version = cudaVersion; manifest = cudaToolkitRedistManifests.${cudaVersion}; } - else {}; + cudaToolkitRedistPackages = lib.optionalAttrs (lib.hasAttr cudaVersion cudaToolkitRedistManifests) + (buildCudaToolkitRedistPackages { version = cudaVersion; manifest = cudaToolkitRedistManifests.${cudaVersion}; }); in cudaToolkitRedistPackages diff --git a/nixpkgs/pkgs/development/compilers/cudatoolkit/redist/manifests/redistrib_12.2.0.json b/nixpkgs/pkgs/development/compilers/cudatoolkit/redist/manifests/redistrib_12.2.0.json new file mode 100644 index 000000000000..f4ba3034ca8e --- /dev/null +++ b/nixpkgs/pkgs/development/compilers/cudatoolkit/redist/manifests/redistrib_12.2.0.json @@ -0,0 +1,1151 @@ +{ + "release_date": "2023-06-28", + "release_label": "12.2.0", + "release_product": "cuda", + "cuda_cccl": { + "name": "CXX Core Compute Libraries", + "license": "CUDA Toolkit", + "license_path": "cuda_cccl/LICENSE.txt", + "version": "12.2.53", + "linux-x86_64": { + "relative_path": "cuda_cccl/linux-x86_64/cuda_cccl-linux-x86_64-12.2.53-archive.tar.xz", + "sha256": "3a665ffb51a3d21dc08f28e316ee035ad2381301eca65a36e657d434a27f8aa2", + "md5": "1a44f8f3bb192c8139ddfc109818e41d", + "size": "1106044" + }, + "linux-ppc64le": { + "relative_path": "cuda_cccl/linux-ppc64le/cuda_cccl-linux-ppc64le-12.2.53-archive.tar.xz", + "sha256": "6cb035a15fd91436b17c66c06c15f7bff6efe70a2ca6d7a89fc1c85ab3b146ad", + "md5": "52073df19d7f2925956888c72e2de461", + "size": "1106412" + }, + "linux-sbsa": { + "relative_path": "cuda_cccl/linux-sbsa/cuda_cccl-linux-sbsa-12.2.53-archive.tar.xz", + "sha256": "fe020baf2784a7745cb7db1df22d9abe13528a4ce0984c10ffc892a27507a7d9", + "md5": "e991c3c63effb228b0ea38edb84414f6", + "size": "1105768" + }, + "windows-x86_64": { + "relative_path": "cuda_cccl/windows-x86_64/cuda_cccl-windows-x86_64-12.2.53-archive.zip", + "sha256": "a2f5579e23f24dd50cfb72d2ee28fb8ed3a7cb1484602df66fa808fe9defb6b3", + "md5": "0e23f2e0f3dd484ae4b770183f9d63d3", + "size": "2957130" + }, + "linux-aarch64": { + "relative_path": "cuda_cccl/linux-aarch64/cuda_cccl-linux-aarch64-12.2.53-archive.tar.xz", + "sha256": "6e6b4c01334778beed0b4320f067758c5c77701e573d8e502a7ffc51843faf7e", + "md5": "29a3d1c635fc4ee82aa1ab17a3aadc71", + "size": "1106468" + } + }, + "cuda_compat": { + "name": "CUDA compat L4T", + "license": "CUDA Toolkit", + "license_path": "cuda_compat/LICENSE.txt", + "version": "12.2.33189084", + "linux-aarch64": { + "relative_path": "cuda_compat/linux-aarch64/cuda_compat-linux-aarch64-12.2.33189084-archive.tar.xz", + "sha256": "e31c801017be83f2ba875f5b9afec91f8ff7b9c71d19b6591f7a85c03043236e", + "md5": "7cbaca4d76bacbb657f0b21aa815deb4", + "size": "18690068" + } + }, + "cuda_cudart": { + "name": "CUDA Runtime (cudart)", + "license": "CUDA Toolkit", + "license_path": "cuda_cudart/LICENSE.txt", + "version": "12.2.53", + "linux-x86_64": { + "relative_path": "cuda_cudart/linux-x86_64/cuda_cudart-linux-x86_64-12.2.53-archive.tar.xz", + "sha256": "e21fb4fc9152f5bbeea94b860b70546545d4a9a36ae3e33f508de15908d47b76", + "md5": "025fbfcecbb9b09e0ae2427b6d5a8472", + "size": "1000396" + }, + "linux-ppc64le": { + "relative_path": "cuda_cudart/linux-ppc64le/cuda_cudart-linux-ppc64le-12.2.53-archive.tar.xz", + "sha256": "fa18c6c76182ded75ea76a5db54097ed852b1e164e15f29d48b95bd589e2a872", + "md5": "535ced6ae08940680ed4dd80735a4138", + "size": "989476" + }, + "linux-sbsa": { + "relative_path": "cuda_cudart/linux-sbsa/cuda_cudart-linux-sbsa-12.2.53-archive.tar.xz", + "sha256": "77310096876cd6c4fae7508225d180f30f4ab6cca73634aa18a11c2e4f0ebde6", + "md5": "fab5c7525a3c4d959f042b4043556d4f", + "size": "999804" + }, + "windows-x86_64": { + "relative_path": "cuda_cudart/windows-x86_64/cuda_cudart-windows-x86_64-12.2.53-archive.zip", + "sha256": "950c71e53aa168d8459ad49050eae5d531b0c024cf0a2d176024d83dea9d3555", + "md5": "3772988f5a5771c914aee8a2c9a2163a", + "size": "2416404" + }, + "linux-aarch64": { + "relative_path": "cuda_cudart/linux-aarch64/cuda_cudart-linux-aarch64-12.2.53-archive.tar.xz", + "sha256": "7aaa03032bc9abb7a04f9215bc13e7a5fff5f8fd83a537b79c4f9dd7983bd1d1", + "md5": "9fd906e2964883d3df346ec5b0f8b6cb", + "size": "1066396" + } + }, + "cuda_cuobjdump": { + "name": "cuobjdump", + "license": "CUDA Toolkit", + "license_path": "cuda_cuobjdump/LICENSE.txt", + "version": "12.2.53", + "linux-x86_64": { + "relative_path": "cuda_cuobjdump/linux-x86_64/cuda_cuobjdump-linux-x86_64-12.2.53-archive.tar.xz", + "sha256": "420e0a60e11b0187e107d791007b63f87eec143fdab50ba08cadcf45dfbba8c5", + "md5": "a5398dd80c504cc52138b3fb3bd58e9a", + "size": "170828" + }, + "linux-ppc64le": { + "relative_path": "cuda_cuobjdump/linux-ppc64le/cuda_cuobjdump-linux-ppc64le-12.2.53-archive.tar.xz", + "sha256": "831692e3e23c9655fd02f9b19704d0adcd65c7cc1f2cf6143bc2dddbf0f2f468", + "md5": "292ace508f5c82d7e113b3fe2360817f", + "size": "212824" + }, + "linux-sbsa": { + "relative_path": "cuda_cuobjdump/linux-sbsa/cuda_cuobjdump-linux-sbsa-12.2.53-archive.tar.xz", + "sha256": "b77c73ab4ea28a98f41ee88884bcfe3c93b7f6d646984376a0dca870cd73ec87", + "md5": "0da93b2444f0f7d413556a396607aab6", + "size": "179248" + }, + "windows-x86_64": { + "relative_path": "cuda_cuobjdump/windows-x86_64/cuda_cuobjdump-windows-x86_64-12.2.53-archive.zip", + "sha256": "36676a17558a3a8137c7259f255854bd6eac8489787a4dc72796da8f100ad9bd", + "md5": "0def615994e278707a4609da17ed8a5d", + "size": "3776112" + }, + "linux-aarch64": { + "relative_path": "cuda_cuobjdump/linux-aarch64/cuda_cuobjdump-linux-aarch64-12.2.53-archive.tar.xz", + "sha256": "aae7adce1a84af830c8a92dd46a60eeb7dcb8cedb9a18c6d9e619f50c6adf9f5", + "md5": "bf9ea89b071cfcab146add4ed365dcd0", + "size": "163804" + } + }, + "cuda_cupti": { + "name": "CUPTI", + "license": "CUDA Toolkit", + "license_path": "cuda_cupti/LICENSE.txt", + "version": "12.2.60", + "linux-x86_64": { + "relative_path": "cuda_cupti/linux-x86_64/cuda_cupti-linux-x86_64-12.2.60-archive.tar.xz", + "sha256": "494663c1ac68f5f8ee86adc31de34089ec4f4fb5e174503298722474adf864f9", + "md5": "f6c81c9267e8af1188e6ef3a05b01049", + "size": "18800604" + }, + "linux-ppc64le": { + "relative_path": "cuda_cupti/linux-ppc64le/cuda_cupti-linux-ppc64le-12.2.60-archive.tar.xz", + "sha256": "cbec530bb1c666a5ea336344705c1927f41f42254bb0051261ad8c13b35bd4b1", + "md5": "ec629ff4843c39b6b509b3b2e1238f80", + "size": "10630824" + }, + "linux-sbsa": { + "relative_path": "cuda_cupti/linux-sbsa/cuda_cupti-linux-sbsa-12.2.60-archive.tar.xz", + "sha256": "653684dd10af3b810c69bfabe7d8b0ddee59629c779c1f005993cb50b774756e", + "md5": "53bcf073b379637c03984d55e59e5a2b", + "size": "9781820" + }, + "windows-x86_64": { + "relative_path": "cuda_cupti/windows-x86_64/cuda_cupti-windows-x86_64-12.2.60-archive.zip", + "sha256": "cf85306b44197720e5078629e627874c7015891e83a94b1a298a7db2c8baa4b7", + "md5": "6d547a40c28f38cb63b34a863cebe476", + "size": "13151576" + }, + "linux-aarch64": { + "relative_path": "cuda_cupti/linux-aarch64/cuda_cupti-linux-aarch64-12.2.60-archive.tar.xz", + "sha256": "e951c00abc6928928dbb687743841f0c0d73c436ffe797e6413e4627d749f96a", + "md5": "bee88796d6ef238540a5f517fec4e1b9", + "size": "7731940" + } + }, + "cuda_cuxxfilt": { + "name": "CUDA cuxxfilt (demangler)", + "license": "CUDA Toolkit", + "license_path": "cuda_cuxxfilt/LICENSE.txt", + "version": "12.2.53", + "linux-x86_64": { + "relative_path": "cuda_cuxxfilt/linux-x86_64/cuda_cuxxfilt-linux-x86_64-12.2.53-archive.tar.xz", + "sha256": "becedc25d308be46b63ebcbc041dd791c5e10a9ff24227eb481b3cc0c53499b2", + "md5": "90257b8ec952759368e008b89d7c0ad8", + "size": "188028" + }, + "linux-ppc64le": { + "relative_path": "cuda_cuxxfilt/linux-ppc64le/cuda_cuxxfilt-linux-ppc64le-12.2.53-archive.tar.xz", + "sha256": "0c5af08176f55c939692e0df87d3f61affe527a665fb321b65e49f608a88f0b0", + "md5": "510a67ba8e82af333848c4f25468f391", + "size": "179980" + }, + "linux-sbsa": { + "relative_path": "cuda_cuxxfilt/linux-sbsa/cuda_cuxxfilt-linux-sbsa-12.2.53-archive.tar.xz", + "sha256": "069b5005b271ba1ba5de3edbbb3aabf945bdf7466ba89ee25477448c1ec27d04", + "md5": "991fbe08fc7e7ed0afe5da73833a8d7c", + "size": "174668" + }, + "windows-x86_64": { + "relative_path": "cuda_cuxxfilt/windows-x86_64/cuda_cuxxfilt-windows-x86_64-12.2.53-archive.zip", + "sha256": "d1a8b508c33dc7488337b4744747d6a1deaf3e67f6279a04f2e9de638ba8334d", + "md5": "c6e567c6fa6339e4c50739f7f5c648b6", + "size": "169417" + }, + "linux-aarch64": { + "relative_path": "cuda_cuxxfilt/linux-aarch64/cuda_cuxxfilt-linux-aarch64-12.2.53-archive.tar.xz", + "sha256": "d3aaa8f58aa6a7164f097bfec4ab2640d59224671465927f6dce328137c074b5", + "md5": "558919c2abb5c55d35d2b229737f69da", + "size": "167304" + } + }, + "cuda_demo_suite": { + "name": "CUDA Demo Suite", + "license": "CUDA Toolkit", + "license_path": "cuda_demo_suite/LICENSE.txt", + "version": "12.2.53", + "linux-x86_64": { + "relative_path": "cuda_demo_suite/linux-x86_64/cuda_demo_suite-linux-x86_64-12.2.53-archive.tar.xz", + "sha256": "074d80c5b3eafa80efa18010b51e17b256ed84422cb9970c77391839bd2e86e8", + "md5": "edfd69322632e5a36f285951b8049177", + "size": "4011816" + }, + "windows-x86_64": { + "relative_path": "cuda_demo_suite/windows-x86_64/cuda_demo_suite-windows-x86_64-12.2.53-archive.zip", + "sha256": "c90a2683593652cf7feae460a96c6240f61e9468ee49cef2ab848d30c3e5022e", + "md5": "ad5f3a4d59b3bcff7bbef6c771ddeaab", + "size": "5052163" + } + }, + "cuda_documentation": { + "name": "CUDA Documentation", + "license": "CUDA Toolkit", + "license_path": "cuda_documentation/LICENSE.txt", + "version": "12.2.53", + "linux-x86_64": { + "relative_path": "cuda_documentation/linux-x86_64/cuda_documentation-linux-x86_64-12.2.53-archive.tar.xz", + "sha256": "166a02868d57a635b3810e2557ac0d0233b2de554a7070c412709eae8ec06ec9", + "md5": "c6a19cbc239d694066c6ee211288d369", + "size": "67148" + }, + "linux-ppc64le": { + "relative_path": "cuda_documentation/linux-ppc64le/cuda_documentation-linux-ppc64le-12.2.53-archive.tar.xz", + "sha256": "790b9b948b058bda215bf8af0693638c90a2201a6910aa618ddbb4b540bdda15", + "md5": "9d8ca1deb21491627bc68e3b1c00a50c", + "size": "67072" + }, + "linux-sbsa": { + "relative_path": "cuda_documentation/linux-sbsa/cuda_documentation-linux-sbsa-12.2.53-archive.tar.xz", + "sha256": "1a6ef53db09820f685792042c72c25d4395953a1ff63a6a6b8a63bd472c67959", + "md5": "88198884d70f7f5d29863becfb553348", + "size": "67076" + }, + "windows-x86_64": { + "relative_path": "cuda_documentation/windows-x86_64/cuda_documentation-windows-x86_64-12.2.53-archive.zip", + "sha256": "b110874271a51c1ff1ecb91b421f75850400a3be8aee6cad9385c2a80ec93f5d", + "md5": "0d8949ba742832f32c90d6060e0d0032", + "size": "105364" + }, + "linux-aarch64": { + "relative_path": "cuda_documentation/linux-aarch64/cuda_documentation-linux-aarch64-12.2.53-archive.tar.xz", + "sha256": "42bc8a0467a16b62c8976c433f9598d2835eec2c95e81cbe37b640301b118853", + "md5": "a9d34a1d043919b3abf79084925ad736", + "size": "67228" + } + }, + "cuda_gdb": { + "name": "CUDA GDB", + "license": "CUDA Toolkit", + "license_path": "cuda_gdb/LICENSE.txt", + "version": "12.2.53", + "linux-x86_64": { + "relative_path": "cuda_gdb/linux-x86_64/cuda_gdb-linux-x86_64-12.2.53-archive.tar.xz", + "sha256": "7360b3b126052712d86e760cc9cd2e5977bda98f25a32a25a36f4e3e1d86477e", + "md5": "454e9bbcb8c44b12610372d67edc16f0", + "size": "65702272" + }, + "linux-ppc64le": { + "relative_path": "cuda_gdb/linux-ppc64le/cuda_gdb-linux-ppc64le-12.2.53-archive.tar.xz", + "sha256": "d58bdf87458af81be178d0457ed666cdbf9307bca35819e92e13c9069a13bd7c", + "md5": "fadcec8f26e76b85740734b525596149", + "size": "65469448" + }, + "linux-sbsa": { + "relative_path": "cuda_gdb/linux-sbsa/cuda_gdb-linux-sbsa-12.2.53-archive.tar.xz", + "sha256": "350fd284c81258b5a7e60eddfb74984d2369254d7a2cc2bbfc0afd14096ff501", + "md5": "aaf51203301579f7fd2517786ff00078", + "size": "65360012" + }, + "linux-aarch64": { + "relative_path": "cuda_gdb/linux-aarch64/cuda_gdb-linux-aarch64-12.2.53-archive.tar.xz", + "sha256": "5659d69039b9215086fd294e437ed669bdacf2b9a203f4348b820a68d1564cde", + "md5": "ddfca3180674496e161f8de6fa858b2c", + "size": "65285732" + } + }, + "cuda_nsight": { + "name": "Nsight Eclipse Edition Plugin", + "license": "CUDA Toolkit", + "license_path": "cuda_nsight/LICENSE.txt", + "version": "12.2.53", + "linux-x86_64": { + "relative_path": "cuda_nsight/linux-x86_64/cuda_nsight-linux-x86_64-12.2.53-archive.tar.xz", + "sha256": "6f3674d4ba97ba18152e5aaa9f36e38b43017441b002cf801d5177bccdd52679", + "md5": "5e60e672c7be453b4cde6243180663ba", + "size": "118606032" + }, + "linux-ppc64le": { + "relative_path": "cuda_nsight/linux-ppc64le/cuda_nsight-linux-ppc64le-12.2.53-archive.tar.xz", + "sha256": "8599079e194fb17e08459d8f92e6dc4bb7910869158db83f02413946605a6aad", + "md5": "342c5efc729e3794aa975a2e1bd25cb0", + "size": "118606032" + } + }, + "cuda_nvcc": { + "name": "CUDA NVCC", + "license": "CUDA Toolkit", + "license_path": "cuda_nvcc/LICENSE.txt", + "version": "12.2.91", + "linux-x86_64": { + "relative_path": "cuda_nvcc/linux-x86_64/cuda_nvcc-linux-x86_64-12.2.91-archive.tar.xz", + "sha256": "d703af09bea3999b40c8c04095a78ec76ccf02b11094059300a3a9c2bd52ec61", + "md5": "b3b07d9b0b874c09a0cafadfc32b8760", + "size": "46508716" + }, + "linux-ppc64le": { + "relative_path": "cuda_nvcc/linux-ppc64le/cuda_nvcc-linux-ppc64le-12.2.91-archive.tar.xz", + "sha256": "a39ebc6ce0f952ae0a3272b770dda7752fa298a0d522f3799ccc3400a7ed0460", + "md5": "92f38d3dafbda1cfe42d5f4ff5fe514d", + "size": "41981244" + }, + "linux-sbsa": { + "relative_path": "cuda_nvcc/linux-sbsa/cuda_nvcc-linux-sbsa-12.2.91-archive.tar.xz", + "sha256": "dcdb55340adc6239ed3cbdc1ad8c3b0409f4d71c488f10a819d9ee1a57e097d2", + "md5": "23440328c7ef2fe44e58d197c1c0e09e", + "size": "41062040" + }, + "windows-x86_64": { + "relative_path": "cuda_nvcc/windows-x86_64/cuda_nvcc-windows-x86_64-12.2.91-archive.zip", + "sha256": "c83baba72ec53a9c69fac2a5db098ccbb0dbe029bb4552b13b07f624ddfc8fcf", + "md5": "905a2cb1107a480613972f7804ca1048", + "size": "60255563" + }, + "linux-aarch64": { + "relative_path": "cuda_nvcc/linux-aarch64/cuda_nvcc-linux-aarch64-12.2.91-archive.tar.xz", + "sha256": "e338332a7c585cd79c7fab4aa17bf6b53f474156f6766c8d599d47a8bbbebb29", + "md5": "76f51119161076f894b9bd61c3e85144", + "size": "42640072" + } + }, + "cuda_nvdisasm": { + "name": "CUDA nvdisasm", + "license": "CUDA Toolkit", + "license_path": "cuda_nvdisasm/LICENSE.txt", + "version": "12.2.53", + "linux-x86_64": { + "relative_path": "cuda_nvdisasm/linux-x86_64/cuda_nvdisasm-linux-x86_64-12.2.53-archive.tar.xz", + "sha256": "30ac135c709a39eb58f6a1f30bd340965499198c9fb0030762253fbaad1c43ff", + "md5": "4f6bd5e1ff724738b2d1909037f1629e", + "size": "49881548" + }, + "linux-ppc64le": { + "relative_path": "cuda_nvdisasm/linux-ppc64le/cuda_nvdisasm-linux-ppc64le-12.2.53-archive.tar.xz", + "sha256": "2219a350d2d02e53a16190d17d6ae4384f6b77ac89f5d5530622d3edc974c72d", + "md5": "ff3a9c319c988267f318857d28df78f7", + "size": "49858640" + }, + "linux-sbsa": { + "relative_path": "cuda_nvdisasm/linux-sbsa/cuda_nvdisasm-linux-sbsa-12.2.53-archive.tar.xz", + "sha256": "88d5394f92dd0e65e43ddc46b536f7db9425cb9ad12462e5cc9dc2b589c2a9b3", + "md5": "672fa265e1330a0a718766ebd58e7e6f", + "size": "49811968" + }, + "windows-x86_64": { + "relative_path": "cuda_nvdisasm/windows-x86_64/cuda_nvdisasm-windows-x86_64-12.2.53-archive.zip", + "sha256": "2ffcff04d7134f6e7f262da5ebd37e1ca6119660e8d07963d86fa97b809ba344", + "md5": "04083830287f39e180a9073399709621", + "size": "50125121" + }, + "linux-aarch64": { + "relative_path": "cuda_nvdisasm/linux-aarch64/cuda_nvdisasm-linux-aarch64-12.2.53-archive.tar.xz", + "sha256": "7cd16a90c25503073334ae896b6b176afa297a0e30556e61596e8c8e5ca0ebfa", + "md5": "5fce580872b7211d4d3c03d46139b0e9", + "size": "49808416" + } + }, + "cuda_nvml_dev": { + "name": "CUDA NVML Headers", + "license": "CUDA Toolkit", + "license_path": "cuda_nvml_dev/LICENSE.txt", + "version": "12.2.81", + "linux-x86_64": { + "relative_path": "cuda_nvml_dev/linux-x86_64/cuda_nvml_dev-linux-x86_64-12.2.81-archive.tar.xz", + "sha256": "07efe02d5ecf7f9079150dfaea06e6b6b9f284e9b0322bb8e07fc743ca39ba98", + "md5": "cf77fec8ce77ade6dfb803d0f471ea6d", + "size": "85072" + }, + "linux-ppc64le": { + "relative_path": "cuda_nvml_dev/linux-ppc64le/cuda_nvml_dev-linux-ppc64le-12.2.81-archive.tar.xz", + "sha256": "a72c79f32672a5fe3afa20fdabee9621fd57f5b21bbcdea6deb042026e040df1", + "md5": "0ad388bc765a0f483e2d8c51e5c070db", + "size": "84424" + }, + "linux-sbsa": { + "relative_path": "cuda_nvml_dev/linux-sbsa/cuda_nvml_dev-linux-sbsa-12.2.81-archive.tar.xz", + "sha256": "d8c76caf01a2a9399c59f2a368fceec5b12df5d7ff2bbf0e5bdeb6d01a8b9e3c", + "md5": "fcd43cdaf216afc39ebcc5f96e18f514", + "size": "85016" + }, + "windows-x86_64": { + "relative_path": "cuda_nvml_dev/windows-x86_64/cuda_nvml_dev-windows-x86_64-12.2.81-archive.zip", + "sha256": "04657b81d0012c7517f27da80eb572c3fbd0d354821e7a368cc0a677182baa78", + "md5": "63722c5bc70003a028d2ee057d443b50", + "size": "119150" + }, + "linux-aarch64": { + "relative_path": "cuda_nvml_dev/linux-aarch64/cuda_nvml_dev-linux-aarch64-12.2.81-archive.tar.xz", + "sha256": "d585c5c3cdf3ae7253a78624776edf81b1a5ae1ad18c0a7fa5b61bdb3727a845", + "md5": "ff412e9af3a1d5fa9ebdab1a83997442", + "size": "85032" + } + }, + "cuda_nvprof": { + "name": "CUDA nvprof", + "license": "CUDA Toolkit", + "license_path": "cuda_nvprof/LICENSE.txt", + "version": "12.2.60", + "linux-x86_64": { + "relative_path": "cuda_nvprof/linux-x86_64/cuda_nvprof-linux-x86_64-12.2.60-archive.tar.xz", + "sha256": "09dca174f073657b915de9be6585e654477b7336bf1f04753391cc35b1b9d660", + "md5": "42c6e437e27d8eee8aaad720de749e71", + "size": "2441200" + }, + "linux-ppc64le": { + "relative_path": "cuda_nvprof/linux-ppc64le/cuda_nvprof-linux-ppc64le-12.2.60-archive.tar.xz", + "sha256": "db8302b6b5f9c490325d5f29e94f1b42c618e27fcf95f468ab9cce350cd77c66", + "md5": "2f98ce48278ceded6a9d721abb9c9089", + "size": "2119668" + }, + "windows-x86_64": { + "relative_path": "cuda_nvprof/windows-x86_64/cuda_nvprof-windows-x86_64-12.2.60-archive.zip", + "sha256": "1330fd4803a37c2f8cb8ffdac62a538bf5e2a5d69169519b3bccecafa4b266ef", + "md5": "c4ed24f3d7a59a3ffc028f17abed7acf", + "size": "1700986" + } + }, + "cuda_nvprune": { + "name": "CUDA nvprune", + "license": "CUDA Toolkit", + "license_path": "cuda_nvprune/LICENSE.txt", + "version": "12.2.53", + "linux-x86_64": { + "relative_path": "cuda_nvprune/linux-x86_64/cuda_nvprune-linux-x86_64-12.2.53-archive.tar.xz", + "sha256": "79550967b7975a3ad38d2b94605a71cbaeb6d24e37ed8cb604253bfeefdef241", + "md5": "066300fa3fa03553acec2ba4ca435330", + "size": "56152" + }, + "linux-ppc64le": { + "relative_path": "cuda_nvprune/linux-ppc64le/cuda_nvprune-linux-ppc64le-12.2.53-archive.tar.xz", + "sha256": "59da797aaaed54f2a3e9e4d225c4552d15ef3e9d5af02a79979814c8bdda7f84", + "md5": "3cbbf747e4f2a41caf709b4d9bc92731", + "size": "57076" + }, + "linux-sbsa": { + "relative_path": "cuda_nvprune/linux-sbsa/cuda_nvprune-linux-sbsa-12.2.53-archive.tar.xz", + "sha256": "5fb12b382a59ac9d7094f2885d769bc15b60da8ebdf259cab426348732f2bce9", + "md5": "384e0c4725ab1898a512338c01215198", + "size": "48144" + }, + "windows-x86_64": { + "relative_path": "cuda_nvprune/windows-x86_64/cuda_nvprune-windows-x86_64-12.2.53-archive.zip", + "sha256": "581721f4a28ff1209e41d163d3575842a21f81d206569862d6d988d5cac16a68", + "md5": "b77d2561d486c69a8eb3e5c2292b6799", + "size": "145868" + }, + "linux-aarch64": { + "relative_path": "cuda_nvprune/linux-aarch64/cuda_nvprune-linux-aarch64-12.2.53-archive.tar.xz", + "sha256": "e27db910927c1c84adc3d7982c49518428f6d331f149eb7ba4e98bebd4af81c1", + "md5": "f0f3e29643c1b45544c7e352d7757ec2", + "size": "49716" + } + }, + "cuda_nvrtc": { + "name": "CUDA NVRTC", + "license": "CUDA Toolkit", + "license_path": "cuda_nvrtc/LICENSE.txt", + "version": "12.2.91", + "linux-x86_64": { + "relative_path": "cuda_nvrtc/linux-x86_64/cuda_nvrtc-linux-x86_64-12.2.91-archive.tar.xz", + "sha256": "c366d551840268b66420b216066f64ad471dc1063156bf8c63cf8538bf606141", + "md5": "01d50d7b944941e10c2cd5000d365a29", + "size": "30600936" + }, + "linux-ppc64le": { + "relative_path": "cuda_nvrtc/linux-ppc64le/cuda_nvrtc-linux-ppc64le-12.2.91-archive.tar.xz", + "sha256": "74ca0a176515fb7f5fb73a8ea1b550425e376b5f471d45f793759045b85daddc", + "md5": "a7d0a50025a122d7f7b2db86b7b31066", + "size": "28230692" + }, + "linux-sbsa": { + "relative_path": "cuda_nvrtc/linux-sbsa/cuda_nvrtc-linux-sbsa-12.2.91-archive.tar.xz", + "sha256": "be057dbc9cc098a2923057be985e068199d16ca1ead802f427ad2e9eee1b15e0", + "md5": "9bbff4319f82a1faf4f10fa996175078", + "size": "28229148" + }, + "windows-x86_64": { + "relative_path": "cuda_nvrtc/windows-x86_64/cuda_nvrtc-windows-x86_64-12.2.91-archive.zip", + "sha256": "f92f8e71ac6a6efdfcb1bec23cb10bef6901861d8fcdfd0e95f7c22af3246158", + "md5": "ffc97eb7fd177e31dfa2be0ffc4d8c83", + "size": "96122917" + }, + "linux-aarch64": { + "relative_path": "cuda_nvrtc/linux-aarch64/cuda_nvrtc-linux-aarch64-12.2.91-archive.tar.xz", + "sha256": "a00c80a98b7582e94601e7b82845d065acef7d9f10805a73a6f8736745a8b71f", + "md5": "156feaa39450acb83deb6e1a768a7b47", + "size": "29471304" + } + }, + "cuda_nvtx": { + "name": "CUDA NVTX", + "license": "CUDA Toolkit", + "license_path": "cuda_nvtx/LICENSE.txt", + "version": "12.2.53", + "linux-x86_64": { + "relative_path": "cuda_nvtx/linux-x86_64/cuda_nvtx-linux-x86_64-12.2.53-archive.tar.xz", + "sha256": "3bcbec1b2ed198bf044f8a85f73fdf011719e5567b418376fcdcde28b0b29c3e", + "md5": "7eb7e5ca661f27fd2b6bc8b816dfc774", + "size": "48372" + }, + "linux-ppc64le": { + "relative_path": "cuda_nvtx/linux-ppc64le/cuda_nvtx-linux-ppc64le-12.2.53-archive.tar.xz", + "sha256": "446e02152814f41cc3eb725c8adccb3d597a36934fefc4fdfd53c78e012571c6", + "md5": "3a1dbd4cbf2e8a93837873d795dc9b07", + "size": "48428" + }, + "linux-sbsa": { + "relative_path": "cuda_nvtx/linux-sbsa/cuda_nvtx-linux-sbsa-12.2.53-archive.tar.xz", + "sha256": "8d8b10154b55212ace5ab9e9be4c24c6579b3ef4940fafb0090274e30aa44a49", + "md5": "b24cc3a2b3b4432c80910978595eb541", + "size": "49004" + }, + "windows-x86_64": { + "relative_path": "cuda_nvtx/windows-x86_64/cuda_nvtx-windows-x86_64-12.2.53-archive.zip", + "sha256": "04a54a3bf04ca81750c5495d5c5c69f218338c2f01b8e433dd7858f61760e729", + "md5": "1e497aa200c0827f2da7486d6961f6bd", + "size": "65690" + }, + "linux-aarch64": { + "relative_path": "cuda_nvtx/linux-aarch64/cuda_nvtx-linux-aarch64-12.2.53-archive.tar.xz", + "sha256": "5b85fabb3a212832180be0e79b4af225e73a8d2202646a9166995efb3e0ff22e", + "md5": "c44c019829a1270f030704014cc01fbf", + "size": "51548" + } + }, + "cuda_nvvp": { + "name": "CUDA NVVP", + "license": "CUDA Toolkit", + "license_path": "cuda_nvvp/LICENSE.txt", + "version": "12.2.60", + "linux-x86_64": { + "relative_path": "cuda_nvvp/linux-x86_64/cuda_nvvp-linux-x86_64-12.2.60-archive.tar.xz", + "sha256": "b213d80a96d6fa22dd48a1e471de817c8c462a52a7cebcffceb37bc942dc00f2", + "md5": "726c6d43ef0e28996f2e7e6aa6ee5751", + "size": "117694060" + }, + "linux-ppc64le": { + "relative_path": "cuda_nvvp/linux-ppc64le/cuda_nvvp-linux-ppc64le-12.2.60-archive.tar.xz", + "sha256": "c597d50e6345739f63bcec8b7af2bfc096da348f1be0721ffcd7f4037cc8be26", + "md5": "966f4b457038d6cb5e4cc2ce1ddda338", + "size": "117147564" + }, + "windows-x86_64": { + "relative_path": "cuda_nvvp/windows-x86_64/cuda_nvvp-windows-x86_64-12.2.60-archive.zip", + "sha256": "225a86ef18bdb5ec49a53d89fbf2b37eabc623f817dc668e536a02ae6f6052d6", + "md5": "0a3ba61f91a92dee25aef180d3f199e2", + "size": "120358259" + } + }, + "cuda_opencl": { + "name": "CUDA OpenCL", + "license": "CUDA Toolkit", + "license_path": "cuda_opencl/LICENSE.txt", + "version": "12.2.53", + "linux-x86_64": { + "relative_path": "cuda_opencl/linux-x86_64/cuda_opencl-linux-x86_64-12.2.53-archive.tar.xz", + "sha256": "139fc9d16f4aaaa68a9161367829a927fe1ae2602e82a1d93adf2a9250b506d3", + "md5": "dd671fd1df845bcef67fd854fa66b2a1", + "size": "74936" + }, + "windows-x86_64": { + "relative_path": "cuda_opencl/windows-x86_64/cuda_opencl-windows-x86_64-12.2.53-archive.zip", + "sha256": "5fc4f66532f797c1daaa2539e55ca32d9accb9d41429e0f3ca6112f893c6627c", + "md5": "5b54f604183a206896e9d0e81f72991c", + "size": "112902" + } + }, + "cuda_profiler_api": { + "name": "CUDA Profiler API", + "license": "CUDA Toolkit", + "license_path": "cuda_profiler_api/LICENSE.txt", + "version": "12.2.53", + "linux-x86_64": { + "relative_path": "cuda_profiler_api/linux-x86_64/cuda_profiler_api-linux-x86_64-12.2.53-archive.tar.xz", + "sha256": "b534489386c9e1df62a5a8544da86fabaae872ef12b3209d8cf222fbb1678ba4", + "md5": "806822db69e151e01992422a5e92fca0", + "size": "16060" + }, + "linux-ppc64le": { + "relative_path": "cuda_profiler_api/linux-ppc64le/cuda_profiler_api-linux-ppc64le-12.2.53-archive.tar.xz", + "sha256": "2b7473f96fac0af92d13fb3a40eaf2c4fa5df60b4ab8afc3a9f2e0f252b8b084", + "md5": "b9fe730c03d14430e258c7634407ab5d", + "size": "16056" + }, + "linux-sbsa": { + "relative_path": "cuda_profiler_api/linux-sbsa/cuda_profiler_api-linux-sbsa-12.2.53-archive.tar.xz", + "sha256": "42c7463dcc2f1ee1c06576d103ad9886ba3620e8348ea760f22aaa963100fd99", + "md5": "628d561d285e45aa5ec28b20d7f57abb", + "size": "16052" + }, + "windows-x86_64": { + "relative_path": "cuda_profiler_api/windows-x86_64/cuda_profiler_api-windows-x86_64-12.2.53-archive.zip", + "sha256": "4b07eb70491d31ee48c6b181a4923dbcf98c2b5b9d14f7c8e12a1a519320b7c9", + "md5": "38d7cc004f8f921271faaaf1e1ee6c0e", + "size": "20075" + }, + "linux-aarch64": { + "relative_path": "cuda_profiler_api/linux-aarch64/cuda_profiler_api-linux-aarch64-12.2.53-archive.tar.xz", + "sha256": "72d6f489b77deb65aa576fef66e4b6015fbe7a1a0a5695d45acf76682c9ab7c8", + "md5": "28b71ef7ca59a5fb6546b5dfe701b0cf", + "size": "16048" + } + }, + "cuda_sanitizer_api": { + "name": "CUDA Compute Sanitizer API", + "license": "CUDA Toolkit", + "license_path": "cuda_sanitizer_api/LICENSE.txt", + "version": "12.2.53", + "linux-x86_64": { + "relative_path": "cuda_sanitizer_api/linux-x86_64/cuda_sanitizer_api-linux-x86_64-12.2.53-archive.tar.xz", + "sha256": "ad70fb519239cd7b53178938c73183ee3cb1b3b3639eeacf3e63fcea8ef32a92", + "md5": "d7c6c2ad94fc0640009c84286da5274e", + "size": "8063936" + }, + "linux-ppc64le": { + "relative_path": "cuda_sanitizer_api/linux-ppc64le/cuda_sanitizer_api-linux-ppc64le-12.2.53-archive.tar.xz", + "sha256": "1d5f46fc86e34f9279fe9acde1efc688388db72dc08ea3b95cf0f27df68124eb", + "md5": "2651d09b3f8acfc1586a449863da3f83", + "size": "7638524" + }, + "linux-sbsa": { + "relative_path": "cuda_sanitizer_api/linux-sbsa/cuda_sanitizer_api-linux-sbsa-12.2.53-archive.tar.xz", + "sha256": "9e1c66bd3d3b81d5b28c3cbabf798a853a63ea31eb86d14d4e259c0d49b27613", + "md5": "aaba9569e08361ad47794e54cf3bde39", + "size": "6215664" + }, + "windows-x86_64": { + "relative_path": "cuda_sanitizer_api/windows-x86_64/cuda_sanitizer_api-windows-x86_64-12.2.53-archive.zip", + "sha256": "1d3f7a07a5fe18e0bccf859e58c98f92a6e40080b156fc65ebf89d9967ed4f7e", + "md5": "ad145cb1bf0bdd1a08045a33f01809a8", + "size": "13897178" + }, + "linux-aarch64": { + "relative_path": "cuda_sanitizer_api/linux-aarch64/cuda_sanitizer_api-linux-aarch64-12.2.53-archive.tar.xz", + "sha256": "24cbb446c763a49875d15aba1a2878d408c796d6412118884a130e54f585409b", + "md5": "9478627e21ed32a1fd2f682da606eb51", + "size": "3538240" + } + }, + "fabricmanager": { + "name": "NVIDIA Fabric Manager", + "license": "NVIDIA Driver", + "license_path": "fabricmanager/LICENSE.txt", + "version": "535.54.03", + "linux-x86_64": { + "relative_path": "fabricmanager/linux-x86_64/fabricmanager-linux-x86_64-535.54.03-archive.tar.xz", + "sha256": "a04f72d5491d102e402d48f91096272276caf38c868852ad5d13a151bcb41a62", + "md5": "7fa84b39ceee1f56f075284413c8d0ac", + "size": "1819128" + }, + "linux-sbsa": { + "relative_path": "fabricmanager/linux-sbsa/fabricmanager-linux-sbsa-535.54.03-archive.tar.xz", + "sha256": "d5d9ca3e4aad2fc5382b490b99c3a79e4bffce90b433dabcee99d66bbc8766d6", + "md5": "ad6b474572fea29a14044c92d9ad1454", + "size": "1679976" + } + }, + "libcublas": { + "name": "CUDA cuBLAS", + "license": "CUDA Toolkit", + "license_path": "libcublas/LICENSE.txt", + "version": "12.2.1.16", + "linux-x86_64": { + "relative_path": "libcublas/linux-x86_64/libcublas-linux-x86_64-12.2.1.16-archive.tar.xz", + "sha256": "59b7509bc16c438b88469705f7c46cbcfb20848d6738845c1e4f39e2ea3b1d2c", + "md5": "d1cbebbf93af112a80a8fd2b71e7d098", + "size": "486327288" + }, + "linux-ppc64le": { + "relative_path": "libcublas/linux-ppc64le/libcublas-linux-ppc64le-12.2.1.16-archive.tar.xz", + "sha256": "0174812ce96bd997d8bb3707140788d7283c054c8f04ea0674f286816ebfe331", + "md5": "27f53db7127c73fcdf68a92f0b74dc55", + "size": "389457560" + }, + "linux-sbsa": { + "relative_path": "libcublas/linux-sbsa/libcublas-linux-sbsa-12.2.1.16-archive.tar.xz", + "sha256": "0bde331f46d0251a6416a198697a5ff07b9ff73b30794ee6a3647248d3793973", + "md5": "ef9244b625a693e85e093b72832271de", + "size": "484681612" + }, + "windows-x86_64": { + "relative_path": "libcublas/windows-x86_64/libcublas-windows-x86_64-12.2.1.16-archive.zip", + "sha256": "70c8bbc1cb1b58e8987623fef465477398839f14118cf9026868327159b8ec89", + "md5": "02630f7d68d31841c521f49c4f0931c3", + "size": "433276035" + }, + "linux-aarch64": { + "relative_path": "libcublas/linux-aarch64/libcublas-linux-aarch64-12.2.1.16-archive.tar.xz", + "sha256": "5d3dd3e92964c48e2ad976410cef944820964649683f15b3d090ea259efcfc91", + "md5": "ec74be5b9456476f1735eb1e472a58a2", + "size": "442689448" + } + }, + "libcudla": { + "name": "cuDLA", + "license": "CUDA Toolkit", + "license_path": "libcudla/LICENSE.txt", + "version": "12.2.53", + "linux-aarch64": { + "relative_path": "libcudla/linux-aarch64/libcudla-linux-aarch64-12.2.53-archive.tar.xz", + "sha256": "c0c5ec192110a4eb556a2d042c07281574aa0ffbf27aa354f017152dd26dd8e6", + "md5": "7766e66ace29d881556eb3b8f8205869", + "size": "37856" + } + }, + "libcufft": { + "name": "CUDA cuFFT", + "license": "CUDA Toolkit", + "license_path": "libcufft/LICENSE.txt", + "version": "11.0.8.15", + "linux-x86_64": { + "relative_path": "libcufft/linux-x86_64/libcufft-linux-x86_64-11.0.8.15-archive.tar.xz", + "sha256": "ce0991bff7d17caddf38262573ce783afbf4faf68034ae2e0543472f8dd90f40", + "md5": "152eaa27cf4c2c23b9bfc68dbcc797bd", + "size": "170425736" + }, + "linux-ppc64le": { + "relative_path": "libcufft/linux-ppc64le/libcufft-linux-ppc64le-11.0.8.15-archive.tar.xz", + "sha256": "9df5e513987601cc4dbfe3ee084da21d0e318e448fa94550e5d4762ecf4d6aae", + "md5": "1b9df07f5b2c2803ca46a9b3fa2b5d74", + "size": "170536256" + }, + "linux-sbsa": { + "relative_path": "libcufft/linux-sbsa/libcufft-linux-sbsa-11.0.8.15-archive.tar.xz", + "sha256": "3eeb365441549334ae582318653260c92137943c1ad285bb325eeccfba9e15e7", + "md5": "b4adab68ba9ab153f5b0b16c57f40cbb", + "size": "170569432" + }, + "windows-x86_64": { + "relative_path": "libcufft/windows-x86_64/libcufft-windows-x86_64-11.0.8.15-archive.zip", + "sha256": "cbec006d998561eed5d89fc8365247dce597bba5280e3642e0e4ba34db083645", + "md5": "e79fcca7c4ffcc1a67bda6f32e85044e", + "size": "97456840" + }, + "linux-aarch64": { + "relative_path": "libcufft/linux-aarch64/libcufft-linux-aarch64-11.0.8.15-archive.tar.xz", + "sha256": "a877d212db7cc4b2320d9579a9e2344609a3ec86b8b0c3f1716b0eec98dd8e11", + "md5": "a2a0df7cbd1373e93ede7be8d1015069", + "size": "170665012" + } + }, + "libcufile": { + "name": "CUDA cuFile", + "license": "CUDA Toolkit", + "license_path": "libcufile/LICENSE.txt", + "version": "1.7.0.149", + "linux-x86_64": { + "relative_path": "libcufile/linux-x86_64/libcufile-linux-x86_64-1.7.0.149-archive.tar.xz", + "sha256": "dbcec7913ad9b59162a60aa5818335d3dbb5aee207ed2c3c65c8995a77746a96", + "md5": "41b451c16c1657e1126f11cb9bae080e", + "size": "41848568" + }, + "linux-sbsa": { + "relative_path": "libcufile/linux-sbsa/libcufile-linux-sbsa-1.7.0.149-archive.tar.xz", + "sha256": "86f5b0b910e3813ea190a074bb743f319ad9b95bfc31bb402d663ac5c284b2c8", + "md5": "a19e71dc765d85a3007493a9b31484a4", + "size": "41294576" + }, + "linux-aarch64": { + "relative_path": "libcufile/linux-aarch64/libcufile-linux-aarch64-1.7.0.149-archive.tar.xz", + "sha256": "39a7dbd1763b6d4c7da2cb5b15db75501e723844a8f8a5914a29fcaa6ad9eca3", + "md5": "7855d4c52825274fb5acfb2d27387e7b", + "size": "41274348" + } + }, + "libcurand": { + "name": "CUDA cuRAND", + "license": "CUDA Toolkit", + "license_path": "libcurand/LICENSE.txt", + "version": "10.3.3.53", + "linux-x86_64": { + "relative_path": "libcurand/linux-x86_64/libcurand-linux-x86_64-10.3.3.53-archive.tar.xz", + "sha256": "890181ef02a4752fd4cf4113770c27340f19112d81cd6076d0630dba8f746ed6", + "md5": "c11537005ba88971f536effdc0825a5a", + "size": "81945064" + }, + "linux-ppc64le": { + "relative_path": "libcurand/linux-ppc64le/libcurand-linux-ppc64le-10.3.3.53-archive.tar.xz", + "sha256": "d0d819e85139346229aef2000231e42ff8d20e13c9ad6acae780e265d3dc8b8e", + "md5": "501debf6ad4405494bfee9a769a976f0", + "size": "81983028" + }, + "linux-sbsa": { + "relative_path": "libcurand/linux-sbsa/libcurand-linux-sbsa-10.3.3.53-archive.tar.xz", + "sha256": "4367394f6d57dd0ff9b597f5f7471b8b346f6c878ad5dca6f2b8f377d0b23d72", + "md5": "6a16970981b6c64be5cbeec2245a5f07", + "size": "81931700" + }, + "windows-x86_64": { + "relative_path": "libcurand/windows-x86_64/libcurand-windows-x86_64-10.3.3.53-archive.zip", + "sha256": "39a68f5049825bb52af30cabf2f29b20a1cfe0f127875ae11a3684824efd41d5", + "md5": "f8654726922d89040d8679cddc5bd150", + "size": "55279087" + }, + "linux-aarch64": { + "relative_path": "libcurand/linux-aarch64/libcurand-linux-aarch64-10.3.3.53-archive.tar.xz", + "sha256": "759082826aea2bfd4d63f7dafb84518a24a306f3007ffc061554d28faf9b4dc6", + "md5": "ae3d27bf5dcb77af666bb89463ce5c88", + "size": "84107132" + } + }, + "libcusolver": { + "name": "CUDA cuSOLVER", + "license": "CUDA Toolkit", + "license_path": "libcusolver/LICENSE.txt", + "version": "11.5.0.53", + "linux-x86_64": { + "relative_path": "libcusolver/linux-x86_64/libcusolver-linux-x86_64-11.5.0.53-archive.tar.xz", + "sha256": "0ce1f6058005117fc1aa2dd731e1c6009aa79993c179cbdb2d01f17959dfdc87", + "md5": "2df25f844d081afb79b3cffe6bc53ce6", + "size": "123332556" + }, + "linux-ppc64le": { + "relative_path": "libcusolver/linux-ppc64le/libcusolver-linux-ppc64le-11.5.0.53-archive.tar.xz", + "sha256": "1f690cabb35ae92ef5a1cd3d6f1222a535bafea86a259d88cf8d2410558b6414", + "md5": "46670044a53afbf7ebdb2fff57bd2a64", + "size": "122967236" + }, + "linux-sbsa": { + "relative_path": "libcusolver/linux-sbsa/libcusolver-linux-sbsa-11.5.0.53-archive.tar.xz", + "sha256": "5135dff78a3cf7353362b7c6547af61fdca164e8b792fbff4066989c36183925", + "md5": "419bad18195a23817c76aba940d8e5ff", + "size": "122295788" + }, + "windows-x86_64": { + "relative_path": "libcusolver/windows-x86_64/libcusolver-windows-x86_64-11.5.0.53-archive.zip", + "sha256": "36bac40d8f8f9a05bf9936a2348cfe71c848fbb52d40750dfb6600c3e84ef9ff", + "md5": "edad14e88c2faeae872a53ee1975575b", + "size": "120629517" + }, + "linux-aarch64": { + "relative_path": "libcusolver/linux-aarch64/libcusolver-linux-aarch64-11.5.0.53-archive.tar.xz", + "sha256": "4eaec6e813dded192cef54252902b915de9116149c52aa840b7631bab7e244a3", + "md5": "f93615f925e87ad318f1307d303a4c5c", + "size": "133342388" + } + }, + "libcusparse": { + "name": "CUDA cuSPARSE", + "license": "CUDA Toolkit", + "license_path": "libcusparse/LICENSE.txt", + "version": "12.1.1.53", + "linux-x86_64": { + "relative_path": "libcusparse/linux-x86_64/libcusparse-linux-x86_64-12.1.1.53-archive.tar.xz", + "sha256": "3b38e39c27fc9e91ccae949bc06692a76e5d6d88320177d8b1795be3086ea305", + "md5": "9333e20cba966d557186fa32ad47008b", + "size": "211590820" + }, + "linux-ppc64le": { + "relative_path": "libcusparse/linux-ppc64le/libcusparse-linux-ppc64le-12.1.1.53-archive.tar.xz", + "sha256": "4c5297adea9229fd820c7891694e851f39ecbe69bd642449007e7eca62c6124f", + "md5": "acd166b34c7f6e5dbe60ddea1ad4a76a", + "size": "211736192" + }, + "linux-sbsa": { + "relative_path": "libcusparse/linux-sbsa/libcusparse-linux-sbsa-12.1.1.53-archive.tar.xz", + "sha256": "504b2a6bfd588cda6cb293f030f98b7aa36a6d60a30063c4c4aa9b74ab27dc92", + "md5": "e233abe1bd165db5619d1bfa1abbe3a9", + "size": "211253852" + }, + "windows-x86_64": { + "relative_path": "libcusparse/windows-x86_64/libcusparse-windows-x86_64-12.1.1.53-archive.zip", + "sha256": "39b9d0927c5f3ac9a3b92523b60aac7871b41fa7a72a210bc9bb3b5828b8d5f8", + "md5": "6d8e6e1c410d3cf50ad95d3df21d0d67", + "size": "192210264" + }, + "linux-aarch64": { + "relative_path": "libcusparse/linux-aarch64/libcusparse-linux-aarch64-12.1.1.53-archive.tar.xz", + "sha256": "b86fcc1f706080bc6cdc5f2f8f99f99ceab62977a40aa13f97eb01e10ad97334", + "md5": "88264e9ac0334655f5b80eb8cea03a2e", + "size": "226908380" + } + }, + "libnpp": { + "name": "CUDA NPP", + "license": "CUDA Toolkit", + "license_path": "libnpp/LICENSE.txt", + "version": "12.1.1.14", + "linux-x86_64": { + "relative_path": "libnpp/linux-x86_64/libnpp-linux-x86_64-12.1.1.14-archive.tar.xz", + "sha256": "efc53c1d554dab8cd4f75b21528b68f39a32b20eaabc5d8d2585e0db91f4353d", + "md5": "902f1d530b9245d35a61ba56ec8cd516", + "size": "182561952" + }, + "linux-ppc64le": { + "relative_path": "libnpp/linux-ppc64le/libnpp-linux-ppc64le-12.1.1.14-archive.tar.xz", + "sha256": "4d58706c834addf38613eaa76eed01690762ee337faeab085ecbf7528d6fac70", + "md5": "ce315e5b89199106aa93a03db65ca39f", + "size": "182373984" + }, + "linux-sbsa": { + "relative_path": "libnpp/linux-sbsa/libnpp-linux-sbsa-12.1.1.14-archive.tar.xz", + "sha256": "e99c853cd9ec8526cc053228d1b90597e6bb89ae1856af72bf85a7095b83106c", + "md5": "0a3254d7e4042d88ac522b14a43e278f", + "size": "181513452" + }, + "windows-x86_64": { + "relative_path": "libnpp/windows-x86_64/libnpp-windows-x86_64-12.1.1.14-archive.zip", + "sha256": "846e7ba7d473a10918a97f81ce6b3742a11282ae0126ca99692971a4d30736b1", + "md5": "cb84a09751bceb3380a8f9e028e8f1c5", + "size": "151773014" + }, + "linux-aarch64": { + "relative_path": "libnpp/linux-aarch64/libnpp-linux-aarch64-12.1.1.14-archive.tar.xz", + "sha256": "77c0b1cccd53e2dec1928dfc22cbce819f51140ede32edcf567840119f51f89d", + "md5": "82a83bf87d10da2f80e443e45deef998", + "size": "199197524" + } + }, + "libnvidia_nscq": { + "name": "NVIDIA NSCQ API", + "license": "NVIDIA Driver", + "license_path": "libnvidia_nscq/LICENSE.txt", + "version": "535.54.03", + "linux-x86_64": { + "relative_path": "libnvidia_nscq/linux-x86_64/libnvidia_nscq-linux-x86_64-535.54.03-archive.tar.xz", + "sha256": "3433f2b46c47efeec54fc1eef990859b070801af9dfdcb5305783380e322e833", + "md5": "6e4728a04c1de840190f481b6b9cc0f0", + "size": "349948" + }, + "linux-sbsa": { + "relative_path": "libnvidia_nscq/linux-sbsa/libnvidia_nscq-linux-sbsa-535.54.03-archive.tar.xz", + "sha256": "8ee52b4f763062e68ab41ed0af7b0daf2ce9d4c0bd3d27aeb14059584703e915", + "md5": "ead66878ffdf57c8875c0151855828b6", + "size": "317244" + } + }, + "libnvjitlink": { + "name": "NVIDIA compiler library for JIT LTO functionality", + "license": "CUDA Toolkit", + "license_path": "libnvjitlink/LICENSE.txt", + "version": "12.2.91", + "linux-x86_64": { + "relative_path": "libnvjitlink/linux-x86_64/libnvjitlink-linux-x86_64-12.2.91-archive.tar.xz", + "sha256": "5f99b51c7dbb7420ad2559f295d651064259c42780298a1fcb6e647560421a98", + "md5": "377b9a77093f05b73e023164ccd58ff1", + "size": "26077128" + }, + "linux-ppc64le": { + "relative_path": "libnvjitlink/linux-ppc64le/libnvjitlink-linux-ppc64le-12.2.91-archive.tar.xz", + "sha256": "18c703ad153525b14d69c0e5ff46b5505b22354e406923887e2d26f3a09f2f9b", + "md5": "09721fd552a006237fe8aad0b6e5dc03", + "size": "23976600" + }, + "linux-sbsa": { + "relative_path": "libnvjitlink/linux-sbsa/libnvjitlink-linux-sbsa-12.2.91-archive.tar.xz", + "sha256": "8b2141ffa23e030fdc7d707b6eebda2b3f32c3e33379c0fe75868640c0f5c701", + "md5": "0d728f150ca04bae7f8f5f6930d27be6", + "size": "23937120" + }, + "windows-x86_64": { + "relative_path": "libnvjitlink/windows-x86_64/libnvjitlink-windows-x86_64-12.2.91-archive.zip", + "sha256": "bb66172487d485d4aa969600a6128d92f0a6e4c02687c5008d282648b9f087e0", + "md5": "fedd2335f22e42106f76966845e031bf", + "size": "86994854" + }, + "linux-aarch64": { + "relative_path": "libnvjitlink/linux-aarch64/libnvjitlink-linux-aarch64-12.2.91-archive.tar.xz", + "sha256": "6676827058de20c4d63819050fb8b53528dc19fd24982fc381ff28456472f6c4", + "md5": "6703a7759c62a74b658859913d5a4c63", + "size": "25130600" + } + }, + "libnvjpeg": { + "name": "CUDA nvJPEG", + "license": "CUDA Toolkit", + "license_path": "libnvjpeg/LICENSE.txt", + "version": "12.1.1.14", + "linux-x86_64": { + "relative_path": "libnvjpeg/linux-x86_64/libnvjpeg-linux-x86_64-12.1.1.14-archive.tar.xz", + "sha256": "7ffeea14fc61f6600c29fd7872edbebad57abf360b3db15308d96902cbec34e7", + "md5": "36c92e8bd55423399dc64a80b1e4e2d5", + "size": "2506196" + }, + "linux-ppc64le": { + "relative_path": "libnvjpeg/linux-ppc64le/libnvjpeg-linux-ppc64le-12.1.1.14-archive.tar.xz", + "sha256": "c56eea8afd8f500b827041f26bfe127d836ba08b15028a48fd41c122e8f06e5c", + "md5": "5d42d6e37898c2f612da15e455fd1ef9", + "size": "2490368" + }, + "linux-sbsa": { + "relative_path": "libnvjpeg/linux-sbsa/libnvjpeg-linux-sbsa-12.1.1.14-archive.tar.xz", + "sha256": "cb17129e4dcbb7338ef7e37149de9ce4023ca9e2efad97de1ae0806bf67bdd10", + "md5": "b020197978d730b63a92caa140bb2a2a", + "size": "2336180" + }, + "windows-x86_64": { + "relative_path": "libnvjpeg/windows-x86_64/libnvjpeg-windows-x86_64-12.1.1.14-archive.zip", + "sha256": "bf4107f5993c6595834821da5e2d50b1b1cd1dd687cb6224176656c198cacbbd", + "md5": "0da427edeea81414df1466fd5bc9b791", + "size": "2766220" + }, + "linux-aarch64": { + "relative_path": "libnvjpeg/linux-aarch64/libnvjpeg-linux-aarch64-12.1.1.14-archive.tar.xz", + "sha256": "9b39d91814bf077c89e4ad5fbd5608acda0dd2fae4a0ccf0c91da6e45b11eaa6", + "md5": "e36afb6fd678c4846d1202f22a97b2fa", + "size": "2474640" + } + }, + "nsight_compute": { + "name": "Nsight Compute", + "license": "NVIDIA SLA", + "license_path": "nsight_compute/LICENSE.txt", + "version": "2023.2.0.16", + "linux-x86_64": { + "relative_path": "nsight_compute/linux-x86_64/nsight_compute-linux-x86_64-2023.2.0.16-archive.tar.xz", + "sha256": "d4232eecbdb709f1482629af916c8fe6c6c6084764fff9fe5d4eec289cc10cb8", + "md5": "bad0c0f76173996c9995884bfb6ae3b6", + "size": "724640244" + }, + "linux-ppc64le": { + "relative_path": "nsight_compute/linux-ppc64le/nsight_compute-linux-ppc64le-2023.2.0.16-archive.tar.xz", + "sha256": "ac3e1530830cf70b4d298818d5ed4e33864c1ebd6c44455ecafaaa264b8d3be7", + "md5": "7fcdf966becc5b915dcd65700e7f6e38", + "size": "185175700" + }, + "linux-sbsa": { + "relative_path": "nsight_compute/linux-sbsa/nsight_compute-linux-sbsa-2023.2.0.16-archive.tar.xz", + "sha256": "5d9f2daeed1aaf87ac4fd8237699d0c915ef2de52b66a1f4ab4bda0057f47c7f", + "md5": "d9639e34e406f705530a25ccfcb55358", + "size": "350199152" + }, + "windows-x86_64": { + "relative_path": "nsight_compute/windows-x86_64/nsight_compute-windows-x86_64-2023.2.0.16-archive.zip", + "sha256": "16579328355102bd1dd27f6969ab6bda426ea9e8a1bdf2f62f2bbf8b9370d5b9", + "md5": "c6be0d2ff8d1f1fe7cce5181393b79a8", + "size": "664635780" + }, + "linux-aarch64": { + "relative_path": "nsight_compute/linux-aarch64/nsight_compute-linux-aarch64-2023.2.0.16-archive.tar.xz", + "sha256": "09a815a8e00fde87acc4b32c6409dfb616b8b49b7ae8f931c66de7c795db87e4", + "md5": "f3879107229a1a031b5971e77cd18916", + "size": "740361468" + } + }, + "nsight_systems": { + "name": "Nsight Systems", + "license": "NVIDIA SLA", + "license_path": "nsight_systems/LICENSE.txt", + "version": "2023.2.3.1001", + "linux-x86_64": { + "relative_path": "nsight_systems/linux-x86_64/nsight_systems-linux-x86_64-2023.2.3.1001-archive.tar.xz", + "sha256": "3c5ff99cd44d99808e25d72059372cf8d36cd435ff4724e840a227cc674d79d0", + "md5": "4addd2a842d5e753e992bb2595babf15", + "size": "222188232" + }, + "linux-ppc64le": { + "relative_path": "nsight_systems/linux-ppc64le/nsight_systems-linux-ppc64le-2023.2.3.1001-archive.tar.xz", + "sha256": "c71f3e39355bb23c6da411450360acb763b4effc5752918d0735517633d38352", + "md5": "2ef6e9dc891b39439541b123056b69c7", + "size": "64464952" + }, + "linux-sbsa": { + "relative_path": "nsight_systems/linux-sbsa/nsight_systems-linux-sbsa-2023.2.3.1001-archive.tar.xz", + "sha256": "6e559924fcdcfbc677490131f343ea9a2ab2a9ecb994906b3a23791601428dfc", + "md5": "92dfed2062891bc73e4b5f488cf48467", + "size": "197068636" + }, + "windows-x86_64": { + "relative_path": "nsight_systems/windows-x86_64/nsight_systems-windows-x86_64-2023.2.3.1001-archive.zip", + "sha256": "928d40a3edd0434d82fd5a48d70781e41a01071db8095891588d0299ba888962", + "md5": "1bb802ca720f4dabdbc5933f426f35ee", + "size": "335353534" + } + }, + "nsight_vse": { + "name": "Nsight Visual Studio Edition (VSE)", + "license": "NVIDIA SLA", + "license_path": "nsight_vse/LICENSE.txt", + "version": "2023.2.0.23143", + "windows-x86_64": { + "relative_path": "nsight_vse/windows-x86_64/nsight_vse-windows-x86_64-2023.2.0.23143-archive.zip", + "sha256": "07a819f72797cae9aa95e4308ae65b712384d1e76ed104842cc2d51ac6196b9f", + "md5": "5cd16b1761028a887351148ac8e078f1", + "size": "526806378" + } + }, + "nvidia_driver": { + "name": "NVIDIA Linux Driver", + "license": "NVIDIA Driver", + "license_path": "nvidia_driver/LICENSE.txt", + "version": "535.54.03", + "linux-x86_64": { + "relative_path": "nvidia_driver/linux-x86_64/nvidia_driver-linux-x86_64-535.54.03-archive.tar.xz", + "sha256": "c394729dc4a52d47d88d2573265fd29037709732f20f489a37ac4ab47f6822f1", + "md5": "955c14cf3dd6178547257a50f07b8c6f", + "size": "399961036" + }, + "linux-ppc64le": { + "relative_path": "nvidia_driver/linux-ppc64le/nvidia_driver-linux-ppc64le-535.54.03-archive.tar.xz", + "sha256": "72176f44f8317fcaa4e3a14ad28dbff0c4d999a1b72f9cd91171cda3d7f0d66c", + "md5": "4a459d6fdd07d8dd9b94d26e96cf9f23", + "size": "99839420" + }, + "linux-sbsa": { + "relative_path": "nvidia_driver/linux-sbsa/nvidia_driver-linux-sbsa-535.54.03-archive.tar.xz", + "sha256": "01bca95203ebac62fc7e87b4142cb0b2ebdaed5290e957fb13999e6c460f78ef", + "md5": "3a69e12fd2d28c957156512021a0dc3e", + "size": "313982992" + } + }, + "nvidia_fs": { + "name": "NVIDIA filesystem", + "license": "CUDA Toolkit", + "license_path": "nvidia_fs/LICENSE.txt", + "version": "2.16.1", + "linux-x86_64": { + "relative_path": "nvidia_fs/linux-x86_64/nvidia_fs-linux-x86_64-2.16.1-archive.tar.xz", + "sha256": "c899c58d07dbbe337abead01337a2aec72a7fd4600b95838b044335c85199c6b", + "md5": "f6f00d81e1e0dcb0847fea3b3c83d3a1", + "size": "57608" + }, + "linux-sbsa": { + "relative_path": "nvidia_fs/linux-sbsa/nvidia_fs-linux-sbsa-2.16.1-archive.tar.xz", + "sha256": "779d2b669d5021125da6689dfc1c45772996abb63ace42d388cbc03a85dfa4fb", + "md5": "c462ac53d3318e5fb73bc04201a78046", + "size": "57580" + }, + "linux-aarch64": { + "relative_path": "nvidia_fs/linux-aarch64/nvidia_fs-linux-aarch64-2.16.1-archive.tar.xz", + "sha256": "a6f56b158246178637a5e87889d81ec3796407a6105ae8b17844842a3d0beafb", + "md5": "ee4bdba81554d3548cf778a72e6321a7", + "size": "57596" + } + }, + "visual_studio_integration": { + "name": "CUDA Visual Studio Integration", + "license": "CUDA Toolkit", + "license_path": "visual_studio_integration/LICENSE.txt", + "version": "12.2.53", + "windows-x86_64": { + "relative_path": "visual_studio_integration/windows-x86_64/visual_studio_integration-windows-x86_64-12.2.53-archive.zip", + "sha256": "427c33b33f67f0d412d37e1e34c72c16e9fd34ef25f6d15b90ab91488ed3d0f5", + "md5": "ddf0c3651191623c29c63e268c6720f2", + "size": "517874" + } + } +} diff --git a/nixpkgs/pkgs/development/compilers/cudatoolkit/redist/overrides.nix b/nixpkgs/pkgs/development/compilers/cudatoolkit/redist/overrides.nix index 7b8e02de2474..b962b6caa1b2 100644 --- a/nixpkgs/pkgs/development/compilers/cudatoolkit/redist/overrides.nix +++ b/nixpkgs/pkgs/development/compilers/cudatoolkit/redist/overrides.nix @@ -27,35 +27,27 @@ in inherit (prev.backendStdenv) cc; in { - # Point NVCC at a compatible compiler - # FIXME: non-redist cudatoolkit copy-pastes this code + # Required by cmake's enable_language(CUDA) to build a test program + # When implementing cross-compilation support: this is + # final.pkgs.targetPackages.cudaPackages.cuda_cudart + env.cudartRoot = "${prev.lib.getDev final.cuda_cudart}"; - # For CMake-based projects: - # https://cmake.org/cmake/help/latest/module/FindCUDA.html#input-variables - # https://cmake.org/cmake/help/latest/envvar/CUDAHOSTCXX.html - # https://cmake.org/cmake/help/latest/variable/CMAKE_CUDA_HOST_COMPILER.html + # Point NVCC at a compatible compiler - # For non-CMake projects: - # We prepend --compiler-bindir to nvcc flags. - # Downstream packages can override these, because NVCC - # uses the last --compiler-bindir it gets on the command line. - # FIXME: this results in "incompatible redefinition" warnings. - # https://docs.nvidia.com/cuda/cuda-compiler-driver-nvcc/index.html#compiler-bindir-directory-ccbin - # NOTE: We unconditionally set -Xfatbin=-compress-all, which reduces the size of the - # compiled binaries. If binaries grow over 2GB, they will fail to link. This is a problem - # for us, as the default set of CUDA capabilities we build can regularly cause this to - # occur (for example, with Magma). - postInstall = (oldAttrs.postInstall or "") + '' - mkdir -p $out/nix-support - cat <<EOF >> $out/nix-support/setup-hook - cmakeFlags+=' -DCUDA_HOST_COMPILER=${cc}/bin' - cmakeFlags+=' -DCMAKE_CUDA_HOST_COMPILER=${cc}/bin' - if [ -z "\''${CUDAHOSTCXX-}" ]; then - export CUDAHOSTCXX=${cc}/bin; - fi - export NVCC_PREPEND_FLAGS+=' --compiler-bindir=${cc}/bin -Xfatbin=-compress-all' - EOF - ''; + # Desiredata: whenever a package (e.g. magma) adds cuda_nvcc to + # nativeBuildInputs (offsets `(-1, 0)`), magma should also source the + # setupCudaHook, i.e. we want it the hook to be propagated into the + # same nativeBuildInputs. + # + # Logically, cuda_nvcc should include the hook in depsHostHostPropagated, + # so that the final offsets for the propagated hook would be `(-1, 0) + + # (0, 0) = (-1, 0)`. + # + # In practice, TargetTarget appears to work: + # https://gist.github.com/fd80ff142cd25e64603618a3700e7f82 + depsTargetTargetPropagated = [ + final.setupCudaHook + ]; }); cuda_nvprof = prev.cuda_nvprof.overrideAttrs (oldAttrs: { diff --git a/nixpkgs/pkgs/development/compilers/cudatoolkit/saxpy/CMakeLists.txt b/nixpkgs/pkgs/development/compilers/cudatoolkit/saxpy/CMakeLists.txt new file mode 100644 index 000000000000..a6954e6e8bee --- /dev/null +++ b/nixpkgs/pkgs/development/compilers/cudatoolkit/saxpy/CMakeLists.txt @@ -0,0 +1,12 @@ +cmake_minimum_required(VERSION 3.25) +project(saxpy LANGUAGES CXX CUDA) + +find_package(CUDAToolkit REQUIRED COMPONENTS cudart cublas) + +add_executable(saxpy saxpy.cu) +target_link_libraries(saxpy PUBLIC CUDA::cublas CUDA::cudart m) +target_compile_features(saxpy PRIVATE cxx_std_14) +target_compile_options(saxpy PRIVATE $<$<COMPILE_LANGUAGE:CUDA>: + --expt-relaxed-constexpr>) + +install(TARGETS saxpy) diff --git a/nixpkgs/pkgs/development/compilers/cudatoolkit/saxpy/default.nix b/nixpkgs/pkgs/development/compilers/cudatoolkit/saxpy/default.nix new file mode 100644 index 000000000000..f347b43d1d11 --- /dev/null +++ b/nixpkgs/pkgs/development/compilers/cudatoolkit/saxpy/default.nix @@ -0,0 +1,50 @@ +{ autoAddOpenGLRunpathHook +, backendStdenv +, cmake +, cuda_cccl +, cuda_cudart +, cudaFlags +, cuda_nvcc +, lib +, libcublas +, setupCudaHook +, stdenv +}: + +backendStdenv.mkDerivation { + pname = "saxpy"; + version = "unstable-2023-07-11"; + + src = ./.; + + buildInputs = [ + libcublas + cuda_cudart + cuda_cccl + ]; + nativeBuildInputs = [ + cmake + + # NOTE: this needs to be pkgs.buildPackages.cudaPackages_XX_Y.cuda_nvcc for + # cross-compilation to work. This should work automatically once we move to + # spliced scopes. Delete this comment once that happens + cuda_nvcc + + # Alternatively, we could remove the propagated hook from cuda_nvcc and add + # directly: + # setupCudaHook + autoAddOpenGLRunpathHook + ]; + + cmakeFlags = [ + "-DCMAKE_VERBOSE_MAKEFILE=ON" + "-DCMAKE_CUDA_ARCHITECTURES=${with cudaFlags; builtins.concatStringsSep ";" (map dropDot cudaCapabilities)}" + ]; + + meta = { + description = "A simple (Single-precision AX Plus Y) FindCUDAToolkit.cmake example for testing cross-compilation"; + license = lib.licenses.mit; + maintainers = lib.teams.cuda.members; + platforms = lib.platforms.unix; + }; +} diff --git a/nixpkgs/pkgs/development/compilers/cudatoolkit/saxpy/saxpy.cu b/nixpkgs/pkgs/development/compilers/cudatoolkit/saxpy/saxpy.cu new file mode 100644 index 000000000000..912a6d1647b1 --- /dev/null +++ b/nixpkgs/pkgs/development/compilers/cudatoolkit/saxpy/saxpy.cu @@ -0,0 +1,68 @@ +#include <cublas_v2.h> +#include <cuda_runtime.h> +#include <vector> + +#include <stdio.h> + +static inline void check(cudaError_t err, const char *context) { + if (err != cudaSuccess) { + fprintf(stderr, "CUDA error at %s: %s\n", context, cudaGetErrorString(err)); + std::exit(EXIT_FAILURE); + } +} + +#define CHECK(x) check(x, #x) + +__global__ void saxpy(int n, float a, float *x, float *y) { + int i = blockIdx.x * blockDim.x + threadIdx.x; + if (i < n) + y[i] = a * x[i] + y[i]; +} + +int main(void) { + setbuf(stderr, NULL); + fprintf(stderr, "Start\n"); + + int rtVersion, driverVersion; + CHECK(cudaRuntimeGetVersion(&rtVersion)); + CHECK(cudaDriverGetVersion(&driverVersion)); + + fprintf(stderr, "Runtime version: %d\n", rtVersion); + fprintf(stderr, "Driver version: %d\n", driverVersion); + + constexpr int N = 1 << 10; + + std::vector<float> xHost(N), yHost(N); + for (int i = 0; i < N; i++) { + xHost[i] = 1.0f; + yHost[i] = 2.0f; + } + + fprintf(stderr, "Host memory initialized, copying to the device\n"); + fflush(stderr); + + float *xDevice, *yDevice; + CHECK(cudaMalloc(&xDevice, N * sizeof(float))); + CHECK(cudaMalloc(&yDevice, N * sizeof(float))); + + CHECK(cudaMemcpy(xDevice, xHost.data(), N * sizeof(float), + cudaMemcpyHostToDevice)); + CHECK(cudaMemcpy(yDevice, yHost.data(), N * sizeof(float), + cudaMemcpyHostToDevice)); + fprintf(stderr, "Scheduled a cudaMemcpy, calling the kernel\n"); + + saxpy<<<(N + 255) / 256, 256>>>(N, 2.0f, xDevice, yDevice); + fprintf(stderr, "Scheduled a kernel call\n"); + CHECK(cudaGetLastError()); + + CHECK(cudaMemcpy(yHost.data(), yDevice, N * sizeof(float), + cudaMemcpyDeviceToHost)); + + float maxError = 0.0f; + for (int i = 0; i < N; i++) + maxError = max(maxError, abs(yHost[i] - 4.0f)); + fprintf(stderr, "Max error: %f\n", maxError); + + CHECK(cudaFree(xDevice)); + CHECK(cudaFree(yDevice)); +} diff --git a/nixpkgs/pkgs/development/compilers/cudatoolkit/versions.toml b/nixpkgs/pkgs/development/compilers/cudatoolkit/versions.toml index e9a2daa964d8..509b7d6bffd7 100644 --- a/nixpkgs/pkgs/development/compilers/cudatoolkit/versions.toml +++ b/nixpkgs/pkgs/development/compilers/cudatoolkit/versions.toml @@ -83,3 +83,9 @@ version = "12.1.1" url = "https://developer.download.nvidia.com/compute/cuda/12.1.1/local_installers/cuda_12.1.1_530.30.02_linux.run" sha256 = "sha256-10Ai1B2AEFMZ36Ib7qObd6W5kZU5wEh6BcqvJEbWpw4=" gcc = "gcc12" + +["12.2"] +version = "12.2.0" +url = "https://developer.download.nvidia.com/compute/cuda/12.2.0/local_installers/cuda_12.2.0_535.54.03_linux.run" +sha256 = "sha256-7PPSr63LrAKfD0UFeFgQ1S0AbkuHunn/P5hDNqK79Rg=" +gcc = "gcc12" diff --git a/nixpkgs/pkgs/development/compilers/dart/sources.nix b/nixpkgs/pkgs/development/compilers/dart/sources.nix index 2230284e7627..12de25fb6c54 100644 --- a/nixpkgs/pkgs/development/compilers/dart/sources.nix +++ b/nixpkgs/pkgs/development/compilers/dart/sources.nix @@ -1,24 +1,24 @@ -let version = "3.0.0"; in +let version = "3.0.6"; in { fetchurl }: { versionUsed = version; "${version}-x86_64-darwin" = fetchurl { url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-macos-x64-release.zip"; - sha256 = "0aav696x5p6zq6vfmv7zpy9v701dpbk0xwkyv2c2qdmrbb8wljb0"; + sha256 = "0adasw9niwbsyk912330c83cqnppk56ph7yxalml23ing6x8wq32"; }; "${version}-aarch64-darwin" = fetchurl { url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-macos-arm64-release.zip"; - sha256 = "1l06qk4w03qrrmnflb7a9jcm8ssx0p7b95jkhyvdg878d79zrpb7"; + sha256 = "0wj58cygjra1qq0ivsbjb710n03zi0jzx0iw5m2p8nr7w8ns551c"; }; "${version}-aarch64-linux" = fetchurl { url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-linux-arm64-release.zip"; - sha256 = "0p15njnry0kp9878lmg86p01bbvin8xm6131r8barzclcj5v3msd"; + sha256 = "06wqq97d2v0bxp2pmc940dhbh8n8yf6p9r0sb1sldgv7f4r47qiy"; }; "${version}-x86_64-linux" = fetchurl { url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-linux-x64-release.zip"; - sha256 = "0r96frjcqinhyzq809hv9yggm09clyc712ln3caqxfybcr552mm2"; + sha256 = "1hg1g4pyr8cgy6ak4n9akidrmj6s5n86dqrx3ybi81c8z5lqw4r2"; }; "${version}-i686-linux" = fetchurl { url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-linux-ia32-release.zip"; - sha256 = "16qdcc6ssgh3158fpqld6sai3lxvyimvasjmgqrhfh7h8p0inzfw"; + sha256 = "1hbh3gahnny2wfs31r64940z5scrgd8jf29mrzfadkpz54g0aizz"; }; } diff --git a/nixpkgs/pkgs/development/compilers/djgpp/default.nix b/nixpkgs/pkgs/development/compilers/djgpp/default.nix new file mode 100644 index 000000000000..25d1e0773cc0 --- /dev/null +++ b/nixpkgs/pkgs/development/compilers/djgpp/default.nix @@ -0,0 +1,97 @@ +{ bison +, buildPackages +, curl +, fetchFromGitHub +, fetchurl +, file +, flex +, targetArchitecture ? "i586" +, lib +, makeWrapper +, perl +, stdenv +, texinfo +, unzip +, which }: + +let + s = import ./sources.nix { inherit fetchurl fetchFromGitHub; }; +in +assert lib.elem targetArchitecture [ "i586" "i686" ]; +stdenv.mkDerivation rec { + pname = "djgpp"; + version = s.gccVersion; + src = s.src; + + patchPhase = '' + runHook prePatch + for f in "build-djgpp.sh" "script/${version}" "setenv/copyfile.sh"; do + substituteInPlace "$f" --replace '/usr/bin/env' '${buildPackages.coreutils}/bin/env' + done + '' + # i686 patches from https://github.com/andrewwutw/build-djgpp/issues/45#issuecomment-1484010755 + # The build script unpacks some files so we can't patch ahead of time, instead patch the script + # to patch after it extracts + + + lib.optionalString (targetArchitecture == "i686") '' + sed -i 's/i586/i686/g' setenv/setenv script/${version} + sed -i '/Building DXE tools./a sed -i "s/i586/i686/g" src/makefile.def src/dxe/makefile.dxe' script/${version} + '' + + '' + runHook postPatch + ''; + + nativeBuildInputs = [ + makeWrapper + ]; + + buildInputs = [ + bison + curl + file + flex + perl + texinfo + unzip + which + ]; + + hardeningDisable = [ "format" ]; + + buildPhase = '' + runHook preBuild + mkdir download; pushd download + ln -s "${s.autoconf}" "${s.autoconf.name}" + ln -s "${s.automake}" "${s.automake.name}" + ln -s "${s.binutils}" "${s.binutils.name}" + ln -s "${s.djcrossgcc}" "${s.djcrossgcc.name}" + ln -s "${s.djcrx}" "${s.djcrx.name}" + ln -s "${s.djdev}" "${s.djdev.name}" + ln -s "${s.djlsr}" "${s.djlsr.name}" + ln -s "${s.gcc}" "${s.gcc.name}" + ln -s "${s.gmp}" "${s.gmp.name}" + ln -s "${s.mpc}" "${s.mpc.name}" + ln -s "${s.mpfr}" "${s.mpfr.name}" + popd + DJGPP_PREFIX=$out ./build-djgpp.sh ${version} + runHook postBuild + ''; + + postInstall = '' + for f in dxegen dxe3gen dxe3res exe2coff stubify; do + cp -v "$out/${targetArchitecture}-pc-msdosdjgpp/bin/$f" "$out/bin" + done + + for f in dxegen dxe3gen; do + wrapProgram $out/bin/$f --set DJDIR $out + done + ''; + + meta = { + description = "A complete 32-bit GNU-based development system for Intel x86 PCs running DOS"; + homepage = "https://www.delorie.com/djgpp/"; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ hughobrien ]; + platforms = lib.platforms.linux; + }; +} diff --git a/nixpkgs/pkgs/development/compilers/djgpp/sources.nix b/nixpkgs/pkgs/development/compilers/djgpp/sources.nix new file mode 100644 index 000000000000..8ae440409b26 --- /dev/null +++ b/nixpkgs/pkgs/development/compilers/djgpp/sources.nix @@ -0,0 +1,81 @@ +let + # adapted from https://github.com/andrewwutw/build-djgpp/blob/master/script/12.1.0 + gccVersion = "12.2.0"; + binutilsVersion = "230"; + djcrxVersion = "205"; + djlsrVersion = "205"; + djdevVersion = "205"; + gmpVersion = "6.2.1"; + mpfrVersion = "4.1.0"; + mpcVersion = "1.2.1"; + autoconfVersion = "2.69"; + automakeVersion = "1.15.1"; + djgppFtpMirror = "https://www.mirrorservice.org/sites/ftp.delorie.com/pub"; + gnuFtpMirror = "https://www.mirrorservice.org/sites/ftp.gnu.org/gnu"; +in +{ fetchFromGitHub, fetchurl }: { + inherit gccVersion; + + src = fetchFromGitHub { + owner = "andrewwutw"; + repo = "build-djgpp"; + rev = "0dc28365825f853c3cc6ad0d8f10f8570bed5828"; + hash = "sha256-L7ROTbnd/Ry/E9cP0N+l0y0cUzkkbC5B2aU9/r3rLQg="; + }; + + autoconf = fetchurl { + url = "${gnuFtpMirror}/autoconf/autoconf-${autoconfVersion}.tar.xz"; + hash = "sha256-ZOvOyfisWySHElqGp3YNJZGsnh09vVlIljP53mKldoQ="; + }; + + automake = fetchurl { + url = "${gnuFtpMirror}/Automake/automake-${automakeVersion}.tar.xz"; + hash = "sha256-r2ujkUIiBofFAPebSqLxgdmyTk+NjsSXzqS6JsZL7a8="; + }; + + binutils = fetchurl { + url = "${djgppFtpMirror}/djgpp/deleted/v2gnu/bnu${binutilsVersion}s.zip"; + hash = "sha256-DSFQyFvswmP5/qYXbesFmUJ9tqEFJpILb0mGclfpXX0="; + }; + + djcrossgcc = fetchurl { + url = "${djgppFtpMirror}/djgpp/rpms/djcross-gcc-${gccVersion}/djcross-gcc-${gccVersion}.tar.bz2"; + hash = "sha256-UL+wkeNv3LCQog0JigShIyBM7qJRqvN58Zitmti/BZM="; + }; + + djcrx = fetchurl { + url = "${djgppFtpMirror}/djgpp/current/v2/djcrx${djcrxVersion}.zip"; + hash = "sha256-IidO2NXuV898zxYfXhaE/RwBkgaHJKfTThveFoBBymA="; + }; + + djdev = fetchurl { + url = "${djgppFtpMirror}/djgpp/current/v2/djdev${djdevVersion}.zip"; + hash = "sha256-RVfftsFh0yZoCuX6cfAJisSUJaGxG5CgILgxYutwXdo="; + }; + + djlsr = fetchurl { + url = "${djgppFtpMirror}/djgpp/current/v2/djlsr${djlsrVersion}.zip"; + hash = "sha256-gGkLbkT/i8bGCB/KH0+uuhWRxEkLdu8OyLNYR7ql3uo="; + }; + + gcc = fetchurl { + url = "${gnuFtpMirror}/gcc/gcc-${gccVersion}/gcc-${gccVersion}.tar.xz"; + hash = "sha256-5UnPnPNZSgDie2WJ1DItcOByDN0hPzm+tBgeBpJiMP8="; + }; + + gmp = fetchurl { + url = "${gnuFtpMirror}/gmp/gmp-${gmpVersion}.tar.xz"; + hash = "sha256-/UgpkSzd0S+EGBw0Ucx1K+IkZD6H+sSXtp7d2txJtPI="; + }; + + mpc = fetchurl { + url = "${gnuFtpMirror}/mpc/mpc-${mpcVersion}.tar.gz"; + hash = "sha256-F1A9LDld/PEGtiLcFCaDwRmUMdCVNnxqrLpu7DA0BFk="; + }; + + mpfr = fetchurl { + url = "${gnuFtpMirror}/mpfr/mpfr-${mpfrVersion}.tar.xz"; + hash = "sha256-DJij8XMv9spOppBVIHnanFl4ctMOluwoQU7iPJVVin8="; + }; + +} diff --git a/nixpkgs/pkgs/development/compilers/dotnet/build-dotnet.nix b/nixpkgs/pkgs/development/compilers/dotnet/build-dotnet.nix index 036d72a65358..91eba8f8dd77 100644 --- a/nixpkgs/pkgs/development/compilers/dotnet/build-dotnet.nix +++ b/nixpkgs/pkgs/development/compilers/dotnet/build-dotnet.nix @@ -122,7 +122,7 @@ stdenv.mkDerivation (finalAttrs: rec { export DOTNET_CLI_TELEMETRY_OPTOUT=1 ''; - passthru = rec { + passthru = { inherit icu; packages = packageDeps; diff --git a/nixpkgs/pkgs/development/compilers/dotnet/default.nix b/nixpkgs/pkgs/development/compilers/dotnet/default.nix index 40ed81a4ed78..915f3b08652b 100644 --- a/nixpkgs/pkgs/development/compilers/dotnet/default.nix +++ b/nixpkgs/pkgs/development/compilers/dotnet/default.nix @@ -5,7 +5,7 @@ dotnetCombined = with dotnetCorePackages; combinePackages [ sdk_6_0 aspnetcore_7 Hashes and urls are retrieved from: https://dotnet.microsoft.com/download/dotnet */ -{ callPackage,}: +{ callPackage }: let buildDotnet = attrs: callPackage (import ./build-dotnet.nix attrs) {}; buildAttrs = { @@ -31,7 +31,7 @@ let # Convert a "stdenv.hostPlatform.system" to a dotnet RID systemToDotnetRid = system: runtimeIdentifierMap.${system} or (throw "unsupported platform ${system}"); in -rec { +{ inherit systemToDotnetRid; combinePackages = attrs: callPackage (import ./combine-packages.nix attrs) {}; diff --git a/nixpkgs/pkgs/development/compilers/dotnet/update.sh b/nixpkgs/pkgs/development/compilers/dotnet/update.sh index 617dfa743327..9fa296842ef6 100755 --- a/nixpkgs/pkgs/development/compilers/dotnet/update.sh +++ b/nixpkgs/pkgs/development/compilers/dotnet/update.sh @@ -2,7 +2,7 @@ #!nix-shell -I nixpkgs=../../../../. -i bash -p curl jq nix gnused # shellcheck shell=bash -set -euo pipefail +set -Eeuo pipefail release () { local content="$1" @@ -64,6 +64,11 @@ generate_package_list() { local url hash url="${nuget_url}${pkg,,}/${version,,}/${pkg,,}.${version,,}.nupkg" hash="$(nix-prefetch-url "$url")" + if [[ -z "$hash" ]]; then + echo "Failed to fetch hash for $url" >&2 + exit 1 + fi + echo " (fetchNuGet { pname = \"${pkg}\"; version = \"${version}\"; sha256 = \"${hash}\"; })" done } @@ -241,6 +246,14 @@ sdk_packages () { "runtime.osx-arm64.Microsoft.NETCore.DotNetHost" \ "runtime.osx-arm64.Microsoft.NETCore.DotNetHostPolicy" \ "runtime.osx-arm64.Microsoft.NETCore.DotNetHostResolver" \ + "Microsoft.NETCore.App.Crossgen2.linux-musl-arm" \ + "Microsoft.NETCore.App.Crossgen2.linux-musl-arm64" \ + "Microsoft.NETCore.App.Crossgen2.linux-musl-x64" \ + "Microsoft.NETCore.App.Crossgen2.linux-arm" \ + "Microsoft.NETCore.App.Crossgen2.linux-arm64" \ + "Microsoft.NETCore.App.Crossgen2.linux-x64" \ + "Microsoft.NETCore.App.Crossgen2.osx-x64" \ + "Microsoft.NETCore.App.Crossgen2.osx-arm64" ) # Packages that only apply to .NET 7 and up @@ -319,6 +332,10 @@ Examples: channel_version=$(jq -r '."channel-version"' <<< "$content") support_phase=$(jq -r '."support-phase"' <<< "$content") + + result=$(mktemp) + trap "rm -f $result" TERM INT EXIT + echo "{ buildAspNetCore, buildNetRuntime, buildNetSdk }: # v$channel_version ($support_phase) @@ -341,7 +358,9 @@ $(aspnetcore_packages "${aspnetcore_version}") $(sdk_packages "${runtime_version}") ]; }; -}" > "./versions/${sem_version}.nix" +}" > "${result}" + + cp "${result}" "./versions/${sem_version}.nix" echo "Generated ./versions/${sem_version}.nix" done } diff --git a/nixpkgs/pkgs/development/compilers/dotnet/versions/6.0.nix b/nixpkgs/pkgs/development/compilers/dotnet/versions/6.0.nix index 5dd1336c3488..30cffb04d644 100644 --- a/nixpkgs/pkgs/development/compilers/dotnet/versions/6.0.nix +++ b/nixpkgs/pkgs/development/compilers/dotnet/versions/6.0.nix @@ -3,169 +3,177 @@ # v6.0 (active) { aspnetcore_6_0 = buildAspNetCore { - version = "6.0.16"; + version = "6.0.20"; srcs = { x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/877a2d48-74ed-484b-85a1-605078f5e718/752ce1e38b76ffb5ebfc2ee1772307bf/aspnetcore-runtime-6.0.16-linux-x64.tar.gz"; - sha512 = "62f25ed054868155b351b98fdd04c27aebd913d92844430a002da1346e77a8e86e61833f7b81bdc3d733ff2ae60a21d66533cdd7003b2fee47b8d0e8746ad504"; + url = "https://download.visualstudio.microsoft.com/download/pr/972dc929-4c16-4456-a7c8-64014f80678d/a3b62252f98a0d7e0c0a9a01ede18776/aspnetcore-runtime-6.0.20-linux-x64.tar.gz"; + sha512 = "891bad6a52a7bcd5afa2a784fe68044d282f6d53fedab4bde6dff8d7d2138a484e947f7a6be156094324b37e9d7e07e87a67622bcf2ea197c2924389edd1d185"; }; aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/5fe35f73-59e4-462e-b7aa-98b5b8782051/74a27e03d896663a9483eb72bc59b275/aspnetcore-runtime-6.0.16-linux-arm64.tar.gz"; - sha512 = "c08159a811d20003bfa32ce4b5657522433fc134f6dd1a391dc82004edb0e92dc2d75880d057e8467171a91ae2c344e90a679e40b5c5fddffe6e9ed0bf26810a"; + url = "https://download.visualstudio.microsoft.com/download/pr/a8a1a993-ddd9-4bcd-8386-d9defcf0fd29/4b471f72c8253fa1462ea923d0fe39a2/aspnetcore-runtime-6.0.20-linux-arm64.tar.gz"; + sha512 = "83b1825c80cabfa5bbbd8c3e69b3525fa5cebef773957f96fee9319d60285155817973a176d47348c9b22bff5af24044f0f06b59229c067ce8adad4f3d4123de"; }; x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/3e30ee2d-da08-49fc-8877-712fd63b0b84/1390326bfaf1e6fcd922fcbc4efc6293/aspnetcore-runtime-6.0.16-osx-x64.tar.gz"; - sha512 = "eeb99268be3c8dcb0d0c571944e01f22b3dbf0825e28cb1c9bdc0faa8f584fedf6d280f767609c5d91688897c185a21840f59cc91f7e1712c05a24a70fff26bf"; + url = "https://download.visualstudio.microsoft.com/download/pr/5fe2084e-1538-4193-9eb6-54b0f8470574/258915bac675b1dea6aa0b5435f64981/aspnetcore-runtime-6.0.20-osx-x64.tar.gz"; + sha512 = "5f6efea102c20805430815228070461216d8c5b928d090ec9d6d245eecbe23298920d1834276a0ce77bba524a14c83d97464580c72660bf3a2367a02f1872e31"; }; aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/9209cddf-bdad-425a-8b04-682a7ead5e12/93c46a477e0d4ff411d78546638f6a54/aspnetcore-runtime-6.0.16-osx-arm64.tar.gz"; - sha512 = "b5eda3aa1394821b4607453cc639e49f92653fac6a7b381c8f33282185513ae606a06c63a4381153371354b94c9289e72287f9a25bdc8aca45efb5a8654d4af8"; + url = "https://download.visualstudio.microsoft.com/download/pr/14d8afd0-2635-4f3c-96fa-63edccafe16f/317d19d4f625bdae211d428ab880a331/aspnetcore-runtime-6.0.20-osx-arm64.tar.gz"; + sha512 = "fbc4033b79a651923dc205b923ef6c9ef048c862113ebcaeb8fa6388827245039369e261e89ac371e895c538aa78fdfc07a5a1c1cbc41713f54a15bdc0ffdf5d"; }; }; }; runtime_6_0 = buildNetRuntime { - version = "6.0.16"; + version = "6.0.20"; srcs = { x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/45395f1b-8928-41c5-9585-f01d949b2afb/0911c4025fffc0f51c3ab535695c6ca6/dotnet-runtime-6.0.16-linux-x64.tar.gz"; - sha512 = "c8891b791a51e7d2c3164470dfd2af2ce59af3c26404e84075277e307df7dcd1e3ccf1a1a3c2655fe2eea8a30f8349b7adbbe5de4cedfee52da06729a505d8f5"; + url = "https://download.visualstudio.microsoft.com/download/pr/26b4797f-d3f2-40c7-8f4a-91120ab87469/4677c3c4e3ee7919836c3a5336e04509/dotnet-runtime-6.0.20-linux-x64.tar.gz"; + sha512 = "3688d7170a59015c36d6a5532db67bc22eff66b3eb0a7fc28e1f425791e27a5f467bc7dc593d7f455d72d08c7d27bfcc92b3c8bd30ec3c7c583a8aa82b5afbac"; }; aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/e7866e12-a380-4994-9c56-1bd3a1e0a546/22a5e54cb4e637c5aac7ec6dcab0d739/dotnet-runtime-6.0.16-linux-arm64.tar.gz"; - sha512 = "f670ea542d34e5f63b6b497a23f9d3f8d9e2fa8292ec3234ee08ef0eb706f339c2c11811857ad83624ae4a7827b449d4cabbe41c566b2b51faccf58be44af598"; + url = "https://download.visualstudio.microsoft.com/download/pr/f45ea605-cd0d-446b-9d79-b9c033c10c11/ba7fd32581bb5f448abdd317d8d55b3f/dotnet-runtime-6.0.20-linux-arm64.tar.gz"; + sha512 = "bf9cd8b13ebe15bbe41d4f3229cc902c3de2eb4f0008f4b239f3d0ec5aa01254adb8a98742c0e32e98f4ba95923611ed9f54963225b462a829c184301bc98ef1"; }; x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/24cc772f-0358-40c5-a41a-4c1434a9e9b8/f91c66d80be3a91f632f7eae102fd64f/dotnet-runtime-6.0.16-osx-x64.tar.gz"; - sha512 = "662084f66cf2983dbfb756f319baa2c1221f183b9d10101ca970fa3ccb2cfc49a7513af5926c843d3bd472b49991284bac5275d8f5e8671b9e96995ad2815571"; + url = "https://download.visualstudio.microsoft.com/download/pr/810c2cf6-c3a3-4f35-91f4-facf1ac24ef1/3ecedc1a0888b571d272c0dd64080c52/dotnet-runtime-6.0.20-osx-x64.tar.gz"; + sha512 = "f21cb044df7d1f57ad45b7ed65893a103cd6fe15b78ed3865380044207136d42deddde29872458e70fae9c8e7f254dd032f7539b4b9820995a075d92b907d49f"; }; aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/757be454-09b0-4991-a2bc-90c06267fbde/2ea450db713598c9cdb46a6d9bd56156/dotnet-runtime-6.0.16-osx-arm64.tar.gz"; - sha512 = "c7389000b353729af7229017cab4b02d9245d39983b00744e3439ac846e6669368648b91574d46eff7807882c6961f76884447411314dfab18e74e8f3824dca7"; + url = "https://download.visualstudio.microsoft.com/download/pr/0f3ecdea-c85c-423b-ab55-d97061a3d9f0/b01dd205c4d6ffdb6266e4540c82621d/dotnet-runtime-6.0.20-osx-arm64.tar.gz"; + sha512 = "27297a16bf1eec0e5a4154d8575b66008227a595cdd77277ae9796a53522b143ff51e063a7aa53a6c57717061cb2e5836c314ee43eeb86d465341fcdf834d773"; }; }; }; sdk_6_0 = buildNetSdk { - version = "6.0.408"; + version = "6.0.412"; srcs = { x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/dd7d2255-c9c1-4c6f-b8ad-6e853d6bb574/c8e1b5f47bf17b317a84487491915178/dotnet-sdk-6.0.408-linux-x64.tar.gz"; - sha512 = "d5eed37ce6c07546aa217d6e786f3b67be2b6d97c23d5888d9ee5d5398e8a9bfc06202b14e3529245f7ec78f4036778caf69bdbe099de805fe1f566277e8440e"; + url = "https://download.visualstudio.microsoft.com/download/pr/62181759-93ce-4512-8de1-92de74a6ba3f/f83ea41c3161f301d3584598f9c31801/dotnet-sdk-6.0.412-linux-x64.tar.gz"; + sha512 = "ee97aa5258e05aecadc66e844fa8eef97d51e5035492999b974cc8272e4db1a862a1f88a925f38be9e95c71d2e961b56459dcd614475895df608945c8057c311"; }; aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/9c4bff1b-9f35-44a3-95a3-d17224810b08/0f7426d4ce82cd5b55ed1b6f07877d5e/dotnet-sdk-6.0.408-linux-arm64.tar.gz"; - sha512 = "40ad715ffb059df03eeae4ee4dff9b8998928e90dc0103b38ef671acbcfe4ac40016220e6b1214f0f77757099dccdf0fbaf1690191b350dbbaf773a01be8d25d"; + url = "https://download.visualstudio.microsoft.com/download/pr/daff8399-d60f-4bde-97bb-c6e350c03e90/5eeb0b21bf1ad11b5f5a7b4ac217c381/dotnet-sdk-6.0.412-linux-arm64.tar.gz"; + sha512 = "669c19665f657de00fda41e5ffff8d80395618dc1cc7d6ec50cd06668b135b5fcca193919172c65394210b7c060eae146fd6d8d57deed889ca8fafddca66d06d"; }; x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/048c81a0-ee14-4b14-8572-d192651d12d1/060be74876613256c50ea75ed623970a/dotnet-sdk-6.0.408-osx-x64.tar.gz"; - sha512 = "98599e2b6d85267cc414cba0da26258251499f62eadfad341d0df4694b261b28ab5a7a97db0b2b8c0f215d03340dfb8a9f984a1f0eeb110a128c982336c1e110"; + url = "https://download.visualstudio.microsoft.com/download/pr/094020b2-7fcd-45aa-a122-42ad85b25d15/969de8f0d024a5bee5260271e097519b/dotnet-sdk-6.0.412-osx-x64.tar.gz"; + sha512 = "0aa713780c4b7f4e0ea72a0813715883f57174f04386b85f3a6dda1a66d9cf6d24c76cd1e0fc0a0991b80b7868b39c719d5b98254e4f683b6bc89a9b4043be9c"; }; aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/21503502-8d12-4a18-9d93-ec0f7ee7b9cb/3df619d8ac623a16a79755e73fdf4d0d/dotnet-sdk-6.0.408-osx-arm64.tar.gz"; - sha512 = "2dea66a67ca21dca2b3a12593c7249949af6619551fc265ce33c45b5366ce98eb55aa84a6c5cf0fa9bb8ef7f5ada89bc9cf3c96d34ad208cd9bf0178a80fbb97"; + url = "https://download.visualstudio.microsoft.com/download/pr/6a6555e3-06ff-4124-aad5-497a2940398b/47bda2f1324f867ae0da2099c5702769/dotnet-sdk-6.0.412-osx-arm64.tar.gz"; + sha512 = "3086e027b94ab8bc5b27e2dfaa7d16484efa2f6a7c1e291f420313021b3e6f65a5208de4b0d86271c3b83d05d784f29e231176dc6f5ba04e567336b7d7b7b871"; }; }; packages = { fetchNuGet }: [ - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm"; version = "6.0.16"; sha256 = "07si0rn45mzkp6xpcnhziwlafrzmg9asa5mb54bmpa7ww0zdwyvz"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "6.0.16"; sha256 = "0c6ys204024yi6wh6jyyvkv60f877nzlmzl6np30w9a3nxlavnhw"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64"; version = "6.0.16"; sha256 = "022kkabdfvb551fw1zs77kgd51lak72pn02429jbiw5sgrn34fzy"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64"; version = "6.0.16"; sha256 = "0vffxqwqcar0hzm2bi9igjmzqpy4cqsaikn6y25q8msixwbdr151"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "6.0.16"; sha256 = "1xdhn8v8y947kw29npck1h9qaw8rj81q7a0qwawpc2200ds96n40"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "6.0.16"; sha256 = "1i26fssv17w3kcaqwk5w2aq03jdijhrfl0xp0q5s68j7i4wrlv6l"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm"; version = "6.0.16"; sha256 = "01r0bzqi67rq0wls14zm7isxw9za4y6dzswkarzjzcpybx9nzfpk"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm64"; version = "6.0.16"; sha256 = "0rjg6w707sacdyr8z1y9aiyif2f16823gmpv36imp6vy7pjiq4xa"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "6.0.16"; sha256 = "0n3kawk20i72cyz5925svrg33blimsd2018qrczjxr4hg9pz3z73"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x86"; version = "6.0.16"; sha256 = "1akpxx2ad3yi2q6ifm6p3nn4qalc7v7cg0vxcavzpq246qarvai3"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Ref"; version = "6.0.16"; sha256 = "1v02j1i139a8x32hgi1yhcpp754xi0sg5b7iqzmslvinfg3b7dwn"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm"; version = "6.0.16"; sha256 = "1v2wfyxwk239ypnx7rnklw7v818y7dki86pyixq6fhlm5k0v30fl"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; version = "6.0.16"; sha256 = "1p84za2cxyxxbkgxhfnmdarkz64dacx9f52jplrfs9rgl19anan4"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm"; version = "6.0.16"; sha256 = "0vxsp1brqifh53c0dziz73m1a7zkyf4l5x9f80m15xfhkvnwvbc0"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "6.0.16"; sha256 = "0iv5186gb778swka9ylzblwvr8pp7cmsvji5iiszrnfvk8c4n3ia"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm64"; version = "6.0.16"; sha256 = "1ickazixmjwsybixb71231qldybaazdiinq621vgpzqn5j4rd782"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-x64"; version = "6.0.16"; sha256 = "0a5p5y85kcg0a6kk9q55203508yr16accnnf44h6rym5mvmr6lds"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "6.0.16"; sha256 = "1pv9arqbmxlh86rnx6nss2cl91hi22j83p66m4ahds34caykf32l"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "6.0.16"; sha256 = "19ffmw131b8kv7l5pmwi4358j5xhla48qdyn6jv9fznffcsxfgzc"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm"; version = "6.0.16"; sha256 = "0h9pq0pxab1hyc7chnqrl3prg44cwfvflrz2afk4dvz84sq4z5vv"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm64"; version = "6.0.16"; sha256 = "1dc554g11xv20hg5sdlg4nff5ky1hi42771jkfbsar8ggp90g4sr"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "6.0.16"; sha256 = "0fv6yvn2sqbrwr9x2alm00g4d06qcgskmbn57nmshjlw7pr4n2ik"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x86"; version = "6.0.16"; sha256 = "1gglqjhz5llv6cgq532f7mqf21pzvy3xycy2193wwfg0xir1pfif"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm"; version = "6.0.16"; sha256 = "0aynzlxyhxy9cqlgs03ixpax7sbhr98y68qipd2x38dpq90jncg6"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "6.0.16"; sha256 = "10dlkzk61nnnw6f5rr1lmrws2p4hvbpkswm3209w45z350n9nlpy"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64"; version = "6.0.16"; sha256 = "0ljnxjj9nmcpng1v185zns14a0vzkgja59m42b76ny783nvn4hr6"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64"; version = "6.0.16"; sha256 = "1rih8q33byfhr33kbz1xzc74drj1ypbxgqd1rjga3zq9065kpkih"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "6.0.16"; sha256 = "1fjrc1l7ihal93ybxqzlxrs7vdqb9jhkabh2acwrmlh7q5197vn2"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "6.0.16"; sha256 = "0gghxcr32mri7235f41w5ngdxrw85q28nd7d57hmzj72cv93yxb3"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm"; version = "6.0.16"; sha256 = "0gncfcx8v63qw56immp26jmmy3gmmqwws9ajqp3v3c0pfl0ai9h3"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm64"; version = "6.0.16"; sha256 = "1v6xbi6l9xign3vjqnvh7yd51yzzpj80ac0a889cspizjlvm1f83"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "6.0.16"; sha256 = "06zmcsnchsw1n5v0dsa55scpmd5j6bylrayds5739dzxv2f2am07"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x86"; version = "6.0.16"; sha256 = "119bh835d4nl4328cqwj666q8smy64jl79arkdnpwa0l78nldf5q"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetAppHost"; version = "6.0.16"; sha256 = "19y5jy00ifyy5y9qjvlysr1xmsgylbh9bc7vksfsxymll6rg51j4"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetHost"; version = "6.0.16"; sha256 = "1abr810nga8pqr4xnrmxlq7bp11cxzjgx7gsz1bvg9xmr0gyp0vf"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.16"; sha256 = "0vry28why3jaisqnida8rjhc84ry9acnw3h02v798j6zd0x2gfvh"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostResolver"; version = "6.0.16"; sha256 = "10bhgqnlqgzd5j8x8ix03fpglp1z13k8a4wn822n4fv0yk5kiswq"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.16"; sha256 = "1kk5mq2rm6al46nzr95lhfr7g0i97hpp5d18n00mrba3zk601hr9"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHost"; version = "6.0.16"; sha256 = "0x7knx2fw7s97jmjbqarflc3bbj8ywdl371i56gs8ipr0zagx06i"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.16"; sha256 = "00ab8jijc3ibdlybikhn708421m4jx375xzvcm1xbl34ljlsm9rj"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.16"; sha256 = "0bgri0wb39dwxzs1x2hc9f49wvhb14a1g50dm4h0grcfaif58j9k"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost"; version = "6.0.16"; sha256 = "1sr6v2q0hcr2q75qjxgwij0735v5c9m2hc41scs87b0gg7m3mdin"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHost"; version = "6.0.16"; sha256 = "0a2q0bkrqqc7sghhhq31c11q5dbw58jgrs696y7qmn4hyj42srxh"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.16"; sha256 = "1fparz4pwvfrkw2r36y787i91rm6q8gmf934i2my88w7nlip7vs8"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.16"; sha256 = "1ggcjz4s4rar9x0y5vdq7zpzwxdcivw8jyzfms6mj0gk3ip4lyy6"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.16"; sha256 = "1qrczz74xvdvbrrsgj3ninp7ab9dz56cwlm5a84x77fyfpfdhab6"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHost"; version = "6.0.16"; sha256 = "16fk4xdd5dv67scqszyzmbbwm79mfapa0akn82cfq1l7a2bccami"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.16"; sha256 = "1pw6kzgpvy5ccawj9j3mnm1v64p0cbmc6klchwm53cqcych2626n"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.16"; sha256 = "1brvra8yicix4sm0yhmdgk5ikkqaq7b890d1mjqrk50drjznjhzj"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.16"; sha256 = "1kbk1j7abx4hw0anj35nr8j5vwvxapx55vzy7mcgd95j0kf7nzy0"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHost"; version = "6.0.16"; sha256 = "122149r0jylqhpi7f2wdna4xiq30bfyscf1wdbwak4v618r05kr5"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.16"; sha256 = "0d1yny2v2qrji3cay77khjqhwrg9kjnmh9k8pxsrzc6kj3lyslhi"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.16"; sha256 = "0xfmfn4xbqaz39fclj47cv8c21mqkbggv719rl9k1cr5lg35nxkk"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.16"; sha256 = "0wvd818hhivf0z8zxpxlxaffqf6w3nfg4b4abhg8lzxa1jvwjy54"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHost"; version = "6.0.16"; sha256 = "0zh770jr1249w53n220d952cj0drjb58j1y4dwrw9ndgdws1vp81"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.16"; sha256 = "0f75fjhm5r2mmnlpl87vq06a203cdy918lnzg0qhfyxrndsphb78"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.16"; sha256 = "1pbxd8fviim97nbpkp12x6cchm81m4zqx20i08k7hhhjr07cn742"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.16"; sha256 = "1ig5a86bhc0k33nqdqsfiy58y2y7bz9ql2jbq7xvwqhrvb8iicyn"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHost"; version = "6.0.16"; sha256 = "17l2mfxs7mq5b2arv6wb0vy94m889nzdsjykm7kym85azrs5p6al"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.16"; sha256 = "12z96zf95al3wb7b5zk2j38bxh8dnnkbx7s4n1yvz6h6snln1dcz"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.16"; sha256 = "0gncg3xc8wcmz5jb6g3cf8mds4hnxnqi3cym4nxym1v0p2qlivx8"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.16"; sha256 = "0haalqnkbhnzjp22z168v61qy1kbjp9dx2jqzc6k292j146cdhhz"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHost"; version = "6.0.16"; sha256 = "1y227dwp3244dd74i2ainh3w4zv6p3qz1vc8bb8wr89z904nkspz"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.16"; sha256 = "1jm8gv73iig0nj699krbz9avq4b5qxz6y5m5dpaik9wfi76fmlbp"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.16"; sha256 = "19hcw59ywxr1l0j4bn45szvqnd623h1faq74mmi8qcb7brxbndjb"; }) - (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetAppHost"; version = "6.0.16"; sha256 = "1wdrfqihjs3ipwy1d2hq642n2d4777zh0mzijjhjxixxjhcd1s09"; }) - (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHost"; version = "6.0.16"; sha256 = "1dlppj0kiybf6wfz0g1g47c8jvdff5zmdpgdz7lh84jx5j8hv9na"; }) - (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.16"; sha256 = "1fss3n6qprssrz59gdhahsbwdfr68yi046rv7z9gjahp231jxn3y"; }) - (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.16"; sha256 = "027jnfdy8cmmj5aixyxmqy80q6vbfysy37pfyg64bjxkvr9qjjky"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.16"; sha256 = "0aj0aqwl2y7v0jxjmknkxk17fdbv3qsg8hsa3vnzm1gsyrzx3dw4"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHost"; version = "6.0.16"; sha256 = "08r8nw3pv4dvjdmby3s7b520jn2v0r02j36knyxfn0vy951d95d9"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.16"; sha256 = "08mwpdxgd3gjq7f96m64wd5hj16zrp2qbwrzggrpf2991ppsx52p"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.16"; sha256 = "0j207sqhk0ndmvl11ig34vjq6xfwqg0k3p59yp3f34fvv003x8kd"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost"; version = "6.0.16"; sha256 = "0zwq1wp7737lsliazyrq9h0llv26svsb91mbr6px1dzrqjk2j1s9"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHost"; version = "6.0.16"; sha256 = "19gxli9z5x18bpn3yzczj8znh4b7ji3qimnk58v0kmc8kchcs5gd"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.16"; sha256 = "0kz4s3bibp8azqb3n644lsf16gwaxb70lijg6n7w2afxicnhxrar"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.16"; sha256 = "02jpzn42i7n7r4k3w2hnf5xpq4lm5k7gx6s8fkml87rs6xjwma8w"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Composite"; version = "6.0.16"; sha256 = "0lr7hhcjcqszgb7477nzh5ahic6mwjp5wybd2ffl63c263z4c1kk"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm"; version = "6.0.16"; sha256 = "1p5cc9nvmdfcpysrszhd6mnk500ksh29b3mmi0v5if01jggl3f63"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-arm64"; version = "6.0.16"; sha256 = "01f98kkq8p3xll4mh6ck8ljgs3k5psv5z7mys7kpvk7lvag2svaa"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm"; version = "6.0.16"; sha256 = "02947hs31zvm5h0s927mk8a6zlvssskyh7wy9pnbq4lcyvan2s72"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "6.0.16"; sha256 = "0jsfjp32z08pgi82blcrhmf5ipkhlg1kld8jmr7znzgv0kic8xyh"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Ref"; version = "6.0.16"; sha256 = "1w89n5grnxdis0wclfimi9ij8g046yrw76rhmcp8l57xm8nl21yj"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm"; version = "6.0.16"; sha256 = "15hvv7vh6zjs8ps7ksqbv8iayd2ld4lai1yrpxmryqm14gjadp7s"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm64"; version = "6.0.16"; sha256 = "13w8zy5y827hvpdwbdzpc7xf779ynb8nbajz7izprm0bj73m8784"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-musl-x64"; version = "6.0.16"; sha256 = "0q28ndwnmh52lbgnfdbrx64im8z2chrffx3hg8xpx6zp5ig4fdva"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-x64"; version = "6.0.16"; sha256 = "1617fdb6bwa43f2c2a2gix70c3k4gn4swd1m9as8fy8pm89nlrx6"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-arm64"; version = "6.0.16"; sha256 = "1m8h239jdp1nrh1axyhfbjjj59bhi2cc4cfal818zq47x9zdr6k8"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-x64"; version = "6.0.16"; sha256 = "0mcjkfbm1ajd65ifpz3758b55nv73pi2aima2j1941z7dagzk98i"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x64"; version = "6.0.16"; sha256 = "1ilayqmqd00sq27q9mzzq2dbbc6q0zbgjd1cgs9xsnwrrwrgzvhy"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x86"; version = "6.0.16"; sha256 = "076gr147fzrvn9ikk4pp33ywk973gzv4if0k069xr3piwhf80w0y"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost"; version = "6.0.16"; sha256 = "18pb2az9y24j7sdad95yskmsr0wjbaccd27hlanlyi1wijdg6qd6"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHost"; version = "6.0.16"; sha256 = "1mlry7w94mmrnhrpl9jcpbyhdz019kk5n5dvm14yaa8g5inc7i1n"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.16"; sha256 = "14c5q15408dr41x6dvi965qrs2hayy5j1cmzmylxs1yi47xmbvqk"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.16"; sha256 = "02157ypj7znfgiz0q4kzq475m225dqp2cn1j5yzbvr83qb3690xa"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.16"; sha256 = "1sf5sjla7s32h7dmcb5vaa2fgc2f4542wr1zn8xp3b29n1w9xr89"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHost"; version = "6.0.16"; sha256 = "1yfcdyjvpd6csqqdm9azz7pm5dy3xapfvcynssl0r2nf9wm0mblm"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.16"; sha256 = "0g6wv8y3l4cnq2w96w69zn5wvya4hzv5vx8421wz35y4vghfbgz7"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.16"; sha256 = "0w7cxw23ka2snvv7dlyfq7npky50l2kckqwgqkjkn29rmqllgxih"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm"; version = "6.0.20"; sha256 = "1jncn2n75vrhsmh22f5ij5rhdr2ninnz0z8clsi3pmk8ba2jzgsh"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "6.0.20"; sha256 = "1ssakq877f2wn51di8v64b3ij0izyr5glc37i238y9jm6l84kpyg"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64"; version = "6.0.20"; sha256 = "0a6d269chp0126sx2igjhsrn7x6q03n5qwhwk7fy6ci1jddrk960"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64"; version = "6.0.20"; sha256 = "13b3yr8y54g5ypnsrr7870csbnl9avwa7r6gk7553sjab255rar4"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "6.0.20"; sha256 = "1js58646f4233g6a9lkwwwhg0kb2x3r60a66lbzapk253x00fnrm"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "6.0.20"; sha256 = "1cwn0dkwk2wvddfraqh28yqy3p5cyrnfkprilgy3bqbnq82mfdxj"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm"; version = "6.0.20"; sha256 = "1paf9f3kmprw09nh1garni8rswcq7cs5m1ib6hkrkqccdis4hfy8"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm64"; version = "6.0.20"; sha256 = "1zr589pkivak83gjd7f15rc9g4whxmywjj1xyymbbaz46ain89gy"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "6.0.20"; sha256 = "0azf6q99aplbca8p2ijf9ccwrigz9r2aaplczj8byi0jd5dgya1m"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x86"; version = "6.0.20"; sha256 = "134a4yszz8gvba2zm8lrds39qfxrf42mziy4niihd4r9n44ksrdn"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Ref"; version = "6.0.20"; sha256 = "0ijdgv1yczfppra6p770vf48vjgmrmcjxfnphah8rrlidssja1dj"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm"; version = "6.0.20"; sha256 = "0k4ivzwbj67n4rr56fmi4jh2y3kdjhbgc376gk0ld50qwpghczxh"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; version = "6.0.20"; sha256 = "1yiq9ihh71d8zlfsdf9xdnapzilxiyk987z9ld7w605sq6b45719"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm"; version = "6.0.20"; sha256 = "039hs39abf1ngrgw1ali8pgzqqpwl6aiq7hqig85gj6phy5l8wbk"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "6.0.20"; sha256 = "0xivyv70kzpj4pc4ln1rk48bm9z9zy3bck1m4vg161rrd58ry16a"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm64"; version = "6.0.20"; sha256 = "06a211fjm9i9ipgh7y6fsp2si41mdr8hp5wpsvd083ybyyfsy32z"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-x64"; version = "6.0.20"; sha256 = "00vz5r4l5p78fkvlglvhhvx80qlv5szzdz9scf0qm8hf1v01wivi"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "6.0.20"; sha256 = "1g0x96f8i8hiflzpb20h9wkn784zzlvd0413y8xlxgf187hj20yn"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "6.0.20"; sha256 = "11sdzb1lrpmmfbd14b3may8d1n8smm1rmfsqamp7bni408j16cfc"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm"; version = "6.0.20"; sha256 = "0w69cfyww088v29bs6diy9jq0sl6bpiaildvq6rayl9vwid71qpi"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm64"; version = "6.0.20"; sha256 = "1bi8bmil8wc42lp5b7a44c70mazycgxn2ag02r3r4wradwawfrmw"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "6.0.20"; sha256 = "1c3qz6h1w5wfpl52ys7s29kj338n3wy7w5sn9ghdz5x5vgflah9l"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x86"; version = "6.0.20"; sha256 = "1zzpj7czk28xip45i3fhhlh3ar0hh3ldar34c6w2vp4psvbdkm40"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm"; version = "6.0.20"; sha256 = "06yzy9spp8d9pz7jihsrcx4rq3n9rcq2j0gq23yhfzp9iip2986b"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "6.0.20"; sha256 = "0bs2hxyjyhnzvcgx4lplwlvlk7rr5lk0xbncbn8in74pvvjw44qn"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64"; version = "6.0.20"; sha256 = "0ra55v67748rr0acd22vgg2b31wmkaaghiifi26vwnrhihky9gma"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64"; version = "6.0.20"; sha256 = "1mjj0bfm57anpywknshx8hc1z4xdinjxrxv3zim295w3dpz46y36"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "6.0.20"; sha256 = "1rqniyhv0i9zim6plbmrhcd9ykwabm5cm7p3mddxr8cgybm1vyfg"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "6.0.20"; sha256 = "0wdqbzma9fc5sh74a3mcxlrby33qz2hs47kb5c9834qvbjf38fcz"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm"; version = "6.0.20"; sha256 = "1q5bk01briqlp5bzvkvrq978dzb52np2sp8lv67wjdm7xcbpnfjz"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm64"; version = "6.0.20"; sha256 = "1zmsd13dd7vzwxqiznffvk99jqc3fdq3l382ixbr440a006splcr"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "6.0.20"; sha256 = "1s1girqjlrkz2kqijasmbpfh2fngqiz2i3424i7k9snrzjgnn6ml"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x86"; version = "6.0.20"; sha256 = "0vmlhgywjhb8k6gi1624fk3q21gy5gsnjxl4f4w8lmaf22zkllvb"; }) + (fetchNuGet { pname = "Microsoft.NETCore.DotNetAppHost"; version = "6.0.20"; sha256 = "04p7m6csfjqgndi81hpg51gr8pgzqqscnqwgrkkj7nas2ffdxlfd"; }) + (fetchNuGet { pname = "Microsoft.NETCore.DotNetHost"; version = "6.0.20"; sha256 = "0ky38wy91pprdhbvxp64hz2fmf4kkchw9ldk0i68dnwg190lkjqk"; }) + (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.20"; sha256 = "1vs4jirn78v65fn97zx4vz4msq2zrlmiiinh7zl0dpyn0dp68br7"; }) + (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostResolver"; version = "6.0.20"; sha256 = "157z5liy55z3h3qvg9kkmapnldbw7v6qamxdfbk89l3dh7r3m5hw"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.20"; sha256 = "11yv6flr0l49rfa222p35dqv3qbc5jbf7yf28q3x09kv0x2571dn"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHost"; version = "6.0.20"; sha256 = "0nc1mbdk3kafgqayq4zmq0gb5ff0hd9bbn660haadmncn8j44njm"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.20"; sha256 = "1xzk2kpmps01srj0zyllfc8m65y2l27gpqcmvkh2llkv881kbdfm"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.20"; sha256 = "0qxiv3a7cgga8xnsq8xkvm5qy1spvgwsk57lm54wc6jyhc13fp2j"; }) + (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost"; version = "6.0.20"; sha256 = "14xfisjj5yrqcvy84f30jzvmchp2513afg633bq26irbcy6ilslc"; }) + (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHost"; version = "6.0.20"; sha256 = "0zdm7bd1z90hn1rvz2k8vwxrzgl7lirmxx4k2ih0gjyp5yz8pkjp"; }) + (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.20"; sha256 = "18icvgf5avz03qv26ivnmn01fmz345lls0lzgl8n3qr93v40bjf7"; }) + (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.20"; sha256 = "00i7adsd6inpgxlr69xgvhsb7sg9g5sscwdmq46z0dp47s1vphli"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.20"; sha256 = "1wf0fgz84n6ag81ry4mydkwdzjrsxsfy7rix73hl8ihfy5f2jhci"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHost"; version = "6.0.20"; sha256 = "0aq5yii9i52i70nkgzm4sb2gcv8i3lw61wl3wbws3lak2van75nh"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.20"; sha256 = "0glzhxnd4fjf9qjn6knj9gw8j9svxf265sb3qxyl5wnwyqx7rfdx"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.20"; sha256 = "0ygdldk7xaa12y3y1mrid8v0045j7d2r9gg509m04r2xvan7rhj8"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.20"; sha256 = "18nmnsh51pslli999g99d52ivsld67nq8kqxccylwj9qmj6cs218"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHost"; version = "6.0.20"; sha256 = "14iz67jr1xrshb5vqph3wk5ngnx4a6ingcv868fb98gx13r7wfc8"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.20"; sha256 = "00khxrlvfy49s5yxn5611vs24lqhmclzks3pf6wy51rw0fy540q2"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.20"; sha256 = "00ws9fi2b5wy3jly5pxmgxcjkfmjixmy0m4lw4vp9h4rb8q6prja"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.20"; sha256 = "1lp4km2sxjb791srirywf11nyj69654i2s4x4jadbp1kb2r7hp18"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHost"; version = "6.0.20"; sha256 = "1hbxd5nyzngynqvj7n0css7xca7kra5zrdz1g40wvz7hgdacd7j3"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.20"; sha256 = "0s3g5610m1asz410pp57rlkbcdnsf6rpr9mp8lz34la34w19gkpw"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.20"; sha256 = "0d509bdgmpjnkxz0gnbssdvdq3rs05k6frs8wpjzm6i5469pxjch"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.20"; sha256 = "1ilbsss1w9940wf2jqfgkirf5hn1lqw0p4hpd68r9yryai2s2wnx"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHost"; version = "6.0.20"; sha256 = "16sc3gfc3dd0mh86xh3qg00lbdz3yq7f7iyan33rl01z6ljkb3w8"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.20"; sha256 = "0vd3dh0k192r5wf6k11p44sywjkgg4yag3a14y0v8f3lnxm7zqfm"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.20"; sha256 = "0qdxvknp6ns263r2gvd5iprcdcjvzcwdn2xlkhyy9ihhszkciv3h"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.20"; sha256 = "08pjmzx8qlknq7dci8m5xlldm3jxcj28zlwjs295951zqifzdajb"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHost"; version = "6.0.20"; sha256 = "17ygzmbcsj1xv5dx63rxb0rvn0laakng7asx0nxsa5pgx28isqdx"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.20"; sha256 = "0vw0wk0j5alk4ffnp9960cdca2gmlvh9dj553nfxdmnil4vpj7wq"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.20"; sha256 = "0k68kxzr0y113rasi0br3jh2f7qjvay61yk6hyizwiz7hikmg12l"; }) + (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetAppHost"; version = "6.0.20"; sha256 = "0kdb86h8adc5alsfbh7mii69yc1iyn2k21wf2j90izk8g63qdzsb"; }) + (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHost"; version = "6.0.20"; sha256 = "19327qki08nnvvpqd1lkvisy2wrpcaj3v8d3qq10hyyf21in1ly7"; }) + (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.20"; sha256 = "1b8wsdkhpkkm046v9yj23x3jdqygs64bzi9vjslbxg69h6andf2j"; }) + (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.20"; sha256 = "0b0w27az1c97ailrjzdwlpzy7255nmq326gic51vp3p5a05pasrj"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.20"; sha256 = "18r7k5m6j7xpz4d0cnk74b0alxcgz6v2nz08zdkz1f473s6hdkvl"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHost"; version = "6.0.20"; sha256 = "1hi2kg5ka1biczyvg0pk7rvbfb08z5nib7yd18yxzjs7i7hb385j"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.20"; sha256 = "1w53abjj2cv39lgc8h4xwf42593cjhiah7vmfi4fc6iyl6q91qg3"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.20"; sha256 = "185vk80j81vckacp0hangng9r2rcw884nirwyvi4p1v0jk66i9g9"; }) + (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost"; version = "6.0.20"; sha256 = "1d01hrwkvf9a64lmv293xf829imghmy4g59s6lkh2dcg96m7byba"; }) + (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHost"; version = "6.0.20"; sha256 = "082zbwg2z2p6fgqy0svd6iahawn1riiqdn4dn63zs6zvjwwc26wg"; }) + (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.20"; sha256 = "16zmi46nkhld8lq1hm5kqndwm0l0w94g352mzammyvrpwsn0wyhn"; }) + (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.20"; sha256 = "1i9ghy6hvslnh53xdk0xwiq0j92cjim2nyaw3asrqk7rkcynsxz0"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Composite"; version = "6.0.20"; sha256 = "1xh5yqlpwhv1xwng93kw7v345dsmlwpg651zmi1mj95l3qd0p9km"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm"; version = "6.0.20"; sha256 = "0r8s132mgx3283gf1xsg5m4fhc5yy6rkzmii56g52wxpl4si0i50"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-arm64"; version = "6.0.20"; sha256 = "1m8gi6nfy0x5ha2cja7f37237ybb6hd81dcspsb0shmbgag141ab"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm"; version = "6.0.20"; sha256 = "0n4fkn7g1zknyalzs9vf3z6x19vrw594qxk1pnianw6db39c9qf1"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "6.0.20"; sha256 = "1nzpshl551sbmpdz8im2rvr8spi0rvdqb2js1kd1988qx2x2jwiz"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Ref"; version = "6.0.20"; sha256 = "00jnmbljs3qhb03d16hh5pqy9na9lij77kgb1wa982lmb80hj7np"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm"; version = "6.0.20"; sha256 = "0c33yyrzfl3p1db7vvd287g7pq3zk14cq1hc8ggpkfr3z3kih8lm"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm64"; version = "6.0.20"; sha256 = "0fggkfpr591pk5867q01qhijhmj4wks04a77fldjv4iv8azlsn8p"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-musl-x64"; version = "6.0.20"; sha256 = "08fa4s35c08rkj4nk7y2k9flliajvw20i2z7fp4a9dbpsjvkaj9a"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-x64"; version = "6.0.20"; sha256 = "149l8qsjms1zk20xazy6ggcnyhvlbp3rd03lhipd28787jy69d3m"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-arm64"; version = "6.0.20"; sha256 = "1wj9piipky41s5z7zwi76ksf8snzk8z9q4vdbl146kkcnaxrkrkm"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-x64"; version = "6.0.20"; sha256 = "19vxwiakqlp299fj62f2ijh8hv67vlk9iz1dg876gvvp06k9mkyg"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x64"; version = "6.0.20"; sha256 = "1mb4kl2jlk6zsavl979j4z2xmml8kjxnnp3gfmv6rynk7b9m5cwg"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x86"; version = "6.0.20"; sha256 = "1nz5krmsx7l087gsfpfsmrbwvjjw8qsmb8wcwn5aynljfl4jq7pz"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost"; version = "6.0.20"; sha256 = "0k9i48w2lh2shfxz0w0qh19yd6y9qg05izhmqb89zpr7m5sccp5v"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHost"; version = "6.0.20"; sha256 = "1xvrmb12fdcrd64bqrs111x170p712aazaqdspbbn5v3j1nbzal4"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.20"; sha256 = "0dp54dk7x8zwcgsydfmgn462ynl1809avmn6s22brip0iy7wrz5g"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.20"; sha256 = "05h8bg0655scv6crqkygc9iac5vf18cfa2slm52bcsvfvic8ad6n"; }) + (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.20"; sha256 = "0yli4v5nxxizxfz24vk504bvjhngcvvk1ab3jcdirrg9z8pcp73j"; }) + (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHost"; version = "6.0.20"; sha256 = "07indvjgrygh674k50k4isjpr3171h06hfxz2gy99bw3fm0y8lm0"; }) + (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.20"; sha256 = "1qzzxdps0h7dpzz3ks43wzqvb9sqhbrdywzi883ipy7zwndl1avw"; }) + (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.20"; sha256 = "08hfm9xjj6rl1c7zvcxfwsc8qb0d9l66l5j48k311apdc4jjsgg4"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm"; version = "6.0.20"; sha256 = "0nz759z6sgmrq29vjr2y04brfjmddr4ga7l5vrsv1k16vf39g3fq"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm64"; version = "6.0.20"; sha256 = "02wqksvir4r22785w1rrnd4aqjav7asz8wji9v3955acrnhdg81g"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-x64"; version = "6.0.20"; sha256 = "07gsm1p1ccb3f1vc4n024ilz9hc7qnqxj6mwk3k8jbvw228nwi89"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm"; version = "6.0.20"; sha256 = "1p74mcsbq92cbbd5i83clxigcmmhi825q7izpzsypdpd46v73hmv"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm64"; version = "6.0.20"; sha256 = "13pya2yy68r247fc4r3dbkq2hwaq5909n8v47cr7bvz07mk8isnb"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-x64"; version = "6.0.20"; sha256 = "1xidixl08nys9jzi17w5f89kq9wiwc135ddcbnhpfyhllhrn03kc"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.osx-x64"; version = "6.0.20"; sha256 = "0ypcdzhr3v48iy6c3z6vhi2yfl7rzp85p0smq2pn625c1v1xgmgh"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.osx-arm64"; version = "6.0.20"; sha256 = "0py3ydy5pbxzvgi2lmkgcm1f15p6kikcym0hmlaj58ag796b1kff"; }) ]; }; } diff --git a/nixpkgs/pkgs/development/compilers/dotnet/versions/7.0.nix b/nixpkgs/pkgs/development/compilers/dotnet/versions/7.0.nix index 8dd267be55ac..ca35bdef1a4a 100644 --- a/nixpkgs/pkgs/development/compilers/dotnet/versions/7.0.nix +++ b/nixpkgs/pkgs/development/compilers/dotnet/versions/7.0.nix @@ -3,176 +3,184 @@ # v7.0 (active) { aspnetcore_7_0 = buildAspNetCore { - version = "7.0.5"; + version = "7.0.9"; srcs = { x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/b936641a-57d6-4069-bd32-280020863326/5793e00ff9e9973a01ca735479ff15b3/aspnetcore-runtime-7.0.5-linux-x64.tar.gz"; - sha512 = "859d48d0f29e014d56e89161d8001f75b3b0b03ee04f86641066570cfbe267b06798232500a86fd7bc31edf022097278dfeb496874778fead4476863aa994928"; + url = "https://download.visualstudio.microsoft.com/download/pr/c1348fca-4ef4-46bc-9f6e-04f2315e0d3e/50fe6b7c2df482cdc880b66bd46834c7/aspnetcore-runtime-7.0.9-linux-x64.tar.gz"; + sha512 = "aabf4fa5ca726dc52774e5d644800ef7477815b22a982b7a2752dec6569186aabca93d5386e195e7ead377144601a786ae6a5d76ff28435bdabfad495cfe554b"; }; aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/565ed9fc-5ae5-4168-b08c-f4e39acf47ff/f5e3c6cc872681c08ab9aa6deb8a72c2/aspnetcore-runtime-7.0.5-linux-arm64.tar.gz"; - sha512 = "2c35feac6e8a55185767714eca52912bafe5c6255cc0eb0b93aa245255e405ad1076ae018b7a3cd845b159bc2d87d950ebf5305dd52b1215adbb35ea9cfcf551"; + url = "https://download.visualstudio.microsoft.com/download/pr/9aca092c-f9c0-48d7-a01f-3c1c2eaac903/01b345ddecc7a90d5c99d016fa5180a6/aspnetcore-runtime-7.0.9-linux-arm64.tar.gz"; + sha512 = "447ebbd115b8d38eeba70f531010832db535cf3a17404491f552e99a5a59c8c63525640694a6753d27e9a7ed5bf1064998491c1983361c1c37b152b01a3b8f8a"; }; x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/b707a1b6-7222-4929-96b6-3525f93cd79e/dfa98874e490e3da4024cd20baca4a22/aspnetcore-runtime-7.0.5-osx-x64.tar.gz"; - sha512 = "69c473ec116de84bd5cfc27972890f545952a83deae1c3d298152a2dac892f1a70b0a3e10269bbd332fa8d95f2616052f07597adf9279a0d2d2ffad7382602b2"; + url = "https://download.visualstudio.microsoft.com/download/pr/7e6cb756-70e3-4974-b96c-dc9b9d138306/9b0ea50c629660a565db33e74a69fe8c/aspnetcore-runtime-7.0.9-osx-x64.tar.gz"; + sha512 = "b2cf51cff120abda9b5ae213e294f73debd620bc8f3e6b12e1bb628df31457a5bb8c6dbb12cb1dcec24a2c04edd5ebe807d6761f6095e7a90441f1930acb8185"; }; aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/dfb4f870-e416-459f-bdf5-5362030c6d5f/fb888174a31cea86516a95f60ca8e65c/aspnetcore-runtime-7.0.5-osx-arm64.tar.gz"; - sha512 = "855ae3cad226fe4429073a54825ebadf2c3bff84ef811d602f4d4f259663d6648b7b0d3e1683e50ec5caf82417ffab47599a928cb635f2149661731cf27ff698"; + url = "https://download.visualstudio.microsoft.com/download/pr/f967c09c-7a90-4da9-b933-926ed7870b16/0e5fbf15f170ceaee7e3d1865b856a99/aspnetcore-runtime-7.0.9-osx-arm64.tar.gz"; + sha512 = "fbe725a764b765f9954ae771b3d043d6d1a53e53149d0b4c89a4138793d9471f2924f68a5b8e1c107d9faa07946f2ac00584ded9b179ed8d40cf230ac7d34750"; }; }; }; runtime_7_0 = buildNetRuntime { - version = "7.0.5"; + version = "7.0.9"; srcs = { x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/e577f9c3-cf57-4f3c-aa2f-2c0c9ce7b9c2/16911adb0b0ac64ece205a8cf96a061d/dotnet-runtime-7.0.5-linux-x64.tar.gz"; - sha512 = "68014bdbf55bf455f59549c7d9d61ccc051e09fe74a975ca6b46d3269278d77c9cd167ba05760aef8ab413df4212f4f5cebdd1533779b49caf517eb4ec50cce5"; + url = "https://download.visualstudio.microsoft.com/download/pr/ecc0d5e3-61f5-49b1-ac1f-3b46956e1139/1ec7760b1697363667623f22a16c67b5/dotnet-runtime-7.0.9-linux-x64.tar.gz"; + sha512 = "09552e5ae6ac014dadf17545ff0a30ab32921075a31fb33e7be148c13078e30d097f592ffa1b8d306563aaa3f6302e40c5c0ba815c1473bbd5d72e3bef55d91e"; }; aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/8fc09c26-b0b1-4f26-921b-c1378547768a/04088af0b59a80a1fe1d613751d0a2c8/dotnet-runtime-7.0.5-linux-arm64.tar.gz"; - sha512 = "983b8123db0ecddee10c00c455c740e24793c3a7d1d400722cbc6183ca9a8916404d81dde07e43b9a6b1ea6ea160055b871845a789117ddc023eb07f3685f4cd"; + url = "https://download.visualstudio.microsoft.com/download/pr/f693db81-adb6-4481-862a-887993824572/9bd6d12296a5b07d8b4b0190afab4152/dotnet-runtime-7.0.9-linux-arm64.tar.gz"; + sha512 = "271396af3adf881a4c5c8c28a812f9a0a30e11497bb0c9cec12bee4d726ed9151b2d35eb9146b5938611ab60ccc249d5ce5c870f721f791d19a3b08545dbfa97"; }; x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/e4242cbd-90b1-4fc0-a8a2-44cd251450aa/3d811a2e1d73cf59d077a63099cb8189/dotnet-runtime-7.0.5-osx-x64.tar.gz"; - sha512 = "4053c79ef80dae8f8ae1958215def910490b3c754ef088f02c81263c790eb8658f1845de916827755d62af37c6d090d59c9a2219c961a29b469a7bed74ba950a"; + url = "https://download.visualstudio.microsoft.com/download/pr/f12bda3f-cef0-4d22-8ffe-89f553b0e5ed/a0ff4b2aeae50d5192e0e6f47075345b/dotnet-runtime-7.0.9-osx-x64.tar.gz"; + sha512 = "104e724bcec68fd77e8f07b71ed364cbcb40394c9ca0d8ef52e1eaab867b579f06ed7b0b203a50bad3df45634d52b6be60829d87a48c1800467f242879f8884e"; }; aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/5a4664cc-7009-4b8a-9e6f-e3ae0b2218d0/add2992c737ce7bb70298fc030c84ead/dotnet-runtime-7.0.5-osx-arm64.tar.gz"; - sha512 = "2bbf02e8001b700cf6badcabedad148a3b799ad0404b2e1e17bf80eca5eaa7a7939df135898f2aa5ebe7892f09d6fa7840118d3f360c2f4aacceb2cd8067c15d"; + url = "https://download.visualstudio.microsoft.com/download/pr/20e6ef57-7686-4115-b7e6-ac561dcbf4fa/e2bf64248953cb06d5bafd6919f48905/dotnet-runtime-7.0.9-osx-arm64.tar.gz"; + sha512 = "1aae7726b89c0398f29bc49fe9cc4c2c3f27f1114d5ab140c998fe74b13caa3eed05cf5ae28eb389f37de2023b35c3bb864be64a2e596bde673e27ce749c53a2"; }; }; }; sdk_7_0 = buildNetSdk { - version = "7.0.302"; + version = "7.0.306"; srcs = { x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/351400ef-f2e6-4ee7-9d1b-4c246231a065/9f7826270fb36ada1bdb9e14bc8b5123/dotnet-sdk-7.0.302-linux-x64.tar.gz"; - sha512 = "9387bd804ed980ba1bc33093598ddbafa3a761e07d28916c94442cc329533d78a03bfc59d3066a1a861244302414e7e658b4e721b5bc825f623f8f908e748b7e"; + url = "https://download.visualstudio.microsoft.com/download/pr/0be7a87e-3a3f-4500-8301-49ccd6f24887/e9e36f35dbaf6625fec3e18f5c2b613f/dotnet-sdk-7.0.306-linux-x64.tar.gz"; + sha512 = "62df9bca9492b3273830e098e787ec3664243989ac03550534599fc331693553660d3cf8bca655f2d1326070dbb7b20b04743eaba77fa9cc69f6f0fddfdebd06"; }; aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/142603ad-0df5-4aef-bdc2-87b6140c90ed/2cce467e6c954d01024942b8370aaf70/dotnet-sdk-7.0.302-linux-arm64.tar.gz"; - sha512 = "7f6372faa348c84560e3f1139605dc08d888b14b98c400724f628b52156fe31c20a50dc2a2f8673e29239d04ef06744e16c6f8bd8eb1756f99274c73eda74621"; + url = "https://download.visualstudio.microsoft.com/download/pr/fb648e91-a4b9-4fc1-b6a3-acd293668e75/ccdc8a107bdb8b8f59ae6bb66ebecb6e/dotnet-sdk-7.0.306-linux-arm64.tar.gz"; + sha512 = "1500927cd2b1e048de8ee5339937fd41073a85a82b7a175220a411212d22e4906b4e5e6d29b51d068157d2ecde33238d540508c700793dca8b04b4d1dcd5c89e"; }; x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/34ce4803-1444-48a2-9955-e2a9b9061b03/e18c978b55226240ca037cf8b1770064/dotnet-sdk-7.0.302-osx-x64.tar.gz"; - sha512 = "cafb8e2839a8c91f58e8bda519d27f622a7a4062aea9247d743d64a3de3acad6ddd4f80d011fd416a3e3622f0ece8cd2e70e65f48331ae321b5ff23d282787b3"; + url = "https://download.visualstudio.microsoft.com/download/pr/3d615bde-bfce-4ee0-a3b9-73dc4ea5a472/907ac9c03d971c7577ce60932456b3e3/dotnet-sdk-7.0.306-osx-x64.tar.gz"; + sha512 = "1ba293a9e07819aeb646c86f0db8280394c4a2b62f828d57a5ae80416cbafb1649a22e27cb12cc315dec1600cb825be645777d15e2f7c8d858fac3c55d0ed057"; }; aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/fc7ed56d-3afe-4aa6-81bb-b4b0f5df56b5/d199f43f7421c6677ba25544b442b6b7/dotnet-sdk-7.0.302-osx-arm64.tar.gz"; - sha512 = "28cc5fcc9651fc75f9b2f864672e5fdaead28feb262696c305d00a71c828004e46f0b9b4a6bb6b21b9ea475b1c601e1724df302eea4d63f604e4fcdc9c97dd63"; + url = "https://download.visualstudio.microsoft.com/download/pr/0e57f35a-00e6-49ab-aa75-7ae6711f0a8e/f28c04285b8bfd3f975731a186e23c23/dotnet-sdk-7.0.306-osx-arm64.tar.gz"; + sha512 = "ac8c0b6e9d2235c8ee639c6c50b2f412f808a16f1616964f6166c7c57d899be2a0d8e83dd6f3010634f8f252da483c5d99cb083703996a99a6b9238cdc2cda6f"; }; }; packages = { fetchNuGet }: [ - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm"; version = "7.0.5"; sha256 = "168bkqk0v02rwxviqzafhkdmzmmbd4z60sibv3s43byn0d8hvfdl"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "7.0.5"; sha256 = "1f7j3fxfdbin5zh39knsr1icpbdf5zkyjdxds9m8brraw9gj5mlw"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64"; version = "7.0.5"; sha256 = "0fqhjy5q2j1c44ijgzpl1j4yfkhl7vyijga2y5cnsly42md9k5lz"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64"; version = "7.0.5"; sha256 = "07c87frgxvdgh4v0n02wc8z27x12kywcwjdy2bqa6g45qznnangz"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "7.0.5"; sha256 = "01irhwqq80ifrqf87897jlh8v0mr5yls000gryv4v8cagsq648s0"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "7.0.5"; sha256 = "1nwlyz0sgykx801fg1lj7la2b3vbgyvk51132v0gnz48m8b62n3w"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm"; version = "7.0.5"; sha256 = "1zkjvfqz89cc0s25i7acbcqvbs52fach0iqf9098h6ak2pq6241h"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm64"; version = "7.0.5"; sha256 = "0jxrlgb601x1na085pmqyb9r1wp2vbnhly7pd2zmrgqihcxcp86w"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "7.0.5"; sha256 = "0nxyv0bz9c46pmwvvbmpb6c7id8l9ka9lpymi0ljwln01xwhi8fx"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x86"; version = "7.0.5"; sha256 = "1631gy294dkd2fvr7010a1sz6hsrdzvvmpykxp1gjxz242wxqaix"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Ref"; version = "7.0.5"; sha256 = "09amylhcl0fgrn08zan5xcsa4wjw5prdnlgypbvsz4z930lm4zf4"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm"; version = "7.0.5"; sha256 = "1c62wlq21lck49a7cfwq6b0lb751151dn1sn9qv11fvc841lkzw6"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; version = "7.0.5"; sha256 = "152dlxn5bqvf0nyhmxbcmaqj95bmm4vhvm4y23ajfwwgh373n00a"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm"; version = "7.0.5"; sha256 = "1vigsv0si95cjicbrpgi3jmpf2a1b4rn13yyxqhqagv1chs60jh5"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "7.0.5"; sha256 = "1fq6bjpsmqdgv5z4ncxnxrfn10aw90n2zh8sqw0whhv2kjsq7v8l"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm64"; version = "7.0.5"; sha256 = "06pbg6cphf7v39f1nsc7d7wzsl8aanb59dckxay3zazljpbyg80d"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-x64"; version = "7.0.5"; sha256 = "00nvn3qxhv2rqi35wxj21fwq5q8w1zxki70pnaxpv4b6m2s8jmql"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "7.0.5"; sha256 = "12p3zq5n8pmpscrgz944rkrjb12q702if8510xyf2b4na85r85qh"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "7.0.5"; sha256 = "1lnv3z082ijmyzwa3in98wz7jchaxld2gbc3dk2k804pavaamr8r"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm"; version = "7.0.5"; sha256 = "0484mij7i3daag1k6nil5p6bxs5w9hsk2f2f13lnjjgdcnl7znf6"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm64"; version = "7.0.5"; sha256 = "0wvjzn6xij7kgdpkb3m7y31p1iz1jzn737r464fqvw778dnnir1h"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "7.0.5"; sha256 = "08raqcy32yni373c6kdmxvyndxlwrhnxadfjp4fn7rfqyrgqkifn"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x86"; version = "7.0.5"; sha256 = "0g88jgsk0vxwaiil9kcp1cfc5chkb6gsr45m8blmj866qinln3vf"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm"; version = "7.0.5"; sha256 = "1nysbj81wpywh6i39l4agv5rjhdn3bd1jqb6iwlkmriyf1xyshdz"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "7.0.5"; sha256 = "08ak2khqcn9dqinb59c5nlpa7imdhi5j7l4g9p2xm62jm6816qlp"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64"; version = "7.0.5"; sha256 = "127bpxp4i902l44b28xmknw59f7smlsc8a3w4q5bykjk1hj18hxz"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64"; version = "7.0.5"; sha256 = "0bba6jzd7bl12wwm5wpnk1nwbn5ylc3jfq16wsqzdf2ymcvnx8vm"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "7.0.5"; sha256 = "1cl6g85yaigyzixdqnxqpclf46x32f3ndjl08x9lpypwsv62cd9z"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "7.0.5"; sha256 = "1rmim6wrkh9vd0klmlwm5yr6xszrhv2qmw4sh12453khxdsi0xpl"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm"; version = "7.0.5"; sha256 = "0c9p34b55zh490ky338npbga3jkssj7r6h4jwyv1bj9skbp3aayn"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm64"; version = "7.0.5"; sha256 = "1x0psxmi1waymxndk38f37aq1lnd8airglq6i0hi38f2yfbmby9h"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "7.0.5"; sha256 = "1wd6i75alsj2hv8aich5gjc6979s4shmrdmfraqj2qr51k3jdf0r"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x86"; version = "7.0.5"; sha256 = "06vl6l0nkd7iikg98ycb5smsrvw8dz9nzmjqyqksia4hxvhrlzc1"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetAppHost"; version = "7.0.5"; sha256 = "1y8fqpnfcp04bz0qjsms9dc5cpf8zdkk2vnll4x6w6h8mgsippj0"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetHost"; version = "7.0.5"; sha256 = "1v4n3rb4kcy51z9c19mpwqkymsrw11j5x17hsffj1bdq7ad5ammv"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.5"; sha256 = "0yci8wcyliv34pl73gid5f9dilf6fb5hrfwbffgpka19x6yxjni5"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostResolver"; version = "7.0.5"; sha256 = "1dl8h9j09lwyc6vq550prwxcz15d7v6c6ii8gzli2c77qk71k6hw"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.5"; sha256 = "11r5944ccwgpzvhqiy9f62a7fyqzszaq2yq9szx31l49hhbiy8bx"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHost"; version = "7.0.5"; sha256 = "0k4q546554m8hnlak8300mgydjyp9rrxqm0xwc90hmn42k9zzr21"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.5"; sha256 = "0mrgj2xkc6nk0xchpjyfrvfchx721nc25p796c93vgh60zv388dc"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.5"; sha256 = "10jnaybkq0b8n02lcc6ay2n5s7msghbz96kydphj8fq3bicljggn"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost"; version = "7.0.5"; sha256 = "1ssdj1mgmm4vg8ics072vkbn0a0x5dk958hx7wcvf5966fxjh5l9"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHost"; version = "7.0.5"; sha256 = "0xygpaccvszvpbpg144ddbdwfcwmbssp1a53l7nfaippr16c7jc8"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.5"; sha256 = "011kc0d2hmdqzy46x20w4ljq10i0hvlhmna84jid21cinfk2zq8k"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.5"; sha256 = "1sigppl8zjxxs2c7y4gsc03913q7bdgw74rvdkh9vh7hq8kgldb6"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.5"; sha256 = "09jnm9pq7m9wacc640g23i171w1fwmvg103amdyc9ayih66gi6nl"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHost"; version = "7.0.5"; sha256 = "0p4izlcdhsd7rnm7iv0s9h7qp8vfvd17dyrn35hjj84147x34dyf"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.5"; sha256 = "0c73xl6ypdjqpq6fw115fdq40pfmj4qm3j5v67mrxgyki2r0m6di"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.5"; sha256 = "0cjsw125syx91d8nm996c03kdv77l1aqx7nwv9gis9mqx6mfb9ij"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.5"; sha256 = "18hxhi8675z52nxwii3zixki3g4k66dm89gnnlsa0bw0n445l44a"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHost"; version = "7.0.5"; sha256 = "1mlyrddmdmf3xfh4zfxcv9938xfhyar7yxgin6skxg6n0f1n3qjp"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.5"; sha256 = "1aczpv37c6b2gajwd5b1wp0fx60dzgbpb0r24d2cqkj43rpbynvw"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.5"; sha256 = "0g6z2pcqgi63r70shc4bhy652cjg2phlapscj7niia7nigvj32w4"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.5"; sha256 = "0whgwpb1p8ykpk81z54mqgnfm3dysgfdl85d3idkjzy4a4pjqv0q"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHost"; version = "7.0.5"; sha256 = "0zgbl854p26wy3vx0arqm8clbclx23z0q0fvk3117k19r0331kz1"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.5"; sha256 = "0q650bmnl1rn4va86dvdw2gdb0vnlfzdm2jgfph6hk34cdxqdrd6"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.5"; sha256 = "1z32pmdfdpw4ng7z7xqq2ahq9ydgii85cywcixl3rdmxk2fsd9pp"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.5"; sha256 = "176rw7iy5k3rpk63cdi6nzcq00qfmskn8y3dfbrds3qxlqlq123i"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHost"; version = "7.0.5"; sha256 = "1xwnpmb7qrzwk2c3vmjrpmwwhpizz8rpx5zm601hkdz458pk9xvj"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.5"; sha256 = "043sg5jfkrvfrc7h2mf2qc9g0l1qz9fifn6dlqx8d6bxl46vqk7d"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.5"; sha256 = "1d6i9dyiml00sr92n5jkp818hibbrmaa1d0wwvczcjqq4r6ajpyw"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.5"; sha256 = "0gxc7jcs1mqbmhz5vwi88pk795f0lbkgk0fvvsy93f9zj70gsc2m"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHost"; version = "7.0.5"; sha256 = "1zvlbzfa61i119s98mad7af871f1qkhb832rfkvi2awv103pwccp"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.5"; sha256 = "08gwnsaqgrj61rk0zpd9wbmlfy71jip4fqaavsv350cd1kw76qv4"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.5"; sha256 = "1k27y6mnn2q8pz24bp8ff04lws1jvpdwmadi3a7saqdsxwzs4mas"; }) - (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetAppHost"; version = "7.0.5"; sha256 = "1vxzs20ibj16scg50g28ha5p7yw2csjh8xglqnjfylg2xh8j5g5c"; }) - (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHost"; version = "7.0.5"; sha256 = "1acxvh7g13jq411w3msysmc4ygd6ciw24piprj8zb8vknbrg83z4"; }) - (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.5"; sha256 = "0saimrqmfg613bpbqsy9f40x8s2rjagzx4x180p3gmwf0sl97qrj"; }) - (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.5"; sha256 = "0vz8jk7idghnljh8sadl260ndjjnqf04misx1bp847ld0nik97a2"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.5"; sha256 = "0kf5s7gra90g21pc8gimc14vqj6wc9rs5lhhmkpb3w6mr8h25cwl"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHost"; version = "7.0.5"; sha256 = "0484f09j66f2gmr4fdsn79xw1mxbvi2b566d6z8kf1702jmd0i53"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.5"; sha256 = "1r6m0933cp0j57lywgaz3vwiswfd04lyh24jxsrvhd62ckywsb78"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.5"; sha256 = "0fwmwpjkv7s18xizcj7psyhm79dy628ksq12hd8w3323rb5696rg"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost"; version = "7.0.5"; sha256 = "10y9rh90a0acqalv348fwf0bx3xlnjya0ni559xi80armbi78l3k"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHost"; version = "7.0.5"; sha256 = "1az0l19syxx5nfn3ixykhy43r9hkhwimxf3l9ww60nxhbkx6v72q"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.5"; sha256 = "0licp7y73lkfkkk9zyks5rkahrh3xn0ihz0cs3dvvc9vlnndcnmg"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.5"; sha256 = "166sj8yw8cjnxivhgdwrl5z30wc0004v4gx6k8dl7nr89y71rcqv"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Composite"; version = "7.0.5"; sha256 = "16vvzp7355l4xi87bq83yvv8s358akdncfqfjk7agj03vbx0qay9"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm"; version = "7.0.5"; sha256 = "16vmhn5xpnbajqbsxd79bppwjyywfza20fkzjd93lsgl36dnxbq9"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-arm64"; version = "7.0.5"; sha256 = "0b87x1r9103fwg3bg6y42hgv4dk40kgysnvksv3wssd9m40v3kqf"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm"; version = "7.0.5"; sha256 = "1pjcd3jnsnsfj1bl60nls8mjfpm0p96jj1jia64l3mfv9lsrgd7v"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "7.0.5"; sha256 = "1qw07w5qll6y8rdids8bv3717hmhcv69vs7xbgpddh7ag0xxihr7"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Ref"; version = "7.0.5"; sha256 = "1sam55nhsa0q6npcx2qa2q2rfqss3lk27djyhp4q7yazsnlihq1d"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm"; version = "7.0.5"; sha256 = "1xdgcrvfiid1njq61cjffhifkw2ix016sz2msfmlyplfmcd9lys3"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm64"; version = "7.0.5"; sha256 = "0r6h1rnxaxfalp6msk8wvmlhi5k5gv385c66jgw7vvvq05kq6gk9"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-musl-x64"; version = "7.0.5"; sha256 = "0bl7ck3hxy34dalpahb0d83f5w1lmp36v0jax18x3lxbn3h5npn6"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-x64"; version = "7.0.5"; sha256 = "11x0s7zjx7m3q2w0l4sp0gpwzbya6f06iagzkj4y0lm95xsx7pik"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-arm64"; version = "7.0.5"; sha256 = "1k142050w7m7fqk6cnpa2iin8zp53cq3xfcs3rqwh4g4ng9dzgpy"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-x64"; version = "7.0.5"; sha256 = "1ap7qlpb2wc5igh08q71i5vh8lgd5p13p9pzz4vpk6gwfqlyiwa3"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x64"; version = "7.0.5"; sha256 = "1prrsqcc4maihmgzcc8n9z5qv32svfr9ambfaka86svngif61m28"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x86"; version = "7.0.5"; sha256 = "0w5q19af5f47r8vgpsvh3vxci75v1fhh0hkp1gqj2mrbb3qydnd0"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost"; version = "7.0.5"; sha256 = "0hbndgxbg6q1zwanjl98ybn35w24592bjy935pdf5wa1b7sv1h11"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHost"; version = "7.0.5"; sha256 = "1jbvknhwyrpvs81kpi1lbjxlj0zh8nmz61jz7b5dn63ilf3mx9x6"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.5"; sha256 = "0jgzf9dh8zar5xi99qw6qi4yx6cgpvd9g9xzj0yis7cc25h5xbpf"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.5"; sha256 = "0n1fajdm3a925bvzy23g1mvxrpch1v28qwin62bbnl21zk41k7f0"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.5"; sha256 = "1nzgry4ckcbsk36kmn2vqfds4ldqk2hqlkyrm1id12mnxblcrih9"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHost"; version = "7.0.5"; sha256 = "0467y44yygx4jia9zmiv63lfn64j7dz8hxn0i0arrw0ai59fzdcz"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.5"; sha256 = "1rzyj8bgcg01pqkww3d2sdv4fk5hsq2ir91xm4kbxkx60zijqfkh"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.5"; sha256 = "0rjz1m2vxw977gl59jdgxzq91kap30jcj2wdbn702im5m1262di1"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.DotNet.ILCompiler"; version = "7.0.5"; sha256 = "1w4aazcr0qc7sf4mxhkpp1d3x1yvgxwq3i9yak9a94a8mxx9b042"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.DotNet.ILCompiler"; version = "7.0.5"; sha256 = "1i445i4i15gqa5b2gl92rlj6zww3iwzpx7a3wvjdaf7pyjwcxfd4"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.DotNet.ILCompiler"; version = "7.0.5"; sha256 = "01bri3hdl9xqkjr8c8krvi2g64csp56jv91rxfspsvy8s1j7mbkp"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.DotNet.ILCompiler"; version = "7.0.5"; sha256 = "0abidvw000x56fw8vk39645ywynip5rlpwg3ahn4bazm6prjhah0"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.DotNet.ILCompiler"; version = "7.0.5"; sha256 = "0qwnykfvf136fkzn9iipxmzkrik27xd3zr210jw1m4c2wzd3pwls"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.DotNet.ILCompiler"; version = "7.0.5"; sha256 = "0330966bldi7x0vxxfl6bb8pd5ysyyvcmn5ll58lwz9b8ihwqji9"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.DotNet.ILCompiler"; version = "7.0.5"; sha256 = "1fyhsrw7zraf8ml0ibqi26i4y76a5i7hm7155hrlf6g2wh9c2wni"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm"; version = "7.0.9"; sha256 = "09d86p5r8wbv03f89cylkg6czwf71m50fkxmav9qp3p5cscayzql"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "7.0.9"; sha256 = "01nkzvwgrlmgw57llabdgfxqz7jp54a2p3fd83zdlajqmmf54wi5"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64"; version = "7.0.9"; sha256 = "1z0cbmff7kmv8yg9x9j4jzga689fy4434z8jy8s3vjsvmcj96wmc"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64"; version = "7.0.9"; sha256 = "0059ldcym4lwrifibhb8qlra2f3ygzb95laxjgxj3jbdh78fy3i8"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "7.0.9"; sha256 = "12wkvz1mwyxv7zcr18bsyfa93p0wjmxqyz26va34xrfws699ip1v"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "7.0.9"; sha256 = "1spnj5n5l0hksrq89blj0xcsp1cnk2dw8n0giqrmq790yssvzn16"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm"; version = "7.0.9"; sha256 = "0paqgqbddlnz6p0q1rmc8rdxhgwhs2gqnhbq8b53c0pn8dv554nz"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm64"; version = "7.0.9"; sha256 = "0zw8bqj770gzk03ddxxh2y69krgxvrxn646878lf0l8ssllbsp5v"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "7.0.9"; sha256 = "0zm2gly0pkm5x0zngcbbz060i2p5xssrb154pnix9xbhpxf9bab7"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x86"; version = "7.0.9"; sha256 = "019fpgx8vminim43x3j4ym0m3fg42r8igw4yhh6ivbfkzyy5jnkb"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Ref"; version = "7.0.9"; sha256 = "1vsrymzxfrsa3dvmia9wgvyyz1s8h3n76qwcysa78dqf6lkas77s"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm"; version = "7.0.9"; sha256 = "19wzv0rwddcnrkz0g10gqya0l1brpajkg1krpcf8br0ly0n6fddi"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; version = "7.0.9"; sha256 = "1l3g7l5xzcw3hpk3mcwsl6g72qfrs0m3blazrngma73z4cj3k9bi"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm"; version = "7.0.9"; sha256 = "1cl0xj4aafsfsvms4il6nrx8dyfwx0wdykwzrr2azy2yxvymqslr"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "7.0.9"; sha256 = "1ckgzrwi67prsab6zrjjm0zmf6mbk7wzjjg197nnrjfd6sp5dpq2"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm64"; version = "7.0.9"; sha256 = "0ymj65d1fjn7mm5w2myrhrq465xsr1nggnvpmbfr5md9g9zz78h9"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-x64"; version = "7.0.9"; sha256 = "0jhcajp4dy3770y5394rapsjl6z7jfdw8c2wnsqdr2cgzwjcjr3s"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "7.0.9"; sha256 = "1rprrl8qbdn9v3j7k2dkh0krmr9bak8k3r5lm9v43f1h85gcicsk"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "7.0.9"; sha256 = "0vgn0gd31xfk4j7a8grnnbn3sc8afbncxzcfykzlrpqmzn61plvm"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm"; version = "7.0.9"; sha256 = "00v7yivfj6vl2w0cxnw03pdqwbqz55ds32nanqmni069466x8aya"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm64"; version = "7.0.9"; sha256 = "139lkp92clq50d3jcpdlv79mx72fi46q7bb9skbgc6svz9d40x4y"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "7.0.9"; sha256 = "0dbwkh60f4sbfxsfzi5kyhc7aiz6f9bx3p0m5h897pp94xz7gqrl"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x86"; version = "7.0.9"; sha256 = "0v6ln2cbh09nsglkcclay9jkxchnlg89qkzxmw2ml353b42an1ca"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm"; version = "7.0.9"; sha256 = "0kp2zhxq7dhsclb57ah3xw7ahp23n2xx1lxxmqkmw8gqgan99jwf"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "7.0.9"; sha256 = "0d380v98ncgbjzhrd3pf6ff2155rbl173sr686ifs8djl1w86q24"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64"; version = "7.0.9"; sha256 = "1f1cjqw2wxdykynj2vkxlhqk7kw058219yydyjsgpczrxpdqmcqa"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64"; version = "7.0.9"; sha256 = "1kd4xdwwck1yjb2j4zwj6xq7b6skbc5x565mpzki8s0x2pncid7s"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "7.0.9"; sha256 = "15fw7ywbn28asnn6d23rl5bljzx6crxq8nj0iv7l24c96l41pi55"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "7.0.9"; sha256 = "0k5iqm0hq9f9nwq9sazld3ada7zx2wypcf5k2ddhrwr53wr3rb2v"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm"; version = "7.0.9"; sha256 = "1nmb8hjln8y061381rii1q0m8ipbip51wciypdgvngzvjsibhsgs"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm64"; version = "7.0.9"; sha256 = "16advlismh4qki0dslnycicy73xlhjm3cv595v8yldrvynam2bdp"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "7.0.9"; sha256 = "1lxn13pvg2zynwnzxriw6izdq778w004m5ijxircn1mhzrziipz9"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x86"; version = "7.0.9"; sha256 = "1659734dxb42pcyjsbdg1r9m13z59qm1kd6c23dpix2dwfn2jnrw"; }) + (fetchNuGet { pname = "Microsoft.NETCore.DotNetAppHost"; version = "7.0.9"; sha256 = "1zyrafkqv54fd03m8pn7gly2svh8lpsfkbf8cr962w56g7m900qd"; }) + (fetchNuGet { pname = "Microsoft.NETCore.DotNetHost"; version = "7.0.9"; sha256 = "1zsshmfjm8ivh34qgb6jcmrd5lv9c8lb40k9splg0d3vi9769kdk"; }) + (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.9"; sha256 = "0lgfaqqjsijvjspz2as5c5wjcgpl38pqyvy016b6bq0pii3008xg"; }) + (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostResolver"; version = "7.0.9"; sha256 = "1v1vq51isgmj15x6p9jmilvgh8kv75748ga7ba9d9azjcia6dj18"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.9"; sha256 = "14z8nr5h8aw5090xwd5ll82c9j936fhadf9k0skb8rghkwqlak0n"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHost"; version = "7.0.9"; sha256 = "10vkpyfp5v9nv2rcwbi20874a6swqzgzn7w4y5zkx51q9a2r80yb"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.9"; sha256 = "064yry4gplxjsxn46ardi9jzvpmm77b0pgv9izhdlp5jgnxp8hrf"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.9"; sha256 = "1jzasfcy1rmn6vmsm5i96srp04ha6nv4a564p09wam1xjqspm3fc"; }) + (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost"; version = "7.0.9"; sha256 = "1gri5l2gbxkbhhjxkzwa4wnyrm522pimpl8ad2nhq2mpa62kmk20"; }) + (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHost"; version = "7.0.9"; sha256 = "1jimxwgx5b311y1nxchyxg7yabkns6xlhx9sc0ha6nyv9m9bbn4y"; }) + (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.9"; sha256 = "1ml6kb8m6l64gvf2igh0cqbhgk51n1alqq1zn1hfcg695wm0ldxy"; }) + (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.9"; sha256 = "17ls7hkmmiagdfrvrh2w089pi24xjyg5w5xbxzwagv65aff0m50z"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.9"; sha256 = "02n69ki00djz3504sfz26akgyk2m0bqd3cmpl3553sh68igqaqnr"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHost"; version = "7.0.9"; sha256 = "1cwsl8abvb5bvkciyb29jv0cbc9yr5gbsv4d16q7sifhmhsj7ccj"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.9"; sha256 = "17vfj41qza3l6vslq5zb8d8wj9mn23d3z6g2flb8spdlvvrc23mn"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.9"; sha256 = "0lcx0zwdryw2jzv61jaqhslc3iglg2kc6lcxqs746vhwsqd40fcd"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.9"; sha256 = "1cmjc993gfrxijk4mkfjvhz2zs146353rhg3948gal2r6gdqnqba"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHost"; version = "7.0.9"; sha256 = "1pp2fgk7c0gdjqmdxddj0xw99akrqpw8hx1wsj4x6yx5f3p3hgay"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.9"; sha256 = "0p06lmfip9iz934sdvql4iir9ln6n59f0bwwg40i4fldvpfgrf6x"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.9"; sha256 = "1gzfypb84x6wr3rrywr5m1lv0a77wz56vzczb6c5kgad9dgjxnhz"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.9"; sha256 = "062xbr09j64bh8qmq77mhdpkd12b1xn8282xyvbxb9svpgy5q3in"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHost"; version = "7.0.9"; sha256 = "1mjvzpsbr8ikbd6417y81bwfn1fa5g4i1hb6yv3spxgl45rpqy7j"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.9"; sha256 = "1fpl01yq1ha0912sr5wj3rwg29q3jknhdaibw92ql8jdmbwp6z1b"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.9"; sha256 = "1zxcy12nbpfhc7a0p3vmi645p79gnqi7g4jjd9ap7rg57b56wd0b"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.9"; sha256 = "15qvi3x575976hs2xqrr0z68mi8v8cpal64sc669njlfprk0rsw5"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHost"; version = "7.0.9"; sha256 = "1zr89aaxz4qlqk0fi4xqwv138k54lskwm219iacpkjvci88brc82"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.9"; sha256 = "07dasy4d7bnirkb61mirnjvgvw7l2266wi4bb69vfiq0gzfzbzr7"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.9"; sha256 = "1iiba4mkvhcbf1lc9ydmafxzd75mfxw16d3q4nm3mravf88hga4j"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.9"; sha256 = "1pvrz3gd1p7ihnhfgl1hlhxy6f90238alw4v0gdwcfqbxlnnfvyh"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHost"; version = "7.0.9"; sha256 = "1ammp0lxban03aam1i5mhfqh0lpc31d9qpy08i1qzs8dpy0qy8kc"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.9"; sha256 = "1gl2j9n3h0fhx4dpcq3lwvcnx5xirdsjs4vq0jph01zfxsvn9rh5"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.9"; sha256 = "0zkdalcb30dpv0682cdf0ib5hyz8ic4yksp0kj1ybrgj6wmnhgr7"; }) + (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetAppHost"; version = "7.0.9"; sha256 = "0m0m7cja0s1sza51qz2300c8m4397ii5p5nppm9nvx1cqhhrxyq1"; }) + (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHost"; version = "7.0.9"; sha256 = "0ds54pnkn9x5nyngdkkymwkg8k0wy3g4jpb098h0hm8pv1pikvz8"; }) + (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.9"; sha256 = "0p20jsz3h5rssiq6wdf1i0m5fb52y3l2a7d83j5s3fllvf1hpv5m"; }) + (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.9"; sha256 = "0s6i21a8raazrw4cm4cs1jjxmpqmazrdjsa7xgk8j6r71galml9h"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.9"; sha256 = "1zxkvw32d099pjnkdza7jmfyxs8q9j46qhn3i0g2b01m7rla1nh4"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHost"; version = "7.0.9"; sha256 = "1ckx746lmb7m952c27hwrnf4ngzx5zk310rpgdk1v74n767n2l4q"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.9"; sha256 = "0jrh9507aa2m82i7b8i4ws7rx3fpbdlcfgr7qrv6046myipx847x"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.9"; sha256 = "1arfqghv2v13knh95k300vllx3rnb6rjfn8h0k5qyvgcha5dxjhs"; }) + (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost"; version = "7.0.9"; sha256 = "1qvr9xd8564bg6zq4qzgjvs1yy6cvpb6k6rbzcrffa0ql6mp5whh"; }) + (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHost"; version = "7.0.9"; sha256 = "1vnb8719i9j1x3nkl7hc6wrcc0w98xiwj2bhaxxwcxjhnqid2kjv"; }) + (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.9"; sha256 = "0d9czhxn25322iqmn5lhv9bwnznlcnr1rsvq52y6h3ks4lqbpx6d"; }) + (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.9"; sha256 = "1k3abndg0gxji09wwvnnbi4d8m3xk51yc2hir08vb064i28x0vwd"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Composite"; version = "7.0.9"; sha256 = "1phh09w8x6i4w15rjrgc74pljaqrrh4cc2g2vaymffx32nbd8b0p"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm"; version = "7.0.9"; sha256 = "10h6gmf8f600qir9b282d9c3890b1jjkqkiv2h1x899cibx3r4xz"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-arm64"; version = "7.0.9"; sha256 = "1199dqdkd9q568scprvbjpqqnjh7476vwykjj3wl242ljc9lzv07"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm"; version = "7.0.9"; sha256 = "06q2r3sfj2g7r564q1ys0ny11dg3qz6nifrby9phijs1pwcrsf7l"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "7.0.9"; sha256 = "1cw4cm7hr4x3niynbxc0z4lwn8lmd78x00vmb1kq52gvy24vnpvz"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Ref"; version = "7.0.9"; sha256 = "1jkv8a4apfjq7xjlw7mkap3h1znrmwb7kb175krslp9arldh9lc4"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm"; version = "7.0.9"; sha256 = "128gc9zy607ybhs58hc49lvwg1ddlmz3s6ak4qdibpjzxgaxd444"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm64"; version = "7.0.9"; sha256 = "0cgbxm4w10kxdjil8bl04d7py0gbccs5npaxnji0xi45977ajs32"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-musl-x64"; version = "7.0.9"; sha256 = "1vz7a4jk3l1xgihv812y198c0kwgbvl9fh21r32jm363dxrd2lrb"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-x64"; version = "7.0.9"; sha256 = "05vhl80v3m3jql0r72ba15gd1q4p1zzc709klzr3wv50zsjqpcgp"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-arm64"; version = "7.0.9"; sha256 = "1sn6qxc57fr5w9hh9x37v6z0pgwch8hhm5jzjchyflkdj9g60zc6"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-x64"; version = "7.0.9"; sha256 = "1kxjwrqbrkwyigyynlcl8lip10rmp029qikiifq5mm6j0ifyashr"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x64"; version = "7.0.9"; sha256 = "15h20x40x14grk7d9jacgi3kfrrlkszg5mxf5mcm0ycphp9cq4h7"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x86"; version = "7.0.9"; sha256 = "0x9zkfp3917wwaz20c1x6yp22iv4zj6778l38m9xbhynsjiak33m"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost"; version = "7.0.9"; sha256 = "025znra1878vbq7ywchjnc2jq1xsqnl3lkij5qacjh13a7zg8jcs"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHost"; version = "7.0.9"; sha256 = "1aaxyyg4f7apb5naj8fj72mh3jzh6v0rdmmgjrx467z471y0ccss"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.9"; sha256 = "11gj2kk8h4jpzgs0hyxa1pgsxw29y04q33c3n70bgsnjd6qrrprl"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.9"; sha256 = "0x58n7zl28973w2rbl7zjpwqvfq3vpr639zi78654sj0xjvqgd9f"; }) + (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.9"; sha256 = "08p00883gf1xinwp36axld678ab039raqj6gbyya0bh8wcybwksz"; }) + (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHost"; version = "7.0.9"; sha256 = "0ck7fqjp6xgnl399lhdp2lqz7zj2awx13dvxbyvql0iv2iyim986"; }) + (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.9"; sha256 = "1257h215aa87irl6pd64sa1600kmhhdv1l545jlv4x7hm0jqy63p"; }) + (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.9"; sha256 = "139ccsmjg8bgh7f318h921lv8g4nbhrycj0b3h7r8nxpg484inls"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm"; version = "7.0.9"; sha256 = "0jg2qnm2wj7bwzgdw656sbvn8radsg9r7nvbsk06w6kn053kpnzs"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm64"; version = "7.0.9"; sha256 = "1d633c6a8qyj5lsv6sjl1yb9j8pinkyv4m6qysffzz1swkzg2fn2"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-x64"; version = "7.0.9"; sha256 = "190n60bzlwsrrs1pr79va4qxbh0vj2zshjpw8wa3ypbfgw9nwfqr"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm"; version = "7.0.9"; sha256 = "0lg0hncd3f79z5rpldk3751q1k08dmn4nyzmg85ivci5xp2glmc4"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm64"; version = "7.0.9"; sha256 = "0ldwqi394i7dancwz46d1g5w7w2d681k0qbb21wnn0l8llairmsz"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-x64"; version = "7.0.9"; sha256 = "1s6g2agg0yjzxppzrq06zg53ik3nk40pv2py3r91vvm9as10l0la"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.osx-x64"; version = "7.0.9"; sha256 = "1a3yv46jkpakpd35qbnyx0rik1w90wmpbffd2sx919pl77l262kq"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.osx-arm64"; version = "7.0.9"; sha256 = "1p7rmjsjyginrx6ml3j0pmlvghp6rhi7p2myn6di1lawi4c245sp"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.DotNet.ILCompiler"; version = "7.0.9"; sha256 = "0hpbb13459izw1c5qw7lh1sy5fbnmg7n8977jci5far584zbf3im"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.DotNet.ILCompiler"; version = "7.0.9"; sha256 = "162pjnjp7k5y1xckl0l7h06yv2d65lczwspqfcyy1ix7whx8l5fm"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.DotNet.ILCompiler"; version = "7.0.9"; sha256 = "0kikz4mgymxdjpg3xwlzwb5b7qdq550qf4rknaik2qklwr2xv7xr"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.DotNet.ILCompiler"; version = "7.0.9"; sha256 = "0crf80nb3pw4wr83bvsx7f48i63f2l1b2zc18sny4xhqlvbcfick"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.DotNet.ILCompiler"; version = "7.0.9"; sha256 = "1370mahfnshdy63vlxbyqpbhmv5rby5azfbnyc72xb7zglf9aqcb"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.DotNet.ILCompiler"; version = "7.0.9"; sha256 = "1v3knzlfb6ik4306lhk5d37pfmpxczl0d4h2flvvzs61ap1jpgh6"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.DotNet.ILCompiler"; version = "7.0.9"; sha256 = "10a0gk0nqx3p9xjaxlwlx6hkvnjps2dyfih91nf10dw31w40q4h9"; }) ]; }; } diff --git a/nixpkgs/pkgs/development/compilers/dotnet/versions/8.0.nix b/nixpkgs/pkgs/development/compilers/dotnet/versions/8.0.nix index cf0d4f0b50cd..6ac6805f4205 100644 --- a/nixpkgs/pkgs/development/compilers/dotnet/versions/8.0.nix +++ b/nixpkgs/pkgs/development/compilers/dotnet/versions/8.0.nix @@ -3,176 +3,184 @@ # v8.0 (preview) { aspnetcore_8_0 = buildAspNetCore { - version = "8.0.0-preview.4.23260.4"; + version = "8.0.0-preview.5.23302.2"; srcs = { x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/bda9e867-46d3-416b-864f-5fb28658a8fd/c58375f59b0c0a9946a2be04617a7276/aspnetcore-runtime-8.0.0-preview.4.23260.4-linux-x64.tar.gz"; - sha512 = "fa2f95d90dafc11e083904e5795a0f9011ccd135a94e64149795a4404a900f0962d2d8cb187db2e5d32e0d8ca55387626e7201ac0c8127fba0cb499eb5a78c61"; + url = "https://download.visualstudio.microsoft.com/download/pr/b95d1c31-20bb-43ad-a6e3-7d14e955f759/003b3b17dbbc72ac8ee66c54aef85c04/aspnetcore-runtime-8.0.0-preview.5.23302.2-linux-x64.tar.gz"; + sha512 = "e9d570ceb193ab9a3e0b2ec3549bd1b67555ed4a333a6654ca8e4020bc38f42eadf3a690f996669c24af428222a6bf989b17b8cc0f7f276db928b2a40a7bc049"; }; aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/c9d4a334-d522-4439-a98a-0af0e7852621/9c3afe685d3e65a92d5c538afa211de7/aspnetcore-runtime-8.0.0-preview.4.23260.4-linux-arm64.tar.gz"; - sha512 = "1224d2ebe38122380db54b8fbf5ce95a7666b2a2062a1f5da40a769e0ec859640ced391ca6cfabe21f5c0aef4a7b1722b324f361e898c9c8c4207198b0b390b5"; + url = "https://download.visualstudio.microsoft.com/download/pr/3a1b9bf4-f6b5-47ed-b325-38e31af9f60d/dfa9cbb848ab710dc162b5cff1f26f2d/aspnetcore-runtime-8.0.0-preview.5.23302.2-linux-arm64.tar.gz"; + sha512 = "b54203fc664d4390441278e1917fec13466df174672622740509ca973811cfa178a851ac930c6d0cb03410bab8f630f4dd21609d2d8706f8b64bc23fb88a1836"; }; x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/6011ab96-f3be-414f-b13b-792aad1e383c/e78722ebae2ad81640e05286a30eb0c8/aspnetcore-runtime-8.0.0-preview.4.23260.4-osx-x64.tar.gz"; - sha512 = "98cd0208733397e622afc725873983f8f4ee41cd5a7d1987f973e71b640aaa0210d99b4a3d2acffe3e1f016c5816998d06289d3ae509f9280078bb716962851a"; + url = "https://download.visualstudio.microsoft.com/download/pr/c588c5f1-58e5-4cfe-b1a7-622458123783/42b3f9e884a7e995da49ad847ee8ffe6/aspnetcore-runtime-8.0.0-preview.5.23302.2-osx-x64.tar.gz"; + sha512 = "76da6d5bfaee0779aab41eaf2ca5759e2f0de919f89446883f6d8d46d4e1643fc9aed2b6095e00aa81ad05dc49c76ba2dc3ab09ae4fbccc7596b6977e5765ea2"; }; aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/5acf37f1-8232-4421-b4ae-41d635e2c8d1/3de8d329bb5d905e539f61a12d6091c9/aspnetcore-runtime-8.0.0-preview.4.23260.4-osx-arm64.tar.gz"; - sha512 = "c0c248789f312e7430850ce53400e041ed550f3ac6eb30ca16a83c344c6110fdd34e7e92bf3c06ca083a4b5b8f01ba37542ed9136458f0d3e41a6cfab22ea5b7"; + url = "https://download.visualstudio.microsoft.com/download/pr/e1fe9f3b-448e-4ed8-85f1-9ab58c51438d/823051b4bdaff6e19c7b78bfbaa1101f/aspnetcore-runtime-8.0.0-preview.5.23302.2-osx-arm64.tar.gz"; + sha512 = "ead98dd5d81efaf8b80f2c9223f55557a54c30f32118c778258ece80e6ff3d63cb55af85e4a1e463d88f356f54d790af35148b9025a9b86147bb6c4a3153b950"; }; }; }; runtime_8_0 = buildNetRuntime { - version = "8.0.0-preview.4.23259.5"; + version = "8.0.0-preview.5.23280.8"; srcs = { x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/7267fec0-ae12-4f40-9c3d-56da5fbf83e4/f64c2758980c1f908cbe089a6233bbe7/dotnet-runtime-8.0.0-preview.4.23259.5-linux-x64.tar.gz"; - sha512 = "02544cc1109f3d7e3fc2065b42c7f1ddd4777ffd8765456c8422b6c4b815abf60cac56d69058c2bff7c7c680d47bc6bcd3e00678db818387b6d09ce9b42f64d0"; + url = "https://download.visualstudio.microsoft.com/download/pr/bbdc7ec0-d87e-4b6b-bb3f-9dbe5db3078e/6cda9733bbedf8f4fb9e18829e301051/dotnet-runtime-8.0.0-preview.5.23280.8-linux-x64.tar.gz"; + sha512 = "0fa3d9bef5300533b4f266fc1983c7bc8eb55c6c9e8ddf86978a3adb911663a2069c9ed9e428f8d2361558a40edef5bfad6ef75ea2a728cf700a23cd38e7bbcc"; }; aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/8fac5d3e-dd32-4b29-a187-1887a912e185/d350aabe412cb33d9c2f2cafbf7c9bed/dotnet-runtime-8.0.0-preview.4.23259.5-linux-arm64.tar.gz"; - sha512 = "56beb8b362028eee4751081811b51a6f5a741736ca2de401a9a9178deaf0b0b8e3790e3175e953fe59140ad0b80700d0b75894d7326b996700d97ed667233394"; + url = "https://download.visualstudio.microsoft.com/download/pr/c5c38c9e-775f-48e1-93db-bdeaccf15876/be5113d9c28eaa96d6317bc6e38e9528/dotnet-runtime-8.0.0-preview.5.23280.8-linux-arm64.tar.gz"; + sha512 = "e53ea13c70b4d358b3a313b3edb6e160a3453d62eee76b13c9f4bbb01c79eaf5a1aea9afa3b565ae9adb74f3f674fb5db9135dfe6cbc1be03b34a8d6288b3965"; }; x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/636e676d-136c-4ad3-86c8-d4e86869832e/627c24b6a6753b0dee5af4a322f79155/dotnet-runtime-8.0.0-preview.4.23259.5-osx-x64.tar.gz"; - sha512 = "117af68c68caa2fba04cdb9ef5d4df230d315e30069a7dd378ae413db4dfcb789730f91b2d9898f78e525bdaae6b2b5bf521d5255abda96be35a73ca0cab3ded"; + url = "https://download.visualstudio.microsoft.com/download/pr/07613650-5f43-4792-b975-10fb0dd512b6/966e29340d90ab182f7e73925cf46d28/dotnet-runtime-8.0.0-preview.5.23280.8-osx-x64.tar.gz"; + sha512 = "190b316c22a833339d0af75b80699a50049cdb4ba0d3f0b0c5e2eed28900930ad7d6043f884ec01cc4406c620504f30cabaf3e3e30bb266e591eb34f22876ed1"; }; aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/c0d0406b-3995-403d-b25c-6ad764291eaa/7f1d366577de292f32623bdf88a5dacf/dotnet-runtime-8.0.0-preview.4.23259.5-osx-arm64.tar.gz"; - sha512 = "497dc9494c3aab67f60717598e6676650bde300170e1d78a14ffba955d76641b62852c64145b5358eca4a3c0b16dbb1dd8cf662c8b04df3202128d97e05ab8bd"; + url = "https://download.visualstudio.microsoft.com/download/pr/620a82a4-38d2-4967-9076-388de70cefaa/9ae3a2b33a9df5b312861995b0bcb08b/dotnet-runtime-8.0.0-preview.5.23280.8-osx-arm64.tar.gz"; + sha512 = "7c9a2086b05a8fa90b6077d3627d1afcddfd0977d3203759a66da3b0784cccdd88f1cc3c559b30f18d4892ee7cf9957cd0ec61eeb30a30532988a78146fa6bd0"; }; }; }; sdk_8_0 = buildNetSdk { - version = "8.0.100-preview.4.23260.5"; + version = "8.0.100-preview.5.23303.2"; srcs = { x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/ae0534ab-1c49-4055-ba2a-b8159c4f94d2/3a5945c949d2eb141f8ce52096fca13c/dotnet-sdk-8.0.100-preview.4.23260.5-linux-x64.tar.gz"; - sha512 = "1132220710d0e2deb97b58e0f439dfd86e965fc5347a2cc9aa3326ebdd98b21361fd6c019507a884927ee3b0053aa93bc0adfb67554ee5d9526c697ae9771551"; + url = "https://download.visualstudio.microsoft.com/download/pr/07b027f8-4ef8-48cb-becc-132652c625bb/441ef662adfe931013745df24d53b26d/dotnet-sdk-8.0.100-preview.5.23303.2-linux-x64.tar.gz"; + sha512 = "dfe2085a92854a5cee84cb7be9344368f5dcb6333c4ca215375a34b862f3a3ee66c953b9957f7b46f6cd710992ee038f6b4c2bd16464b4a216a1785868e86f7c"; }; aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/9de5d7d8-6062-4a61-b8bf-b1b61dd4b768/f23a336abc7548309acf01314ddc8904/dotnet-sdk-8.0.100-preview.4.23260.5-linux-arm64.tar.gz"; - sha512 = "47d9d1a67b58223b749fc1ca176c4dbd7049d7437f0717a61a6b22923b9a4c243e4d101c655bc1db817e281e0272ad452f4af6fc60c51d98493d85253e7476db"; + url = "https://download.visualstudio.microsoft.com/download/pr/93db1aea-6913-4cdc-8129-23e3e3de8dd1/4a942a2fbbb6ca6667c01ec414096ee0/dotnet-sdk-8.0.100-preview.5.23303.2-linux-arm64.tar.gz"; + sha512 = "13c6c559646c359ce07584328ef2e5cf5cb70371197deea9d31caee249c45b07ec1b874bcc5e3cb3b601b5ae280883cda555fd4cd2bf4a255d3be431574e46d6"; }; x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/78706993-4be4-46e0-8b14-48f295884a1b/39c2db8388ac84cdfe7e909bdde39384/dotnet-sdk-8.0.100-preview.4.23260.5-osx-x64.tar.gz"; - sha512 = "be1a7cdde31cf018d4d3b1d6c8305330bfc44b5c2e515c3213d162ab227d902edba16a8e422ab1d5441c712b2e50480d1e9240e6a26a51421c794840baafbe23"; + url = "https://download.visualstudio.microsoft.com/download/pr/47115ea7-dffc-436d-a0ac-e7445a932d12/b59ac26284ffa2162139c21052feaed9/dotnet-sdk-8.0.100-preview.5.23303.2-osx-x64.tar.gz"; + sha512 = "f4f42021b88abe1adae7aed539ad0b31ad524a7f2af79a974030bfc50aa8b2e9424fd5f38cb25f40277eb9b0a76f68255e7a97058bac49c30c20a72ddc59d0bf"; }; aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/2c6668f9-b531-427a-b3b5-5c9dc456c5b8/ef5ef0a8db2df07d12ef138e05fa2231/dotnet-sdk-8.0.100-preview.4.23260.5-osx-arm64.tar.gz"; - sha512 = "d66f6a9008b707119b37e9d2fa746aaa126f5f87452f25aa4902f3e50d08844218e11a55ecafa731c88eaf9b5aef21d08f828064d722446719ba37e69940a813"; + url = "https://download.visualstudio.microsoft.com/download/pr/078ed12c-82d5-486c-85b2-5f4ed34ddf34/a314372565e2e62d8de3497118a41888/dotnet-sdk-8.0.100-preview.5.23303.2-osx-arm64.tar.gz"; + sha512 = "2b3c95d41fca29b6c3812d47561b14d312d270b599e88a8c02918695ec285d171ab69233567c11820bdc16fe03dabd33d23fd6fd8a987ae36f33f87e59b89f27"; }; }; packages = { fetchNuGet }: [ - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm"; version = "8.0.0-preview.4.23260.4"; sha256 = "1d3iifh5cqdxf2gk45wna21z8amk7cml505daqkh1jgd50sp12n7"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "8.0.0-preview.4.23260.4"; sha256 = "0ziz2h08d75y4s8ifws6xr4y0jh74j5ccc4hhbzw19b57xdyvlbz"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64"; version = "8.0.0-preview.4.23260.4"; sha256 = "15yvjnij8ij2zbnwcq9cqbxjch1rgzyadi0a295axcjn0jpgg0y9"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64"; version = "8.0.0-preview.4.23260.4"; sha256 = "02x4k23r6g74fzm9fiiq1cmh1vdjv0i355pfnzfmnwyya1rim3j4"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "8.0.0-preview.4.23260.4"; sha256 = "1y88sr0yh8aypi34smxcy94djmvdkww0iq8cmk3sqccjxzyrfc8i"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "8.0.0-preview.4.23260.4"; sha256 = "0armm7x8v8cpa778xcq3iykwfhpnwcz21qhiaqrbc186hjgq1a2l"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm"; version = "8.0.0-preview.4.23260.4"; sha256 = "1wx5iq5yd8wrcnk8hsy7bknc9vi24fdnmywqj49rkmnr51ya41d0"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm64"; version = "8.0.0-preview.4.23260.4"; sha256 = "0z442kryiaiq191knpqgyg73ialnbm1nxi62pdsarfia7wxlgqxz"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "8.0.0-preview.4.23260.4"; sha256 = "1sshh549dsv1brv4qwbkp4g8sz4z4gq56y6dk7hysjx4qdlv159q"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x86"; version = "8.0.0-preview.4.23260.4"; sha256 = "0xsg8fjqply0ah5h6rwq871j3yr85ksvakyfm140pjf594cxwgxh"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Ref"; version = "8.0.0-preview.4.23260.4"; sha256 = "08x79vw0zw3153dpfrzm3fqfv36l7m55p7xlfqbn4c817fy10y52"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm"; version = "8.0.0-preview.4.23260.4"; sha256 = "0n9s4q8w7glxp3dwkzf549rk010pjnxj08hqz4m0jhk81vnm7nqf"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; version = "8.0.0-preview.4.23260.4"; sha256 = "07j59nbbakcw1npi6zk06fwbhp3rpd3n73drmyx9sk0j34mqrqs4"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm"; version = "8.0.0-preview.4.23259.5"; sha256 = "1f2xy2zqa8qjfd2dwgx1mcp0gpqvgzypppqk2sg3kbq879fis9ys"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "8.0.0-preview.4.23259.5"; sha256 = "14j6ahm3arfi78m6kjacid7vrw0shjyqh90cdxq3s02s8y6xb4vg"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm64"; version = "8.0.0-preview.4.23259.5"; sha256 = "0hncsby0gccfipsimgqp2n5ryzpd5940prds5rwvr8ncm2zzsikf"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-x64"; version = "8.0.0-preview.4.23259.5"; sha256 = "19pimns32v9gpx27gi53spzkr05r2d3cjg0cr1sydrp5xashvjws"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "8.0.0-preview.4.23259.5"; sha256 = "15wx6bdk38a75llqbc7hw4gizqhlhmyvdr2c0n4jb7vq54b8vh7f"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "8.0.0-preview.4.23259.5"; sha256 = "1dg12c904pkd5khm1lqqxzmh1w1hpvi5rb136wm2jh2gri32wmzy"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm"; version = "8.0.0-preview.4.23259.5"; sha256 = "0m08mv9jhpglgalxn37m9acwyrhxjr2kk0cavpjq1nd7imlnhday"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm64"; version = "8.0.0-preview.4.23259.5"; sha256 = "1jchikr4h1snzg3ai4022m5wj9bfallxc2jb9pq0p0zcyr7gy7ig"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "8.0.0-preview.4.23259.5"; sha256 = "1cc8fhh90gh5wra50ys4bqs39qzp6kb477hci8smbflg3dww4l40"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x86"; version = "8.0.0-preview.4.23259.5"; sha256 = "1kv5pzzxhj2cpysxz9jbliz6yz146v9bwr6n9l6vgrayavmg5k5z"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm"; version = "8.0.0-preview.4.23259.5"; sha256 = "196kph47z4k92bdnqfgki2p9l20rcgj7ls5j609ig845wc2z4az5"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "8.0.0-preview.4.23259.5"; sha256 = "0m238kwijlpx9y68w86svks7v90kxnr5ssfsaxn58iv2gll4fq2k"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64"; version = "8.0.0-preview.4.23259.5"; sha256 = "170r6xlc3jvvzn4vs1pihkwkw25vqx9940np30padm9r99yyp9bg"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64"; version = "8.0.0-preview.4.23259.5"; sha256 = "1l8qsmi66b1nxdkyz93d9kb4lm3xc55648qdl66ny6sj2h32palj"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "8.0.0-preview.4.23259.5"; sha256 = "06hs42ab2k7n7fmasg4nvxknwbv6ffslrd5c188jyfk1m23f12yx"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "8.0.0-preview.4.23259.5"; sha256 = "13y8n0hk78l4qkh2h8rwd80knn9jid42q634bsgqalmlg1vplzy0"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm"; version = "8.0.0-preview.4.23259.5"; sha256 = "1ggfqw34pbywpvgjj6qmzv3qbi4i62l4c9xqwi4460z1nv6kxnhi"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm64"; version = "8.0.0-preview.4.23259.5"; sha256 = "09jf4zahypzmy95h6asxzkrr7827vwdm83dwasydlzn9cal6xd1i"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "8.0.0-preview.4.23259.5"; sha256 = "1xgwxfqhdd0m8qh642bwazgridzrhzs220af6j2qkbyjgsvav4fr"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x86"; version = "8.0.0-preview.4.23259.5"; sha256 = "0wvkvaxr661xwr8ch03nlaiyn0ws2ly90yrv0qxvyz60z7b4mi8l"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetAppHost"; version = "8.0.0-preview.4.23259.5"; sha256 = "06wx5kk8zc2dbakwb6gfldxh57v2aiyvqnafr4clq14iw5pki4gc"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetHost"; version = "8.0.0-preview.4.23259.5"; sha256 = "13nlrvmjmwzfaf3r37pkdqsgvnby7hp2m7cwcx610vwsjaylyv43"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.0-preview.4.23259.5"; sha256 = "09nnvqdhgyzp8smaz62a8c9v2awzzc0xxirjs5qiz4f87q76xnc5"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostResolver"; version = "8.0.0-preview.4.23259.5"; sha256 = "0jvm3x2687z85acv6wc9pc2lgzifhz9n3kdsqbwj6djy6vjrhdii"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.0-preview.4.23259.5"; sha256 = "03p2khg9x35zf9ws905l61mca4d16i19j8d33bm5igmaizf8hvis"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHost"; version = "8.0.0-preview.4.23259.5"; sha256 = "04r92k2k7vlds0g6yb6slhmxwricl68gnfzddf7ajrvbz0skvpk8"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.0-preview.4.23259.5"; sha256 = "1v2dlm8vw9k020lv3lm4g360wkf0nhlxdv8dfix1vl6nd1qr3njw"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.0-preview.4.23259.5"; sha256 = "0qsrx612kjfpm6xd9a2l7a7qlfw9qmwrn6dnml622zb90nr37iab"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost"; version = "8.0.0-preview.4.23259.5"; sha256 = "0rlqs580jflv059w02bq2hmjdawshh376grwxr9vx1v76h38ll2n"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHost"; version = "8.0.0-preview.4.23259.5"; sha256 = "0dxrv5ypinjx37yazi4zzzp6a712vj4fjlgrzq3h2w6hwz1gf5ay"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.0-preview.4.23259.5"; sha256 = "0br19vniyn8z8g0b3njga1qzpkmsxk6zwdbafdjhw9pbd4vasx3l"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.0-preview.4.23259.5"; sha256 = "1vbdnjdab7bxm3w3dabzpga3mgvp6ck6q0iiby789d4nq75zxi8y"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.0-preview.4.23259.5"; sha256 = "00pfba98r89ny186rh2yjbx2nx40dx2payi13j8s63js7mim31an"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHost"; version = "8.0.0-preview.4.23259.5"; sha256 = "1r9finqxwsgqs7f1cvgfjg3ija9lmxnc7p4whaz5sy1lgzyh7wxv"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.0-preview.4.23259.5"; sha256 = "167m64vvl9649wcp55ggyy1y6q2rhcn2g7pa0zrarl2fg74hda15"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.0-preview.4.23259.5"; sha256 = "177kwd8qghvibxzhm9n4jmdxs4jdpav04gkc2jvqi4jmk9kfix1z"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.0-preview.4.23259.5"; sha256 = "1zgh1fz27bkz9gx813i87xawd9cpwwgch7npfr78csiv3ssqyxf0"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHost"; version = "8.0.0-preview.4.23259.5"; sha256 = "0ms5r3lih96haz02n5qxv971igah6b00v9wmx6j4m7kk81y8jwsl"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.0-preview.4.23259.5"; sha256 = "1qmxwx1c57ak6b9lb3rxglxxwm1bnlx2vlldwyq9pl5k5bp4ja77"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.0-preview.4.23259.5"; sha256 = "0qvl27k2vqsxbpwswpbmx8z8r874nsjprcwkn1imcbrnlgrsw1yd"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.0-preview.4.23259.5"; sha256 = "05ycd8gd7lacwh1v85m08zi820x144xzb9w4c5h2d46myhflx238"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHost"; version = "8.0.0-preview.4.23259.5"; sha256 = "11p76kv9p9ml44y62j4lrqr4y4p75syf86cqjsghsx48b6hqavj4"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.0-preview.4.23259.5"; sha256 = "08yhc2w6xmbx742f6n8w25iqa14a83khq80krqvr5wh6dfv0j2r3"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.0-preview.4.23259.5"; sha256 = "1vkczbgajyyys550s62ysqvxgp1w4dl80wyxxa3x57502qrg9dh5"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.0-preview.4.23259.5"; sha256 = "1hvdpxjlf9h199xiyzp61ys8m7bnbdmyqqzf59qgidlfk7f4bzn6"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHost"; version = "8.0.0-preview.4.23259.5"; sha256 = "1xb2d07p00paym06scq8wmg9bvnzfkcgjqjcjqlbbx4d6y2cghpx"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.0-preview.4.23259.5"; sha256 = "0xfg74za501byqzfsydagd59wbnknfrkj5p9l93f87vz147dpwgq"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.0-preview.4.23259.5"; sha256 = "0x3hh1k17449rbz010qn8jw9j1r9yl931wr2rk6aci5c9l9c0c89"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.0-preview.4.23259.5"; sha256 = "0vrkimk6dl096af256dm9qvhz0cawn37idmqhgyw0w5sq5vp340v"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHost"; version = "8.0.0-preview.4.23259.5"; sha256 = "1plbjhnh2sa2s9znwn5mkdic20ls755q81hh5zg5ma89q7c94c9n"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.0-preview.4.23259.5"; sha256 = "1jx6kx7f44zj346q6gvly2slwkw8fplfjzwfr6ryjvzb2llhs4ng"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.0-preview.4.23259.5"; sha256 = "0cqh3mfmbxnnsrlqaygrvd188nwzf7ik4a77ghv5i1s9jqlb1qyb"; }) - (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetAppHost"; version = "8.0.0-preview.4.23259.5"; sha256 = "0gna1y8ygdr7r9j8sknk8gpb5j1fhmwckp1cdj8d9n2g8c8r26fc"; }) - (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHost"; version = "8.0.0-preview.4.23259.5"; sha256 = "1d8654bzzbfmi0phgikrifwpdhh8xyymx2jwwxjhfww6nb3n3n2j"; }) - (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.0-preview.4.23259.5"; sha256 = "1qg9vzxw0wcn3j2m87rc5cllkfhqi089p8gxw4njic6dm5yxcr4h"; }) - (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.0-preview.4.23259.5"; sha256 = "1gz1gk2vjrz5cq65kipkv1k5y0x9q67qg4r26c6fb8s55l4f7wr5"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.0-preview.4.23259.5"; sha256 = "1czl0s1sm9wdcgscn0a9r9qb858yr0ak524vnghx81m87s4fl5l6"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHost"; version = "8.0.0-preview.4.23259.5"; sha256 = "01cwnnwhhr12yqjkjz2fpqhsh9zmdvn95nxrh4x4qzylfs3brw3w"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.0-preview.4.23259.5"; sha256 = "0n2m6j9izi668s0wa9pgjfafb7lka45sscgzspmzqc80syyr10lj"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.0-preview.4.23259.5"; sha256 = "1s5fnq3ybvjpw1ddbk3mxx9vzq3s4l0wk9qm6373742c0bnv4k32"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost"; version = "8.0.0-preview.4.23259.5"; sha256 = "1s9glkf7zbsdkc0zpvj7r0xkll2g0d6c2v8hw42qmpmb3lby9p0r"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHost"; version = "8.0.0-preview.4.23259.5"; sha256 = "166jxayw2vx1iysxn8v1ql13x52fw8h4ivrnvziyw43wdk76xjdc"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.0-preview.4.23259.5"; sha256 = "03x8cv14wsfizzj7fqmyqlbxdn1lkm49xq8jhyhfrrl936f27xd2"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.0-preview.4.23259.5"; sha256 = "11y01apmjqf18phnzdy5pj62r43m10w1dis8b5sxkz55vsyk1znh"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Composite"; version = "8.0.0-preview.4.23259.5"; sha256 = "1k221gbx12h9pqqb8zb45zjpy9rfffa7r9q4lx72zg47273rrpkj"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm"; version = "8.0.0-preview.4.23259.5"; sha256 = "0wyyp5f9vnbkqqb0xpxk2n6vcygd271hq6nbll3qrvg5ry9kn51l"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-arm64"; version = "8.0.0-preview.4.23259.5"; sha256 = "1vrcqhpjrmcl4rqpwb3mlgj6gpwwdfz615j4cv5yndwl6pcwi2c7"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm"; version = "8.0.0-preview.4.23259.5"; sha256 = "0rvwvrqiw0b7830i6vn4k6aj0x24bdbvsifg4f4bsd5gd7p8k7m9"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "8.0.0-preview.4.23259.5"; sha256 = "12zkl0nar5jw69r8ajliv9nbqng07md168708758g39yzvrs33vb"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Ref"; version = "8.0.0-preview.4.23259.5"; sha256 = "07p5svdm9i356m9z6qrsbmxjw57jxb5545hmyhipyhcy6yc935sw"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm"; version = "8.0.0-preview.4.23259.5"; sha256 = "1qxxhpccfgvdkkxj5h8mmglh13gpaxis846gq2clx12x5wnhyc8f"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm64"; version = "8.0.0-preview.4.23259.5"; sha256 = "017ypd8aa8m9zjv4irbi5p2334q6qfbnzn4wka9kq7m5r7psb3hh"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-musl-x64"; version = "8.0.0-preview.4.23259.5"; sha256 = "0c1zjb4i0qw7zphhnziawbyflq281jyhs16mmpcx30gi4pmdxm6r"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-x64"; version = "8.0.0-preview.4.23259.5"; sha256 = "08ax6gyqyj71f20yx54qk8nzwy45k2dnsq3rrnffiyzpwnxsaj0z"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-arm64"; version = "8.0.0-preview.4.23259.5"; sha256 = "14bsjrb344ryhilnkq31pl5jlswpdm1lv8xlpdz1xpdfz1d50qj3"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-x64"; version = "8.0.0-preview.4.23259.5"; sha256 = "0i1w14i70rmxbg16dvgr6scg7ad4sdq1cch1cxrs32r195k6mx1l"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x64"; version = "8.0.0-preview.4.23259.5"; sha256 = "1sga9fgq97zpcws2akpkpm5qsaq0sl9xnqh77jc1fadrlvg7dkin"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x86"; version = "8.0.0-preview.4.23259.5"; sha256 = "1088ss3d0n3afhyi6k89w002wb0h08z3vwxx53fgkdjx1ivqh9hs"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost"; version = "8.0.0-preview.4.23259.5"; sha256 = "017nda21914ycdvp6ahzqvdiphaghj3aim8ywnjgrlbzi94x5r03"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHost"; version = "8.0.0-preview.4.23259.5"; sha256 = "1apdjkjm0f9cg3y9l1xqcmyvnkvqhsf3wdzl31cv7324w4p5wk9r"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.0-preview.4.23259.5"; sha256 = "1xfh9j892q54n592q9pc5171xxn3p9mqk3c9l0p56wnn50gysvny"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.0-preview.4.23259.5"; sha256 = "0sz1b0bba36w7nwvbzdfbcpic0pqv5x283gjbdpk7pf1khz39f3v"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.0-preview.4.23259.5"; sha256 = "0pspdq0sny7kpfhc8knjsd8711vxnv0ipmg1dy1i2a0ynp5hgn3c"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHost"; version = "8.0.0-preview.4.23259.5"; sha256 = "1bac4a64fn80vdnl28qfpvqdkzd8n0k35hdpviwc076r0zib2idv"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.0-preview.4.23259.5"; sha256 = "1yv9fwrfykx2n3r2fkplbh344d7ja7d1hbygn2y4mhkkj2xxbpxp"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.0-preview.4.23259.5"; sha256 = "02wg6cd2vv1ibrlsdl8lkr69nn4h5jvkhdfd429rdkq4pyykm4qb"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.DotNet.ILCompiler"; version = "8.0.0-preview.4.23259.5"; sha256 = "1b2h8aqb5sda22cpg1547ayvndlzc84y0b7jg5yy2qd6vv7sx9if"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.DotNet.ILCompiler"; version = "8.0.0-preview.4.23259.5"; sha256 = "0m1kyayg1r8i6i1h9n6wran1f62m911vpqgp269gzda4ljb9h2vq"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.DotNet.ILCompiler"; version = "8.0.0-preview.4.23259.5"; sha256 = "0f5ml8b84c218fvfwqa1nmr731wvy4sh8minik6kyv0dg0z9kikr"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.DotNet.ILCompiler"; version = "8.0.0-preview.4.23259.5"; sha256 = "08lqhmz48szasi8klzwyssbbxvifaq6bgvnnvn5qxhpffl9kxsqj"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.DotNet.ILCompiler"; version = "8.0.0-preview.4.23259.5"; sha256 = "057zpvsd67gp8lw826ljc1iyx8gp4i9nxx89n94j5jsvhd33v8ii"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.DotNet.ILCompiler"; version = "8.0.0-preview.4.23259.5"; sha256 = "1nlii0clbwqs2gq72lhmf7hf52pia5mn996xvj2n9hsdj7h35ayd"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.DotNet.ILCompiler"; version = "8.0.0-preview.4.23259.5"; sha256 = "0rjrjcmns4875rq7qkfgbc4ybs8vcdsfscbkwsz426cgnxpsp8jk"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm"; version = "8.0.0-preview.5.23302.2"; sha256 = "1944ynm8cygvnffrrinpdk3xpa7dg4kzknhgjncrmydcz82chv6b"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "8.0.0-preview.5.23302.2"; sha256 = "0i1aifdn4zig99gj7v4113sg7igmd3n44p42nf91m0gpsxb79gmc"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64"; version = "8.0.0-preview.5.23302.2"; sha256 = "1dqmj5ahlrqn4vymmww6lsca4kpr8a3pihddh78rwxwhgd0dg683"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64"; version = "8.0.0-preview.5.23302.2"; sha256 = "168zcrhcyxgbmjk64ggg28c3j55fj1hrzdihprq4w5cncmi0qgsx"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "8.0.0-preview.5.23302.2"; sha256 = "061ss2psdhfmn4wh7i5cghk49bawa4qsw9qhlaiqg2815k2l3rr0"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "8.0.0-preview.5.23302.2"; sha256 = "1jm2gqmyk86qppbrr5sl9nf7wh7wgw832p3nmsd0l8by3dnz3cwb"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm"; version = "8.0.0-preview.5.23302.2"; sha256 = ""; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm64"; version = "8.0.0-preview.5.23302.2"; sha256 = "0pwbbjcwvim69maj8981fnf4v6kmd5ql47a3kadj7y7c1whcg41x"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "8.0.0-preview.5.23302.2"; sha256 = "1cnryxcs0dwzgxpfir3ibi762xrpjlzgxjsagzsmda5y766xkx8j"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x86"; version = "8.0.0-preview.5.23302.2"; sha256 = "1g66zixb90y1qnlayw8cjqdlj6n8s6d4b3y97bl7khrdpp0dn99y"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Ref"; version = "8.0.0-preview.5.23302.2"; sha256 = "132fc74r5cviz2057bqpwpk56nwjykh6flliavx2lr5dpcclk78j"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm"; version = "8.0.0-preview.5.23302.2"; sha256 = "0m0b5lppvsy5d76zj5gigmssiv5yl36xb84f7hn0wzn4idg0zc97"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; version = "8.0.0-preview.5.23302.2"; sha256 = "1g92v7axzr9lm2zl29hpcdjas9yvqpwjx8r5zs18w20iykjz7dhy"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm"; version = "8.0.0-preview.5.23280.8"; sha256 = "1p8xk4jsf82fnlfn92fg0mxmrvh6fhnv04vbvwl8p2145sqgzlr4"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "8.0.0-preview.5.23280.8"; sha256 = "154njplr7vqh3arfg4ygn05z8cwyl5fdr635n704h7p6585dw7xr"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm64"; version = "8.0.0-preview.5.23280.8"; sha256 = "0zika3kzi18xj37sy3vs99ypigqxrsvqykrrk8gjnls1dfrgk1gz"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-x64"; version = "8.0.0-preview.5.23280.8"; sha256 = "0c34kp92s522f3x2fwyvixrnpmm92wc3giw9da9f0ihga4kxs62q"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "8.0.0-preview.5.23280.8"; sha256 = "183lndsg4x0agi0c0jvk88dv122l4hm23fy8wy082iprbdjdfmvw"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "8.0.0-preview.5.23280.8"; sha256 = "0i5kl7gkhn7zpx70f3sygcmbz945f71d9ama9ikb0bd8w316657b"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm"; version = "8.0.0-preview.5.23280.8"; sha256 = ""; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm64"; version = "8.0.0-preview.5.23280.8"; sha256 = "0if1jkyj5zzsj3v8xramk18hl1arwv14yz17sylac0zi92fa1hy0"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "8.0.0-preview.5.23280.8"; sha256 = "15h588yv53panbc1gbslizqr4144g9a5bfjyqcksi5qdh70q0wcd"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x86"; version = "8.0.0-preview.5.23280.8"; sha256 = "16m670bnlql1fd3v9xkd72fh8gjdm5gdxflbg0bka17cdbsl6c3w"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm"; version = "8.0.0-preview.5.23280.8"; sha256 = "1p2cf5cbb6rqnsrb1ncaw2rxydg3f4ldcyv40h0d8lqypymlxkfb"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "8.0.0-preview.5.23280.8"; sha256 = "1lvk6ysazcb6jd51mpwqbwqj05w0rknbwr78wdwi1bfsqkj850n3"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64"; version = "8.0.0-preview.5.23280.8"; sha256 = "1101b3hl12v0p4hxciylb4sx817cjhwlkibyrvq0rcc59ph9r3bi"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64"; version = "8.0.0-preview.5.23280.8"; sha256 = "1cyvbp2shb8jcm9vcwn9ipgqsbqvwizny40yq12lqis6l2kjxdlk"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "8.0.0-preview.5.23280.8"; sha256 = "0qkmy9p708f31yyqmc4przb6vldraasilivpgp4ci55fgv7gqphm"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "8.0.0-preview.5.23280.8"; sha256 = "1ijv96vgfidkxcfx8yi2wyf63srld7gjb7d73h8rhimfa6sg3fa2"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm"; version = "8.0.0-preview.5.23280.8"; sha256 = ""; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm64"; version = "8.0.0-preview.5.23280.8"; sha256 = "0azd1hdhnirgqc3q06qrqjxhidk9zj9jqj8nlqddp06r2ql8jki8"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "8.0.0-preview.5.23280.8"; sha256 = "0293dg11f5kbsapp6mq5bkqfv2jpsrv7xw62qvmdn0ky3zfjxls6"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x86"; version = "8.0.0-preview.5.23280.8"; sha256 = "1d5z1facifk0q3yk7kx56y91a4gqs94q79myxlrc6zxs204gfywp"; }) + (fetchNuGet { pname = "Microsoft.NETCore.DotNetAppHost"; version = "8.0.0-preview.5.23280.8"; sha256 = "1r754iznmx0mz99qifxzm2asm76j8ykmjxiqxbj1y7i525s838im"; }) + (fetchNuGet { pname = "Microsoft.NETCore.DotNetHost"; version = "8.0.0-preview.5.23280.8"; sha256 = "1zgyav841b3nwdy2shlda26r1zizprzjrjj731c78drr1ihp0iga"; }) + (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.0-preview.5.23280.8"; sha256 = "0ri3fqfrgsl95ya08c99in1ig48m60p326i2dj929hfj9yikzwly"; }) + (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostResolver"; version = "8.0.0-preview.5.23280.8"; sha256 = "1k8vzl18g8hclpgd7sy2s5n3ixfnv17csp9akf7nis0y493s1gbf"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.0-preview.5.23280.8"; sha256 = "0am2i1k527887qqyipwzg0idss5sscah57zr3fvldfb3hxx5xm0m"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHost"; version = "8.0.0-preview.5.23280.8"; sha256 = "08ghakmfzjjn2s4b3s73zrr6g6akxfib4lx0740481abzq985d8x"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.0-preview.5.23280.8"; sha256 = "1n8ip4zc6sljknl3pk8gkw4rg8ajmnc3qcrivs0jlz79kr95vxds"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.0-preview.5.23280.8"; sha256 = "02n6psqh8y70v5hgw4k6w823dx4k8iqfp137i1xgxwjmijm7c0sm"; }) + (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost"; version = "8.0.0-preview.5.23280.8"; sha256 = "02wgvv0gvhgp1z41rmb4g5d4ld0b8anwahz7514c7bqlk3gvmhaq"; }) + (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHost"; version = "8.0.0-preview.5.23280.8"; sha256 = "17sm055xml4xfzdbr5cxi546n9gfacz1q5mjznzvng290ds9y34l"; }) + (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.0-preview.5.23280.8"; sha256 = "1xr3plgr99423psql74hs038lckf4h32ngphsa2748c6fhck7a43"; }) + (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.0-preview.5.23280.8"; sha256 = "08qg0b05wlg6q414fha9qgxsby00mm9qs5r4i2lr250klxih0vbm"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.0-preview.5.23280.8"; sha256 = "1562mlps4z2n3vjmvvw9q2chxay8chi45ggsfkj2bdg6fmsns8j1"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHost"; version = "8.0.0-preview.5.23280.8"; sha256 = "0rd3wxdmlcj9h5n2jlvmbk2y8qf93wy4f85z6amlzsqkk6pgjxqv"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.0-preview.5.23280.8"; sha256 = "1s02wwn7jc0a3fa73qyx3hxvzy3f93jknsmqs26frg5bwnj7sz79"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.0-preview.5.23280.8"; sha256 = "0abyyqcx4ix4xw7f67dhhdj2dpiddsfb6qpd4qqicfd481nvp6yd"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.0-preview.5.23280.8"; sha256 = "0bfgvcrhgzj78chnnapg5mzkzwyl5m3z5arrk4h31vg041xiamx1"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHost"; version = "8.0.0-preview.5.23280.8"; sha256 = "01dlxshx6riqj03j8cyy9w5i20dkzq2zbvh7av977d465rnyzvak"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.0-preview.5.23280.8"; sha256 = "1p1xvc15fvvqmmyc55xz3plmdc8j7zvr2z61ngzr6y82grm782j0"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.0-preview.5.23280.8"; sha256 = "0rva3jjas2fiz643fgc4nhl82l79gws92jwipp7dxq4p7psn93m2"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.0-preview.5.23280.8"; sha256 = "1xl6ydjv0icj6707a074qc8b2rh2gfq1pibplvnpr3j04hvi3wcc"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHost"; version = "8.0.0-preview.5.23280.8"; sha256 = "1swijczxc4g3rw49ki3ll3b5czm3pahx4x2893sdigrc54xhcyj3"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.0-preview.5.23280.8"; sha256 = "1gc9rvscpcbv7x2v5j3bvjsikldkzhwhz1d0zszq4ha0wccijqgf"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.0-preview.5.23280.8"; sha256 = "13g0vkws6acsbg9nq7y7jcmw0p21w8vsj5clw1r0qfwhbypx3gwy"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.0-preview.5.23280.8"; sha256 = "1nwg176lj8nahsqzffdn3wjirbzfqkjkh940i2jcv621318x1c5a"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHost"; version = "8.0.0-preview.5.23280.8"; sha256 = "1kwd8c67wnv2xl62vaa5fd6dpxdcf32f1bhmzqpk2j4xddjp81p6"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.0-preview.5.23280.8"; sha256 = "015xh2077rd65lmg2a21x8dd67mqbmxna3jn0fvkhjir31sga18y"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.0-preview.5.23280.8"; sha256 = "19694r5gr0l5ks1wa76ip9jk8kwbmppc4dk9jv5ppm82ya30mjdv"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.0-preview.5.23280.8"; sha256 = "0c1yrywmndbb0ckda5nl69xq2mpkmlsz146s55mbd9hil8s4sr9n"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHost"; version = "8.0.0-preview.5.23280.8"; sha256 = "0sx5kyvhgwm05djwqglccwjqnwjglwn3lbh81q8nhxx0m2l07x7w"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.0-preview.5.23280.8"; sha256 = "1xffjvnc64p23fm7alxsmgrga13xx20ixmllrgv0gnxqbbd192im"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.0-preview.5.23280.8"; sha256 = "1lw0dj4gpd668mw2aw880zq76yxnz3d74whx3dlz8r4119r6xp54"; }) + (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetAppHost"; version = "8.0.0-preview.5.23280.8"; sha256 = ""; }) + (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHost"; version = "8.0.0-preview.5.23280.8"; sha256 = ""; }) + (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.0-preview.5.23280.8"; sha256 = ""; }) + (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.0-preview.5.23280.8"; sha256 = ""; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.0-preview.5.23280.8"; sha256 = "11f12zcrj9hif65ai1ifmrxy6in49fyjvf30xh42iv8zzp4b2fp5"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHost"; version = "8.0.0-preview.5.23280.8"; sha256 = "1avarzaaidy2bw44cd3vr9yzjfc6d4i2h8ar8z57bj0y69c7sfbn"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.0-preview.5.23280.8"; sha256 = "0vblvvs0blsajd01zhzgyxpfdxjz96715r1saz7n66k2v3n22qrf"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.0-preview.5.23280.8"; sha256 = "054d7gqm4w1svfg6g90gnlzijmj4410q845a095lcs8arg5fdw7i"; }) + (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost"; version = "8.0.0-preview.5.23280.8"; sha256 = "00hk4zp2cccxzw87fw1qn59ikd6276wsi46qagg93lsrvm5i2b7p"; }) + (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHost"; version = "8.0.0-preview.5.23280.8"; sha256 = "10g16wjyl7dzx1al0jhxc65fywbqs84b0m2gzbcwp84q7fn2ap3k"; }) + (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.0-preview.5.23280.8"; sha256 = "0j4876vm3jws5ndyg5cp3qlrlpwgv31aijaxcw8nymrxhm0afiz9"; }) + (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.0-preview.5.23280.8"; sha256 = "1wz5pvisa22wd2gbd5s70mfnyvrj8jcaz7bi7i9lblsbac63vs34"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Composite"; version = "8.0.0-preview.5.23280.8"; sha256 = "18mrbqsawj4r2vw2z7w21vl5m27dwx8zbd4qj58yjv9fcw8lnjgz"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm"; version = "8.0.0-preview.5.23280.8"; sha256 = "1a5mil8zzp6jrjpjj15mcz2mahpj6h7mlqbqygzc7ky5gdzfx7kk"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-arm64"; version = "8.0.0-preview.5.23280.8"; sha256 = "0z73n85psbmcm2gd5fxicr0zb3nz8hgbs2g961zn9bf92668bp0s"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm"; version = "8.0.0-preview.5.23280.8"; sha256 = "1qz78a9d5jcfrkcb1ifid65p91h1xxkn32ssbmqprzzx394qnj56"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "8.0.0-preview.5.23280.8"; sha256 = "1d9nzpn3rg8rc3j1hgyafsqjnq5iigwf57waqa4v07vhwv94l2gr"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Ref"; version = "8.0.0-preview.5.23280.8"; sha256 = "15zwam01k50f2hcy8aj3kj9wvgdvpccvmkin8lq4a5c1hll8867m"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm"; version = "8.0.0-preview.5.23280.8"; sha256 = "1fswvdzw646lim6z1sj5nf4ccmzv10b6kdywrmxfdbdbc5q31672"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm64"; version = "8.0.0-preview.5.23280.8"; sha256 = "09vd8j32qhflwy2s0xb8mrkidbq1bvkfysb59js7wbjn6fbaqi55"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-musl-x64"; version = "8.0.0-preview.5.23280.8"; sha256 = "1sq4rvvwd616vsdw8slpg06lkkdp0cb55g67zz0p8bbiqfzclwc3"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-x64"; version = "8.0.0-preview.5.23280.8"; sha256 = "0pgsh0qg2hb99hjcxfkvj238g81w16lh3dxl1qvcw9ldi87raskm"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-arm64"; version = "8.0.0-preview.5.23280.8"; sha256 = "1frc2m51qk7ymmygg5dqwp2jfnj0x0qsflmasvwx69w21ncsjp9n"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-x64"; version = "8.0.0-preview.5.23280.8"; sha256 = "0zps8ackfk4g07395ywybcr2bsfcfz0asc3ps50hwv8mrfxavfcp"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x64"; version = "8.0.0-preview.5.23280.8"; sha256 = "16jack7jcy4vg05949l5j2ykc5g12r2nbcgkrkim094a6cdfnnci"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x86"; version = "8.0.0-preview.5.23280.8"; sha256 = "0r9xl99m3h88l8xmsh4lb4wmf5n9kbdhv2q98rl6r6ggdcb1rwz1"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost"; version = "8.0.0-preview.5.23280.8"; sha256 = "0v7n2a035ipylqadcm9xnxsnx1lbiwip6m4mwl2gl5b7ibx9n509"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHost"; version = "8.0.0-preview.5.23280.8"; sha256 = "0h176skavpcqfa68l4vk3yy9axq24sc661azcb7i6cpjb0scdcb6"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.0-preview.5.23280.8"; sha256 = "06lbqcig7grq3g93a754q3bnlrmg4mqr3wi6xxhm0x7k0sxa71hk"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.0-preview.5.23280.8"; sha256 = "0b68cjjpja582xfwm3dk722sjj88ri5vyawvgrn8lkdkarpcmjna"; }) + (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.0-preview.5.23280.8"; sha256 = "1l4pmphc50kciz40w9pggmjsmh3bzfbla76fp5p0ppms0xafkr1y"; }) + (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHost"; version = "8.0.0-preview.5.23280.8"; sha256 = "13iavci8n0ahsl5k1xasribk93gmkxd3s67xgagasc1gzpkxm8q2"; }) + (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.0-preview.5.23280.8"; sha256 = "16aa6sgblm4l1fzsgllmxsxn57qnx430z12n6hm3m08qrlmcpyd9"; }) + (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.0-preview.5.23280.8"; sha256 = "05k0h0p6yc02np4m7jdhmc8c2105b22wdldbsklx4rl3jqy7m6p3"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm"; version = "8.0.0-preview.5.23280.8"; sha256 = "1yvaiqblqmsrydbf9gr18rp6d9rqqpzahzxhc62hixfh59l55mi7"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm64"; version = "8.0.0-preview.5.23280.8"; sha256 = "06i72xhd0ji755wj8bczv8x8mynyf2kxhx7ysn70crrkk0b7921h"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-x64"; version = "8.0.0-preview.5.23280.8"; sha256 = "02ks9j1mybb3f34mjky09nw22la6nhfmkjj5g5gczspqfcc6a2dw"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm"; version = "8.0.0-preview.5.23280.8"; sha256 = "15plhhljfyaj0cdpsqyq3n0q747p90nvl5kwj6amccadkcy7ahnk"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm64"; version = "8.0.0-preview.5.23280.8"; sha256 = "09vvjm9a7nh6bd8ldf1f0vz1iafp4v77q5d78382hfqan8r505id"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-x64"; version = "8.0.0-preview.5.23280.8"; sha256 = "1p21siacj11nbba5czcg4ppk7wny2p3rc2wxg30vs1jj45qvf82c"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.osx-x64"; version = "8.0.0-preview.5.23280.8"; sha256 = "1h6xrjvgn0bl615bwmr5l5gpw4qxhbzsqd7sb57m8597cjqc8m35"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.osx-arm64"; version = "8.0.0-preview.5.23280.8"; sha256 = "0fymmvixx0wh1qa5hrazfr27n0hr3dj1gppipy3mslm325m1zdf4"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.DotNet.ILCompiler"; version = "8.0.0-preview.5.23280.8"; sha256 = "0z6cny0jzbwd7skgc3lji00j1z061j4yacrjbhysnq5z5g563r75"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.DotNet.ILCompiler"; version = "8.0.0-preview.5.23280.8"; sha256 = "0f72algnr7kknbvw1b17vlw6wvkghw8v4n9fji7ppwbrd8g8i8b0"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.DotNet.ILCompiler"; version = "8.0.0-preview.5.23280.8"; sha256 = "1bcps96s8n5iwshxjqwbdvhhr5nkh1f1hn4k79gw1q8ic1c4giq9"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.DotNet.ILCompiler"; version = "8.0.0-preview.5.23280.8"; sha256 = "1zixz057s0c282v404l8v3da2dag1cwk79phfv5ps83n4mypzpfb"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.DotNet.ILCompiler"; version = "8.0.0-preview.5.23280.8"; sha256 = "12wia5n3kakcdqgj9r3hb9qxbrlcrpdfvmy0yml23cxhqsy8ny92"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.DotNet.ILCompiler"; version = "8.0.0-preview.5.23280.8"; sha256 = "0r95iysm08cplqwxh7mm81ji13414nd0shgi7jskspqd2cjmcknk"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.DotNet.ILCompiler"; version = "8.0.0-preview.5.23280.8"; sha256 = "1w1jzv64d4ijr6g3sb9w5im11jxxssyqwzas6hycvzvjyxb8f3q9"; }) ]; }; } diff --git a/nixpkgs/pkgs/development/compilers/dtc/default.nix b/nixpkgs/pkgs/development/compilers/dtc/default.nix index 5ec3d6ec36cc..d9013895becc 100644 --- a/nixpkgs/pkgs/development/compilers/dtc/default.nix +++ b/nixpkgs/pkgs/development/compilers/dtc/default.nix @@ -83,12 +83,18 @@ stdenv.mkDerivation (finalAttrs: { mesonAutoFeatures = "auto"; mesonFlags = [ (lib.mesonBool "static-build" stdenv.hostPlatform.isStatic) - (lib.mesonBool "tests" finalAttrs.doCheck) + (lib.mesonBool "tests" finalAttrs.finalPackage.doCheck) ]; - # Checks are broken on aarch64 darwin - # https://github.com/NixOS/nixpkgs/pull/118700#issuecomment-885892436 - doCheck = !stdenv.isDarwin; + doCheck = + # Checks are broken on aarch64 darwin + # https://github.com/NixOS/nixpkgs/pull/118700#issuecomment-885892436 + !stdenv.isDarwin && + + # we must explicitly disable this here so that mesonFlags receives + # `-Dtests=disabled`; without it meson will attempt to run + # hostPlatform binaries during the configurePhase. + (with stdenv; buildPlatform.canExecute hostPlatform); meta = with lib; { description = "Device Tree Compiler"; diff --git a/nixpkgs/pkgs/development/compilers/edk2/default.nix b/nixpkgs/pkgs/development/compilers/edk2/default.nix index 4660d563c6b4..3a039014db84 100644 --- a/nixpkgs/pkgs/development/compilers/edk2/default.nix +++ b/nixpkgs/pkgs/development/compilers/edk2/default.nix @@ -5,7 +5,6 @@ , libuuid , python3 , bc -, llvmPackages_9 , lib , buildPackages }: @@ -24,25 +23,20 @@ else if stdenv.isAarch64 then else throw "Unsupported architecture"; -buildStdenv = if stdenv.isDarwin then - llvmPackages_9.stdenv -else - stdenv; - buildType = if stdenv.isDarwin then "CLANGPDB" else "GCC5"; -edk2 = buildStdenv.mkDerivation { +edk2 = stdenv.mkDerivation { pname = "edk2"; - version = "202302"; + version = "202305"; patches = [ # pass targetPrefix as an env var (fetchpatch { url = "https://src.fedoraproject.org/rpms/edk2/raw/08f2354cd280b4ce5a7888aa85cf520e042955c3/f/0021-Tweak-the-tools_def-to-support-cross-compiling.patch"; - sha256 = "sha256-E1/fiFNVx0aB1kOej2DJ2DlBIs9tAAcxoedym2Zhjxw="; + hash = "sha256-E1/fiFNVx0aB1kOej2DJ2DlBIs9tAAcxoedym2Zhjxw="; }) ]; @@ -52,7 +46,7 @@ edk2 = buildStdenv.mkDerivation { repo = "edk2"; rev = "edk2-stable${edk2.version}"; fetchSubmodules = true; - sha256 = "sha256-KZ5bTdaStO2M1hLPx9LsUSMl9NEiZeYMmFiShxCJqJM="; + hash = "sha256-htOvV43Hw5K05g0SF3po69HncLyma3BtgpqYSdzRG4s="; }; nativeBuildInputs = [ pythonEnv ]; @@ -62,8 +56,7 @@ edk2 = buildStdenv.mkDerivation { # trick taken from https://src.fedoraproject.org/rpms/edk2/blob/08f2354cd280b4ce5a7888aa85cf520e042955c3/f/edk2.spec#_319 ${"GCC5_${targetArch}_PREFIX"}=stdenv.cc.targetPrefix; - makeFlags = [ "-C BaseTools" ] - ++ lib.optionals (stdenv.cc.isClang) [ "CXX=llvm BUILD_AR=ar BUILD_CC=clang BUILD_CXX=clang++ BUILD_AS=clang BUILD_LD=ld" ]; + makeFlags = [ "-C BaseTools" ]; env.NIX_CFLAGS_COMPILE = "-Wno-return-type" + lib.optionalString (stdenv.cc.isGNU) " -Wno-error=stringop-truncation"; @@ -89,7 +82,7 @@ edk2 = buildStdenv.mkDerivation { }; passthru = { - mkDerivation = projectDscPath: attrsOrFun: buildStdenv.mkDerivation (finalAttrs: + mkDerivation = projectDscPath: attrsOrFun: stdenv.mkDerivation (finalAttrs: let attrs = lib.toFunction attrsOrFun finalAttrs; in diff --git a/nixpkgs/pkgs/development/compilers/emscripten/0001-emulate-clang-sysroot-include-logic.patch b/nixpkgs/pkgs/development/compilers/emscripten/0001-emulate-clang-sysroot-include-logic.patch index 9cb3ca2bf9f6..6a57e423bd72 100644 --- a/nixpkgs/pkgs/development/compilers/emscripten/0001-emulate-clang-sysroot-include-logic.patch +++ b/nixpkgs/pkgs/development/compilers/emscripten/0001-emulate-clang-sysroot-include-logic.patch @@ -1,4 +1,4 @@ -From 67f54fde2b1683aae3800f7a86a4e507c1125be8 Mon Sep 17 00:00:00 2001 +From 4bbbb640934aa653bcfec0335798b77a8935b815 Mon Sep 17 00:00:00 2001 From: Yureka <yuka@yuka.dev> Date: Sat, 7 Aug 2021 09:16:46 +0200 Subject: [PATCH] emulate clang 'sysroot + /include' logic @@ -20,23 +20,23 @@ but it doesn't appear to work 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/emcc.py b/emcc.py -index 999314afc..0e23c066c 100755 +index ba8d1b556..7d89644c5 100755 --- a/emcc.py +++ b/emcc.py -@@ -759,7 +759,12 @@ def emsdk_ldflags(user_args): +@@ -883,7 +883,12 @@ def parse_s_args(args): def emsdk_cflags(user_args): -- cflags = ['--sysroot=' + shared.Cache.get_sysroot(absolute=True)] +- cflags = ['--sysroot=' + cache.get_sysroot(absolute=True)] + cflags = [ -+ '--sysroot=' + shared.Cache.get_sysroot(absolute=True), ++ '--sysroot=' + cache.get_sysroot(absolute=True), + '-resource-dir=@resourceDir@', -+ '-idirafter' + shared.Cache.get_sysroot(absolute=True) + os.path.join('/include'), ++ '-idirafter' + cache.get_sysroot(absolute=True) + os.path.join('/include'), + '-iwithsysroot' + os.path.join('/include','c++','v1') + ] def array_contains_any_of(hay, needles): for n in needles: -- -2.32.0 +2.40.0 diff --git a/nixpkgs/pkgs/development/compilers/emscripten/default.nix b/nixpkgs/pkgs/development/compilers/emscripten/default.nix index 02b1f6f03b2a..be7461582303 100644 --- a/nixpkgs/pkgs/development/compilers/emscripten/default.nix +++ b/nixpkgs/pkgs/development/compilers/emscripten/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub, python3, nodejs, closurecompiler , jre, binaryen , llvmPackages -, symlinkJoin, makeWrapper, substituteAll, fetchpatch +, symlinkJoin, makeWrapper, substituteAll , buildNpmPackage , emscripten }: stdenv.mkDerivation rec { pname = "emscripten"; - version = "3.1.24"; + version = "3.1.42"; llvmEnv = symlinkJoin { name = "emscripten-llvm-${version}"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { name = "emscripten-node-modules-${version}"; inherit pname version src; - npmDepsHash = "sha256-ejuHR2BpAUStWjuvQuGE6ko4byF4GBl6FJBshxlknQk="; + npmDepsHash = "sha256-QlKm6UvPUa7+VJ9ZvXdxYZzK+U96Ju/oAHPhZ/hyv/I="; dontBuild = true; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "emscripten-core"; repo = "emscripten"; - sha256 = "sha256-1jW6ThxK6dThOO90l4Mc5yehVF3tI4HWipBWZAOztrk="; + hash = "sha256-elp/LPd9SAuVZy42Wkgb6pCbPi2GnETTfyRJqU92S0E="; rev = version; }; @@ -42,17 +42,7 @@ stdenv.mkDerivation rec { patches = [ (substituteAll { src = ./0001-emulate-clang-sysroot-include-logic.patch; - resourceDir = "${llvmEnv}/lib/clang/${llvmPackages.release_version}/"; - }) - # https://github.com/emscripten-core/emscripten/pull/18219 - (fetchpatch { - url = "https://github.com/emscripten-core/emscripten/commit/afbc14950f021513c59cbeaced8807ef8253530a.patch"; - sha256 = "sha256-+gJNTQJng9rWcGN3GAcMBB0YopKPnRp/r8CN9RSTClU="; - }) - # https://github.com/emscripten-core/emscripten/pull/18220 - (fetchpatch { - url = "https://github.com/emscripten-core/emscripten/commit/852982318f9fb692ba1dd1173f62e1eb21ae61ca.patch"; - sha256 = "sha256-hmIOtpRx3PD3sDAahUcreSydydqcdSqArYvyLGgUgd8="; + resourceDir = "${llvmEnv}/lib/clang/16/"; }) ]; @@ -68,9 +58,6 @@ stdenv.mkDerivation rec { sed -i '/^def/!s/root_is_writable()/True/' tools/config.py sed -i "/^def check_sanity/a\\ return" tools/shared.py - # required for wasm2c - ln -s ${nodeModules} node_modules - echo "EMSCRIPTEN_ROOT = '$out/share/emscripten'" > .emscripten echo "LLVM_ROOT = '${llvmEnv}/bin'" >> .emscripten echo "NODE_JS = '${nodejs}/bin/node'" >> .emscripten @@ -108,17 +95,17 @@ stdenv.mkDerivation rec { # precompile libc (etc.) in all variants: pushd $TMPDIR - echo 'int __main_argc_argv() { return 42; }' >test.c + echo 'int __main_argc_argv( int a, int b ) { return 42; }' >test.c for LTO in -flto ""; do - # wasm2c doesn't work with PIC - $out/bin/emcc -s WASM2C -s STANDALONE_WASM $LTO test.c - for BIND in "" "--bind"; do - for MT in "" "-s USE_PTHREADS"; do - for RELOCATABLE in "" "-s RELOCATABLE"; do - $out/bin/emcc $RELOCATABLE $BIND $MT $LTO test.c - done - done + # starting with emscripten 3.1.32+, + # if pthreads and relocatable are both used, + # _emscripten_thread_exit_joinable must be exported + # (see https://github.com/emscripten-core/emscripten/pull/18376) + # TODO: get library cache to build with both enabled and function exported + $out/bin/emcc $LTO $BIND test.c + $out/bin/emcc $LTO $BIND -s RELOCATABLE test.c + $out/bin/emcc $LTO $BIND -s USE_PTHREADS test.c done done popd diff --git a/nixpkgs/pkgs/development/compilers/erg/default.nix b/nixpkgs/pkgs/development/compilers/erg/default.nix index 7b0292153b1c..8706c05febcd 100644 --- a/nixpkgs/pkgs/development/compilers/erg/default.nix +++ b/nixpkgs/pkgs/development/compilers/erg/default.nix @@ -4,20 +4,21 @@ , makeWrapper , python3 , which +, stdenv }: rustPlatform.buildRustPackage rec { pname = "erg"; - version = "0.6.13"; + version = "0.6.17"; src = fetchFromGitHub { owner = "erg-lang"; repo = "erg"; rev = "v${version}"; - hash = "sha256-XwQKtorE1HGRRCCtxQBVbl6O6aTs5Z2/W9n2Am40e8Q="; + hash = "sha256-KHfKV0i3jYwzD/PQ0TSOlxjUnc08pk0yKrLQlg5eQvg="; }; - cargoHash = "sha256-I4hQ78RTkCDKpq7HBNJsKqCiFL9004XvWdwtRdTQQkE="; + cargoHash = "sha256-PD1C3IsupjyQndD971zbfHYxizOQd/t770u48o/aGmk="; nativeBuildInputs = [ makeWrapper @@ -29,6 +30,7 @@ rustPlatform.buildRustPackage rec { env = { BUILD_DATE = "1970/01/01 00:00:00"; + CASE_SENSITIVE = lib.boolToString (!stdenv.isDarwin); GIT_HASH_SHORT = src.rev; }; diff --git a/nixpkgs/pkgs/development/compilers/fasmg/default.nix b/nixpkgs/pkgs/development/compilers/fasmg/default.nix index 611a2bdb8f14..ec915bcb04bc 100644 --- a/nixpkgs/pkgs/development/compilers/fasmg/default.nix +++ b/nixpkgs/pkgs/development/compilers/fasmg/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { bin = "source/macos/fasmg"; asm = "source/macos/fasmg.asm"; }; - }.${system} or (throw "Unsopported system: ${system}"); + }.${system} or (throw "Unsupported system: ${system}"); in '' chmod +x ${path.bin} diff --git a/nixpkgs/pkgs/development/compilers/flix/default.nix b/nixpkgs/pkgs/development/compilers/flix/default.nix index eda130f1f33d..667dbaf109b9 100644 --- a/nixpkgs/pkgs/development/compilers/flix/default.nix +++ b/nixpkgs/pkgs/development/compilers/flix/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation rec { pname = "flix"; - version = "0.37.0"; + version = "0.39.0"; src = fetchurl { url = "https://github.com/flix/flix/releases/download/v${version}/flix.jar"; - sha256 = "sha256-7Hny8Y74Ihptto4LkvANStUAwBQBrNlwjQ5PqBwsbW0="; + sha256 = "sha256-kIH5vv/7pKgfAL1BaWYH6PSyEaKVONcccUczsudyfO4="; }; dontUnpack = true; diff --git a/nixpkgs/pkgs/development/compilers/flutter/default.nix b/nixpkgs/pkgs/development/compilers/flutter/default.nix index 0f57919a9508..95758fb56ab0 100644 --- a/nixpkgs/pkgs/development/compilers/flutter/default.nix +++ b/nixpkgs/pkgs/development/compilers/flutter/default.nix @@ -5,7 +5,7 @@ let getPatches = dir: let files = builtins.attrNames (builtins.readDir dir); in map (f: dir + ("/" + f)) files; - mkFlutter = { version, engineVersion, dartVersion, hash, dartHash, patches }: + mkFlutter = { version, engineVersion, dartVersion, flutterHash, dartHash, patches }: let args = { inherit version engineVersion patches; @@ -21,12 +21,34 @@ let url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${dartVersion}/sdk/dartsdk-linux-arm64-release.zip"; sha256 = dartHash.aarch64-linux; }; + "${dartVersion}-x86_64-darwin" = fetchzip { + url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${dartVersion}/sdk/dartsdk-macos-x64-release.zip"; + sha256 = dartHash.x86_64-darwin; + }; + "${dartVersion}-aarch64-darwin" = fetchzip { + url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${dartVersion}/sdk/dartsdk-macos-arm64-release.zip"; + sha256 = dartHash.aarch64-darwin; + }; }; }; - src = fetchzip { - url = "https://storage.googleapis.com/flutter_infra_release/releases/stable/linux/flutter_linux_${version}-stable.tar.xz"; - sha256 = hash; - }; + src = { + x86_64-linux = fetchzip { + url = "https://storage.googleapis.com/flutter_infra_release/releases/stable/linux/flutter_linux_${version}-stable.tar.xz"; + sha256 = flutterHash.x86_64-linux; + }; + aarch64-linux = fetchzip { + url = "https://storage.googleapis.com/flutter_infra_release/releases/stable/linux/flutter_linux_${version}-stable.tar.xz"; + sha256 = flutterHash.aarch64-linux; + }; + x86_64-darwin = fetchzip { + url = "https://storage.googleapis.com/flutter_infra_release/releases/stable/macos/flutter_macos_${version}-stable.zip"; + sha256 = flutterHash.x86_64-darwin; + }; + aarch64-darwin = fetchzip { + url = "https://storage.googleapis.com/flutter_infra_release/releases/stable/macos/flutter_macos_arm64_${version}-stable.zip"; + sha256 = flutterHash.aarch64-darwin; + }; + }.${stdenv.hostPlatform.system}; }; in (mkCustomFlutter args).overrideAttrs (prev: next: { @@ -47,19 +69,25 @@ let }; }); - flutter2Patches = getPatches ./patches/flutter2; flutter3Patches = getPatches ./patches/flutter3; in { inherit wrapFlutter; stable = mkFlutter { - version = "3.10.0"; - engineVersion = "d44b5a94c976fbb65815374f61ab5392a220b084"; - dartVersion = "3.0.0"; - hash = "sha256-3cRVPNrph9QUUnAdQhd5TOp2i1zFRxJ+OhqxXrJ+ncU="; + version = "3.10.5"; + engineVersion = "45f6e009110df4f34ec2cf99f63cf73b71b7a420"; + dartVersion = "3.0.5"; dartHash = { - x86_64-linux = "sha256-AhvAt2c0URzL+MSIXlwbkuWNuhKbWvUpoyiYf1vXfcc="; - aarch64-linux = "sha256-bo4kZtNpj91JaCW8+GD4bQ60oOWQ7daj4C7cAHwLMtw="; + x86_64-linux = "sha256-UVVwPFk0qsKNR4JZMOGSGh1T482MN/8Xp4MZ3SA3C28="; + aarch64-linux = "sha256-phzaFfrv7qbZOOhPq92q39R6mr5vFeBqEmYDU7e7lZQ="; + x86_64-darwin = "sha256-4gJ659bNzs2lfI1LRwFACgu/ttkj+3xIrqLijju+CaI="; + aarch64-darwin = "sha256-RJt+muq5IrcAhVLYEgdbVygcY1oB7tnVCN+iqktC+6c="; + }; + flutterHash = rec { + x86_64-linux = "sha256-lLppUQzu+fl81TMYSPD+HA83BqeIg7bXpURyo49NPwI="; + aarch64-linux = x86_64-linux; + x86_64-darwin = "sha256-1ZC5aCoGVBCeTSsu/ZEl1v53lLnzulx8Ya6YXvo4yIY="; + aarch64-darwin = "sha256-TCMempLjO47IbP5MAZVHlXXvNaURGo+EbaL0K8e27wU="; }; patches = flutter3Patches; }; @@ -68,23 +96,18 @@ in version = "3.7.12"; engineVersion = "1a65d409c7a1438a34d21b60bf30a6fd5db59314"; dartVersion = "2.19.6"; - hash = "sha256-5ExDBQXIpoZ5NwS66seY3m9/V8xDiyq/RdzldAyHdEE="; dartHash = { x86_64-linux = "sha256-4ezRuwhQHVCxZg5WbzU/tBUDvZVpfCo6coDE4K0UzXo="; aarch64-linux = "sha256-pYmClIqOo0sRPOkrcF4xQbo0mHlrr1TkhT1fnNyYNck="; + x86_64-darwin = "sha256-tuIQhIOX2ub0u99CW/l7nCya9YVNokCZNgbVFqO4ils="; + aarch64-darwin = "sha256-Oe8/0ygDN3xf5/2I3N/OBzF0bps7Mg0K2zJKj+E9Nak="; }; - patches = flutter3Patches; - }; - - v2 = mkFlutter { - version = "2.10.5"; - engineVersion = "57d3bac3dd5cb5b0e464ab70e7bc8a0d8cf083ab"; - dartVersion = "2.16.2"; - hash = "sha256-MxaWvlcCfXN8gsC116UMzqb4LgixHL3YjrGWy7WYgW4="; - dartHash = { - x86_64-linux = "sha256-vxKxysg6e3Qxtlp4dLxOZaBtgHGtl7XYd73zFZd9yJc="; - aarch64-linux = "sha256-ZfpR6fj/a9Bsgrg31Z/uIJaCHIWtcQH3VTTVkDJKkwA="; + flutterHash = rec { + x86_64-linux = "sha256-5ExDBQXIpoZ5NwS66seY3m9/V8xDiyq/RdzldAyHdEE="; + aarch64-linux = x86_64-linux; + x86_64-darwin = "sha256-cJF8KB9fNb3hTZShDAPsMmr1neRdIMLvIl/m2tpzwQs="; + aarch64-darwin = "sha256-yetEE65UP2Wh9ocx7nClQjYLHO6lIbZPay1+I2tDSM4="; }; - patches = flutter2Patches; + patches = flutter3Patches; }; } diff --git a/nixpkgs/pkgs/development/compilers/flutter/engine-artifacts/default.nix b/nixpkgs/pkgs/development/compilers/flutter/engine-artifacts/default.nix index 6f5d6b98d9b8..249e9217325b 100644 --- a/nixpkgs/pkgs/development/compilers/flutter/engine-artifacts/default.nix +++ b/nixpkgs/pkgs/development/compilers/flutter/engine-artifacts/default.nix @@ -2,10 +2,11 @@ , stdenv , hostPlatform , engineVersion +, fetchurl , fetchzip , autoPatchelfHook - , gtk3 +, unzip }: let @@ -44,6 +45,56 @@ let }; }; + darwin = { + "arm64" = { + base = [ + { archive = "artifacts.zip"; } + { archive = "font-subset.zip"; } + ]; + variants = lib.genAttrs [ "profile" "release" ] + (variant: [ + { archive = "artifacts.zip"; } + ]); + }; + "x64" = { + base = [ + { archive = "FlutterEmbedder.framework.zip"; } + { archive = "FlutterMacOS.framework.zip"; } + { archive = "artifacts.zip"; } + { archive = "font-subset.zip"; } + { archive = "gen_snapshot.zip"; } + ]; + variants.profile = [ + { archive = "FlutterMacOS.framework.zip"; } + { archive = "artifacts.zip"; } + { archive = "gen_snapshot.zip"; } + ]; + variants.release = [ + { archive = "FlutterMacOS.dSYM.zip"; } + { archive = "FlutterMacOS.framework.zip"; } + { archive = "artifacts.zip"; } + { archive = "gen_snapshot.zip"; } + ]; + }; + }; + + ios = + (lib.genAttrs + [ "" ] + (arch: + { + base = [ + { archive = "artifacts.zip"; } + ]; + variants.profile = [ + { archive = "artifacts.zip"; } + ]; + variants.release = [ + { archive = "artifacts.zip"; } + { archive = "Flutter.dSYM.zip"; } + ]; + })); + linux = lib.genAttrs [ "arm64" "x64" ] (arch: @@ -85,18 +136,29 @@ let let artifactDirectory = if platform == null then null else "${platform}${lib.optionalString (variant != null) "-${variant}"}"; archiveBasename = lib.removeSuffix ".${(lib.last (lib.splitString "." archive))}" archive; + overrideUnpackCmd = builtins.elem archive [ "FlutterEmbedder.framework.zip" "FlutterMacOS.framework.zip" ]; in stdenv.mkDerivation ({ pname = "flutter-artifact${lib.optionalString (platform != null) "-${artifactDirectory}"}-${archiveBasename}"; version = engineVersion; - src = fetchzip { - url = "https://storage.googleapis.com/flutter_infra_release/flutter/${engineVersion}${lib.optionalString (platform != null) "/${artifactDirectory}"}/${archive}"; - stripRoot = false; - hash = (if artifactDirectory == null then hashes else hashes.${artifactDirectory}).${archive}; - }; + nativeBuildInputs = [ unzip ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ]; + + src = + if overrideUnpackCmd then + (fetchurl { + url = "https://storage.googleapis.com/flutter_infra_release/flutter/${engineVersion}${lib.optionalString (platform != null) "/${artifactDirectory}"}/${archive}"; + hash = (if artifactDirectory == null then hashes else hashes.${artifactDirectory}).${archive}; + }) else + (fetchzip { + url = "https://storage.googleapis.com/flutter_infra_release/flutter/${engineVersion}${lib.optionalString (platform != null) "/${artifactDirectory}"}/${archive}"; + stripRoot = false; + hash = (if artifactDirectory == null then hashes else hashes.${artifactDirectory}).${archive}; + }); - nativeBuildInputs = [ autoPatchelfHook ]; + setSourceRoot = if overrideUnpackCmd then "sourceRoot=`pwd`" else null; + unpackCmd = if overrideUnpackCmd then "unzip -o $src -d $out" else null; installPhase = let @@ -117,13 +179,13 @@ let (architecture: variants: { base = map (args: mkArtifactDerivation ({ - platform = "${os}-${architecture}"; + platform = "${os}${lib.optionalString (architecture != "") "-${architecture}"}"; } // args)) variants.base; variants = builtins.mapAttrs (variant: variantArtifacts: map (args: mkArtifactDerivation ({ - platform = "${os}-${architecture}"; + platform = "${os}${lib.optionalString (architecture != "") "-${architecture}"}"; inherit variant; } // args)) variantArtifacts) diff --git a/nixpkgs/pkgs/development/compilers/flutter/engine-artifacts/hashes.nix b/nixpkgs/pkgs/development/compilers/flutter/engine-artifacts/hashes.nix index 5356d5b53519..fb5134739f76 100644 --- a/nixpkgs/pkgs/development/compilers/flutter/engine-artifacts/hashes.nix +++ b/nixpkgs/pkgs/development/compilers/flutter/engine-artifacts/hashes.nix @@ -1,211 +1,228 @@ { - "d44b5a94c976fbb65815374f61ab5392a220b084" = { - "flutter_patched_sdk.zip" = "sha256-uLMzCF3dsBeSZnoY9YQ2bBQhw+hUAksoDKEWr3TCnhk="; - "flutter_patched_sdk_product.zip" = "sha256-0NbvAGSK0VgU6jSyboyhviP9H+wID7JoTS6xMqbZs2w="; - "android-arm" = { - "artifacts.zip" = "sha256-NZde8sVeknhR6bxchb/RURNIlKnJw6j5PZAWmmjiZvM="; - }; - "android-arm-profile" = { - "artifacts.zip" = "sha256-BTs1tuSdjVP8zAGCxV+uQ7sAAbCt0dML4g7/85IOFEs="; - "linux-x64.zip" = "sha256-GpjP5omeAjHBLZjJQdUMUnPoEgYBLppicLPUTY0fHqM="; - }; - "android-arm-release" = { - "artifacts.zip" = "sha256-ip2GnYkKq8aLWjVPk9no3aOf0c3k1h9foznhgLpZ17U="; - "linux-x64.zip" = "sha256-mGnmbraE98rqKRdO6keoITOaNCP0K3iYNRadihwOpxc="; - }; - "android-arm64" = { - "artifacts.zip" = "sha256-Sl7S/TNZWrlM4Z9UGN5rgGfpKk4UWKz6CKlQbz1qcZ4="; - }; - "android-arm64-profile" = { - "artifacts.zip" = "sha256-zNZtTxM8254y+KKSVYlBUYyIV2J04XN1cmnSjkQLJs8="; - "linux-x64.zip" = "sha256-M8AbEwFV2zedeqMoNeb+2UbR7i9I9rGh6LXBQcPO4iA="; - }; - "android-arm64-release" = { - "artifacts.zip" = "sha256-PdnAIcYccdRs3r6M8rwmgl2x+TsBPMRF/iAEgwLbt/4="; - "linux-x64.zip" = "sha256-kmLkKXBj/70B3v5GJ50trTlV8epj16jOlQrh1U4/pVA="; - }; - "android-x86" = { - "artifacts.zip" = "sha256-J1kgvNvdWo05HMHJMlVFECLMVnoCqUm1oP4K394w+xc="; - }; - "android-x86-jit-release" = { - "artifacts.zip" = "sha256-Tz/veYh/73px0eH0FOXbN4G8fVjXmEHv7G8lRm3YLtY="; - }; - "android-x64" = { - "artifacts.zip" = "sha256-+WT7oT31XwE+ykLbiAUvnKw+WVR0VeFXPGpcMUHbsTg="; - }; - "android-x64-profile" = { - "artifacts.zip" = "sha256-f298VAJoZ2x+w0bxma7wu5h7Bn6+kCdrHh5qtjhhhhc="; - "linux-x64.zip" = "sha256-73Br9XgafwmagxAf61NSHn4BHn4q90pHJYEXCfAG8qY="; - }; - "android-x64-release" = { - "artifacts.zip" = "sha256-63hQCvObPmIxTcKyBQlXgGY6FfKp9PrbBY0RkSr1D/U="; - "linux-x64.zip" = "sha256-i5WQeePNxUNAbVR06Lz2XCXvZZTJxaFB6txtpVn2h9I="; - }; - "linux-arm64" = { - "artifacts.zip" = "sha256-LTdVexuy7cL6dJqdM14YteI7Jo/z5wYOHakbX/BiV38="; - "font-subset.zip" = "sha256-cqLjvl3maO6NpN47/e718xyuSL8L8cHqU6ybuwlD+fA="; - }; - "linux-arm64-debug" = { - "linux-arm64-flutter-gtk.zip" = "sha256-SRlKQllg5UWHk2kOIQ6ZwbqG5FoeFGCl2F9tTI+XVOE="; - }; - "linux-arm64-profile" = { - "linux-arm64-flutter-gtk.zip" = "sha256-4wERBO+eimsSKFt8/P6mQqgzv+HURK+O/YFHAUHpklA="; - }; - "linux-arm64-release" = { - "linux-arm64-flutter-gtk.zip" = "sha256-1XHdFiW//1Yd+qOLrRlk0vma99HlGDC/RA0An8db/oY="; - }; - "linux-x64" = { - "artifacts.zip" = "sha256-Bl0BRxUfVqNX6y7HdUXu5lIFzMLB2GUJauhOLEeInEE="; - "font-subset.zip" = "sha256-v02HV8QOqwdv30RiHpKu8ujTXOQmupGr9HCfpBUvrKM="; - }; - "linux-x64-debug" = { - "linux-x64-flutter-gtk.zip" = "sha256-xjScsvWgPO8qeccw5BGzNrMLNzn5O+CvOpoPkvlrX0o="; - }; - "linux-x64-profile" = { - "linux-x64-flutter-gtk.zip" = "sha256-52nMjoHQZ/ve7yJW9d8YK02U8mowe9xHZpkTwbGq9vU="; - }; - "linux-x64-release" = { - "linux-x64-flutter-gtk.zip" = "sha256-SA7Th1Qasaj4Q5wFr89Rv8PNQx6s6zvHsDxT1EKKZV0="; - }; - }; "1a65d409c7a1438a34d21b60bf30a6fd5db59314" = { - "flutter_patched_sdk.zip" = "sha256-Pvsjttm5OwpJ/pW4UQXvvEiJYCM5CoZZfVXz5jef37k="; - "flutter_patched_sdk_product.zip" = "sha256-fhj2uUOrLwrzHrM6RNVpPNize5Qu6mLQDcSzLT2TbRA="; - "android-arm" = { + android-arm = { "artifacts.zip" = "sha256-KDMiI6SQoZHfFV5LJJZ7VOGyEKC4UxzRc777j4BbXgM="; }; - "android-arm-profile" = { + android-arm-profile = { "artifacts.zip" = "sha256-MErLoGJWXg4yJ6b6c5bqP8Nat6O7eYSfM71mMNAAQf4="; "linux-x64.zip" = "sha256-0TZQ05HR7NRqHzeoHZ/sOrjKiSvCpMUH85YXXzV4URg="; + "darwin-x64.zip" = "sha256-gOmxGurYyuuGxPnzK+2O1s7d7x514R9MfincibxVTCI="; }; - "android-arm-release" = { + android-arm-release = { "artifacts.zip" = "sha256-hU4S4FOqUGokByZ47nzOqQ4A9QFshruqrpJvJUBHUho="; "linux-x64.zip" = "sha256-AqNlqjOht+c2sdW5ReoF66ZJWJl1W4vGKbQ3YyderRY="; + "darwin-x64.zip" = "sha256-UiJNbIvjYvIX2oFNCz+TurUdhHS8vcl9X6WEkEs5hvU="; }; - "android-arm64" = { + android-arm64 = { "artifacts.zip" = "sha256-ApNg3Uu9gyGNsx7sdpTCz1yADVAI5ZuNHgvgiuH9IpQ="; }; - "android-arm64-profile" = { + android-arm64-profile = { "artifacts.zip" = "sha256-D/8+WKPIkOaV3PwkCHiJROFlokm4lWWmtPQb93Yqwr0="; "linux-x64.zip" = "sha256-S0RHLov6/C22VvGdvZV87Ybaxun8YBrw1gTgNklRcM0="; + "darwin-x64.zip" = "sha256-AWivGn0TCVEW+N8g9bpEP1JuKWhrccb+ANQgyLjBjfw="; }; - "android-arm64-release" = { + android-arm64-release = { "artifacts.zip" = "sha256-OoYqHtwmT+VWJ+G+sMXM5+ux3h1Fnyo9Vj2za9cm5eE="; "linux-x64.zip" = "sha256-NuXclg1a+Ofw5AWJ1tajpn2jYEZw6DluWxrFVL8rPfg="; + "darwin-x64.zip" = "sha256-/j5sVfyllkhsc9mpdbOqlT7VT1H6nD3Y+mYnWXDh0yI="; }; - "android-x86" = { - "artifacts.zip" = "sha256-nN66nIrcbJHq2S4oIT5e2NCv7mS5Kw+HBv3ReHs+d3Y="; - }; - "android-x86-jit-release" = { - "artifacts.zip" = "sha256-A8F6K78Ykp1rMsUmjD7B9nFFPAubZnqAqgWSzbNCRwk="; - }; - "android-x64" = { + android-x64 = { "artifacts.zip" = "sha256-hrBvnzCj/24h5kat96avlgXi6WhMsos5aPlkgxOYo8Q="; }; - "android-x64-profile" = { + android-x64-profile = { "artifacts.zip" = "sha256-xzSj/2ah9aQoosaNGkSWFP3bMNJqRSFc0+78XEBHwzM="; "linux-x64.zip" = "sha256-HfBiz1JWlBQ8KEfmf8uDlVzFlDt3+VF2VeY82tsMjHs="; + "darwin-x64.zip" = "sha256-J5JJH9GAQaQKahimb09fLC59VchPP15iMHY9bDMfdf8="; }; - "android-x64-release" = { + android-x64-release = { "artifacts.zip" = "sha256-TcfMeA+8Uf9yRrYdEIsjip0cKmSUm2Ow1tkoE9803XY="; "linux-x64.zip" = "sha256-D6efb6pj9+xjPnJu3O+ZCmwfatBzasuFZEFRntAiU9U="; + "darwin-x64.zip" = "sha256-hDftGgKqW6tzH/+jFOYfzxssbS01XtiWEeycJr3QSoc="; + }; + android-x86 = { + "artifacts.zip" = "sha256-nN66nIrcbJHq2S4oIT5e2NCv7mS5Kw+HBv3ReHs+d3Y="; + }; + android-x86-jit-release = { + "artifacts.zip" = "sha256-A8F6K78Ykp1rMsUmjD7B9nFFPAubZnqAqgWSzbNCRwk="; + }; + darwin-arm64 = { + "artifacts.zip" = "sha256-lfkEToKFBBOee7KgOl1z/ZeMQwEBWkmAYb2Hbfk8dfg="; + "font-subset.zip" = "sha256-W7GnLvCobED7uyhpURF4T4SL4yZIQmE2JFQVQIxl0NI="; + }; + darwin-arm64-profile = { + "artifacts.zip" = "sha256-DfYS+FEqjtq02jFRBqVR3SVWe4LAoPa5MMKWCbvF7mI="; + }; + darwin-arm64-release = { + "artifacts.zip" = "sha256-gG/OcCJE3XPO6T8bltMtPxdlYX5HQ/4qYsdHe0OdDaE="; + }; + darwin-x64 = { + "FlutterEmbedder.framework.zip" = "sha256-G84GGK6gtR+CYu9S/GhdNTL4KWqgFBp8QdvWOq+IZlk="; + "FlutterMacOS.framework.zip" = "sha256-1/txBoXDIs7Gn5zsZ4jYQXK73+iaZV4sRdYKqEBUTxU="; + "artifacts.zip" = "sha256-H7Moy6E1eRrOXYYAIgiJHOmstyy3YaCnu8O3IPr9BK8="; + "font-subset.zip" = "sha256-VSkG3zZw/4DDInwxPaMXT2B1LXIb0Ejkb2xf5SVrwW4="; + "gen_snapshot.zip" = "sha256-Pknv1fUcXGbWzt6So0DgWnvL4b43k51KMWiX1YXd2As="; + }; + darwin-x64-profile = { + "FlutterMacOS.framework.zip" = "sha256-3umN1HNX4UA00EFsBnWS0X04QRKlcCnChDYd9L6x1L4="; + "artifacts.zip" = "sha256-8Aj2+nTKKeVLEYN+swVlVqRB/3fVSwrb3i1g1JUDsNY="; + "gen_snapshot.zip" = "sha256-bi3RqSdOQODpPmY+eBUQPiNeZ/bECoOUx/pOADpTZiA="; + }; + darwin-x64-release = { + "FlutterMacOS.dSYM.zip" = "sha256-LfDQuCcBXEV3Jao/sbfIvjn1d2ZfZrWgzNzFE1zE3Rw="; + "FlutterMacOS.framework.zip" = "sha256-2xuPPJifdu/kvvtR0viMvbTOXfv8ndtNAhTmef8863o="; + "artifacts.zip" = "sha256-3p41zRjvWYCl/Kk/7/0MjV2FS10XEtyX1hYmxTHT8lU="; + "gen_snapshot.zip" = "sha256-ExXwj1QO1XQznZ49rW08tibA5BaURShE6pUYDokZfpE="; + }; + "flutter_patched_sdk.zip" = "sha256-Pvsjttm5OwpJ/pW4UQXvvEiJYCM5CoZZfVXz5jef37k="; + "flutter_patched_sdk_product.zip" = "sha256-fhj2uUOrLwrzHrM6RNVpPNize5Qu6mLQDcSzLT2TbRA="; + ios = { + "artifacts.zip" = "sha256-yqJ4+lNsedRFbe11dBK4KGMX5+Nilj1V0i2E94n7q+0="; + }; + ios-profile = { + "artifacts.zip" = "sha256-ZguLM1QoYyg5dXPw3Fl1zSLdbirShV3xZuxl1CfEf50="; }; - "linux-arm64" = { + ios-release = { + "Flutter.dSYM.zip" = "sha256-Y57wt1y4NIdbRMM1r/d1Dv8bekwO9/9gpLkTEcw7Hfs="; + "artifacts.zip" = "sha256-Sm4Pkm1mWu3k5S+aws+kRpth+o3yTBYITg23LhnSViE="; + }; + linux-arm64 = { "artifacts.zip" = "sha256-xyKVaEFb5gVkVrPzDrOql5BmXGO0FnCSeXOoQ10ZFrw="; "font-subset.zip" = "sha256-Ulwb6q2SzB4suMJhAM3zAwWOzlEImlu9Ha+w5u4QqIU="; }; - "linux-arm64-debug" = { + linux-arm64-debug = { "linux-arm64-flutter-gtk.zip" = "sha256-SiYOH++py4zeoD3BkNayqy/C9Zz9OiYQ5+u+pDLIpWg="; }; - "linux-arm64-profile" = { + linux-arm64-profile = { "linux-arm64-flutter-gtk.zip" = "sha256-xB0eqrBYD7vhOwYUgJwNaBftNZJgdwxA9AUpEfX0iFs="; }; - "linux-arm64-release" = { + linux-arm64-release = { "linux-arm64-flutter-gtk.zip" = "sha256-aHLKV129WIRsLUG6xTMwCKB4eXD3jonqinjI8KSsOus="; }; - "linux-x64" = { + linux-x64 = { "artifacts.zip" = "sha256-+zIABFXUpiqn3OMoLcU4NDLxZ1y9z0r46iCTNRHAkz8="; "font-subset.zip" = "sha256-W4SRPvA4rraVqN1ehbY6MFL7ZIWDHVJhjlLtxyUJJKY="; }; - "linux-x64-debug" = { + linux-x64-debug = { "linux-x64-flutter-gtk.zip" = "sha256-boICnuJF4zqGb7kaN5haO/df9hC9KeJidt3uIK06S7M="; }; - "linux-x64-profile" = { + linux-x64-profile = { "linux-x64-flutter-gtk.zip" = "sha256-AnkLMPW3mwiXdiDz3Zo802QZRi+8EMCy4Mx2ODSbMOU="; }; - "linux-x64-release" = { + linux-x64-release = { "linux-x64-flutter-gtk.zip" = "sha256-RAsgupVF18IxLaP8tJ7XRQ8y/um46nlpA8fDITPwLqY="; }; }; - "57d3bac3dd5cb5b0e464ab70e7bc8a0d8cf083ab" = { - "flutter_patched_sdk.zip" = "sha256-A/y5Y+Aw0CUhXABbdyQcGCSnSbO7Ask+71m8LZDSjH4="; - "flutter_patched_sdk_product.zip" = "sha256-VPxF4NrTUhFbpztyPnLEiC9Cy0kDDbYvy21kA5ES4HM="; - "android-arm" = { - "artifacts.zip" = "sha256-3igOO+rgFh0fNTIIiiucqSmqC+NKFPG5H1CnIa9bDcM="; + "45f6e009110df4f34ec2cf99f63cf73b71b7a420" = { + android-arm = { + "artifacts.zip" = "sha256-NOpUM+iFSPVzr99Dz0DBdDUQnMC0ad1eZnVhtqu9HnU="; + }; + android-arm-profile = { + "artifacts.zip" = "sha256-MZK1zaSv9yuZaVDR1dReCM7WRDxKql0yxsPa8WFc1yw="; + "linux-x64.zip" = "sha256-9OlBv2C6Msj73g624TixbstudCTbdIJ6PzPMsbQENy4="; + "darwin-x64.zip" = "sha256-lVJ31F7UMaXQym3touJQ2cN8svKBaWJurDTVZPeMzCo="; + }; + android-arm-release = { + "artifacts.zip" = "sha256-tjHckwoxQkkKoyTl6+wBKK40mFDmSDvCPNhBHVA+xxw="; + "linux-x64.zip" = "sha256-zE9oYkv4WBcbgEdYfYIcdDXX3tnYfCg+3KA3oA03nYA="; + "darwin-x64.zip" = "sha256-mCr29gIn808NF4k8kdC7oLTSU6AXq7I/bJF3BBdJlAo="; + }; + android-arm64 = { + "artifacts.zip" = "sha256-8W/JrOGhAzHWpM2Jh9vjdkaB6ODmCItqcmF47GqbNQk="; + }; + android-arm64-profile = { + "artifacts.zip" = "sha256-9SGBWp05lxLQTpLuzq8FYSQQOpjo8UL93Pv4YYFD4QE="; + "linux-x64.zip" = "sha256-5nH2AAxupRIhn8gNH+1V+vSP+qqfx5MS97EC4s3QHe8="; + "darwin-x64.zip" = "sha256-kkutEwKcj1wKJREbxbx8+DW53WVbizg6zKIFFVujgAM="; + }; + android-arm64-release = { + "artifacts.zip" = "sha256-7O7RBfEo6enZtVNsnt4HH0bex8Xpz9mqCvb2LNLbg3Q="; + "linux-x64.zip" = "sha256-loucmX4+0R11L1nzewiMTeRZoB6wLK0WasW5W3rIvYU="; + "darwin-x64.zip" = "sha256-0bpNQDfIzQqwQpzThLfOXEEEpH/uCJCRF331d0/pzfs="; + }; + android-x64 = { + "artifacts.zip" = "sha256-j7AezbyzH07yOR0/W1ttfCjMHMdOlXLQjAsu/ExqmqA="; + }; + android-x64-profile = { + "artifacts.zip" = "sha256-J8cqdcHoj1hpo6zY5R6S9lvkVXp7wvzQlurM7TEUe+k="; + "linux-x64.zip" = "sha256-YuRHctkDjLZVGQr+m5uM+AxYNLkfqycV4UNcAp7JavE="; + "darwin-x64.zip" = "sha256-Mw8C279cVbQHTdIsHhIT5HWe52X8XXbkIDpVcEz1tWc="; + }; + android-x64-release = { + "artifacts.zip" = "sha256-uhq3fXcxXjF4/YHSkf6V4wToL9jOUKBm3978j/7xI/s="; + "linux-x64.zip" = "sha256-iJfatLW7jVcrfNdVx/QOPiyON5ce0tSNGOBx0TILrKE="; + "darwin-x64.zip" = "sha256-3P3QZ+jW3Jl6PJvRY9pBHQdhj8UcsHFAjln8q6UlL+A="; + }; + android-x86 = { + "artifacts.zip" = "sha256-/xLacCi65hg1gEahty0btrc+NR/jfebSAIt31qwIlZY="; }; - "android-arm-profile" = { - "artifacts.zip" = "sha256-qai254LNrQXJBsaoQgXao6mBpzzcYHh4sUESurSyxNA="; - "linux-x64.zip" = "sha256-hBkntf1fX5w752ly6lVUHm6wEM/4ep9guJGma3SKjxU="; + android-x86-jit-release = { + "artifacts.zip" = "sha256-Ntq0i+sFruDhlyp9VBxBnsNqqGoQeXMeIwfi+BNlr0Q="; }; - "android-arm-release" = { - "artifacts.zip" = "sha256-7yuXIJyErb1PZyk56+TtlJY0o1EOwmdAvpVfGGAteuA="; - "linux-x64.zip" = "sha256-v/jBnE662XOX/fOhYbve7ZiQwVu0haIMOD532Vdj9Yw="; + darwin-arm64 = { + "artifacts.zip" = "sha256-A21Tnn4jC5IzdL3c7n6/q9H6uJ/ofvJ+K9W8PPpAoYM="; + "font-subset.zip" = "sha256-NhnUOK1Gn4ekKOf5rDoy4HodzhlS8ylf/MN/6l4Dk18="; }; - "android-arm64" = { - "artifacts.zip" = "sha256-Llxu8+SkYEtnoiMf01rffPpF/AjrlV+QPuAW850oMzo="; + darwin-arm64-profile = { + "artifacts.zip" = "sha256-aDWrz3bebC6kZRe2LgunsmFhbxJhmP1bsZv5A/SGF2Y="; }; - "android-arm64-profile" = { - "artifacts.zip" = "sha256-su4U80supv8Q+2kE/5FTybiA5NFbKNMHqdB0NHCqrVI="; - "linux-x64.zip" = "sha256-yGt0SztNxYHDwZ1DwzLg5REE8rmMRKNn7GfCQ+GEHBw="; + darwin-arm64-release = { + "artifacts.zip" = "sha256-F44e39KSX8juojFBV/CSvFES+RQW+gHKDWtfnydqiNo="; }; - "android-arm64-release" = { - "artifacts.zip" = "sha256-+p1+SXSEglR3jqWc/jKgmtR9nOGgMRGC+anoTs1kRc8="; - "linux-x64.zip" = "sha256-5UiG5gxOso8NO+7nkb6bjxW8e/Tr7mlvPRUagSRTCNs="; + darwin-x64 = { + "FlutterEmbedder.framework.zip" = "sha256-+S2unNH8cpfqUiPLTwGUUW00DdNYFDN8KM/O1pMdxQs="; + "FlutterMacOS.framework.zip" = "sha256-iCGXzxBhJGR6rWcECRg0W5Qv4I6ePo7UrWIqjQK1bWI="; + "artifacts.zip" = "sha256-2Ng0rxVDeMCH3kFHS7rhVd6R8oiJqvfsNDp+rzgtA50="; + "font-subset.zip" = "sha256-5IyNNLUT27WUCr61LjnMjmAZEv63ZaF+rl/p2XHFlVU="; + "gen_snapshot.zip" = "sha256-zPJaXPdvbQGx79c41XdRrBW/+3aV/INaPtO47+hHdxM="; }; - "android-x86" = { - "artifacts.zip" = "sha256-Cbo17VYWaclyO1RLHkwjbqoFVZ283IgGdN0uDdiWvQs="; + darwin-x64-profile = { + "FlutterMacOS.framework.zip" = "sha256-PV4sTACDGeLLPz+AchxngWrQypmmUVQ48bQlAfH323w="; + "artifacts.zip" = "sha256-LBosuXu9mPh5WT0Mmgu9rX5Nuy+iIGN8Xvi7uVAyFhc="; + "gen_snapshot.zip" = "sha256-douXVnavzSGBuld3WhwHagBNK6FEU679puM8/fNGz2I="; }; - "android-x86-jit-release" = { - "artifacts.zip" = "sha256-gSPm2tClTj2vEYtGKgobD/mebWLNlDp8nEoFX0rhEOk="; + darwin-x64-release = { + "FlutterMacOS.dSYM.zip" = "sha256-A8kyc1fmsGemgUVhI46yTC6XNkrXdoPYvwXomHoW6kM="; + "FlutterMacOS.framework.zip" = "sha256-dZ/MO9J+zanoGfvPaAinnANte92bQOlh697fd/LvGqA="; + "artifacts.zip" = "sha256-T/wxPd1LmstfGHr2Fx6cfhRifaGm6CUlig6cBMcOO5g="; + "gen_snapshot.zip" = "sha256-qeZxVp6btr/fUQRf7nOhlnSC03+QTcRaggiVOmPxVuo="; }; - "android-x64" = { - "artifacts.zip" = "sha256-PVb1aKMMTlDT41O2MZRAUjCq8h+m/s2h5qOnEFPd77w="; + "flutter_patched_sdk.zip" = "sha256-kRRFCqQGBDimqwMiSn4yRMNRfZHt03YJqsKW47IBIvQ="; + "flutter_patched_sdk_product.zip" = "sha256-BowamIQHPZgfcZbWG7OFrB5GeEwdcA7AdUrF2Y+KIds="; + ios = { + "artifacts.zip" = "sha256-VoofDPEBUW2jBrXg3Z556uC2UdrD9JCpioZNhX1p/P0="; }; - "android-x64-profile" = { - "artifacts.zip" = "sha256-gZSSRCDy42AMLMiu/KH7YsDuFVaxRcoyXzUgV8V025Y="; - "linux-x64.zip" = "sha256-9+LCjeI18u/GlPDMIl6Jx6b++lc90fJ5tVBlDR+ctDs="; + ios-profile = { + "artifacts.zip" = "sha256-5jDIqk7tWuRxXsAzrjBq9xzQrt/eREmmoEF3zc2xQ5M="; }; - "android-x64-release" = { - "artifacts.zip" = "sha256-rsS08VP86/b2S0TEYusCEJBvS4BuevsmV9REAxRgJIc="; - "linux-x64.zip" = "sha256-H4nFCJ+iCUzIwHogYzS+h33eDMaFnz71dcDLSQW1aPg="; + ios-release = { + "Flutter.dSYM.zip" = "sha256-TuDld2LcHshl1mXcuIwfZgWLm1My4RpXUwI2B/QbLRk="; + "artifacts.zip" = "sha256-bGuUCKVqNNWWGVccVVKIBmCxTqgu4Q2Kj/Znnl9ZR2Q="; }; - "linux-arm64" = { - "artifacts.zip" = "sha256-kCxsKQQQX6wzhD46bfoflKdz3AYYkoSyavhfyTDuHLU="; - "font-subset.zip" = "sha256-Yk6JsNWe7ftEQU/TsjDUZSFeLzeIbcS63lhl8fsWsdk="; - "linux-arm64-flutter-gtk.zip" = "sha256-girVdkXrTO5tssoi+eKwG9ykstCR/VOx8zWtcAz8AKM="; + linux-arm64 = { + "artifacts.zip" = "sha256-jME3ivE+M+ceAt3aGPSeVwPaW8UhwGQOoL5lmRUqrOU="; + "font-subset.zip" = "sha256-MqavBMXOlx5JX94Oe/8GGuuDNh7A2UkjiOrEhCDW5cc="; }; - "linux-arm64-debug" = { - "linux-arm64-flutter-gtk.zip" = "sha256-girVdkXrTO5tssoi+eKwG9ykstCR/VOx8zWtcAz8AKM="; + linux-arm64-debug = { + "linux-arm64-flutter-gtk.zip" = "sha256-+ojrvr3bpCAwBc5ZJxSSvfxpW9M8h+YeQqdKno9TJgI="; }; - "linux-arm64-profile" = { - "linux-arm64-flutter-gtk.zip" = "sha256-VL5cwYaZ1FOJ3TwJzbgvHDQwkU9NrHGnf/tQhZ/dAGg="; + linux-arm64-profile = { + "linux-arm64-flutter-gtk.zip" = "sha256-5Smyc7JvudBG16l4Twq8QrZgfYXXeUGXb9NRNCBE+D4="; }; - "linux-arm64-release" = { - "linux-arm64-flutter-gtk.zip" = "sha256-27hy7mLFCLkqJbn+5p5eJdYnfBKTyfFe98iUMmKyz4g="; + linux-arm64-release = { + "linux-arm64-flutter-gtk.zip" = "sha256-WWHhfgD83eMkAYC1jlZdkqO2J8lxf0VlIBGB8qfXQp0="; }; - "linux-x64" = { - "artifacts.zip" = "sha256-JgEX+rKxdcWBBaxyR42eC7qOAvaawF9M2+rfaD4IgeA="; - "font-subset.zip" = "sha256-5EoxBrxSjaLLd+rKrxVYNoUZaejk0qcQ5LVsmqtKc2g="; - "linux-x64-flutter-gtk.zip" = "sha256-MH5HDPoXXi/KpQLQ0U1tQzZ0sbZx1RVhZtQ7L+WhZgk="; + linux-x64 = { + "artifacts.zip" = "sha256-LpCjbAjQQmDL3r5iKHkB1072qKbIkvVusPvMYCj1ZI4="; + "font-subset.zip" = "sha256-2TWRwNIMSomFb+ZDKN6ZF9egehq0SBkcyD+0g+GvmEM="; }; - "linux-x64-debug" = { - "linux-x64-flutter-gtk.zip" = "sha256-MH5HDPoXXi/KpQLQ0U1tQzZ0sbZx1RVhZtQ7L+WhZgk="; + linux-x64-debug = { + "linux-x64-flutter-gtk.zip" = "sha256-BV+Sp1EUTndrlu93eQB5txa/lsUPEEk42TbImFGzmk8="; }; - "linux-x64-profile" = { - "linux-x64-flutter-gtk.zip" = "sha256-r2hB/AKrB5vNga2fve4tTM4j+Zp9KDqNlTjKQhQvbaI="; + linux-x64-profile = { + "linux-x64-flutter-gtk.zip" = "sha256-HhT2wm2dqc2ZoPprzm2TTP6pG/glh4ugmmowUYNtBRo="; }; - "linux-x64-release" = { - "linux-x64-flutter-gtk.zip" = "sha256-muREs2iUiHCZM+SGN5q3HRRGnejJapKN582Aeog49MI="; + linux-x64-release = { + "linux-x64-flutter-gtk.zip" = "sha256-eluXkoISuzObXt2aiBmZGW6x8MsPTiD9bbVM4xcpe2w="; }; }; } diff --git a/nixpkgs/pkgs/development/compilers/flutter/flutter.nix b/nixpkgs/pkgs/development/compilers/flutter/flutter.nix index 3dbab3529e77..49dcb4c3658d 100644 --- a/nixpkgs/pkgs/development/compilers/flutter/flutter.nix +++ b/nixpkgs/pkgs/development/compilers/flutter/flutter.nix @@ -3,68 +3,14 @@ , patches , dart , src -, includedEngineArtifacts ? { - common = [ - "flutter_patched_sdk" - "flutter_patched_sdk_product" - ]; - platform = { }; - } - , lib -, callPackage , stdenv -, runCommandLocal -, symlinkJoin -, lndir +, darwin , git , which }: let - engineArtifactDirectory = - let - engineArtifacts = callPackage ./engine-artifacts { inherit engineVersion; }; - in - runCommandLocal "flutter-engine-artifacts-${version}" { } - ( - let - mkCommonArtifactLinkCommand = { artifact }: - '' - mkdir -p $out/common - ${lndir}/bin/lndir -silent ${artifact} $out/common - ''; - mkPlatformArtifactLinkCommand = { artifact, os, architecture, variant ? null }: - let - artifactDirectory = "${os}-${architecture}${lib.optionalString (variant != null) "-${variant}"}"; - in - '' - mkdir -p $out/${artifactDirectory} - ${lndir}/bin/lndir -silent ${artifact} $out/${artifactDirectory} - ''; - in - '' - ${ - builtins.concatStringsSep "\n" - ((map (name: mkCommonArtifactLinkCommand { - artifact = engineArtifacts.common.${name}; - }) (if includedEngineArtifacts ? common then includedEngineArtifacts.common else [ ])) ++ - (builtins.foldl' (commands: os: commands ++ - (builtins.foldl' (commands: architecture: commands ++ - (builtins.foldl' (commands: variant: commands ++ - (map (artifact: mkPlatformArtifactLinkCommand { - inherit artifact os architecture variant; - }) engineArtifacts.platform.${os}.${architecture}.variants.${variant})) - (map (artifact: mkPlatformArtifactLinkCommand { - inherit artifact os architecture; - }) engineArtifacts.platform.${os}.${architecture}.base) - includedEngineArtifacts.platform.${os}.${architecture})) - [] (builtins.attrNames includedEngineArtifacts.platform.${os}))) - [] (builtins.attrNames (if includedEngineArtifacts ? platform then includedEngineArtifacts.platform else { })))) - } - '' - ); - unwrapped = stdenv.mkDerivation { name = "flutter-${version}-unwrapped"; @@ -73,6 +19,8 @@ let outputs = [ "out" "cache" ]; buildInputs = [ git ]; + nativeBuildInputs = [ ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.DarwinTools ]; preConfigure = '' if [ "$(< bin/internal/engine.version)" != '${engineVersion}' ]; then @@ -124,8 +72,8 @@ let # Certain prebuilts should be replaced with Nix-built (or at least Nix-patched) equivalents. rm -r \ - bin/cache/dart-sdk \ - bin/cache/artifacts/engine + $FLUTTER_ROOT/bin/cache/dart-sdk \ + $FLUTTER_ROOT/bin/cache/artifacts/engine ''; installPhase = '' @@ -134,13 +82,13 @@ let mkdir -p $out cp -r . $out ln -sf ${dart} $out/bin/cache/dart-sdk - ln -sf ${engineArtifactDirectory} $out/bin/cache/artifacts/engine runHook postInstall ''; doInstallCheck = true; - nativeInstallCheckInputs = [ which ]; + nativeInstallCheckInputs = [ which ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.DarwinTools ]; installCheckPhase = '' runHook preInstallCheck @@ -153,7 +101,7 @@ let ''; passthru = { - inherit dart; + inherit dart engineVersion; # The derivation containing the original Flutter SDK files. # When other derivations wrap this one, any unmodified files # found here should be included as-is, for tooling compatibility. @@ -168,7 +116,7 @@ let ''; homepage = "https://flutter.dev"; license = licenses.bsd3; - platforms = [ "x86_64-linux" "aarch64-linux" ]; + platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ]; maintainers = with maintainers; [ babariviere ericdallo FlafyDev gilice hacker1024 ]; }; }; diff --git a/nixpkgs/pkgs/development/compilers/flutter/patches/flutter2/copy-without-perms.patch b/nixpkgs/pkgs/development/compilers/flutter/patches/flutter2/copy-without-perms.patch deleted file mode 100644 index f262f04bc945..000000000000 --- a/nixpkgs/pkgs/development/compilers/flutter/patches/flutter2/copy-without-perms.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/packages/flutter_tools/lib/src/build_system/targets/assets.dart b/packages/flutter_tools/lib/src/build_system/targets/assets.dart -index 68a4cd0257..1e212b9b0d 100644 ---- a/packages/flutter_tools/lib/src/build_system/targets/assets.dart -+++ b/packages/flutter_tools/lib/src/build_system/targets/assets.dart -@@ -101,7 +101,11 @@ Future<Depfile> copyAssets(Environment environment, Directory outputDirectory, { - outputPath: file.path, - relativePath: entry.key, - )) { -- await (content.file as File).copy(file.path); -+ // Not using File.copy because it preserves permissions. -+ final sourceFile = content.file as File; -+ final destinationFile = file; -+ -+ await destinationFile.writeAsBytes(await sourceFile.readAsBytes(), flush: true); - } - } else { - await file.writeAsBytes(await entry.value.contentsAsBytes()); diff --git a/nixpkgs/pkgs/development/compilers/flutter/patches/flutter2/disable-auto-update.patch b/nixpkgs/pkgs/development/compilers/flutter/patches/flutter2/disable-auto-update.patch deleted file mode 100644 index 33805b7a54d2..000000000000 --- a/nixpkgs/pkgs/development/compilers/flutter/patches/flutter2/disable-auto-update.patch +++ /dev/null @@ -1,49 +0,0 @@ -diff --git a/bin/internal/shared.sh b/bin/internal/shared.sh -index 05cba4393b..2a775bf24f 100644 ---- a/bin/internal/shared.sh -+++ b/bin/internal/shared.sh -@@ -217,8 +217,6 @@ function shared::execute() { - # FLUTTER_TOOL_ARGS="--enable-asserts $FLUTTER_TOOL_ARGS" - # FLUTTER_TOOL_ARGS="$FLUTTER_TOOL_ARGS --observe=65432" - -- upgrade_flutter 7< "$PROG_NAME" -- - BIN_NAME="$(basename "$PROG_NAME")" - case "$BIN_NAME" in - flutter*) -diff --git a/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart b/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart -index 396756808e..d324a6df59 100644 ---- a/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart -+++ b/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart -@@ -241,7 +241,6 @@ class FlutterCommandRunner extends CommandRunner<void> { - globals.flutterUsage.suppressAnalytics = true; - } - -- globals.flutterVersion.ensureVersionFile(); - final bool machineFlag = topLevelResults['machine'] as bool? ?? false; - final bool ci = await globals.botDetector.isRunningOnBot; - final bool redirectedCompletion = !globals.stdio.hasTerminal && -@@ -250,10 +249,6 @@ class FlutterCommandRunner extends CommandRunner<void> { - final bool versionCheckFlag = topLevelResults['version-check'] as bool? ?? false; - final bool explicitVersionCheckPassed = topLevelResults.wasParsed('version-check') && versionCheckFlag; - -- if (topLevelResults.command?.name != 'upgrade' && -- (explicitVersionCheckPassed || (versionCheckFlag && !isMachine))) { -- await globals.flutterVersion.checkFlutterVersionFreshness(); -- } - - // See if the user specified a specific device. - globals.deviceManager?.specifiedDeviceId = topLevelResults['device-id'] as String?; - -diff --git a/packages/flutter_tools/lib/src/cache.dart b/packages/flutter_tools/lib/src/cache.dart -index defc86cc20..6c0824c965 100644 ---- a/packages/flutter_tools/lib/src/cache.dart -+++ b/packages/flutter_tools/lib/src/cache.dart -@@ -666,6 +666,7 @@ class Cache { - - /// Update the cache to contain all `requiredArtifacts`. - Future<void> updateAll(Set<DevelopmentArtifact> requiredArtifacts) async { -+ return; - if (!_lockEnabled) { - return; - } diff --git a/nixpkgs/pkgs/development/compilers/flutter/patches/flutter2/git-dir.patch b/nixpkgs/pkgs/development/compilers/flutter/patches/flutter2/git-dir.patch deleted file mode 100644 index 0136ef93106d..000000000000 --- a/nixpkgs/pkgs/development/compilers/flutter/patches/flutter2/git-dir.patch +++ /dev/null @@ -1,80 +0,0 @@ -diff --git a/dev/bots/prepare_package.dart b/dev/bots/prepare_package.dart -index 468a91a954..5def6897ce 100644 ---- a/dev/bots/prepare_package.dart -+++ b/dev/bots/prepare_package.dart -@@ -525,7 +525,7 @@ class ArchiveCreator { - - Future<String> _runGit(List<String> args, {Directory? workingDirectory}) { - return _processRunner.runProcess( -- <String>['git', ...args], -+ <String>['git', '--git-dir', '.git', ...args], - workingDirectory: workingDirectory ?? flutterRoot, - ); - } -diff --git a/packages/flutter_tools/lib/src/version.dart b/packages/flutter_tools/lib/src/version.dart -index f2068a6ca2..99b161689e 100644 ---- a/packages/flutter_tools/lib/src/version.dart -+++ b/packages/flutter_tools/lib/src/version.dart -@@ -106,7 +106,7 @@ class FlutterVersion { - String? channel = _channel; - if (channel == null) { - final String gitChannel = _runGit( -- 'git rev-parse --abbrev-ref --symbolic @{u}', -+ 'git --git-dir .git rev-parse --abbrev-ref --symbolic @{u}', - globals.processUtils, - _workingDirectory, - ); -@@ -114,7 +114,7 @@ class FlutterVersion { - if (slash != -1) { - final String remote = gitChannel.substring(0, slash); - _repositoryUrl = _runGit( -- 'git ls-remote --get-url $remote', -+ 'git --git-dir .git ls-remote --get-url $remote', - globals.processUtils, - _workingDirectory, - ); -@@ -326,7 +326,7 @@ class FlutterVersion { - /// the branch name will be returned as `'[user-branch]'`. - String getBranchName({ bool redactUnknownBranches = false }) { - _branch ??= () { -- final String branch = _runGit('git rev-parse --abbrev-ref HEAD', globals.processUtils); -+ final String branch = _runGit('git --git-dir .git rev-parse --abbrev-ref HEAD', globals.processUtils); - return branch == 'HEAD' ? channel : branch; - }(); - if (redactUnknownBranches || _branch!.isEmpty) { -@@ -359,7 +359,7 @@ class FlutterVersion { - /// wrapper that does that. - @visibleForTesting - static List<String> gitLog(List<String> args) { -- return <String>['git', '-c', 'log.showSignature=false', 'log'] + args; -+ return <String>['git', '-c', 'log.showSignature=false', '--git-dir', '.git', 'log'] + args; - } - - /// Gets the release date of the latest available Flutter version. -@@ -730,7 +730,7 @@ class GitTagVersion { - - static GitTagVersion determine(ProcessUtils processUtils, {String? workingDirectory, bool fetchTags = false, String gitRef = 'HEAD'}) { - if (fetchTags) { -- final String channel = _runGit('git rev-parse --abbrev-ref HEAD', processUtils, workingDirectory); -+ final String channel = _runGit('git --git-dir .git rev-parse --abbrev-ref HEAD', processUtils, workingDirectory); - if (channel == 'dev' || channel == 'beta' || channel == 'stable') { - globals.printTrace('Skipping request to fetchTags - on well known channel $channel.'); - } else { -@@ -739,7 +739,7 @@ class GitTagVersion { - } - // find all tags attached to the given [gitRef] - final List<String> tags = _runGit( -- 'git tag --points-at $gitRef', processUtils, workingDirectory).trim().split('\n'); -+ 'git --git-dir .git tag --points-at $gitRef', processUtils, workingDirectory).trim().split('\n'); - - // Check first for a stable tag - final RegExp stableTagPattern = RegExp(r'^\d+\.\d+\.\d+$'); -@@ -760,7 +760,7 @@ class GitTagVersion { - // recent tag and number of commits past. - return parse( - _runGit( -- 'git describe --match *.*.* --long --tags $gitRef', -+ 'git --git-dir .git describe --match *.*.* --long --tags $gitRef', - processUtils, - workingDirectory, - ) diff --git a/nixpkgs/pkgs/development/compilers/flutter/patches/flutter2/move-cache.patch b/nixpkgs/pkgs/development/compilers/flutter/patches/flutter2/move-cache.patch deleted file mode 100644 index efab81d2fc0e..000000000000 --- a/nixpkgs/pkgs/development/compilers/flutter/patches/flutter2/move-cache.patch +++ /dev/null @@ -1,37 +0,0 @@ -diff --git a/packages/flutter_tools/lib/src/cache.dart b/packages/flutter_tools/lib/src/cache.dart -index dd80b1e46e..8e54517765 100644 ---- a/packages/flutter_tools/lib/src/cache.dart -+++ b/packages/flutter_tools/lib/src/cache.dart -@@ -22,6 +22,7 @@ import 'base/user_messages.dart'; - import 'build_info.dart'; - import 'convert.dart'; - import 'features.dart'; -+import 'globals.dart' as globals; - - const String kFlutterRootEnvironmentVariableName = 'FLUTTER_ROOT'; // should point to //flutter/ (root of flutter/flutter repo) - const String kFlutterEngineEnvironmentVariableName = 'FLUTTER_ENGINE'; // should point to //engine/src/ (root of flutter/engine repo) -@@ -318,8 +319,13 @@ class Cache { - return; - } - assert(_lock == null); -+ final Directory dir = _fileSystem.directory(_fileSystem.path.join(globals.fsUtils.homeDirPath!, '.cache', 'flutter')); -+ if (!dir.existsSync()) { -+ dir.createSync(recursive: true); -+ globals.os.chmod(dir, '755'); -+ } - final File lockFile = -- _fileSystem.file(_fileSystem.path.join(flutterRoot!, 'bin', 'cache', 'lockfile')); -+ _fileSystem.file(_fileSystem.path.join(globals.fsUtils.homeDirPath!, '.cache', 'flutter', 'lockfile')); - try { - _lock = lockFile.openSync(mode: FileMode.write); - } on FileSystemException catch (e) { -@@ -378,8 +384,7 @@ class Cache { - - String get devToolsVersion { - if (_devToolsVersion == null) { -- const String devToolsDirPath = 'dart-sdk/bin/resources/devtools'; -- final Directory devToolsDir = getCacheDir(devToolsDirPath, shouldCreate: false); -+ final Directory devToolsDir = _fileSystem.directory(_fileSystem.path.join(flutterRoot!, 'bin/cache/dart-sdk/bin/resources/devtools')); - if (!devToolsDir.existsSync()) { - throw Exception('Could not find directory at ${devToolsDir.path}'); - } diff --git a/nixpkgs/pkgs/development/compilers/flutter/patches/flutter3/move-cache.patch b/nixpkgs/pkgs/development/compilers/flutter/patches/flutter3/move-cache.patch index efab81d2fc0e..cc6e5e8f49e0 100644 --- a/nixpkgs/pkgs/development/compilers/flutter/patches/flutter3/move-cache.patch +++ b/nixpkgs/pkgs/development/compilers/flutter/patches/flutter3/move-cache.patch @@ -35,3 +35,19 @@ index dd80b1e46e..8e54517765 100644 if (!devToolsDir.existsSync()) { throw Exception('Could not find directory at ${devToolsDir.path}'); } +diff --git a/packages/flutter_tools/lib/src/cache.dart b/packages/flutter_tools/lib/src/cache.dart +index 1c31c1b5db..76c7210d3b 100644 +--- a/packages/flutter_tools/lib/src/cache.dart ++++ b/packages/flutter_tools/lib/src/cache.dart +@@ -529,6 +529,11 @@ class Cache { + + /// Return the top-level directory in the cache; this is `bin/cache`. + Directory getRoot() { ++ const Platform platform = LocalPlatform(); ++ if (platform.environment.containsKey('FLUTTER_CACHE_DIR')) { ++ return _fileSystem.directory(platform.environment['FLUTTER_CACHE_DIR']); ++ } ++ + if (_rootOverride != null) { + return _fileSystem.directory(_fileSystem.path.join(_rootOverride!.path, 'bin', 'cache')); + } else { diff --git a/nixpkgs/pkgs/development/compilers/flutter/wrapper.nix b/nixpkgs/pkgs/development/compilers/flutter/wrapper.nix index 81e5e6e4fdcd..5685ddebd781 100644 --- a/nixpkgs/pkgs/development/compilers/flutter/wrapper.nix +++ b/nixpkgs/pkgs/development/compilers/flutter/wrapper.nix @@ -1,10 +1,29 @@ { lib , stdenv +, darwin , callPackage , flutter , supportsLinuxDesktop ? stdenv.hostPlatform.isLinux -, supportsAndroid ? stdenv.hostPlatform.isx86_64 -, includedEngineArtifacts ? null +, supportsAndroid ? (stdenv.hostPlatform.isx86_64 || stdenv.hostPlatform.isDarwin) +, supportsDarwin ? stdenv.hostPlatform.isDarwin +, supportsIOS ? stdenv.hostPlatform.isDarwin +, includedEngineArtifacts ? { + common = [ + "flutter_patched_sdk" + "flutter_patched_sdk_product" + ]; + platform = { + android = lib.optionalAttrs supportsAndroid + ((lib.genAttrs [ "arm" "arm64" "x64" ] (architecture: [ "profile" "release" ])) // { x86 = [ "jit-release" ]; }); + darwin = lib.optionalAttrs supportsDarwin + ((lib.genAttrs [ "arm64" "x64" ] (architecture: [ "profile" "release" ]))); + ios = lib.optionalAttrs supportsIOS + ((lib.genAttrs [ "" ] (architecture: [ "profile" "release" ]))); + linux = lib.optionalAttrs supportsLinuxDesktop + (lib.genAttrs ((lib.optional stdenv.hostPlatform.isx86_64 "x64") ++ (lib.optional stdenv.hostPlatform.isAarch64 "arm64")) + (architecture: [ "debug" "profile" "release" ])); + }; + } , extraPkgConfigPackages ? [ ] , extraLibraries ? [ ] , extraIncludes ? [ ] @@ -32,30 +51,73 @@ , cmake , ninja , clang +, lndir +, symlinkJoin }: let - flutterWithArtifacts = flutter.override { - includedEngineArtifacts = if includedEngineArtifacts != null then includedEngineArtifacts else { - common = [ - "flutter_patched_sdk" - "flutter_patched_sdk_product" - ]; - platform = { - android = lib.optionalAttrs supportsAndroid - ((lib.genAttrs [ "arm" "arm64" "x64" ] (architecture: [ "profile" "release" ])) // { x86 = [ "jit-release" ]; }); - linux = lib.optionalAttrs supportsLinuxDesktop - (lib.genAttrs ((lib.optional stdenv.hostPlatform.isx86_64 "x64") ++ (lib.optional stdenv.hostPlatform.isAarch64 "arm64")) - (architecture: [ "debug" "profile" "release" ])); - }; - }; + engineArtifacts = callPackage ./engine-artifacts { inherit (flutter) engineVersion; }; + mkCommonArtifactLinkCommand = { artifact }: + '' + mkdir -p $out/artifacts/engine/common + lndir -silent ${artifact} $out/artifacts/engine/common + ''; + mkPlatformArtifactLinkCommand = { artifact, os, architecture, variant ? null }: + let + artifactDirectory = "${os}-${architecture}${lib.optionalString (variant != null) "-${variant}"}"; + in + '' + mkdir -p $out/artifacts/engine/${artifactDirectory} + lndir -silent ${artifact} $out/artifacts/engine/${artifactDirectory} + ''; + engineArtifactDirectory = + runCommandLocal "flutter-engine-artifacts-${flutter.version}" { nativeBuildInputs = [ lndir ]; } + ( + builtins.concatStringsSep "\n" + ((map + (name: mkCommonArtifactLinkCommand { + artifact = engineArtifacts.common.${name}; + }) + (includedEngineArtifacts.common or [ ])) ++ + (builtins.foldl' + (commands: os: commands ++ + (builtins.foldl' + (commands: architecture: commands ++ + (builtins.foldl' + (commands: variant: commands ++ + (map + (artifact: mkPlatformArtifactLinkCommand { + inherit artifact os architecture variant; + }) + engineArtifacts.platform.${os}.${architecture}.variants.${variant})) + (map + (artifact: mkPlatformArtifactLinkCommand { + inherit artifact os architecture; + }) + engineArtifacts.platform.${os}.${architecture}.base) + includedEngineArtifacts.platform.${os}.${architecture})) + [ ] + (builtins.attrNames includedEngineArtifacts.platform.${os}))) + [ ] + (builtins.attrNames (includedEngineArtifacts.platform or { })))) + ); + + cacheDir = symlinkJoin { + name = "flutter-cache-dir"; + paths = [ + engineArtifactDirectory + "${flutter}/bin/cache" + ]; }; # By default, Flutter stores downloaded files (such as the Pub cache) in the SDK directory. # Wrap it to ensure that it does not do that, preferring home directories instead. + # The sh file `$out/bin/internal/shared.sh` runs when launching Flutter and calls `"$FLUTTER_ROOT/bin/cache/` instead of our environment variable `FLUTTER_CACHE_DIR`. + # We do not patch it since the script doesn't require engine artifacts(which are the only thing not added by the unwrapped derivation), so it shouldn't fail, and patching it will just be harder to maintain. immutableFlutter = writeShellScript "flutter_immutable" '' export PUB_CACHE=''${PUB_CACHE:-"$HOME/.pub-cache"} - ${flutterWithArtifacts}/bin/flutter "$@" + export FLUTTER_CACHE_DIR=${cacheDir} + ${flutter}/bin/flutter "$@" ''; # Tools that the Flutter tool depends on. @@ -103,14 +165,16 @@ let in (callPackage ./sdk-symlink.nix { }) (runCommandLocal "flutter-wrapped" { - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ + makeWrapper + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.DarwinTools ]; - passthru = flutterWithArtifacts.passthru // { - inherit (flutterWithArtifacts) version; - unwrapped = flutterWithArtifacts; + passthru = flutter.passthru // { + inherit (flutter) version; + unwrapped = flutter; }; - inherit (flutterWithArtifacts) meta; + inherit (flutter) meta; } '' for path in ${builtins.concatStringsSep " " (builtins.foldl' (paths: pkg: paths ++ (map (directory: "'${pkg}/${directory}/pkgconfig'") ["lib" "share"])) [ ] pkgConfigPackages)}; do addToSearchPath FLUTTER_PKG_CONFIG_PATH "$path" diff --git a/nixpkgs/pkgs/development/compilers/gambit/bootstrap.nix b/nixpkgs/pkgs/development/compilers/gambit/bootstrap.nix index a29f45a4e7a5..753938e95aa3 100644 --- a/nixpkgs/pkgs/development/compilers/gambit/bootstrap.nix +++ b/nixpkgs/pkgs/development/compilers/gambit/bootstrap.nix @@ -6,11 +6,11 @@ gccStdenv.mkDerivation { pname = "gambit-bootstrap"; - version = "4.9.3"; + version = "4.9.5"; src = fetchurl { - url = "http://www.iro.umontreal.ca/~gambit/download/gambit/v4.9/source/gambit-v4_9_3.tgz"; - sha256 = "1p6172vhcrlpjgia6hsks1w4fl8rdyjf9xjh14wxfkv7dnx8a5hk"; + url = "https://gambitscheme.org/4.9.5/gambit-v4_9_5.tgz"; + sha256 = "sha256-4o74218OexFZcgwVAFPcq498TK4fDlyDiUR5cHP4wdw="; }; buildInputs = [ autoconf ]; diff --git a/nixpkgs/pkgs/development/compilers/gambit/build.nix b/nixpkgs/pkgs/development/compilers/gambit/build.nix index 029225629154..9481078fd941 100644 --- a/nixpkgs/pkgs/development/compilers/gambit/build.nix +++ b/nixpkgs/pkgs/development/compilers/gambit/build.nix @@ -1,5 +1,5 @@ { gccStdenv, lib, git, openssl, autoconf, pkgs, makeStaticLibraries, gcc, coreutils, gnused, gnugrep, - src, version, git-version, + src, version, git-version, stampYmd ? 0, stampHms ? 0, gambit-support, optimizationSetting ? "-O1", gambit-params ? pkgs.gambit-support.stable-params }: # Note that according to a benchmark run by Marc Feeley on May 2018, @@ -26,6 +26,7 @@ gccStdenv.mkDerivation rec { bootstrap = gambit-support.gambit-bootstrap; nativeBuildInputs = [ git autoconf ]; + # TODO: if/when we can get all the library packages we depend on to have static versions, # we could use something like (makeStaticLibraries openssl) to enable creation # of statically linked binaries by gsc. @@ -39,11 +40,14 @@ gccStdenv.mkDerivation rec { "--enable-targets=${gambit-params.targets}" "--enable-single-host" "--enable-c-opt=${optimizationSetting}" + "--enable-c-opt-rts=-O2" "--enable-gcc-opts" "--enable-shared" "--enable-absolute-shared-libs" # Yes, NixOS will want an absolute path, and fix it. "--enable-openssl" + #"--enable-default-compile-options='(compactness 9)'" # Make life easier on the JS backend "--enable-default-runtime-options=${gambit-params.defaultRuntimeOptions}" + # "--enable-rtlib-debug" # used by Geiser, but only on recent-enough gambit, and messes js runtime # "--enable-debug" # Nope: enables plenty of good stuff, but also the costly console.log # "--enable-multiple-versions" # Nope, NixOS already does version multiplexing # "--enable-guide" @@ -58,9 +62,9 @@ gccStdenv.mkDerivation rec { # "--enable-coverage" # "--enable-inline-jumps" # "--enable-char-size=1" # default is 4 - ] ++ - # due not enable poll on darwin due to https://github.com/gambit/gambit/issues/498 - lib.optional (!gccStdenv.isDarwin) "--enable-poll"; + ] ++ gambit-params.extraOptions + # Do not enable poll on darwin due to https://github.com/gambit/gambit/issues/498 + ++ lib.optional (!gccStdenv.isDarwin) "--enable-poll"; configurePhase = '' export CC=${gccStdenv.cc}/bin/${gccStdenv.cc.targetPrefix}gcc \ @@ -71,31 +75,35 @@ gccStdenv.mkDerivation rec { XMKMF=${coreutils}/bin/false unset CFLAGS LDFLAGS LIBS CPPFLAGS CXXFLAGS - ${gambit-params.fix-stamp git-version} + ${gambit-params.fixStamp git-version stampYmd stampHms} ./configure --prefix=$out/gambit ${builtins.concatStringsSep " " configureFlags} # OS-specific paths are hardcoded in ./configure substituteInPlace config.status \ - --replace "/usr/local/opt/openssl@1.1" "${lib.getLib openssl}" \ - --replace "/usr/local/opt/openssl" "${lib.getLib openssl}" + ${lib.optionalString (gccStdenv.isDarwin && !gambit-params.stable) + ''--replace "/usr/local/opt/openssl@1.1" "${lib.getLib openssl}"''} \ + --replace "/usr/local/opt/openssl" "${lib.getLib openssl}" ./config.status ''; buildPhase = '' - # Make bootstrap compiler, from release bootstrap + # The MAKEFLAGS setting is a workaround for https://github.com/gambit/gambit/issues/833 + export MAKEFLAGS="--output-sync=recurse" + echo "Make bootstrap compiler, from release bootstrap" mkdir -p boot cp -rp ${bootstrap}/gambit/. boot/. chmod -R u+w boot cd boot cp ../gsc/makefile.in ../gsc/*.scm gsc/ + echo > include/stamp.h # No stamp needed for the bootstrap compiler ./configure for i in lib gsi gsc ; do (cd $i ; make -j$NIX_BUILD_CORES) ; done cd .. cp boot/gsc/gsc gsc-boot - # Now use the bootstrap compiler to build the real thing! + echo "Now use the bootstrap compiler to build the real thing!" make -j$NIX_BUILD_CORES from-scratch ${lib.optionalString gambit-params.modules "make -j$NIX_BUILD_CORES modules"} ''; @@ -107,6 +115,7 @@ gccStdenv.mkDerivation rec { ''; doCheck = true; + dontStrip = true; meta = gambit-support.meta; } diff --git a/nixpkgs/pkgs/development/compilers/gambit/default.nix b/nixpkgs/pkgs/development/compilers/gambit/default.nix index 8f77daa4173b..cb4f5f9501ca 100644 --- a/nixpkgs/pkgs/development/compilers/gambit/default.nix +++ b/nixpkgs/pkgs/development/compilers/gambit/default.nix @@ -1,10 +1,10 @@ { callPackage, fetchurl }: callPackage ./build.nix rec { - version = "4.9.3"; + version = "4.9.5"; git-version = version; src = fetchurl { - url = "http://www.iro.umontreal.ca/~gambit/download/gambit/v4.9/source/gambit-v4_9_3.tgz"; - sha256 = "1p6172vhcrlpjgia6hsks1w4fl8rdyjf9xjh14wxfkv7dnx8a5hk"; + url = "https://gambitscheme.org/4.9.5/gambit-v4_9_5.tgz"; + sha256 = "sha256-4o74218OexFZcgwVAFPcq498TK4fDlyDiUR5cHP4wdw="; }; } diff --git a/nixpkgs/pkgs/development/compilers/gambit/gambit-support.nix b/nixpkgs/pkgs/development/compilers/gambit/gambit-support.nix index be745367ec03..f78c99a50700 100644 --- a/nixpkgs/pkgs/development/compilers/gambit/gambit-support.nix +++ b/nixpkgs/pkgs/development/compilers/gambit/gambit-support.nix @@ -3,37 +3,38 @@ rec { stable-params = { stable = true; - defaultRuntimeOptions = "f8,-8,t8"; - buildRuntimeOptions = "f8,-8,t8"; - fix-stamp = git-version : ""; - targets = "java,js,php,python,ruby"; - modules = false; - }; - - unstable-params = { - stable = false; defaultRuntimeOptions = "iL,fL,-L,tL"; buildRuntimeOptions = "i8,f8,-8,t8"; - fix-stamp = git-version : '' + targets = "js"; # arm,java,js,php,python,riscv-32,riscv-64,ruby,x86,x86-64 + #fixStamp = _: _: _: ""; + fixStamp = git-version: stampYmd: stampHms: '' + echo "Fixing timestamp recipe in Makefile" substituteInPlace configure \ --replace "$(grep '^PACKAGE_VERSION=.*$' configure)" 'PACKAGE_VERSION="v${git-version}"' \ --replace "$(grep '^PACKAGE_STRING=.*$' configure)" 'PACKAGE_STRING="Gambit v${git-version}"' ; + substituteInPlace include/makefile.in \ + --replace "echo > stamp.h;" "(echo '#define ___STAMP_VERSION \"${git-version}\"'; echo '#define ___STAMP_YMD ${toString stampYmd}'; echo '#define ___STAMP_HMS ${toString stampHms}';) > stamp.h;"; ''; - targets = "arm,java,js,php,python,riscv-32,riscv-64,ruby,x86,x86-64"; # eats 100% cpu on _digest - modules = false; + modules = true; + extraOptions = []; + }; + + unstable-params = stable-params // { + stable = false; + extraOptions = ["--enable-trust-c-tco"]; }; export-gambopt = params : "export GAMBOPT=${params.buildRuntimeOptions} ;"; gambit-bootstrap = import ./bootstrap.nix ( pkgs ); - meta = { + meta = with lib; { description = "Optimizing Scheme to C compiler"; homepage = "http://gambitscheme.org"; - license = lib.licenses.lgpl21; # dual, also asl20 - # NB regarding platforms: continuously tested on Linux, - # tested on macOS once in a while, *should* work everywhere. - platforms = lib.platforms.unix; - maintainers = with lib.maintainers; [ thoughtpolice raskin fare ]; + license = licenses.lgpl21Only; # dual, also asl20 + # NB regarding platforms: continuously tested on Linux x86_64 and regularly tested on macOS x86_64. + # *should* work everywhere. + platforms = platforms.unix; + maintainers = with maintainers; [ thoughtpolice raskin fare ]; }; } diff --git a/nixpkgs/pkgs/development/compilers/gambit/unstable.nix b/nixpkgs/pkgs/development/compilers/gambit/unstable.nix index a689991a1e13..26761d67d35d 100644 --- a/nixpkgs/pkgs/development/compilers/gambit/unstable.nix +++ b/nixpkgs/pkgs/development/compilers/gambit/unstable.nix @@ -1,13 +1,15 @@ { callPackage, fetchFromGitHub, gambit-support }: callPackage ./build.nix { - version = "unstable-2020-09-20"; - git-version = "4.9.3-1234-g6acd87df"; + version = "unstable-2023-07-30"; + git-version = "4.9.5-3-ge059fffd"; + stampYmd = 20230730; + stampHms = 151945; src = fetchFromGitHub { - owner = "feeley"; + owner = "gambit"; repo = "gambit"; - rev = "6acd87dfa95bfca33082a431e72f023345dc07ee"; - sha256 = "0a3dy4ij8hzlp3sjam4b6dp6yvyz5d7g2x784qm3gp89fi2ck56r"; + rev = "e059fffdfbd91e27c350ff2ebd671adefadd5212"; + sha256 = "0q7hdfchl6lw53xawmmjvhyjdmqxjdsnzjqv9vpkl2qa4vyir5fs"; }; gambit-params = gambit-support.unstable-params; } diff --git a/nixpkgs/pkgs/development/compilers/gcc/10/default.nix b/nixpkgs/pkgs/development/compilers/gcc/10/default.nix index 83a03cc56d6d..c61093c67c03 100644 --- a/nixpkgs/pkgs/development/compilers/gcc/10/default.nix +++ b/nixpkgs/pkgs/development/compilers/gcc/10/default.nix @@ -9,8 +9,8 @@ , profiledCompiler ? false , langJit ? false , staticCompiler ? false -, enableShared ? !stdenv.targetPlatform.isStatic -, enableLTO ? !stdenv.hostPlatform.isStatic +, enableShared ? stdenv.targetPlatform.hasSharedLibraries +, enableLTO ? stdenv.hostPlatform.hasSharedLibraries , texinfo ? null , perl ? null # optional, for texi2pod (then pod2man) , gmp, mpfr, libmpc, gettext, which, patchelf, binutils @@ -22,11 +22,12 @@ , name ? "gcc" , libcCross ? null , threadsCross ? null # for MinGW -, crossStageStatic ? false +, withoutTargetLibc ? false , gnused ? null , cloog ? null # unused; just for compat with gcc4, as we override the parameter on some places , buildPackages , libxcrypt +, callPackage }: # Make sure we get GNU sed. @@ -53,13 +54,8 @@ let majorVersion = "10"; patches = [ # Fix https://gcc.gnu.org/bugzilla/show_bug.cgi?id=80431 - (fetchurl { - name = "fix-bug-80431.patch"; - url = "https://gcc.gnu.org/git/?p=gcc.git;a=patch;h=de31f5445b12fd9ab9969dc536d821fe6f0edad0"; - sha256 = "0sd52c898msqg7m316zp0ryyj7l326cjcn2y19dcxqp15r74qj0g"; - }) + ../fix-bug-80431.patch ../11/fix-struct-redefinition-on-glibc-2.36.patch - ../install-info-files-serially.patch ] ++ optional (targetPlatform != hostPlatform) ../libstdc++-target.patch ++ optional noSysDirs ../no-sys-dirs.patch ++ optional (noSysDirs && hostPlatform.isRiscV) ../no-sys-dirs-riscv.patch @@ -73,7 +69,7 @@ let majorVersion = "10"; ++ optional (targetPlatform.libc == "musl" && targetPlatform.isPower) ../ppc-musl.patch # Obtain latest patch with ../update-mcfgthread-patches.sh - ++ optional (!crossStageStatic && targetPlatform.isMinGW && threadsCross.model == "mcf") ./Added-mcf-thread-model-support-from-mcfgthread.patch + ++ optional (!withoutTargetLibc && targetPlatform.isMinGW && threadsCross.model == "mcf") ./Added-mcf-thread-model-support-from-mcfgthread.patch ++ optional (buildPlatform.system == "aarch64-darwin" && targetPlatform != buildPlatform) (fetchpatch { url = "https://raw.githubusercontent.com/richard-vd/musl-cross-make/5e9e87f06fc3220e102c29d3413fbbffa456fcd6/patches/gcc-${version}/0008-darwin-aarch64-self-host-driver.patch"; @@ -82,7 +78,7 @@ let majorVersion = "10"; /* Cross-gcc settings (build == host != target) */ crossMingw = targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt"; - stageNameAddon = if crossStageStatic then "stage-static" else "stage-final"; + stageNameAddon = if withoutTargetLibc then "stage-static" else "stage-final"; crossNameAddon = optionalString (targetPlatform != hostPlatform) "${targetPlatform.config}-${stageNameAddon}-"; callFile = lib.callPackageWith { @@ -103,7 +99,7 @@ let majorVersion = "10"; binutils buildPackages cloog - crossStageStatic + withoutTargetLibc enableLTO enableMultilib enablePlugin @@ -148,7 +144,7 @@ let majorVersion = "10"; in -stdenv.mkDerivation ({ +lib.pipe (stdenv.mkDerivation ({ pname = "${crossNameAddon}${name}"; inherit version; @@ -218,7 +214,7 @@ stdenv.mkDerivation ({ ) ''; - inherit noSysDirs staticCompiler crossStageStatic + inherit noSysDirs staticCompiler withoutTargetLibc libcCross crossMingw; inherit (callFile ../common/dependencies.nix { }) @@ -242,6 +238,9 @@ stdenv.mkDerivation ({ (targetPlatform == hostPlatform && hostPlatform == buildPlatform) (if profiledCompiler then "profiledbootstrap" else "bootstrap"); + # https://gcc.gnu.org/PR109898 + enableParallelInstalling = false; + inherit (callFile ../common/strip-attributes.nix { }) stripDebugList stripDebugListTarget @@ -293,10 +292,8 @@ stdenv.mkDerivation ({ } -// optionalAttrs (targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt" && crossStageStatic) { - makeFlags = [ "all-gcc" "all-target-libgcc" ]; - installTargets = "install-gcc install-target-libgcc"; -} - // optionalAttrs (enableMultilib) { dontMoveLib64 = true; } -) +)) +[ + (callPackage ../common/libgcc.nix { inherit version langC langCC langJit targetPlatform hostPlatform withoutTargetLibc enableShared; }) +] diff --git a/nixpkgs/pkgs/development/compilers/gcc/11/default.nix b/nixpkgs/pkgs/development/compilers/gcc/11/default.nix index 505b9abf06b0..92abdebe49b3 100644 --- a/nixpkgs/pkgs/development/compilers/gcc/11/default.nix +++ b/nixpkgs/pkgs/development/compilers/gcc/11/default.nix @@ -9,8 +9,8 @@ , profiledCompiler ? false , langJit ? false , staticCompiler ? false -, enableShared ? !stdenv.targetPlatform.isStatic -, enableLTO ? !stdenv.hostPlatform.isStatic +, enableShared ? stdenv.targetPlatform.hasSharedLibraries +, enableLTO ? stdenv.hostPlatform.hasSharedLibraries , texinfo ? null , perl ? null # optional, for texi2pod (then pod2man) , gmp, mpfr, libmpc, gettext, which, patchelf, binutils @@ -22,7 +22,7 @@ , name ? "gcc" , libcCross ? null , threadsCross ? null # for MinGW -, crossStageStatic ? false +, withoutTargetLibc ? false , gnused ? null , cloog # unused; just for compat with gcc4, as we override the parameter on some places , buildPackages @@ -50,20 +50,14 @@ with lib; with builtins; let majorVersion = "11"; - version = "${majorVersion}.3.0"; + version = "${majorVersion}.4.0"; disableBootstrap = !stdenv.hostPlatform.isDarwin; inherit (stdenv) buildPlatform hostPlatform targetPlatform; patches = [ # Fix https://gcc.gnu.org/bugzilla/show_bug.cgi?id=80431 - (fetchurl { - name = "fix-bug-80431.patch"; - url = "https://gcc.gnu.org/git/?p=gcc.git;a=patch;h=de31f5445b12fd9ab9969dc536d821fe6f0edad0"; - sha256 = "0sd52c898msqg7m316zp0ryyj7l326cjcn2y19dcxqp15r74qj0g"; - }) - ./fix-struct-redefinition-on-glibc-2.36.patch - ../install-info-files-serially.patch + ../fix-bug-80431.patch ] ++ optional (targetPlatform != hostPlatform) ../libstdc++-target.patch ++ optional noSysDirs ../no-sys-dirs.patch ++ optional (noSysDirs && hostPlatform.isRiscV) ../no-sys-dirs-riscv.patch @@ -79,23 +73,23 @@ let majorVersion = "11"; ++ optionals stdenv.isDarwin [ (fetchpatch { # There are no upstream release tags in https://github.com/iains/gcc-11-branch. - # 2d280e7 is the commit from https://github.com/gcc-mirror/gcc/releases/tag/releases%2Fgcc-11.3.0 - url = "https://github.com/iains/gcc-11-branch/compare/2d280e7eafc086e9df85f50ed1a6526d6a3a204d..gcc-11.3-darwin-r2.diff"; - sha256 = "sha256-LFAXUEoYD7YeCG8V9mWanygyQOI7U5OhCRIKOVCCDAg="; + # ff4bf32 is the commit from https://github.com/gcc-mirror/gcc/releases/tag/releases%2Fgcc-11.4.0 + url = "https://github.com/iains/gcc-11-branch/compare/ff4bf326d03e750a8d4905ea49425fe7d15a04b8..gcc-11.4-darwin-r0.diff"; + hash = "sha256-6prPgR2eGVJs7vKd6iM1eZsEPCD1ShzLns2Z+29vlt4="; }) ] # https://github.com/osx-cross/homebrew-avr/issues/280#issuecomment-1272381808 ++ optional (stdenv.isDarwin && targetPlatform.isAvr) ./avr-gcc-11.3-darwin.patch # Obtain latest patch with ../update-mcfgthread-patches.sh - ++ optional (!crossStageStatic && targetPlatform.isMinGW && threadsCross.model == "mcf") ./Added-mcf-thread-model-support-from-mcfgthread.patch + ++ optional (!withoutTargetLibc && targetPlatform.isMinGW && threadsCross.model == "mcf") ./Added-mcf-thread-model-support-from-mcfgthread.patch # openjdk build fails without this on -march=opteron; is upstream in gcc12 ++ [ ./gcc-issue-103910.patch ]; /* Cross-gcc settings (build == host != target) */ crossMingw = targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt"; - stageNameAddon = if crossStageStatic then "stage-static" else "stage-final"; + stageNameAddon = if withoutTargetLibc then "stage-static" else "stage-final"; crossNameAddon = optionalString (targetPlatform != hostPlatform) "${targetPlatform.config}-${stageNameAddon}-"; callFile = lib.callPackageWith { @@ -116,7 +110,7 @@ let majorVersion = "11"; binutils buildPackages cloog - crossStageStatic + withoutTargetLibc enableLTO enableMultilib enablePlugin @@ -171,7 +165,7 @@ lib.pipe (stdenv.mkDerivation ({ src = fetchurl { url = "mirror://gcc/releases/gcc-${version}/gcc-${version}.tar.xz"; - sha256 = "sha256-tHzygYaR9bHiHfK7OMeV+sLPvWQO3i0KXhyJ4zijrDk="; + hash = "sha256-Py2yIrAH6KSiPNW6VnJu8I6LHx6yBV7nLBQCzqc6jdk="; }; inherit patches; @@ -182,7 +176,8 @@ lib.pipe (stdenv.mkDerivation ({ libc_dev = stdenv.cc.libc_dev; - hardeningDisable = [ "format" "pie" ]; + hardeningDisable = [ "format" "pie" ] + ++ optional langAda "fortify3"; postPatch = '' configureScripts=$(find . -name configure) @@ -233,7 +228,7 @@ lib.pipe (stdenv.mkDerivation ({ ) ''; - inherit noSysDirs staticCompiler crossStageStatic + inherit noSysDirs staticCompiler withoutTargetLibc libcCross crossMingw; inherit (callFile ../common/dependencies.nix { }) @@ -258,6 +253,9 @@ lib.pipe (stdenv.mkDerivation ({ + lib.optionalString (targetPlatform == hostPlatform && hostPlatform == buildPlatform && !disableBootstrap) "bootstrap"; in lib.optional (target != "") target; + # https://gcc.gnu.org/PR109898 + enableParallelInstalling = false; + inherit (callFile ../common/strip-attributes.nix { }) stripDebugList stripDebugListTarget @@ -307,14 +305,9 @@ lib.pipe (stdenv.mkDerivation ({ }; } -// optionalAttrs (targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt" && crossStageStatic) { - makeFlags = [ "all-gcc" "all-target-libgcc" ]; - installTargets = "install-gcc install-target-libgcc"; -} - // optionalAttrs (enableMultilib) { dontMoveLib64 = true; } )) [ - (callPackage ../common/libgcc.nix { inherit langC langCC langJit; }) + (callPackage ../common/libgcc.nix { inherit version langC langCC langJit targetPlatform hostPlatform withoutTargetLibc enableShared; }) (callPackage ../common/checksum.nix { inherit langC langCC; }) ] diff --git a/nixpkgs/pkgs/development/compilers/gcc/12/default.nix b/nixpkgs/pkgs/development/compilers/gcc/12/default.nix index f0886f862c97..9665c2a9fe85 100644 --- a/nixpkgs/pkgs/development/compilers/gcc/12/default.nix +++ b/nixpkgs/pkgs/development/compilers/gcc/12/default.nix @@ -9,8 +9,8 @@ , profiledCompiler ? false , langJit ? false , staticCompiler ? false -, enableShared ? !stdenv.targetPlatform.isStatic -, enableLTO ? !stdenv.hostPlatform.isStatic +, enableShared ? stdenv.targetPlatform.hasSharedLibraries +, enableLTO ? stdenv.hostPlatform.hasSharedLibraries , texinfo ? null , perl ? null # optional, for texi2pod (then pod2man) , gmp, mpfr, libmpc, gettext, which, patchelf, binutils @@ -23,7 +23,7 @@ , name ? "gcc" , libcCross ? null , threadsCross ? null # for MinGW -, crossStageStatic ? false +, withoutTargetLibc ? false , gnused ? null , cloog # unused; just for compat with gcc4, as we override the parameter on some places , buildPackages @@ -68,7 +68,6 @@ let majorVersion = "12"; ../gnat-cflags-11.patch ../gcc-12-gfortran-driving.patch ../ppc-musl.patch - ../install-info-files-serially.patch # backport ICE fix on ccache code ./lambda-ICE-PR109241.patch @@ -128,11 +127,11 @@ let majorVersion = "12"; ++ optional (stdenv.isDarwin && langAda) ../gnat-darwin-dylib-install-name.patch # Obtain latest patch with ../update-mcfgthread-patches.sh - ++ optional (!crossStageStatic && targetPlatform.isMinGW && threadsCross.model == "mcf") ./Added-mcf-thread-model-support-from-mcfgthread.patch; + ++ optional (!withoutTargetLibc && targetPlatform.isMinGW && threadsCross.model == "mcf") ./Added-mcf-thread-model-support-from-mcfgthread.patch; /* Cross-gcc settings (build == host != target) */ crossMingw = targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt"; - stageNameAddon = if crossStageStatic then "stage-static" else "stage-final"; + stageNameAddon = if withoutTargetLibc then "stage-static" else "stage-final"; crossNameAddon = optionalString (targetPlatform != hostPlatform) "${targetPlatform.config}-${stageNameAddon}-"; callFile = lib.callPackageWith { @@ -153,7 +152,7 @@ let majorVersion = "12"; binutils buildPackages cloog - crossStageStatic + withoutTargetLibc disableBootstrap disableGdbPlugin enableLTO @@ -272,7 +271,7 @@ lib.pipe (stdenv.mkDerivation ({ ) ''; - inherit noSysDirs staticCompiler crossStageStatic + inherit noSysDirs staticCompiler withoutTargetLibc libcCross crossMingw; inherit (callFile ../common/dependencies.nix { }) depsBuildBuild nativeBuildInputs depsBuildTarget buildInputs depsTargetTarget; @@ -300,6 +299,9 @@ lib.pipe (stdenv.mkDerivation ({ lib.optionalString (targetPlatform == hostPlatform && hostPlatform == buildPlatform && !disableBootstrap) "bootstrap"; in lib.optional (target != "") target; + # https://gcc.gnu.org/PR109898 + enableParallelInstalling = false; + inherit (callFile ../common/strip-attributes.nix { }) stripDebugList stripDebugListTarget @@ -348,15 +350,10 @@ lib.pipe (stdenv.mkDerivation ({ }; } -// optionalAttrs (targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt" && crossStageStatic) { - makeFlags = [ "all-gcc" "all-target-libgcc" ]; - installTargets = "install-gcc install-target-libgcc"; -} - // optionalAttrs (enableMultilib) { dontMoveLib64 = true; } )) [ - (callPackage ../common/libgcc.nix { inherit langC langCC langJit; }) + (callPackage ../common/libgcc.nix { inherit version langC langCC langJit targetPlatform hostPlatform withoutTargetLibc enableShared; }) (callPackage ../common/checksum.nix { inherit langC langCC; }) ] diff --git a/nixpkgs/pkgs/development/compilers/gcc/13/default.nix b/nixpkgs/pkgs/development/compilers/gcc/13/default.nix index 4273195e7182..1b73c251ce6f 100644 --- a/nixpkgs/pkgs/development/compilers/gcc/13/default.nix +++ b/nixpkgs/pkgs/development/compilers/gcc/13/default.nix @@ -9,8 +9,8 @@ , profiledCompiler ? false , langJit ? false , staticCompiler ? false -, enableShared ? !stdenv.targetPlatform.isStatic -, enableLTO ? !stdenv.hostPlatform.isStatic +, enableShared ? stdenv.targetPlatform.hasSharedLibraries +, enableLTO ? stdenv.hostPlatform.hasSharedLibraries , texinfo ? null , perl ? null # optional, for texi2pod (then pod2man) , gmp, mpfr, libmpc, gettext, which, patchelf, binutils @@ -23,7 +23,7 @@ , name ? "gcc" , libcCross ? null , threadsCross ? null # for MinGW -, crossStageStatic ? false +, withoutTargetLibc ? false , gnused ? null , cloog # unused; just for compat with gcc4, as we override the parameter on some places , buildPackages @@ -125,7 +125,7 @@ let majorVersion = "13"; /* Cross-gcc settings (build == host != target) */ crossMingw = targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt"; - stageNameAddon = if crossStageStatic then "stage-static" else "stage-final"; + stageNameAddon = if withoutTargetLibc then "stage-static" else "stage-final"; crossNameAddon = optionalString (targetPlatform != hostPlatform) "${targetPlatform.config}-${stageNameAddon}-"; callFile = lib.callPackageWith { @@ -146,7 +146,7 @@ let majorVersion = "13"; binutils buildPackages cloog - crossStageStatic + withoutTargetLibc disableBootstrap disableGdbPlugin enableLTO @@ -265,7 +265,7 @@ lib.pipe (stdenv.mkDerivation ({ ) ''; - inherit noSysDirs staticCompiler crossStageStatic + inherit noSysDirs staticCompiler withoutTargetLibc libcCross crossMingw; inherit (callFile ../common/dependencies.nix { }) depsBuildBuild nativeBuildInputs depsBuildTarget buildInputs depsTargetTarget; @@ -298,6 +298,9 @@ lib.pipe (stdenv.mkDerivation ({ stripDebugListTarget preFixup; + # https://gcc.gnu.org/PR109898 + enableParallelInstalling = false; + # https://gcc.gnu.org/install/specific.html#x86-64-x-solaris210 ${if hostPlatform.system == "x86_64-solaris" then "CC" else null} = "gcc -m64"; @@ -341,15 +344,10 @@ lib.pipe (stdenv.mkDerivation ({ }; } -// optionalAttrs (targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt" && crossStageStatic) { - makeFlags = [ "all-gcc" "all-target-libgcc" ]; - installTargets = "install-gcc install-target-libgcc"; -} - // optionalAttrs (enableMultilib) { dontMoveLib64 = true; } )) [ - (callPackage ../common/libgcc.nix { inherit langC langCC langJit; }) + (callPackage ../common/libgcc.nix { inherit version langC langCC langJit targetPlatform hostPlatform withoutTargetLibc enableShared; }) (callPackage ../common/checksum.nix { inherit langC langCC; }) ] diff --git a/nixpkgs/pkgs/development/compilers/gcc/4.8/default.nix b/nixpkgs/pkgs/development/compilers/gcc/4.8/default.nix index 90489fd3fb1c..fa856eff96e5 100644 --- a/nixpkgs/pkgs/development/compilers/gcc/4.8/default.nix +++ b/nixpkgs/pkgs/development/compilers/gcc/4.8/default.nix @@ -8,8 +8,8 @@ , profiledCompiler ? false , langJit ? false , staticCompiler ? false -, enableShared ? !stdenv.targetPlatform.isStatic -, enableLTO ? !stdenv.hostPlatform.isStatic +, enableShared ? stdenv.targetPlatform.hasSharedLibraries +, enableLTO ? stdenv.hostPlatform.hasSharedLibraries , texinfo ? null , perl ? null # optional, for texi2pod (then pod2man); required for Java , gmp, mpfr, libmpc, gettext, which, patchelf, binutils @@ -26,9 +26,10 @@ , name ? "gcc" , libcCross ? null , threadsCross ? null # for MinGW -, crossStageStatic ? false +, withoutTargetLibc ? false , gnused ? null , buildPackages +, callPackage }: assert langJava -> zip != null && unzip != null @@ -74,7 +75,6 @@ let majorVersion = "4"; ../struct-ucontext-4.8.patch ../sigsegv-not-declared.patch ../res_state-not-declared.patch - ../install-info-files-serially.patch # gcc-11 compatibility (fetchpatch { name = "gcc4-char-reload.patch"; @@ -109,7 +109,7 @@ let majorVersion = "4"; /* Cross-gcc settings (build == host != target) */ crossMingw = targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt"; - stageNameAddon = if crossStageStatic then "stage-static" else "stage-final"; + stageNameAddon = if withoutTargetLibc then "stage-static" else "stage-final"; crossNameAddon = optionalString (targetPlatform != hostPlatform) "${targetPlatform.config}-${stageNameAddon}-"; callFile = lib.callPackageWith { @@ -135,7 +135,7 @@ let majorVersion = "4"; boehmgc buildPackages cloog - crossStageStatic + withoutTargetLibc enableLTO enableMultilib enablePlugin @@ -193,7 +193,7 @@ in # We need all these X libraries when building AWT with GTK. assert x11Support -> (filter (x: x == null) ([ gtk2 libart_lgpl ] ++ xlibs)) == []; -stdenv.mkDerivation ({ +lib.pipe (stdenv.mkDerivation ({ pname = "${crossNameAddon}${name}"; inherit version; @@ -232,7 +232,7 @@ stdenv.mkDerivation ({ '' else null; - inherit noSysDirs staticCompiler langJava crossStageStatic + inherit noSysDirs staticCompiler langJava withoutTargetLibc libcCross crossMingw; inherit (callFile ../common/dependencies.nix { }) @@ -257,6 +257,9 @@ stdenv.mkDerivation ({ stripDebugListTarget preFixup; + # https://gcc.gnu.org/PR109898 + enableParallelInstalling = false; + doCheck = false; # requires a lot of tools, causes a dependency cycle for stdenv # https://gcc.gnu.org/install/specific.html#x86-64-x-solaris210 @@ -317,10 +320,8 @@ stdenv.mkDerivation ({ }; } -// optionalAttrs (targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt" && crossStageStatic) { - makeFlags = [ "all-gcc" "all-target-libgcc" ]; - installTargets = "install-gcc install-target-libgcc"; -} - // optionalAttrs (enableMultilib) { dontMoveLib64 = true; } -) +)) +[ + (callPackage ../common/libgcc.nix { inherit version langC langCC langJit targetPlatform hostPlatform withoutTargetLibc enableShared; }) +] diff --git a/nixpkgs/pkgs/development/compilers/gcc/4.9/default.nix b/nixpkgs/pkgs/development/compilers/gcc/4.9/default.nix index ec0f4cde781d..bab79f968db3 100644 --- a/nixpkgs/pkgs/development/compilers/gcc/4.9/default.nix +++ b/nixpkgs/pkgs/development/compilers/gcc/4.9/default.nix @@ -8,8 +8,8 @@ , profiledCompiler ? false , langJit ? false , staticCompiler ? false -, enableShared ? !stdenv.targetPlatform.isStatic -, enableLTO ? !stdenv.hostPlatform.isStatic +, enableShared ? stdenv.targetPlatform.hasSharedLibraries +, enableLTO ? stdenv.hostPlatform.hasSharedLibraries , texinfo ? null , perl ? null # optional, for texi2pod (then pod2man); required for Java , gmp, mpfr, libmpc, gettext, which, patchelf, binutils @@ -26,9 +26,10 @@ , name ? "gcc" , libcCross ? null , threadsCross ? null # for MinGW -, crossStageStatic ? false +, withoutTargetLibc ? false , gnused ? null , buildPackages +, callPackage }: assert langJava -> zip != null && unzip != null @@ -63,7 +64,6 @@ let majorVersion = "4"; [ ../9/fix-struct-redefinition-on-glibc-2.36.patch ../use-source-date-epoch.patch ../parallel-bconfig.patch ./parallel-strsignal.patch ./libsanitizer.patch - ../install-info-files-serially.patch (fetchpatch { name = "avoid-ustat-glibc-2.28.patch"; url = "https://gitweb.gentoo.org/proj/gcc-patches.git/plain/4.9.4/gentoo/100_all_avoid-ustat-glibc-2.28.patch?id=55fcb515620a8f7d3bb77eba938aa0fcf0d67c96"; @@ -126,7 +126,7 @@ let majorVersion = "4"; /* Cross-gcc settings (build == host != target) */ crossMingw = targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt"; - stageNameAddon = if crossStageStatic then "stage-static" else "stage-final"; + stageNameAddon = if withoutTargetLibc then "stage-static" else "stage-final"; crossNameAddon = optionalString (targetPlatform != hostPlatform) "${targetPlatform.config}-${stageNameAddon}-"; callFile = lib.callPackageWith { @@ -152,7 +152,7 @@ let majorVersion = "4"; boehmgc buildPackages cloog - crossStageStatic + withoutTargetLibc enableLTO enableMultilib enablePlugin @@ -210,7 +210,7 @@ in # We need all these X libraries when building AWT with GTK. assert x11Support -> (filter (x: x == null) ([ gtk2 libart_lgpl ] ++ xlibs)) == []; -stdenv.mkDerivation ({ +lib.pipe (stdenv.mkDerivation ({ pname = "${crossNameAddon}${name}"; inherit version; @@ -253,7 +253,7 @@ stdenv.mkDerivation ({ '' else null; - inherit noSysDirs staticCompiler langJava crossStageStatic + inherit noSysDirs staticCompiler langJava withoutTargetLibc libcCross crossMingw; inherit (callFile ../common/dependencies.nix { }) @@ -273,6 +273,9 @@ stdenv.mkDerivation ({ (targetPlatform == hostPlatform && hostPlatform == buildPlatform) (if profiledCompiler then "profiledbootstrap" else "bootstrap"); + # https://gcc.gnu.org/PR109898 + enableParallelInstalling = false; + inherit (callFile ../common/strip-attributes.nix { }) stripDebugList stripDebugListTarget @@ -338,11 +341,6 @@ stdenv.mkDerivation ({ }; } -// optionalAttrs (targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt" && crossStageStatic) { - makeFlags = [ "all-gcc" "all-target-libgcc" ]; - installTargets = "install-gcc install-target-libgcc"; -} - // optionalAttrs (enableMultilib) { dontMoveLib64 = true; } // optionalAttrs (langJava) { @@ -350,4 +348,7 @@ stdenv.mkDerivation ({ target="$(echo "$out/libexec/gcc"/*/*/ecj*)" patchelf --set-rpath "$(patchelf --print-rpath "$target"):$out/lib" "$target" '';} -) +)) +[ + (callPackage ../common/libgcc.nix { inherit version langC langCC langJit targetPlatform hostPlatform withoutTargetLibc enableShared; }) +] diff --git a/nixpkgs/pkgs/development/compilers/gcc/6/default.nix b/nixpkgs/pkgs/development/compilers/gcc/6/default.nix index 82ca9fd967c0..f443babb4b70 100644 --- a/nixpkgs/pkgs/development/compilers/gcc/6/default.nix +++ b/nixpkgs/pkgs/development/compilers/gcc/6/default.nix @@ -9,8 +9,8 @@ , profiledCompiler ? false , langJit ? false , staticCompiler ? false -, enableShared ? !stdenv.targetPlatform.isStatic -, enableLTO ? !stdenv.hostPlatform.isStatic +, enableShared ? stdenv.targetPlatform.hasSharedLibraries +, enableLTO ? stdenv.hostPlatform.hasSharedLibraries , texinfo ? null , flex , perl ? null # optional, for texi2pod (then pod2man); required for Java @@ -29,10 +29,11 @@ , name ? "gcc" , libcCross ? null , threadsCross ? null # for MinGW -, crossStageStatic ? false +, withoutTargetLibc ? false , gnused ? null , cloog ? null # unused; just for compat with gcc4, as we override the parameter on some places , buildPackages +, callPackage }: assert langJava -> zip != null && unzip != null @@ -67,12 +68,7 @@ let majorVersion = "6"; ../use-source-date-epoch.patch ./0001-Fix-build-for-glibc-2.31.patch # Fix https://gcc.gnu.org/bugzilla/show_bug.cgi?id=80431 - (fetchurl { - name = "fix-bug-80431.patch"; - url = "https://gcc.gnu.org/git/?p=gcc.git;a=patch;h=de31f5445b12fd9ab9969dc536d821fe6f0edad0"; - sha256 = "0sd52c898msqg7m316zp0ryyj7l326cjcn2y19dcxqp15r74qj0g"; - }) - ../install-info-files-serially.patch + ../fix-bug-80431.patch ] ++ optional (targetPlatform != hostPlatform) ../libstdc++-target.patch ++ optional noSysDirs ../no-sys-dirs.patch ++ optional langAda ../gnat-cflags.patch @@ -82,7 +78,7 @@ let majorVersion = "6"; ++ optional langGo ./gogcc-workaround-glibc-2.36.patch # Obtain latest patch with ../update-mcfgthread-patches.sh - ++ optional (!crossStageStatic && targetPlatform.isMinGW && threadsCross.model == "mcf") ./Added-mcf-thread-model-support-from-mcfgthread.patch + ++ optional (!withoutTargetLibc && targetPlatform.isMinGW && threadsCross.model == "mcf") ./Added-mcf-thread-model-support-from-mcfgthread.patch ++ optional (targetPlatform.libc == "musl" && targetPlatform.isx86_32) (fetchpatch { url = "https://git.alpinelinux.org/aports/plain/main/gcc/gcc-6.1-musl-libssp.patch?id=5e4b96e23871ee28ef593b439f8c07ca7c7eb5bb"; sha256 = "1jf1ciz4gr49lwyh8knfhw6l5gvfkwzjy90m7qiwkcbsf4a3fqn2"; @@ -115,7 +111,7 @@ let majorVersion = "6"; /* Cross-gcc settings (build == host != target) */ crossMingw = targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt"; - stageNameAddon = if crossStageStatic then "stage-static" else "stage-final"; + stageNameAddon = if withoutTargetLibc then "stage-static" else "stage-final"; crossNameAddon = optionalString (targetPlatform != hostPlatform) "${targetPlatform.config}-${stageNameAddon}-"; callFile = lib.callPackageWith { @@ -141,7 +137,7 @@ let majorVersion = "6"; boehmgc buildPackages cloog - crossStageStatic + withoutTargetLibc enableLTO enableMultilib enablePlugin @@ -203,7 +199,7 @@ in # We need all these X libraries when building AWT with GTK. assert x11Support -> (filter (x: x == null) ([ gtk2 libart_lgpl ] ++ xlibs)) == []; -stdenv.mkDerivation ({ +lib.pipe (stdenv.mkDerivation ({ pname = "${crossNameAddon}${name}"; inherit version; @@ -273,7 +269,7 @@ stdenv.mkDerivation ({ )) ); - inherit noSysDirs staticCompiler langJava crossStageStatic + inherit noSysDirs staticCompiler langJava withoutTargetLibc libcCross crossMingw; inherit (callFile ../common/dependencies.nix { }) @@ -295,6 +291,9 @@ stdenv.mkDerivation ({ (targetPlatform == hostPlatform && hostPlatform == buildPlatform) (if profiledCompiler then "profiledbootstrap" else "bootstrap"); + # https://gcc.gnu.org/PR109898 + enableParallelInstalling = false; + inherit (callFile ../common/strip-attributes.nix { }) stripDebugList stripDebugListTarget @@ -360,11 +359,6 @@ stdenv.mkDerivation ({ }; } -// optionalAttrs (targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt" && crossStageStatic) { - makeFlags = [ "all-gcc" "all-target-libgcc" ]; - installTargets = "install-gcc install-target-libgcc"; -} - // optionalAttrs (enableMultilib) { dontMoveLib64 = true; } // optionalAttrs (langJava && !stdenv.hostPlatform.isDarwin) { @@ -372,4 +366,7 @@ stdenv.mkDerivation ({ target="$(echo "$out/libexec/gcc"/*/*/ecj*)" patchelf --set-rpath "$(patchelf --print-rpath "$target"):$out/lib" "$target" '';} -) +)) +[ + (callPackage ../common/libgcc.nix { inherit version langC langCC langJit targetPlatform hostPlatform withoutTargetLibc enableShared; }) +] diff --git a/nixpkgs/pkgs/development/compilers/gcc/7/default.nix b/nixpkgs/pkgs/development/compilers/gcc/7/default.nix index 50039e4c0317..5b6ea7ead50a 100644 --- a/nixpkgs/pkgs/development/compilers/gcc/7/default.nix +++ b/nixpkgs/pkgs/development/compilers/gcc/7/default.nix @@ -7,8 +7,8 @@ , profiledCompiler ? false , langJit ? false , staticCompiler ? false -, enableShared ? !stdenv.targetPlatform.isStatic -, enableLTO ? !stdenv.hostPlatform.isStatic +, enableShared ? stdenv.targetPlatform.hasSharedLibraries +, enableLTO ? stdenv.hostPlatform.hasSharedLibraries , texinfo ? null , perl ? null # optional, for texi2pod (then pod2man) , gmp, mpfr, libmpc, gettext, which, patchelf, binutils @@ -19,10 +19,11 @@ , name ? "gcc" , libcCross ? null , threadsCross ? null # for MinGW -, crossStageStatic ? false +, withoutTargetLibc ? false , gnused ? null , cloog ? null # unused; just for compat with gcc4, as we override the parameter on some places , buildPackages +, callPackage }: # Make sure we get GNU sed. @@ -58,14 +59,9 @@ let majorVersion = "7"; ./0001-Fix-build-for-glibc-2.31.patch # Fix https://gcc.gnu.org/bugzilla/show_bug.cgi?id=80431 - (fetchurl { - name = "fix-bug-80431.patch"; - url = "https://gcc.gnu.org/git/?p=gcc.git;a=patch;h=de31f5445b12fd9ab9969dc536d821fe6f0edad0"; - sha256 = "0sd52c898msqg7m316zp0ryyj7l326cjcn2y19dcxqp15r74qj0g"; - }) + ../fix-bug-80431.patch ../9/fix-struct-redefinition-on-glibc-2.36.patch - ../install-info-files-serially.patch ] ++ optional (targetPlatform != hostPlatform) ../libstdc++-target.patch ++ optionals targetPlatform.isNetBSD [ @@ -85,13 +81,13 @@ let majorVersion = "7"; ++ optional (targetPlatform.libc == "musl") ../libgomp-dont-force-initial-exec.patch # Obtain latest patch with ../update-mcfgthread-patches.sh - ++ optional (!crossStageStatic && targetPlatform.isMinGW && threadsCross.model == "mcf") ./Added-mcf-thread-model-support-from-mcfgthread.patch + ++ optional (!withoutTargetLibc && targetPlatform.isMinGW && threadsCross.model == "mcf") ./Added-mcf-thread-model-support-from-mcfgthread.patch ++ [ ../libsanitizer-no-cyclades-9.patch ]; /* Cross-gcc settings (build == host != target) */ crossMingw = targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt"; - stageNameAddon = if crossStageStatic then "stage-static" else "stage-final"; + stageNameAddon = if withoutTargetLibc then "stage-static" else "stage-final"; crossNameAddon = optionalString (targetPlatform != hostPlatform) "${targetPlatform.config}-${stageNameAddon}-"; callFile = lib.callPackageWith { @@ -112,7 +108,7 @@ let majorVersion = "7"; binutils buildPackages cloog - crossStageStatic + withoutTargetLibc enableLTO enableMultilib enablePlugin @@ -153,7 +149,7 @@ let majorVersion = "7"; in -stdenv.mkDerivation ({ +lib.pipe (stdenv.mkDerivation ({ pname = "${crossNameAddon}${name}"; inherit version; @@ -222,7 +218,7 @@ stdenv.mkDerivation ({ ) ''; - inherit noSysDirs staticCompiler crossStageStatic + inherit noSysDirs staticCompiler withoutTargetLibc libcCross crossMingw; inherit (callFile ../common/dependencies.nix { }) @@ -248,6 +244,9 @@ stdenv.mkDerivation ({ (targetPlatform == hostPlatform && hostPlatform == buildPlatform) (if profiledCompiler then "profiledbootstrap" else "bootstrap"); + # https://gcc.gnu.org/PR109898 + enableParallelInstalling = false; + inherit (callFile ../common/strip-attributes.nix { }) stripDebugList stripDebugListTarget @@ -300,10 +299,8 @@ stdenv.mkDerivation ({ }; } -// optionalAttrs (targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt" && crossStageStatic) { - makeFlags = [ "all-gcc" "all-target-libgcc" ]; - installTargets = "install-gcc install-target-libgcc"; -} - // optionalAttrs (enableMultilib) { dontMoveLib64 = true; } -) +)) +[ + (callPackage ../common/libgcc.nix { inherit version langC langCC langJit targetPlatform hostPlatform withoutTargetLibc enableShared; }) +] diff --git a/nixpkgs/pkgs/development/compilers/gcc/8/default.nix b/nixpkgs/pkgs/development/compilers/gcc/8/default.nix index 483cc31ea44c..f903e264b0af 100644 --- a/nixpkgs/pkgs/development/compilers/gcc/8/default.nix +++ b/nixpkgs/pkgs/development/compilers/gcc/8/default.nix @@ -7,8 +7,8 @@ , profiledCompiler ? false , langJit ? false , staticCompiler ? false -, enableShared ? !stdenv.targetPlatform.isStatic -, enableLTO ? !stdenv.hostPlatform.isStatic +, enableShared ? stdenv.targetPlatform.hasSharedLibraries +, enableLTO ? stdenv.hostPlatform.hasSharedLibraries , texinfo ? null , perl ? null # optional, for texi2pod (then pod2man) , gmp, mpfr, libmpc, gettext, which, patchelf, binutils @@ -19,10 +19,11 @@ , name ? "gcc" , libcCross ? null , threadsCross ? null # for MinGW -, crossStageStatic ? false +, withoutTargetLibc ? false , gnused ? null , cloog ? null # unused; just for compat with gcc4, as we override the parameter on some places , buildPackages +, callPackage }: # Make sure we get GNU sed. @@ -48,13 +49,8 @@ let majorVersion = "8"; patches = [ # Fix https://gcc.gnu.org/bugzilla/show_bug.cgi?id=80431 - (fetchurl { - name = "fix-bug-80431.patch"; - url = "https://gcc.gnu.org/git/?p=gcc.git;a=patch;h=de31f5445b12fd9ab9969dc536d821fe6f0edad0"; - sha256 = "0sd52c898msqg7m316zp0ryyj7l326cjcn2y19dcxqp15r74qj0g"; - }) + ../fix-bug-80431.patch ../9/fix-struct-redefinition-on-glibc-2.36.patch - ../install-info-files-serially.patch ] ++ optional (targetPlatform != hostPlatform) ../libstdc++-target.patch ++ optional targetPlatform.isNetBSD ../libstdc++-netbsd-ctypes.patch ++ optional noSysDirs ../no-sys-dirs.patch @@ -67,12 +63,12 @@ let majorVersion = "8"; ++ optional (targetPlatform.libc == "musl") ../libgomp-dont-force-initial-exec.patch # Obtain latest patch with ../update-mcfgthread-patches.sh - ++ optional (!crossStageStatic && targetPlatform.isMinGW && threadsCross.model == "mcf") ./Added-mcf-thread-model-support-from-mcfgthread.patch + ++ optional (!withoutTargetLibc && targetPlatform.isMinGW && threadsCross.model == "mcf") ./Added-mcf-thread-model-support-from-mcfgthread.patch ++ [ ../libsanitizer-no-cyclades-9.patch ]; /* Cross-gcc settings (build == host != target) */ crossMingw = targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt"; - stageNameAddon = if crossStageStatic then "stage-static" else "stage-final"; + stageNameAddon = if withoutTargetLibc then "stage-static" else "stage-final"; crossNameAddon = optionalString (targetPlatform != hostPlatform) "${targetPlatform.config}-${stageNameAddon}-"; callFile = lib.callPackageWith { @@ -93,7 +89,7 @@ let majorVersion = "8"; binutils buildPackages cloog - crossStageStatic + withoutTargetLibc enableLTO enableMultilib enablePlugin @@ -134,7 +130,7 @@ let majorVersion = "8"; in -stdenv.mkDerivation ({ +lib.pipe (stdenv.mkDerivation ({ pname = "${crossNameAddon}${name}"; inherit version; @@ -203,7 +199,7 @@ stdenv.mkDerivation ({ ) ''; - inherit noSysDirs staticCompiler crossStageStatic + inherit noSysDirs staticCompiler withoutTargetLibc libcCross crossMingw; inherit (callFile ../common/dependencies.nix { }) @@ -225,6 +221,9 @@ stdenv.mkDerivation ({ (targetPlatform == hostPlatform && hostPlatform == buildPlatform) (if profiledCompiler then "profiledbootstrap" else "bootstrap"); + # https://gcc.gnu.org/PR109898 + enableParallelInstalling = false; + inherit (callFile ../common/strip-attributes.nix { }) stripDebugList stripDebugListTarget @@ -275,10 +274,8 @@ stdenv.mkDerivation ({ }; } -// optionalAttrs (targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt" && crossStageStatic) { - makeFlags = [ "all-gcc" "all-target-libgcc" ]; - installTargets = "install-gcc install-target-libgcc"; -} - // optionalAttrs (enableMultilib) { dontMoveLib64 = true; } -) +)) +[ + (callPackage ../common/libgcc.nix { inherit version langC langCC langJit targetPlatform hostPlatform withoutTargetLibc enableShared; }) +] diff --git a/nixpkgs/pkgs/development/compilers/gcc/9/default.nix b/nixpkgs/pkgs/development/compilers/gcc/9/default.nix index f541a83cdf46..289212a13635 100644 --- a/nixpkgs/pkgs/development/compilers/gcc/9/default.nix +++ b/nixpkgs/pkgs/development/compilers/gcc/9/default.nix @@ -9,8 +9,8 @@ , profiledCompiler ? false , langJit ? false , staticCompiler ? false -, enableShared ? !stdenv.targetPlatform.isStatic -, enableLTO ? !stdenv.hostPlatform.isStatic +, enableShared ? stdenv.targetPlatform.hasSharedLibraries +, enableLTO ? stdenv.hostPlatform.hasSharedLibraries , texinfo ? null , perl ? null # optional, for texi2pod (then pod2man) , gmp, mpfr, libmpc, gettext, which, patchelf, binutils @@ -22,10 +22,11 @@ , name ? "gcc" , libcCross ? null , threadsCross ? null # for MinGW -, crossStageStatic ? false +, withoutTargetLibc ? false , gnused ? null , cloog # unused; just for compat with gcc4, as we override the parameter on some places , buildPackages +, callPackage }: # Note: this package is used for bootstrapping fetchurl, and thus @@ -58,12 +59,7 @@ let majorVersion = "9"; patches = [ ./fix-struct-redefinition-on-glibc-2.36.patch # Fix https://gcc.gnu.org/bugzilla/show_bug.cgi?id=80431 - (fetchurl { - name = "fix-bug-80431.patch"; - url = "https://gcc.gnu.org/git/?p=gcc.git;a=patch;h=de31f5445b12fd9ab9969dc536d821fe6f0edad0"; - sha256 = "0sd52c898msqg7m316zp0ryyj7l326cjcn2y19dcxqp15r74qj0g"; - }) - ../install-info-files-serially.patch + ../fix-bug-80431.patch ] ++ optional (targetPlatform != hostPlatform) ../libstdc++-target.patch ++ optional targetPlatform.isNetBSD ../libstdc++-netbsd-ctypes.patch ++ optional noSysDirs ../no-sys-dirs.patch @@ -78,12 +74,12 @@ let majorVersion = "9"; ++ optional (targetPlatform.libc == "musl" && targetPlatform.isPower) ../ppc-musl.patch # Obtain latest patch with ../update-mcfgthread-patches.sh - ++ optional (!crossStageStatic && targetPlatform.isMinGW && threadsCross.model == "mcf") ./Added-mcf-thread-model-support-from-mcfgthread.patch + ++ optional (!withoutTargetLibc && targetPlatform.isMinGW && threadsCross.model == "mcf") ./Added-mcf-thread-model-support-from-mcfgthread.patch ; /* Cross-gcc settings (build == host != target) */ crossMingw = targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt"; - stageNameAddon = if crossStageStatic then "stage-static" else "stage-final"; + stageNameAddon = if withoutTargetLibc then "stage-static" else "stage-final"; crossNameAddon = optionalString (targetPlatform != hostPlatform) "${targetPlatform.config}-${stageNameAddon}-"; callFile = lib.callPackageWith { @@ -104,7 +100,7 @@ let majorVersion = "9"; binutils buildPackages cloog - crossStageStatic + withoutTargetLibc enableLTO enableMultilib enablePlugin @@ -148,7 +144,7 @@ let majorVersion = "9"; in -stdenv.mkDerivation ({ +lib.pipe (stdenv.mkDerivation ({ pname = "${crossNameAddon}${name}"; inherit version; @@ -217,7 +213,7 @@ stdenv.mkDerivation ({ ) ''; - inherit noSysDirs staticCompiler crossStageStatic + inherit noSysDirs staticCompiler withoutTargetLibc libcCross crossMingw; inherit (callFile ../common/dependencies.nix { }) @@ -239,6 +235,9 @@ stdenv.mkDerivation ({ (targetPlatform == hostPlatform && hostPlatform == buildPlatform) (if profiledCompiler then "profiledbootstrap" else "bootstrap"); + # https://gcc.gnu.org/PR109898 + enableParallelInstalling = false; + inherit (callFile ../common/strip-attributes.nix { }) stripDebugList stripDebugListTarget @@ -289,10 +288,9 @@ stdenv.mkDerivation ({ }; } -// optionalAttrs (targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt" && crossStageStatic) { - makeFlags = [ "all-gcc" "all-target-libgcc" ]; - installTargets = "install-gcc install-target-libgcc"; -} // optionalAttrs (enableMultilib) { dontMoveLib64 = true; } ) +) [ + (callPackage ../common/libgcc.nix { inherit version langC langCC langJit targetPlatform hostPlatform withoutTargetLibc enableShared; }) +] diff --git a/nixpkgs/pkgs/development/compilers/gcc/builder.sh b/nixpkgs/pkgs/development/compilers/gcc/builder.sh index 5147df1e4cc0..d9016c45e579 100644 --- a/nixpkgs/pkgs/development/compilers/gcc/builder.sh +++ b/nixpkgs/pkgs/development/compilers/gcc/builder.sh @@ -135,7 +135,7 @@ if test "$noSysDirs" = "1"; then ) fi - if test "$crossStageStatic" == 1; then + if test "$withoutTargetLibc" == 1; then # We don't want the gcc build to assume there will be a libc providing # limits.h in this stage makeFlagsArray+=( @@ -167,7 +167,7 @@ preConfigure() { rm -Rf zlib fi - if test -n "$crossMingw" -a -n "$crossStageStatic"; then + if test -n "$crossMingw" -a -n "$withoutTargetLibc"; then mkdir -p ../mingw # --with-build-sysroot expects that: cp -R $libcCross/include ../mingw @@ -185,8 +185,9 @@ preConfigure() { postConfigure() { - # Don't store the configure flags in the resulting executables. - sed -e '/TOPLEVEL_CONFIGURE_ARGUMENTS=/d' -i Makefile + # Avoid store paths when embedding ./configure flags into gcc. + # Mangled arguments are still useful when reporting bugs upstream. + sed -e "/TOPLEVEL_CONFIGURE_ARGUMENTS=/ s|$NIX_STORE/[a-z0-9]\{32\}-|$NIX_STORE/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-|g" -i Makefile } diff --git a/nixpkgs/pkgs/development/compilers/gcc/common/configure-flags.nix b/nixpkgs/pkgs/development/compilers/gcc/common/configure-flags.nix index aa8ecc62e55a..a60a3380ea25 100644 --- a/nixpkgs/pkgs/development/compilers/gcc/common/configure-flags.nix +++ b/nixpkgs/pkgs/development/compilers/gcc/common/configure-flags.nix @@ -1,7 +1,7 @@ { lib, stdenv , targetPackages -, crossStageStatic, libcCross +, withoutTargetLibc, libcCross , threadsCross , version @@ -59,14 +59,14 @@ let "--with-as=${if targetPackages.stdenv.cc.bintools.isLLVM then binutils else targetPackages.stdenv.cc.bintools}/bin/${targetPlatform.config}-as" "--with-ld=${targetPackages.stdenv.cc.bintools}/bin/${targetPlatform.config}-ld" ] - ++ (if crossStageStatic then [ + ++ (if withoutTargetLibc then [ "--disable-libssp" "--disable-nls" "--without-headers" "--disable-threads" "--disable-libgomp" "--disable-libquadmath" - "--disable-shared" + (lib.enableFeature enableShared "shared") "--disable-libatomic" # requires libc "--disable-decimal-float" # requires libc "--disable-libmpx" # requires libc @@ -112,7 +112,7 @@ let "--with-mpfr-lib=${mpfr.out}/lib" "--with-mpc=${libmpc}" ] - ++ lib.optionals (!crossStageStatic) [ + ++ lib.optionals (!withoutTargetLibc) [ (if libcCross == null then "--with-native-system-header-dir=${lib.getDev stdenv.cc.libc}/include" else "--with-native-system-header-dir=${lib.getDev libcCross}${libcCross.incdir or "/include"}") diff --git a/nixpkgs/pkgs/development/compilers/gcc/common/dependencies.nix b/nixpkgs/pkgs/development/compilers/gcc/common/dependencies.nix index 72aa0defcc6f..a38cdcb9e20f 100644 --- a/nixpkgs/pkgs/development/compilers/gcc/common/dependencies.nix +++ b/nixpkgs/pkgs/development/compilers/gcc/common/dependencies.nix @@ -30,7 +30,7 @@ , javaAwtGtk ? false , langAda ? false , langGo ? false -, crossStageStatic ? null +, withoutTargetLibc ? null , threadsCross ? null }: @@ -88,5 +88,5 @@ in ; # threadsCross.package after gcc6 so i assume its okay for 4.8 and 4.9 too - depsTargetTarget = optionals (!crossStageStatic && threadsCross != { } && threadsCross.package != null) [ threadsCross.package ]; + depsTargetTarget = optionals (!withoutTargetLibc && threadsCross != { } && threadsCross.package != null) [ threadsCross.package ]; } diff --git a/nixpkgs/pkgs/development/compilers/gcc/common/extra-target-flags.nix b/nixpkgs/pkgs/development/compilers/gcc/common/extra-target-flags.nix index 4dedd333b002..30a24185e3b4 100644 --- a/nixpkgs/pkgs/development/compilers/gcc/common/extra-target-flags.nix +++ b/nixpkgs/pkgs/development/compilers/gcc/common/extra-target-flags.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, crossStageStatic, langD ? false, libcCross, threadsCross }: +{ lib, stdenv, withoutTargetLibc, langD ? false, libcCross, threadsCross }: let inherit (stdenv) hostPlatform targetPlatform; @@ -11,23 +11,23 @@ in EXTRA_FLAGS_FOR_TARGET = let mkFlags = dep: langD: lib.optionals (targetPlatform != hostPlatform && dep != null && !langD) ([ "-O2 -idirafter ${lib.getDev dep}${dep.incdir or "/include"}" - ] ++ lib.optionals (! crossStageStatic) [ + ] ++ lib.optionals (! withoutTargetLibc) [ "-B${lib.getLib dep}${dep.libdir or "/lib"}" ]); in mkFlags libcCross langD - ++ lib.optionals (!crossStageStatic) (mkFlags (threadsCross.package or null) langD) + ++ lib.optionals (!withoutTargetLibc) (mkFlags (threadsCross.package or null) langD) ; EXTRA_LDFLAGS_FOR_TARGET = let mkFlags = dep: lib.optionals (targetPlatform != hostPlatform && dep != null) ([ "-Wl,-L${lib.getLib dep}${dep.libdir or "/lib"}" - ] ++ (if crossStageStatic then [ + ] ++ (if withoutTargetLibc then [ "-B${lib.getLib dep}${dep.libdir or "/lib"}" ] else [ "-Wl,-rpath,${lib.getLib dep}${dep.libdir or "/lib"}" "-Wl,-rpath-link,${lib.getLib dep}${dep.libdir or "/lib"}" ])); in mkFlags libcCross - ++ lib.optionals (!crossStageStatic) (mkFlags (threadsCross.package or null)) + ++ lib.optionals (!withoutTargetLibc) (mkFlags (threadsCross.package or null)) ; } diff --git a/nixpkgs/pkgs/development/compilers/gcc/common/libgcc.nix b/nixpkgs/pkgs/development/compilers/gcc/common/libgcc.nix index 422239262b75..b14d111e361f 100644 --- a/nixpkgs/pkgs/development/compilers/gcc/common/libgcc.nix +++ b/nixpkgs/pkgs/development/compilers/gcc/common/libgcc.nix @@ -1,16 +1,58 @@ { lib , stdenv +, version , langC , langCC , langJit +, enableShared +, targetPlatform +, hostPlatform +, withoutTargetLibc }: -let +assert !stdenv.targetPlatform.hasSharedLibraries -> !enableShared; + +drv: lib.pipe drv + +([ + + (pkg: pkg.overrideAttrs (previousAttrs: + lib.optionalAttrs ( + targetPlatform != hostPlatform && + (enableShared || targetPlatform.libc == "msvcrt") && + withoutTargetLibc + ) { + makeFlags = [ "all-gcc" "all-target-libgcc" ]; + installTargets = "install-gcc install-target-libgcc"; + })) + +] ++ + +# nixpkgs did not add the "libgcc" output until gcc11. In theory +# the following condition can be changed to `true`, but that has not +# been tested. +lib.optional (lib.versionAtLeast version "11.0") + +(let + targetPlatformSlash = + if hostPlatform.config == targetPlatform.config + then "" + else "${targetPlatform.config}/"; + enableLibGccOutput = - (with stdenv; targetPlatform == hostPlatform) && + (!stdenv.targetPlatform.isWindows || (with stdenv; targetPlatform == hostPlatform)) && !langJit && !stdenv.hostPlatform.isDarwin && - !stdenv.hostPlatform.isStatic; + enableShared + ; + + # For some reason libgcc_s.so has major-version "2" on m68k but + # "1" everywhere else. Might be worth changing this to "*". + libgcc_s-version-major = + if targetPlatform.isM68k + then "2" + else "1"; + in (pkg: pkg.overrideAttrs (previousAttrs: lib.optionalAttrs ((!langC) || langJit || enableLibGccOutput) { outputs = previousAttrs.outputs ++ lib.optionals enableLibGccOutput [ "libgcc" ]; @@ -23,6 +65,10 @@ in lib.optionalString (!langC) '' rm -f $out/lib/libgcc_s.so* '' + + lib.optionalString (hostPlatform.config != targetPlatform.config) '' + mkdir -p $lib/lib/ + ln -s ${targetPlatformSlash}lib $lib/lib + '' # TODO(amjoseph): remove the `libgcc_s.so` symlinks below and replace them # with a `-L${gccForLibs.libgcc}/lib` in cc-wrapper's @@ -35,10 +81,10 @@ in + lib.optionalString enableLibGccOutput ('' # move libgcc from lib to its own output (libgcc) mkdir -p $libgcc/lib - mv $lib/lib/libgcc_s.so $libgcc/lib/ - mv $lib/lib/libgcc_s.so.1 $libgcc/lib/ - ln -s $libgcc/lib/libgcc_s.so $lib/lib/ - ln -s $libgcc/lib/libgcc_s.so.1 $lib/lib/ + mv $lib/${targetPlatformSlash}lib/libgcc_s.so $libgcc/lib/ + mv $lib/${targetPlatformSlash}lib/libgcc_s.so.${libgcc_s-version-major} $libgcc/lib/ + ln -s $libgcc/lib/libgcc_s.so $lib/${targetPlatformSlash}lib/ + ln -s $libgcc/lib/libgcc_s.so.${libgcc_s-version-major} $lib/${targetPlatformSlash}lib/ '' # # Nixpkgs ordinarily turns dynamic linking into pseudo-static linking: @@ -95,6 +141,7 @@ in # another eliminates the ability to make these queries. # + '' - patchelf --set-rpath "" $libgcc/lib/libgcc_s.so.1 + patchelf --set-rpath "" $libgcc/lib/libgcc_s.so.${libgcc_s-version-major} ''); -})) +})))) + diff --git a/nixpkgs/pkgs/development/compilers/gcc/common/pre-configure.nix b/nixpkgs/pkgs/development/compilers/gcc/common/pre-configure.nix index 58e44b96b5d3..e386693b22c7 100644 --- a/nixpkgs/pkgs/development/compilers/gcc/common/pre-configure.nix +++ b/nixpkgs/pkgs/development/compilers/gcc/common/pre-configure.nix @@ -1,10 +1,13 @@ -{ lib, version, buildPlatform, hostPlatform, targetPlatform +{ lib +, stdenv +, version, buildPlatform, hostPlatform, targetPlatform , gnat-bootstrap ? null , langAda ? false , langJava ? false , langJit ? false , langGo -, crossStageStatic +, withoutTargetLibc +, enableShared , enableMultilib }: @@ -105,10 +108,46 @@ in lib.optionalString (hostPlatform.isSunOS && hostPlatform.is64bit) '' # gcc->clang "cross"-compilation manages to evade it: there # hostPlatform != targetPlatform, hostPlatform.config == targetPlatform.config. # We explicitly inhibit libc headers use in this case as well. -+ lib.optionalString (targetPlatform != hostPlatform && crossStageStatic) '' ++ lib.optionalString (targetPlatform != hostPlatform && withoutTargetLibc) '' export inhibit_libc=true '' +# Trick to build a gcc that is capable of emitting shared libraries *without* having the +# targetPlatform libc available beforehand. Taken from: +# https://web.archive.org/web/20170222224855/http://frank.harvard.edu/~coldwell/toolchain/ +# https://web.archive.org/web/20170224235700/http://frank.harvard.edu/~coldwell/toolchain/t-linux.diff ++ lib.optionalString (targetPlatform != hostPlatform && withoutTargetLibc && enableShared) + (let + + # crt{i,n}.o are the first and last (respectively) object file + # linked when producing an executable. Traditionally these + # files are delivered as part of the C library, but on GNU + # systems they are in fact built by GCC. Since libgcc needs to + # build before glibc, we can't wait for them to be copied by + # glibc. At this early pre-glibc stage these files sometimes + # have different names. + crtstuff-ofiles = + if targetPlatform.isPower + then "ecrti.o ecrtn.o ncrti.o ncrtn.o" + else "crti.o crtn.o"; + + # Normally, `SHLIB_LC` is set to `-lc`, which means that + # `libgcc_s.so` cannot be built until `libc.so` is available. + # The assignment below clobbers this variable, removing the + # `-lc`. + # + # On PowerPC we add `-mnewlib`, which means "libc has not been + # built yet". This causes libgcc's Makefile to use the + # gcc-built `{e,n}crt{n,i}.o` instead of failing to find the + # versions which have been repackaged in libc as `crt{n,i}.o` + # + SHLIB_LC = lib.optionalString targetPlatform.isPower "-mnewlib"; + + in '' + echo 'libgcc.a: ${crtstuff-ofiles}' >> libgcc/Makefile.in + echo 'SHLIB_LC=${SHLIB_LC}' >> libgcc/Makefile.in + '') + + lib.optionalString (!enableMultilib && hostPlatform.is64bit && !hostPlatform.isMips64n32) '' export linkLib64toLib=1 '' diff --git a/nixpkgs/pkgs/development/compilers/gcc/fix-bug-80431.patch b/nixpkgs/pkgs/development/compilers/gcc/fix-bug-80431.patch new file mode 100644 index 000000000000..2d688b8c7997 --- /dev/null +++ b/nixpkgs/pkgs/development/compilers/gcc/fix-bug-80431.patch @@ -0,0 +1,92 @@ +From de31f5445b12fd9ab9969dc536d821fe6f0edad0 Mon Sep 17 00:00:00 2001 +From: Patrick Palka <ppalka@redhat.com> +Date: Mon, 21 Jun 2021 07:54:26 -0400 +Subject: [PATCH] c++: conversion to base of vbase in NSDMI [PR80431] + +The delayed processing of conversions to a virtual base in an NSDMI +assumes the target base type is a (possibly indirect) virtual base of +the current class, but the target base type could also be a base of a +virtual base, as in the testcase below. Since such a base isn't a part +of CLASSTYPE_VBASECLASSES, we end up miscompiling the testcase due to +the call to build_base_path (with binfo=NULL_TREE) silently returning +error_mark_node. Fix this by using convert_to_base to build the +conversion instead. + + PR c++/80431 + +gcc/cp/ChangeLog: + + * tree.c (bot_replace): Use convert_to_base to build the + conversion to the (morally) virtual base. + +gcc/testsuite/ChangeLog: + + * g++.dg/cpp0x/nsdmi-virtual1a.C: New test. +--- + gcc/cp/tree.c | 14 ++++------ + gcc/testsuite/g++.dg/cpp0x/nsdmi-virtual1a.C | 28 ++++++++++++++++++++ + 2 files changed, 33 insertions(+), 9 deletions(-) + create mode 100644 gcc/testsuite/g++.dg/cpp0x/nsdmi-virtual1a.C + +diff --git a/gcc/cp/tree.c b/gcc/cp/tree.c +index fec5afaa2be..297da2b1550 100644 +--- a/gcc/cp/tree.c ++++ b/gcc/cp/tree.c +@@ -3242,15 +3242,11 @@ bot_replace (tree* t, int* /*walk_subtrees*/, void* data_) + else if (TREE_CODE (*t) == CONVERT_EXPR + && CONVERT_EXPR_VBASE_PATH (*t)) + { +- /* In an NSDMI build_base_path defers building conversions to virtual +- bases, and we handle it here. */ +- tree basetype = TYPE_MAIN_VARIANT (TREE_TYPE (TREE_TYPE (*t))); +- vec<tree, va_gc> *vbases = CLASSTYPE_VBASECLASSES (current_class_type); +- int i; tree binfo; +- FOR_EACH_VEC_SAFE_ELT (vbases, i, binfo) +- if (BINFO_TYPE (binfo) == basetype) +- break; +- *t = build_base_path (PLUS_EXPR, TREE_OPERAND (*t, 0), binfo, true, ++ /* In an NSDMI build_base_path defers building conversions to morally ++ virtual bases, and we handle it here. */ ++ tree basetype = TREE_TYPE (*t); ++ *t = convert_to_base (TREE_OPERAND (*t, 0), basetype, ++ /*check_access=*/false, /*nonnull=*/true, + tf_warning_or_error); + } + +diff --git a/gcc/testsuite/g++.dg/cpp0x/nsdmi-virtual1a.C b/gcc/testsuite/g++.dg/cpp0x/nsdmi-virtual1a.C +new file mode 100644 +index 00000000000..dc847cc16e5 +--- /dev/null ++++ b/gcc/testsuite/g++.dg/cpp0x/nsdmi-virtual1a.C +@@ -0,0 +1,28 @@ ++// PR c++/80431 ++// { dg-do run { target c++11 } } ++ ++// A variant of nsdmi-virtual1.C where A is only a morally virtual base of B. ++ ++struct A ++{ ++ A(): i(42) { } ++ int i; ++ int f() { return i; } ++}; ++ ++struct D : A { int pad; }; ++ ++struct B : virtual D ++{ ++ int j = i + f(); ++ int k = A::i + A::f(); ++}; ++ ++struct C: B { int pad; }; ++ ++int main() ++{ ++ C c; ++ if (c.j != 84 || c.k != 84) ++ __builtin_abort(); ++} +-- +2.31.1 + diff --git a/nixpkgs/pkgs/development/compilers/gcc/install-info-files-serially.patch b/nixpkgs/pkgs/development/compilers/gcc/install-info-files-serially.patch deleted file mode 100644 index bec7c0a158d0..000000000000 --- a/nixpkgs/pkgs/development/compilers/gcc/install-info-files-serially.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -Naur gcc-12.2.0/gcc/Makefile.in gcc-12.2.0-new/gcc/Makefile.in ---- gcc-12.2.0/gcc/Makefile.in 2022-08-19 10:09:52.280658631 +0200 -+++ gcc-12.2.0-new/gcc/Makefile.in 2023-05-04 14:35:44.401420184 +0200 -@@ -3781,6 +3781,11 @@ - fi; \ - fi - -+# We don't care about the order in which the info files are built, but -+# install-info doesn't support multiple parallel invocations writing to -+# the same `dir-file`, so we have to disable parallelism for that reason: -+.NOTPARALLEL: install-info -+ - # Install the info files. - # $(INSTALL_DATA) might be a relative pathname, so we can't cd into srcdir - # to do the install. diff --git a/nixpkgs/pkgs/development/compilers/gforth/default.nix b/nixpkgs/pkgs/development/compilers/gforth/default.nix index c5508d2e043d..b76482ba5963 100644 --- a/nixpkgs/pkgs/development/compilers/gforth/default.nix +++ b/nixpkgs/pkgs/development/compilers/gforth/default.nix @@ -9,13 +9,13 @@ let in stdenv.mkDerivation rec { pname = "gforth"; - version = "0.7.9_20220127"; + version = "0.7.9_20230518"; src = fetchFromGitHub { owner = "forthy42"; repo = "gforth"; rev = version; - sha256 = "sha256-3+ObHhsPvW44UFiN0GWOhwo7aiqhjwxNY8hw2Wv4MK0="; + hash = "sha256-rXtmmENBt9RMdLPq8GDyndh4+CYnCmz6NYpe3kH5OwU="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/compilers/ghc/8.10.2-binary.nix b/nixpkgs/pkgs/development/compilers/ghc/8.10.2-binary.nix index 41461a26d425..368bc76bf0e2 100644 --- a/nixpkgs/pkgs/development/compilers/ghc/8.10.2-binary.nix +++ b/nixpkgs/pkgs/development/compilers/ghc/8.10.2-binary.nix @@ -421,7 +421,10 @@ stdenv.mkDerivation rec { # Our Cabal compiler name haskellCompilerName = "ghc-${version}"; - } // lib.optionalAttrs (binDistUsed.isHadrian or false) { + } + # We duplicate binDistUsed here since we have a sensible default even if no bindist is avaible, + # this makes sure that getting the `meta` attribute doesn't throw even on unsupported platforms. + // lib.optionalAttrs (ghcBinDists.${distSetName}.${stdenv.hostPlatform.system}.isHadrian or false) { # Normal GHC derivations expose the hadrian derivation used to build them # here. In the case of bindists we just make sure that the attribute exists, # as it is used for checking if a GHC derivation has been built with hadrian. diff --git a/nixpkgs/pkgs/development/compilers/ghc/8.10.7-binary.nix b/nixpkgs/pkgs/development/compilers/ghc/8.10.7-binary.nix index 22552fa67fb2..73ce0c918574 100644 --- a/nixpkgs/pkgs/development/compilers/ghc/8.10.7-binary.nix +++ b/nixpkgs/pkgs/development/compilers/ghc/8.10.7-binary.nix @@ -417,7 +417,10 @@ stdenv.mkDerivation rec { # Our Cabal compiler name haskellCompilerName = "ghc-${version}"; - } // lib.optionalAttrs (binDistUsed.isHadrian or false) { + } + # We duplicate binDistUsed here since we have a sensible default even if no bindist is avaible, + # this makes sure that getting the `meta` attribute doesn't throw even on unsupported platforms. + // lib.optionalAttrs (ghcBinDists.${distSetName}.${stdenv.hostPlatform.system}.isHadrian or false) { # Normal GHC derivations expose the hadrian derivation used to build them # here. In the case of bindists we just make sure that the attribute exists, # as it is used for checking if a GHC derivation has been built with hadrian. diff --git a/nixpkgs/pkgs/development/compilers/ghc/9.2.4-binary.nix b/nixpkgs/pkgs/development/compilers/ghc/9.2.4-binary.nix index 79b006ce5537..93380fd14519 100644 --- a/nixpkgs/pkgs/development/compilers/ghc/9.2.4-binary.nix +++ b/nixpkgs/pkgs/development/compilers/ghc/9.2.4-binary.nix @@ -403,7 +403,10 @@ stdenv.mkDerivation rec { # Our Cabal compiler name haskellCompilerName = "ghc-${version}"; - } // lib.optionalAttrs (binDistUsed.isHadrian or false) { + } + # We duplicate binDistUsed here since we have a sensible default even if no bindist is avaible, + # this makes sure that getting the `meta` attribute doesn't throw even on unsupported platforms. + // lib.optionalAttrs (ghcBinDists.${distSetName}.${stdenv.hostPlatform.system}.isHadrian or false) { # Normal GHC derivations expose the hadrian derivation used to build them # here. In the case of bindists we just make sure that the attribute exists, # as it is used for checking if a GHC derivation has been built with hadrian. diff --git a/nixpkgs/pkgs/development/compilers/ghc/9.6.1.nix b/nixpkgs/pkgs/development/compilers/ghc/9.6.1.nix deleted file mode 100644 index 7e8622f218cb..000000000000 --- a/nixpkgs/pkgs/development/compilers/ghc/9.6.1.nix +++ /dev/null @@ -1,4 +0,0 @@ -import ./common-hadrian.nix rec { - version = "9.6.1"; - sha256 = "fe5ac909cb8bb087e235de97fa63aff47a8ae650efaa37a2140f4780e21f34cb"; -} diff --git a/nixpkgs/pkgs/development/compilers/ghc/common-hadrian.nix b/nixpkgs/pkgs/development/compilers/ghc/common-hadrian.nix index b90a4934fdba..099a7fd2568f 100644 --- a/nixpkgs/pkgs/development/compilers/ghc/common-hadrian.nix +++ b/nixpkgs/pkgs/development/compilers/ghc/common-hadrian.nix @@ -385,6 +385,12 @@ stdenv.mkDerivation ({ "--enable-dwarf-unwind" "--with-libdw-includes=${lib.getDev elfutils}/include" "--with-libdw-libraries=${lib.getLib elfutils}/lib" + ] ++ lib.optionals targetPlatform.isDarwin [ + # Darwin uses llvm-ar. GHC will try to use `-L` with `ar` when it is `llvm-ar` + # but it doesn’t currently work because Cabal never uses `-L` on Darwin. See: + # https://gitlab.haskell.org/ghc/ghc/-/issues/23188 + # https://github.com/haskell/cabal/issues/8882 + "fp_cv_prog_ar_supports_dash_l=no" ]; # Make sure we never relax`$PATH` and hooks support for compatibility. diff --git a/nixpkgs/pkgs/development/compilers/ghc/head.nix b/nixpkgs/pkgs/development/compilers/ghc/head.nix index 76d63c9d695d..951b708381f1 100644 --- a/nixpkgs/pkgs/development/compilers/ghc/head.nix +++ b/nixpkgs/pkgs/development/compilers/ghc/head.nix @@ -1,5 +1,5 @@ import ./common-hadrian.nix { - version = "9.7.20230505"; - rev = "983ce55815f2dd57f84ee86eee97febf7d80b470"; - sha256 = "sha256-U+LZIe9WbF/DF5Zn8w8wkRf4JJHxgdY2ahM517bwRo4="; + version = "9.7.20230527"; + rev = "69fdbece5f6ca0a718bb9f1fef7b0ab57cf6b664"; + sha256 = "13rf1d27wdich0kmbds55by9vj3wz0v9clba9p8qpwz7x7wpcjz2"; } diff --git a/nixpkgs/pkgs/development/compilers/gleam/default.nix b/nixpkgs/pkgs/development/compilers/gleam/default.nix index 58069a4a7939..ea82d72a481a 100644 --- a/nixpkgs/pkgs/development/compilers/gleam/default.nix +++ b/nixpkgs/pkgs/development/compilers/gleam/default.nix @@ -1,14 +1,24 @@ -{ lib, stdenv, rustPlatform, fetchFromGitHub, git, pkg-config, openssl, Security, libiconv }: +{ lib +, stdenv +, rustPlatform +, fetchFromGitHub +, git +, pkg-config +, openssl +, Security +, libiconv +, nix-update-script +}: rustPlatform.buildRustPackage rec { pname = "gleam"; - version = "0.29.0"; + version = "0.30.5"; src = fetchFromGitHub { owner = "gleam-lang"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-qGFF6Q1cY2hDb2TycB39RY7RAIJica0y6ju76NeIplY="; + hash = "sha256-DOQhuSNIyP6K+M9a/uM8Cn6gyzpaH23+n4fux8otPWQ="; }; nativeBuildInputs = [ git pkg-config ]; @@ -16,7 +26,9 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security libiconv ]; - cargoHash = "sha256-/WIM7DhnfPlo/DGoTSEHON+et55h364V++VHU8Olvuc="; + cargoHash = "sha256-CkMUconCw94Jvy7FhrOZvBbA8DAi91Ae5GFxGFBcEew="; + + passthru.updateScript = nix-update-script { }; meta = with lib; { description = "A statically typed language for the Erlang VM"; diff --git a/nixpkgs/pkgs/development/compilers/glslang/default.nix b/nixpkgs/pkgs/development/compilers/glslang/default.nix index c3ed81a839af..a53e78103ad5 100644 --- a/nixpkgs/pkgs/development/compilers/glslang/default.nix +++ b/nixpkgs/pkgs/development/compilers/glslang/default.nix @@ -10,15 +10,24 @@ }: stdenv.mkDerivation rec { pname = "glslang"; - version = "12.1.0"; + version = "12.2.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "glslang"; rev = version; - hash = "sha256-U45/7G02o82EP4zh7i2Go0VCnsO1B7vxDwIokjyo5Rk="; + hash = "sha256-2i6DZA42b0s1ul6VDhjPi9lpSYvsRD8r9yiRoRfVoW0="; }; + patches = [ + # Fix build on Darwin + # FIXME: remove for next release + (fetchpatch { + url = "https://github.com/KhronosGroup/glslang/commit/6a7ec4be7b8a22ab16cea0f294b5973dbcdd637a.diff"; + hash = "sha256-O1N62X6LZNRNHHz90TLJDbt6pDr28EI6IKMbMXcKBj8="; + }) + ]; + # These get set at all-packages, keep onto them for child drvs passthru = { spirv-tools = spirv-tools; @@ -27,19 +36,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake python3 bison jq ]; - patches = [ - # Related PR: https://github.com/KhronosGroup/glslang/pull/3067 - ./use-CMAKE_INSTALL_FULL_LIBDIR-in-compat-cmake-files.patch - # Upstream tries to detect the Darwin linker by checking for AppleClang, but it’s just Clang in nixpkgs. - # Revert the commit to allow the build to work on Darwin with the nixpkg Darwin Clang toolchain. - (fetchpatch { - name = "Fix-Darwin-linker-error.patch"; - url = "https://github.com/KhronosGroup/glslang/commit/586baa35a47b3aa6ad3fa829a27f0f4206400668.patch"; - hash = "sha256-paAl4E8GzogcxDEzn/XuhNH6XObp+i7WfArqAiuH4Mk="; - revert = true; - }) - ]; - postPatch = '' cp --no-preserve=mode -r "${spirv-tools.src}" External/spirv-tools ln -s "${spirv-headers.src}" External/spirv-tools/external/spirv-headers diff --git a/nixpkgs/pkgs/development/compilers/glslang/use-CMAKE_INSTALL_FULL_LIBDIR-in-compat-cmake-files.patch b/nixpkgs/pkgs/development/compilers/glslang/use-CMAKE_INSTALL_FULL_LIBDIR-in-compat-cmake-files.patch deleted file mode 100644 index 43ab21963527..000000000000 --- a/nixpkgs/pkgs/development/compilers/glslang/use-CMAKE_INSTALL_FULL_LIBDIR-in-compat-cmake-files.patch +++ /dev/null @@ -1,139 +0,0 @@ -commit 0bcfd795469c6067d1e891198d9177afa5cce1c9 -Author: Chuang Zhu <git@chuang.cz> -Date: Sat Nov 19 12:03:20 2022 +0800 - - Use CMAKE_INSTALL_FULL_LIBDIR in compat cmake files - - According to - https://cmake.org/cmake/help/v3.25/module/GNUInstallDirs.html, - CMAKE_INSTALL_LIBDIR can be an absolute path. For instance, Nixpkgs - [defined it to an absolute path in /nix/store](https://github.com/NixOS/nixpkgs/blob/3d17b4c305cefef284109fa9d426b00f3e5072c6/pkgs/development/tools/build-managers/cmake/setup-hook.sh#L101). - The output in this case is: - - # result-glslang/lib/cmake/glslangTargets.cmake:5 - include("${CMAKE_CURRENT_LIST_DIR}/../..//nix/store/3mif2zibig0cilk5dbz334278n0vlq9s-glslang-1.3.231.0/lib/glslang/glslang-targets.cmake") - - Signed-off-by: Chuang Zhu <git@chuang.cz> - -diff --git a/OGLCompilersDLL/CMakeLists.txt b/OGLCompilersDLL/CMakeLists.txt -index 33f16b0d..71a5675d 100644 ---- a/OGLCompilersDLL/CMakeLists.txt -+++ b/OGLCompilersDLL/CMakeLists.txt -@@ -49,7 +49,7 @@ if(ENABLE_GLSLANG_INSTALL AND NOT BUILD_SHARED_LIBS) - message(WARNING \"Using `OGLCompilerTargets.cmake` is deprecated: use `find_package(glslang)` to find glslang CMake targets.\") - - if (NOT TARGET glslang::OGLCompiler) -- include(\"\${CMAKE_CURRENT_LIST_DIR}/../../${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}/glslang-targets.cmake\") -+ include(\"${CMAKE_INSTALL_FULL_LIBDIR}/cmake/${PROJECT_NAME}/glslang-targets.cmake\") - endif() - - add_library(OGLCompiler ALIAS glslang::OGLCompiler) -diff --git a/SPIRV/CMakeLists.txt b/SPIRV/CMakeLists.txt -index 35b74621..b31bdd63 100644 ---- a/SPIRV/CMakeLists.txt -+++ b/SPIRV/CMakeLists.txt -@@ -125,7 +125,7 @@ if(ENABLE_GLSLANG_INSTALL) - message(WARNING \"Using `SPVRemapperTargets.cmake` is deprecated: use `find_package(glslang)` to find glslang CMake targets.\") - - if (NOT TARGET glslang::SPVRemapper) -- include(\"\${CMAKE_CURRENT_LIST_DIR}/../../${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}/glslang-targets.cmake\") -+ include(\"${CMAKE_INSTALL_FULL_LIBDIR}/cmake/${PROJECT_NAME}/glslang-targets.cmake\") - endif() - - add_library(SPVRemapper ALIAS glslang::SPVRemapper) -@@ -137,7 +137,7 @@ if(ENABLE_GLSLANG_INSTALL) - message(WARNING \"Using `SPIRVTargets.cmake` is deprecated: use `find_package(glslang)` to find glslang CMake targets.\") - - if (NOT TARGET glslang::SPIRV) -- include(\"\${CMAKE_CURRENT_LIST_DIR}/../../${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}/glslang-targets.cmake\") -+ include(\"${CMAKE_INSTALL_FULL_LIBDIR}/cmake/${PROJECT_NAME}/glslang-targets.cmake\") - endif() - - add_library(SPIRV ALIAS glslang::SPIRV) -diff --git a/StandAlone/CMakeLists.txt b/StandAlone/CMakeLists.txt -index b1ba18f6..8ddef104 100644 ---- a/StandAlone/CMakeLists.txt -+++ b/StandAlone/CMakeLists.txt -@@ -101,7 +101,7 @@ if(ENABLE_GLSLANG_INSTALL) - message(WARNING \"Using `glslangValidatorTargets.cmake` is deprecated: use `find_package(glslang)` to find glslang CMake targets.\") - - if (NOT TARGET glslang::glslangValidator) -- include(\"\${CMAKE_CURRENT_LIST_DIR}/../../${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}/glslang-targets.cmake\") -+ include(\"${CMAKE_INSTALL_FULL_LIBDIR}/cmake/${PROJECT_NAME}/glslang-targets.cmake\") - endif() - - add_library(glslangValidator ALIAS glslang::glslangValidator) -@@ -116,7 +116,7 @@ if(ENABLE_GLSLANG_INSTALL) - message(WARNING \"Using `spirv-remapTargets.cmake` is deprecated: use `find_package(glslang)` to find glslang CMake targets.\") - - if (NOT TARGET glslang::spirv-remap) -- include(\"\${CMAKE_CURRENT_LIST_DIR}/../../${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}/glslang-targets.cmake\") -+ include(\"${CMAKE_INSTALL_FULL_LIBDIR}/cmake/${PROJECT_NAME}/glslang-targets.cmake\") - endif() - - add_library(spirv-remap ALIAS glslang::spirv-remap) -diff --git a/glslang/CMakeLists.txt b/glslang/CMakeLists.txt -index 7d8790c4..4d8a537b 100644 ---- a/glslang/CMakeLists.txt -+++ b/glslang/CMakeLists.txt -@@ -234,7 +234,7 @@ if(ENABLE_GLSLANG_INSTALL) - message(WARNING \"Using `glslangTargets.cmake` is deprecated: use `find_package(glslang)` to find glslang CMake targets.\") - - if (NOT TARGET glslang::glslang) -- include(\"\${CMAKE_CURRENT_LIST_DIR}/../../${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}/glslang-targets.cmake\") -+ include(\"${CMAKE_INSTALL_FULL_LIBDIR}/cmake/${PROJECT_NAME}/glslang-targets.cmake\") - endif() - - if(${BUILD_SHARED_LIBS}) -diff --git a/glslang/OSDependent/Unix/CMakeLists.txt b/glslang/OSDependent/Unix/CMakeLists.txt -index 7ed71fbf..acb74275 100644 ---- a/glslang/OSDependent/Unix/CMakeLists.txt -+++ b/glslang/OSDependent/Unix/CMakeLists.txt -@@ -60,7 +60,7 @@ if(ENABLE_GLSLANG_INSTALL AND NOT BUILD_SHARED_LIBS) - message(WARNING \"Using `OSDependentTargets.cmake` is deprecated: use `find_package(glslang)` to find glslang CMake targets.\") - - if (NOT TARGET glslang::OSDependent) -- include(\"\${CMAKE_CURRENT_LIST_DIR}/../../${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}/glslang-targets.cmake\") -+ include(\"${CMAKE_INSTALL_FULL_LIBDIR}/cmake/${PROJECT_NAME}/glslang-targets.cmake\") - endif() - - add_library(OSDependent ALIAS glslang::OSDependent) -diff --git a/glslang/OSDependent/Windows/CMakeLists.txt b/glslang/OSDependent/Windows/CMakeLists.txt -index 67976da8..882133ab 100644 ---- a/glslang/OSDependent/Windows/CMakeLists.txt -+++ b/glslang/OSDependent/Windows/CMakeLists.txt -@@ -55,7 +55,7 @@ if(ENABLE_GLSLANG_INSTALL) - message(WARNING \"Using `OSDependentTargets.cmake` is deprecated: use `find_package(glslang)` to find glslang CMake targets.\") - - if (NOT TARGET glslang::OSDependent) -- include(\"\${CMAKE_CURRENT_LIST_DIR}/../../${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}/glslang-targets.cmake\") -+ include(\"${CMAKE_INSTALL_FULL_LIBDIR}/cmake/${PROJECT_NAME}/glslang-targets.cmake\") - endif() - - add_library(OSDependent ALIAS glslang::OSDependent) -diff --git a/gtests/CMakeLists.txt b/gtests/CMakeLists.txt -index 203812d8..408a92db 100644 ---- a/gtests/CMakeLists.txt -+++ b/gtests/CMakeLists.txt -@@ -76,7 +76,7 @@ if(BUILD_TESTING) - message(WARNING \"Using `glslangtestsTargets.cmake` is deprecated: use `find_package(glslang)` to find glslang CMake targets.\") - - if (NOT TARGET glslang::glslangtests) -- include(\"\${CMAKE_CURRENT_LIST_DIR}/../../${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}/glslang-targets.cmake\") -+ include(\"${CMAKE_INSTALL_FULL_LIBDIR}/cmake/${PROJECT_NAME}/glslang-targets.cmake\") - endif() - - add_library(glslangtests ALIAS glslang::glslangtests) -diff --git a/hlsl/CMakeLists.txt b/hlsl/CMakeLists.txt -index 4d5f15fd..16c82a67 100644 ---- a/hlsl/CMakeLists.txt -+++ b/hlsl/CMakeLists.txt -@@ -53,7 +53,7 @@ if(ENABLE_GLSLANG_INSTALL) - message(WARNING \"Using `HLSLTargets.cmake` is deprecated: use `find_package(glslang)` to find glslang CMake targets.\") - - if (NOT TARGET glslang::HLSL) -- include(\"\${CMAKE_CURRENT_LIST_DIR}/../../${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}/glslang-targets.cmake\") -+ include(\"${CMAKE_INSTALL_FULL_LIBDIR}/cmake/${PROJECT_NAME}/glslang-targets.cmake\") - endif() - - add_library(HLSL ALIAS glslang::HLSL) diff --git a/nixpkgs/pkgs/development/compilers/go/1.19.nix b/nixpkgs/pkgs/development/compilers/go/1.19.nix index 3e25ed128619..0ce8fcc659a8 100644 --- a/nixpkgs/pkgs/development/compilers/go/1.19.nix +++ b/nixpkgs/pkgs/development/compilers/go/1.19.nix @@ -47,11 +47,11 @@ let in stdenv.mkDerivation rec { pname = "go"; - version = "1.19.10"; + version = "1.19.12"; src = fetchurl { url = "https://go.dev/dl/go${version}.src.tar.gz"; - hash = "sha256-E3VbzOUpdH1fKTDe4DRzDIbQK9PlIas+K77eVI07lT8="; + hash = "sha256-7l1Q4Kf9dLobE3y4eWCaqu+YgL9ytdF0IQDjiucrtVc="; }; strictDeps = true; diff --git a/nixpkgs/pkgs/development/compilers/go/1.20.nix b/nixpkgs/pkgs/development/compilers/go/1.20.nix index ad5a5e5944a9..18fa8db98792 100644 --- a/nixpkgs/pkgs/development/compilers/go/1.20.nix +++ b/nixpkgs/pkgs/development/compilers/go/1.20.nix @@ -46,11 +46,11 @@ let in stdenv.mkDerivation rec { pname = "go"; - version = "1.20.4"; + version = "1.20.6"; src = fetchurl { url = "https://go.dev/dl/go${version}.src.tar.gz"; - hash = "sha256-nzSs4Sh2S3o6SyOLgFhWzBshhDBN+eVpCCWwcQ9CAtY="; + hash = "sha256-Yu5bxvtVuLro9wXgy434bWRTYmtOz5MnnihnCS4Lf3A="; }; strictDeps = true; diff --git a/nixpkgs/pkgs/development/compilers/halide/default.nix b/nixpkgs/pkgs/development/compilers/halide/default.nix index 636506836dc9..0f5a330faa18 100644 --- a/nixpkgs/pkgs/development/compilers/halide/default.nix +++ b/nixpkgs/pkgs/development/compilers/halide/default.nix @@ -3,9 +3,11 @@ , lib , fetchFromGitHub , cmake +, libffi , libpng , libjpeg , mesa +, libGL , eigen , openblas , blas @@ -43,11 +45,14 @@ stdenv.mkDerivation rec { llvmPackages.lld llvmPackages.openmp llvmPackages.libclang + libffi libpng libjpeg - mesa eigen openblas + ] ++ lib.optionals (!stdenv.isDarwin) [ + mesa + libGL ]; nativeBuildInputs = [ cmake ]; @@ -57,6 +62,6 @@ stdenv.mkDerivation rec { homepage = "https://halide-lang.org"; license = licenses.mit; platforms = platforms.all; - maintainers = with maintainers; [ ck3d atila ]; + maintainers = with maintainers; [ ck3d atila twesterhout ]; }; } diff --git a/nixpkgs/pkgs/development/compilers/hvm/default.nix b/nixpkgs/pkgs/development/compilers/hvm/default.nix index dc933572514f..03dcdcae6724 100644 --- a/nixpkgs/pkgs/development/compilers/hvm/default.nix +++ b/nixpkgs/pkgs/development/compilers/hvm/default.nix @@ -1,7 +1,6 @@ { lib , rustPlatform , fetchCrate -, fetchpatch , stdenv , darwin }: @@ -17,18 +16,6 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-RQnyVRHWrqnKcI3Jy593jDTydG1nGyrScsqSNyJTDJk="; - patches = [ - # see https://github.com/higherorderco/hvm/pull/220 - # this commit removes the feature to fix build with rust nightly - # but this feature is required with rust stable - (fetchpatch { - name = "revert-fix-remove-feature-automic-mut-ptr.patch"; - url = "https://github.com/higherorderco/hvm/commit/c0e35c79b4e31c266ad33beadc397c428e4090ee.patch"; - hash = "sha256-9xxu7NOtz3Tuzf5F0Mi4rw45Xnyh7h9hbTrzq4yfslg="; - revert = true; - }) - ]; - buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk_11_0.frameworks.IOKit ]; diff --git a/nixpkgs/pkgs/development/compilers/inform6/default.nix b/nixpkgs/pkgs/development/compilers/inform6/default.nix index e22d279fd9f2..770f26ca443a 100644 --- a/nixpkgs/pkgs/development/compilers/inform6/default.nix +++ b/nixpkgs/pkgs/development/compilers/inform6/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "inform6"; - version = "6.41-r5"; + version = "6.41-r6"; src = fetchurl { url = "https://ifarchive.org/if-archive/infocom/compilers/inform6/source/inform-${version}.tar.gz"; - sha256 = "sha256-JsLufRmqUmJ4if1XURi9swS0upw+Hj827T27A9qDANg="; + sha256 = "sha256-YJ3k9c+uYRzI5vMzPXAWvbLoAv45CWxZ21DFsx4UtVc="; }; buildInputs = [ perl ]; diff --git a/nixpkgs/pkgs/development/compilers/intel-graphics-compiler/default.nix b/nixpkgs/pkgs/development/compilers/intel-graphics-compiler/default.nix index b5a5f0671ab8..d2093ccb6c68 100644 --- a/nixpkgs/pkgs/development/compilers/intel-graphics-compiler/default.nix +++ b/nixpkgs/pkgs/development/compilers/intel-graphics-compiler/default.nix @@ -86,6 +86,9 @@ stdenv.mkDerivation rec { "-DIGC_PREFERRED_LLVM_VERSION=${lib.getVersion llvm}" ]; + # causes redefinition of _FORTIFY_SOURCE + hardeningDisable = [ "fortify3" ]; + meta = with lib; { homepage = "https://github.com/intel/intel-graphics-compiler"; description = "LLVM-based compiler for OpenCL targeting Intel Gen graphics hardware"; diff --git a/nixpkgs/pkgs/development/compilers/ispc/default.nix b/nixpkgs/pkgs/development/compilers/ispc/default.nix index 004bf4bb10de..f124cb4d4e68 100644 --- a/nixpkgs/pkgs/development/compilers/ispc/default.nix +++ b/nixpkgs/pkgs/development/compilers/ispc/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, fetchpatch -, cmake, which, m4, python3, bison, flex, llvmPackages, ncurses +, cmake, which, m4, python3, bison, flex, llvmPackages, ncurses, xcode # the default test target is sse4, but that is not supported by all Hydra agents , testedTargets ? if stdenv.isAarch64 || stdenv.isAarch32 then [ "neon-i32x4" ] else [ "sse2-i32x4" ] @@ -7,16 +7,16 @@ stdenv.mkDerivation rec { pname = "ispc"; - version = "1.18.1"; + version = "1.19.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-WBAVgjQjW4x9JGx6xotPoTVOePsPjBJEyBYA7TCTBvc="; + sha256 = "sha256:0yhcgyzjlrgs920lm0l6kygj2skanfb6qkxbdgm69r8c2xkzkaa3"; }; - nativeBuildInputs = [ cmake which m4 bison flex python3 llvmPackages.libllvm.dev ]; + nativeBuildInputs = [ cmake which m4 bison flex python3 llvmPackages.libllvm.dev ] ++ lib.lists.optionals stdenv.isDarwin [ xcode ]; buildInputs = with llvmPackages; [ libllvm libclang openmp ncurses ]; @@ -30,8 +30,7 @@ stdenv.mkDerivation rec { inherit testedTargets; - # needs 'transcendentals' executable, which is only on linux - doCheck = stdenv.isLinux; + doCheck = true; # the compiler enforces -Werror, and -fno-strict-overflow makes it mad. # hilariously this is something of a double negative: 'disable' the @@ -60,6 +59,8 @@ stdenv.mkDerivation rec { "-DISPC_INCLUDE_UTILS=OFF" ("-DARM_ENABLED=" + (if stdenv.isAarch64 || stdenv.isAarch32 then "TRUE" else "FALSE")) ("-DX86_ENABLED=" + (if stdenv.isx86_64 || stdenv.isx86_32 then "TRUE" else "FALSE")) + ] ++ lib.lists.optionals stdenv.isDarwin [ + "-DISPC_MACOS_SDK_PATH=${xcode}/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk" ]; meta = with lib; { diff --git a/nixpkgs/pkgs/development/compilers/jasmin-compiler/default.nix b/nixpkgs/pkgs/development/compilers/jasmin-compiler/default.nix index 4ff706087cef..9f539f698182 100644 --- a/nixpkgs/pkgs/development/compilers/jasmin-compiler/default.nix +++ b/nixpkgs/pkgs/development/compilers/jasmin-compiler/default.nix @@ -2,32 +2,45 @@ stdenv.mkDerivation rec { pname = "jasmin-compiler"; - version = "2022.09.3"; + version = "2023.06.0"; src = fetchurl { url = "https://github.com/jasmin-lang/jasmin/releases/download/v${version}/jasmin-compiler-v${version}.tar.bz2"; - hash = "sha256-CCLUF3GDeQrWIur1ve19WveNiOR/6kRVWuU7wvmXGGg="; + hash = "sha256-yQBQGDNZQhNATs62nqWsgl/HzQCH24EHPp87B3I0Dxo="; }; sourceRoot = "jasmin-compiler-v${version}/compiler"; - nativeBuildInputs = with ocamlPackages; [ ocaml findlib ocamlbuild menhir camlidl ]; + # Released tarball contains extraneous `dune` files + # See https://github.com/jasmin-lang/jasmin/pull/495 + preBuild = '' + rm -rf tests + ''; + + nativeBuildInputs = with ocamlPackages; [ ocaml findlib dune_3 menhir camlidl cmdliner ]; buildInputs = [ mpfr ppl ] ++ (with ocamlPackages; [ apron + yojson + ]); + + propagatedBuildInputs = with ocamlPackages; [ batteries menhirLib - yojson zarith - ]); + ]; + + outputs = [ "bin" "lib" "out" ]; installPhase = '' runHook preInstall - mkdir -p $out/bin - cp jasminc.native $out/bin/jasminc + dune build @install + dune install --prefix=$bin --libdir=$out/lib/ocaml/${ocamlPackages.ocaml.version}/site-lib + mkdir -p $lib/lib/jasmin/easycrypt + cp ../eclib/*.ec $lib/lib/jasmin/easycrypt runHook postInstall ''; diff --git a/nixpkgs/pkgs/development/compilers/jetbrains-jdk/default.nix b/nixpkgs/pkgs/development/compilers/jetbrains-jdk/default.nix index f5328e0b9d98..377f66ca97bc 100644 --- a/nixpkgs/pkgs/development/compilers/jetbrains-jdk/default.nix +++ b/nixpkgs/pkgs/development/compilers/jetbrains-jdk/default.nix @@ -29,8 +29,8 @@ openjdk17.overrideAttrs (oldAttrs: rec { pname = "jetbrains-jdk-jcef"; - javaVersion = "17.0.6"; - build = "829.9"; + javaVersion = "17.0.7"; + build = "829.16"; # To get the new tag: # git clone https://github.com/jetbrains/jetbrainsruntime # cd jetbrainsruntime @@ -43,7 +43,7 @@ openjdk17.overrideAttrs (oldAttrs: rec { owner = "JetBrains"; repo = "JetBrainsRuntime"; rev = "jb${version}"; - hash = "sha256-E0pk2dz+iLKuQqMvczWNwy9ifLO8YGKXlKt3MQgiRXo="; + hash = "sha256-b3wW52knkYUeG8h4naTQLGUedhAMiPnUsn3zFAiJCwM="; }; BOOT_JDK = openjdk17-bootstrap.home; diff --git a/nixpkgs/pkgs/development/compilers/jsonnet/default.nix b/nixpkgs/pkgs/development/compilers/jsonnet/default.nix index a4aec00711fb..8e723cdb8211 100644 --- a/nixpkgs/pkgs/development/compilers/jsonnet/default.nix +++ b/nixpkgs/pkgs/development/compilers/jsonnet/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { pname = "jsonnet"; version = "0.20.0"; - outputs = ["out" "doc"]; + outputs = [ "out" "doc" ]; src = fetchFromGitHub { rev = "v${version}"; @@ -15,7 +15,17 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ jekyll cmake ]; buildInputs = [ gtest ]; - cmakeFlags = ["-DBUILD_STATIC_LIBS=ON" "-DUSE_SYSTEM_GTEST=ON" ]; + cmakeFlags = [ + "-DUSE_SYSTEM_GTEST=ON" + "-DBUILD_STATIC_LIBS=${if stdenv.hostPlatform.isStatic then "ON" else "OFF"}" + ] ++ lib.optionals (!stdenv.isDarwin) [ + "-DBUILD_SHARED_BINARIES=${if stdenv.hostPlatform.isStatic then "OFF" else "ON"}" + ]; + + # https://github.com/google/jsonnet/issues/778 + patches = [ + ./fix-cpp-unresolved-symbols.patch + ]; enableParallelBuilding = true; diff --git a/nixpkgs/pkgs/development/compilers/jsonnet/fix-cpp-unresolved-symbols.patch b/nixpkgs/pkgs/development/compilers/jsonnet/fix-cpp-unresolved-symbols.patch new file mode 100644 index 000000000000..dc4cdcf2ea1b --- /dev/null +++ b/nixpkgs/pkgs/development/compilers/jsonnet/fix-cpp-unresolved-symbols.patch @@ -0,0 +1,12 @@ +diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt +index 3a52458..872e6c6 100644 +--- a/cpp/CMakeLists.txt ++++ b/cpp/CMakeLists.txt +@@ -10,6 +10,7 @@ set(LIBJSONNETPP_SOURCE + + add_library(libjsonnet++ SHARED ${LIBJSONNETPP_HEADERS} ${LIBJSONNETPP_SOURCE}) + add_dependencies(libjsonnet++ jsonnet) ++target_link_libraries(libjsonnet++ libjsonnet) + # target_link_libraries(libjsonnet libjsonnet) + + # CMake prepends CMAKE_SHARED_LIBRARY_PREFIX to shared libraries, so without diff --git a/nixpkgs/pkgs/development/compilers/julia/1.9-bin.nix b/nixpkgs/pkgs/development/compilers/julia/1.9-bin.nix index 94a6c5d880c4..9bae485b34d1 100644 --- a/nixpkgs/pkgs/development/compilers/julia/1.9-bin.nix +++ b/nixpkgs/pkgs/development/compilers/julia/1.9-bin.nix @@ -24,24 +24,24 @@ let in stdenv.mkDerivation rec { pname = "julia-bin"; - version = "1.9.1"; + version = "1.9.2"; src = { x86_64-linux = fetchurl { url = "https://julialang-s3.julialang.org/bin/linux/x64/${lib.versions.majorMinor version}/julia-${version}-linux-x86_64.tar.gz"; - hash = "sha256-zeFKWPiZJR8wz87YcFVib0SEV4Blnr6NUMvExnsxmXw="; + sha256 = "4c2d799f442d7fe718827b19da2bacb72ea041b9ce55f24eee7b1313f57c4383"; }; aarch64-linux = fetchurl { url = "https://julialang-s3.julialang.org/bin/linux/aarch64/${lib.versions.majorMinor version}/julia-${version}-linux-aarch64.tar.gz"; - hash = "sha256-tkPM0+Kllg985wVSQ3Q9Cjm63aOXS849d4Yd02O63RA="; + sha256 = "682397f8895149f0e283f0b27bffc6694033bdfb19f9366c80f6efdf3685f27c"; }; x86_64-darwin = fetchurl { url = "https://julialang-s3.julialang.org/bin/mac/x64/${lib.versions.majorMinor version}/julia-${version}-mac64.tar.gz"; - hash = "sha256-STaN2u9ON+1gaAimyli6DxpEUaJ7ggGu1NnXskwnaBc="; + sha256 = "a2e8eb31a89b26e4a99349303aeff8e8ee780144bbdb1f7eda6f41024d42cadb"; }; aarch64-darwin = fetchurl { url = "https://julialang-s3.julialang.org/bin/mac/aarch64/${lib.versions.majorMinor version}/julia-${version}-macaarch64.tar.gz"; - hash = "sha256-nj4CymVGUT3OJlN5q+lXyytbDM9AZiGUhtoOuHLdzrw="; + sha256 = "77c71ff8cb1fcdb84097e86a9fb579a8b34d8e7fd8e24d43107042e0fb988b76"; }; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); diff --git a/nixpkgs/pkgs/development/compilers/julia/1.9.nix b/nixpkgs/pkgs/development/compilers/julia/1.9.nix index ba8e94e1eaac..5b6d027914d7 100644 --- a/nixpkgs/pkgs/development/compilers/julia/1.9.nix +++ b/nixpkgs/pkgs/development/compilers/julia/1.9.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchurl -, fetchpatch , which , python3 , gfortran @@ -14,21 +13,15 @@ stdenv.mkDerivation rec { pname = "julia"; - version = "1.9.1"; + version = "1.9.2"; src = fetchurl { url = "https://github.com/JuliaLang/julia/releases/download/v${version}/julia-${version}-full.tar.gz"; - hash = "sha256-oTznFrY9PkbZEIOV4f/Iod5xLmqEimA6xZK88IDqATk="; + hash = "sha256-hwY9TC6kHHNqoujLvHwvGgYuIjlVFX+EBFU87XZJE80="; }; patches = [ ./patches/1.8/0002-skip-failing-and-flaky-tests.patch - # https://github.com/JuliaLang/julia/issues/46530 - (fetchpatch { - url = "https://github.com/JuliaLang/julia/commit/b9b60fcde61ff18d77cb548421b3f71a369b4e02.patch"; - revert = true; - hash = "sha256-XXn4U8aWkWwZYwpvIx+Gk5E16prjeXooF9AafK0aEfg="; - }) ]; strictDeps = true; @@ -56,8 +49,6 @@ stdenv.mkDerivation rec { makeFlags = [ "prefix=$(out)" "USE_BINARYBUILDER=0" - # workaround for https://github.com/JuliaLang/julia/issues/47989 - "USE_INTEL_JITEVENTS=0" ] ++ lib.optionals stdenv.isx86_64 [ # https://github.com/JuliaCI/julia-buildbot/blob/master/master/inventory.py "JULIA_CPU_TARGET=generic;sandybridge,-xsaveopt,clone_all;haswell,-rdrnd,base(1)" diff --git a/nixpkgs/pkgs/development/compilers/kind2/default.nix b/nixpkgs/pkgs/development/compilers/kind2/default.nix index d307f6eac8b7..182e4cb1a0e9 100644 --- a/nixpkgs/pkgs/development/compilers/kind2/default.nix +++ b/nixpkgs/pkgs/development/compilers/kind2/default.nix @@ -3,7 +3,6 @@ , fetchCrate , stdenv , darwin -, fetchpatch }: rustPlatform.buildRustPackage rec { @@ -21,33 +20,6 @@ rustPlatform.buildRustPackage rec { darwin.apple_sdk_11_0.frameworks.Security ]; - postPatch = - let - hvmPatch = fetchpatch { - name = "revert-fix-remove-feature-automic-mut-ptr.patch"; - url = "https://github.com/higherorderco/hvm/commit/c0e35c79b4e31c266ad33beadc397c428e4090ee.patch"; - hash = "sha256-9xxu7NOtz3Tuzf5F0Mi4rw45Xnyh7h9hbTrzq4yfslg="; - revert = true; - }; - in - '' - pushd $cargoDepsCopy/hvm - - oldLibHash=$(sha256sum src/lib.rs | cut -d " " -f 1) - oldMainHash=$(sha256sum src/main.rs | cut -d " " -f 1) - - patch -p1 < ${hvmPatch} - - newLibHash=$(sha256sum src/lib.rs | cut -d " " -f 1) - newMainHash=$(sha256sum src/main.rs | cut -d " " -f 1) - - substituteInPlace .cargo-checksum.json \ - --replace "$oldLibHash" "$newLibHash" \ - --replace "$oldMainHash" "$newMainHash" - - popd - ''; - # requires nightly features RUSTC_BOOTSTRAP = true; diff --git a/nixpkgs/pkgs/development/compilers/koka/default.nix b/nixpkgs/pkgs/development/compilers/koka/default.nix index 901830ffb70e..aec856e47d68 100644 --- a/nixpkgs/pkgs/development/compilers/koka/default.nix +++ b/nixpkgs/pkgs/development/compilers/koka/default.nix @@ -4,19 +4,18 @@ , parsec, process, regex-compat, text, time }: let - version = "2.4.0"; + version = "2.4.2"; src = fetchFromGitHub { owner = "koka-lang"; repo = "koka"; rev = "v${version}"; - sha256 = "sha256-+evs5g0qrplUMr8zC51GvUx2JXQBYJb39IaI4rC6CSA="; + sha256 = "sha256-sVjaIzOxNuBtDswpDl5gLB10Sw945TQAf2ywrKumqqk="; fetchSubmodules = true; }; kklib = stdenv.mkDerivation { pname = "kklib"; inherit version; src = "${src}/kklib"; - patches = [ ./kklib-mimalloc-macos-fix.diff ]; nativeBuildInputs = [ cmake ]; outputs = [ "out" "dev" ]; postInstall = '' diff --git a/nixpkgs/pkgs/development/compilers/koka/kklib-mimalloc-macos-fix.diff b/nixpkgs/pkgs/development/compilers/koka/kklib-mimalloc-macos-fix.diff deleted file mode 100644 index 7d77bfd18afb..000000000000 --- a/nixpkgs/pkgs/development/compilers/koka/kklib-mimalloc-macos-fix.diff +++ /dev/null @@ -1,10 +0,0 @@ ---- kklib/mimalloc/src/random.c 1969-12-31 18:00:01.000000000 -0600 -+++ kklib/mimalloc/src/random.c.new 2022-01-16 19:43:54.000000000 -0600 -@@ -195,6 +195,7 @@ - #elif defined(__APPLE__) - #include <AvailabilityMacros.h> - #if defined(MAC_OS_X_VERSION_10_10) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_10 -+#include <CommonCrypto/CommonCryptoError.h> - #include <CommonCrypto/CommonRandom.h> - #endif - static bool os_random_buf(void* buf, size_t buf_len) { diff --git a/nixpkgs/pkgs/development/compilers/kotlin/default.nix b/nixpkgs/pkgs/development/compilers/kotlin/default.nix index 21c575b6aa56..89474f27614f 100644 --- a/nixpkgs/pkgs/development/compilers/kotlin/default.nix +++ b/nixpkgs/pkgs/development/compilers/kotlin/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "kotlin"; - version = "1.8.22"; + version = "1.9.0"; src = fetchurl { url = "https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-compiler-${version}.zip"; - sha256 = "19psrm905r7fli27cn5hykvjhizshpg2xzp1kbkv3pwybki0zxci"; + sha256 = "1s5y9180r97qmfysw3rm39y5c646rj4z149ywhnyj2cqby00vi8z"; }; propagatedBuildInputs = [ jre ] ; diff --git a/nixpkgs/pkgs/development/compilers/kotlin/native.nix b/nixpkgs/pkgs/development/compilers/kotlin/native.nix index d4380e953a08..9236809b5761 100644 --- a/nixpkgs/pkgs/development/compilers/kotlin/native.nix +++ b/nixpkgs/pkgs/development/compilers/kotlin/native.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { pname = "kotlin-native"; - version = "1.8.22"; + version = "1.9.0"; src = let getArch = { @@ -20,9 +20,9 @@ stdenv.mkDerivation rec { "https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-native-${arch}-${version}.tar.gz"; getHash = arch: { - "macos-aarch64" = "05z4jdq52lxhbs0sgv43zbfx8dkl16k04ky578b3raqf4brmm019"; - "macos-x86_64" = "03f2nxp8xajpap8fw0fccacs45fp5lcjgy01ygr8yjwsaq96nvhd"; - "linux-x86_64" = "12z5jxkdnraivc0in4m9qagca06jiasfnjalk9fpsd0b07y43yx1"; + "macos-aarch64" = "0728zm72ywyl6yhrfkad3whg2xly9bx7whp8alfi980qf468b1jh"; + "macos-x86_64" = "09j2i06qypw7ag2wrfkci9gnvprj96n3362p5vynr65jrzm5b8ww"; + "linux-x86_64" = "1v58n8ap5kifhawz30lk6rb2sp0qyiiy8gihw2ngbbhvakkigg8q"; }.${arch}; in fetchurl { diff --git a/nixpkgs/pkgs/development/compilers/ligo/2706.diff b/nixpkgs/pkgs/development/compilers/ligo/2706.diff new file mode 100644 index 000000000000..8eab82e1461e --- /dev/null +++ b/nixpkgs/pkgs/development/compilers/ligo/2706.diff @@ -0,0 +1,58 @@ +--- a/src/passes/02-parsing/cameligo/dune ++++ b/src/passes/02-parsing/cameligo/dune +@@ -20,7 +20,9 @@ + (action + (with-stdout-to + %{targets} +- (run menhir-recover --external-tokens Lexing_cameligo.Token Parser.cmly)))) ++ (run menhir-recover ++ --external-tokens Lexing_cameligo.Token.MenhirInterpreter ++ Parser.cmly)))) + + ;; Build of the CameLIGO parser as a library + +diff --git a/src/passes/02-parsing/jsligo/dune b/src/passes/02-parsing/jsligo/dune +index d691ab0af0fe6ae87119405c19e49e2b5c2d1a23..3b13a06e69737037df0df12aa087506f402d8430 100644 +--- a/src/passes/02-parsing/jsligo/dune ++++ b/src/passes/02-parsing/jsligo/dune +@@ -20,7 +20,9 @@ + (action + (with-stdout-to + %{targets} +- (run menhir-recover --external-tokens Lexing_jsligo.Token Parser.cmly)))) ++ (run menhir-recover ++ --external-tokens Lexing_jsligo.Token.MenhirInterpreter ++ Parser.cmly)))) + + ;; Build of the JsLIGO parser as a library + +diff --git a/src/passes/02-parsing/pascaligo/dune b/src/passes/02-parsing/pascaligo/dune +index 0516a8b790d2eb3ebdb833051bd66241ca44832c..e650decc7ba9907551e1016fee1a53b806fb593e 100644 +--- a/src/passes/02-parsing/pascaligo/dune ++++ b/src/passes/02-parsing/pascaligo/dune +@@ -20,7 +20,9 @@ + (action + (with-stdout-to + %{targets} +- (run menhir-recover --external-tokens Lexing_pascaligo.Token Parser.cmly)))) ++ (run menhir-recover ++ --external-tokens Lexing_pascaligo.Token.MenhirInterpreter ++ Parser.cmly)))) + + ;; Build of the PascaLIGO parser as a library + +diff --git a/src/passes/02-parsing/pyligo/dune b/src/passes/02-parsing/pyligo/dune +index abb0165f6f185d21ea4a52a152cef188ae9dde4b..5930d86ab721e9dd683e5c4f2873b196ac5859b4 100644 +--- a/src/passes/02-parsing/pyligo/dune ++++ b/src/passes/02-parsing/pyligo/dune +@@ -20,7 +20,9 @@ + (action + (with-stdout-to + %{targets} +- (run menhir-recover --external-tokens Lexing_pyligo.Token Parser.cmly)))) ++ (run menhir-recover ++ --external-tokens Lexing_pyligo.Token.MenhirInterpreter ++ Parser.cmly)))) + + ;; Build of the PyLIGO parser as a library + diff --git a/nixpkgs/pkgs/development/compilers/ligo/default.nix b/nixpkgs/pkgs/development/compilers/ligo/default.nix index 3240dcb31980..05fea9caddbb 100644 --- a/nixpkgs/pkgs/development/compilers/ligo/default.nix +++ b/nixpkgs/pkgs/development/compilers/ligo/default.nix @@ -15,15 +15,18 @@ ocamlPackages.buildDunePackage rec { pname = "ligo"; - version = "0.66.0"; + version = "0.69.0"; src = fetchFromGitLab { owner = "ligolang"; repo = "ligo"; rev = version; - sha256 = "sha256-BFeNnpMT+WKqTvjVg+H2qHl5EUMcbe7xmJohbpD99gY="; + sha256 = "sha256-Swt4uihsAtHVMkc0DxATwB8FvgxwtSJTN3E5cBtyXf8="; fetchSubmodules = true; }; + # https://gitlab.com/ligolang/ligo/-/merge_requests/2706.diff + patches = [ ./2706.diff ]; + postPatch = '' substituteInPlace "vendors/tezos-ligo/src/lib_hacl/hacl.ml" \ --replace \ @@ -103,8 +106,6 @@ ocamlPackages.buildDunePackage rec { # vendored tezos' deps aches aches-lwt - tezos-plonk - tezos-bls12-381-polynomial ctypes ctypes_stubs_js class_group_vdf @@ -116,7 +117,7 @@ ocamlPackages.buildDunePackage rec { bls12-381 bls12-381-signature ptime - mtime + mtime_1 lwt_log secp256k1-internal resto @@ -128,6 +129,8 @@ ocamlPackages.buildDunePackage rec { pure-splitmix zarith_stubs_js simple-diff + seqes + stdint ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; diff --git a/nixpkgs/pkgs/development/compilers/llvm/10/default.nix b/nixpkgs/pkgs/development/compilers/llvm/10/default.nix index 4964d405d32e..44791f09e384 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/10/default.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/10/default.nix @@ -131,8 +131,13 @@ let inherit llvm_meta; }; - lldb = callPackage ./lldb { - inherit llvm_meta; + lldb = callPackage ../common/lldb.nix { + src = fetch "lldb" "051p5b04y6z3g730rmc2n2v71lipbw7k69riww3a6sl74myfiaq7"; + patches = [ + ./lldb/procfs.patch + ./lldb/gnu-install-dirs.patch + ]; + inherit llvm_meta release_version; }; # Below, is the LLVM bootstrapping logic. It handles building a diff --git a/nixpkgs/pkgs/development/compilers/llvm/10/lldb/default.nix b/nixpkgs/pkgs/development/compilers/llvm/10/lldb/default.nix deleted file mode 100644 index 4a40a931af65..000000000000 --- a/nixpkgs/pkgs/development/compilers/llvm/10/lldb/default.nix +++ /dev/null @@ -1,128 +0,0 @@ -{ lib, stdenv, llvm_meta -, fetch -, cmake -, zlib -, ncurses -, swig -, which -, libedit -, libxml2 -, libllvm -, libclang -, python3 -, version -, darwin -, lit -, makeWrapper -, enableManpages ? false -}: - -stdenv.mkDerivation (rec { - pname = "lldb"; - inherit version; - - src = fetch pname "051p5b04y6z3g730rmc2n2v71lipbw7k69riww3a6sl74myfiaq7"; - - patches = [ - ./procfs.patch - ./gnu-install-dirs.patch - ]; - - outputs = [ "out" "lib" "dev" ]; - - nativeBuildInputs = [ - cmake python3 which swig lit makeWrapper - ] ++ lib.optionals enableManpages [ - python3.pkgs.sphinx python3.pkgs.recommonmark - ]; - - buildInputs = [ - ncurses zlib libedit libxml2 libllvm - ] ++ lib.optionals stdenv.isDarwin [ - darwin.libobjc - darwin.apple_sdk.libs.xpc - darwin.apple_sdk.frameworks.Foundation - darwin.bootstrap_cmds - darwin.apple_sdk.frameworks.Carbon - darwin.apple_sdk.frameworks.Cocoa - ]; - - hardeningDisable = [ "format" ]; - - cmakeFlags = [ - "-DLLDB_INCLUDE_TESTS=${if doCheck then "YES" else "NO"}" - "-DLLVM_ENABLE_RTTI=OFF" - "-DClang_DIR=${libclang.dev}/lib/cmake" - "-DLLVM_EXTERNAL_LIT=${lit}/bin/lit" - ] ++ lib.optionals stdenv.isDarwin [ - "-DLLDB_USE_SYSTEM_DEBUGSERVER=ON" - ] ++ lib.optionals (!stdenv.isDarwin) [ - "-DLLDB_CODESIGN_IDENTITY=" # codesigning makes nondeterministic - ] ++ lib.optionals enableManpages [ - "-DLLVM_ENABLE_SPHINX=ON" - "-DSPHINX_OUTPUT_MAN=ON" - "-DSPHINX_OUTPUT_HTML=OFF" - ] ++ lib.optionals doCheck [ - "-DLLDB_TEST_C_COMPILER=${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc" - "-DLLDB_TEST_CXX_COMPILER=${stdenv.cc}/bin/${stdenv.cc.targetPrefix}c++" - ]; - - doCheck = false; - - doInstallCheck = true; - - installCheckPhase = '' - if [ ! -e "$lib/${python3.sitePackages}/lldb/_lldb.so" ] ; then - echo "ERROR: python files not installed where expected!"; - return 1; - fi - ''; - - postInstall = '' - wrapProgram $out/bin/lldb --prefix PYTHONPATH : $lib/${python3.sitePackages}/ - - # Editor support - # vscode: - install -D ../tools/lldb-vscode/package.json $out/share/vscode/extensions/llvm-org.lldb-vscode-0.1.0/package.json - mkdir -p $out/share/vscode/extensions/llvm-org.lldb-vscode-0.1.0/bin - ln -s $out/bin/llvm-vscode $out/share/vscode/extensions/llvm-org.lldb-vscode-0.1.0/bin - ''; - - meta = llvm_meta // { - homepage = "https://lldb.llvm.org/"; - description = "A next-generation high-performance debugger"; - longDescription = '' - LLDB is a next generation, high-performance debugger. It is built as a set - of reusable components which highly leverage existing libraries in the - larger LLVM Project, such as the Clang expression parser and LLVM - disassembler. - ''; - # never built on aarch64-darwin since first introduction in nixpkgs - broken = stdenv.isDarwin && stdenv.isAarch64; - }; -} // lib.optionalAttrs enableManpages { - pname = "lldb-manpages"; - - buildPhase = '' - make docs-man - ''; - - propagatedBuildInputs = []; - - # manually install lldb man page - installPhase = '' - mkdir -p $out/share/man/man1 - install docs/man/lldb.1 -t $out/share/man/man1/ - ''; - - postPatch = null; - postInstall = null; - - outputs = [ "out" ]; - - doCheck = false; - - meta = llvm_meta // { - description = "man pages for LLDB ${version}"; - }; -}) diff --git a/nixpkgs/pkgs/development/compilers/llvm/10/llvm/default.nix b/nixpkgs/pkgs/development/compilers/llvm/10/llvm/default.nix index ec494f4afce5..6f8ef0b57512 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/10/llvm/default.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/10/llvm/default.nix @@ -125,6 +125,14 @@ in stdenv.mkDerivation (rec { relative = "llvm"; hash = "sha256-XPbvNJ45SzjMGlNUgt/IgEvM2dHQpDOe6woUJY+nUYA="; }) + + # Backport gcc-13 fixes with missing includes. + (fetchpatch { + name = "signals-gcc-13.patch"; + url = "https://github.com/llvm/llvm-project/commit/ff1681ddb303223973653f7f5f3f3435b48a1983.patch"; + hash = "sha256-CXwYxQezTq5vdmc8Yn88BUAEly6YZ5VEIA6X3y5NNOs="; + stripLen = 1; + }) ] ++ lib.optional enablePolly ./gnu-install-dirs-polly.patch; postPatch = optionalString stdenv.isDarwin '' diff --git a/nixpkgs/pkgs/development/compilers/llvm/11/default.nix b/nixpkgs/pkgs/development/compilers/llvm/11/default.nix index a94b9d64d49b..2fd510942df9 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/11/default.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/11/default.nix @@ -146,8 +146,13 @@ let inherit llvm_meta; }; - lldb = callPackage ./lldb { - inherit llvm_meta; + lldb = callPackage ../common/lldb.nix { + src = fetch "lldb" "1vlyg015dyng43xqb8cg2l6r9ix8klibxsajazbfnckdnh54hwxj"; + patches = [ + ./lldb/procfs.patch + ./lldb/gnu-install-dirs.patch + ]; + inherit llvm_meta release_version; }; # Below, is the LLVM bootstrapping logic. It handles building a diff --git a/nixpkgs/pkgs/development/compilers/llvm/11/lldb/default.nix b/nixpkgs/pkgs/development/compilers/llvm/11/lldb/default.nix deleted file mode 100644 index 5912323608dc..000000000000 --- a/nixpkgs/pkgs/development/compilers/llvm/11/lldb/default.nix +++ /dev/null @@ -1,126 +0,0 @@ -{ lib, stdenv, llvm_meta -, fetch -, cmake -, zlib -, ncurses -, swig -, which -, libedit -, libxml2 -, libllvm -, libclang -, python3 -, version -, darwin -, lit -, makeWrapper -, enableManpages ? false -}: - -stdenv.mkDerivation (rec { - pname = "lldb"; - inherit version; - - src = fetch pname "1vlyg015dyng43xqb8cg2l6r9ix8klibxsajazbfnckdnh54hwxj"; - - patches = [ - ./procfs.patch - ./gnu-install-dirs.patch - ]; - - outputs = [ "out" "lib" "dev" ]; - - nativeBuildInputs = [ - cmake python3 which swig lit makeWrapper - ] ++ lib.optionals enableManpages [ - python3.pkgs.sphinx python3.pkgs.recommonmark - ]; - - buildInputs = [ - ncurses zlib libedit libxml2 libllvm - ] ++ lib.optionals stdenv.isDarwin [ - darwin.libobjc - darwin.apple_sdk.libs.xpc - darwin.apple_sdk.frameworks.Foundation - darwin.bootstrap_cmds - darwin.apple_sdk.frameworks.Carbon - darwin.apple_sdk.frameworks.Cocoa - ]; - - hardeningDisable = [ "format" ]; - - cmakeFlags = [ - "-DLLDB_INCLUDE_TESTS=${if doCheck then "YES" else "NO"}" - "-DLLVM_ENABLE_RTTI=OFF" - "-DClang_DIR=${libclang.dev}/lib/cmake" - "-DLLVM_EXTERNAL_LIT=${lit}/bin/lit" - ] ++ lib.optionals stdenv.isDarwin [ - "-DLLDB_USE_SYSTEM_DEBUGSERVER=ON" - ] ++ lib.optionals (!stdenv.isDarwin) [ - "-DLLDB_CODESIGN_IDENTITY=" # codesigning makes nondeterministic - ] ++ lib.optionals enableManpages [ - "-DLLVM_ENABLE_SPHINX=ON" - "-DSPHINX_OUTPUT_MAN=ON" - "-DSPHINX_OUTPUT_HTML=OFF" - ] ++ lib.optionals doCheck [ - "-DLLDB_TEST_C_COMPILER=${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc" - "-DLLDB_TEST_CXX_COMPILER=${stdenv.cc}/bin/${stdenv.cc.targetPrefix}c++" - ]; - - doCheck = false; - - doInstallCheck = true; - - installCheckPhase = '' - if [ ! -e "$lib/${python3.sitePackages}/lldb/_lldb.so" ] ; then - echo "ERROR: python files not installed where expected!"; - return 1; - fi - ''; - - postInstall = '' - wrapProgram $out/bin/lldb --prefix PYTHONPATH : $lib/${python3.sitePackages}/ - - # Editor support - # vscode: - install -D ../tools/lldb-vscode/package.json $out/share/vscode/extensions/llvm-org.lldb-vscode-0.1.0/package.json - mkdir -p $out/share/vscode/extensions/llvm-org.lldb-vscode-0.1.0/bin - ln -s $out/bin/llvm-vscode $out/share/vscode/extensions/llvm-org.lldb-vscode-0.1.0/bin - ''; - - meta = llvm_meta // { - homepage = "https://lldb.llvm.org/"; - description = "A next-generation high-performance debugger"; - longDescription = '' - LLDB is a next generation, high-performance debugger. It is built as a set - of reusable components which highly leverage existing libraries in the - larger LLVM Project, such as the Clang expression parser and LLVM - disassembler. - ''; - }; -} // lib.optionalAttrs enableManpages { - pname = "lldb-manpages"; - - buildPhase = '' - make docs-man - ''; - - propagatedBuildInputs = []; - - # manually install lldb man page - installPhase = '' - mkdir -p $out/share/man/man1 - install docs/man/lldb.1 -t $out/share/man/man1/ - ''; - - postPatch = null; - postInstall = null; - - outputs = [ "out" ]; - - doCheck = false; - - meta = llvm_meta // { - description = "man pages for LLDB ${version}"; - }; -}) diff --git a/nixpkgs/pkgs/development/compilers/llvm/11/llvm/default.nix b/nixpkgs/pkgs/development/compilers/llvm/11/llvm/default.nix index beab3c885ab1..a5078ef3b76d 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/11/llvm/default.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/11/llvm/default.nix @@ -123,6 +123,20 @@ in stdenv.mkDerivation (rec { relative = "llvm"; hash = "sha256-XPbvNJ45SzjMGlNUgt/IgEvM2dHQpDOe6woUJY+nUYA="; }) + + # Backport gcc-13 fixes with missing includes. + (fetchpatch { + name = "signals-gcc-13.patch"; + url = "https://github.com/llvm/llvm-project/commit/ff1681ddb303223973653f7f5f3f3435b48a1983.patch"; + hash = "sha256-CXwYxQezTq5vdmc8Yn88BUAEly6YZ5VEIA6X3y5NNOs="; + stripLen = 1; + }) + (fetchpatch { + name = "base64-gcc-13.patch"; + url = "https://github.com/llvm/llvm-project/commit/5e9be93566f39ee6cecd579401e453eccfbe81e5.patch"; + hash = "sha256-PAwrVrvffPd7tphpwCkYiz+67szPRzRB2TXBvKfzQ7U="; + stripLen = 1; + }) ] ++ lib.optional enablePolly ./gnu-install-dirs-polly.patch; postPatch = optionalString stdenv.isDarwin '' diff --git a/nixpkgs/pkgs/development/compilers/llvm/12/default.nix b/nixpkgs/pkgs/development/compilers/llvm/12/default.nix index 512a576d6f5d..d7fa0517815c 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/12/default.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/12/default.nix @@ -135,11 +135,23 @@ let inherit (libraries) libunwind; }; - lldb = callPackage ./lldb { - inherit llvm_meta; - inherit (darwin) libobjc bootstrap_cmds; - inherit (darwin.apple_sdk.libs) xpc; - inherit (darwin.apple_sdk.frameworks) Foundation Carbon Cocoa; + lldb = callPackage ../common/lldb.nix { + src = fetch "lldb" "0g3pj1m3chafavpr35r9fynm85y2hdyla6klj0h28khxs2613i78"; + patches = + let + resourceDirPatch = callPackage ({ runCommand, libclang }: (runCommand "resource-dir.patch" + { + clangLibDir = "${libclang.lib}/lib"; + } '' + substitute '${./lldb/resource-dir.patch}' "$out" --subst-var clangLibDir + '')) { }; + in + [ + ./lldb/procfs.patch + resourceDirPatch + ./lldb/gnu-install-dirs.patch + ]; + inherit llvm_meta release_version; }; # Below, is the LLVM bootstrapping logic. It handles building a diff --git a/nixpkgs/pkgs/development/compilers/llvm/12/lldb/default.nix b/nixpkgs/pkgs/development/compilers/llvm/12/lldb/default.nix deleted file mode 100644 index c75eb255cd75..000000000000 --- a/nixpkgs/pkgs/development/compilers/llvm/12/lldb/default.nix +++ /dev/null @@ -1,142 +0,0 @@ -{ lib, stdenv, llvm_meta -, runCommand -, fetch -, cmake -, zlib -, ncurses -, swig -, which -, libedit -, libxml2 -, libllvm -, libclang -, python3 -, version -, libobjc -, xpc -, Foundation -, bootstrap_cmds -, Carbon -, Cocoa -, lit -, makeWrapper -, enableManpages ? false -}: - -stdenv.mkDerivation (rec { - pname = "lldb"; - inherit version; - - src = fetch pname "0g3pj1m3chafavpr35r9fynm85y2hdyla6klj0h28khxs2613i78"; - - patches = [ - ./procfs.patch - (runCommand "resource-dir.patch" { - clangLibDir = "${libclang.lib}/lib"; - } '' - substitute '${./resource-dir.patch}' "$out" --subst-var clangLibDir - '') - ./gnu-install-dirs.patch - ]; - - outputs = [ "out" "lib" "dev" ]; - - nativeBuildInputs = [ - cmake python3 which swig lit makeWrapper - ] ++ lib.optionals enableManpages [ - python3.pkgs.sphinx python3.pkgs.recommonmark - ]; - - buildInputs = [ - ncurses - zlib - libedit - libxml2 - libllvm - ] - ++ lib.optionals stdenv.isDarwin [ - libobjc - xpc - Foundation - bootstrap_cmds - Carbon - Cocoa - ]; - - hardeningDisable = [ "format" ]; - - cmakeFlags = [ - "-DLLDB_INCLUDE_TESTS=${if doCheck then "YES" else "NO"}" - "-DLLVM_ENABLE_RTTI=OFF" - "-DClang_DIR=${libclang.dev}/lib/cmake" - "-DLLVM_EXTERNAL_LIT=${lit}/bin/lit" - ] ++ lib.optionals stdenv.isDarwin [ - "-DLLDB_USE_SYSTEM_DEBUGSERVER=ON" - ] ++ lib.optionals (!stdenv.isDarwin) [ - "-DLLDB_CODESIGN_IDENTITY=" # codesigning makes nondeterministic - ] ++ lib.optionals enableManpages [ - "-DLLVM_ENABLE_SPHINX=ON" - "-DSPHINX_OUTPUT_MAN=ON" - "-DSPHINX_OUTPUT_HTML=OFF" - ] ++ lib.optionals doCheck [ - "-DLLDB_TEST_C_COMPILER=${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc" - "-DLLDB_TEST_CXX_COMPILER=${stdenv.cc}/bin/${stdenv.cc.targetPrefix}c++" - ]; - - doCheck = false; - - doInstallCheck = true; - - installCheckPhase = '' - if [ ! -e "$lib/${python3.sitePackages}/lldb/_lldb.so" ] ; then - echo "ERROR: python files not installed where expected!"; - return 1; - fi - ''; - - postInstall = '' - wrapProgram $out/bin/lldb --prefix PYTHONPATH : $lib/${python3.sitePackages}/ - - # Editor support - # vscode: - install -D ../tools/lldb-vscode/package.json $out/share/vscode/extensions/llvm-org.lldb-vscode-0.1.0/package.json - mkdir -p $out/share/vscode/extensions/llvm-org.lldb-vscode-0.1.0/bin - ln -s $out/bin/lldb-vscode $out/share/vscode/extensions/llvm-org.lldb-vscode-0.1.0/bin - ''; - - meta = llvm_meta // { - homepage = "https://lldb.llvm.org/"; - description = "A next-generation high-performance debugger"; - longDescription = '' - LLDB is a next generation, high-performance debugger. It is built as a set - of reusable components which highly leverage existing libraries in the - larger LLVM Project, such as the Clang expression parser and LLVM - disassembler. - ''; - }; -} // lib.optionalAttrs enableManpages { - pname = "lldb-manpages"; - - buildPhase = '' - make docs-lldb-man - ''; - - propagatedBuildInputs = []; - - # manually install lldb man page - installPhase = '' - mkdir -p $out/share/man/man1 - install docs/man/lldb.1 -t $out/share/man/man1/ - ''; - - postPatch = null; - postInstall = null; - - outputs = [ "out" ]; - - doCheck = false; - - meta = llvm_meta // { - description = "man pages for LLDB ${version}"; - }; -}) diff --git a/nixpkgs/pkgs/development/compilers/llvm/12/llvm/default.nix b/nixpkgs/pkgs/development/compilers/llvm/12/llvm/default.nix index 5edc5c136d57..3c724e07bd16 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/12/llvm/default.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/12/llvm/default.nix @@ -107,6 +107,20 @@ in stdenv.mkDerivation (rec { relative = "llvm"; hash = "sha256-XPbvNJ45SzjMGlNUgt/IgEvM2dHQpDOe6woUJY+nUYA="; }) + + # Backport gcc-13 fixes with missing includes. + (fetchpatch { + name = "signals-gcc-13.patch"; + url = "https://github.com/llvm/llvm-project/commit/ff1681ddb303223973653f7f5f3f3435b48a1983.patch"; + hash = "sha256-CXwYxQezTq5vdmc8Yn88BUAEly6YZ5VEIA6X3y5NNOs="; + stripLen = 1; + }) + (fetchpatch { + name = "base64-gcc-13.patch"; + url = "https://github.com/llvm/llvm-project/commit/5e9be93566f39ee6cecd579401e453eccfbe81e5.patch"; + hash = "sha256-PAwrVrvffPd7tphpwCkYiz+67szPRzRB2TXBvKfzQ7U="; + stripLen = 1; + }) ] ++ lib.optional enablePolly ./gnu-install-dirs-polly.patch; postPatch = optionalString stdenv.isDarwin '' diff --git a/nixpkgs/pkgs/development/compilers/llvm/13/clang/default.nix b/nixpkgs/pkgs/development/compilers/llvm/13/clang/default.nix index f1a3e74fa6bc..5e06e85c02a9 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/13/clang/default.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/13/clang/default.nix @@ -10,7 +10,7 @@ let inherit version; inherit src; - sourceRoot = "source/clang"; + sourceRoot = "${src.name}/clang"; nativeBuildInputs = [ cmake python3 ] ++ lib.optional enableManpages python3.pkgs.sphinx diff --git a/nixpkgs/pkgs/development/compilers/llvm/13/compiler-rt/default.nix b/nixpkgs/pkgs/development/compilers/llvm/13/compiler-rt/default.nix index faa123312bd7..18be4499d0fd 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/13/compiler-rt/default.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/13/compiler-rt/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { inherit version; inherit src; - sourceRoot = "source/compiler-rt"; + sourceRoot = "${src.name}/compiler-rt"; nativeBuildInputs = [ cmake python3 libllvm.dev ] ++ lib.optional stdenv.isDarwin xcbuild.xcrun; diff --git a/nixpkgs/pkgs/development/compilers/llvm/13/default.nix b/nixpkgs/pkgs/development/compilers/llvm/13/default.nix index f51f33cf9dbf..42dfd2551779 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/13/default.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/13/default.nix @@ -135,11 +135,36 @@ let inherit llvm_meta; }; - lldb = callPackage ./lldb { - inherit llvm_meta; - inherit (darwin) libobjc bootstrap_cmds; - inherit (darwin.apple_sdk.libs) xpc; - inherit (darwin.apple_sdk.frameworks) Foundation Carbon Cocoa; + lldb = callPackage ../common/lldb.nix { + patches = + let + resourceDirPatch = callPackage ({ runCommand, libclang }: (runCommand "resource-dir.patch" + { + clangLibDir = "${libclang.lib}/lib"; + } '' + substitute '${./lldb/resource-dir.patch}' "$out" --subst-var clangLibDir + '')) { }; + in + [ + ./lldb/procfs.patch + resourceDirPatch + ./lldb/gnu-install-dirs.patch + ] + # This is a stopgap solution if/until the macOS SDK used for x86_64 is + # updated. + # + # The older 10.12 SDK used on x86_64 as of this writing has a `mach/machine.h` + # header that does not define `CPU_SUBTYPE_ARM64E` so we replace the one use + # of this preprocessor symbol in `lldb` with its expansion. + # + # See here for some context: + # https://github.com/NixOS/nixpkgs/pull/194634#issuecomment-1272129132 + ++ lib.optional ( + stdenv.targetPlatform.isDarwin + && !stdenv.targetPlatform.isAarch64 + && (lib.versionOlder darwin.apple_sdk.sdk.version "11.0") + ) ./lldb/cpu_subtype_arm64e_replacement.patch; + inherit llvm_meta release_version; }; # Below, is the LLVM bootstrapping logic. It handles building a diff --git a/nixpkgs/pkgs/development/compilers/llvm/13/libcxx/default.nix b/nixpkgs/pkgs/development/compilers/llvm/13/libcxx/default.nix index b18c9da18ffd..994ec7dd5a56 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/13/libcxx/default.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/13/libcxx/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { inherit version; inherit src; - sourceRoot = "source/libcxx"; + sourceRoot = "${src.name}/libcxx"; outputs = [ "out" ] ++ lib.optional (!headersOnly) "dev"; diff --git a/nixpkgs/pkgs/development/compilers/llvm/13/libcxxabi/default.nix b/nixpkgs/pkgs/development/compilers/llvm/13/libcxxabi/default.nix index 06137ab06734..b1b57b3050ad 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/13/libcxxabi/default.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/13/libcxxabi/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { inherit version; inherit src; - sourceRoot = "source/${pname}"; + sourceRoot = "${src.name}/${pname}"; outputs = [ "out" "dev" ]; diff --git a/nixpkgs/pkgs/development/compilers/llvm/13/libunwind/default.nix b/nixpkgs/pkgs/development/compilers/llvm/13/libunwind/default.nix index b6017e741728..d837bc60de37 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/13/libunwind/default.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/13/libunwind/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { inherit version; inherit src; - sourceRoot = "source/${pname}"; + sourceRoot = "${src.name}/${pname}"; patches = [ ./gnu-install-dirs.patch diff --git a/nixpkgs/pkgs/development/compilers/llvm/13/lld/default.nix b/nixpkgs/pkgs/development/compilers/llvm/13/lld/default.nix index c8c3e0b448bd..d506f396f65c 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/13/lld/default.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/13/lld/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { inherit version; inherit src; - sourceRoot = "source/${pname}"; + sourceRoot = "${src.name}/${pname}"; patches = [ ./gnu-install-dirs.patch diff --git a/nixpkgs/pkgs/development/compilers/llvm/13/lldb/default.nix b/nixpkgs/pkgs/development/compilers/llvm/13/lldb/default.nix deleted file mode 100644 index ca7a17a5e90d..000000000000 --- a/nixpkgs/pkgs/development/compilers/llvm/13/lldb/default.nix +++ /dev/null @@ -1,159 +0,0 @@ -{ lib, stdenv, llvm_meta -, runCommand -, src -, cmake -, zlib -, ncurses -, swig -, which -, libedit -, libxml2 -, libllvm -, libclang -, python3 -, version -, libobjc -, xpc -, Foundation -, bootstrap_cmds -, Carbon -, Cocoa -, lit -, makeWrapper -, darwin -, enableManpages ? false -}: - -stdenv.mkDerivation (rec { - pname = "lldb"; - inherit version; - - inherit src; - sourceRoot = "source/${pname}"; - - patches = [ - ./procfs.patch - (runCommand "resource-dir.patch" { - clangLibDir = "${libclang.lib}/lib"; - } '' - substitute '${./resource-dir.patch}' "$out" --subst-var clangLibDir - '') - ./gnu-install-dirs.patch - ] - # This is a stopgap solution if/until the macOS SDK used for x86_64 is - # updated. - # - # The older 10.12 SDK used on x86_64 as of this writing has a `mach/machine.h` - # header that does not define `CPU_SUBTYPE_ARM64E` so we replace the one use - # of this preprocessor symbol in `lldb` with its expansion. - # - # See here for some context: - # https://github.com/NixOS/nixpkgs/pull/194634#issuecomment-1272129132 - ++ lib.optional ( - stdenv.targetPlatform.isDarwin - && !stdenv.targetPlatform.isAarch64 - && (lib.versionOlder darwin.apple_sdk.sdk.version "11.0") - ) ./cpu_subtype_arm64e_replacement.patch; - - - outputs = [ "out" "lib" "dev" ]; - - nativeBuildInputs = [ - cmake python3 which swig lit makeWrapper - ] ++ lib.optionals enableManpages [ - python3.pkgs.sphinx python3.pkgs.recommonmark - ]; - - buildInputs = [ - ncurses - zlib - libedit - libxml2 - libllvm - ] ++ lib.optionals stdenv.isDarwin [ - libobjc - xpc - Foundation - bootstrap_cmds - Carbon - Cocoa - ]; - - hardeningDisable = [ "format" ]; - - cmakeFlags = [ - "-DLLDB_INCLUDE_TESTS=${if doCheck then "YES" else "NO"}" - "-DLLVM_ENABLE_RTTI=OFF" - "-DClang_DIR=${libclang.dev}/lib/cmake" - "-DLLVM_EXTERNAL_LIT=${lit}/bin/lit" - ] ++ lib.optionals stdenv.isDarwin [ - "-DLLDB_USE_SYSTEM_DEBUGSERVER=ON" - ] ++ lib.optionals (!stdenv.isDarwin) [ - "-DLLDB_CODESIGN_IDENTITY=" # codesigning makes nondeterministic - ] ++ lib.optionals enableManpages [ - "-DLLVM_ENABLE_SPHINX=ON" - "-DSPHINX_OUTPUT_MAN=ON" - "-DSPHINX_OUTPUT_HTML=OFF" - ] ++ lib.optionals doCheck [ - "-DLLDB_TEST_C_COMPILER=${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc" - "-DLLDB_TEST_CXX_COMPILER=${stdenv.cc}/bin/${stdenv.cc.targetPrefix}c++" - ]; - - doCheck = false; - - doInstallCheck = true; - - installCheckPhase = '' - if [ ! -e "$lib/${python3.sitePackages}/lldb/_lldb.so" ] ; then - echo "ERROR: python files not installed where expected!"; - return 1; - fi - ''; - - postInstall = '' - wrapProgram $out/bin/lldb --prefix PYTHONPATH : $lib/${python3.sitePackages}/ - - # Editor support - # vscode: - install -D ../tools/lldb-vscode/package.json $out/share/vscode/extensions/llvm-org.lldb-vscode-0.1.0/package.json - mkdir -p $out/share/vscode/extensions/llvm-org.lldb-vscode-0.1.0/bin - ln -s $out/bin/lldb-vscode $out/share/vscode/extensions/llvm-org.lldb-vscode-0.1.0/bin - ''; - - meta = llvm_meta // { - homepage = "https://lldb.llvm.org/"; - description = "A next-generation high-performance debugger"; - longDescription = '' - LLDB is a next generation, high-performance debugger. It is built as a set - of reusable components which highly leverage existing libraries in the - larger LLVM Project, such as the Clang expression parser and LLVM - disassembler. - ''; - }; -} // lib.optionalAttrs enableManpages { - pname = "lldb-manpages"; - - buildPhase = '' - make docs-lldb-man - ''; - - propagatedBuildInputs = []; - - # manually install lldb man page - installPhase = '' - mkdir -p $out/share/man/man1 - install docs/man/lldb.1 -t $out/share/man/man1/ - ''; - - postPatch = null; - postInstall = null; - - outputs = [ "out" ]; - - doCheck = false; - - meta = llvm_meta // { - broken = stdenv.isDarwin; - description = "man pages for LLDB ${version}"; - }; -}) diff --git a/nixpkgs/pkgs/development/compilers/llvm/13/llvm/default.nix b/nixpkgs/pkgs/development/compilers/llvm/13/llvm/default.nix index 0977f2f2caff..827e528581cf 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/13/llvm/default.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/13/llvm/default.nix @@ -61,7 +61,7 @@ in stdenv.mkDerivation (rec { inherit version; inherit src; - sourceRoot = "source/${pname}"; + sourceRoot = "${src.name}/${pname}"; outputs = [ "out" "lib" "dev" "python" ]; @@ -98,6 +98,20 @@ in stdenv.mkDerivation (rec { relative = "llvm"; hash = "sha256-XPbvNJ45SzjMGlNUgt/IgEvM2dHQpDOe6woUJY+nUYA="; }) + + # Backport gcc-13 fixes with missing includes. + (fetchpatch { + name = "signals-gcc-13.patch"; + url = "https://github.com/llvm/llvm-project/commit/ff1681ddb303223973653f7f5f3f3435b48a1983.patch"; + hash = "sha256-CXwYxQezTq5vdmc8Yn88BUAEly6YZ5VEIA6X3y5NNOs="; + stripLen = 1; + }) + (fetchpatch { + name = "base64-gcc-13.patch"; + url = "https://github.com/llvm/llvm-project/commit/5e9be93566f39ee6cecd579401e453eccfbe81e5.patch"; + hash = "sha256-PAwrVrvffPd7tphpwCkYiz+67szPRzRB2TXBvKfzQ7U="; + stripLen = 1; + }) ] ++ lib.optional enablePolly ./gnu-install-dirs-polly.patch; postPatch = optionalString stdenv.isDarwin '' diff --git a/nixpkgs/pkgs/development/compilers/llvm/13/openmp/default.nix b/nixpkgs/pkgs/development/compilers/llvm/13/openmp/default.nix index 71362be1fdc6..8eca980d601c 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/13/openmp/default.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/13/openmp/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { inherit version; inherit src; - sourceRoot = "source/${pname}"; + sourceRoot = "${src.name}/${pname}"; nativeBuildInputs = [ cmake perl ]; buildInputs = [ diff --git a/nixpkgs/pkgs/development/compilers/llvm/14/default.nix b/nixpkgs/pkgs/development/compilers/llvm/14/default.nix index cf3cf1133e58..5a7651958027 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/14/default.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/14/default.nix @@ -136,11 +136,36 @@ let inherit llvm_meta; }; - lldb = callPackage ./lldb { - inherit llvm_meta; - inherit (darwin) libobjc bootstrap_cmds; - inherit (darwin.apple_sdk.libs) xpc; - inherit (darwin.apple_sdk.frameworks) Foundation Carbon Cocoa; + lldb = callPackage ../common/lldb.nix { + patches = + let + resourceDirPatch = callPackage ({ runCommand, libclang }: (runCommand "resource-dir.patch" + { + clangLibDir = "${libclang.lib}/lib"; + } '' + substitute '${./lldb/resource-dir.patch}' "$out" --subst-var clangLibDir + '')) { }; + in + [ + ./lldb/procfs.patch + resourceDirPatch + ./lldb/gnu-install-dirs.patch + ] + # This is a stopgap solution if/until the macOS SDK used for x86_64 is + # updated. + # + # The older 10.12 SDK used on x86_64 as of this writing has a `mach/machine.h` + # header that does not define `CPU_SUBTYPE_ARM64E` so we replace the one use + # of this preprocessor symbol in `lldb` with its expansion. + # + # See here for some context: + # https://github.com/NixOS/nixpkgs/pull/194634#issuecomment-1272129132 + ++ lib.optional ( + stdenv.targetPlatform.isDarwin + && !stdenv.targetPlatform.isAarch64 + && (lib.versionOlder darwin.apple_sdk.sdk.version "11.0") + ) ./lldb/cpu_subtype_arm64e_replacement.patch; + inherit llvm_meta release_version; }; # Below, is the LLVM bootstrapping logic. It handles building a diff --git a/nixpkgs/pkgs/development/compilers/llvm/14/lldb/default.nix b/nixpkgs/pkgs/development/compilers/llvm/14/lldb/default.nix deleted file mode 100644 index cd28325a5573..000000000000 --- a/nixpkgs/pkgs/development/compilers/llvm/14/lldb/default.nix +++ /dev/null @@ -1,167 +0,0 @@ -{ lib, stdenv, llvm_meta -, runCommand -, monorepoSrc -, cmake -, zlib -, ncurses -, swig -, which -, libedit -, libxml2 -, libllvm -, libclang -, python3 -, version -, libobjc -, xpc -, Foundation -, bootstrap_cmds -, Carbon -, Cocoa -, lit -, makeWrapper -, darwin -, enableManpages ? false -, lua5_3 -}: - -stdenv.mkDerivation (rec { - pname = "lldb"; - inherit version; - - src = runCommand "${pname}-src-${version}" {} '' - mkdir -p "$out" - cp -r ${monorepoSrc}/cmake "$out" - cp -r ${monorepoSrc}/${pname} "$out" - ''; - - sourceRoot = "${src.name}/${pname}"; - - patches = [ - ./procfs.patch - (runCommand "resource-dir.patch" { - clangLibDir = "${libclang.lib}/lib"; - } '' - substitute '${./resource-dir.patch}' "$out" --subst-var clangLibDir - '') - ./gnu-install-dirs.patch - ] - # This is a stopgap solution if/until the macOS SDK used for x86_64 is - # updated. - # - # The older 10.12 SDK used on x86_64 as of this writing has a `mach/machine.h` - # header that does not define `CPU_SUBTYPE_ARM64E` so we replace the one use - # of this preprocessor symbol in `lldb` with its expansion. - # - # See here for some context: - # https://github.com/NixOS/nixpkgs/pull/194634#issuecomment-1272129132 - ++ lib.optional ( - stdenv.targetPlatform.isDarwin - && !stdenv.targetPlatform.isAarch64 - && (lib.versionOlder darwin.apple_sdk.sdk.version "11.0") - ) ./cpu_subtype_arm64e_replacement.patch; - - outputs = [ "out" "lib" "dev" ]; - - nativeBuildInputs = [ - cmake python3 which swig lit makeWrapper lua5_3 - ] ++ lib.optionals enableManpages [ - python3.pkgs.sphinx python3.pkgs.recommonmark - ]; - - buildInputs = [ - ncurses - zlib - libedit - libxml2 - libllvm - ] ++ lib.optionals stdenv.isDarwin [ - libobjc - xpc - Foundation - bootstrap_cmds - Carbon - Cocoa - ]; - - hardeningDisable = [ "format" ]; - - cmakeFlags = [ - "-DLLDB_INCLUDE_TESTS=${if doCheck then "YES" else "NO"}" - "-DLLVM_ENABLE_RTTI=OFF" - "-DClang_DIR=${libclang.dev}/lib/cmake" - "-DLLVM_EXTERNAL_LIT=${lit}/bin/lit" - ] ++ lib.optionals stdenv.isDarwin [ - "-DLLDB_USE_SYSTEM_DEBUGSERVER=ON" - ] ++ lib.optionals (!stdenv.isDarwin) [ - "-DLLDB_CODESIGN_IDENTITY=" # codesigning makes nondeterministic - ] ++ lib.optionals enableManpages [ - "-DLLVM_ENABLE_SPHINX=ON" - "-DSPHINX_OUTPUT_MAN=ON" - "-DSPHINX_OUTPUT_HTML=OFF" - ] ++ lib.optionals doCheck [ - "-DLLDB_TEST_C_COMPILER=${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc" - "-DLLDB_TEST_CXX_COMPILER=${stdenv.cc}/bin/${stdenv.cc.targetPrefix}c++" - ]; - - doCheck = false; - - doInstallCheck = true; - - installCheckPhase = '' - if [ ! -e $lib/${python3.sitePackages}/lldb/_lldb*.so ] ; then - echo "ERROR: python files not installed where expected!"; - return 1; - fi - if [ ! -e "$lib/lib/lua/${lua5_3.luaversion}/lldb.so" ] ; then - echo "ERROR: lua files not installed where expected!"; - return 1; - fi - ''; - - postInstall = '' - wrapProgram $out/bin/lldb --prefix PYTHONPATH : $lib/${python3.sitePackages}/ - - # Editor support - # vscode: - install -D ../tools/lldb-vscode/package.json $out/share/vscode/extensions/llvm-org.lldb-vscode-0.1.0/package.json - mkdir -p $out/share/vscode/extensions/llvm-org.lldb-vscode-0.1.0/bin - ln -s $out/bin/lldb-vscode $out/share/vscode/extensions/llvm-org.lldb-vscode-0.1.0/bin - ''; - - meta = llvm_meta // { - homepage = "https://lldb.llvm.org/"; - description = "A next-generation high-performance debugger"; - longDescription = '' - LLDB is a next generation, high-performance debugger. It is built as a set - of reusable components which highly leverage existing libraries in the - larger LLVM Project, such as the Clang expression parser and LLVM - disassembler. - ''; - }; -} // lib.optionalAttrs enableManpages { - pname = "lldb-manpages"; - - buildPhase = '' - make docs-lldb-man - ''; - - propagatedBuildInputs = []; - - # manually install lldb man page - installPhase = '' - mkdir -p $out/share/man/man1 - install docs/man/lldb.1 -t $out/share/man/man1/ - ''; - - postPatch = null; - postInstall = null; - - outputs = [ "out" ]; - - doCheck = false; - - meta = llvm_meta // { - description = "man pages for LLDB ${version}"; - }; -}) diff --git a/nixpkgs/pkgs/development/compilers/llvm/15/default.nix b/nixpkgs/pkgs/development/compilers/llvm/15/default.nix index 0e36ebb8abbb..a9fee13d12b0 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/15/default.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/15/default.nix @@ -184,11 +184,36 @@ in let inherit llvm_meta; }; - lldb = callPackage ./lldb { - inherit llvm_meta; - inherit (darwin) libobjc bootstrap_cmds; - inherit (darwin.apple_sdk.libs) xpc; - inherit (darwin.apple_sdk.frameworks) Foundation Carbon Cocoa; + lldb = callPackage ../common/lldb.nix { + patches = + let + resourceDirPatch = callPackage ({ runCommand, libclang }: (runCommand "resource-dir.patch" + { + clangLibDir = "${libclang.lib}/lib"; + } '' + substitute '${./lldb/resource-dir.patch}' "$out" --subst-var clangLibDir + '')) { }; + in + [ + ./lldb/procfs.patch + resourceDirPatch + ./lldb/gnu-install-dirs.patch + ] + # This is a stopgap solution if/until the macOS SDK used for x86_64 is + # updated. + # + # The older 10.12 SDK used on x86_64 as of this writing has a `mach/machine.h` + # header that does not define `CPU_SUBTYPE_ARM64E` so we replace the one use + # of this preprocessor symbol in `lldb` with its expansion. + # + # See here for some context: + # https://github.com/NixOS/nixpkgs/pull/194634#issuecomment-1272129132 + ++ lib.optional ( + stdenv.targetPlatform.isDarwin + && !stdenv.targetPlatform.isAarch64 + && (lib.versionOlder darwin.apple_sdk.sdk.version "11.0") + ) ./lldb/cpu_subtype_arm64e_replacement.patch; + inherit llvm_meta release_version; }; # Below, is the LLVM bootstrapping logic. It handles building a diff --git a/nixpkgs/pkgs/development/compilers/llvm/16/clang/default.nix b/nixpkgs/pkgs/development/compilers/llvm/16/clang/default.nix index d558bf70acfb..2a2656df5fe1 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/16/clang/default.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/16/clang/default.nix @@ -36,9 +36,14 @@ let "-DSPHINX_OUTPUT_MAN=ON" "-DSPHINX_OUTPUT_HTML=OFF" "-DSPHINX_WARNINGS_AS_ERRORS=OFF" - ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + ] ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ "-DLLVM_TABLEGEN_EXE=${buildLlvmTools.llvm}/bin/llvm-tblgen" "-DCLANG_TABLEGEN=${buildLlvmTools.libclang.dev}/bin/clang-tblgen" + # Added in LLVM15: + # `clang-tidy-confusable-chars-gen`: https://github.com/llvm/llvm-project/commit/c3574ef739fbfcc59d405985a3a4fa6f4619ecdb + # `clang-pseudo-gen`: https://github.com/llvm/llvm-project/commit/cd2292ef824591cc34cc299910a3098545c840c7 + "-DCLANG_TIDY_CONFUSABLE_CHARS_GEN=${buildLlvmTools.libclang.dev}/bin/clang-tidy-confusable-chars-gen" + "-DCLANG_PSEUDO_GEN=${buildLlvmTools.libclang.dev}/bin/clang-pseudo-gen" ]; patches = [ @@ -81,7 +86,7 @@ let patchShebangs $python/bin mkdir -p $dev/bin - cp bin/clang-tblgen $dev/bin + cp bin/{clang-tblgen,clang-tidy-confusable-chars-gen,clang-pseudo-gen} $dev/bin ''; passthru = { diff --git a/nixpkgs/pkgs/development/compilers/llvm/16/default.nix b/nixpkgs/pkgs/development/compilers/llvm/16/default.nix index 1304ef2bdbc0..1e200b17b0b2 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/16/default.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/16/default.nix @@ -25,7 +25,7 @@ # rev-version = /* human readable version; i.e. "unstable-2022-26-07" */; # sha256 = /* checksum for this release, can omit if specifying your own `monorepoSrc` */; # } -, officialRelease ? { version = "16.0.1"; sha256 = "sha256-Vr978ZY0i0NkdE/uuwcTccshfAT61KIN6KNq0TdwBNE="; } +, officialRelease ? { version = "16.0.6"; sha256 = "sha256-fspqSReX+VD+Nl/Cfq+tDcdPtnQPV1IRopNDfd5VtUs="; } # i.e.: # { # version = /* i.e. "15.0.0" */; @@ -184,11 +184,41 @@ in let inherit llvm_meta; }; - lldb = callPackage ./lldb { - inherit llvm_meta; - inherit (darwin) libobjc bootstrap_cmds; - inherit (darwin.apple_sdk.libs) xpc; - inherit (darwin.apple_sdk.frameworks) Foundation Carbon Cocoa; + lldb = callPackage ../common/lldb.nix { + src = callPackage ({ runCommand }: runCommand "lldb-src-${version}" {} '' + mkdir -p "$out" + cp -r ${monorepoSrc}/cmake "$out" + cp -r ${monorepoSrc}/lldb "$out" + '') { }; + patches = + let + resourceDirPatch = callPackage ({ runCommand, libclang }: (runCommand "resource-dir.patch" + { + clangLibDir = "${libclang.lib}/lib"; + } '' + substitute '${./lldb/resource-dir.patch}' "$out" --subst-var clangLibDir + '')) { }; + in + [ + # FIXME: do we need this? ./procfs.patch + resourceDirPatch + ./lldb/gnu-install-dirs.patch + ] + # This is a stopgap solution if/until the macOS SDK used for x86_64 is + # updated. + # + # The older 10.12 SDK used on x86_64 as of this writing has a `mach/machine.h` + # header that does not define `CPU_SUBTYPE_ARM64E` so we replace the one use + # of this preprocessor symbol in `lldb` with its expansion. + # + # See here for some context: + # https://github.com/NixOS/nixpkgs/pull/194634#issuecomment-1272129132 + ++ lib.optional ( + stdenv.targetPlatform.isDarwin + && !stdenv.targetPlatform.isAarch64 + && (lib.versionOlder darwin.apple_sdk.sdk.version "11.0") + ) ./lldb/cpu_subtype_arm64e_replacement.patch; + inherit llvm_meta release_version; }; # Below, is the LLVM bootstrapping logic. It handles building a diff --git a/nixpkgs/pkgs/development/compilers/llvm/16/lldb/default.nix b/nixpkgs/pkgs/development/compilers/llvm/16/lldb/default.nix deleted file mode 100644 index 062867394cc8..000000000000 --- a/nixpkgs/pkgs/development/compilers/llvm/16/lldb/default.nix +++ /dev/null @@ -1,186 +0,0 @@ -{ lib, stdenv, llvm_meta -, runCommand -, monorepoSrc -, cmake -, ninja -, zlib -, ncurses -, swig -, which -, libedit -, libxml2 -, libllvm -, libclang -, python3 -, version -, libobjc -, xpc -, Foundation -, bootstrap_cmds -, Carbon -, Cocoa -, lit -, makeWrapper -, darwin -, enableManpages ? false -, lua5_3 -}: - -# TODO: we build the python bindings but don't expose them as a python package -# TODO: expose the vscode extension? - -stdenv.mkDerivation (rec { - pname = "lldb"; - inherit version; - - src = runCommand "${pname}-src-${version}" {} '' - mkdir -p "$out" - cp -r ${monorepoSrc}/cmake "$out" - cp -r ${monorepoSrc}/${pname} "$out" - ''; - - sourceRoot = "${src.name}/${pname}"; - - patches = [ - # FIXME: do we need this? ./procfs.patch - (runCommand "resource-dir.patch" { - clangLibDir = "${libclang.lib}/lib"; - } '' - substitute '${./resource-dir.patch}' "$out" --subst-var clangLibDir - '') - ./gnu-install-dirs.patch - ] - # This is a stopgap solution if/until the macOS SDK used for x86_64 is - # updated. - # - # The older 10.12 SDK used on x86_64 as of this writing has a `mach/machine.h` - # header that does not define `CPU_SUBTYPE_ARM64E` so we replace the one use - # of this preprocessor symbol in `lldb` with its expansion. - # - # See here for some context: - # https://github.com/NixOS/nixpkgs/pull/194634#issuecomment-1272129132 - ++ lib.optional ( - stdenv.targetPlatform.isDarwin - && !stdenv.targetPlatform.isAarch64 - && (lib.versionOlder darwin.apple_sdk.sdk.version "11.0") - ) ./cpu_subtype_arm64e_replacement.patch; - - outputs = [ "out" "lib" "dev" ]; - - nativeBuildInputs = [ - cmake ninja python3 which swig lit makeWrapper lua5_3 - ] ++ lib.optionals enableManpages [ - python3.pkgs.sphinx python3.pkgs.recommonmark - ]; - - buildInputs = [ - ncurses - zlib - libedit - libxml2 - libllvm - ] ++ lib.optionals stdenv.isDarwin [ - libobjc - xpc - Foundation - bootstrap_cmds - Carbon - Cocoa - ] - # The older libSystem used on x86_64 macOS is missing the - # `<bsm/audit_session.h>` header which `lldb` uses. - # - # We copy this header over from macOS 10.12 SDK. - # - # See here for context: - # https://github.com/NixOS/nixpkgs/pull/194634#issuecomment-1272129132 - ++ lib.optional ( - stdenv.targetPlatform.isDarwin - && !stdenv.targetPlatform.isAarch64 - ) ( - runCommand "bsm-audit-session-header" { } '' - install -Dm444 \ - "${lib.getDev darwin.apple_sdk.sdk}/include/bsm/audit_session.h" \ - "$out/include/bsm/audit_session.h" - '' - ); - - hardeningDisable = [ "format" ]; - - cmakeFlags = [ - "-DLLDB_INCLUDE_TESTS=${if doCheck then "YES" else "NO"}" - "-DLLVM_ENABLE_RTTI=OFF" - "-DClang_DIR=${libclang.dev}/lib/cmake" - "-DLLVM_EXTERNAL_LIT=${lit}/bin/lit" - ] ++ lib.optionals stdenv.isDarwin [ - "-DLLDB_USE_SYSTEM_DEBUGSERVER=ON" - ] ++ lib.optionals (!stdenv.isDarwin) [ - "-DLLDB_CODESIGN_IDENTITY=" # codesigning makes nondeterministic - ] ++ lib.optionals enableManpages [ - "-DLLVM_ENABLE_SPHINX=ON" - "-DSPHINX_OUTPUT_MAN=ON" - "-DSPHINX_OUTPUT_HTML=OFF" - - # docs reference `automodapi` but it's not added to the extensions list when - # only building the manpages: - # https://github.com/llvm/llvm-project/blob/af6ec9200b09039573d85e349496c4f5b17c3d7f/lldb/docs/conf.py#L54 - # - # so, we just ignore the resulting errors - "-DSPHINX_WARNINGS_AS_ERRORS=OFF" - ] ++ lib.optionals doCheck [ - "-DLLDB_TEST_C_COMPILER=${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc" - "-DLLDB_TEST_CXX_COMPILER=${stdenv.cc}/bin/${stdenv.cc.targetPrefix}c++" - ]; - - doCheck = false; - - installCheckPhase = '' - if [ ! -e "$lib/${python3.sitePackages}/lldb/_lldb.so" ] ; then - return 1; - fi - ''; - - postInstall = '' - wrapProgram $out/bin/lldb --prefix PYTHONPATH : $lib/${python3.sitePackages}/ - - # Editor support - # vscode: - install -D ../tools/lldb-vscode/package.json $out/share/vscode/extensions/llvm-org.lldb-vscode-0.1.0/package.json - mkdir -p $out/share/vscode/extensions/llvm-org.lldb-vscode-0.1.0/bin - ln -s $out/bin/lldb-vscode $out/share/vscode/extensions/llvm-org.lldb-vscode-0.1.0/bin - ''; - - meta = llvm_meta // { - homepage = "https://lldb.llvm.org/"; - description = "A next-generation high-performance debugger"; - longDescription = '' - LLDB is a next generation, high-performance debugger. It is built as a set - of reusable components which highly leverage existing libraries in the - larger LLVM Project, such as the Clang expression parser and LLVM - disassembler. - ''; - }; -} // lib.optionalAttrs enableManpages { - pname = "lldb-manpages"; - - ninjaFlags = [ "docs-lldb-man" ]; - - propagatedBuildInputs = []; - - # manually install lldb man page - installPhase = '' - mkdir -p $out/share/man/man1 - install docs/man/lldb.1 -t $out/share/man/man1/ - ''; - - postPatch = null; - postInstall = null; - - outputs = [ "out" ]; - - doCheck = false; - - meta = llvm_meta // { - description = "man pages for LLDB ${version}"; - }; -}) diff --git a/nixpkgs/pkgs/development/compilers/llvm/16/llvm/gnu-install-dirs.patch b/nixpkgs/pkgs/development/compilers/llvm/16/llvm/gnu-install-dirs.patch index 0ef317af8cc7..1c2d52d59ef2 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/16/llvm/gnu-install-dirs.patch +++ b/nixpkgs/pkgs/development/compilers/llvm/16/llvm/gnu-install-dirs.patch @@ -1,8 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 45399dc0537e..5d946e9e6583 100644 +index 7e25e0407db2..72f031a82b75 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -942,7 +942,7 @@ if (NOT TENSORFLOW_AOT_PATH STREQUAL "") +@@ -995,7 +995,7 @@ if (NOT TENSORFLOW_AOT_PATH STREQUAL "") add_subdirectory(${TENSORFLOW_AOT_PATH}/xla_aot_runtime_src ${CMAKE_ARCHIVE_OUTPUT_DIRECTORY}/tf_runtime) install(TARGETS tf_xla_runtime EXPORT LLVMExports @@ -12,10 +12,10 @@ index 45399dc0537e..5d946e9e6583 100644 # Once we add more modules, we should handle this more automatically. if (DEFINED LLVM_OVERRIDE_MODEL_HEADER_INLINERSIZEMODEL) diff --git a/cmake/modules/AddLLVM.cmake b/cmake/modules/AddLLVM.cmake -index 057431208322..56f0dcb258da 100644 +index 93e6d67551de..8d367457af5a 100644 --- a/cmake/modules/AddLLVM.cmake +++ b/cmake/modules/AddLLVM.cmake -@@ -844,8 +844,8 @@ macro(add_llvm_library name) +@@ -874,8 +874,8 @@ macro(add_llvm_library name) get_target_export_arg(${name} LLVM export_to_llvmexports ${umbrella}) install(TARGETS ${name} ${export_to_llvmexports} @@ -26,7 +26,7 @@ index 057431208322..56f0dcb258da 100644 RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT ${name}) if (NOT LLVM_ENABLE_IDE) -@@ -2007,7 +2007,7 @@ function(llvm_install_library_symlink name dest type) +@@ -2043,7 +2043,7 @@ function(llvm_install_library_symlink name dest type) set(full_name ${CMAKE_${type}_LIBRARY_PREFIX}${name}${CMAKE_${type}_LIBRARY_SUFFIX}) set(full_dest ${CMAKE_${type}_LIBRARY_PREFIX}${dest}${CMAKE_${type}_LIBRARY_SUFFIX}) @@ -35,7 +35,7 @@ index 057431208322..56f0dcb258da 100644 if(WIN32 AND "${type}" STREQUAL "SHARED") set(output_dir "${CMAKE_INSTALL_BINDIR}") endif() -@@ -2271,15 +2271,15 @@ function(llvm_setup_rpath name) +@@ -2312,16 +2312,37 @@ function(llvm_setup_rpath name) if (APPLE) set(_install_name_dir INSTALL_NAME_DIR "@rpath") @@ -49,7 +49,30 @@ index 057431208322..56f0dcb258da 100644 - set(_install_rpath "${LLVM_LIBRARY_OUTPUT_INTDIR}" "${CMAKE_INSTALL_PREFIX}/lib${LLVM_LIBDIR_SUFFIX}" ${extra_libdir}) + set(_install_rpath "${LLVM_LIBRARY_OUTPUT_INTDIR}" "${CMAKE_INSTALL_FULL_LIBDIR}${LLVM_LIBDIR_SUFFIX}" ${extra_libdir}) elseif(UNIX) -- set(_install_rpath "\$ORIGIN/../lib${LLVM_LIBDIR_SUFFIX}" ${extra_libdir}) +- set(_build_rpath "\$ORIGIN/../lib${LLVM_LIBDIR_SUFFIX}" ${extra_libdir}) +- set(_install_rpath "\$ORIGIN/../lib${LLVM_LIBDIR_SUFFIX}") ++ # Note that we add `extra_libdir` (aka `LLVM_LIBRARY_DIR` in our case) back ++ # to `_install_rpath` here. ++ # ++ # In nixpkgs we do not build and install LLVM alongside rdeps of LLVM (i.e. ++ # clang); instead LLVM is its own package and thus lands at its own nix ++ # store path. This makes it so that the default relative rpath (`../lib/`) ++ # does not point at the LLVM shared objects. ++ # ++ # More discussion here: ++ # - https://github.com/NixOS/nixpkgs/pull/235624#discussion_r1220150329 ++ # - https://reviews.llvm.org/D146918 (16.0.5+) ++ # ++ # Note that we leave `extra_libdir` in `_build_rpath`: without FHS there is ++ # no potential that this will result in us pulling in the "wrong" LLVM. ++ # Adding this to the build rpath means we aren't forced to use ++ # `installCheckPhase` instead of `checkPhase` (i.e. binaries in the build ++ # dir, pre-install, will have the right rpath for LLVM). ++ # ++ # As noted in the differential above, an alternative solution is to have ++ # all rdeps of nixpkgs' LLVM (that use the AddLLVM.cmake machinery) set ++ # `CMAKE_INSTALL_RPATH`. ++ set(_build_rpath "\$ORIGIN/../${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}" ${extra_libdir}) + set(_install_rpath "\$ORIGIN/../${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}" ${extra_libdir}) if(${CMAKE_SYSTEM_NAME} MATCHES "(FreeBSD|DragonFly)") set_property(TARGET ${name} APPEND_STRING PROPERTY @@ -71,10 +94,10 @@ index 891c9e6d618c..8d963f3b0069 100644 list(APPEND ocaml_flags "-ldopt" "-Wl,-rpath,${ocaml_rpath}") diff --git a/cmake/modules/CMakeLists.txt b/cmake/modules/CMakeLists.txt -index d4b0ab959148..26ed981fd09f 100644 +index d99af79aa38e..21e794224b99 100644 --- a/cmake/modules/CMakeLists.txt +++ b/cmake/modules/CMakeLists.txt -@@ -128,7 +128,7 @@ set(LLVM_CONFIG_INCLUDE_DIRS +@@ -127,7 +127,7 @@ set(LLVM_CONFIG_INCLUDE_DIRS ) list(REMOVE_DUPLICATES LLVM_CONFIG_INCLUDE_DIRS) @@ -84,7 +107,7 @@ index d4b0ab959148..26ed981fd09f 100644 "${LLVM_CONFIG_LIBRARY_DIR}" # FIXME: Should there be other entries here? diff --git a/docs/CMake.rst b/docs/CMake.rst -index 879b7b231d4c..9c31d14e8950 100644 +index 7926de258ec8..5ae01adc3905 100644 --- a/docs/CMake.rst +++ b/docs/CMake.rst @@ -250,7 +250,7 @@ description is in `LLVM-related variables`_ below. @@ -120,10 +143,10 @@ index 370005cd8d7d..7e790bc52111 100644 #define LLVM_INSTALL_PACKAGE_DIR "@LLVM_INSTALL_PACKAGE_DIR@" #define LLVM_TARGETS_BUILT "@LLVM_TARGETS_BUILT@" diff --git a/tools/llvm-config/llvm-config.cpp b/tools/llvm-config/llvm-config.cpp -index 2c6c55f89d38..f6d2068a0827 100644 +index b1d795a0a349..de6cb1514f05 100644 --- a/tools/llvm-config/llvm-config.cpp +++ b/tools/llvm-config/llvm-config.cpp -@@ -369,7 +369,11 @@ int main(int argc, char **argv) { +@@ -366,7 +366,11 @@ int main(int argc, char **argv) { sys::fs::make_absolute(ActivePrefix, Path); ActiveBinDir = std::string(Path.str()); } diff --git a/nixpkgs/pkgs/development/compilers/llvm/15/lldb/default.nix b/nixpkgs/pkgs/development/compilers/llvm/common/lldb.nix index 4b50b79cf613..82ad9c304ea6 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/15/lldb/default.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/common/lldb.nix @@ -1,8 +1,8 @@ -{ lib, stdenv, llvm_meta -, runCommand -, monorepoSrc +{ lib +, stdenv +, llvm_meta +, release_version , cmake -, ninja , zlib , ncurses , swig @@ -13,64 +13,57 @@ , libclang , python3 , version -, libobjc -, xpc -, Foundation -, bootstrap_cmds -, Carbon -, Cocoa +, darwin , lit , makeWrapper -, darwin -, enableManpages ? false , lua5_3 +, ninja +, runCommand +, src ? null +, monorepoSrc ? null +, patches ? [ ] +, enableManpages ? false }: -# TODO: we build the python bindings but don't expose them as a python package -# TODO: expose the vscode extension? +let + src' = + if monorepoSrc != null then + runCommand "lldb-src-${version}" { } '' + mkdir -p "$out" + cp -r ${monorepoSrc}/cmake "$out" + cp -r ${monorepoSrc}/lldb "$out" + '' else src; +in stdenv.mkDerivation (rec { + passthru.monorepoSrc = monorepoSrc; pname = "lldb"; inherit version; - src = runCommand "${pname}-src-${version}" {} '' - mkdir -p "$out" - cp -r ${monorepoSrc}/cmake "$out" - cp -r ${monorepoSrc}/${pname} "$out" - ''; - - sourceRoot = "${src.name}/${pname}"; - - patches = [ - ./procfs.patch - (runCommand "resource-dir.patch" { - clangLibDir = "${libclang.lib}/lib"; - } '' - substitute '${./resource-dir.patch}' "$out" --subst-var clangLibDir - '') - ./gnu-install-dirs.patch - ] - # This is a stopgap solution if/until the macOS SDK used for x86_64 is - # updated. - # - # The older 10.12 SDK used on x86_64 as of this writing has a `mach/machine.h` - # header that does not define `CPU_SUBTYPE_ARM64E` so we replace the one use - # of this preprocessor symbol in `lldb` with its expansion. - # - # See here for some context: - # https://github.com/NixOS/nixpkgs/pull/194634#issuecomment-1272129132 - ++ lib.optional ( - stdenv.targetPlatform.isDarwin - && !stdenv.targetPlatform.isAarch64 - && (lib.versionOlder darwin.apple_sdk.sdk.version "11.0") - ) ./cpu_subtype_arm64e_replacement.patch; + src = src'; + inherit patches; outputs = [ "out" "lib" "dev" ]; + sourceRoot = + if lib.versionOlder release_version "13" then null + else "${src.name}/${pname}"; + nativeBuildInputs = [ - cmake ninja python3 which swig lit makeWrapper lua5_3 + cmake + ] ++ lib.optionals (lib.versionAtLeast release_version "15") [ + ninja + ] ++ [ + python3 + which + swig + lit + makeWrapper + ] ++ lib.optionals (lib.versionAtLeast release_version "14") [ + lua5_3 ] ++ lib.optionals enableManpages [ - python3.pkgs.sphinx python3.pkgs.recommonmark + python3.pkgs.sphinx + python3.pkgs.recommonmark ]; buildInputs = [ @@ -80,12 +73,12 @@ stdenv.mkDerivation (rec { libxml2 libllvm ] ++ lib.optionals stdenv.isDarwin [ - libobjc - xpc - Foundation - bootstrap_cmds - Carbon - Cocoa + darwin.libobjc + darwin.apple_sdk.libs.xpc + darwin.apple_sdk.frameworks.Foundation + darwin.bootstrap_cmds + darwin.apple_sdk.frameworks.Carbon + darwin.apple_sdk.frameworks.Cocoa ] # The older libSystem used on x86_64 macOS is missing the # `<bsm/audit_session.h>` header which `lldb` uses. @@ -96,7 +89,8 @@ stdenv.mkDerivation (rec { # https://github.com/NixOS/nixpkgs/pull/194634#issuecomment-1272129132 ++ lib.optional ( stdenv.targetPlatform.isDarwin - && !stdenv.targetPlatform.isAarch64 + && !stdenv.targetPlatform.isAarch64 + && (lib.versionAtLeast release_version "15") ) ( runCommand "bsm-audit-session-header" { } '' install -Dm444 \ @@ -116,29 +110,45 @@ stdenv.mkDerivation (rec { "-DLLDB_USE_SYSTEM_DEBUGSERVER=ON" ] ++ lib.optionals (!stdenv.isDarwin) [ "-DLLDB_CODESIGN_IDENTITY=" # codesigning makes nondeterministic - ] ++ lib.optionals enableManpages [ + ] ++ lib.optionals enableManpages ([ "-DLLVM_ENABLE_SPHINX=ON" "-DSPHINX_OUTPUT_MAN=ON" "-DSPHINX_OUTPUT_HTML=OFF" - + ] ++ lib.optionals (lib.versionAtLeast release_version "15") [ # docs reference `automodapi` but it's not added to the extensions list when # only building the manpages: # https://github.com/llvm/llvm-project/blob/af6ec9200b09039573d85e349496c4f5b17c3d7f/lldb/docs/conf.py#L54 # # so, we just ignore the resulting errors "-DSPHINX_WARNINGS_AS_ERRORS=OFF" - ] ++ lib.optionals doCheck [ + ]) ++ lib.optionals doCheck [ "-DLLDB_TEST_C_COMPILER=${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc" "-DLLDB_TEST_CXX_COMPILER=${stdenv.cc}/bin/${stdenv.cc.targetPrefix}c++" ]; doCheck = false; - installCheckPhase = '' - if [ ! -e "$lib/${python3.sitePackages}/lldb/_lldb.so" ] ; then - return 1; - fi - ''; + # TODO: cleanup with mass-rebuild + installCheckPhase = + if ((lib.versions.major release_version) == "14") then '' + if [ ! -e $lib/${python3.sitePackages}/lldb/_lldb*.so ] ; then + echo "ERROR: python files not installed where expected!"; + return 1; + fi + if [ ! -e "$lib/lib/lua/${lua5_3.luaversion}/lldb.so" ] ; then + echo "ERROR: lua files not installed where expected!"; + return 1; + fi + '' else if (((lib.versions.major release_version) == "15") || (lib.versions.major release_version) == "16") then '' + if [ ! -e "$lib/${python3.sitePackages}/lldb/_lldb.so" ] ; then + return 1; + fi + '' else '' + if [ ! -e "$lib/${python3.sitePackages}/lldb/_lldb.so" ] ; then + echo "ERROR: python files not installed where expected!"; + return 1; + fi + ''; postInstall = '' wrapProgram $out/bin/lldb --prefix PYTHONPATH : $lib/${python3.sitePackages}/ @@ -147,7 +157,7 @@ stdenv.mkDerivation (rec { # vscode: install -D ../tools/lldb-vscode/package.json $out/share/vscode/extensions/llvm-org.lldb-vscode-0.1.0/package.json mkdir -p $out/share/vscode/extensions/llvm-org.lldb-vscode-0.1.0/bin - ln -s $out/bin/lldb-vscode $out/share/vscode/extensions/llvm-org.lldb-vscode-0.1.0/bin + ln -s $out/bin/${if (lib.versionOlder release_version "12") then "llvm-vscode" else "lldb-vscode"} $out/share/vscode/extensions/llvm-org.lldb-vscode-0.1.0/bin ''; meta = llvm_meta // { @@ -159,13 +169,24 @@ stdenv.mkDerivation (rec { larger LLVM Project, such as the Clang expression parser and LLVM disassembler. ''; + # llvm <10 never built on aarch64-darwin since first introduction in nixpkgs + broken = + (lib.versionOlder release_version "11" && stdenv.isDarwin && stdenv.isAarch64) + || (((lib.versions.major release_version) == "13") && stdenv.isDarwin); }; +} // lib.optionalAttrs (lib.versionOlder release_version "15") { + doInstallCheck = true; } // lib.optionalAttrs enableManpages { pname = "lldb-manpages"; - ninjaFlags = [ "docs-lldb-man" ]; + buildPhase = + if lib.versionOlder release_version "15" then '' + make ${if (lib.versionOlder release_version "12") then "docs-man" else "docs-lldb-man"} + '' else null; + + ninjaFlags = if lib.versionAtLeast release_version "15" then [ "docs-lldb-man" ] else null; - propagatedBuildInputs = []; + propagatedBuildInputs = [ ]; # manually install lldb man page installPhase = '' diff --git a/nixpkgs/pkgs/development/compilers/lobster/default.nix b/nixpkgs/pkgs/development/compilers/lobster/default.nix index b1dac5a67f1a..712dcf12215d 100644 --- a/nixpkgs/pkgs/development/compilers/lobster/default.nix +++ b/nixpkgs/pkgs/development/compilers/lobster/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "lobster"; - version = "2023.6"; + version = "2023.9"; src = fetchFromGitHub { owner = "aardappel"; repo = "lobster"; rev = "v${version}"; - sha256 = "sha256-10QucCDHL7Hk3P4NI94J4Kw6L5+8BNd90DKX6LN7D+E="; + sha256 = "sha256-30OOdl/BzWJeLhSWuzLAhwELRPcOJIi7FqwL/ztUOUo="; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/compilers/lunarml/default.nix b/nixpkgs/pkgs/development/compilers/lunarml/default.nix new file mode 100644 index 000000000000..ff3122ce2198 --- /dev/null +++ b/nixpkgs/pkgs/development/compilers/lunarml/default.nix @@ -0,0 +1,54 @@ +{ lib +, fetchFromGitHub +, stdenvNoCC +, mlton +, lua5_3 +}: + +let + pname = "lunarml"; +in +stdenvNoCC.mkDerivation { + inherit pname; + + version = "unstable-2023-06-25"; + + src = fetchFromGitHub { + owner = "minoki"; + repo = "LunarML"; + rev = "f58f90cf7a2f26340403245907ed183f6a12ab52"; + sha256 = "djHJfUAPplsejFW9L3fbwTeeWgvR+gKkI8TmwIh8n7E="; + }; + + outputs = [ "out" "doc" ]; + + nativeBuildInputs = [ + mlton + ]; + + nativeCheckInputs = [ + lua5_3 + ]; + + postBuild = '' + make -C thirdparty install + ''; + + doCheck = true; + + installPhase = '' + mkdir -p $doc/${pname} $out/{bin,lib} + cp -r bin $out + cp -r lib $out + cp -r doc/* README.* LICENSE* $doc/${pname} + cp -r example $doc/${pname} + ''; + + meta = { + description = "Standard ML compiler that produces Lua/JavaScript"; + homepage = "https://github.com/minoki/LunarML"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ toastal ]; + platforms = mlton.meta.platforms; + }; +} diff --git a/nixpkgs/pkgs/development/compilers/minimacy/default.nix b/nixpkgs/pkgs/development/compilers/minimacy/default.nix index 0442e6a040f8..7e14f9a91de4 100644 --- a/nixpkgs/pkgs/development/compilers/minimacy/default.nix +++ b/nixpkgs/pkgs/development/compilers/minimacy/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "minimacy"; - version = "1.0.0"; + version = "1.1.0"; src = fetchFromGitHub { owner = "ambermind"; repo = pname; rev = version; - hash = "sha256-cpxKZ77Noe/2et3ROAQwG2LJxrlsEfi+bmUj+QaPkk0="; + hash = "sha256-VqcMdlptoMJEsPTny/E6ly7/xmHKcljIsSeZDzaA+ig="; }; nativeBuildInputs = [ makeBinaryWrapper ]; diff --git a/nixpkgs/pkgs/development/compilers/mono/generic.nix b/nixpkgs/pkgs/development/compilers/mono/generic.nix index ddd77509c766..26e8653209fa 100644 --- a/nixpkgs/pkgs/development/compilers/mono/generic.nix +++ b/nixpkgs/pkgs/development/compilers/mono/generic.nix @@ -81,6 +81,15 @@ stdenv.mkDerivation rec { description = "Cross platform, open source .NET development framework"; platforms = with platforms; darwin ++ linux; maintainers = with maintainers; [ thoughtpolice obadz vrthra ]; - license = licenses.free; # Combination of LGPL/X11/GPL ? + license = with licenses; [ + /* runtime, compilers, tools and most class libraries licensed */ mit + /* runtime includes some code licensed */ bsd3 + /* mcs/class/I18N/mklist.sh marked GPLv2 and others just GPL */ gpl2Only + /* RabbitMQ.Client class libraries dual licensed */ mpl20 asl20 + /* mcs/class/System.Core/System/TimeZoneInfo.Android.cs */ asl20 + /* some documentation */ mspl + # https://www.mono-project.com/docs/faq/licensing/ + # https://github.com/mono/mono/blob/main/LICENSE + ]; }; } diff --git a/nixpkgs/pkgs/development/compilers/mruby/default.nix b/nixpkgs/pkgs/development/compilers/mruby/default.nix index 6cebeed7378e..578dbf9c9837 100644 --- a/nixpkgs/pkgs/development/compilers/mruby/default.nix +++ b/nixpkgs/pkgs/development/compilers/mruby/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, ruby, bison, rake, fetchFromGitHub }: +{ lib, stdenv, ruby, rake, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "mruby"; @@ -11,10 +11,12 @@ stdenv.mkDerivation rec { sha256 = "sha256-MmrbWeg/G29YBvVrOtceTOZChrQ2kx9+apl7u7BiGjA="; }; - nativeBuildInputs = [ ruby bison rake ]; + nativeBuildInputs = [ rake ]; + + nativeCheckInputs = [ ruby ]; # Necessary so it uses `gcc` instead of `ld` for linking. - # https://github.com/mruby/mruby/blob/35be8b252495d92ca811d76996f03c470ee33380/tasks/toolchains/gcc.rake#L25 + # https://github.com/mruby/mruby/blob/e502fd88b988b0a8d9f31b928eb322eae269c45a/tasks/toolchains/gcc.rake#L30 preBuild = "unset LD"; installPhase = '' @@ -24,19 +26,13 @@ stdenv.mkDerivation rec { doCheck = true; - checkPhase = '' - runHook preCheck - - rake test - - runHook postCheck - ''; + checkTarget = "test"; meta = with lib; { description = "An embeddable implementation of the Ruby language"; homepage = "https://mruby.org"; - maintainers = [ maintainers.nicknovitski ]; + maintainers = with maintainers; [ nicknovitski marsam ]; license = licenses.mit; - platforms = platforms.unix; + platforms = platforms.all; }; } diff --git a/nixpkgs/pkgs/development/compilers/nim/default.nix b/nixpkgs/pkgs/development/compilers/nim/default.nix index 1cbdd84ba639..131a27b6f544 100644 --- a/nixpkgs/pkgs/development/compilers/nim/default.nix +++ b/nixpkgs/pkgs/development/compilers/nim/default.nix @@ -86,12 +86,12 @@ in { nim-unwrapped = stdenv.mkDerivation rec { pname = "nim-unwrapped"; - version = "1.6.12"; + version = "1.6.14"; strictDeps = true; src = fetchurl { url = "https://nim-lang.org/download/nim-${version}.tar.xz"; - hash = "sha256-rO8LCrdzYE1Nc5S2hRntt0+zD0aRIpSyi8J+DHtLTcI="; + hash = "sha256-0HDS8oriQA33/kpJ7OufRc1TmQaxB0gYVqCveo+oLck="; }; buildInputs = [ boehmgc openssl pcre readline sqlite ] @@ -103,6 +103,9 @@ in { ./nixbuild.patch # Load libraries at runtime by absolute path + + ./extra-mangling.patch + # Mangle store paths of modules to prevent runtime dependence. ] ++ lib.optional (!stdenv.hostPlatform.isWindows) ./toLocation.patch; configurePhase = '' @@ -282,9 +285,6 @@ in { "--set NIM_CONFIG_PATH ${placeholder "out"}/etc/nim" # Use the custom configuration - - ''--set NIX_HARDENING_ENABLE "''${NIX_HARDENING_ENABLE/fortify}"'' - # Fortify hardening appends -O2 to gcc flags which is unwanted for unoptimized nim builds. ]; installPhase = '' diff --git a/nixpkgs/pkgs/development/compilers/nim/extra-mangling.patch b/nixpkgs/pkgs/development/compilers/nim/extra-mangling.patch new file mode 100644 index 000000000000..b68f7033994d --- /dev/null +++ b/nixpkgs/pkgs/development/compilers/nim/extra-mangling.patch @@ -0,0 +1,48 @@ +diff --git a/compiler/modulepaths.nim b/compiler/modulepaths.nim +index e80ea3fa6..8ecf27a85 100644 +--- a/compiler/modulepaths.nim ++++ b/compiler/modulepaths.nim +@@ -70,6 +70,13 @@ proc checkModuleName*(conf: ConfigRef; n: PNode; doLocalError=true): FileIndex = + else: + result = fileInfoIdx(conf, fullPath) + ++proc rot13(result: var string) = ++ for i, c in result: ++ case c ++ of 'a'..'m', 'A'..'M': result[i] = char(c.uint8 + 13) ++ of 'n'..'z', 'N'..'Z': result[i] = char(c.uint8 - 13) ++ else: discard ++ + proc mangleModuleName*(conf: ConfigRef; path: AbsoluteFile): string = + ## Mangle a relative module path to avoid path and symbol collisions. + ## +@@ -78,9 +85,11 @@ proc mangleModuleName*(conf: ConfigRef; path: AbsoluteFile): string = + ## + ## Example: + ## `foo-#head/../bar` becomes `@foo-@hhead@s..@sbar` +- "@m" & relativeTo(path, conf.projectPath).string.multiReplace( ++ result = "@m" & relativeTo(path, conf.projectPath).string.multiReplace( + {$os.DirSep: "@s", $os.AltSep: "@s", "#": "@h", "@": "@@", ":": "@c"}) ++ rot13(result) + + proc demangleModuleName*(path: string): string = + ## Demangle a relative module path. + result = path.multiReplace({"@@": "@", "@h": "#", "@s": "/", "@m": "", "@c": ":"}) ++ rot13(result) +diff --git a/compiler/msgs.nim b/compiler/msgs.nim +index 3f386cc61..054f7f647 100644 +--- a/compiler/msgs.nim ++++ b/compiler/msgs.nim +@@ -659,8 +659,10 @@ proc uniqueModuleName*(conf: ConfigRef; fid: FileIndex): string = + for i in 0..<trunc: + let c = rel[i] + case c +- of 'a'..'z': +- result.add c ++ of 'a'..'m': ++ result.add char(c.uint8 + 13) ++ of 'n'..'z': ++ result.add char(c.uint8 - 13) + of {os.DirSep, os.AltSep}: + result.add 'Z' # because it looks a bit like '/' + of '.': diff --git a/nixpkgs/pkgs/development/compilers/odin/default.nix b/nixpkgs/pkgs/development/compilers/odin/default.nix index 5845be142b62..340c56284f88 100644 --- a/nixpkgs/pkgs/development/compilers/odin/default.nix +++ b/nixpkgs/pkgs/development/compilers/odin/default.nix @@ -1,31 +1,43 @@ { lib , fetchFromGitHub -, llvmPackages -, makeWrapper +, llvmPackages_13 +, makeBinaryWrapper , libiconv +, MacOSX-SDK +, which }: let + llvmPackages = llvmPackages_13; inherit (llvmPackages) stdenv; in stdenv.mkDerivation rec { pname = "odin"; - version = "0.13.0"; + version = "dev-2023-07"; src = fetchFromGitHub { owner = "odin-lang"; repo = "Odin"; - rev = "v${version}"; - sha256 = "ke2HPxVtF/Lh74Tv6XbpM9iLBuXLdH1+IE78MAacfYY="; + rev = version; + hash = "sha256-ksCK1Qmjbg5ZgFoq0I4cjrWaCxd+UW7f1NLcSjCPMwE="; }; nativeBuildInputs = [ - makeWrapper + makeBinaryWrapper which ]; buildInputs = lib.optional stdenv.isDarwin libiconv; - postPatch = '' - sed -i 's/^GIT_SHA=.*$/GIT_SHA=/' Makefile + LLVM_CONFIG = "${llvmPackages.llvm.dev}/bin/llvm-config"; + + postPatch = lib.optionalString stdenv.isDarwin '' + sed -i src/main.cpp \ + -e 's|-syslibroot /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk|-syslibroot ${MacOSX-SDK}|' + '' + '' + sed -i build_odin.sh \ + -e 's/^GIT_SHA=.*$/GIT_SHA=/' \ + -e 's/LLVM-C/LLVM/' \ + -e 's/framework System/lSystem/' + patchShebangs build_odin.sh ''; dontConfigure = true; @@ -35,23 +47,32 @@ in stdenv.mkDerivation rec { ]; installPhase = '' + runHook preInstall + mkdir -p $out/bin cp odin $out/bin/odin - cp -r core $out/bin/core - - wrapProgram $out/bin/odin --prefix PATH : ${lib.makeBinPath (with llvmPackages; [ - bintools - llvm - clang - lld - ])} + + mkdir -p $out/share + cp -r core $out/share/core + cp -r vendor $out/share/vendor + + wrapProgram $out/bin/odin \ + --prefix PATH : ${lib.makeBinPath (with llvmPackages; [ + bintools + llvm + clang + lld + ])} \ + --set-default ODIN_ROOT $out/share + + runHook postInstall ''; meta = with lib; { description = "A fast, concise, readable, pragmatic and open sourced programming language"; homepage = "https://odin-lang.org/"; - license = licenses.bsd2; - maintainers = with maintainers; [ luc65r ]; - platforms = platforms.x86_64; + license = licenses.bsd3; + maintainers = with maintainers; [ luc65r astavie ]; + platforms = platforms.x86_64 ++ [ "aarch64-darwin" ]; }; } diff --git a/nixpkgs/pkgs/development/compilers/openjdk/11.nix b/nixpkgs/pkgs/development/compilers/openjdk/11.nix index af7bfead3982..e9b8961d5e59 100644 --- a/nixpkgs/pkgs/development/compilers/openjdk/11.nix +++ b/nixpkgs/pkgs/development/compilers/openjdk/11.nix @@ -11,8 +11,8 @@ let major = "11"; minor = "0"; - update = "18"; - build = "10"; + update = "19"; + build = "7"; # when building a headless jdk, also bootstrap it with a headless jdk openjdk-bootstrap = openjdk11-bootstrap.override { gtkSupport = !headless; }; @@ -25,7 +25,7 @@ let owner = "openjdk"; repo = "jdk${major}u"; rev = "jdk-${version}"; - sha256 = "sha256-QGOpMIrWwOtIcUY/CLbTRDvcVTG2xioZu46v+n+IIQ4="; + sha256 = "sha256-mp8toB1dWcwOtMqNFd7UwRg8pLJckovqD/LD5p9zUoA="; }; nativeBuildInputs = [ pkg-config autoconf unzip ]; diff --git a/nixpkgs/pkgs/development/compilers/openjdk/17.nix b/nixpkgs/pkgs/development/compilers/openjdk/17.nix index 9cb0b811b516..9aa952156d29 100644 --- a/nixpkgs/pkgs/development/compilers/openjdk/17.nix +++ b/nixpkgs/pkgs/development/compilers/openjdk/17.nix @@ -11,8 +11,8 @@ let version = { feature = "17"; - interim = ".0.6"; - build = "10"; + interim = ".0.7"; + build = "7"; }; # when building a headless jdk, also bootstrap it with a headless jdk @@ -26,7 +26,7 @@ let owner = "openjdk"; repo = "jdk${version.feature}u"; rev = "jdk-${version.feature}${version.interim}+${version.build}"; - sha256 = "sha256-zPpINi++3Ct0PCwlwlfhceh/ploMkclw+MgeI9dULdc="; + sha256 = "sha256-S6QOB4Tbi+K1yjvvywTfvwFI2eX8AiqIx5c3zfxcskc="; }; nativeBuildInputs = [ pkg-config autoconf unzip ]; diff --git a/nixpkgs/pkgs/development/compilers/openjdk/20.nix b/nixpkgs/pkgs/development/compilers/openjdk/20.nix new file mode 100644 index 000000000000..105a1cc7b35d --- /dev/null +++ b/nixpkgs/pkgs/development/compilers/openjdk/20.nix @@ -0,0 +1,195 @@ +{ stdenv, lib, fetchurl, fetchpatch, fetchFromGitHub, bash, pkg-config, autoconf, cpio +, file, which, unzip, zip, perl, cups, freetype, alsa-lib, libjpeg, giflib +, libpng, zlib, lcms2, libX11, libICE, libXrender, libXext, libXt, libXtst +, libXi, libXinerama, libXcursor, libXrandr, fontconfig, openjdk20-bootstrap +, ensureNewerSourcesForZipFilesHook +, setJavaClassPath +# TODO(@sternenseemann): gtk3 fails to evaluate in pkgsCross.ghcjs.buildPackages +# which should be fixable, this is a no-rebuild workaround for GHC. +, headless ? stdenv.targetPlatform.isGhcjs +, enableJavaFX ? false, openjfx +, enableGnome2 ? true, gtk3, gnome_vfs, glib, GConf +}: + +let + version = { + feature = "20"; + interim = ""; + build = "36"; + }; + + # when building a headless jdk, also bootstrap it with a headless jdk + openjdk-bootstrap = openjdk20-bootstrap.override { gtkSupport = !headless; }; + + openjdk = stdenv.mkDerivation { + pname = "openjdk" + lib.optionalString headless "-headless"; + version = "${version.feature}${version.interim}+${version.build}"; + + src = fetchFromGitHub { + owner = "openjdk"; + repo = "jdk${version.feature}u"; + rev = "jdk-${version.feature}${version.interim}+${version.build}"; + hash = "sha256-fXoSO8nq5qpUYbCtbrRr2C46XRdYX77Pxmk7GfmlZV4="; + }; + + nativeBuildInputs = [ pkg-config autoconf unzip ensureNewerSourcesForZipFilesHook ]; + buildInputs = [ + cpio file which zip perl zlib cups freetype alsa-lib libjpeg giflib + libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst + libXi libXinerama libXcursor libXrandr fontconfig openjdk-bootstrap + ] ++ lib.optionals (!headless && enableGnome2) [ + gtk3 gnome_vfs GConf glib + ]; + + patches = [ + ./fix-java-home-jdk10.patch + ./read-truststore-from-env-jdk10.patch + ./currency-date-range-jdk10.patch + ./increase-javadoc-heap-jdk13.patch + ./ignore-LegalNoticeFilePlugin-jdk18.patch + + # -Wformat etc. are stricter in newer gccs, per + # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=79677 + # so grab the work-around from + # https://src.fedoraproject.org/rpms/java-openjdk/pull-request/24 + (fetchurl { + url = "https://src.fedoraproject.org/rpms/java-openjdk/raw/06c001c7d87f2e9fe4fedeef2d993bcd5d7afa2a/f/rh1673833-remove_removal_of_wformat_during_test_compilation.patch"; + sha256 = "082lmc30x64x583vqq00c8y0wqih3y4r0mp1c4bqq36l22qv6b6r"; + }) + + # Patch borrowed from Alpine to fix build errors with musl libc and recent gcc. + # This is applied anywhere to prevent patchrot. + (fetchpatch { + url = "https://git.alpinelinux.org/aports/plain/testing/openjdk19/FixNullPtrCast.patch?id=93dc07f97ff716b647c5f57c6224901ea06da560"; + hash = "sha256-H4X3Yip5bCpXMH7MSu9BgXIOYRVUBMZPZW8EvZSWI5k="; + }) + + # Fix build for gnumake-4.4.1: + # https://github.com/openjdk/jdk/pull/12992 + (fetchpatch { + name = "gnumake-4.4.1"; + url = "https://github.com/openjdk/jdk/commit/9341d135b855cc208d48e47d30cd90aafa354c36.patch"; + hash = "sha256-Qcm3ZmGCOYLZcskNjj7DYR85R4v07vYvvavrVOYL8vg="; + }) + ] ++ lib.optionals (!headless && enableGnome2) [ + ./swing-use-gtk-jdk13.patch + ]; + + postPatch = '' + chmod +x configure + patchShebangs --build configure + ''; + + # JDK's build system attempts to specifically detect + # and special-case WSL, and we don't want it to do that, + # so pass the correct platform names explicitly + configurePlatforms = ["build" "host"]; + + configureFlags = [ + "--with-boot-jdk=${openjdk-bootstrap.home}" + "--with-version-build=${version.build}" + "--with-version-opt=nixos" + "--with-version-pre=" + "--enable-unlimited-crypto" + "--with-native-debug-symbols=internal" + "--with-libjpeg=system" + "--with-giflib=system" + "--with-libpng=system" + "--with-zlib=system" + "--with-lcms=system" + "--with-stdc++lib=dynamic" + ] ++ lib.optional stdenv.isx86_64 "--with-jvm-features=zgc" + ++ lib.optional headless "--enable-headless-only" + ++ lib.optional (!headless && enableJavaFX) "--with-import-modules=${openjfx}"; + + separateDebugInfo = true; + + env.NIX_CFLAGS_COMPILE = "-Wno-error"; + + NIX_LDFLAGS = toString (lib.optionals (!headless) [ + "-lfontconfig" "-lcups" "-lXinerama" "-lXrandr" "-lmagic" + ] ++ lib.optionals (!headless && enableGnome2) [ + "-lgtk-3" "-lgio-2.0" "-lgnomevfs-2" "-lgconf-2" + ]); + + # -j flag is explicitly rejected by the build system: + # Error: 'make -jN' is not supported, use 'make JOBS=N' + # Note: it does not make build sequential. Build system + # still runs in parallel. + enableParallelBuilding = false; + + buildFlags = [ "images" ]; + + installPhase = '' + mkdir -p $out/lib + + mv build/*/images/jdk $out/lib/openjdk + + # Remove some broken manpages. + rm -rf $out/lib/openjdk/man/ja* + + # Mirror some stuff in top-level. + mkdir -p $out/share + ln -s $out/lib/openjdk/include $out/include + ln -s $out/lib/openjdk/man $out/share/man + + # IDEs use the provided src.zip to navigate the Java codebase (https://github.com/NixOS/nixpkgs/pull/95081) + ln -s $out/lib/openjdk/lib/src.zip $out/lib/src.zip + + # jni.h expects jni_md.h to be in the header search path. + ln -s $out/include/linux/*_md.h $out/include/ + + # Remove crap from the installation. + rm -rf $out/lib/openjdk/demo + ${lib.optionalString headless '' + rm $out/lib/openjdk/lib/{libjsound,libfontmanager}.so + ''} + + ln -s $out/lib/openjdk/bin $out/bin + ''; + + preFixup = '' + # Propagate the setJavaClassPath setup hook so that any package + # that depends on the JDK has $CLASSPATH set up properly. + mkdir -p $out/nix-support + #TODO or printWords? cf https://github.com/NixOS/nixpkgs/pull/27427#issuecomment-317293040 + echo -n "${setJavaClassPath}" > $out/nix-support/propagated-build-inputs + + # Set JAVA_HOME automatically. + mkdir -p $out/nix-support + cat <<EOF > $out/nix-support/setup-hook + if [ -z "\''${JAVA_HOME-}" ]; then export JAVA_HOME=$out/lib/openjdk; fi + EOF + ''; + + postFixup = '' + # Build the set of output library directories to rpath against + LIBDIRS="" + for output in $(getAllOutputNames); do + if [ "$output" = debug ]; then continue; fi + LIBDIRS="$(find $(eval echo \$$output) -name \*.so\* -exec dirname {} \+ | sort -u | tr '\n' ':'):$LIBDIRS" + done + # Add the local library paths to remove dependencies on the bootstrap + for output in $(getAllOutputNames); do + if [ "$output" = debug ]; then continue; fi + OUTPUTDIR=$(eval echo \$$output) + BINLIBS=$(find $OUTPUTDIR/bin/ -type f; find $OUTPUTDIR -name \*.so\*) + echo "$BINLIBS" | while read i; do + patchelf --set-rpath "$LIBDIRS:$(patchelf --print-rpath "$i")" "$i" || true + patchelf --shrink-rpath "$i" || true + done + done + ''; + + disallowedReferences = [ openjdk-bootstrap ]; + + pos = builtins.unsafeGetAttrPos "feature" version; + meta = import ./meta.nix lib version.feature; + + passthru = { + architecture = ""; + home = "${openjdk}/lib/openjdk"; + inherit gtk3; + }; + }; +in openjdk diff --git a/nixpkgs/pkgs/development/compilers/openjdk/darwin/20.nix b/nixpkgs/pkgs/development/compilers/openjdk/darwin/20.nix new file mode 100644 index 000000000000..e26592462e50 --- /dev/null +++ b/nixpkgs/pkgs/development/compilers/openjdk/darwin/20.nix @@ -0,0 +1,81 @@ +{ lib, stdenv, fetchurl, unzip, setJavaClassPath }: +let + # Details from https://www.azul.com/downloads/?version=java-19-sts&os=macos&package=jdk + # Note that the latest build may differ by platform + dist = { + x86_64-darwin = { + arch = "x64"; + zuluVersion = "20.30.11"; + jdkVersion = "20.0.1"; + sha256 = "0hg2n2mdbpxsgpw3c58w8y1f3im6schvfqahji352p9ljbdykzmy"; + }; + + aarch64-darwin = { + arch = "aarch64"; + zuluVersion = "20.30.11"; + jdkVersion = "20.0.1"; + sha256 = "0bc9h1y0b2azyfl3f5sqj19sh02xs995d1kdn55m4lfhc00rzr81"; + }; + }."${stdenv.hostPlatform.system}"; + + jce-policies = fetchurl { + # Ugh, unversioned URLs... I hope this doesn't change often enough to cause pain before we move to a Darwin source build of OpenJDK! + url = "http://cdn.azul.com/zcek/bin/ZuluJCEPolicies.zip"; + sha256 = "0nk7m0lgcbsvldq2wbfni2pzq8h818523z912i7v8hdcij5s48c0"; + }; + + jdk = stdenv.mkDerivation rec { + pname = "zulu${dist.zuluVersion}-ca-jdk"; + version = dist.jdkVersion; + + src = fetchurl { + url = "https://cdn.azul.com/zulu/bin/zulu${dist.zuluVersion}-ca-jdk${dist.jdkVersion}-macosx_${dist.arch}.tar.gz"; + inherit (dist) sha256; + curlOpts = "-H Referer:https://www.azul.com/downloads/zulu/"; + }; + + nativeBuildInputs = [ unzip ]; + + installPhase = '' + mkdir -p $out + mv * $out + + unzip ${jce-policies} + mv -f ZuluJCEPolicies/*.jar $out/lib/security/ + + # jni.h expects jni_md.h to be in the header search path. + ln -s $out/include/darwin/*_md.h $out/include/ + + if [ -f $out/LICENSE ]; then + install -D $out/LICENSE $out/share/zulu/LICENSE + rm $out/LICENSE + fi + ''; + + preFixup = '' + # Propagate the setJavaClassPath setup hook from the JDK so that + # any package that depends on the JDK has $CLASSPATH set up + # properly. + mkdir -p $out/nix-support + printWords ${setJavaClassPath} > $out/nix-support/propagated-build-inputs + + # Set JAVA_HOME automatically. + cat <<EOF >> $out/nix-support/setup-hook + if [ -z "\''${JAVA_HOME-}" ]; then export JAVA_HOME=$out; fi + EOF + ''; + + # fixupPhase is moving the man to share/man which breaks it because it's a + # relative symlink. + postFixup = '' + ln -nsf ../zulu-${lib.versions.major version}.jdk/Contents/Home/man $out/share/man + ''; + + passthru = { + home = jdk; + }; + + meta = import ./meta.nix lib version; + }; +in +jdk diff --git a/nixpkgs/pkgs/development/compilers/openjdk/openjfx/20.nix b/nixpkgs/pkgs/development/compilers/openjdk/openjfx/20.nix new file mode 100644 index 000000000000..430b32187b33 --- /dev/null +++ b/nixpkgs/pkgs/development/compilers/openjdk/openjfx/20.nix @@ -0,0 +1,113 @@ +{ stdenv, lib, fetchFromGitHub, fetchpatch, writeText, openjdk17_headless +, openjdk19_headless, gradle_7, pkg-config, perl, cmake, gperf, gtk2, gtk3, libXtst +, libXxf86vm, glib, alsa-lib, ffmpeg_4, python3, ruby, icu68 +, withMedia ? true +, withWebKit ? false +}: + +let + major = "20"; + update = ""; + build = "+19"; + repover = "${major}${update}${build}"; + gradle_ = (gradle_7.override { + # note: gradle does not yet support running on 19 + java = openjdk17_headless; + }); + + makePackage = args: stdenv.mkDerivation ({ + version = "${major}${update}${build}"; + + src = fetchFromGitHub { + owner = "openjdk"; + repo = "jfx"; + rev = repover; + hash = "sha256-QPPJyl6+XU+m5xqYOFtQKJNNrovqy7ngNE/e7kiEJVU="; + }; + + buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg_4 icu68 ]; + nativeBuildInputs = [ gradle_ perl pkg-config cmake gperf python3 ruby ]; + + dontUseCmakeConfigure = true; + + config = writeText "gradle.properties" ('' + CONF = Release + JDK_HOME = ${openjdk19_headless.home} + '' + args.gradleProperties or ""); + + buildPhase = '' + runHook preBuild + + export GRADLE_USER_HOME=$(mktemp -d) + ln -s $config gradle.properties + export NIX_CFLAGS_COMPILE="$(pkg-config --cflags glib-2.0) $NIX_CFLAGS_COMPILE" + gradle --no-daemon $gradleFlags sdk + + runHook postBuild + ''; + } // args); + + # Fake build to pre-download deps into fixed-output derivation. + # We run nearly full build because I see no other way to download everything that's needed. + # Anyone who knows a better way? + deps = makePackage { + pname = "openjfx-deps"; + + # perl code mavenizes pathes (com.squareup.okio/okio/1.13.0/a9283170b7305c8d92d25aff02a6ab7e45d06cbe/okio-1.13.0.jar -> com/squareup/okio/okio/1.13.0/okio-1.13.0.jar) + installPhase = '' + find $GRADLE_USER_HOME -type f -regex '.*/modules.*\.\(jar\|pom\)' \ + | perl -pe 's#(.*/([^/]+)/([^/]+)/([^/]+)/[0-9a-f]{30,40}/([^/\s]+))$# ($x = $2) =~ tr|\.|/|; "install -Dm444 $1 \$out/$x/$3/$4/$5" #e' \ + | sh + rm -rf $out/tmp + ''; + + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + # suspiciously the same as for openjfx 17 ... + # could they really not have changed any of their dependencies? + # or did we miss changing another upstream hash when copy-pasting? + outputHash = "sha256-dV7/U5GpFxhI13smZ587C6cVE4FRNPY0zexZkYK4Yqo="; + }; + +in makePackage { + pname = "openjfx-modular-sdk"; + + gradleProperties = '' + COMPILE_MEDIA = ${lib.boolToString withMedia} + COMPILE_WEBKIT = ${lib.boolToString withWebKit} + ''; + + preBuild = '' + swtJar="$(find ${deps} -name org.eclipse.swt\*.jar)" + substituteInPlace build.gradle \ + --replace 'mavenCentral()' 'mavenLocal(); maven { url uri("${deps}") }' \ + --replace 'name: SWT_FILE_NAME' "files('$swtJar')" + ''; + + installPhase = '' + cp -r build/modular-sdk $out + ''; + + stripDebugList = [ "." ]; + + postFixup = '' + # Remove references to bootstrap. + export openjdkOutPath='${openjdk19_headless.outPath}' + find "$out" -name \*.so | while read lib; do + new_refs="$(patchelf --print-rpath "$lib" | perl -pe 's,:?\Q$ENV{openjdkOutPath}\E[^:]*,,')" + patchelf --set-rpath "$new_refs" "$lib" + done + ''; + + disallowedReferences = [ openjdk17_headless openjdk19_headless ]; + + passthru.deps = deps; + + meta = with lib; { + homepage = "https://openjdk.org/projects/openjfx/"; + license = licenses.gpl2Classpath; + description = "The next-generation Java client toolkit"; + maintainers = with maintainers; [ abbradar ]; + platforms = platforms.unix; + }; +} diff --git a/nixpkgs/pkgs/development/compilers/opensmalltalk-vm/default.nix b/nixpkgs/pkgs/development/compilers/opensmalltalk-vm/default.nix new file mode 100644 index 000000000000..a049e3e8abec --- /dev/null +++ b/nixpkgs/pkgs/development/compilers/opensmalltalk-vm/default.nix @@ -0,0 +1,186 @@ +{ stdenv +, lib +, fetchFromGitHub +, fetchurl +, alsa-lib +, coreutils +, file +, freetype +, gnugrep +, libpulseaudio +, libtool +, libuuid +, openssl +, pango +, pkg-config +, xorg +}: +let + buildVM = + { + # VM-specific information, manually extracted from building/<platformDir>/<vmName>/build/mvm + platformDir + , vmName + , scriptName + , configureFlagsArray + , configureFlags + }: + let + src = fetchFromGitHub { + owner = "OpenSmalltalk"; + repo = "opensmalltalk-vm"; + rev = "202206021410"; + hash = "sha256-QqElPiJuqD5svFjWrLz1zL0Tf+pHxQ2fPvkVRn2lyBI="; + }; + in + stdenv.mkDerivation { + pname = + let vmNameNoDots = builtins.replaceStrings [ "." ] [ "-" ] vmName; + in "opensmalltalk-vm-${platformDir}-${vmNameNoDots}"; + version = src.rev; + + inherit src; + + postPatch = + '' + vmVersionFiles=$(sed -n 's/^versionfiles="\(.*\)"/\1/p' ./scripts/updateSCCSVersions) + for vmVersionFile in $vmVersionFiles; do + substituteInPlace "$vmVersionFile" \ + --replace "\$Date\$" "\$Date: Thu Jan 1 00:00:00 1970 +0000 \$" \ + --replace "\$URL\$" "\$URL: ${src.url} \$" \ + --replace "\$Rev\$" "\$Rev: ${src.rev} \$" \ + --replace "\$CommitHash\$" "\$CommitHash: 000000000000 \$" + done + patchShebangs --build ./building/${platformDir} scripts + substituteInPlace ./platforms/unix/config/mkmf \ + --replace "/bin/rm" "rm" + substituteInPlace ./platforms/unix/config/configure \ + --replace "/usr/bin/file" "file" \ + --replace "/usr/bin/pkg-config" "pkg-config" \ + ''; + + preConfigure = '' + cd building/${platformDir}/${vmName}/build + # Exits with non-zero code if the check fails, counterintuitively + ../../../../scripts/checkSCCSversion && exit 1 + cp ../plugins.int ../plugins.ext . + configureFlagsArray=${configureFlagsArray} + ''; + + configureScript = "../../../../platforms/unix/config/configure"; + + configureFlags = [ "--with-scriptname=${scriptName}" ] ++ configureFlags; + + buildFlags = [ "all" ]; + + enableParallelBuilding = true; + + nativeBuildInputs = [ + file + pkg-config + ]; + + buildInputs = [ + alsa-lib + freetype + libpulseaudio + libtool + libuuid + openssl + pango + xorg.libX11 + xorg.libXrandr + ]; + + postInstall = '' + rm "$out/squeak" + cd "$out/bin" + BIN="$(find ../lib -type f -name squeak)" + for f in $(find . -type f); do + rm "$f" + ln -s "$BIN" "$f" + done + ''; + + meta = { + description = "The cross-platform virtual machine for Squeak, Pharo, Cuis, and Newspeak."; + mainProgram = scriptName; + homepage = "https://opensmalltalk.org/"; + license = with lib.licenses; [ mit ]; + maintainers = with lib.maintainers; [ jakewaksbaum ]; + platforms = [ stdenv.targetPlatform.system ]; + }; + }; + + vmsByPlatform = { + "aarch64-linux" = { + "squeak-cog-spur" = buildVM { + platformDir = "linux64ARMv8"; + vmName = "squeak.cog.spur"; + scriptName = "squeak"; + configureFlagsArray = ''( + CFLAGS="-DNDEBUG -DDEBUGVM=0 -DMUSL -D_GNU_SOURCE -DUSEEVDEV -DCOGMTVM=0 -DDUAL_MAPPED_CODE_ZONE=1" + LIBS="-lrt" + )''; + configureFlags = [ + "--with-vmversion=5.0" + "--with-src=src/spur64.cog" + "--without-npsqueak" + "--enable-fast-bitblt" + ]; + }; + + "squeak-stack-spur" = buildVM { + platformDir = "linux64ARMv8"; + vmName = "squeak.stack.spur"; + scriptName = "squeak"; + configureFlagsArray = ''( + CFLAGS="-DNDEBUG -DDEBUGVM=0 -DMUSL -D_GNU_SOURCE -DUSEEVDEV -D__ARM_ARCH_ISA_A64 -DARM64 -D__arm__ -D__arm64__ -D__aarch64__" + )''; + configureFlags = [ + "--with-vmversion=5.0" + "--with-src=src/spur64.stack" + "--disable-cogit" + "--without-npsqueak" + ]; + }; + }; + + "x86_64-linux" = { + "newspeak-cog-spur" = buildVM { + platformDir = "linux64x64"; + vmName = "newspeak.cog.spur"; + scriptName = "newspeak"; + configureFlagsArray = ''( + CFLAGS="-DNDEBUG -DDEBUGVM=0" + )''; + configureFlags = [ + "--with-vmversion=5.0" + "--with-src=src/spur64.cog.newspeak" + "--without-vm-display-fbdev" + "--without-npsqueak" + ]; + }; + + "squeak-cog-spur" = buildVM { + platformDir = "linux64x64"; + vmName = "squeak.cog.spur"; + scriptName = "squeak"; + configureFlagsArray = ''( + CFLAGS="-DNDEBUG -DDEBUGVM=0 -DCOGMTVM=0" + )''; + configureFlags = [ + "--with-vmversion=5.0" + "--with-src=src/spur64.cog" + "--without-npsqueak" + ]; + }; + }; + }; + + platform = stdenv.targetPlatform.system; +in + vmsByPlatform.${platform} or (throw ( + "Unsupported platform ${platform}: only the following platforms are supported: " + + builtins.toString (builtins.attrNames vmsByPlatform) + )) diff --git a/nixpkgs/pkgs/development/compilers/opensycl/default.nix b/nixpkgs/pkgs/development/compilers/opensycl/default.nix new file mode 100644 index 000000000000..d6f11798f199 --- /dev/null +++ b/nixpkgs/pkgs/development/compilers/opensycl/default.nix @@ -0,0 +1,67 @@ +{ lib +, fetchFromGitHub +, llvmPackages_15 +, lld_15 +, rocm-device-libs +, python3 +, rocm-runtime +, cmake +, boost +, libxml2 +, libffi +, makeWrapper +, hip +, rocmSupport ? false +}: +let + inherit (llvmPackages_15) stdenv; +in +stdenv.mkDerivation rec { + pname = "OpenSYCL"; + version = "0.9.4"; + + src = fetchFromGitHub { + owner = "OpenSYCL"; + repo = "OpenSYCL"; + rev = "v${version}"; + sha256 = "sha256-5YkuUOAnvoAD5xDKxKMPq0B7+1pb6hVisPAhs0Za1ls="; + }; + + nativeBuildInputs = [ + cmake + makeWrapper + ]; + + buildInputs = [ + libxml2 + libffi + boost + llvmPackages_15.openmp + llvmPackages_15.libclang.dev + llvmPackages_15.llvm + ] ++ lib.optionals rocmSupport [ + hip + rocm-runtime + ]; + + # opensycl makes use of clangs internal headers. Its cmake does not successfully discover them automatically on nixos, so we supply the path manually + cmakeFlags = [ + "-DCLANG_INCLUDE_PATH=${llvmPackages_15.libclang.dev}/include" + ]; + + postFixup = '' + wrapProgram $out/bin/syclcc-clang \ + --prefix PATH : ${lib.makeBinPath [ python3 lld_15 ]} \ + --add-flags "-L${llvmPackages_15.openmp}/lib" \ + --add-flags "-I${llvmPackages_15.openmp.dev}/include" \ + '' + lib.optionalString rocmSupport '' + --add-flags "--rocm-device-lib-path=${rocm-device-libs}/amdgcn/bitcode" + ''; + + meta = with lib; { + homepage = "https://github.com/OpenSYCL/OpenSYCL"; + description = "Multi-backend implementation of SYCL for CPUs and GPUs"; + maintainers = with maintainers; [ yboettcher ]; + license = licenses.bsd2; + }; +} diff --git a/nixpkgs/pkgs/development/compilers/orc/default.nix b/nixpkgs/pkgs/development/compilers/orc/default.nix index e36eb28d465e..dd1ce9d14672 100644 --- a/nixpkgs/pkgs/development/compilers/orc/default.nix +++ b/nixpkgs/pkgs/development/compilers/orc/default.nix @@ -18,11 +18,11 @@ inherit (lib) optional optionals; in stdenv.mkDerivation rec { pname = "orc"; - version = "0.4.33"; + version = "0.4.34"; src = fetchurl { url = "https://gstreamer.freedesktop.org/src/orc/${pname}-${version}.tar.xz"; - sha256 = "sha256-hE5tfbgIb3k/V2GNPUto0p2ZsWA05xQw3zwhz9PDVCo="; + sha256 = "sha256-j0ers/CXFx5E64B63Nq9hg+6Lv/TfY08T71fNByt1B8="; }; postPatch = lib.optionalString stdenv.isAarch32 '' @@ -58,6 +58,7 @@ in stdenv.mkDerivation rec { meta = with lib; { description = "The Oil Runtime Compiler"; homepage = "https://gstreamer.freedesktop.org/projects/orc.html"; + changelog = "https://cgit.freedesktop.org/gstreamer/orc/plain/RELEASE?h=${version}"; # The source code implementing the Marsenne Twister algorithm is licensed # under the 3-clause BSD license. The rest is 2-clause BSD license. license = with licenses; [ bsd3 bsd2 ]; diff --git a/nixpkgs/pkgs/development/compilers/osl/default.nix b/nixpkgs/pkgs/development/compilers/osl/default.nix index 32027deb607b..090cedb424b9 100644 --- a/nixpkgs/pkgs/development/compilers/osl/default.nix +++ b/nixpkgs/pkgs/development/compilers/osl/default.nix @@ -4,6 +4,7 @@ , cmake , clang , libclang +, libxml2 , zlib , openexr , openimageio @@ -23,13 +24,13 @@ let in stdenv.mkDerivation rec { pname = "openshadinglanguage"; - version = "1.12.12.0"; + version = "1.12.13.0"; src = fetchFromGitHub { owner = "AcademySoftwareFoundation"; repo = "OpenShadingLanguage"; rev = "v${version}"; - hash = "sha256-kxfDhqF8uTdLqt99rTOk8TWBdN5NF7zm98CT0DbLrW0="; + hash = "sha256-EVV7YHovWwbRju+uv8IK2wpcpoK1ndZ8yNRHzU8LUuE="; }; cmakeFlags = [ @@ -67,6 +68,8 @@ in stdenv.mkDerivation rec { python3.pkgs.pybind11 util-linux # needed just for hexdump zlib + ] ++ lib.optionals stdenv.isDarwin [ + libxml2 ]; postFixup = '' @@ -79,6 +82,6 @@ in stdenv.mkDerivation rec { homepage = "https://opensource.imageworks.com/osl.html"; maintainers = with maintainers; [ hodapp ]; license = licenses.bsd3; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/nixpkgs/pkgs/development/compilers/otus-lisp/default.nix b/nixpkgs/pkgs/development/compilers/otus-lisp/default.nix new file mode 100644 index 000000000000..5338734e6c6d --- /dev/null +++ b/nixpkgs/pkgs/development/compilers/otus-lisp/default.nix @@ -0,0 +1,25 @@ +{ lib, stdenv, fetchFromGitHub, xxd }: + +stdenv.mkDerivation rec { + pname = "otus-lisp"; + version = "2.4"; + + src = fetchFromGitHub { + owner = "yuriy-chumak"; + repo = "ol"; + rev = version; + sha256 = "sha256-+6qH1BhvMkuG2rUOfo9qMjMjhCib9KONQTBWS27c3Ts="; + }; + + nativeBuildInputs = [ xxd ]; + + makeFlags = [ "PREFIX=$(out)" ]; + + meta = { + description = "A purely functional dialect of Lisp"; + homepage = "https://yuriy-chumak.github.io/ol/"; + license = with lib.licenses; [ mit lgpl3Only ]; # dual licensed + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ nagy ]; + }; +} diff --git a/nixpkgs/pkgs/development/compilers/p4c/default.nix b/nixpkgs/pkgs/development/compilers/p4c/default.nix index ddf0c112f8ff..99ec78c6ecee 100644 --- a/nixpkgs/pkgs/development/compilers/p4c/default.nix +++ b/nixpkgs/pkgs/development/compilers/p4c/default.nix @@ -25,15 +25,15 @@ let toCMakeBoolean = v: if v then "ON" else "OFF"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "p4c"; - version = "1.2.3.9"; + version = "1.2.4.1"; src = fetchFromGitHub { owner = "p4lang"; repo = "p4c"; - rev = "v${version}"; - sha256 = "sha256-mnJluusDei95B6LMAwre8FjjxwlpK99tzvzLwroQQsM="; + rev = "v${finalAttrs.version}"; + hash = "sha256-Whdryz1Gt0ymE7cj+mI95lW3Io9yBvLqcWa04gu5zEw="; fetchSubmodules = true; }; @@ -78,12 +78,12 @@ stdenv.mkDerivation rec { python3 ]; - meta = with lib; { - homepage = "https://github.com/p4lang/p4c"; + meta = { changelog = "https://github.com/p4lang/p4c/releases"; description = "Reference compiler for the P4 programming language"; - platforms = platforms.linux; - maintainers = with maintainers; [ raitobezarius govanify ]; - license = licenses.asl20; + homepage = "https://github.com/p4lang/p4c"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ raitobezarius govanify ]; + platforms = lib.platforms.linux; }; -} +}) diff --git a/nixpkgs/pkgs/development/compilers/pforth/default.nix b/nixpkgs/pkgs/development/compilers/pforth/default.nix index 59994b26aeed..d0766fe13768 100644 --- a/nixpkgs/pkgs/development/compilers/pforth/default.nix +++ b/nixpkgs/pkgs/development/compilers/pforth/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, buildPackages }: stdenv.mkDerivation (finalAttrs: { @@ -14,14 +15,26 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-vEjFeHSJl+yAtatYJEnu+r9hmOr/kZOgIbSUXR/c8WU="; }; - dontConfigure = true; - - preBuild = '' - cd platforms/unix + # We build the dictionary in a cross-compile compatible way. + # For that, we perform steps, that the Makefile would otherwise do. + buildPhase = '' + runHook preBuild + make -C platforms/unix pfdicapp + pushd fth/ + ${stdenv.hostPlatform.emulator buildPackages} ../platforms/unix/pforth -i system.fth + ${stdenv.hostPlatform.emulator buildPackages} ../platforms/unix/pforth -d pforth.dic <<< "include savedicd.fth sdad bye" + mv pforth.dic pfdicdat.h ../platforms/unix/ + popd + make -C platforms/unix pforthapp + runHook postBuild ''; installPhase = '' - install -Dm755 pforth_standalone $out/bin/pforth + runHook preInstall + install -Dm755 platforms/unix/pforth_standalone $out/bin/pforth + mkdir -p $out/share/pforth + cp -r fth/* $out/share/pforth/ + runHook postInstall ''; meta = { diff --git a/nixpkgs/pkgs/development/compilers/purescript/psc-package/default.nix b/nixpkgs/pkgs/development/compilers/purescript/psc-package/default.nix index 88f7adce5a1a..d291b1f3cfee 100644 --- a/nixpkgs/pkgs/development/compilers/purescript/psc-package/default.nix +++ b/nixpkgs/pkgs/development/compilers/purescript/psc-package/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A package manager for PureScript based on package sets"; license = licenses.bsd3; - maintainers = with maintainers; [ Profpatsch ]; + maintainers = with maintainers; [ ]; platforms = [ "x86_64-darwin" "x86_64-linux" ]; }; } diff --git a/nixpkgs/pkgs/development/compilers/purescript/purescript/default.nix b/nixpkgs/pkgs/development/compilers/purescript/purescript/default.nix index d7c8394a57b1..872f16549d8b 100644 --- a/nixpkgs/pkgs/development/compilers/purescript/purescript/default.nix +++ b/nixpkgs/pkgs/development/compilers/purescript/purescript/default.nix @@ -7,10 +7,7 @@ let dynamic-linker = stdenv.cc.bintools.dynamicLinker; patchelf = libPath : - if stdenv.isDarwin - then "" - else - '' + lib.optionalString (!stdenv.isDarwin) '' chmod u+w $PURS patchelf --interpreter ${dynamic-linker} --set-rpath ${libPath} $PURS chmod u-w $PURS @@ -18,7 +15,7 @@ let in stdenv.mkDerivation rec { pname = "purescript"; - version = "0.15.9"; + version = "0.15.10"; # These hashes can be updated automatically by running the ./update.sh script. src = @@ -28,17 +25,17 @@ in stdenv.mkDerivation rec { then fetchurl { url = "https://github.com/${pname}/${pname}/releases/download/v${version}/macos-arm64.tar.gz"; - sha256 = "16ci26pgrw0zmnyn1zj129y9624cqwzrhqglc8mgfg4k7rxvqy2a"; + sha256 = "1pk6mkjy09qvh8lsygb5gb77i2fqwjzz8jdjkxlyzynp3wpkcjp7"; } else fetchurl { - url = "https://123.github.com/${pname}/${pname}/releases/download/v${version}/macos.tar.gz"; - sha256 = "1xxg79rlf7li9f73wdbwif1dyy4hnzpypy6wx4zbnvap53habq9f"; + url = "https://github.com/${pname}/${pname}/releases/download/v${version}/macos.tar.gz"; + sha256 = "14yd00v3dsnnwj2f645vy0apnp1843ms9ffd2ccv7bj5p4kxsdzg"; }) else fetchurl { url = "https://github.com/${pname}/${pname}/releases/download/v${version}/linux64.tar.gz"; - sha256 = "0rabinklsd8bs16f03zv7ij6d1lv4w2xwvzzgkwc862gpqvz9jq3"; + sha256 = "03p5f2m5xvrqgiacs4yfc2dgz6frlxy90h6z1nm6wan40p2vd41r"; }; diff --git a/nixpkgs/pkgs/development/compilers/roslyn/default.nix b/nixpkgs/pkgs/development/compilers/roslyn/default.nix index 4fa028bc00ef..6ab2799f46c4 100644 --- a/nixpkgs/pkgs/development/compilers/roslyn/default.nix +++ b/nixpkgs/pkgs/development/compilers/roslyn/default.nix @@ -21,7 +21,7 @@ buildDotnetModule rec { projectFile = [ "src/NuGet/Microsoft.Net.Compilers.Toolset/Microsoft.Net.Compilers.Toolset.Package.csproj" ]; - nugetDeps = ./extended-deps.nix; + nugetDeps = ./deps.nix; dontDotnetFixup = true; diff --git a/nixpkgs/pkgs/development/compilers/roslyn/deps.nix b/nixpkgs/pkgs/development/compilers/roslyn/deps.nix index 7261823943cb..9362f8aab133 100644 --- a/nixpkgs/pkgs/development/compilers/roslyn/deps.nix +++ b/nixpkgs/pkgs/development/compilers/roslyn/deps.nix @@ -19,6 +19,7 @@ (fetchNuGet { pname = "Microsoft.CodeAnalysis.PublicApiAnalyzers"; version = "3.3.4-beta1.22160.2"; sha256 = "0ih091ls51x5k9q998g14pfy4r3g1ygvzihj1gkrl79wydn7b0n3"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/49e5305d-d845-4a14-9d69-6f5dbfb9570c/nuget/v3/flat2/microsoft.codeanalysis.publicapianalyzers/3.3.4-beta1.22160.2/microsoft.codeanalysis.publicapianalyzers.3.3.4-beta1.22160.2.nupkg"; }) (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.7.0"; sha256 = "0gd67zlw554j098kabg887b5a6pq9kzavpa3jjy5w53ccjzjfy8j"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.csharp/4.7.0/microsoft.csharp.4.7.0.nupkg"; }) (fetchNuGet { pname = "Microsoft.DiaSymReader.Native"; version = "17.0.0-beta1.21524.1"; sha256 = "0gash3xgzvcb78w2xqv003l0cld199zpfilnjbagwbr5ikdh6f3s"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.diasymreader.native/17.0.0-beta1.21524.1/microsoft.diasymreader.native.17.0.0-beta1.21524.1.nupkg"; }) + (fetchNuGet { pname = "Microsoft.DotNet.Arcade.Sdk"; version = "7.0.0-beta.22171.2"; sha256 = "15y26skavivkwhnpfa984if3cnpnllbbwbdsjiyfdcalp32fhmjq"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/microsoft.dotnet.arcade.sdk/7.0.0-beta.22171.2/microsoft.dotnet.arcade.sdk.7.0.0-beta.22171.2.nupkg"; }) (fetchNuGet { pname = "Microsoft.DotNet.XliffTasks"; version = "1.0.0-beta.22169.1"; sha256 = "12fcin3d4m0lawla9fflz9f2qispzgvzf1mwkpscmlk5lnvb0riw"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/microsoft.dotnet.xlifftasks/1.0.0-beta.22169.1/microsoft.dotnet.xlifftasks.1.0.0-beta.22169.1.nupkg"; }) (fetchNuGet { pname = "Microsoft.Net.Compilers.Toolset"; version = "4.2.0-1.final"; sha256 = "02zas22hj29gv2w7h74q786i0cvxffgwqai21ri0zj41nb2hwhyq"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.net.compilers.toolset/4.2.0-1.final/microsoft.net.compilers.toolset.4.2.0-1.final.nupkg"; }) (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "3.1.32"; sha256 = "1zygp70xrk5zggs3q4a6yc6jfdwzcsjjsapqpwn6qyx35m69b72p"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.app.host.linux-arm64/3.1.32/microsoft.netcore.app.host.linux-arm64.3.1.32.nupkg"; }) diff --git a/nixpkgs/pkgs/development/compilers/roslyn/extended-deps.nix b/nixpkgs/pkgs/development/compilers/roslyn/extended-deps.nix deleted file mode 100644 index 9401e0709d56..000000000000 --- a/nixpkgs/pkgs/development/compilers/roslyn/extended-deps.nix +++ /dev/null @@ -1,11 +0,0 @@ -# Some required nuget packages are not picked up by the deps generation script, -# since they are referenced as a SDK reference, which unfortunately only gets -# downloaded during build time. So we include them manually. -{ fetchNuGet }: (import ./deps.nix { inherit fetchNuGet; }) ++ [ - (fetchNuGet rec { - pname = "Microsoft.DotNet.Arcade.Sdk"; - version = "7.0.0-beta.22171.2"; - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/microsoft.dotnet.arcade.sdk/${version}/microsoft.dotnet.arcade.sdk.${version}.nupkg"; - sha256 = "15y26skavivkwhnpfa984if3cnpnllbbwbdsjiyfdcalp32fhmjq"; - }) -] diff --git a/nixpkgs/pkgs/development/compilers/rust/1_69.nix b/nixpkgs/pkgs/development/compilers/rust/1_69.nix deleted file mode 100644 index 5f2e2e9acdc4..000000000000 --- a/nixpkgs/pkgs/development/compilers/rust/1_69.nix +++ /dev/null @@ -1,63 +0,0 @@ -# New rust versions should first go to staging. -# Things to check after updating: -# 1. Rustc should produce rust binaries on x86_64-linux, aarch64-linux and x86_64-darwin: -# i.e. nix-shell -p fd or @GrahamcOfBorg build fd on github -# This testing can be also done by other volunteers as part of the pull -# request review, in case platforms cannot be covered. -# 2. The LLVM version used for building should match with rust upstream. -# Check the version number in the src/llvm-project git submodule in: -# https://github.com/rust-lang/rust/blob/<version-tag>/.gitmodules -# 3. Firefox and Thunderbird should still build on x86_64-linux. - -{ stdenv, lib -, buildPackages -, newScope, callPackage -, CoreFoundation, Security, SystemConfiguration -, pkgsBuildTarget, pkgsBuildBuild, pkgsBuildHost -, makeRustPlatform -, llvmPackages_11 -, llvmPackages_15, llvm_15 -} @ args: - -import ./default.nix { - rustcVersion = "1.69.0"; - rustcSha256 = "sha256-+wWXGGetbMq703ICefWpS5n2ECSSMYe1a7XEVfo89g8="; - - llvmSharedForBuild = pkgsBuildBuild.llvmPackages_15.libllvm.override { enableSharedLibraries = true; }; - llvmSharedForHost = pkgsBuildHost.llvmPackages_15.libllvm.override { enableSharedLibraries = true; }; - llvmSharedForTarget = pkgsBuildTarget.llvmPackages_15.libllvm.override { enableSharedLibraries = true; }; - - llvmBootstrapForDarwin = llvmPackages_11; - - # For use at runtime - llvmShared = llvm_15.override { enableSharedLibraries = true; }; - - # Expose llvmPackages used for rustc from rustc via passthru for LTO in Firefox - llvmPackages = llvmPackages_15; - - # Note: the version MUST be one version prior to the version we're - # building - bootstrapVersion = "1.68.2"; - - # fetch hashes by running `print-hashes.sh ${bootstrapVersion}` - bootstrapHashes = { - i686-unknown-linux-gnu = "a85e1aa0831e8bd31dc8ba3e042b6dea69b4d45fd5d1111bf6fd2cc9d58dd619"; - x86_64-unknown-linux-gnu = "df7c7466ef35556e855c0d35af7ff08e133040400452eb3427c53202b6731926"; - x86_64-unknown-linux-musl = "bd02cbdedb4b7f2169a68dc8410e8436fab3734a3a30cab81ab21661d70c6ddd"; - arm-unknown-linux-gnueabihf = "a5847f9bcbb1fb4183656b1b01e191d8e48c7bc8346ec6831318b697a2f305c6"; - armv7-unknown-linux-gnueabihf = "f87e4b063b5f916b4a5057e5f544f819cee9ab5da3fe1a977cddb2170e7ba0d7"; - aarch64-unknown-linux-gnu = "b24d0df852490d80791a228f18c2b75f24b1e6437e6e745f85364edab245f7fa"; - aarch64-unknown-linux-musl = "e6615e72aaa3e3c9c42c35139ab253a9b738a4eab719e3e306e25026c1aa93e5"; - x86_64-apple-darwin = "632540d3d83758cb048dc45fcfbc0b29f6f170161a3051be22b0a2962a566fb9"; - aarch64-apple-darwin = "ab4c6add94686a0392953c588c2b61d4c03f51e855232d161dc492f286e34202"; - powerpc64le-unknown-linux-gnu = "cf95658277d71bb8ae3a0fbc53099cc1397ed40e0953c026f41cde4a9619efca"; - riscv64gc-unknown-linux-gnu = "befcf2d53e35ae3fe0d609d1e056bdc814bd36ce54028b8d6b8b9e38c0afcaa5"; - mips64el-unknown-linux-gnuabi64 = "ee85bbfdc2fb831f067fda19881e6427c8c86571ebff16c1bd219d850969ef0a"; - }; - - selectRustPackage = pkgs: pkgs.rust_1_69; - - rustcPatches = [ ]; -} - -(builtins.removeAttrs args [ "pkgsBuildHost" "llvmPackages_11" "llvmPackages_15" "llvm_15"]) diff --git a/nixpkgs/pkgs/development/compilers/rust/1_70.nix b/nixpkgs/pkgs/development/compilers/rust/1_70.nix new file mode 100644 index 000000000000..2a22c4643e55 --- /dev/null +++ b/nixpkgs/pkgs/development/compilers/rust/1_70.nix @@ -0,0 +1,60 @@ +# New rust versions should first go to staging. +# Things to check after updating: +# 1. Rustc should produce rust binaries on x86_64-linux, aarch64-linux and x86_64-darwin: +# i.e. nix-shell -p fd or @GrahamcOfBorg build fd on github +# This testing can be also done by other volunteers as part of the pull +# request review, in case platforms cannot be covered. +# 2. The LLVM version used for building should match with rust upstream. +# Check the version number in the src/llvm-project git submodule in: +# https://github.com/rust-lang/rust/blob/<version-tag>/.gitmodules +# 3. Firefox and Thunderbird should still build on x86_64-linux. + +{ stdenv, lib +, buildPackages +, newScope, callPackage +, CoreFoundation, Security, SystemConfiguration +, pkgsBuildTarget, pkgsBuildBuild, pkgsBuildHost +, makeRustPlatform +, llvmPackages_16, llvm_16 +} @ args: + +import ./default.nix { + rustcVersion = "1.70.0"; + rustcSha256 = "sha256-sr+uAAt6UEDk7Eu8UKCfIVSBkMt1cLDtdzWDaEE70nw="; + + llvmSharedForBuild = pkgsBuildBuild.llvmPackages_16.libllvm.override { enableSharedLibraries = true; }; + llvmSharedForHost = pkgsBuildHost.llvmPackages_16.libllvm.override { enableSharedLibraries = true; }; + llvmSharedForTarget = pkgsBuildTarget.llvmPackages_16.libllvm.override { enableSharedLibraries = true; }; + + # For use at runtime + llvmShared = llvm_16.override { enableSharedLibraries = true; }; + + # Expose llvmPackages used for rustc from rustc via passthru for LTO in Firefox + llvmPackages = llvmPackages_16; + + # Note: the version MUST be one version prior to the version we're + # building + bootstrapVersion = "1.69.0"; + + # fetch hashes by running `print-hashes.sh ${bootstrapVersion}` + bootstrapHashes = { + i686-unknown-linux-gnu = "08b2b4f58c0861f40ae159c39cc12f6d41b6858e04a43c6c0aeb36707e2971d0"; + x86_64-unknown-linux-gnu = "2ca4a306047c0b8b4029c382910fcbc895badc29680e0332c9df990fd1c70d4f"; + x86_64-unknown-linux-musl = "071cb04819b15d8801584a1395b28d0472ce99c0e716296e3c0bb4e6318cf171"; + arm-unknown-linux-gnueabihf = "64c82735b4e5606af61be0d01317da436a9590b969e503cdbd19e24636e15845"; + armv7-unknown-linux-gnueabihf = "a509f02d910041c97847e2ccc4ee908c761b7dc5b3c4715922d2b1c573a09675"; + aarch64-unknown-linux-gnu = "88af5aa7a40c8f1b40416a1f27de8ffbe09c155d933f69d3e109c0ccee92353b"; + aarch64-unknown-linux-musl = "76aaf3e4fd7b552feb2d70752c43896a960a2a7c940002f58a5c3f03d2b3c862"; + x86_64-apple-darwin = "9818dab2c3726d63dfbfde12c9273e62e484ef6d6f6e05a6431a3e089c335454"; + aarch64-apple-darwin = "36228cac303298243fb84235db87a5ecf2af49db28585a82af091caefd598677"; + powerpc64le-unknown-linux-gnu = "8ef68b77971c079dbe23b54a2cfb52da012873d96399c424bc223635306e9a58"; + riscv64gc-unknown-linux-gnu = "e1976bf7d0edb7e7789a1ad7ff8086fdb5306a932650fa8182a5d009883fa6c5"; + mips64el-unknown-linux-gnuabi64 = "c4bf3043451d6122a3845db825cbe35b5ca61a44659a00004f6cca1299ad9d72"; + }; + + selectRustPackage = pkgs: pkgs.rust_1_70; + + rustcPatches = [ ]; +} + +(builtins.removeAttrs args [ "pkgsBuildTarget" "pkgsBuildBuild" "pkgsBuildHost" "llvmPackages_16" "llvm_16"]) diff --git a/nixpkgs/pkgs/development/compilers/rust/default.nix b/nixpkgs/pkgs/development/compilers/rust/default.nix index 0324aca1e4ec..35f5ab79c106 100644 --- a/nixpkgs/pkgs/development/compilers/rust/default.nix +++ b/nixpkgs/pkgs/development/compilers/rust/default.nix @@ -5,7 +5,6 @@ , bootstrapHashes , selectRustPackage , rustcPatches ? [] -, llvmBootstrapForDarwin , llvmShared , llvmSharedForBuild , llvmSharedForHost @@ -16,7 +15,6 @@ , buildPackages , newScope, callPackage , CoreFoundation, Security, SystemConfiguration -, pkgsBuildTarget, pkgsBuildBuild , makeRustPlatform }: @@ -69,11 +67,6 @@ in # Use boot package set to break cycle inherit (bootstrapRustPackages) cargo rustc; - } // lib.optionalAttrs (stdenv.cc.isClang && stdenv.hostPlatform == stdenv.buildPlatform) { - stdenv = llvmBootstrapForDarwin.stdenv; - pkgsBuildBuild = pkgsBuildBuild // { targetPackages.stdenv = llvmBootstrapForDarwin.stdenv; }; - pkgsBuildHost = pkgsBuildBuild // { targetPackages.stdenv = llvmBootstrapForDarwin.stdenv; }; - pkgsBuildTarget = pkgsBuildTarget // { targetPackages.stdenv = llvmBootstrapForDarwin.stdenv; }; }); rustfmt = self.callPackage ./rustfmt.nix { inherit Security; diff --git a/nixpkgs/pkgs/development/compilers/rust/rustc.nix b/nixpkgs/pkgs/development/compilers/rust/rustc.nix index 5d1430344d0d..7b924b9f8d4f 100644 --- a/nixpkgs/pkgs/development/compilers/rust/rustc.nix +++ b/nixpkgs/pkgs/development/compilers/rust/rustc.nix @@ -53,7 +53,7 @@ in stdenv.mkDerivation rec { NIX_LDFLAGS = toString ( # when linking stage1 libstd: cc: undefined reference to `__cxa_begin_catch' optional (stdenv.isLinux && !withBundledLLVM) "--push-state --as-needed -lstdc++ --pop-state" - ++ optional (stdenv.isDarwin && !withBundledLLVM) "-lc++" + ++ optional (stdenv.isDarwin && !withBundledLLVM) "-lc++ -lc++abi" ++ optional stdenv.isDarwin "-rpath ${llvmSharedForHost}/lib"); # Increase codegen units to introduce parallelism within the compiler. @@ -238,9 +238,10 @@ in stdenv.mkDerivation rec { "x86_64-darwin" "i686-darwin" "aarch64-darwin" "i686-freebsd13" "x86_64-freebsd13" "x86_64-solaris" - "aarch64-linux" "armv7l-linux" "i686-linux" "mipsel-linux" - "mips64el-linux" "powerpc64-linux" "powerpc64le-linux" - "riscv64-linux" "s390x-linux" "x86_64-linux" + "aarch64-linux" "armv6l-linux" "armv7l-linux" "i686-linux" + "loongarch64-linux" "mipsel-linux" "mips64el-linux" + "powerpc64-linux" "powerpc64le-linux" "riscv64-linux" + "s390x-linux" "x86_64-linux" "aarch64-netbsd" "armv7l-netbsd" "i686-netbsd" "powerpc-netbsd" "x86_64-netbsd" "i686-openbsd" "x86_64-openbsd" diff --git a/nixpkgs/pkgs/development/compilers/sagittarius-scheme/default.nix b/nixpkgs/pkgs/development/compilers/sagittarius-scheme/default.nix index 7f48108314b6..2d6a48631c05 100644 --- a/nixpkgs/pkgs/development/compilers/sagittarius-scheme/default.nix +++ b/nixpkgs/pkgs/development/compilers/sagittarius-scheme/default.nix @@ -16,10 +16,10 @@ let platformLdLibraryPath = if stdenv.isDarwin then "DYLD_FALLBACK_LIBRARY_PATH" in stdenv.mkDerivation rec { pname = "sagittarius-scheme"; - version = "0.9.9"; + version = "0.9.10"; src = fetchurl { url = "https://bitbucket.org/ktakashi/${pname}/downloads/sagittarius-${version}.tar.gz"; - sha256 = "sha256-UB7Lfyc2afTIVW5SIiHxXi2wyoVC2Q2ClTkSOQ6UmPg="; + sha256 = "sha256-F2GaaYVnDAGYDlQZBGhdPDO8lbeVgn+ta6LSK0L0zNA="; }; preBuild = '' # since we lack rpath during build, need to explicitly add build path diff --git a/nixpkgs/pkgs/development/compilers/sbcl/2.x.nix b/nixpkgs/pkgs/development/compilers/sbcl/2.x.nix index 9e803e6306ce..8fcb1c7c043a 100644 --- a/nixpkgs/pkgs/development/compilers/sbcl/2.x.nix +++ b/nixpkgs/pkgs/development/compilers/sbcl/2.x.nix @@ -22,12 +22,12 @@ let # The loosely held nixpkgs convention for SBCL is to keep the last two # versions. # https://github.com/NixOS/nixpkgs/pull/200994#issuecomment-1315042841 - "2.3.4" = { - sha256 = "sha256-8RtHZMbqvbJ+WpxGshcgTRG82lNOc7+XBz1Xgx0gnE4="; + "2.3.6" = { + sha256 = "sha256-tEFMpNmnR06NiE19YyN+LynvRZ39WoSEJKnD+lUdGbk="; }; - "2.3.5" = { - sha256 = "sha256-ickHIM+dBdvNkNaQ44GiUUwPGAcVng1yIiIMWowtUYY="; + "2.3.7" = { + sha256 = "sha256-aYFE+4BaMZGaYQ3pmauYOR1S62mK2qjKGbKPxu0Nmfc="; }; }; diff --git a/nixpkgs/pkgs/development/compilers/scala/2.x.nix b/nixpkgs/pkgs/development/compilers/scala/2.x.nix index 7652d176230a..e9680553e017 100644 --- a/nixpkgs/pkgs/development/compilers/scala/2.x.nix +++ b/nixpkgs/pkgs/development/compilers/scala/2.x.nix @@ -18,14 +18,14 @@ let }; "2.12" = { - version = "2.12.15"; - sha256 = "F5RePKlHjQaoQ2BWqsa5r99g3q/cPjgsbAi2A5IberY="; + version = "2.12.18"; + sha256 = "naIJCET+YPrbXln39F9aU3DBdnjcn7PYMmhDxETOA5g="; pname = "scala_2_12"; }; "2.13" = { - version = "2.13.10"; - sha256 = "sha256-sBRhWZzQeGBCxktTN5D0XlG6u5HFLcRl2EaDjpcBnMQ="; + version = "2.13.11"; + sha256 = "YYLdgdICPM5SczPteFsaojqY6H3IVauji6SJLcaq8eM="; pname = "scala_2_13"; }; }; diff --git a/nixpkgs/pkgs/development/compilers/scala/bare.nix b/nixpkgs/pkgs/development/compilers/scala/bare.nix index 0bcfe7bef7c4..33095a49b829 100644 --- a/nixpkgs/pkgs/development/compilers/scala/bare.nix +++ b/nixpkgs/pkgs/development/compilers/scala/bare.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl, makeWrapper, jre, ncurses }: stdenv.mkDerivation rec { - version = "3.2.2"; + version = "3.3.0"; pname = "scala-bare"; src = fetchurl { url = "https://github.com/lampepfl/dotty/releases/download/${version}/scala3-${version}.tar.gz"; - hash = "sha256-t8Xt70LozePoDXE3IHejWOTWCEYcOZytRDKz/QxgmZg="; + hash = "sha256-Bk7lCKjjucaYQxAsg2qomJQUgCK/N688JqlGTfoQFHU="; }; propagatedBuildInputs = [ jre ncurses.dev ] ; diff --git a/nixpkgs/pkgs/development/compilers/swi-prolog/default.nix b/nixpkgs/pkgs/development/compilers/swi-prolog/default.nix index a1eb060d6bab..b964cf53d9e2 100644 --- a/nixpkgs/pkgs/development/compilers/swi-prolog/default.nix +++ b/nixpkgs/pkgs/development/compilers/swi-prolog/default.nix @@ -34,7 +34,7 @@ }: let - version = "8.3.29"; + version = "9.1.10"; packInstall = swiplPath: pack: ''${swiplPath}/bin/swipl -g "pack_install(${pack}, [package_directory(\"${swiplPath}/lib/swipl/pack\"), silent(true), interactive(false)])." -t "halt." ''; @@ -47,7 +47,7 @@ stdenv.mkDerivation { owner = "SWI-Prolog"; repo = "swipl-devel"; rev = "V${version}"; - sha256 = "sha256-2QYY3VDG3dhbv5gtSid4eMYMxhhpggCedJL+RhtbbaU="; + sha256 = "sha256-hr9cI0Ww6RfZs99iM1hFVw4sOYZFZWr8Vzv6dognCTQ="; fetchSubmodules = true; }; diff --git a/nixpkgs/pkgs/development/compilers/swift/default.nix b/nixpkgs/pkgs/development/compilers/swift/default.nix index 2df883095cf1..0da2510f09a0 100644 --- a/nixpkgs/pkgs/development/compilers/swift/default.nix +++ b/nixpkgs/pkgs/development/compilers/swift/default.nix @@ -2,11 +2,14 @@ , pkgs , newScope , darwin +, llvmPackages , llvmPackages_15 , overrideCC }: let + swiftLlvmPackages = llvmPackages_15; + self = rec { callPackage = newScope self; @@ -24,12 +27,25 @@ let # used in Swift, and applies the same libc overrides as `apple_sdk.stdenv`. clang = if pkgs.stdenv.isDarwin then - llvmPackages_15.clang.override rec { + swiftLlvmPackages.clang.override rec { libc = apple_sdk.Libsystem; bintools = pkgs.bintools.override { inherit libc; }; + # Ensure that Swift’s internal clang uses the same libc++ and libc++abi as the + # default Darwin stdenv. Using the default libc++ avoids issues (such as crashes) + # that can happen when a Swift application dynamically links different versions + # of libc++ and libc++abi than libraries it links are using. + inherit (llvmPackages) libcxx; + extraPackages = [ + llvmPackages.libcxxabi + # Use the compiler-rt associated with clang, but use the libc++abi from the stdenv + # to avoid linking against two different versions (for the same reasons as above). + (swiftLlvmPackages.compiler-rt.override { + inherit (llvmPackages) libcxxabi; + }) + ]; } else - llvmPackages_15.clang; + swiftLlvmPackages.clang; # Overrides that create a useful environment for swift packages, allowing # packaging with `swiftPackages.callPackage`. These are similar to diff --git a/nixpkgs/pkgs/development/compilers/temurin-bin/generate-sources.py b/nixpkgs/pkgs/development/compilers/temurin-bin/generate-sources.py index 3e043275a7d9..79bf8aeca275 100755 --- a/nixpkgs/pkgs/development/compilers/temurin-bin/generate-sources.py +++ b/nixpkgs/pkgs/development/compilers/temurin-bin/generate-sources.py @@ -6,7 +6,7 @@ import re import requests import sys -feature_versions = (8, 11, 16, 17, 18, 19) +feature_versions = (8, 11, 16, 17, 18, 19, 20) oses = ("mac", "linux", "alpine-linux") types = ("jre", "jdk") impls = ("hotspot") diff --git a/nixpkgs/pkgs/development/compilers/temurin-bin/jdk-darwin.nix b/nixpkgs/pkgs/development/compilers/temurin-bin/jdk-darwin.nix index 7774b7f2b1ae..fe0c5792a53d 100644 --- a/nixpkgs/pkgs/development/compilers/temurin-bin/jdk-darwin.nix +++ b/nixpkgs/pkgs/development/compilers/temurin-bin/jdk-darwin.nix @@ -19,4 +19,7 @@ in jdk-19 = common { sourcePerArch = sources.jdk.openjdk19; }; jre-19 = common { sourcePerArch = sources.jre.openjdk19; }; + + jdk-20 = common { sourcePerArch = sources.jdk.openjdk20; }; + jre-20 = common { sourcePerArch = sources.jre.openjdk20; }; } diff --git a/nixpkgs/pkgs/development/compilers/temurin-bin/jdk-linux.nix b/nixpkgs/pkgs/development/compilers/temurin-bin/jdk-linux.nix index 9033413431fe..af9202aa4078 100644 --- a/nixpkgs/pkgs/development/compilers/temurin-bin/jdk-linux.nix +++ b/nixpkgs/pkgs/development/compilers/temurin-bin/jdk-linux.nix @@ -20,4 +20,7 @@ in jdk-19 = common { sourcePerArch = sources.jdk.openjdk19; }; jre-19 = common { sourcePerArch = sources.jre.openjdk19; }; + + jdk-20 = common { sourcePerArch = sources.jdk.openjdk20; }; + jre-20 = common { sourcePerArch = sources.jre.openjdk20; }; } diff --git a/nixpkgs/pkgs/development/compilers/temurin-bin/sources.json b/nixpkgs/pkgs/development/compilers/temurin-bin/sources.json index 171180492a13..e4744a799609 100644 --- a/nixpkgs/pkgs/development/compilers/temurin-bin/sources.json +++ b/nixpkgs/pkgs/development/compilers/temurin-bin/sources.json @@ -6,10 +6,10 @@ "packageType": "jdk", "vmType": "hotspot", "x86_64": { - "build": "8", - "sha256": "774d5955c09893dda14e3eb0fd3e239a6b2cec58615fcf4ec68747260b6e1cc1", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.17%2B8/OpenJDK11U-jdk_x64_alpine-linux_hotspot_11.0.17_8.tar.gz", - "version": "11.0.17" + "build": "7", + "sha256": "45f56d75da2f55b29e7307cc790958e379abbe6b5f160a3824dc26e320c718e5", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.19%2B7/OpenJDK11U-jdk_x64_alpine-linux_hotspot_11.0.19_7.tar.gz", + "version": "11.0.19" } }, "openjdk16": { @@ -26,10 +26,10 @@ "packageType": "jdk", "vmType": "hotspot", "x86_64": { - "build": "8", - "sha256": "cb154396ff3bfb6a9082e3640c564643d31ecae1792fab0956149ed5258ad84b", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.5%2B8/OpenJDK17U-jdk_x64_alpine-linux_hotspot_17.0.5_8.tar.gz", - "version": "17.0.5" + "build": "7", + "sha256": "b6edac2fa669876ef16b4895b36b61d01066626e7a69feba2acc19760c8d18cb", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.7%2B7/OpenJDK17U-jdk_x64_alpine-linux_hotspot_17.0.7_7.tar.gz", + "version": "17.0.7" } }, "openjdk18": { @@ -46,20 +46,30 @@ "packageType": "jdk", "vmType": "hotspot", "x86_64": { - "build": "10", - "sha256": "76cfcdf47cdf24331b51939fd2840fd387cf62471da99e4718e2e42b486a9270", - "url": "https://github.com/adoptium/temurin19-binaries/releases/download/jdk-19.0.1%2B10/OpenJDK19U-jdk_x64_alpine-linux_hotspot_19.0.1_10.tar.gz", - "version": "19.0.1" + "build": "7", + "sha256": "e2d971400ad2db25ad43ea6fa2058b269c0236e3977986dcdee2097da301beb2", + "url": "https://github.com/adoptium/temurin19-binaries/releases/download/jdk-19.0.2%2B7/OpenJDK19U-jdk_x64_alpine-linux_hotspot_19.0.2_7.tar.gz", + "version": "19.0.2" + } + }, + "openjdk20": { + "packageType": "jdk", + "vmType": "hotspot", + "x86_64": { + "build": "9", + "sha256": "68d0f0c468064e944e304cab64fc162335d4d9bc0ddab7e6ff7a395a0bceda74", + "url": "https://github.com/adoptium/temurin20-binaries/releases/download/jdk-20.0.1%2B9/OpenJDK20U-jdk_x64_alpine-linux_hotspot_20.0.1_9.tar.gz", + "version": "20.0.1" } }, "openjdk8": { "packageType": "jdk", "vmType": "hotspot", "x86_64": { - "build": "8", - "sha256": "aa782e3c561b041a5730cbe728c210e234db71fa7222bd8b661f9f4df7799375", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u352-b08/OpenJDK8U-jdk_x64_alpine-linux_hotspot_8u352b08.tar.gz", - "version": "8.0.352" + "build": "7", + "sha256": "cfdf8e07c8eeb087b7a2895b90fc0a19986bcff85006f1e2b708e3964909aa8e", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u372-b07/OpenJDK8U-jdk_x64_alpine-linux_hotspot_8u372b07.tar.gz", + "version": "8.0.372" } } }, @@ -68,20 +78,20 @@ "packageType": "jre", "vmType": "hotspot", "x86_64": { - "build": "8", - "sha256": "96d26887d042f3c5630cca208b6cd365679a59bf9efb601b28363e827439796c", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.17%2B8/OpenJDK11U-jre_x64_alpine-linux_hotspot_11.0.17_8.tar.gz", - "version": "11.0.17" + "build": "7", + "sha256": "b5d71cdf3032040e7d2a577712bf525e32e87686af3430219308a39878b98851", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.19%2B7/OpenJDK11U-jre_x64_alpine-linux_hotspot_11.0.19_7.tar.gz", + "version": "11.0.19" } }, "openjdk17": { "packageType": "jre", "vmType": "hotspot", "x86_64": { - "build": "8", - "sha256": "56daddc4c38cda4fa8716d0a6c5b3197305b94ed7011f06adfcd55357952ae17", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.5%2B8/OpenJDK17U-jre_x64_alpine-linux_hotspot_17.0.5_8.tar.gz", - "version": "17.0.5" + "build": "7", + "sha256": "711f837bacf8222dee9e8cd7f39941a4a0acf869243f03e6038ca3ba189f66ca", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.7%2B7/OpenJDK17U-jre_x64_alpine-linux_hotspot_17.0.7_7.tar.gz", + "version": "17.0.7" } }, "openjdk18": { @@ -98,20 +108,30 @@ "packageType": "jre", "vmType": "hotspot", "x86_64": { - "build": "10", - "sha256": "32426b790ac99a21a69abec793bfa47996a4fe7f74c7c89484836237f121640b", - "url": "https://github.com/adoptium/temurin19-binaries/releases/download/jdk-19.0.1%2B10/OpenJDK19U-jre_x64_alpine-linux_hotspot_19.0.1_10.tar.gz", - "version": "19.0.1" + "build": "7", + "sha256": "6c0ce0ead2e7ce3e0f06b9578447499c8bd0509306c95fcd81dbecb634228933", + "url": "https://github.com/adoptium/temurin19-binaries/releases/download/jdk-19.0.2%2B7/OpenJDK19U-jre_x64_alpine-linux_hotspot_19.0.2_7.tar.gz", + "version": "19.0.2" + } + }, + "openjdk20": { + "packageType": "jre", + "vmType": "hotspot", + "x86_64": { + "build": "9", + "sha256": "0e95fa3719f7989908dfcc77ef701c6fe1111c4195ee3c6858faab5fd37525c5", + "url": "https://github.com/adoptium/temurin20-binaries/releases/download/jdk-20.0.1%2B9/OpenJDK20U-jre_x64_alpine-linux_hotspot_20.0.1_9.tar.gz", + "version": "20.0.1" } }, "openjdk8": { "packageType": "jre", "vmType": "hotspot", "x86_64": { - "build": "8", - "sha256": "0f4a4a3c092d8cca171fc36003ac82e2f3d8d768bd6f530a20e2a4caf79bdb9e", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u352-b08/OpenJDK8U-jre_x64_alpine-linux_hotspot_8u352b08.tar.gz", - "version": "8.0.352" + "build": "7", + "sha256": "95d8cb8b5375ec00a064ed728eb60d925d44c1a79fe92f6ca7385b5863d4f78c", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u372-b07/OpenJDK8U-jre_x64_alpine-linux_hotspot_8u372b07.tar.gz", + "version": "8.0.372" } } } @@ -120,36 +140,36 @@ "jdk": { "openjdk11": { "aarch64": { - "build": "8", - "sha256": "d18b5dd73fce9edd5c58f623a1173f9ee2d45023836b8753b96beae51673a432", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.17%2B8/OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.17_8.tar.gz", - "version": "11.0.17" + "build": "7", + "sha256": "0c7763a19b4af4ef5fbae831781b5184e988d6f131d264482399eeaf51b6e254", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.19%2B7/OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.19_7.tar.gz", + "version": "11.0.19" }, "armv6l": { - "build": "8", - "sha256": "9ff3b4bd2bac18fb39f3356148efa2dc710ac029e12dc8f18ea1fe6be23bf299", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.17%2B8/OpenJDK11U-jdk_arm_linux_hotspot_11.0.17_8.tar.gz", - "version": "11.0.17" + "build": "7", + "sha256": "be07af349f0d2e1ffb7e01e1e8bac8bffd76e22f6cc1354e5b627222e3395f41", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.19%2B7/OpenJDK11U-jdk_arm_linux_hotspot_11.0.19_7.tar.gz", + "version": "11.0.19" }, "armv7l": { - "build": "8", - "sha256": "9ff3b4bd2bac18fb39f3356148efa2dc710ac029e12dc8f18ea1fe6be23bf299", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.17%2B8/OpenJDK11U-jdk_arm_linux_hotspot_11.0.17_8.tar.gz", - "version": "11.0.17" + "build": "7", + "sha256": "be07af349f0d2e1ffb7e01e1e8bac8bffd76e22f6cc1354e5b627222e3395f41", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.19%2B7/OpenJDK11U-jdk_arm_linux_hotspot_11.0.19_7.tar.gz", + "version": "11.0.19" }, "packageType": "jdk", "powerpc64le": { - "build": "8", - "sha256": "18c636bd103e240d29cdb30d7867720ea9fb9ff7c645738bfb4d5b8027269263", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.17%2B8/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.17_8.tar.gz", - "version": "11.0.17" + "build": "7", + "sha256": "1e3704c8e155f8f894953c2a6708a52e6f449bbf5a85450be6fbb2ec76581700", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.19%2B7/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.19_7.tar.gz", + "version": "11.0.19" }, "vmType": "hotspot", "x86_64": { - "build": "8", - "sha256": "b8d46ed08ef4859476fe6421a7690d899ed83dce63f13fd894f994043177ef3c", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.17%2B8/OpenJDK11U-jdk_x64_linux_hotspot_11.0.17_8.tar.gz", - "version": "11.0.17" + "build": "7", + "sha256": "5f19fb28aea3e28fcc402b73ce72f62b602992d48769502effe81c52ca39a581", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.19%2B7/OpenJDK11U-jdk_x64_linux_hotspot_11.0.19_7.tar.gz", + "version": "11.0.19" } }, "openjdk16": { @@ -188,36 +208,36 @@ }, "openjdk17": { "aarch64": { - "build": "8", - "sha256": "1c26c0e09f1641a666d6740d802beb81e12180abaea07b47c409d30c7f368109", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.5%2B8/OpenJDK17U-jdk_aarch64_linux_hotspot_17.0.5_8.tar.gz", - "version": "17.0.5" + "build": "7", + "sha256": "0084272404b89442871e0a1f112779844090532978ad4d4191b8d03fc6adfade", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.7%2B7/OpenJDK17U-jdk_aarch64_linux_hotspot_17.0.7_7.tar.gz", + "version": "17.0.7" }, "armv6l": { - "build": "8", - "sha256": "e7c81596f67b6325036e9182d012f2266ced5663c5d4b0de0540ce62dcc67718", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.5%2B8/OpenJDK17U-jdk_arm_linux_hotspot_17.0.5_8.tar.gz", - "version": "17.0.5" + "build": "7", + "sha256": "e7a84c3e59704588510d7e6cce1f732f397b54a3b558c521912a18a1b4d0abdc", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.7%2B7/OpenJDK17U-jdk_arm_linux_hotspot_17.0.7_7.tar.gz", + "version": "17.0.7" }, "armv7l": { - "build": "8", - "sha256": "e7c81596f67b6325036e9182d012f2266ced5663c5d4b0de0540ce62dcc67718", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.5%2B8/OpenJDK17U-jdk_arm_linux_hotspot_17.0.5_8.tar.gz", - "version": "17.0.5" + "build": "7", + "sha256": "e7a84c3e59704588510d7e6cce1f732f397b54a3b558c521912a18a1b4d0abdc", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.7%2B7/OpenJDK17U-jdk_arm_linux_hotspot_17.0.7_7.tar.gz", + "version": "17.0.7" }, "packageType": "jdk", "powerpc64le": { - "build": "8", - "sha256": "a426a4e2cbc29f46fa686bea8b26613f7b7a9a772a77fed0d40dfe05295be883", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.5%2B8/OpenJDK17U-jdk_ppc64le_linux_hotspot_17.0.5_8.tar.gz", - "version": "17.0.5" + "build": "7", + "sha256": "8f4366ff1eddb548b1744cd82a1a56ceee60abebbcbad446bfb3ead7ac0f0f85", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.7%2B7/OpenJDK17U-jdk_ppc64le_linux_hotspot_17.0.7_7.tar.gz", + "version": "17.0.7" }, "vmType": "hotspot", "x86_64": { - "build": "8", - "sha256": "482180725ceca472e12a8e6d1a4af23d608d78287a77d963335e2a0156a020af", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.5%2B8/OpenJDK17U-jdk_x64_linux_hotspot_17.0.5_8.tar.gz", - "version": "17.0.5" + "build": "7", + "sha256": "e9458b38e97358850902c2936a1bb5f35f6cffc59da9fcd28c63eab8dbbfbc3b", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.7%2B7/OpenJDK17U-jdk_x64_linux_hotspot_17.0.7_7.tar.gz", + "version": "17.0.7" } }, "openjdk18": { @@ -256,140 +276,162 @@ }, "openjdk19": { "aarch64": { - "build": "10", - "sha256": "5e8d7b3189364afd78d936bad140dbe1e7025d4b96d530ed5536d035c21afb7c", - "url": "https://github.com/adoptium/temurin19-binaries/releases/download/jdk-19.0.1%2B10/OpenJDK19U-jdk_aarch64_linux_hotspot_19.0.1_10.tar.gz", - "version": "19.0.1" + "build": "7", + "sha256": "1c4be9aa173cb0deb0d215643d9509c8900e5497290b29eee4bee335fa57984f", + "url": "https://github.com/adoptium/temurin19-binaries/releases/download/jdk-19.0.2%2B7/OpenJDK19U-jdk_aarch64_linux_hotspot_19.0.2_7.tar.gz", + "version": "19.0.2" }, "armv6l": { - "build": "36", - "sha256": "34a786548033391de80b857fe02a9c7bd42fcb94243e7273e89012df73f1adef", - "url": "https://github.com/adoptium/temurin19-binaries/releases/download/jdk-19%2B36/OpenJDK19U-jdk_arm_linux_hotspot_19_36.tar.gz", - "version": "19.0.0" + "build": "7", + "sha256": "6a51cb3868b5a3b81848a0d276267230ff3f8639f20ba9ae9ef1d386440bf1fd", + "url": "https://github.com/adoptium/temurin19-binaries/releases/download/jdk-19.0.2%2B7/OpenJDK19U-jdk_arm_linux_hotspot_19.0.2_7.tar.gz", + "version": "19.0.2" }, "armv7l": { - "build": "36", - "sha256": "34a786548033391de80b857fe02a9c7bd42fcb94243e7273e89012df73f1adef", - "url": "https://github.com/adoptium/temurin19-binaries/releases/download/jdk-19%2B36/OpenJDK19U-jdk_arm_linux_hotspot_19_36.tar.gz", - "version": "19.0.0" + "build": "7", + "sha256": "6a51cb3868b5a3b81848a0d276267230ff3f8639f20ba9ae9ef1d386440bf1fd", + "url": "https://github.com/adoptium/temurin19-binaries/releases/download/jdk-19.0.2%2B7/OpenJDK19U-jdk_arm_linux_hotspot_19.0.2_7.tar.gz", + "version": "19.0.2" }, "packageType": "jdk", "powerpc64le": { - "build": "10", - "sha256": "79320712bbef13825a0aa308621006f32e54f503142737fb21ff085185a61a96", - "url": "https://github.com/adoptium/temurin19-binaries/releases/download/jdk-19.0.1%2B10/OpenJDK19U-jdk_ppc64le_linux_hotspot_19.0.1_10.tar.gz", - "version": "19.0.1" + "build": "7", + "sha256": "173d1256dfb9d13d309b5390e6bdf72d143b512201b0868f9d349d5ed3d64072", + "url": "https://github.com/adoptium/temurin19-binaries/releases/download/jdk-19.0.2%2B7/OpenJDK19U-jdk_ppc64le_linux_hotspot_19.0.2_7.tar.gz", + "version": "19.0.2" }, "vmType": "hotspot", "x86_64": { - "build": "10", - "sha256": "163da7ea140210bae97c6a4590c757858ab4520a78af0e3e33129863d4087552", - "url": "https://github.com/adoptium/temurin19-binaries/releases/download/jdk-19.0.1%2B10/OpenJDK19U-jdk_x64_linux_hotspot_19.0.1_10.tar.gz", - "version": "19.0.1" + "build": "7", + "sha256": "3a3ba7a3f8c3a5999e2c91ea1dca843435a0d1c43737bd2f6822b2f02fc52165", + "url": "https://github.com/adoptium/temurin19-binaries/releases/download/jdk-19.0.2%2B7/OpenJDK19U-jdk_x64_linux_hotspot_19.0.2_7.tar.gz", + "version": "19.0.2" + } + }, + "openjdk20": { + "aarch64": { + "build": "9", + "sha256": "b16c0271899de1f0e277dc0398bfff11b54511765f104fa938929ac484dc926d", + "url": "https://github.com/adoptium/temurin20-binaries/releases/download/jdk-20.0.1%2B9/OpenJDK20U-jdk_aarch64_linux_hotspot_20.0.1_9.tar.gz", + "version": "20.0.1" + }, + "packageType": "jdk", + "powerpc64le": { + "build": "36", + "sha256": "45dde71faf8cbb78fab3c976894259655c8d3de827347f23e0ebe5710921dded", + "url": "https://github.com/adoptium/temurin20-binaries/releases/download/jdk-20%2B36/OpenJDK20U-jdk_ppc64le_linux_hotspot_20_36.tar.gz", + "version": "20.0.0" + }, + "vmType": "hotspot", + "x86_64": { + "build": "9", + "sha256": "43ad054f135a7894dc87ad5d10ad45d8e82846186515892acdbc17c2c5cd27e4", + "url": "https://github.com/adoptium/temurin20-binaries/releases/download/jdk-20.0.1%2B9/OpenJDK20U-jdk_x64_linux_hotspot_20.0.1_9.tar.gz", + "version": "20.0.1" } }, "openjdk8": { "aarch64": { - "build": "8", - "sha256": "a70768968bbcccccf977f036e87e545c3b080ed6c44072a01e9dadb94051c454", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u352-b08/OpenJDK8U-jdk_aarch64_linux_hotspot_8u352b08.tar.gz", - "version": "8.0.352" + "build": "7", + "sha256": "195808eb42ab73535c84de05188914a52a47c1ac784e4bf66de95fe1fd315a5a", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u372-b07/OpenJDK8U-jdk_aarch64_linux_hotspot_8u372b07.tar.gz", + "version": "8.0.372" }, "armv6l": { - "build": "1", - "sha256": "af4ecd311df32b405142d5756f966418d0200fbf6cb9009c20a44dc691e8da6f", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u345-b01/OpenJDK8U-jdk_arm_linux_hotspot_8u345b01.tar.gz", - "version": "8.0.345" + "build": "7", + "sha256": "3f4848700a4bf856d3c138dc9c2b305b978879c8fbef5aa7df34a7c2fe1b64b8", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u372-b07/OpenJDK8U-jdk_arm_linux_hotspot_8u372b07.tar.gz", + "version": "8.0.372" }, "armv7l": { - "build": "1", - "sha256": "af4ecd311df32b405142d5756f966418d0200fbf6cb9009c20a44dc691e8da6f", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u345-b01/OpenJDK8U-jdk_arm_linux_hotspot_8u345b01.tar.gz", - "version": "8.0.345" + "build": "7", + "sha256": "3f4848700a4bf856d3c138dc9c2b305b978879c8fbef5aa7df34a7c2fe1b64b8", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u372-b07/OpenJDK8U-jdk_arm_linux_hotspot_8u372b07.tar.gz", + "version": "8.0.372" }, "packageType": "jdk", "powerpc64le": { - "build": "8", - "sha256": "863791dd8e0536a678f5e439c9c67199a0f3f18c76138a8e242775dfe1784009", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u352-b08/OpenJDK8U-jdk_ppc64le_linux_hotspot_8u352b08.tar.gz", - "version": "8.0.352" + "build": "7", + "sha256": "bb85303848fe402d4f1004f748f80ccb39cb11f356f50a513555d1083c3913b8", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u372-b07/OpenJDK8U-jdk_ppc64le_linux_hotspot_8u372b07.tar.gz", + "version": "8.0.372" }, "vmType": "hotspot", "x86_64": { - "build": "8", - "sha256": "1633bd7590cb1cd72f5a1378ae8294451028b274d798e2a4ac672059a2f00fee", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u352-b08/OpenJDK8U-jdk_x64_linux_hotspot_8u352b08.tar.gz", - "version": "8.0.352" + "build": "7", + "sha256": "78a0b3547d6f3d46227f2ad8c774248425f20f1cd63f399b713f0cdde2cc376c", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u372-b07/OpenJDK8U-jdk_x64_linux_hotspot_8u372b07.tar.gz", + "version": "8.0.372" } } }, "jre": { "openjdk11": { "aarch64": { - "build": "8", - "sha256": "bd6efe3290c8b5a42f695a55a26f3e3c9c284288574879d4b7089f31f5114177", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.17%2B8/OpenJDK11U-jre_aarch64_linux_hotspot_11.0.17_8.tar.gz", - "version": "11.0.17" + "build": "7", + "sha256": "1fe4b20d808f393422610818711c728331992a4455eeeb061d3d05b45412771d", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.19%2B7/OpenJDK11U-jre_aarch64_linux_hotspot_11.0.19_7.tar.gz", + "version": "11.0.19" }, "armv6l": { - "build": "8", - "sha256": "8cf113d3d7fa808895c8d2e41bb890af21c47e38c2460e0588147a4bb8fc658d", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.17%2B8/OpenJDK11U-jre_arm_linux_hotspot_11.0.17_8.tar.gz", - "version": "11.0.17" + "build": "7", + "sha256": "cb754b055177381f9f6852b7e5469904a15edddd7f8e136043c28b1e33aee47c", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.19%2B7/OpenJDK11U-jre_arm_linux_hotspot_11.0.19_7.tar.gz", + "version": "11.0.19" }, "armv7l": { - "build": "8", - "sha256": "8cf113d3d7fa808895c8d2e41bb890af21c47e38c2460e0588147a4bb8fc658d", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.17%2B8/OpenJDK11U-jre_arm_linux_hotspot_11.0.17_8.tar.gz", - "version": "11.0.17" + "build": "7", + "sha256": "cb754b055177381f9f6852b7e5469904a15edddd7f8e136043c28b1e33aee47c", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.19%2B7/OpenJDK11U-jre_arm_linux_hotspot_11.0.19_7.tar.gz", + "version": "11.0.19" }, "packageType": "jre", "powerpc64le": { - "build": "8", - "sha256": "0ca3d806131ab5834c501f9c625bb0248cd528af361c704503348e9c9605bedf", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.17%2B8/OpenJDK11U-jre_ppc64le_linux_hotspot_11.0.17_8.tar.gz", - "version": "11.0.17" + "build": "7", + "sha256": "8019d938e5525938ec8e68e2989c4413263b0d9b7b3f20fe0c45f6d967919cfb", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.19%2B7/OpenJDK11U-jre_ppc64le_linux_hotspot_11.0.19_7.tar.gz", + "version": "11.0.19" }, "vmType": "hotspot", "x86_64": { - "build": "8", - "sha256": "752616097e09d7f60a3ad8bd312f90eaf50ac72577e55df229fe6e8091148f79", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.17%2B8/OpenJDK11U-jre_x64_linux_hotspot_11.0.17_8.tar.gz", - "version": "11.0.17" + "build": "7", + "sha256": "32dcf760664f93531594b72ce9226e9216567de5705a23c9ff5a77c797948054", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.19%2B7/OpenJDK11U-jre_x64_linux_hotspot_11.0.19_7.tar.gz", + "version": "11.0.19" } }, "openjdk17": { "aarch64": { - "build": "8", - "sha256": "34d6414710db27cd7760fe369135f3b9927ccc81410280606613166d4106d60a", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.5%2B8/OpenJDK17U-jre_aarch64_linux_hotspot_17.0.5_8.tar.gz", - "version": "17.0.5" + "build": "7", + "sha256": "2ff6a4fd1fa354047c93ba8c3179967156162f27bd683aee1f6e52a480bcbe6a", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.7%2B7/OpenJDK17U-jre_aarch64_linux_hotspot_17.0.7_7.tar.gz", + "version": "17.0.7" }, "armv6l": { - "build": "8", - "sha256": "9e0d1745139fe502f22df1e261d2ed1ad807085dd75a8b333d481289b579870d", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.5%2B8/OpenJDK17U-jre_arm_linux_hotspot_17.0.5_8.tar.gz", - "version": "17.0.5" + "build": "7", + "sha256": "5b0401199c7c9163b8395ebf25195ed395fec7b7ef7158c36302420cf993825a", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.7%2B7/OpenJDK17U-jre_arm_linux_hotspot_17.0.7_7.tar.gz", + "version": "17.0.7" }, "armv7l": { - "build": "8", - "sha256": "9e0d1745139fe502f22df1e261d2ed1ad807085dd75a8b333d481289b579870d", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.5%2B8/OpenJDK17U-jre_arm_linux_hotspot_17.0.5_8.tar.gz", - "version": "17.0.5" + "build": "7", + "sha256": "5b0401199c7c9163b8395ebf25195ed395fec7b7ef7158c36302420cf993825a", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.7%2B7/OpenJDK17U-jre_arm_linux_hotspot_17.0.7_7.tar.gz", + "version": "17.0.7" }, "packageType": "jre", "powerpc64le": { - "build": "8", - "sha256": "51dd491505bd2e096676b9dc8ecaf196d78993215af16c0f9dfddfe3dbc0205b", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.5%2B8/OpenJDK17U-jre_ppc64le_linux_hotspot_17.0.5_8.tar.gz", - "version": "17.0.5" + "build": "7", + "sha256": "cc25e74c0817cd4d943bba056b256b86e0e9148bf41d7600c5ec2e1eadb2e470", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.7%2B7/OpenJDK17U-jre_ppc64le_linux_hotspot_17.0.7_7.tar.gz", + "version": "17.0.7" }, "vmType": "hotspot", "x86_64": { - "build": "8", - "sha256": "11326464a14b63e6328d1d2088a23fb559c0e36b3f380e4c1f8dcbe160a8b95e", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.5%2B8/OpenJDK17U-jre_x64_linux_hotspot_17.0.5_8.tar.gz", - "version": "17.0.5" + "build": "7", + "sha256": "bb025133b96266f6415d5084bb9b260340a813968007f1d2d14690f20bd021ca", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.7%2B7/OpenJDK17U-jre_x64_linux_hotspot_17.0.7_7.tar.gz", + "version": "17.0.7" } }, "openjdk18": { @@ -428,70 +470,92 @@ }, "openjdk19": { "aarch64": { - "build": "10", - "sha256": "c69ffc5474be076b200e8cc72417b838e4f830b36603d593fb8ca6d11b81969b", - "url": "https://github.com/adoptium/temurin19-binaries/releases/download/jdk-19.0.1%2B10/OpenJDK19U-jre_aarch64_linux_hotspot_19.0.1_10.tar.gz", - "version": "19.0.1" + "build": "7", + "sha256": "3653f9e5ad21e4744e5a655e243fba2895651029bee23f3d2366d5debc41a736", + "url": "https://github.com/adoptium/temurin19-binaries/releases/download/jdk-19.0.2%2B7/OpenJDK19U-jre_aarch64_linux_hotspot_19.0.2_7.tar.gz", + "version": "19.0.2" }, "armv6l": { - "build": "36", - "sha256": "f6c4895b8d33118c75403d08f9697af0b77769d0e8574cb678518a0ab3b74a12", - "url": "https://github.com/adoptium/temurin19-binaries/releases/download/jdk-19%2B36/OpenJDK19U-jre_arm_linux_hotspot_19_36.tar.gz", - "version": "19.0.0" + "build": "7", + "sha256": "d4588e8c01ca60da2ceed68b7d43d2fd9ec3350b93043f0dabd0eb6cb03cb23d", + "url": "https://github.com/adoptium/temurin19-binaries/releases/download/jdk-19.0.2%2B7/OpenJDK19U-jre_arm_linux_hotspot_19.0.2_7.tar.gz", + "version": "19.0.2" }, "armv7l": { - "build": "36", - "sha256": "f6c4895b8d33118c75403d08f9697af0b77769d0e8574cb678518a0ab3b74a12", - "url": "https://github.com/adoptium/temurin19-binaries/releases/download/jdk-19%2B36/OpenJDK19U-jre_arm_linux_hotspot_19_36.tar.gz", - "version": "19.0.0" + "build": "7", + "sha256": "d4588e8c01ca60da2ceed68b7d43d2fd9ec3350b93043f0dabd0eb6cb03cb23d", + "url": "https://github.com/adoptium/temurin19-binaries/releases/download/jdk-19.0.2%2B7/OpenJDK19U-jre_arm_linux_hotspot_19.0.2_7.tar.gz", + "version": "19.0.2" }, "packageType": "jre", "powerpc64le": { - "build": "10", - "sha256": "c5f3d67edfa0d9b5ec935f944c177c0ee4b2d7a2b5846feaf187b77e954f4242", - "url": "https://github.com/adoptium/temurin19-binaries/releases/download/jdk-19.0.1%2B10/OpenJDK19U-jre_ppc64le_linux_hotspot_19.0.1_10.tar.gz", - "version": "19.0.1" + "build": "7", + "sha256": "a30203431c7c21602227d39368c5af6e7abd19000d6da5562de7f3f5c57cbad5", + "url": "https://github.com/adoptium/temurin19-binaries/releases/download/jdk-19.0.2%2B7/OpenJDK19U-jre_ppc64le_linux_hotspot_19.0.2_7.tar.gz", + "version": "19.0.2" }, "vmType": "hotspot", "x86_64": { - "build": "10", - "sha256": "68cae46c973e48ca6777cd0026bbf25f3457bd3d6730c36bd79d4f3b398c8338", - "url": "https://github.com/adoptium/temurin19-binaries/releases/download/jdk-19.0.1%2B10/OpenJDK19U-jre_x64_linux_hotspot_19.0.1_10.tar.gz", - "version": "19.0.1" + "build": "7", + "sha256": "7386e10c74f00a4382be0540bc0494854804ad79427d8a50ac77a4c7208ff348", + "url": "https://github.com/adoptium/temurin19-binaries/releases/download/jdk-19.0.2%2B7/OpenJDK19U-jre_x64_linux_hotspot_19.0.2_7.tar.gz", + "version": "19.0.2" + } + }, + "openjdk20": { + "aarch64": { + "build": "9", + "sha256": "4b04fcfabf833403cc74dd19105a387563f9ff0fef975c4101f3d74c53eb7745", + "url": "https://github.com/adoptium/temurin20-binaries/releases/download/jdk-20.0.1%2B9/OpenJDK20U-jre_aarch64_linux_hotspot_20.0.1_9.tar.gz", + "version": "20.0.1" + }, + "packageType": "jre", + "powerpc64le": { + "build": "36", + "sha256": "a1c5a16d5a438ce7da4563cd51ff6778cdf62331c00a3096ab2388a916e076d2", + "url": "https://github.com/adoptium/temurin20-binaries/releases/download/jdk-20%2B36/OpenJDK20U-jre_ppc64le_linux_hotspot_20_36.tar.gz", + "version": "20.0.0" + }, + "vmType": "hotspot", + "x86_64": { + "build": "9", + "sha256": "daacf24c15bf7f38a957a98a312911a36ba7f7d97004920a7875791f20e8e1ed", + "url": "https://github.com/adoptium/temurin20-binaries/releases/download/jdk-20.0.1%2B9/OpenJDK20U-jre_x64_linux_hotspot_20.0.1_9.tar.gz", + "version": "20.0.1" } }, "openjdk8": { "aarch64": { - "build": "8", - "sha256": "cce4db7c4311378d8d2a174b2cf680d57b52a4036f37c995b14f936b6fc1141a", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u352-b08/OpenJDK8U-jre_aarch64_linux_hotspot_8u352b08.tar.gz", - "version": "8.0.352" + "build": "7", + "sha256": "f8e440273c8feb3fcfaca88ba18fec291deae18a548adde8a37cd1db08107b95", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u372-b07/OpenJDK8U-jre_aarch64_linux_hotspot_8u372b07.tar.gz", + "version": "8.0.372" }, "armv6l": { - "build": "1", - "sha256": "a9dd1ea4280a85158191101688bbf1920c4676a3849e22dc7783fb61f60d6199", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u345-b01/OpenJDK8U-jre_arm_linux_hotspot_8u345b01.tar.gz", - "version": "8.0.345" + "build": "7", + "sha256": "e58e017012838ae4f0db78293e3246cc09958e6ea9a2393c5947ec003bf736dd", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u372-b07/OpenJDK8U-jre_arm_linux_hotspot_8u372b07.tar.gz", + "version": "8.0.372" }, "armv7l": { - "build": "1", - "sha256": "a9dd1ea4280a85158191101688bbf1920c4676a3849e22dc7783fb61f60d6199", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u345-b01/OpenJDK8U-jre_arm_linux_hotspot_8u345b01.tar.gz", - "version": "8.0.345" + "build": "7", + "sha256": "e58e017012838ae4f0db78293e3246cc09958e6ea9a2393c5947ec003bf736dd", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u372-b07/OpenJDK8U-jre_arm_linux_hotspot_8u372b07.tar.gz", + "version": "8.0.372" }, "packageType": "jre", "powerpc64le": { - "build": "8", - "sha256": "5649672dab65b3519ec16653fb2f154da90a7cd2afc568da03f3bff5c6b30a90", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u352-b08/OpenJDK8U-jre_ppc64le_linux_hotspot_8u352b08.tar.gz", - "version": "8.0.352" + "build": "7", + "sha256": "ba5f8141a16722e39576bf42b69d2b8ebf95fc2c05441e3200f609af4dd9f1ea", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u372-b07/OpenJDK8U-jre_ppc64le_linux_hotspot_8u372b07.tar.gz", + "version": "8.0.372" }, "vmType": "hotspot", "x86_64": { - "build": "8", - "sha256": "40b6b4c3d8f7332ea479527b530413bf0dbc13cff3c0ed9fcadf1ca053bed106", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u352-b08/OpenJDK8U-jre_x64_linux_hotspot_8u352b08.tar.gz", - "version": "8.0.352" + "build": "7", + "sha256": "b6fdfe32085a884c11b31f66aa67ac62811df7112fb6fb08beea61376a86fbb4", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u372-b07/OpenJDK8U-jre_x64_linux_hotspot_8u372b07.tar.gz", + "version": "8.0.372" } } } @@ -500,18 +564,18 @@ "jdk": { "openjdk11": { "aarch64": { - "build": "8", - "sha256": "79b18cbd398b67a52ebaf033dfca15c7af4c1a84ec5fa68a88f3bf742bb082f7", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.17%2B8/OpenJDK11U-jdk_aarch64_mac_hotspot_11.0.17_8.tar.gz", - "version": "11.0.17" + "build": "7", + "sha256": "f3b416ecccf51f45cc8c986975eb7bd35e7e1ad953656ab0a807125963fcf73b", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.19%2B7/OpenJDK11U-jdk_aarch64_mac_hotspot_11.0.19_7.tar.gz", + "version": "11.0.19" }, "packageType": "jdk", "vmType": "hotspot", "x86_64": { - "build": "8", - "sha256": "f408a12f10d93b3205bef851af62707531b699963cef79408d59197d08763c94", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.17%2B8/OpenJDK11U-jdk_x64_mac_hotspot_11.0.17_8.tar.gz", - "version": "11.0.17" + "build": "7", + "sha256": "fc34c4f0e590071dcd65a0f93540913466ccac3aa8caa984826713b67afb696d", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.19%2B7/OpenJDK11U-jdk_x64_mac_hotspot_11.0.19_7.tar.gz", + "version": "11.0.19" } }, "openjdk16": { @@ -526,18 +590,18 @@ }, "openjdk17": { "aarch64": { - "build": "8", - "sha256": "2dc3e425b52d1cd2915d93af5e468596b9e6a90112056abdcebac8b65bf57049", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.5%2B8/OpenJDK17U-jdk_aarch64_mac_hotspot_17.0.5_8.tar.gz", - "version": "17.0.5" + "build": "7", + "sha256": "1d6aeb55b47341e8ec33cc1644d58b88dfdcce17aa003a858baa7460550e6ff9", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.7%2B7/OpenJDK17U-jdk_aarch64_mac_hotspot_17.0.7_7.tar.gz", + "version": "17.0.7" }, "packageType": "jdk", "vmType": "hotspot", "x86_64": { - "build": "8", - "sha256": "94fe50982b09a179e603a096e83fd8e59fd12c0ae4bcb37ae35f00ef30a75d64", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.5%2B8/OpenJDK17U-jdk_x64_mac_hotspot_17.0.5_8.tar.gz", - "version": "17.0.5" + "build": "7", + "sha256": "50d0e9840113c93916418068ba6c845f1a72ed0dab80a8a1f7977b0e658b65fb", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.7%2B7/OpenJDK17U-jdk_x64_mac_hotspot_17.0.7_7.tar.gz", + "version": "17.0.7" } }, "openjdk18": { @@ -558,62 +622,78 @@ }, "openjdk19": { "aarch64": { - "build": "10", - "sha256": "2be4ffbf7c59b3148886b48ecf3f7d7edb7c745917ceae2a6be145a4678bf014", - "url": "https://github.com/adoptium/temurin19-binaries/releases/download/jdk-19.0.1%2B10/OpenJDK19U-jdk_aarch64_mac_hotspot_19.0.1_10.tar.gz", - "version": "19.0.1" + "build": "7", + "sha256": "c419330cc8d6b9974d3bf1937f8f0e747c34c469afd5c546831d35aa19e03d49", + "url": "https://github.com/adoptium/temurin19-binaries/releases/download/jdk-19.0.2%2B7/OpenJDK19U-jdk_aarch64_mac_hotspot_19.0.2_7.tar.gz", + "version": "19.0.2" }, "packageType": "jdk", "vmType": "hotspot", "x86_64": { - "build": "10", - "sha256": "0d80a8787fa97f5fc2f0000a849b54f4d41c5b87726c29ea1de215e382c8380c", - "url": "https://github.com/adoptium/temurin19-binaries/releases/download/jdk-19.0.1%2B10/OpenJDK19U-jdk_x64_mac_hotspot_19.0.1_10.tar.gz", - "version": "19.0.1" + "build": "7", + "sha256": "f59d4157b3b53a35e72db283659d47f14aecae0ff5936d5f8078000504299da6", + "url": "https://github.com/adoptium/temurin19-binaries/releases/download/jdk-19.0.2%2B7/OpenJDK19U-jdk_x64_mac_hotspot_19.0.2_7.tar.gz", + "version": "19.0.2" + } + }, + "openjdk20": { + "aarch64": { + "build": "9", + "sha256": "e743f7a4aebb46bfb02e164c7aa009a29bcce1d7dd0c4926541893ea6ed21d82", + "url": "https://github.com/adoptium/temurin20-binaries/releases/download/jdk-20.0.1%2B9/OpenJDK20U-jdk_aarch64_mac_hotspot_20.0.1_9.tar.gz", + "version": "20.0.1" + }, + "packageType": "jdk", + "vmType": "hotspot", + "x86_64": { + "build": "9", + "sha256": "7cccfc4fb9f63410b7fdc315fd1c7739cf61888930d7f88f3eee6589d14e861f", + "url": "https://github.com/adoptium/temurin20-binaries/releases/download/jdk-20.0.1%2B9/OpenJDK20U-jdk_x64_mac_hotspot_20.0.1_9.tar.gz", + "version": "20.0.1" } }, "openjdk8": { "packageType": "jdk", "vmType": "hotspot", "x86_64": { - "build": "1", - "sha256": "3eeba0e76101b9f5e8eb9eb14ad991293cf0cc064df35f6a89882b603630f0c8", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u345-b01/OpenJDK8U-jdk_x64_mac_hotspot_8u345b01.tar.gz", - "version": "8.0.345" + "build": "7", + "sha256": "9c33db312cc46b6bfe705770fdc5c08edb7d790ba70be4e8b12a98e79da5f4a1", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u372-b07/OpenJDK8U-jdk_x64_mac_hotspot_8u372b07.tar.gz", + "version": "8.0.372" } } }, "jre": { "openjdk11": { "aarch64": { - "build": "8", - "sha256": "2a5cbc2888f8e382c7d0a5bf2c6d2c3bad120ceff51b00d3a62805dae4473c02", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.17%2B8/OpenJDK11U-jre_aarch64_mac_hotspot_11.0.17_8.tar.gz", - "version": "11.0.17" + "build": "7", + "sha256": "78a07bd60c278f65bafd0df93890d909ff60259ccbd22ad71a1c3b312906508e", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.19%2B7/OpenJDK11U-jre_aarch64_mac_hotspot_11.0.19_7.tar.gz", + "version": "11.0.19" }, "packageType": "jre", "vmType": "hotspot", "x86_64": { - "build": "8", - "sha256": "66508958b5da6e36021d960b65490ab70cc7d44851c98301a3d6d3552f305674", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.17%2B8/OpenJDK11U-jre_x64_mac_hotspot_11.0.17_8.tar.gz", - "version": "11.0.17" + "build": "7", + "sha256": "87e439b2193e1a2cf1a8782168bba83b558f54e2708f88ea8296184ea2735c89", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.19%2B7/OpenJDK11U-jre_x64_mac_hotspot_11.0.19_7.tar.gz", + "version": "11.0.19" } }, "openjdk17": { "aarch64": { - "build": "8", - "sha256": "d98b7f5ee6cb4a1c49288bd932008e3e37f9bb5d9a0eb9396ea236786e6ab570", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.5%2B8/OpenJDK17U-jre_aarch64_mac_hotspot_17.0.5_8.tar.gz", - "version": "17.0.5" + "build": "7", + "sha256": "625d070a297a3c856badbaa5c65adaaa1adb3ea3813363fb8335c47709b69140", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.7%2B7/OpenJDK17U-jre_aarch64_mac_hotspot_17.0.7_7.tar.gz", + "version": "17.0.7" }, "packageType": "jre", "vmType": "hotspot", "x86_64": { - "build": "8", - "sha256": "c4884b6cd8d43497ff46e4fd475ddde5ab91004db435f0c29a801b081662f7ee", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.5%2B8/OpenJDK17U-jre_x64_mac_hotspot_17.0.5_8.tar.gz", - "version": "17.0.5" + "build": "7", + "sha256": "62559a927a8dbac2ea1d7879f590a62fea87d61bfaa92894e578d2045b8d921b", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.7%2B7/OpenJDK17U-jre_x64_mac_hotspot_17.0.7_7.tar.gz", + "version": "17.0.7" } }, "openjdk18": { @@ -634,28 +714,44 @@ }, "openjdk19": { "aarch64": { - "build": "10", - "sha256": "d6d4a51d2eefb98cabdbdd9118ca473e9b07ced8d784541177f74e9bf09d4a2e", - "url": "https://github.com/adoptium/temurin19-binaries/releases/download/jdk-19.0.1%2B10/OpenJDK19U-jre_aarch64_mac_hotspot_19.0.1_10.tar.gz", - "version": "19.0.1" + "build": "7", + "sha256": "1cd53e60478912fe5f2095313821e90c4926e74ff60a4aa9d99fc2ec912411c1", + "url": "https://github.com/adoptium/temurin19-binaries/releases/download/jdk-19.0.2%2B7/OpenJDK19U-jre_aarch64_mac_hotspot_19.0.2_7.tar.gz", + "version": "19.0.2" + }, + "packageType": "jre", + "vmType": "hotspot", + "x86_64": { + "build": "7", + "sha256": "33a37be7a5d7a6003595eeee6d09e47abfa1a1065a4da9a6f592b4b09cfcea19", + "url": "https://github.com/adoptium/temurin19-binaries/releases/download/jdk-19.0.2%2B7/OpenJDK19U-jre_x64_mac_hotspot_19.0.2_7.tar.gz", + "version": "19.0.2" + } + }, + "openjdk20": { + "aarch64": { + "build": "9", + "sha256": "ee8be9190324285ebc7e9bd47b948eec349221845fa48f1e673e5a1489708750", + "url": "https://github.com/adoptium/temurin20-binaries/releases/download/jdk-20.0.1%2B9/OpenJDK20U-jre_aarch64_mac_hotspot_20.0.1_9.tar.gz", + "version": "20.0.1" }, "packageType": "jre", "vmType": "hotspot", "x86_64": { - "build": "10", - "sha256": "8bf67ece0915f5847caec5060e93eafbeeb1a3c99132a72a9424255b3b7cd063", - "url": "https://github.com/adoptium/temurin19-binaries/releases/download/jdk-19.0.1%2B10/OpenJDK19U-jre_x64_mac_hotspot_19.0.1_10.tar.gz", - "version": "19.0.1" + "build": "9", + "sha256": "b59a5f8b7f8fd1502df274e8ba58215b06934c8261413cb40e344f6ad81e7f1f", + "url": "https://github.com/adoptium/temurin20-binaries/releases/download/jdk-20.0.1%2B9/OpenJDK20U-jre_x64_mac_hotspot_20.0.1_9.tar.gz", + "version": "20.0.1" } }, "openjdk8": { "packageType": "jre", "vmType": "hotspot", "x86_64": { - "build": "1", - "sha256": "6161240769bd784e5ad55105fab9782d787ad34b7b8efd1f730a05f2659455d2", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u345-b01/OpenJDK8U-jre_x64_mac_hotspot_8u345b01.tar.gz", - "version": "8.0.345" + "build": "7", + "sha256": "6c876ea7bfa778ae78ec5a976e557b2b981a592a3639eb0d3dc3c8d3dda8d321", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u372-b07/OpenJDK8U-jre_x64_mac_hotspot_8u372b07.tar.gz", + "version": "8.0.372" } } } diff --git a/nixpkgs/pkgs/development/compilers/teyjus/default.nix b/nixpkgs/pkgs/development/compilers/teyjus/default.nix index e8d2ffe17265..3a44a136b6e2 100644 --- a/nixpkgs/pkgs/development/compilers/teyjus/default.nix +++ b/nixpkgs/pkgs/development/compilers/teyjus/default.nix @@ -1,42 +1,28 @@ -{ lib, stdenv, fetchFromGitHub, omake, ocaml, flex, bison }: +{ lib, fetchFromGitHub, buildDunePackage, flex, bison }: -stdenv.mkDerivation rec { +buildDunePackage rec { pname = "teyjus"; - version = "unstable-2019-07-26"; + version = "2.1.1"; src = fetchFromGitHub { owner = "teyjus"; repo = "teyjus"; - rev = "e63f40aa9f1d0ea5e7bac41aae5e479c3616545c"; - sha256 = "sha256-gaAWKd5/DZrIPaaQzx9l0KtCMW9LPw17vvNPsnopZA0="; + rev = "refs/tags/v${version}"; + hash = "sha256-N4XKDd0NFr501PYUdb7PM2sWh0uD1/SUFXoMr10f064="; }; - patches = [ - ./fix-lex-to-flex.patch - ]; - - postPatch = '' - sed -i "/TST/d" source/OMakefile - rm -rf source/front/caml - ''; - strictDeps = true; - nativeBuildInputs = [ omake ocaml flex bison ]; + nativeBuildInputs = [ flex bison ]; hardeningDisable = [ "format" ]; - env.NIX_CFLAGS_COMPILE = "-I${ocaml}/include"; - - buildPhase = "omake all"; - - checkPhase = "omake check"; - - installPhase = "mkdir -p $out/bin && cp tj* $out/bin"; + doCheck = true; meta = with lib; { description = "An efficient implementation of the Lambda Prolog language"; homepage = "https://github.com/teyjus/teyjus"; + changelog = "https://github.com/teyjus/teyjus/releases/tag/v${version}"; license = lib.licenses.gpl3; maintainers = [ maintainers.bcdarwin ]; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/development/compilers/teyjus/fix-lex-to-flex.patch b/nixpkgs/pkgs/development/compilers/teyjus/fix-lex-to-flex.patch deleted file mode 100644 index fa82d80633ad..000000000000 --- a/nixpkgs/pkgs/development/compilers/teyjus/fix-lex-to-flex.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff --git a/source/OMakefile b/source/OMakefile -index e6bd37e..1bbc0a8 100644 ---- a/source/OMakefile -+++ b/source/OMakefile -@@ -184,6 +184,12 @@ DEP_MAIN = $(FNT)/dependfront - PAR_MAIN = $(FNT)/parsefront - - ############################################################ -+# Nixpkgs specific changes -+# -+ -+LEX = flex -+ -+############################################################ - # Platform specific changes - # - -@@ -194,7 +200,6 @@ if $(mem $(SYSNAME), Linux) - - if $(mem $(OSTYPE), Cygwin Win32) - YACC = bison -by -- LEX = flex - CC = i686-pc-mingw32-gcc - INC_C[] += $(INC)/byteswap $(INC)/search - export diff --git a/nixpkgs/pkgs/development/compilers/typescript/default.nix b/nixpkgs/pkgs/development/compilers/typescript/default.nix new file mode 100644 index 000000000000..d63fe8651a1b --- /dev/null +++ b/nixpkgs/pkgs/development/compilers/typescript/default.nix @@ -0,0 +1,24 @@ +{ lib, buildNpmPackage, fetchFromGitHub }: + +buildNpmPackage rec { + pname = "typescript"; + version = "5.1.6"; + + src = fetchFromGitHub { + owner = "microsoft"; + repo = "TypeScript"; + rev = "v${version}"; + hash = "sha256-YBAAiO7MBJ41VK6A9zeExB7ZSbbrQ23sVTHAqo+/H/w="; + }; + + npmDepsHash = "sha256-RHiUhhkzkr2Ra3wc1d13gE2WIZL49w7IEFEAZuBDTDI="; + + meta = with lib; { + description = "A superset of JavaScript that compiles to clean JavaScript output"; + homepage = "https://www.typescriptlang.org/"; + changelog = "https://github.com/microsoft/TypeScript/releases/tag/v${version}"; + license = licenses.asl20; + maintainers = [ maintainers.marsam ]; + mainProgram = "tsc"; + }; +} diff --git a/nixpkgs/pkgs/development/compilers/unison/default.nix b/nixpkgs/pkgs/development/compilers/unison/default.nix index 0fd99ac0c375..f34992c8a36e 100644 --- a/nixpkgs/pkgs/development/compilers/unison/default.nix +++ b/nixpkgs/pkgs/development/compilers/unison/default.nix @@ -1,23 +1,27 @@ -{ lib, stdenv, fetchurl, autoPatchelfHook -, ncurses5, zlib, gmp -, makeWrapper +{ lib +, autoPatchelfHook +, fetchurl +, gmp , less +, makeWrapper +, ncurses6 +, stdenv +, zlib }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "unison-code-manager"; - milestone_id = "M4i"; - version = "1.0.${milestone_id}-alpha"; + version = "M5b"; - src = if (stdenv.isDarwin) then + src = if stdenv.isDarwin then fetchurl { - url = "https://github.com/unisonweb/unison/releases/download/release/${milestone_id}/ucm-macos.tar.gz"; - hash = "sha256-1Qp1SB5rCsVimZzRo1NOX8HBoMEGlIycJPm3zGTUuOw="; + url = "https://github.com/unisonweb/unison/releases/download/release/${finalAttrs.version}/ucm-macos.tar.gz"; + hash = "sha256-Uknt1NrywmGs8YovlnN8TU8iaYgT1jeYP4SQCuK1u+I="; } else fetchurl { - url = "https://github.com/unisonweb/unison/releases/download/release/${milestone_id}/ucm-linux.tar.gz"; - hash = "sha256-Qx8vO/Vaz0VdCGXwIwRQIuMlp44hxCroQ7m7Y+m7aXk="; + url = "https://github.com/unisonweb/unison/releases/download/release/${finalAttrs.version}/ucm-linux.tar.gz"; + hash = "sha256-CZLGA4fFFysxHkwedC8RBLmHWwr3BM8xqps7hN3TC/g="; }; # The tarball is just the prebuilt binary, in the archive root. @@ -25,8 +29,9 @@ stdenv.mkDerivation rec { dontBuild = true; dontConfigure = true; - nativeBuildInputs = [ makeWrapper ] ++ (lib.optional (!stdenv.isDarwin) autoPatchelfHook); - buildInputs = lib.optionals (!stdenv.isDarwin) [ ncurses5 zlib gmp ]; + nativeBuildInputs = [ makeWrapper ] + ++ lib.optional (!stdenv.isDarwin) autoPatchelfHook; + buildInputs = lib.optionals (!stdenv.isDarwin) [ ncurses6 zlib gmp ]; installPhase = '' mkdir -p $out/bin @@ -45,4 +50,4 @@ stdenv.mkDerivation rec { platforms = [ "x86_64-darwin" "x86_64-linux" "aarch64-darwin" ]; mainProgram = "ucm"; }; -} +}) diff --git a/nixpkgs/pkgs/development/compilers/vala/default.nix b/nixpkgs/pkgs/development/compilers/vala/default.nix index 9588e718b3e6..9ad5d3b4a340 100644 --- a/nixpkgs/pkgs/development/compilers/vala/default.nix +++ b/nixpkgs/pkgs/development/compilers/vala/default.nix @@ -10,17 +10,15 @@ let withGraphviz ? false }: let - # Patches from the openembedded-core project to build vala without graphviz - # support. We need to apply an additional patch to allow building when the - # header file isn't available at all, but that patch (./gvc-compat.patch) - # can be shared between all versions of Vala so far. + # Build vala (valadoc) without graphviz support. Inspired from the openembedded-core project. + # https://github.com/openembedded/openembedded-core/blob/a5440d4288e09d3e/meta/recipes-devtools/vala/vala/disable-graphviz.patch graphvizPatch = { "0.48" = ./disable-graphviz-0.46.1.patch; "0.54" = ./disable-graphviz-0.46.1.patch; - "0.56" = ./disable-graphviz-0.46.1.patch; + "0.56" = ./disable-graphviz-0.56.8.patch; }.${lib.versions.majorMinor version} or (throw "no graphviz patch for this version of vala"); @@ -47,7 +45,7 @@ let # If we're disabling graphviz, apply the patches and corresponding # configure flag. We also need to override the path to the valac compiler # so that it can be used to regenerate documentation. - patches = lib.optionals disableGraphviz [ graphvizPatch ./gvc-compat.patch ]; + patches = lib.optionals disableGraphviz [ graphvizPatch ]; configureFlags = lib.optional disableGraphviz "--disable-graphviz"; # when cross-compiling ./compiler/valac is valac for host # so add the build vala in nativeBuildInputs @@ -103,8 +101,8 @@ in rec { }; vala_0_56 = generic { - version = "0.56.7"; - sha256 = "PTnHWW1fqa6L/q5HZmn4EfcFe397kwhHiie2hEPYsAM="; + version = "0.56.9"; + sha256 = "VVeMfE8Ges4CjlQYBq8kD4CEy2/wzFVMqorAjL+Lzi8="; }; vala = vala_0_56; diff --git a/nixpkgs/pkgs/development/compilers/vala/disable-graphviz-0.46.1.patch b/nixpkgs/pkgs/development/compilers/vala/disable-graphviz-0.46.1.patch index 8c3e54b6a959..7c2ded4c8eda 100644 --- a/nixpkgs/pkgs/development/compilers/vala/disable-graphviz-0.46.1.patch +++ b/nixpkgs/pkgs/development/compilers/vala/disable-graphviz-0.46.1.patch @@ -259,3 +259,22 @@ index 5aa4afdea..e79b0b8f5 100644 return this; } +diff --git i/libvaladoc/Makefile.am w/libvaladoc/Makefile.am +index 8dc398cf1..a5d8a45b4 100644 +--- i/libvaladoc/Makefile.am ++++ w/libvaladoc/Makefile.am +@@ -176,9 +176,13 @@ endif + libvaladoc@PACKAGE_SUFFIX@_la_SOURCES = \ + libvaladoc.vala.stamp \ + $(libvaladoc_la_VALASOURCES:.vala=.c) \ +- gvc-compat.c \ + $(NULL) + ++if ENABLE_GRAPHVIZ ++libvaladoc@PACKAGE_SUFFIX@_la_SOURCES += \ ++ gvc-compat.c ++endif ++ + valadoc@PACKAGE_SUFFIX@.vapi valadoc.h: libvaladoc.vala.stamp + libvaladoc.vala.stamp: $(libvaladoc_la_VALASOURCES) + $(VALA_V)$(VALAC) \ diff --git a/nixpkgs/pkgs/development/compilers/vala/disable-graphviz-0.56.8.patch b/nixpkgs/pkgs/development/compilers/vala/disable-graphviz-0.56.8.patch new file mode 100644 index 000000000000..37c5ba504e5d --- /dev/null +++ b/nixpkgs/pkgs/development/compilers/vala/disable-graphviz-0.56.8.patch @@ -0,0 +1,173 @@ +diff --git a/configure.ac b/configure.ac +index 088e8f3b5..bded3c54c 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -196,13 +196,15 @@ AC_SUBST(GMODULE_LIBS) + + AC_ARG_WITH(cgraph, AS_HELP_STRING([--with-cgraph], [Required flag for cross-compilation to define capability of graphviz]), [], with_cgraph=check) + AC_ARG_ENABLE(valadoc, AS_HELP_STRING([--disable-valadoc], [Disable valadoc]), enable_valadoc=$enableval, enable_valadoc=yes) ++AC_ARG_ENABLE(graphviz, AS_HELP_STRING([--disable-graphviz], [Disable graphviz usage for valadoc]), enable_graphviz=$enableval, enable_graphviz=yes) + AS_IF([test "$VALAC" != :], [FOUND_VALAC_VERION=`$VALAC --version | sed 's/Vala *//'` + AS_VERSION_COMPARE(["$FOUND_VALAC_VERION"], ["$VALAC_VALADOC_REQUIRED"], [ + AC_MSG_WARN([Force disable build of valadoc, valac >= $VALAC_VALADOC_REQUIRED is required]) + enable_valadoc=no + ]) + ]) +-if test x$enable_valadoc = xyes; then ++if test x$enable_valadoc = xyes && test x$enable_graphviz = xyes; then ++ VALAFLAGS="$VALAFLAGS -D HAVE_GRAPHVIZ" + PKG_CHECK_MODULES(LIBGVC, libgvc >= $LIBGVC_REQUIRED) + AC_MSG_CHECKING([for CGRAPH]) + cgraph_tmp_LIBADD="$LIBADD" +@@ -244,6 +246,7 @@ if test x$enable_valadoc = xyes; then + fi + AM_CONDITIONAL(HAVE_CGRAPH, test "$have_cgraph" = "yes") + AM_CONDITIONAL(ENABLE_VALADOC, test x$enable_valadoc = xyes) ++AM_CONDITIONAL(ENABLE_GRAPHVIZ, test x$enable_graphviz = xyes) + + AC_PATH_PROG([G_IR_COMPILER], [g-ir-compiler], :) + AM_CONDITIONAL(HAVE_G_IR_COMPILER, test "$G_IR_COMPILER" != :) +diff --git a/libvaladoc/Makefile.am b/libvaladoc/Makefile.am +index dad9a9e99..e23266606 100644 +--- a/libvaladoc/Makefile.am ++++ b/libvaladoc/Makefile.am +@@ -119,10 +119,6 @@ libvaladoc_la_VALASOURCES = \ + content/tablerow.vala \ + content/taglet.vala \ + content/text.vala \ +- charts/chart.vala \ +- charts/chartfactory.vala \ +- charts/hierarchychart.vala \ +- charts/simplechartfactory.vala \ + parser/manyrule.vala \ + parser/oneofrule.vala \ + parser/optionalrule.vala \ +@@ -149,19 +145,34 @@ libvaladoc_la_VALASOURCES = \ + highlighter/codetoken.vala \ + highlighter/highlighter.vala \ + html/basicdoclet.vala \ +- html/htmlchartfactory.vala \ + html/linkhelper.vala \ + html/cssclassresolver.vala \ + html/htmlmarkupwriter.vala \ + html/htmlrenderer.vala \ + $(NULL) + ++if ENABLE_GRAPHVIZ ++libvaladoc_la_VALASOURCES += \ ++ charts/chart.vala \ ++ charts/chartfactory.vala \ ++ charts/hierarchychart.vala \ ++ charts/simplechartfactory.vala \ ++ html/htmlchartfactory.vala \ ++ $(NULL) ++endif ++ + libvaladoc@PACKAGE_SUFFIX@_la_SOURCES = \ + libvaladoc.vala.stamp \ + $(libvaladoc_la_VALASOURCES:.vala=.c) \ +- gvc-compat.c \ + $(NULL) + ++if ENABLE_GRAPHVIZ ++libvaladoc@PACKAGE_SUFFIX@_la_SOURCES += \ ++ gvc-compat.c ++ ++LIBGVC_PKG = --vapidir $(top_srcdir)/vapi --pkg libgvc ++endif ++ + valadoc@PACKAGE_SUFFIX@.vapi valadoc.h: libvaladoc.vala.stamp + libvaladoc.vala.stamp: $(libvaladoc_la_VALASOURCES) + $(VALA_V)$(VALAC) \ +@@ -174,7 +185,7 @@ libvaladoc.vala.stamp: $(libvaladoc_la_VALASOURCES) + --library valadoc \ + --vapi valadoc@PACKAGE_SUFFIX@.vapi \ + --vapidir $(top_srcdir)/vapi --pkg gmodule-2.0 \ +- --vapidir $(top_srcdir)/vapi --pkg libgvc \ ++ $(LIBGVC_PKG) \ + --vapidir $(top_srcdir)/gee --pkg gee \ + --vapidir $(top_srcdir)/vala --pkg vala \ + --vapidir $(top_srcdir)/ccode --pkg ccode \ +@@ -206,6 +217,9 @@ nodist_pkgconfig_DATA = valadoc@PACKAGE_SUFFIX@.pc + + valadoc@PACKAGE_SUFFIX@.pc: valadoc.pc + cp $< $@ ++if !ENABLE_GRAPHVIZ ++ sed -i "s/libgvc //g" $@ ++endif + + vapidir = $(datadir)/vala/vapi + dist_vapi_DATA = valadoc@PACKAGE_SUFFIX@.vapi +@@ -213,6 +227,9 @@ nodist_vapi_DATA = valadoc@PACKAGE_SUFFIX@.deps + + valadoc@PACKAGE_SUFFIX@.deps: valadoc.deps + cp $< $@ ++if !ENABLE_GRAPHVIZ ++ sed -i "s/libgvc//g" $@ ++endif + + EXTRA_DIST = \ + $(libvaladoc_la_VALASOURCES) \ +diff --git a/libvaladoc/html/basicdoclet.vala b/libvaladoc/html/basicdoclet.vala +index f4999efd4..03871d687 100644 +--- a/libvaladoc/html/basicdoclet.vala ++++ b/libvaladoc/html/basicdoclet.vala +@@ -46,7 +46,11 @@ public abstract class Valadoc.Html.BasicDoclet : Api.Visitor, Doclet { + protected HtmlRenderer _renderer; + protected Html.MarkupWriter writer; + protected Html.CssClassResolver cssresolver; ++#if HAVE_GRAPHVIZ + protected Charts.Factory image_factory; ++#else ++ protected void* image_factory; ++#endif + protected ErrorReporter reporter; + protected string package_list_link = "../index.html"; + +@@ -120,7 +124,9 @@ public abstract class Valadoc.Html.BasicDoclet : Api.Visitor, Doclet { + this.linker = new LinkHelper (); + + _renderer = new HtmlRenderer (settings, this.linker, this.cssresolver); ++#if HAVE_GRAPHVIZ + this.image_factory = new SimpleChartFactory (settings, linker); ++#endif + } + + +@@ -1028,6 +1034,7 @@ public abstract class Valadoc.Html.BasicDoclet : Api.Visitor, Doclet { + } + + protected void write_image_block (Api.Node element) { ++#if HAVE_GRAPHVIZ + if (element is Class || element is Interface || element is Struct) { + unowned string format = (settings.use_svg_images ? "svg" : "png"); + var chart = new Charts.Hierarchy (image_factory, element); +@@ -1047,6 +1054,7 @@ public abstract class Valadoc.Html.BasicDoclet : Api.Visitor, Doclet { + this.get_img_path_html (element, format)}); + writer.add_usemap (chart); + } ++#endif + } + + public void write_namespace_content (Namespace node, Api.Node? parent) { +diff --git a/libvaladoc/html/htmlmarkupwriter.vala b/libvaladoc/html/htmlmarkupwriter.vala +index 5aa4afdea..e79b0b8f5 100644 +--- a/libvaladoc/html/htmlmarkupwriter.vala ++++ b/libvaladoc/html/htmlmarkupwriter.vala +@@ -51,12 +51,16 @@ public class Valadoc.Html.MarkupWriter : Valadoc.MarkupWriter { + } + } + ++#if HAVE_GRAPHVIZ + public unowned MarkupWriter add_usemap (Charts.Chart chart) { + string? buf = (string?) chart.write_buffer ("cmapx"); + if (buf != null) { + raw_text ("\n"); + raw_text ((!) buf); + } ++#else ++ public unowned MarkupWriter add_usemap (void* chart) { ++#endif + + return this; + } diff --git a/nixpkgs/pkgs/development/compilers/vala/gvc-compat.patch b/nixpkgs/pkgs/development/compilers/vala/gvc-compat.patch deleted file mode 100644 index 8c0d25098f14..000000000000 --- a/nixpkgs/pkgs/development/compilers/vala/gvc-compat.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff --git i/libvaladoc/Makefile.am w/libvaladoc/Makefile.am -index 8dc398cf1..a5d8a45b4 100644 ---- i/libvaladoc/Makefile.am -+++ w/libvaladoc/Makefile.am -@@ -176,9 +176,13 @@ endif - libvaladoc@PACKAGE_SUFFIX@_la_SOURCES = \ - libvaladoc.vala.stamp \ - $(libvaladoc_la_VALASOURCES:.vala=.c) \ -- gvc-compat.c \ - $(NULL) - -+if ENABLE_GRAPHVIZ -+libvaladoc@PACKAGE_SUFFIX@_la_SOURCES += \ -+ gvc-compat.c -+endif -+ - valadoc@PACKAGE_SUFFIX@.vapi valadoc.h: libvaladoc.vala.stamp - libvaladoc.vala.stamp: $(libvaladoc_la_VALASOURCES) - $(VALA_V)$(VALAC) \ diff --git a/nixpkgs/pkgs/development/compilers/yosys/default.nix b/nixpkgs/pkgs/development/compilers/yosys/default.nix index e5504d4d5592..a25142fa9fd5 100644 --- a/nixpkgs/pkgs/development/compilers/yosys/default.nix +++ b/nixpkgs/pkgs/development/compilers/yosys/default.nix @@ -71,13 +71,13 @@ let in stdenv.mkDerivation rec { pname = "yosys"; - version = "0.29"; + version = "0.31"; src = fetchFromGitHub { owner = "YosysHQ"; repo = "yosys"; rev = "${pname}-${version}"; - hash = "sha256-qsuKXYuKsMAALIy1SjxhEhZIMO8B4MF2vmVbwqgzLyM="; + hash = "sha256-BGeqI0U2AdKgsQQw3f/C0l1ENPTlQ3Eoa8TaLRE+aWI="; }; enableParallelBuilding = true; diff --git a/nixpkgs/pkgs/development/compilers/yosys/plugin-search-dirs.patch b/nixpkgs/pkgs/development/compilers/yosys/plugin-search-dirs.patch index 0cb0aee9c7ed..354eeddbc2e1 100644 --- a/nixpkgs/pkgs/development/compilers/yosys/plugin-search-dirs.patch +++ b/nixpkgs/pkgs/development/compilers/yosys/plugin-search-dirs.patch @@ -1,34 +1,45 @@ -diff --git a/passes/cmds/plugin.cc b/passes/cmds/plugin.cc -index 3ed19497..f9534bd0 100644 ---- a/passes/cmds/plugin.cc -+++ b/passes/cmds/plugin.cc -@@ -75,8 +75,27 @@ void load_plugin(std::string filename, std::vector<std::string> aliases) - #endif +diff --git i/passes/cmds/plugin.cc w/passes/cmds/plugin.cc +index 08b4aa8c4..f00f540e9 100644 +--- i/passes/cmds/plugin.cc ++++ w/passes/cmds/plugin.cc +@@ -87,15 +87,33 @@ void load_plugin(std::string filename, std::vector<std::string> aliases) - void *hdl = dlopen(filename.c_str(), RTLD_LAZY|RTLD_LOCAL); -- if (hdl == NULL && orig_filename.find('/') == std::string::npos) -- hdl = dlopen((proc_share_dirname() + "plugins/" + orig_filename + ".so").c_str(), RTLD_LAZY|RTLD_LOCAL); -+ if (hdl == NULL && orig_filename.find('/') == std::string::npos) { -+ std::string install_dir = proc_share_dirname() + "plugins"; + // We were unable to open the file, try to do so from the plugin directory + if (hdl == NULL && orig_filename.find('/') == std::string::npos) { +- hdl = dlopen([orig_filename]() { +- std::string new_path = proc_share_dirname() + "plugins/" + orig_filename; ++ std::string install_dir = proc_share_dirname() + "plugins"; + +- // Check if we need to append .so +- if (new_path.find(".so") == std::string::npos) +- new_path.append(".so"); ++ vector<string> all_dirs; ++ all_dirs.push_back(install_dir); + +- return new_path; +- }().c_str(), RTLD_LAZY|RTLD_LOCAL); ++ char* plugin_dirs = getenv("NIX_YOSYS_PLUGIN_DIRS"); ++ if (plugin_dirs != NULL) { ++ std::string p(plugin_dirs), t; ++ std::stringstream ss(p); + -+ vector<string> all_dirs; -+ all_dirs.push_back(install_dir); ++ while(std::getline(ss, t, ':')) { ++ all_dirs.push_back(t); ++ } ++ } + -+ char* plugin_dirs = getenv("NIX_YOSYS_PLUGIN_DIRS"); -+ if (plugin_dirs != NULL) { -+ std::string p(plugin_dirs), t; -+ std::stringstream ss(p); ++ for (auto dir : all_dirs) { ++ hdl = dlopen([dir, orig_filename]() { ++ std::string new_path = dir + "/" + orig_filename; + -+ while(std::getline(ss, t, ':')) { -+ all_dirs.push_back(t); -+ } -+ } ++ // Check if we need to append .so ++ if (new_path.find(".so") == std::string::npos) ++ new_path.append(".so"); + -+ for (auto dir : all_dirs) { -+ hdl = dlopen((dir + "/" + orig_filename + ".so").c_str(), RTLD_LAZY|RTLD_LOCAL); -+ if (hdl != NULL) break; -+ } -+ } - if (hdl == NULL) - log_cmd_error("Can't load module `%s': %s\n", filename.c_str(), dlerror()); - loaded_plugins[orig_filename] = hdl; ++ return new_path; ++ }().c_str(), RTLD_LAZY|RTLD_LOCAL); ++ if (hdl != NULL) break; ++ } + } + + if (hdl == NULL) diff --git a/nixpkgs/pkgs/development/compilers/zig/0.10.nix b/nixpkgs/pkgs/development/compilers/zig/0.10.nix index a6e253adde66..c21a51afa5b3 100644 --- a/nixpkgs/pkgs/development/compilers/zig/0.10.nix +++ b/nixpkgs/pkgs/development/compilers/zig/0.10.nix @@ -2,38 +2,18 @@ , stdenv , fetchFromGitHub , cmake -, coreutils , llvmPackages , libxml2 , zlib -}: +, coreutils +}@args: -stdenv.mkDerivation rec { - pname = "zig"; +import ./generic.nix args { version = "0.10.1"; - outputs = [ "out" "doc" ]; - src = fetchFromGitHub { - owner = "ziglang"; - repo = pname; - rev = version; - hash = "sha256-69QIkkKzApOGfrBdgtmxFMDytRkSh+0YiaJQPbXsBeo="; - }; + hash = "sha256-69QIkkKzApOGfrBdgtmxFMDytRkSh+0YiaJQPbXsBeo="; - nativeBuildInputs = [ - cmake - llvmPackages.llvm.dev - ]; - - buildInputs = [ - coreutils - libxml2 - zlib - ] ++ (with llvmPackages; [ - libclang - lld - llvm - ]); + outputs = [ "out" "doc" ]; patches = [ # Backport alignment related panics from zig-master to 0.10. @@ -41,16 +21,6 @@ stdenv.mkDerivation rec { ./zig_14559.patch ]; - preBuild = '' - export HOME=$TMPDIR; - ''; - - postPatch = '' - # Zig's build looks at /usr/bin/env to find dynamic linking info. This - # doesn't work in Nix' sandbox. Use env from our coreutils instead. - substituteInPlace lib/std/zig/system/NativeTargetInfo.zig --replace "/usr/bin/env" "${coreutils}/bin/env" - ''; - cmakeFlags = [ # file RPATH_CHANGE could not write new RPATH "-DCMAKE_SKIP_BUILD_RPATH=ON" @@ -63,26 +33,10 @@ stdenv.mkDerivation rec { ]; postBuild = '' - ./zig2 build-exe ../doc/docgen.zig - ./docgen ./zig2 ../doc/langref.html.in ./langref.html + ./zig2 run ../doc/docgen.zig -- ./zig2 ../doc/langref.html.in langref.html ''; - doCheck = true; - postInstall = '' - install -Dm644 -t $doc/share/doc/$pname-$version/html ./langref.html + install -Dm644 -t $doc/share/doc/zig-$version/html ./langref.html ''; - - installCheckPhase = '' - $out/bin/zig test --cache-dir "$TMPDIR" -I $src/test $src/test/behavior.zig - ''; - - meta = with lib; { - homepage = "https://ziglang.org/"; - description = - "General-purpose programming language and toolchain for maintaining robust, optimal, and reusable software"; - license = licenses.mit; - maintainers = with maintainers; [ aiotter andrewrk AndersonTorres ]; - platforms = platforms.unix; - }; } diff --git a/nixpkgs/pkgs/development/compilers/zig/0.11.nix b/nixpkgs/pkgs/development/compilers/zig/0.11.nix new file mode 100644 index 000000000000..7c4fcedc0538 --- /dev/null +++ b/nixpkgs/pkgs/development/compilers/zig/0.11.nix @@ -0,0 +1,36 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, llvmPackages +, libxml2 +, zlib +, coreutils +}@args: + +import ./generic.nix args { + version = "0.11.0"; + + hash = "sha256-iuU1fzkbJxI+0N1PiLQM013Pd1bzrgqkbIyTxo5gB2I="; + + outputs = [ "out" "doc" ]; + + cmakeFlags = [ + # file RPATH_CHANGE could not write new RPATH + "-DCMAKE_SKIP_BUILD_RPATH=ON" + + # always link against static build of LLVM + "-DZIG_STATIC_LLVM=ON" + + # ensure determinism in the compiler build + "-DZIG_TARGET_MCPU=baseline" + ]; + + postBuild = '' + stage3/bin/zig run ../tools/docgen.zig -- ../doc/langref.html.in langref.html --zig $PWD/stage3/bin/zig + ''; + + postInstall = '' + install -Dm444 -t $doc/share/doc/zig-$version/html langref.html + ''; +} diff --git a/nixpkgs/pkgs/development/compilers/zig/0.9.1.nix b/nixpkgs/pkgs/development/compilers/zig/0.9.1.nix index 637186f686e9..a05d5ae893cf 100644 --- a/nixpkgs/pkgs/development/compilers/zig/0.9.1.nix +++ b/nixpkgs/pkgs/development/compilers/zig/0.9.1.nix @@ -5,26 +5,13 @@ , llvmPackages , libxml2 , zlib -}: +, coreutils +}@args: -let - zig_0_10_0 = fetchFromGitHub { - owner = "ziglang"; - repo = "zig"; - rev = "0.10.0"; - hash = "sha256-DNs937N7PLQimuM2anya4npYXcj6cyH+dRS7AiOX7tw="; - }; -in -stdenv.mkDerivation rec { - pname = "zig"; +import ./generic.nix args { version = "0.9.1"; - src = fetchFromGitHub { - owner = "ziglang"; - repo = pname; - rev = version; - hash = "sha256-x2c4c9RSrNWGqEngio4ArW7dJjW0gg+8nqBwPcR721k="; - }; + hash = "sha256-x2c4c9RSrNWGqEngio4ArW7dJjW0gg+8nqBwPcR721k="; patches = [ # Fix index out of bounds reading RPATH (cherry-picked from 0.10-dev) @@ -34,30 +21,21 @@ stdenv.mkDerivation rec { ]; # TODO: remove on next upgrade - prePatch = '' - cp -R ${zig_0_10_0}/lib/libc/include/any-macos.13-any lib/libc/include/any-macos.13-any - cp -R ${zig_0_10_0}/lib/libc/include/aarch64-macos.13-none lib/libc/include/aarch64-macos.13-gnu - cp -R ${zig_0_10_0}/lib/libc/include/x86_64-macos.13-none lib/libc/include/x86_64-macos.13-gnu - cp ${zig_0_10_0}/lib/libc/darwin/libSystem.13.tbd lib/libc/darwin/ - ''; - - nativeBuildInputs = [ - cmake - llvmPackages.llvm.dev - ]; - - buildInputs = [ - libxml2 - zlib - ] ++ (with llvmPackages; [ - libclang - lld - llvm - ]); - - preBuild = '' - export HOME=$TMPDIR; - ''; + prePatch = + let + zig_0_10_0 = fetchFromGitHub { + owner = "ziglang"; + repo = "zig"; + rev = "0.10.0"; + hash = "sha256-DNs937N7PLQimuM2anya4npYXcj6cyH+dRS7AiOX7tw="; + }; + in + '' + cp -R ${zig_0_10_0}/lib/libc/include/any-macos.13-any lib/libc/include/any-macos.13-any + cp -R ${zig_0_10_0}/lib/libc/include/aarch64-macos.13-none lib/libc/include/aarch64-macos.13-gnu + cp -R ${zig_0_10_0}/lib/libc/include/x86_64-macos.13-none lib/libc/include/x86_64-macos.13-gnu + cp ${zig_0_10_0}/lib/libc/darwin/libSystem.13.tbd lib/libc/darwin/ + ''; cmakeFlags = [ # file RPATH_CHANGE could not write new RPATH @@ -66,20 +44,4 @@ stdenv.mkDerivation rec { # ensure determinism in the compiler build "-DZIG_TARGET_MCPU=baseline" ]; - - doCheck = true; - checkPhase = '' - runHook preCheck - ./zig test --cache-dir "$TMPDIR" -I $src/test $src/test/behavior.zig - runHook postCheck - ''; - - meta = with lib; { - homepage = "https://ziglang.org/"; - description = - "General-purpose programming language and toolchain for maintaining robust, optimal, and reusable software"; - license = licenses.mit; - maintainers = with maintainers; [ aiotter andrewrk AndersonTorres ]; - platforms = platforms.unix; - }; } diff --git a/nixpkgs/pkgs/development/compilers/zig/generic.nix b/nixpkgs/pkgs/development/compilers/zig/generic.nix new file mode 100644 index 000000000000..5cc75cbbf6eb --- /dev/null +++ b/nixpkgs/pkgs/development/compilers/zig/generic.nix @@ -0,0 +1,64 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, llvmPackages +, libxml2 +, zlib +, coreutils +, ... +}: + +args: + +stdenv.mkDerivation (finalAttrs: { + pname = "zig"; + + src = fetchFromGitHub { + owner = "ziglang"; + repo = "zig"; + rev = finalAttrs.version; + inherit (args) hash; + }; + + nativeBuildInputs = [ + cmake + llvmPackages.llvm.dev + ]; + + buildInputs = [ + libxml2 + zlib + ] ++ (with llvmPackages; [ + libclang + lld + llvm + ]); + + env.ZIG_GLOBAL_CACHE_DIR = "$TMPDIR/zig-cache"; + + # Zig's build looks at /usr/bin/env to find dynamic linking info. This doesn't + # work in Nix's sandbox. Use env from our coreutils instead. + postPatch = '' + substituteInPlace lib/std/zig/system/NativeTargetInfo.zig \ + --replace "/usr/bin/env" "${coreutils}/bin/env" + ''; + + doInstallCheck = true; + installCheckPhase = '' + runHook preInstallCheck + + $out/bin/zig test --cache-dir "$TMPDIR/zig-test-cache" -I $src/test $src/test/behavior.zig + + runHook postInstallCheck + ''; + + meta = { + description = "General-purpose programming language and toolchain for maintaining robust, optimal, and reusable software"; + homepage = "https://ziglang.org/"; + changelog = "https://ziglang.org/download/${finalAttrs.version}/release-notes.html"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ aiotter andrewrk AndersonTorres figsoda ]; + platforms = lib.platforms.unix; + }; +} // removeAttrs args [ "hash" ]) diff --git a/nixpkgs/pkgs/development/compilers/zig/hook.nix b/nixpkgs/pkgs/development/compilers/zig/hook.nix new file mode 100644 index 000000000000..df6304a34378 --- /dev/null +++ b/nixpkgs/pkgs/development/compilers/zig/hook.nix @@ -0,0 +1,17 @@ +{ lib +, makeSetupHook +, zig +}: + +makeSetupHook { + name = "zig-hook"; + + propagatedBuildInputs = [ zig ]; + + passthru = { inherit zig; }; + + meta = { + description = "A setup hook for using the Zig compiler in Nixpkgs"; + inherit (zig.meta) maintainers platforms broken; + }; +} ./setup-hook.sh diff --git a/nixpkgs/pkgs/development/compilers/zig/setup-hook.sh b/nixpkgs/pkgs/development/compilers/zig/setup-hook.sh new file mode 100644 index 000000000000..f514180692ea --- /dev/null +++ b/nixpkgs/pkgs/development/compilers/zig/setup-hook.sh @@ -0,0 +1,90 @@ +# shellcheck shell=bash disable=SC2154,SC2086 + +# This readonly zigDefaultBuildFlagsArray below is meant to avoid CPU feature +# impurity in Nixpkgs. However, this flagset is "unstable": it is specifically +# meant to be controlled by the upstream development team - being up to that +# team exposing or not that flags to the outside (especially the package manager +# teams). + +# Because of this hurdle, @andrewrk from Zig Software Foundation proposed some +# solutions for this issue. Hopefully they will be implemented in future +# releases of Zig. When this happens, this flagset should be revisited +# accordingly. + +# Below are some useful links describing the discovery process of this 'bug' in +# Nixpkgs: + +# https://github.com/NixOS/nixpkgs/issues/169461 +# https://github.com/NixOS/nixpkgs/issues/185644 +# https://github.com/NixOS/nixpkgs/pull/197046 +# https://github.com/NixOS/nixpkgs/pull/241741#issuecomment-1624227485 +# https://github.com/ziglang/zig/issues/14281#issuecomment-1624220653 + +readonly zigDefaultFlagsArray=("-Drelease-safe=true" "-Dcpu=baseline") + +function zigSetGlobalCacheDir { + ZIG_GLOBAL_CACHE_DIR=$(mktemp -d) + export ZIG_GLOBAL_CACHE_DIR +} + +function zigBuildPhase { + runHook preBuild + + local flagsArray=( + "${zigDefaultFlagsArray[@]}" + $zigBuildFlags "${zigBuildFlagsArray[@]}" + ) + + echoCmd 'build flags' "${flagsArray[@]}" + zig build "${flagsArray[@]}" + + runHook postBuild +} + +function zigCheckPhase { + runHook preCheck + + local flagsArray=( + "${zigDefaultFlagsArray[@]}" + $zigCheckFlags "${zigCheckFlagsArray[@]}" + ) + + echoCmd 'check flags' "${flagsArray[@]}" + zig build test "${flagsArray[@]}" + + runHook postCheck +} + +function zigInstallPhase { + runHook preInstall + + local flagsArray=( + "${zigDefaultFlagsArray[@]}" + $zigBuildFlags "${zigBuildFlagsArray[@]}" + $zigInstallFlags "${zigInstallFlagsArray[@]}" + ) + + if [ -z "${dontAddPrefix-}" ]; then + # Zig does not recognize `--prefix=/dir/`, only `--prefix /dir/` + flagsArray+=("${prefixKey:---prefix}" "$prefix") + fi + + echoCmd 'install flags' "${flagsArray[@]}" + zig build install "${flagsArray[@]}" + + runHook postInstall +} + +addEnvHooks "$targetOffset" zigSetGlobalCacheDir + +if [ -z "${dontUseZigBuild-}" ] && [ -z "${buildPhase-}" ]; then + buildPhase=zigBuildPhase +fi + +if [ -z "${dontUseZigCheck-}" ] && [ -z "${checkPhase-}" ]; then + checkPhase=zigCheckPhase +fi + +if [ -z "${dontUseZigInstall-}" ] && [ -z "${installPhase-}" ]; then + installPhase=zigInstallPhase +fi |