From 3a3e7904b74518fa7f0e8edacdd00e7e505fde1d Mon Sep 17 00:00:00 2001 From: Florian Brandes Date: Wed, 20 Nov 2024 16:24:15 +0100 Subject: [PATCH 001/343] python312Packages.mongomock: 4.2.0.post1 -> 4.3.0 Signed-off-by: Florian Brandes --- pkgs/development/python-modules/mongomock/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mongomock/default.nix b/pkgs/development/python-modules/mongomock/default.nix index 608422286622d..1dbe742f04711 100644 --- a/pkgs/development/python-modules/mongomock/default.nix +++ b/pkgs/development/python-modules/mongomock/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "mongomock"; - version = "4.2.0.post1"; + version = "4.3.0"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-kkHSzscnS5c22+jtrLGVKP9mrzs3ebMk157MQgEifzE="; + hash = "sha256-MmZ7eQZvq8EtTxfxao/XNhtfRDUgizujLCJuUiEqjDA="; }; build-system = [ From becb2fa1523e7e446698e613141d6c975f70555c Mon Sep 17 00:00:00 2001 From: Arnout Engelen Date: Fri, 27 Dec 2024 18:45:06 +0100 Subject: [PATCH 002/343] temurin-bin: minor updates as generated with ./generate-sources.py --- .../compilers/temurin-bin/sources.json | 640 +++++++++--------- 1 file changed, 320 insertions(+), 320 deletions(-) diff --git a/pkgs/development/compilers/temurin-bin/sources.json b/pkgs/development/compilers/temurin-bin/sources.json index 9443eb45f401d..225c244e3cfc1 100644 --- a/pkgs/development/compilers/temurin-bin/sources.json +++ b/pkgs/development/compilers/temurin-bin/sources.json @@ -6,62 +6,62 @@ "packageType": "jdk", "vmType": "hotspot", "x86_64": { - "build": "8", - "sha256": "ae988c72eeb2d78bb729a3387601ce0ea84305734ebdbe95d276f39952a8e019", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.24%2B8/OpenJDK11U-jdk_x64_alpine-linux_hotspot_11.0.24_8.tar.gz", - "version": "11.0.24" + "build": "9", + "sha256": "0a431310ccccc36c85b1274b5d31e368fdc8cf62cb7c2ed98d7b59eb5a13dc82", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.25%2B9/OpenJDK11U-jdk_x64_alpine-linux_hotspot_11.0.25_9.tar.gz", + "version": "11.0.25" } }, "openjdk17": { "packageType": "jdk", "vmType": "hotspot", "x86_64": { - "build": "7", - "sha256": "6d274a292a717a6f8d00a3ed0695497405c5c634c27fec1692dd13784f6ff6fa", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.12%2B7/OpenJDK17U-jdk_x64_alpine-linux_hotspot_17.0.12_7.tar.gz", - "version": "17.0.12" + "build": "11", + "sha256": "67632ee4563e9827b56f62ab6da95bce200d9e82092b211988c0d2113abc4071", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.13%2B11/OpenJDK17U-jdk_x64_alpine-linux_hotspot_17.0.13_11.tar.gz", + "version": "17.0.13" } }, "openjdk21": { "aarch64": { - "build": "7", - "sha256": "849c6d5a62a1f3dc2a3d2d7be07ffda089d35b862f6160b2a288c0408c2d8be8", - "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.4%2B7/OpenJDK21U-jdk_aarch64_alpine-linux_hotspot_21.0.4_7.tar.gz", - "version": "21.0.4" + "build": "11", + "sha256": "f22e32b869dd0e5e3f248646f62bffaa307b360299488ac8764e622923d7e747", + "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.5%2B11/OpenJDK21U-jdk_aarch64_alpine-linux_hotspot_21.0.5_11.tar.gz", + "version": "21.0.5" }, "packageType": "jdk", "vmType": "hotspot", "x86_64": { - "build": "7", - "sha256": "8fa232fc9de5a861c1a6b0cbdc861d0b0a2bdbdd27da53d991802a460a7f0973", - "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.4%2B7/OpenJDK21U-jdk_x64_alpine-linux_hotspot_21.0.4_7.tar.gz", - "version": "21.0.4" + "build": "11", + "sha256": "8da7da49101d45f646272616f20e8b10d57472bbf5961d64ffb07d7ba93c6909", + "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.5%2B11/OpenJDK21U-jdk_x64_alpine-linux_hotspot_21.0.5_11.tar.gz", + "version": "21.0.5" } }, "openjdk23": { "aarch64": { - "build": "37", - "sha256": "7e842c9b8a44a5a21d83a3e38ae3b141cfbdb429dde70ff264d3da4bff44e1c7", - "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23%2B37/OpenJDK23U-jdk_aarch64_alpine-linux_hotspot_23_37.tar.gz", - "version": "23.0.0" + "build": "11", + "sha256": "ebdd6602d27bd7535bf06f21e8a0c3d563be7b790a90bef00cb6ac4123c66f86", + "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.1%2B11/OpenJDK23U-jdk_aarch64_alpine-linux_hotspot_23.0.1_11.tar.gz", + "version": "23.0.1" }, "packageType": "jdk", "vmType": "hotspot", "x86_64": { - "build": "37", - "sha256": "bff4c78f30d8d173e622bf2f40c36113df47337fc6d1ee5105ed2459841165aa", - "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23%2B37/OpenJDK23U-jdk_x64_alpine-linux_hotspot_23_37.tar.gz", - "version": "23.0.0" + "build": "11", + "sha256": "4c37a9e885c4e099b049c3ba9baa073de1525e28cd5ffca016c5c5bd7ed385a6", + "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.1%2B11/OpenJDK23U-jdk_x64_alpine-linux_hotspot_23.0.1_11.tar.gz", + "version": "23.0.1" } }, "openjdk8": { "packageType": "jdk", "vmType": "hotspot", "x86_64": { - "build": "5", - "sha256": "525a7731331cad502b9293ccb4ac2b13e85516736e98a57cb27c2767005188e1", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u422-b05/OpenJDK8U-jdk_x64_alpine-linux_hotspot_8u422b05.tar.gz", - "version": "8.0.422" + "build": "6", + "sha256": "86071bc98901cae80c62745a64bb4486212985fe5b66b5aec36ce92e8a036a9d", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u432-b06/OpenJDK8U-jdk_x64_alpine-linux_hotspot_8u432b06.tar.gz", + "version": "8.0.432" } } }, @@ -70,62 +70,62 @@ "packageType": "jre", "vmType": "hotspot", "x86_64": { - "build": "8", - "sha256": "0ac795729cc11f47323a71713eac2a5b22d4615fd9b66c8766f964c03fb6e160", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.24%2B8/OpenJDK11U-jre_x64_alpine-linux_hotspot_11.0.24_8.tar.gz", - "version": "11.0.24" + "build": "9", + "sha256": "905e35f14228904d67a7a56f9f0b8ede58e9b15f9af3a3d54fb86f78c8e47a34", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.25%2B9/OpenJDK11U-jre_x64_alpine-linux_hotspot_11.0.25_9.tar.gz", + "version": "11.0.25" } }, "openjdk17": { "packageType": "jre", "vmType": "hotspot", "x86_64": { - "build": "7", - "sha256": "63bae276cc322532b451ae7473127c92a75db16cc95473577f133cd09349822a", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.12%2B7/OpenJDK17U-jre_x64_alpine-linux_hotspot_17.0.12_7.tar.gz", - "version": "17.0.12" + "build": "11", + "sha256": "7a2df4e2f86eca649af1e17d990ab8e354cb6dee389606025b9d05f75623c388", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.13%2B11/OpenJDK17U-jre_x64_alpine-linux_hotspot_17.0.13_11.tar.gz", + "version": "17.0.13" } }, "openjdk21": { "aarch64": { - "build": "7", - "sha256": "f9410264235861deaf30f97bec80870cf3bc38b1d8e57d897d8bb1f706ae6705", - "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.4%2B7/OpenJDK21U-jre_aarch64_alpine-linux_hotspot_21.0.4_7.tar.gz", - "version": "21.0.4" + "build": "11", + "sha256": "12b988a3d934e3eb89c6a981a93f8e2adf0a62cc9030487dee76c0c29b93714d", + "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.5%2B11/OpenJDK21U-jre_aarch64_alpine-linux_hotspot_21.0.5_11.tar.gz", + "version": "21.0.5" }, "packageType": "jre", "vmType": "hotspot", "x86_64": { - "build": "7", - "sha256": "0dfd0ebab44d777f65bceaff7f79e8e0b9deb74a5eb166922483f1864bcf2052", - "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.4%2B7/OpenJDK21U-jre_x64_alpine-linux_hotspot_21.0.4_7.tar.gz", - "version": "21.0.4" + "build": "11", + "sha256": "2dfa33fb8e9474e6967c6cf17964abb5ddce9c17fa6a9f8d7aa221a0ae295df9", + "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.5%2B11/OpenJDK21U-jre_x64_alpine-linux_hotspot_21.0.5_11.tar.gz", + "version": "21.0.5" } }, "openjdk23": { "aarch64": { - "build": "37", - "sha256": "858aa6b255164e535e2fd6cc8dfbf129327a9126ebb9e8f24115c2089efd36f3", - "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23%2B37/OpenJDK23U-jre_aarch64_alpine-linux_hotspot_23_37.tar.gz", - "version": "23.0.0" + "build": "11", + "sha256": "b56eaedc094cb9107be2d5be9ad34c3dd9492c45aa671d102b5829a488cfc744", + "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.1%2B11/OpenJDK23U-jre_aarch64_alpine-linux_hotspot_23.0.1_11.tar.gz", + "version": "23.0.1" }, "packageType": "jre", "vmType": "hotspot", "x86_64": { - "build": "37", - "sha256": "7acbc972b0dd84ca10ec6f192b20e76445a22f4c5558e1657ff393e4868e9343", - "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23%2B37/OpenJDK23U-jre_x64_alpine-linux_hotspot_23_37.tar.gz", - "version": "23.0.0" + "build": "11", + "sha256": "38a1b20b5ee8869b20e9f9aefdc91eedf245584d35287842a66540f0745dd3d0", + "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.1%2B11/OpenJDK23U-jre_x64_alpine-linux_hotspot_23.0.1_11.tar.gz", + "version": "23.0.1" } }, "openjdk8": { "packageType": "jre", "vmType": "hotspot", "x86_64": { - "build": "5", - "sha256": "9a7a939638b9cdaa8e1a119b8f21bfdd4cb2390b8a47cc27ccf9effc90f4b437", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u422-b05/OpenJDK8U-jre_x64_alpine-linux_hotspot_8u422b05.tar.gz", - "version": "8.0.422" + "build": "6", + "sha256": "7f7c265560dd5a42533bf282831d7d2f044a7ff7f4c310b40a0f9f8e19ff12e5", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u432-b06/OpenJDK8U-jre_x64_alpine-linux_hotspot_8u432b06.tar.gz", + "version": "8.0.432" } } } @@ -134,332 +134,332 @@ "jdk": { "openjdk11": { "aarch64": { - "build": "8", - "sha256": "04e21301fedc76841fb03929ac6cacfbbda30b5693acfd515a8f34d4a0cdeb28", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.24%2B8/OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.24_8.tar.gz", - "version": "11.0.24" + "build": "9", + "sha256": "f2087cc3abdd509b74facf8e43e81e36244d14c70dec080b8f3a662695417ca7", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.25%2B9/OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.25_9.tar.gz", + "version": "11.0.25" }, "armv6l": { - "build": "8", - "sha256": "9d14a076d1440161ab4c9736644e8e9f4719eb8e9f44c03470640960c3cd5e00", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.24%2B8/OpenJDK11U-jdk_arm_linux_hotspot_11.0.24_8.tar.gz", - "version": "11.0.24" + "build": "9", + "sha256": "6bdd7da08c9f8fedded8da0411b6566c16cb9a904d164b68a0b7f11c8376673a", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.25%2B9/OpenJDK11U-jdk_arm_linux_hotspot_11.0.25_9.tar.gz", + "version": "11.0.25" }, "armv7l": { - "build": "8", - "sha256": "9d14a076d1440161ab4c9736644e8e9f4719eb8e9f44c03470640960c3cd5e00", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.24%2B8/OpenJDK11U-jdk_arm_linux_hotspot_11.0.24_8.tar.gz", - "version": "11.0.24" + "build": "9", + "sha256": "6bdd7da08c9f8fedded8da0411b6566c16cb9a904d164b68a0b7f11c8376673a", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.25%2B9/OpenJDK11U-jdk_arm_linux_hotspot_11.0.25_9.tar.gz", + "version": "11.0.25" }, "packageType": "jdk", "powerpc64le": { - "build": "8", - "sha256": "4dfdc498938a159c592a2f094576f09c94999e17327c1f5ff81794694992054d", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.24%2B8/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.24_8.tar.gz", - "version": "11.0.24" + "build": "9", + "sha256": "0014ffdae26d2b8f840b4842e3f9d4edc3576b4a961770708273d8ecc86ba5b6", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.25%2B9/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.25_9.tar.gz", + "version": "11.0.25" }, "vmType": "hotspot", "x86_64": { - "build": "8", - "sha256": "0e71a01563a5c7b9988a168b0c4ce720a6dff966b3c27bb29d1ded461ff71d0e", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.24%2B8/OpenJDK11U-jdk_x64_linux_hotspot_11.0.24_8.tar.gz", - "version": "11.0.24" + "build": "9", + "sha256": "191baa2e052627614022171400a917d28f0987dc54da48aaf07b06f552bb9884", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.25%2B9/OpenJDK11U-jdk_x64_linux_hotspot_11.0.25_9.tar.gz", + "version": "11.0.25" } }, "openjdk17": { "aarch64": { - "build": "7", - "sha256": "8257de06bf37f0c8f19f8d542e2ab5a4e17db3ca5f29d041bd0b02ab265db021", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.12%2B7/OpenJDK17U-jdk_aarch64_linux_hotspot_17.0.12_7.tar.gz", - "version": "17.0.12" + "build": "11", + "sha256": "0c17fa4f14c0d2cc9e9334f996fccdddc5da4459d768f3105c7ff0283c47bf62", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.13%2B11/OpenJDK17U-jdk_aarch64_linux_hotspot_17.0.13_11.tar.gz", + "version": "17.0.13" }, "armv6l": { - "build": "7", - "sha256": "ce7873ebf40ed0eb1089941ead4d3af79a205b1264f3162860d26ae957572b74", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.12%2B7/OpenJDK17U-jdk_arm_linux_hotspot_17.0.12_7.tar.gz", - "version": "17.0.12" + "build": "11", + "sha256": "e69d43be937e05dbccae4cc98f732ed86aa11993234bf5ad6e81c30475a78ce7", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.13%2B11/OpenJDK17U-jdk_arm_linux_hotspot_17.0.13_11.tar.gz", + "version": "17.0.13" }, "armv7l": { - "build": "7", - "sha256": "ce7873ebf40ed0eb1089941ead4d3af79a205b1264f3162860d26ae957572b74", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.12%2B7/OpenJDK17U-jdk_arm_linux_hotspot_17.0.12_7.tar.gz", - "version": "17.0.12" + "build": "11", + "sha256": "e69d43be937e05dbccae4cc98f732ed86aa11993234bf5ad6e81c30475a78ce7", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.13%2B11/OpenJDK17U-jdk_arm_linux_hotspot_17.0.13_11.tar.gz", + "version": "17.0.13" }, "packageType": "jdk", "powerpc64le": { - "build": "7", - "sha256": "c97988e5a99b8ae0c47ba330b0883398c7433312db0051d8c5ff97911bae1605", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.12%2B7/OpenJDK17U-jdk_ppc64le_linux_hotspot_17.0.12_7.tar.gz", - "version": "17.0.12" + "build": "11", + "sha256": "d4e553c6fa7afdfe2577420c6e77a558db8113a3cef84e755384148f5610834e", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.13%2B11/OpenJDK17U-jdk_ppc64le_linux_hotspot_17.0.13_11.tar.gz", + "version": "17.0.13" }, "riscv64": { - "build": "7", - "sha256": "d024c100eba4709970716ddcac757ba5e3122a8ff9c6f539ff8bac5b47f51f3a", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.12%2B7/OpenJDK17U-jdk_riscv64_linux_hotspot_17.0.12_7.tar.gz", - "version": "17.0.12" + "build": "11", + "sha256": "e7c82833a7381a05cae2be0e947c08e971bbae4f2e4142c6ec87bbd7530a5646", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.13%2B11/OpenJDK17U-jdk_riscv64_linux_hotspot_17.0.13_11.tar.gz", + "version": "17.0.13" }, "vmType": "hotspot", "x86_64": { - "build": "7", - "sha256": "9d4dd339bf7e6a9dcba8347661603b74c61ab2a5083ae67bf76da6285da8a778", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.12%2B7/OpenJDK17U-jdk_x64_linux_hotspot_17.0.12_7.tar.gz", - "version": "17.0.12" + "build": "11", + "sha256": "8682892fc02965930b9022c066fa164dd6f458ef4a5dc262016aa28333b30f49", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.13%2B11/OpenJDK17U-jdk_x64_linux_hotspot_17.0.13_11.tar.gz", + "version": "17.0.13" } }, "openjdk21": { "aarch64": { - "build": "7", - "sha256": "d768eecddd7a515711659e02caef8516b7b7177fa34880a56398fd9822593a79", - "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.4%2B7/OpenJDK21U-jdk_aarch64_linux_hotspot_21.0.4_7.tar.gz", - "version": "21.0.4" + "build": "11", + "sha256": "6482639ed9fd22aa2e704cc366848b1b3e1586d2bf1213869c43e80bca58fe5c", + "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.5%2B11/OpenJDK21U-jdk_aarch64_linux_hotspot_21.0.5_11.tar.gz", + "version": "21.0.5" }, "packageType": "jdk", "powerpc64le": { - "build": "7", - "sha256": "c208cd0fb90560644a90f928667d2f53bfe408c957a5e36206585ad874427761", - "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.4%2B7/OpenJDK21U-jdk_ppc64le_linux_hotspot_21.0.4_7.tar.gz", - "version": "21.0.4" + "build": "11", + "sha256": "3c6f4c358facfb6c19d90faf02bfe0fc7512d6b0e80ac18146bbd7e0d01deeef", + "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.5%2B11/OpenJDK21U-jdk_ppc64le_linux_hotspot_21.0.5_11.tar.gz", + "version": "21.0.5" }, "riscv64": { - "build": "7", - "sha256": "b04fd7f52d18268a935f1a7144dae802b25db600ec97156ddd46b3100cbd13da", - "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.4%2B7/OpenJDK21U-jdk_riscv64_linux_hotspot_21.0.4_7.tar.gz", - "version": "21.0.4" + "build": "11", + "sha256": "2f1b3e401e36de803398dfb9818861f9f14ca8ae7db650ea0946ab048fefe3b9", + "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.5%2B11/OpenJDK21U-jdk_riscv64_linux_hotspot_21.0.5_11.tar.gz", + "version": "21.0.5" }, "vmType": "hotspot", "x86_64": { - "build": "7", - "sha256": "51fb4d03a4429c39d397d3a03a779077159317616550e4e71624c9843083e7b9", - "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.4%2B7/OpenJDK21U-jdk_x64_linux_hotspot_21.0.4_7.tar.gz", - "version": "21.0.4" + "build": "11", + "sha256": "3c654d98404c073b8a7e66bffb27f4ae3e7ede47d13284c132d40a83144bfd8c", + "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.5%2B11/OpenJDK21U-jdk_x64_linux_hotspot_21.0.5_11.tar.gz", + "version": "21.0.5" } }, "openjdk23": { "aarch64": { - "build": "37", - "sha256": "e8043d1bd9c4f42c5cf7883aca1fc3ef6bcccf4a664f378818ac0fd4fb987b7e", - "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23%2B37/OpenJDK23U-jdk_aarch64_linux_hotspot_23_37.tar.gz", - "version": "23.0.0" + "build": "11", + "sha256": "808e3843293e50515bf02ad2f956e543da65e32dac82ae7a266a147b3485c61a", + "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.1%2B11/OpenJDK23U-jdk_aarch64_linux_hotspot_23.0.1_11.tar.gz", + "version": "23.0.1" }, "packageType": "jdk", "powerpc64le": { - "build": "37", - "sha256": "4d3b0609c783dea1f6a899bfc8c84b4000d1f48f39e2489d70050bbf2c7f7d9c", - "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23%2B37/OpenJDK23U-jdk_ppc64le_linux_hotspot_23_37.tar.gz", - "version": "23.0.0" + "build": "11", + "sha256": "1885ab141fe7b8ed6beb77b814b1c1c99fd54713399bf917edb6a4020545adde", + "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.1%2B11/OpenJDK23U-jdk_ppc64le_linux_hotspot_23.0.1_11.tar.gz", + "version": "23.0.1" }, "riscv64": { - "build": "37", - "sha256": "d401699a92469de7bfb72909c1d11019537a0a2c21af01a8dce1831f09ef5165", - "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23%2B37/OpenJDK23U-jdk_riscv64_linux_hotspot_23_37.tar.gz", - "version": "23.0.0" + "build": "11", + "sha256": "80d7bab9f9614bdf934c6bc441031bd1fead3aea85f16770123bd8a6bcdc52b6", + "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.1%2B11/OpenJDK23U-jdk_riscv64_linux_hotspot_23.0.1_11.tar.gz", + "version": "23.0.1" }, "vmType": "hotspot", "x86_64": { - "build": "37", - "sha256": "630c4f3870056e7e005736ec1edc34ee63a9b45e2027582c52f53a9bf44314b8", - "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23%2B37/OpenJDK23U-jdk_x64_linux_hotspot_23_37.tar.gz", - "version": "23.0.0" + "build": "11", + "sha256": "2400267e4e9c0f6ae880a4d763af6caf18c673714bdee5debf8388b0b5d52886", + "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.1%2B11/OpenJDK23U-jdk_x64_linux_hotspot_23.0.1_11.tar.gz", + "version": "23.0.1" } }, "openjdk8": { "aarch64": { - "build": "5", - "sha256": "af98a839ec238106078bd360af9e405dc6665c05ee837178ed13b92193681923", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u422-b05/OpenJDK8U-jdk_aarch64_linux_hotspot_8u422b05.tar.gz", - "version": "8.0.422" + "build": "6", + "sha256": "383caabc20428e9500f2e07965317ed4387a0e336104483e29a9e06eeffbf26b", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u432-b06/OpenJDK8U-jdk_aarch64_linux_hotspot_8u432b06.tar.gz", + "version": "8.0.432" }, "armv6l": { - "build": "5", - "sha256": "5bd0203b2b09b033e3a762299a4975939d7571b433eab8b59340cc966102bef1", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u422-b05/OpenJDK8U-jdk_arm_linux_hotspot_8u422b05.tar.gz", - "version": "8.0.422" + "build": "6", + "sha256": "ff1ce3f6f1cf11987ab63f278b29cf1aae799652606c547f8a590e7acbd16b61", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u432-b06/OpenJDK8U-jdk_arm_linux_hotspot_8u432b06.tar.gz", + "version": "8.0.432" }, "armv7l": { - "build": "5", - "sha256": "5bd0203b2b09b033e3a762299a4975939d7571b433eab8b59340cc966102bef1", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u422-b05/OpenJDK8U-jdk_arm_linux_hotspot_8u422b05.tar.gz", - "version": "8.0.422" + "build": "6", + "sha256": "ff1ce3f6f1cf11987ab63f278b29cf1aae799652606c547f8a590e7acbd16b61", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u432-b06/OpenJDK8U-jdk_arm_linux_hotspot_8u432b06.tar.gz", + "version": "8.0.432" }, "packageType": "jdk", "powerpc64le": { - "build": "5", - "sha256": "78fbd7b01204cdf90bcb3f9fe6a8e9432bdaa75776fa333aa9cbcb5a79de34cd", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u422-b05/OpenJDK8U-jdk_ppc64le_linux_hotspot_8u422b05.tar.gz", - "version": "8.0.422" + "build": "6", + "sha256": "64fb17e83b79f9ad41dc18351a408bfe90324fd6360903ca5c0a740006c81be3", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u432-b06/OpenJDK8U-jdk_ppc64le_linux_hotspot_8u432b06.tar.gz", + "version": "8.0.432" }, "vmType": "hotspot", "x86_64": { - "build": "5", - "sha256": "4c6056f6167fae73ace7c3080b78940be5c87d54f5b08894b3517eed1cbb2c06", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u422-b05/OpenJDK8U-jdk_x64_linux_hotspot_8u422b05.tar.gz", - "version": "8.0.422" + "build": "6", + "sha256": "abaaa90deadf51bd28921453baf2992b3dff6171bb7142f5bdd14ef269f7b245", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u432-b06/OpenJDK8U-jdk_x64_linux_hotspot_8u432b06.tar.gz", + "version": "8.0.432" } } }, "jre": { "openjdk11": { "aarch64": { - "build": "8", - "sha256": "1fe97cdaad47d7d108f329c6e4560b46748ef7f2948a1027812ade0bbc2a3597", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.24%2B8/OpenJDK11U-jre_aarch64_linux_hotspot_11.0.24_8.tar.gz", - "version": "11.0.24" + "build": "9", + "sha256": "e37ba6636e31f3c9191ac7e3fd0ab7fb354a2f3b320d68bfb95efd1e053134c9", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.25%2B9/OpenJDK11U-jre_aarch64_linux_hotspot_11.0.25_9.tar.gz", + "version": "11.0.25" }, "armv6l": { - "build": "8", - "sha256": "bf893085627c6ec484e63aa1290276b23bcfee547459da6b0432ae9c5c1be22a", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.24%2B8/OpenJDK11U-jre_arm_linux_hotspot_11.0.24_8.tar.gz", - "version": "11.0.24" + "build": "9", + "sha256": "6b7b1297da762cf2b1eb4834073e6a45cda82a359efb17a89eba3fc6b59b4d26", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.25%2B9/OpenJDK11U-jre_arm_linux_hotspot_11.0.25_9.tar.gz", + "version": "11.0.25" }, "armv7l": { - "build": "8", - "sha256": "bf893085627c6ec484e63aa1290276b23bcfee547459da6b0432ae9c5c1be22a", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.24%2B8/OpenJDK11U-jre_arm_linux_hotspot_11.0.24_8.tar.gz", - "version": "11.0.24" + "build": "9", + "sha256": "6b7b1297da762cf2b1eb4834073e6a45cda82a359efb17a89eba3fc6b59b4d26", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.25%2B9/OpenJDK11U-jre_arm_linux_hotspot_11.0.25_9.tar.gz", + "version": "11.0.25" }, "packageType": "jre", "powerpc64le": { - "build": "8", - "sha256": "8ee351314182df93fbad96139bb74b97814944d66197896e388404a1ecfa06b3", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.24%2B8/OpenJDK11U-jre_ppc64le_linux_hotspot_11.0.24_8.tar.gz", - "version": "11.0.24" + "build": "9", + "sha256": "7e7edaf34c29c304514d60f40f6c9ce58eb3e32b0dec20bb6ccd1cfbb4456698", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.25%2B9/OpenJDK11U-jre_ppc64le_linux_hotspot_11.0.25_9.tar.gz", + "version": "11.0.25" }, "vmType": "hotspot", "x86_64": { - "build": "8", - "sha256": "e0c1938093da3780e4494d366a4e6b75584dde8d46a19acea6691ae11df4cda5", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.24%2B8/OpenJDK11U-jre_x64_linux_hotspot_11.0.24_8.tar.gz", - "version": "11.0.24" + "build": "9", + "sha256": "84cd7101f39172a4db085fb52940595bb14dad6bc3afb5bf82ee497eceaf86d3", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.25%2B9/OpenJDK11U-jre_x64_linux_hotspot_11.0.25_9.tar.gz", + "version": "11.0.25" } }, "openjdk17": { "aarch64": { - "build": "7", - "sha256": "9dfe4c56463690ae67d22268980d8861eb46b907d7914f8f2e6fc7b25778c8ec", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.12%2B7/OpenJDK17U-jre_aarch64_linux_hotspot_17.0.12_7.tar.gz", - "version": "17.0.12" + "build": "11", + "sha256": "97c4fb748eaa1292fb2f28fec90a3eba23e35974ef67f8b3aa304ad4db2ba162", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.13%2B11/OpenJDK17U-jre_aarch64_linux_hotspot_17.0.13_11.tar.gz", + "version": "17.0.13" }, "armv6l": { - "build": "7", - "sha256": "f093094abe0cb2bb5a255d8180810030321073520541f289926c4682eda76136", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.12%2B7/OpenJDK17U-jre_arm_linux_hotspot_17.0.12_7.tar.gz", - "version": "17.0.12" + "build": "11", + "sha256": "f9c4008680db016c9cab26cc2739d4553898911522f6a78a611fafa1f5270c88", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.13%2B11/OpenJDK17U-jre_arm_linux_hotspot_17.0.13_11.tar.gz", + "version": "17.0.13" }, "armv7l": { - "build": "7", - "sha256": "f093094abe0cb2bb5a255d8180810030321073520541f289926c4682eda76136", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.12%2B7/OpenJDK17U-jre_arm_linux_hotspot_17.0.12_7.tar.gz", - "version": "17.0.12" + "build": "11", + "sha256": "f9c4008680db016c9cab26cc2739d4553898911522f6a78a611fafa1f5270c88", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.13%2B11/OpenJDK17U-jre_arm_linux_hotspot_17.0.13_11.tar.gz", + "version": "17.0.13" }, "packageType": "jre", "powerpc64le": { - "build": "7", - "sha256": "2759c48e1e56117871b04c851af18b92b6992cf67590f602949b96c3cff15c73", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.12%2B7/OpenJDK17U-jre_ppc64le_linux_hotspot_17.0.12_7.tar.gz", - "version": "17.0.12" + "build": "11", + "sha256": "790f53fcc95cc76ed8f27d3146cf789fc354a2afb7148cffd197ca61a643212f", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.13%2B11/OpenJDK17U-jre_ppc64le_linux_hotspot_17.0.13_11.tar.gz", + "version": "17.0.13" }, "riscv64": { - "build": "7", - "sha256": "2d1ed42918305a1a0754a6e1e9294c7d4d7fda4bff6dba7bc5682037d860dbc9", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.12%2B7/OpenJDK17U-jre_riscv64_linux_hotspot_17.0.12_7.tar.gz", - "version": "17.0.12" + "build": "11", + "sha256": "f6f3e71e5452b764aad47e6ffa4f0b26fcfe69bd9eb07fbd468343f9dd5f17b5", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.13%2B11/OpenJDK17U-jre_riscv64_linux_hotspot_17.0.13_11.tar.gz", + "version": "17.0.13" }, "vmType": "hotspot", "x86_64": { - "build": "7", - "sha256": "0e8088d7a3a7496faba7ac8787db09dc0264c2bc6f568ea8024fd775a783e13c", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.12%2B7/OpenJDK17U-jre_x64_linux_hotspot_17.0.12_7.tar.gz", - "version": "17.0.12" + "build": "11", + "sha256": "4086cc7cb2d9e7810141f255063caad10a8a018db5e6b47fa5394c506ab65bff", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.13%2B11/OpenJDK17U-jre_x64_linux_hotspot_17.0.13_11.tar.gz", + "version": "17.0.13" } }, "openjdk21": { "aarch64": { - "build": "7", - "sha256": "58845ce4275f3ec74fba075597c8216bb201773da036c4703be8b7b7b457355d", - "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.4%2B7/OpenJDK21U-jre_aarch64_linux_hotspot_21.0.4_7.tar.gz", - "version": "21.0.4" + "build": "11", + "sha256": "e4d02c33aeaf8e1148c1c505e129a709c5bc1889e855d4fb4f001b1780db42b4", + "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.5%2B11/OpenJDK21U-jre_aarch64_linux_hotspot_21.0.5_11.tar.gz", + "version": "21.0.5" }, "packageType": "jre", "powerpc64le": { - "build": "7", - "sha256": "46cf93653e2b553fb1c91760cfe2ff20999ba358d648d2df69e5948784768440", - "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.4%2B7/OpenJDK21U-jre_ppc64le_linux_hotspot_21.0.4_7.tar.gz", - "version": "21.0.4" + "build": "11", + "sha256": "ae9ad61578da420fa7aeb01d3f6909da8a74d54a31bb8ba090a263cfadf221cc", + "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.5%2B11/OpenJDK21U-jre_ppc64le_linux_hotspot_21.0.5_11.tar.gz", + "version": "21.0.5" }, "riscv64": { - "build": "7", - "sha256": "bf814344429f53d11f8aace14d326e2580ea6e66dd81b109c79160bd41735237", - "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.4%2B7/OpenJDK21U-jre_riscv64_linux_hotspot_21.0.4_7.tar.gz", - "version": "21.0.4" + "build": "11", + "sha256": "c6fe71bb6ce61366242073e3904c4f51613252a885d54be81c65d3fadd2c5b7c", + "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.5%2B11/OpenJDK21U-jre_riscv64_linux_hotspot_21.0.5_11.tar.gz", + "version": "21.0.5" }, "vmType": "hotspot", "x86_64": { - "build": "7", - "sha256": "d3affbb011ca6c722948f6345d15eba09bded33f9947d4d67e09723e2518c12a", - "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.4%2B7/OpenJDK21U-jre_x64_linux_hotspot_21.0.4_7.tar.gz", - "version": "21.0.4" + "build": "11", + "sha256": "553dda64b3b1c3c16f8afe402377ffebe64fb4a1721a46ed426a91fd18185e62", + "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.5%2B11/OpenJDK21U-jre_x64_linux_hotspot_21.0.5_11.tar.gz", + "version": "21.0.5" } }, "openjdk23": { "aarch64": { - "build": "37", - "sha256": "ec45f4f9a4a98d8a0af24b508ca84a411ea88fac8abb8ad2cfca85cb3902ab5d", - "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23%2B37/OpenJDK23U-jre_aarch64_linux_hotspot_23_37.tar.gz", - "version": "23.0.0" + "build": "11", + "sha256": "0b498a5b673cb50fe9cfd0a13bd39c7259b4fad4d930d614e1563aeb8bca7f0e", + "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.1%2B11/OpenJDK23U-jre_aarch64_linux_hotspot_23.0.1_11.tar.gz", + "version": "23.0.1" }, "packageType": "jre", "powerpc64le": { - "build": "37", - "sha256": "9120876c35b904ac041c5a021330a6f11d4e6c7537ce28bdbb7170b944673435", - "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23%2B37/OpenJDK23U-jre_ppc64le_linux_hotspot_23_37.tar.gz", - "version": "23.0.0" + "build": "11", + "sha256": "ae5d49932f7d9b182c2d9ededa18bd4defc61873f1d717caa3d905bba870a683", + "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.1%2B11/OpenJDK23U-jre_ppc64le_linux_hotspot_23.0.1_11.tar.gz", + "version": "23.0.1" }, "riscv64": { - "build": "37", - "sha256": "ca32d942ef5357fb948604cd8aea5c597130cf7fdf6ddee267b4aa99406ee471", - "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23%2B37/OpenJDK23U-jre_riscv64_linux_hotspot_23_37.tar.gz", - "version": "23.0.0" + "build": "11", + "sha256": "cf65a926c2d7cbdbaa63242a8d20ce747335e7260eaaabd7bb52d51c099fda9a", + "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.1%2B11/OpenJDK23U-jre_riscv64_linux_hotspot_23.0.1_11.tar.gz", + "version": "23.0.1" }, "vmType": "hotspot", "x86_64": { - "build": "37", - "sha256": "9c3c3d42ffb2603b328b7154fc9eb449ef87488b3cbeb24a497d46677c7fd44d", - "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23%2B37/OpenJDK23U-jre_x64_linux_hotspot_23_37.tar.gz", - "version": "23.0.0" + "build": "11", + "sha256": "1233cbec40f05c76ad926b68521ae78c6ae4f454996ef549602be6987069fa77", + "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.1%2B11/OpenJDK23U-jre_x64_linux_hotspot_23.0.1_11.tar.gz", + "version": "23.0.1" } }, "openjdk8": { "aarch64": { - "build": "5", - "sha256": "8fbefff2c578f73d95118d830347589ddc9aa84510200a5a5001901c2dea4810", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u422-b05/OpenJDK8U-jre_aarch64_linux_hotspot_8u422b05.tar.gz", - "version": "8.0.422" + "build": "6", + "sha256": "786522da4c761104dd8274c81edc90126a25acaafbbbc5da886b3fb51f33cba2", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u432-b06/OpenJDK8U-jre_aarch64_linux_hotspot_8u432b06.tar.gz", + "version": "8.0.432" }, "armv6l": { - "build": "5", - "sha256": "13bdefdeae6f18bc9c87bba18c853b8b12c5442ce07ff0a3956ce28776d695ff", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u422-b05/OpenJDK8U-jre_arm_linux_hotspot_8u422b05.tar.gz", - "version": "8.0.422" + "build": "6", + "sha256": "49894dbe2f915dfad026cf7b4013118c0284e88359172499b1b25a4dac195ff1", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u432-b06/OpenJDK8U-jre_arm_linux_hotspot_8u432b06.tar.gz", + "version": "8.0.432" }, "armv7l": { - "build": "5", - "sha256": "13bdefdeae6f18bc9c87bba18c853b8b12c5442ce07ff0a3956ce28776d695ff", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u422-b05/OpenJDK8U-jre_arm_linux_hotspot_8u422b05.tar.gz", - "version": "8.0.422" + "build": "6", + "sha256": "49894dbe2f915dfad026cf7b4013118c0284e88359172499b1b25a4dac195ff1", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u432-b06/OpenJDK8U-jre_arm_linux_hotspot_8u432b06.tar.gz", + "version": "8.0.432" }, "packageType": "jre", "powerpc64le": { - "build": "5", - "sha256": "2991edbedee448c0f1edf131beca84b415dac64ea97365b9bfd85bc2f39893bb", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u422-b05/OpenJDK8U-jre_ppc64le_linux_hotspot_8u422b05.tar.gz", - "version": "8.0.422" + "build": "6", + "sha256": "c573f33f9e5ba49a4838847d0d34efc9c1dc57a9ba71b926599530bbcda87f65", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u432-b06/OpenJDK8U-jre_ppc64le_linux_hotspot_8u432b06.tar.gz", + "version": "8.0.432" }, "vmType": "hotspot", "x86_64": { - "build": "5", - "sha256": "0ac516cc1eadffb4cd3cfc9736a33d58ea6a396bf85729036c973482f7c063d9", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u422-b05/OpenJDK8U-jre_x64_linux_hotspot_8u422b05.tar.gz", - "version": "8.0.422" + "build": "6", + "sha256": "bb8c8cc575b69e68e12a213674ec2e3848baff4f1955d2973d98e67666ab94d7", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u432-b06/OpenJDK8U-jre_x64_linux_hotspot_8u432b06.tar.gz", + "version": "8.0.432" } } } @@ -468,152 +468,152 @@ "jdk": { "openjdk11": { "aarch64": { - "build": "8", - "sha256": "8bcbb98e293fb3c4d5cae3539f240ed478fae85962311fccd4c628ebad3a90e4", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.24%2B8/OpenJDK11U-jdk_aarch64_mac_hotspot_11.0.24_8.tar.gz", - "version": "11.0.24" + "build": "9", + "sha256": "658f73050ab168109862d4e25eefeedb587063cc01128a78ea4081e8ec62edcf", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.25%2B9/OpenJDK11U-jdk_aarch64_mac_hotspot_11.0.25_9.tar.gz", + "version": "11.0.25" }, "packageType": "jdk", "vmType": "hotspot", "x86_64": { - "build": "8", - "sha256": "07a1be21f45f0951db05516e57602c414295c51a920f7e9b6ddeaa325d619b28", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.24%2B8/OpenJDK11U-jdk_x64_mac_hotspot_11.0.24_8.tar.gz", - "version": "11.0.24" + "build": "9", + "sha256": "fa6f88ebd8c3d2b4f5146cd45e4ef875cb2d073b6e95b60de86a1ce0bfdb463a", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.25%2B9/OpenJDK11U-jdk_x64_mac_hotspot_11.0.25_9.tar.gz", + "version": "11.0.25" } }, "openjdk17": { "aarch64": { - "build": "7", - "sha256": "d7910b1acaeb290c5c5da21811d2b2b8635f806612a2d6e8d1953b2f77580f78", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.12%2B7/OpenJDK17U-jdk_aarch64_mac_hotspot_17.0.12_7.tar.gz", - "version": "17.0.12" + "build": "11", + "sha256": "d8b2f77f755d06e81a540834c5be22ed86f3c8a51a20396606c074303f8f9e2d", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.13%2B11/OpenJDK17U-jdk_aarch64_mac_hotspot_17.0.13_11.tar.gz", + "version": "17.0.13" }, "packageType": "jdk", "vmType": "hotspot", "x86_64": { - "build": "7", - "sha256": "d5230eeec88739aa7133e4c8635bbd4ab226708c12deaafa13cf26b02bc8e8c4", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.12%2B7/OpenJDK17U-jdk_x64_mac_hotspot_17.0.12_7.tar.gz", - "version": "17.0.12" + "build": "11", + "sha256": "840535070200a944a6b582d258ee84608bd25c9f2b5d1cdddb58dfadb019675a", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.13%2B11/OpenJDK17U-jdk_x64_mac_hotspot_17.0.13_11.tar.gz", + "version": "17.0.13" } }, "openjdk21": { "aarch64": { - "build": "7", - "sha256": "dcf69a21601d9b1b25454bbad4f0f32784bb42cdbe4063492e15a851b74cb61e", - "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.4%2B7/OpenJDK21U-jdk_aarch64_mac_hotspot_21.0.4_7.tar.gz", - "version": "21.0.4" + "build": "11", + "sha256": "dc6db7347907d23743d13af935d3c10e8b3490acdf542115f578838227da0dab", + "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.5%2B11/OpenJDK21U-jdk_aarch64_mac_hotspot_21.0.5_11.tar.gz", + "version": "21.0.5" }, "packageType": "jdk", "vmType": "hotspot", "x86_64": { - "build": "7", - "sha256": "e368e5de7111aa88e6bbabeff6f4c040772b57fb279cc4e197b51654085bbc18", - "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.4%2B7/OpenJDK21U-jdk_x64_mac_hotspot_21.0.4_7.tar.gz", - "version": "21.0.4" + "build": "11", + "sha256": "b9b46f396ab5f3658fa5569af963896167c7f735cfec816359c04101fae38bdf", + "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.5%2B11/OpenJDK21U-jdk_x64_mac_hotspot_21.0.5_11.tar.gz", + "version": "21.0.5" } }, "openjdk23": { "aarch64": { - "build": "37", - "sha256": "411934ca9ede95671afc1e7e1d9c8912c43247c7e4fba97730f20c0875287d44", - "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23%2B37/OpenJDK23U-jdk_aarch64_mac_hotspot_23_37.tar.gz", - "version": "23.0.0" + "build": "11", + "sha256": "9e69810a50c8183e01429243d0bb112e381a122c6e7be936b7c13c3cfe7b29a0", + "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.1%2B11/OpenJDK23U-jdk_aarch64_mac_hotspot_23.0.1_11.tar.gz", + "version": "23.0.1" }, "packageType": "jdk", "vmType": "hotspot", "x86_64": { - "build": "37", - "sha256": "0b4b14f7cb44cab89083fb72beafa6d4f12ee6722bf682e5dd026dab12cc8d23", - "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23%2B37/OpenJDK23U-jdk_x64_mac_hotspot_23_37.tar.gz", - "version": "23.0.0" + "build": "11", + "sha256": "055a5b9c27991ad955c8207a20b549ac3254d479aa8a4fc199b6b02d56b1875e", + "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.1%2B11/OpenJDK23U-jdk_x64_mac_hotspot_23.0.1_11.tar.gz", + "version": "23.0.1" } }, "openjdk8": { "packageType": "jdk", "vmType": "hotspot", "x86_64": { - "build": "5", - "sha256": "14e93cac142c4e7734aab53d1e9f44ef2851cf1cc4657918abccdf99e78c8bad", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u422-b05.1/OpenJDK8U-jdk_x64_mac_hotspot_8u422b05.tar.gz", - "version": "8.0.422" + "build": "6", + "sha256": "e5cc78b704cf96f7a6c4ad677048f79331f38cd37fbef6c86dce75e1bfe28895", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u432-b06/OpenJDK8U-jdk_x64_mac_hotspot_8u432b06.tar.gz", + "version": "8.0.432" } } }, "jre": { "openjdk11": { "aarch64": { - "build": "8", - "sha256": "809c13c1c3abefe09c8396b18d6dd64837f30bf7bda7cbe317c6567bcd161d7a", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.24%2B8/OpenJDK11U-jre_aarch64_mac_hotspot_11.0.24_8.tar.gz", - "version": "11.0.24" + "build": "9", + "sha256": "f1d602b478269c7def552d4a01c5ba3ac91cc34f5d66b5313da3aa0b72d670e7", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.25%2B9/OpenJDK11U-jre_aarch64_mac_hotspot_11.0.25_9.tar.gz", + "version": "11.0.25" }, "packageType": "jre", "vmType": "hotspot", "x86_64": { - "build": "8", - "sha256": "764d30489541ae088d2d0a75d46524ec35797dcdbe4a11b6bfbaee7957d8f77e", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.24%2B8/OpenJDK11U-jre_x64_mac_hotspot_11.0.24_8.tar.gz", - "version": "11.0.24" + "build": "9", + "sha256": "97e0e32b12460e92e3b4632492b3ccd648cf03a6023ca2ee7dc81f7cfa3bd275", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.25%2B9/OpenJDK11U-jre_x64_mac_hotspot_11.0.25_9.tar.gz", + "version": "11.0.25" } }, "openjdk17": { "aarch64": { - "build": "7", - "sha256": "5c1cb2cbd2ef3f2b529e2733d0ab55381e10c4c3607f4d62f2bf12f0942198bf", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.12%2B7/OpenJDK17U-jre_aarch64_mac_hotspot_17.0.12_7.tar.gz", - "version": "17.0.12" + "build": "11", + "sha256": "a886b8f2a50eca2e59b45ea59f5a2e8e9d27ff5b5b3b069443a70cda7f27c907", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.13%2B11/OpenJDK17U-jre_aarch64_mac_hotspot_17.0.13_11.tar.gz", + "version": "17.0.13" }, "packageType": "jre", "vmType": "hotspot", "x86_64": { - "build": "7", - "sha256": "331aceddc402263c5e47529234965927573ead684ea2b7a0358fbb6c279c1510", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.12%2B7/OpenJDK17U-jre_x64_mac_hotspot_17.0.12_7.tar.gz", - "version": "17.0.12" + "build": "11", + "sha256": "bf9faf4540001a251e6bfb52b99c7ec5b1f36d3ebe94e104f61a30f173ba8c78", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.13%2B11/OpenJDK17U-jre_x64_mac_hotspot_17.0.13_11.tar.gz", + "version": "17.0.13" } }, "openjdk21": { "aarch64": { - "build": "7", - "sha256": "14b39c00ec0ec6e0c465f784261449d0a1c4256b3b15c63c222397ccb31758aa", - "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.4%2B7/OpenJDK21U-jre_aarch64_mac_hotspot_21.0.4_7.tar.gz", - "version": "21.0.4" + "build": "11", + "sha256": "12249a1c5386957c93fc372260c483ae921b1ec6248a5136725eabd0abc07f93", + "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.5%2B11/OpenJDK21U-jre_aarch64_mac_hotspot_21.0.5_11.tar.gz", + "version": "21.0.5" }, "packageType": "jre", "vmType": "hotspot", "x86_64": { - "build": "7", - "sha256": "f67f17413d012672da11163dd73600e0d92eef6f6ff27c6ae25523bd9df74222", - "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.4%2B7/OpenJDK21U-jre_x64_mac_hotspot_21.0.4_7.tar.gz", - "version": "21.0.4" + "build": "11", + "sha256": "0e0dcb571f7bf7786c111fe066932066d9eab080c9f86d8178da3e564324ee81", + "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.5%2B11/OpenJDK21U-jre_x64_mac_hotspot_21.0.5_11.tar.gz", + "version": "21.0.5" } }, "openjdk23": { "aarch64": { - "build": "37", - "sha256": "2c96b006080906951fb0ddae8e23ca3ef2bd327b77cac84b4302b8d84c7014f5", - "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23%2B37/OpenJDK23U-jre_aarch64_mac_hotspot_23_37.tar.gz", - "version": "23.0.0" + "build": "11", + "sha256": "e29029d35608f4e415e49c7990ebe0f42d0ecb7dc2d4d444e41adf3e3287f922", + "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.1%2B11/OpenJDK23U-jre_aarch64_mac_hotspot_23.0.1_11.tar.gz", + "version": "23.0.1" }, "packageType": "jre", "vmType": "hotspot", "x86_64": { - "build": "37", - "sha256": "1f41755494c45a8a88dfed926251f478544c0e51a71a011314fc282e915f804f", - "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23%2B37/OpenJDK23U-jre_x64_mac_hotspot_23_37.tar.gz", - "version": "23.0.0" + "build": "11", + "sha256": "87e532fda02327e0f2766650223b6bd63a4407c4907f82790edb5862a5285116", + "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.1%2B11/OpenJDK23U-jre_x64_mac_hotspot_23.0.1_11.tar.gz", + "version": "23.0.1" } }, "openjdk8": { "packageType": "jre", "vmType": "hotspot", "x86_64": { - "build": "5", - "sha256": "814a1e262c10cb3f056adbdb20396564fe9ea0f039a863bae6b648f7680b30cc", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u422-b05.1/OpenJDK8U-jre_x64_mac_hotspot_8u422b05.tar.gz", - "version": "8.0.422" + "build": "6", + "sha256": "55aac241ad7cb7c1903d4810ad705ffe2f2536a88b6a88efabb4942a9f09db33", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u432-b06/OpenJDK8U-jre_x64_mac_hotspot_8u432b06.tar.gz", + "version": "8.0.432" } } } From f9a85f2330b03aa678d3bca9ff601870bf6b5f88 Mon Sep 17 00:00:00 2001 From: lucasew Date: Fri, 27 Dec 2024 14:19:03 -0300 Subject: [PATCH 003/343] cargoCheckHook: pass test-threads using an environment variable Signed-off-by: lucasew --- pkgs/build-support/rust/hooks/cargo-check-hook.sh | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/build-support/rust/hooks/cargo-check-hook.sh b/pkgs/build-support/rust/hooks/cargo-check-hook.sh index 965e2b4514471..168a7e933ff00 100644 --- a/pkgs/build-support/rust/hooks/cargo-check-hook.sh +++ b/pkgs/build-support/rust/hooks/cargo-check-hook.sh @@ -11,10 +11,9 @@ cargoCheckHook() { local flagsArray=("-j" "$NIX_BUILD_CORES") - if [[ -z ${dontUseCargoParallelTests-} ]]; then - prependToVar checkFlags "--test-threads=$NIX_BUILD_CORES" - else - prependToVar checkFlags "--test-threads=1" + export RUST_TEST_THREADS=$NIX_BUILD_CORES + if [[ ! -z ${dontUseCargoParallelTests-} ]]; then + RUST_TEST_THREADS=1 fi if [ "${cargoCheckType}" != "debug" ]; then From 09388f4eb330d3ff0718c046e59959ad54f152e3 Mon Sep 17 00:00:00 2001 From: YoshiRulz Date: Tue, 31 Dec 2024 16:05:58 +1000 Subject: [PATCH 004/343] lua: Don't flood stdout when included in `mkShell` fixes 665f3f694 --- pkgs/development/interpreters/lua-5/utils.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/interpreters/lua-5/utils.sh b/pkgs/development/interpreters/lua-5/utils.sh index 2365af08dc9cb..04d614fc04303 100644 --- a/pkgs/development/interpreters/lua-5/utils.sh +++ b/pkgs/development/interpreters/lua-5/utils.sh @@ -66,7 +66,7 @@ addToLuaPath() { _addToLuaPath() { local dir="$1" - echo "_addToLuaPath called for dir $dir" + nix_debug "_addToLuaPath called for dir $dir" if [[ ! -d "$dir" ]]; then nix_debug "$dir not a directory abort" @@ -77,7 +77,7 @@ _addToLuaPath() { # if [ -n "${pythonPathsSeen[$dir]}" ]; then return; fi if [[ -n "${luaPathsSeen[$dir]:-}" ]]; then # if [ -n "${luaPathsSeen[$dir]}" ]; then - echo "$dir already parsed" + nix_debug "$dir already parsed" return fi @@ -103,7 +103,7 @@ _addToLuaPath() { if [ -e "$prop" ]; then local new_path for new_path in $(cat $prop); do - echo "newpath: $new_path" + nix_debug "newpath: $new_path" _addToLuaPath "$new_path" done fi @@ -116,7 +116,7 @@ buildLuaPath() { local luaPath="$1" local path - echo "BUILD_LUA_PATH" + nix_debug "BUILD_LUA_PATH" # # set -x # # Create an empty table of paths (see doc on loadFromPropagatedInputs From 2c9f8d299d71cd44a28829d4eed12adf43ae8b93 Mon Sep 17 00:00:00 2001 From: FliegendeWurst Date: Fri, 3 Jan 2025 15:59:48 +0100 Subject: [PATCH 005/343] pypy310Packages.pyflakes: disable failing tests --- .../python-modules/pyflakes/default.nix | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/pyflakes/default.nix b/pkgs/development/python-modules/pyflakes/default.nix index 4550ca77e02bc..04534f99c58da 100644 --- a/pkgs/development/python-modules/pyflakes/default.nix +++ b/pkgs/development/python-modules/pyflakes/default.nix @@ -1,6 +1,7 @@ { lib, buildPythonPackage, + isPyPy, pythonAtLeast, pythonOlder, fetchFromGitHub, @@ -27,10 +28,17 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - disabledTests = lib.optionals (pythonAtLeast "3.13") [ - # https://github.com/PyCQA/pyflakes/issues/812 - "test_errors_syntax" - ]; + disabledTests = + lib.optionals (pythonAtLeast "3.13") [ + # https://github.com/PyCQA/pyflakes/issues/812 + "test_errors_syntax" + ] + ++ lib.optionals isPyPy [ + # https://github.com/PyCQA/pyflakes/issues/779 + "test_eofSyntaxError" + "test_misencodedFileUTF8" + "test_multilineSyntaxError" + ]; pythonImportsCheck = [ "pyflakes" ]; From d94b52ff981d41eff1bb1858b6ab945cf4a3cd63 Mon Sep 17 00:00:00 2001 From: Chuang Zhu Date: Sun, 5 Jan 2025 00:58:54 +0800 Subject: [PATCH 006/343] usbutils: 017 -> 018 --- pkgs/by-name/us/usbutils/fix-paths.patch | 21 ++++++++++++--------- pkgs/by-name/us/usbutils/package.nix | 14 ++++++-------- 2 files changed, 18 insertions(+), 17 deletions(-) diff --git a/pkgs/by-name/us/usbutils/fix-paths.patch b/pkgs/by-name/us/usbutils/fix-paths.patch index ef63a41e726c2..af522ac50d7bd 100644 --- a/pkgs/by-name/us/usbutils/fix-paths.patch +++ b/pkgs/by-name/us/usbutils/fix-paths.patch @@ -1,11 +1,14 @@ ---- a/Makefile.am -+++ b/Makefile.am -@@ -61,7 +61,7 @@ EXTRA_DIST = \ - LICENSES/GPL-3.0-only.txt +diff --git a/lsusb.py b/lsusb.py +index bbc4dbb..8af1b1f 100755 +--- a/lsusb.py ++++ b/lsusb.py +@@ -27,8 +27,7 @@ showwakeup = False - lsusb.py: $(srcdir)/lsusb.py.in -- sed 's|VERSION|$(VERSION)|g;s|@usbids@|$(datadir)/usb.ids|g' $< >$@ -+ sed 's|VERSION|$(VERSION)|g;s|@usbids@|@hwdata@/share/hwdata/usb.ids|g' $< >$@ - chmod 755 $@ + prefix = "/sys/bus/usb/devices/" + usbids = [ +- "/usr/share/hwdata/usb.ids", +- "/usr/share/usb.ids", ++ "@hwdata@/share/hwdata/usb.ids", + ] + cols = ("", "", "", "", "", "") - lsusb.8: $(srcdir)/lsusb.8.in diff --git a/pkgs/by-name/us/usbutils/package.nix b/pkgs/by-name/us/usbutils/package.nix index 3ffd5fe88a660..627069dafd654 100644 --- a/pkgs/by-name/us/usbutils/package.nix +++ b/pkgs/by-name/us/usbutils/package.nix @@ -3,7 +3,8 @@ stdenv, fetchurl, substituteAll, - autoreconfHook, + meson, + ninja, pkg-config, libusb1, hwdata, @@ -12,11 +13,11 @@ stdenv.mkDerivation rec { pname = "usbutils"; - version = "017"; + version = "018"; src = fetchurl { url = "mirror://kernel/linux/utils/usb/usbutils/usbutils-${version}.tar.xz"; - hash = "sha256-pqJf/c+RA+ONekRzKsoXBz9OYCuS5K5VYlIxqCcC4Fs="; + hash = "sha256-g/aLWbWFR1icACZugmcYZGJ1k6tDYtjIB/UO6pI8rZM="; }; patches = [ @@ -27,7 +28,8 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ - autoreconfHook + meson + ninja pkg-config ]; buildInputs = [ @@ -41,10 +43,6 @@ stdenv.mkDerivation rec { "python" ]; - postBuild = '' - $CC $NIX_CFLAGS -o usbreset usbreset.c - ''; - postInstall = '' moveToOutput "bin/lsusb.py" "$python" install -Dm555 usbreset -t $out/bin From cad4696db22cfa7b41c99b6c50a249d04a2398ef Mon Sep 17 00:00:00 2001 From: Chuang Zhu Date: Sun, 5 Jan 2025 01:13:23 +0800 Subject: [PATCH 007/343] usbutils: add darwin support --- pkgs/by-name/us/usbutils/package.nix | 42 ++++++++++++++++++---------- 1 file changed, 28 insertions(+), 14 deletions(-) diff --git a/pkgs/by-name/us/usbutils/package.nix b/pkgs/by-name/us/usbutils/package.nix index 627069dafd654..72a557c931f0f 100644 --- a/pkgs/by-name/us/usbutils/package.nix +++ b/pkgs/by-name/us/usbutils/package.nix @@ -3,6 +3,7 @@ stdenv, fetchurl, substituteAll, + fetchpatch, meson, ninja, pkg-config, @@ -20,12 +21,19 @@ stdenv.mkDerivation rec { hash = "sha256-g/aLWbWFR1icACZugmcYZGJ1k6tDYtjIB/UO6pI8rZM="; }; - patches = [ - (substituteAll { - src = ./fix-paths.patch; - inherit hwdata; - }) - ]; + patches = + [ + (substituteAll { + src = ./fix-paths.patch; + inherit hwdata; + }) + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + (fetchpatch { + url = "https://raw.githubusercontent.com/Homebrew/formula-patches/24a6945778381a62ecdcc1d78bcc16b9f86778c1/usbutils/portable.patch"; + hash = "sha256-spTkWURij4sPLoWtDaWVMIk81AS5W+qUUOQL1pAZEvs="; + }) + ]; nativeBuildInputs = [ meson @@ -37,13 +45,16 @@ stdenv.mkDerivation rec { python3 ]; - outputs = [ - "out" - "man" - "python" - ]; + outputs = + [ + "out" + "man" + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + "python" # uses sysfs + ]; - postInstall = '' + postInstall = lib.optionalString stdenv.hostPlatform.isLinux '' moveToOutput "bin/lsusb.py" "$python" install -Dm555 usbreset -t $out/bin ''; @@ -51,12 +62,15 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.linux-usb.org/"; description = "Tools for working with USB devices, such as lsusb"; - maintainers = with lib.maintainers; [ cafkafk ]; + maintainers = with lib.maintainers; [ + cafkafk + chuangzhu + ]; license = with lib.licenses; [ gpl2Only # manpages, usbreset gpl2Plus # most of the code ]; - platforms = lib.platforms.linux; + platforms = with lib.platforms; linux ++ darwin; mainProgram = "lsusb"; }; } From 510a1ff255357e605d5acd305f65f814a9a5ec38 Mon Sep 17 00:00:00 2001 From: FliegendeWurst Date: Fri, 3 Jan 2025 15:59:48 +0100 Subject: [PATCH 008/343] pypy310Packages.flake8: disable failing tests --- pkgs/development/python-modules/flake8/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/python-modules/flake8/default.nix b/pkgs/development/python-modules/flake8/default.nix index 624f36a7447aa..6f2a8c49d5704 100644 --- a/pkgs/development/python-modules/flake8/default.nix +++ b/pkgs/development/python-modules/flake8/default.nix @@ -1,6 +1,7 @@ { lib, buildPythonPackage, + isPyPy, pythonOlder, fetchFromGitHub, setuptools, @@ -35,6 +36,12 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; + disabledTests = lib.optionals isPyPy [ + # tests fail due to slightly different error position + "test_tokenization_error_is_a_syntax_error" + "test_tokenization_error_but_not_syntax_error" + ]; + meta = with lib; { changelog = "https://github.com/PyCQA/flake8/blob/${src.rev}/docs/source/release-notes/${version}.rst"; description = "Modular source code checker: pep8, pyflakes and co"; From 23221bbf26dea7691134a59c991dd825a66ffe32 Mon Sep 17 00:00:00 2001 From: misuzu Date: Mon, 6 Jan 2025 00:24:51 +0200 Subject: [PATCH 009/343] bpftools: fix cross for riscv64-linux --- pkgs/by-name/bp/bpftools/package.nix | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/pkgs/by-name/bp/bpftools/package.nix b/pkgs/by-name/bp/bpftools/package.nix index 88ec301bc3560..6c3badae44110 100644 --- a/pkgs/by-name/bp/bpftools/package.nix +++ b/pkgs/by-name/bp/bpftools/package.nix @@ -1,6 +1,7 @@ { lib, stdenv, + fetchpatch, linuxHeaders, buildPackages, libopcodes, @@ -25,6 +26,25 @@ stdenv.mkDerivation rec { patches = [ # fix unknown type name '__vector128' on ppc64le ./include-asm-types-for-ppc64le.patch + # fix build for riscv64 + (fetchpatch { + # libbpf: Add missing per-arch include path + # https://patchwork.kernel.org/project/linux-riscv/patch/20240927131355.350918-1-bjorn@kernel.org/ + url = "https://patchwork.kernel.org/project/linux-riscv/patch/20240927131355.350918-1-bjorn@kernel.org/raw/"; + hash = "sha256-edXY/ejHW5L7rGgY5B2GmVZxUgnLdBadNhBOSAgcL7M="; + }) + (fetchpatch { + # selftests: bpf: Add missing per-arch include path + # https://patchwork.kernel.org/project/linux-riscv/patch/20240927131355.350918-2-bjorn@kernel.org/ + url = "https://patchwork.kernel.org/project/linux-riscv/patch/20240927131355.350918-2-bjorn@kernel.org/raw/"; + hash = "sha256-7yNWE/L/qd3vcLtJYoSyGxB3ytySlr20R0D3t5ni2Fc="; + }) + (fetchpatch { + # tools: Override makefile ARCH variable if defined, but empty + # https://patchwork.kernel.org/project/linux-riscv/patch/20241127101748.165693-1-bjorn@kernel.org/ + url = "https://patchwork.kernel.org/project/linux-riscv/patch/20241127101748.165693-1-bjorn@kernel.org/raw/"; + hash = "sha256-y8N71Hm1XfX9g3S6PzW2m7Lxp6wQQMfQE9L0QNt8cYY="; + }) ]; depsBuildBuild = [ buildPackages.stdenv.cc ]; @@ -68,6 +88,9 @@ stdenv.mkDerivation rec { "bpf_dbg" ]; + # needed for cross to riscv64 + makeFlags = [ "ARCH=${stdenv.hostPlatform.linuxArch}" ]; + installPhase = '' make -C bpftool install install -Dm755 -t $out/bin bpf_asm From e2d137d8539b0eb500eb650b12ccdbad40660488 Mon Sep 17 00:00:00 2001 From: Artemis Tosini Date: Tue, 7 Jan 2025 00:12:17 -0800 Subject: [PATCH 010/343] ldns: run autoreconfHook The pregenerated configure script does not generate dynamic libraries on OpenBSD. Run autoreconfHook to generate a working one --- pkgs/by-name/ld/ldns/package.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/ld/ldns/package.nix b/pkgs/by-name/ld/ldns/package.nix index ed0a570a75038..42caae4fed34e 100644 --- a/pkgs/by-name/ld/ldns/package.nix +++ b/pkgs/by-name/ld/ldns/package.nix @@ -6,6 +6,7 @@ perl, which, dns-root-data, + autoreconfHook, }: stdenv.mkDerivation rec { @@ -28,7 +29,11 @@ stdenv.mkDerivation rec { "examples" ]; - nativeBuildInputs = [ perl ]; + nativeBuildInputs = [ + perl + autoreconfHook + ]; + buildInputs = [ openssl ]; configureFlags = From 07cee321f1c6ea241e46a599caa12a1b5dee40eb Mon Sep 17 00:00:00 2001 From: Artemis Tosini Date: Tue, 7 Jan 2025 00:15:11 -0800 Subject: [PATCH 011/343] libedit: run autoreconfHook The generated configure script will not generate dynamic libriares on OpenBSD when building cross. Run autoreconfHook to give us dynamic libraires on OpenBSD --- pkgs/by-name/li/libedit/package.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/by-name/li/libedit/package.nix b/pkgs/by-name/li/libedit/package.nix index 92248a806d253..12bd2e966a1ee 100644 --- a/pkgs/by-name/li/libedit/package.nix +++ b/pkgs/by-name/li/libedit/package.nix @@ -3,6 +3,7 @@ stdenv, fetchurl, ncurses, + autoreconfHook, }: stdenv.mkDerivation (finalAttrs: { @@ -24,6 +25,10 @@ stdenv.mkDerivation (finalAttrs: { ./01-cygwin.patch ]; + nativeBuildInputs = [ + autoreconfHook + ]; + propagatedBuildInputs = [ ncurses ]; From a426ed3d09b3b68341f7c1cd9fc7c394a65e7d21 Mon Sep 17 00:00:00 2001 From: Artemis Tosini Date: Tue, 7 Jan 2025 00:03:36 -0800 Subject: [PATCH 012/343] lesspipe: Fix build on OpenBSD For some reason resholve can figure out that `file` built for FreeBSD and Linux do not execute arguments, but not for OpenBSD. Explicitly tell it that there is no problem --- pkgs/by-name/le/lesspipe/package.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/by-name/le/lesspipe/package.nix b/pkgs/by-name/le/lesspipe/package.nix index 0fd06e2758de4..7f42f6bbf59a6 100644 --- a/pkgs/by-name/le/lesspipe/package.nix +++ b/pkgs/by-name/le/lesspipe/package.nix @@ -167,6 +167,7 @@ stdenv.mkDerivation rec { }; execer = [ "cannot:${iconv}/bin/iconv" + "cannot:${file}/bin/file" ]; }} ${resholve.phraseSolution "lesscomplete" { @@ -216,6 +217,9 @@ stdenv.mkDerivation rec { ]; builtin = [ "setopt" ]; }; + execer = [ + "cannot:${file}/bin/file" + ]; }} ''; From fa9a371817f32dad7c2d2e7b8489ad0a6c665454 Mon Sep 17 00:00:00 2001 From: FliegendeWurst Date: Wed, 8 Jan 2025 12:32:19 +0100 Subject: [PATCH 013/343] blas: fix static build --- pkgs/by-name/bl/blas/package.nix | 34 +++++++++++++++++++++----------- 1 file changed, 23 insertions(+), 11 deletions(-) diff --git a/pkgs/by-name/bl/blas/package.nix b/pkgs/by-name/bl/blas/package.nix index 0372753c8ef42..01ad1839c339b 100644 --- a/pkgs/by-name/bl/blas/package.nix +++ b/pkgs/by-name/bl/blas/package.nix @@ -164,10 +164,10 @@ let version = "3"; canonicalExtension = - if stdenv.hostPlatform.isLinux then + if stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isStatic then "${stdenv.hostPlatform.extensions.sharedLibrary}.${version}" else - stdenv.hostPlatform.extensions.sharedLibrary; + stdenv.hostPlatform.extensions.sharedLibrary or ".a"; blasImplementation = lib.getName blasProvider; blasProvider' = @@ -212,18 +212,20 @@ stdenv.mkDerivation { echo "$libblas does not exist, ${blasProvider'.name} does not provide libblas." exit 1 fi - + '' + + lib.optionalString (!stdenv.hostPlatform.isStatic) '' $NM -an "$libblas" | cut -f3 -d' ' > symbols for symbol in ${toString blasFortranSymbols}; do grep -q "^$symbol_$" symbols || { echo "$symbol" was not found in "$libblas"; exit 1; } done - + '' + + '' cp -L "$libblas" $out/lib/libblas${canonicalExtension} chmod +w $out/lib/libblas${canonicalExtension} '' + ( - if stdenv.hostPlatform.isElf then + if (stdenv.hostPlatform.isElf && !stdenv.hostPlatform.isStatic) then '' patchelf --set-soname libblas${canonicalExtension} $out/lib/libblas${canonicalExtension} patchelf --set-rpath "$(patchelf --print-rpath $out/lib/libblas${canonicalExtension}):${lib.getLib blasProvider'}/lib" $out/lib/libblas${canonicalExtension} @@ -238,8 +240,12 @@ stdenv.mkDerivation { ) + '' - if [ "$out/lib/libblas${canonicalExtension}" != "$out/lib/libblas${stdenv.hostPlatform.extensions.sharedLibrary}" ]; then - ln -s $out/lib/libblas${canonicalExtension} "$out/lib/libblas${stdenv.hostPlatform.extensions.sharedLibrary}" + if [ "$out/lib/libblas${canonicalExtension}" != "$out/lib/libblas${ + stdenv.hostPlatform.extensions.sharedLibrary or ".a" + }" ]; then + ln -s $out/lib/libblas${canonicalExtension} "$out/lib/libblas${ + stdenv.hostPlatform.extensions.sharedLibrary or ".a" + }" fi cat < $dev/lib/pkgconfig/blas.pc @@ -262,7 +268,7 @@ stdenv.mkDerivation { '' + ( - if stdenv.hostPlatform.isElf then + if (stdenv.hostPlatform.isElf && !stdenv.hostPlatform.isStatic) then '' patchelf --set-soname libcblas${canonicalExtension} $out/lib/libcblas${canonicalExtension} patchelf --set-rpath "$(patchelf --print-rpath $out/lib/libcblas${canonicalExtension}):${lib.getLib blasProvider'}/lib" $out/lib/libcblas${canonicalExtension} @@ -276,8 +282,12 @@ stdenv.mkDerivation { '' ) + '' - if [ "$out/lib/libcblas${canonicalExtension}" != "$out/lib/libcblas${stdenv.hostPlatform.extensions.sharedLibrary}" ]; then - ln -s $out/lib/libcblas${canonicalExtension} "$out/lib/libcblas${stdenv.hostPlatform.extensions.sharedLibrary}" + if [ "$out/lib/libcblas${canonicalExtension}" != "$out/lib/libcblas${ + stdenv.hostPlatform.extensions.sharedLibrary or ".a" + }" ]; then + ln -s $out/lib/libcblas${canonicalExtension} "$out/lib/libcblas${ + stdenv.hostPlatform.extensions.sharedLibrary or ".a" + }" fi cp ${lib.getDev lapack-reference}/include/cblas{,_mangling}.h $dev/include @@ -293,7 +303,9 @@ stdenv.mkDerivation { + lib.optionalString (blasImplementation == "mkl") '' mkdir -p $out/nix-support echo 'export MKL_INTERFACE_LAYER=${lib.optionalString isILP64 "I"}LP64,GNU' > $out/nix-support/setup-hook - ln -s $out/lib/libblas${canonicalExtension} $out/lib/libmkl_rt${stdenv.hostPlatform.extensions.sharedLibrary} + ln -s $out/lib/libblas${canonicalExtension} $out/lib/libmkl_rt${ + stdenv.hostPlatform.extensions.sharedLibrary or ".a" + } ln -sf ${blasProvider'}/include/* $dev/include '' ); From 00d34304266337a21d02aa76de0742f0dd662322 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sat, 11 Jan 2025 07:07:02 +0000 Subject: [PATCH 014/343] bc: 1.07.1 -> 1.08.1 Changes: - https://lists.gnu.org/archive/html/info-gnu/2025-01/msg00000.html - https://lists.gnu.org/archive/html/info-gnu/2025-01/msg00002.html --- pkgs/by-name/bc/bc/cross-bc.patch | 169 ------------------------------ pkgs/by-name/bc/bc/package.nix | 7 +- 2 files changed, 3 insertions(+), 173 deletions(-) delete mode 100644 pkgs/by-name/bc/bc/cross-bc.patch diff --git a/pkgs/by-name/bc/bc/cross-bc.patch b/pkgs/by-name/bc/bc/cross-bc.patch deleted file mode 100644 index ba8857abb581e..0000000000000 --- a/pkgs/by-name/bc/bc/cross-bc.patch +++ /dev/null @@ -1,169 +0,0 @@ -commit fdda59736ddc048cf38a2c7103f4f5d9eeaf995e -Author: Ben Gamari -Date: Tue Oct 17 10:51:34 2017 -0400 - - Try implementing cross-compilation - -diff --git a/bc/Makefile.am b/bc/Makefile.am -index d9d412e..fdef633 100644 ---- a/bc/Makefile.am -+++ b/bc/Makefile.am -@@ -17,6 +17,7 @@ MAINTAINERCLEANFILES = Makefile.in bc.c bc.h scan.c \ - - AM_CPPFLAGS = -I$(srcdir) -I$(srcdir)/../h - LIBBC = ../lib/libbc.a -+LIBBC_HOST = ../lib/libbc_host.a - LIBL = @LEXLIB@ - LDADD = $(LIBBC) $(LIBL) @READLINELIB@ - -@@ -29,12 +30,20 @@ $(PROGRAMS): libmath.h $(LIBBC) - scan.o: bc.h - global.o: libmath.h -+ -+main_host.c : main.c -+ cp $< $@ - --fbcOBJ = main.o bc.o scan.o execute.o load.o storage.o util.o warranty.o -+fbcOBJ = $(addsuffix _host,main.o bc.o scan.o execute.o load.o storage.o util.o warranty.o) -+ -+%.o_host : CC:=$(CC_FOR_BUILD) -+ -+%.o_host : %.c -+ $(COMPILE) -c $(CFLAGS) $(INCLUDES) -o $@ $< - --libmath.h: libmath.b $(fbcOBJ) $(LIBBC) -+libmath.h: libmath.b $(fbcOBJ) $(LIBBC_HOST) - echo '{0}' > libmath.h -- $(MAKE) global.o -- $(LINK) -o fbc $(fbcOBJ) global.o $(LIBBC) $(LIBL) $(READLINELIB) $(LIBS) -+ $(MAKE) global.o_host -+ $(CC_FOR_BUILD) -o fbc $(fbcOBJ) global.o_host $(LIBBC_HOST) $(LIBL) ${READLINELIB} $(LIBS) - ./fbc -c $(srcdir)/libmath.b libmath.h - $(srcdir)/fix-libmath_h - rm -f ./fbc ./global.o -diff --git a/configure.ac b/configure.ac -index fc74573..5cabb73 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -20,6 +20,7 @@ m4_define([dc_version], 1.4.1) - - AC_INIT([bc],[bc_version]) - AC_CONFIG_SRCDIR(doc/bc.1) -+AC_CONFIG_MACRO_DIR([m4]) - AM_INIT_AUTOMAKE([dist-bzip2]) - AC_CONFIG_HEADERS(config.h) - -@@ -35,6 +36,7 @@ AC_DEFINE([DC_COPYRIGHT], - [Define the dc copyright line.]) - - AC_PROG_CC -+AX_CC_FOR_BUILD - AC_USE_SYSTEM_EXTENSIONS - - AM_PROG_LEX -diff --git a/lib/Makefile.am b/lib/Makefile.am -index ec4bf59..c670f5b 100644 ---- a/lib/Makefile.am -+++ b/lib/Makefile.am -@@ -1,5 +1,5 @@ - ## Process this file with automake to produce Makefile.in --noinst_LIBRARIES = libbc.a -+noinst_LIBRARIES = libbc.a libbc_host.a - - AM_CPPFLAGS = -I. -I.. -I$(srcdir)/../h - -@@ -24,3 +24,11 @@ testmul: testmul.o number.o - - specialnumber: newnumber.o - cp newnumber.o number.o -+ -+%.o_host : CC:=$(CC_FOR_BUILD) -+%.o_host : %.c -+ $(COMPILE) -c $(CFLAGS) $(INCLUDES) -o $@ $< -+ -+libbc_host.a : $(addsuffix _host,$(libbc_a_OBJECTS)) -+ ar cru $@ $+ -+ ranlib $@ -diff --git a/m4/cc_for_build.m4 b/m4/cc_for_build.m4 -new file mode 100644 -index 0000000..c62ffad ---- /dev/null -+++ b/m4/cc_for_build.m4 -@@ -0,0 +1,77 @@ -+# =========================================================================== -+# https://www.gnu.org/software/autoconf-archive/ax_cc_for_build.html -+# =========================================================================== -+# -+# SYNOPSIS -+# -+# AX_CC_FOR_BUILD -+# -+# DESCRIPTION -+# -+# Find a build-time compiler. Sets CC_FOR_BUILD and EXEEXT_FOR_BUILD. -+# -+# LICENSE -+# -+# Copyright (c) 2010 Reuben Thomas -+# Copyright (c) 1999 Richard Henderson -+# -+# This program is free software: you can redistribute it and/or modify it -+# under the terms of the GNU General Public License as published by the -+# Free Software Foundation, either version 3 of the License, or (at your -+# option) any later version. -+# -+# This program is distributed in the hope that it will be useful, but -+# WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General -+# Public License for more details. -+# -+# You should have received a copy of the GNU General Public License along -+# with this program. If not, see . -+# -+# As a special exception, the respective Autoconf Macro's copyright owner -+# gives unlimited permission to copy, distribute and modify the configure -+# scripts that are the output of Autoconf when processing the Macro. You -+# need not follow the terms of the GNU General Public License when using -+# or distributing such scripts, even though portions of the text of the -+# Macro appear in them. The GNU General Public License (GPL) does govern -+# all other use of the material that constitutes the Autoconf Macro. -+# -+# This special exception to the GPL applies to versions of the Autoconf -+# Macro released by the Autoconf Archive. When you make and distribute a -+# modified version of the Autoconf Macro, you may extend this special -+# exception to the GPL to apply to your modified version as well. -+ -+#serial 3 -+ -+dnl Get a default for CC_FOR_BUILD to put into Makefile. -+AC_DEFUN([AX_CC_FOR_BUILD], -+[# Put a plausible default for CC_FOR_BUILD in Makefile. -+if test -z "$CC_FOR_BUILD"; then -+ if test "x$cross_compiling" = "xno"; then -+ CC_FOR_BUILD='$(CC)' -+ else -+ CC_FOR_BUILD=gcc -+ fi -+fi -+AC_SUBST(CC_FOR_BUILD) -+# Also set EXEEXT_FOR_BUILD. -+if test "x$cross_compiling" = "xno"; then -+ EXEEXT_FOR_BUILD='$(EXEEXT)' -+else -+ AC_CACHE_CHECK([for build system executable suffix], bfd_cv_build_exeext, -+ [rm -f conftest* -+ echo 'int main () { return 0; }' > conftest.c -+ bfd_cv_build_exeext= -+ ${CC_FOR_BUILD} -o conftest conftest.c 1>&5 2>&5 -+ for file in conftest.*; do -+ case $file in -+ *.c | *.o | *.obj | *.ilk | *.pdb) ;; -+ *) bfd_cv_build_exeext=`echo $file | sed -e s/conftest//` ;; -+ esac -+ done -+ rm -f conftest* -+ test x"${bfd_cv_build_exeext}" = x && bfd_cv_build_exeext=no]) -+ EXEEXT_FOR_BUILD="" -+ test x"${bfd_cv_build_exeext}" != xno && EXEEXT_FOR_BUILD=${bfd_cv_build_exeext} -+fi -+AC_SUBST(EXEEXT_FOR_BUILD)])dnl diff --git a/pkgs/by-name/bc/bc/package.nix b/pkgs/by-name/bc/bc/package.nix index 47f6b40690c39..b58d9f7e0ebb1 100644 --- a/pkgs/by-name/bc/bc/package.nix +++ b/pkgs/by-name/bc/bc/package.nix @@ -12,17 +12,16 @@ stdenv.mkDerivation rec { pname = "bc"; - version = "1.07.1"; + version = "1.08.1"; src = fetchurl { - url = "mirror://gnu/bc/bc-${version}.tar.gz"; - sha256 = "62adfca89b0a1c0164c2cdca59ca210c1d44c3ffc46daf9931cf4942664cb02a"; + url = "mirror://gnu/bc/bc-${version}.tar.xz"; + hash = "sha256-UVQwEVszNMY2MXUDRgoJUN/3mUCqMlnOLBqmfCiB0CM="; }; configureFlags = [ "--with-readline" ]; # As of 1.07 cross-compilation is quite complicated as the build system wants # to build a code generator, bc/fbc, on the build machine. - patches = [ ./cross-bc.patch ]; depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ # Tools From 04791f4a4d1cac8bcd9f3ace9219efc742b9f5ef Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sat, 11 Jan 2025 12:31:08 +0000 Subject: [PATCH 015/343] bintools-wrapper: enable stackclashprotection by default --- pkgs/build-support/bintools-wrapper/default.nix | 1 + pkgs/top-level/stage.nix | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/bintools-wrapper/default.nix b/pkgs/build-support/bintools-wrapper/default.nix index 878439cb31a66..fdf3fcfb284d0 100644 --- a/pkgs/build-support/bintools-wrapper/default.nix +++ b/pkgs/build-support/bintools-wrapper/default.nix @@ -43,6 +43,7 @@ "fortify3" "pic" "relro" + "stackclashprotection" "stackprotector" "strictoverflow" "zerocallusedregs" diff --git a/pkgs/top-level/stage.nix b/pkgs/top-level/stage.nix index 1cedd8dd18458..b9f671629c390 100644 --- a/pkgs/top-level/stage.nix +++ b/pkgs/top-level/stage.nix @@ -329,7 +329,6 @@ let super'.stdenv.cc.defaultHardeningFlags ++ [ "shadowstack" "pacret" - "stackclashprotection" "trivialautovarinit" ] ) super'.stdenv; From 2e30794916665787d7a7831972272e3d160ab856 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 12 Jan 2025 02:01:23 +0000 Subject: [PATCH 016/343] harfbuzz: 10.1.0 -> 10.2.0 --- pkgs/development/libraries/harfbuzz/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/harfbuzz/default.nix b/pkgs/development/libraries/harfbuzz/default.nix index e05d85a4a015c..243ebdae73513 100644 --- a/pkgs/development/libraries/harfbuzz/default.nix +++ b/pkgs/development/libraries/harfbuzz/default.nix @@ -36,11 +36,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "harfbuzz${lib.optionalString withIcu "-icu"}"; - version = "10.1.0"; + version = "10.2.0"; src = fetchurl { url = "https://github.com/harfbuzz/harfbuzz/releases/download/${finalAttrs.version}/harfbuzz-${finalAttrs.version}.tar.xz"; - hash = "sha256-bONSDy0ImjPO8PxIMhM0uOC3IUH2p2Nxmqrs0neey4I="; + hash = "sha256-Yg40aPrsLqhoXTLEalhGm4UO9jBAs1Zc3gWVmCW0gic="; }; postPatch = From 117929b9ccfc42c338e5ecfa00ec980a27611549 Mon Sep 17 00:00:00 2001 From: Isaac Shapira Date: Fri, 12 Jan 2024 17:28:58 -0700 Subject: [PATCH 017/343] buildNpmPackage: avoid using npm config --- .../node/build-npm-package/hooks/npm-config-hook.sh | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/build-support/node/build-npm-package/hooks/npm-config-hook.sh b/pkgs/build-support/node/build-npm-package/hooks/npm-config-hook.sh index 486b0c2f8372d..6a301e715ef8c 100644 --- a/pkgs/build-support/node/build-npm-package/hooks/npm-config-hook.sh +++ b/pkgs/build-support/node/build-npm-package/hooks/npm-config-hook.sh @@ -81,9 +81,11 @@ npmConfigHook() { cachePath="$TMPDIR/cache" fi - npm config set cache "$cachePath" - npm config set offline true - npm config set progress false + echo "Setting npm_config_cache to $cachePath" + # do not use npm config to avoid modifying .npmrc + export npm_config_cache="$cachePath" + export npm_config_offline="true" + export npm_config_progress="false" echo "Installing dependencies" From aedf74603ab156d5353389d872c87744f4102b8a Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Sun, 12 Jan 2025 17:46:13 +0100 Subject: [PATCH 018/343] taglib: Modernise - Set strictDeps - Use lib.cmake* for cmakeFlags - Drop meta-wide "with lib" - Correct meta.license: COPYING.LGPL on the repo is version 2.1, no plus clauses used in code - Add meta.platforms --- pkgs/by-name/ta/taglib/package.nix | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/ta/taglib/package.nix b/pkgs/by-name/ta/taglib/package.nix index 684a37f0172fb..865ee774ddee2 100644 --- a/pkgs/by-name/ta/taglib/package.nix +++ b/pkgs/by-name/ta/taglib/package.nix @@ -18,21 +18,23 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-QX0EpHGT36UsgIfRf5iALnwxe0jjLpZvCTbk8vSMFF4="; }; + strictDeps = true; + nativeBuildInputs = [ cmake ]; buildInputs = [ zlib ]; cmakeFlags = [ - "-DBUILD_SHARED_LIBS=ON" + (lib.cmakeBool "BUILD_SHARED_LIBS" (!stdenv.hostPlatform.isStatic)) # Workaround unconditional ${prefix} until upstream is fixed: # https://github.com/taglib/taglib/issues/1098 - "-DCMAKE_INSTALL_LIBDIR=lib" - "-DCMAKE_INSTALL_INCLUDEDIR=include" + (lib.cmakeFeature "CMAKE_INSTALL_LIBDIR" "lib") + (lib.cmakeFeature "CMAKE_INSTALL_INCLUDEDIR" "include") ]; passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; - meta = with lib; { + meta = { homepage = "https://taglib.org/"; description = "Library for reading and editing audio file metadata"; mainProgram = "taglib-config"; @@ -42,14 +44,15 @@ stdenv.mkDerivation (finalAttrs: { files, Ogg Vorbis comments and ID3 tags and Vorbis comments in FLAC, MPC, Speex, WavPack, TrueAudio, WAV, AIFF, MP4 and ASF files. ''; - license = with licenses; [ - lgpl3 + license = with lib.licenses; [ + lgpl21Only mpl11 ]; - maintainers = with maintainers; [ ttuegel ]; + maintainers = with lib.maintainers; [ ttuegel ]; pkgConfigModules = [ "taglib" "taglib_c" ]; + platforms = lib.platforms.all; }; }) From 3f8f35ae4345e930bbe42ce64b765f33ce9b9a8a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 13 Jan 2025 01:12:30 +0000 Subject: [PATCH 019/343] openblas: 0.3.28 -> 0.3.29 --- pkgs/development/libraries/science/math/openblas/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/science/math/openblas/default.nix b/pkgs/development/libraries/science/math/openblas/default.nix index 0a81f0f8af393..9ceec2d760d01 100644 --- a/pkgs/development/libraries/science/math/openblas/default.nix +++ b/pkgs/development/libraries/science/math/openblas/default.nix @@ -158,7 +158,7 @@ let in stdenv.mkDerivation rec { pname = "openblas"; - version = "0.3.28"; + version = "0.3.29"; outputs = [ "out" @@ -169,7 +169,7 @@ stdenv.mkDerivation rec { owner = "OpenMathLib"; repo = "OpenBLAS"; rev = "v${version}"; - hash = "sha256-430zG47FoBNojcPFsVC7FA43FhVPxrulxAW3Fs6CHo8="; + hash = "sha256-n/3FGmZxnNiOEKYHSIuqX2LJS1BzYPCwLWT9DSwEoPI="; }; postPatch = '' From 2c2a56dba0ef44460f2fffb4caf6659f8ea60ba6 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Mon, 13 Jan 2025 06:23:28 +0000 Subject: [PATCH 020/343] doxygen: 1.13.0 -> 1.13.2 Changes: - https://www.doxygen.nl/manual/changelog.html#log_1_13_1 - https://www.doxygen.nl/manual/changelog.html#log_1_13_2 --- pkgs/development/tools/documentation/doxygen/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/documentation/doxygen/default.nix b/pkgs/development/tools/documentation/doxygen/default.nix index 66ccab402e2f3..194b614a12d5b 100644 --- a/pkgs/development/tools/documentation/doxygen/default.nix +++ b/pkgs/development/tools/documentation/doxygen/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "doxygen"; - version = "1.13.0"; + version = "1.13.2"; src = fetchFromGitHub { owner = "doxygen"; repo = "doxygen"; tag = "Release_${lib.replaceStrings [ "." ] [ "_" ] version}"; - hash = "sha256-XKzH2nMByE0WE7WX4YYj2boq9+iwD7SyO5w9/4g9cGE="; + hash = "sha256-tet2Ep2Mvucg2QBJbo9A6531cJhQ9L7+ZMmo07S8cwY="; }; # https://github.com/doxygen/doxygen/issues/10928#issuecomment-2179320509 From 4517d158a1c8bfdeeaefc20a66e56c977e82ec90 Mon Sep 17 00:00:00 2001 From: FliegendeWurst Date: Wed, 8 Jan 2025 12:32:19 +0100 Subject: [PATCH 021/343] glog: disable broken test everywhere --- pkgs/by-name/gl/glog/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gl/glog/package.nix b/pkgs/by-name/gl/glog/package.nix index ed30b55a60f4a..6206cdf3e1c99 100644 --- a/pkgs/by-name/gl/glog/package.nix +++ b/pkgs/by-name/gl/glog/package.nix @@ -67,8 +67,8 @@ stdenv.mkDerivation rec { lib.optionals stdenv.hostPlatform.isDarwin [ "mock-log" ] - ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ - "logging" # works around segfaults on aarch64-darwin for now + ++ [ + "logging" # works around segfaults for now ]; excludedTestsRegex = lib.optionalString ( excludedTests != [ ] From 824d063356df578d766dc20c322637c013b9ec9b Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Tue, 14 Jan 2025 07:10:24 +0000 Subject: [PATCH 022/343] npth: 1.7 -> 1.8 Changes: https://dev.gnupg.org/T7387 --- pkgs/by-name/np/npth/package.nix | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/pkgs/by-name/np/npth/package.nix b/pkgs/by-name/np/npth/package.nix index 16e386e721439..d3b6d95cd5ac5 100644 --- a/pkgs/by-name/np/npth/package.nix +++ b/pkgs/by-name/np/npth/package.nix @@ -2,28 +2,19 @@ lib, stdenv, fetchurl, - fetchpatch, autoreconfHook, pkgsCross, }: stdenv.mkDerivation rec { pname = "npth"; - version = "1.7"; + version = "1.8"; src = fetchurl { url = "mirror://gnupg/npth/npth-${version}.tar.bz2"; - sha256 = "sha256-hYn1aTe3XOM7KNMS/MvzArO3HsPzlF/eaqp0AnkUrQU="; + hash = "sha256-i9JLTyOjBl1uWybpirqc54PqT9eBBpwbNdFJaU6Qyj4="; }; - patches = [ - (fetchpatch { - name = "musl.patch"; - url = "https://git.gnupg.org/cgi-bin/gitweb.cgi?p=npth.git;a=patch;h=417abd56fd7bf45cd4948414050615cb1ad59134"; - hash = "sha256-0g2tLFjW1bybNi6oxlW7vPimsQLjmTih4JZSoATjESI="; - }) - ]; - nativeBuildInputs = [ autoreconfHook ]; doCheck = true; From 6845526c09ed356f0bdde74ec747aaf079f80a70 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 14 Jan 2025 19:34:09 +0100 Subject: [PATCH 023/343] iana-etc: 20240318 -> 20250108 Diff: https://github.com/Mic92/iana-etc/compare/None...20250108 --- pkgs/by-name/ia/iana-etc/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ia/iana-etc/package.nix b/pkgs/by-name/ia/iana-etc/package.nix index 0cfaee22c6e4c..f3a2fac0fb3c7 100644 --- a/pkgs/by-name/ia/iana-etc/package.nix +++ b/pkgs/by-name/ia/iana-etc/package.nix @@ -7,11 +7,11 @@ stdenvNoCC.mkDerivation rec { pname = "iana-etc"; - version = "20240318"; + version = "20250108"; src = fetchzip { url = "https://github.com/Mic92/iana-etc/releases/download/${version}/iana-etc-${version}.tar.gz"; - sha256 = "sha256-t/VOTFDdAH+EdzofdMyUO9Yvl5qdMjdPl9ebYtBC388="; + sha256 = "sha256-vQxZ8wqAQfBuyQ6QOQonmotBpl0JFJKqkw9NTma1G6k="; }; installPhase = '' From 7befd3471f0ff2c05ca12da1753953960afadb7a Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Wed, 15 Jan 2025 06:25:22 +0000 Subject: [PATCH 024/343] sqlite, sqlite-analyzer: 3.47.2 -> 3.48.0 Changes: https://www.sqlite.org/releaselog/3_48_0.html --- pkgs/development/libraries/sqlite/default.nix | 13 +++++-------- pkgs/development/libraries/sqlite/tools.nix | 6 +++--- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix index c483d5e3a2629..5522cab569ab9 100644 --- a/pkgs/development/libraries/sqlite/default.nix +++ b/pkgs/development/libraries/sqlite/default.nix @@ -16,17 +16,17 @@ in stdenv.mkDerivation rec { pname = "sqlite${lib.optionalString interactive "-interactive"}"; - version = "3.47.2"; + version = "3.48.0"; # nixpkgs-update: no auto update # NB! Make sure to update ./tools.nix src (in the same directory). src = fetchurl { - url = "https://sqlite.org/2024/sqlite-autoconf-${archiveVersion version}.tar.gz"; - hash = "sha256-8bLuQSwo10cryVupljaNbwzc8ANir/2tsn7ShsF5VAs="; + url = "https://sqlite.org/2025/sqlite-autoconf-${archiveVersion version}.tar.gz"; + hash = "sha256-rJkvf8o5id5+0f6ZwWNj+Eh5TIwyoVja/U65J6LgL9U="; }; docsrc = fetchurl { - url = "https://sqlite.org/2024/sqlite-doc-${archiveVersion version}.zip"; - hash = "sha256-bcyommdJAp+6gbwPQYjL1PeKy0jWo+rcbVSK+RF8P0E="; + url = "https://sqlite.org/2025/sqlite-doc-${archiveVersion version}.zip"; + hash = "sha256-PcE3/NfGrLMmr2CmG5hE3RXTdzywXnqc4nbEH3E9dlo="; }; outputs = [ "bin" "dev" "man" "doc" "out" ]; @@ -86,9 +86,6 @@ stdenv.mkDerivation rec { ''; postInstall = '' - # Do not contaminate dependent libtool-based projects with sqlite dependencies. - sed -i $out/lib/libsqlite3.la -e "s/dependency_libs=.*/dependency_libs='''/" - mkdir -p $doc/share/doc unzip $docsrc mv sqlite-doc-${archiveVersion version} $doc/share/doc/sqlite diff --git a/pkgs/development/libraries/sqlite/tools.nix b/pkgs/development/libraries/sqlite/tools.nix index 29c6192fd7dea..fc32439f9e317 100644 --- a/pkgs/development/libraries/sqlite/tools.nix +++ b/pkgs/development/libraries/sqlite/tools.nix @@ -4,12 +4,12 @@ let archiveVersion = import ./archive-version.nix lib; mkTool = { pname, makeTarget, description, homepage, mainProgram }: stdenv.mkDerivation rec { inherit pname; - version = "3.47.2"; + version = "3.48.0"; # nixpkgs-update: no auto update src = assert version == sqlite.version; fetchurl { - url = "https://sqlite.org/2024/sqlite-src-${archiveVersion version}.zip"; - hash = "sha256-5qRx8SOCJfNMLEjFYBtUAkzFOARDaCMPWf8Gcr4fxiM="; + url = "https://sqlite.org/2025/sqlite-src-${archiveVersion version}.zip"; + hash = "sha256-LXsDK2/f6MRCqoCfhQaHqB0GOB3uzXvjMSYB0oYS5kA="; }; nativeBuildInputs = [ unzip ]; From 514875c4bf7608d5bd5d8ad141ee18ed5cba0cdd Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Wed, 15 Jan 2025 07:05:05 +0000 Subject: [PATCH 025/343] libinput: 1.27.0 -> 1.27.1 Changes: https://newreleases.io/project/freedesktop-gitlab/libinput/libinput/release/1.27.1 --- pkgs/development/libraries/libinput/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libinput/default.nix b/pkgs/development/libraries/libinput/default.nix index 36e232ee0d0d5..bb527c5257dbf 100644 --- a/pkgs/development/libraries/libinput/default.nix +++ b/pkgs/development/libraries/libinput/default.nix @@ -46,7 +46,7 @@ in stdenv.mkDerivation rec { pname = "libinput"; - version = "1.27.0"; + version = "1.27.1"; outputs = [ "bin" "out" "dev" ]; @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { owner = "libinput"; repo = "libinput"; rev = version; - hash = "sha256-aeCMZnH4RPvaV4+1kqeOSqIj1ViUlaryEXQAo8KaOQE="; + hash = "sha256-3U+2a/uSoSj1t34uz7xO2QQtJExygKOhBL7BUGP0Fbo="; }; patches = [ From 45a36cc9da3b7cc25b946f4db4c0276a0331de66 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 18 Jan 2025 00:34:48 +0000 Subject: [PATCH 026/343] libexif: 0.6.24 -> 0.6.25 --- pkgs/by-name/li/libexif/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/li/libexif/package.nix b/pkgs/by-name/li/libexif/package.nix index 31fc243ca2dfc..35f37c9c41a92 100644 --- a/pkgs/by-name/li/libexif/package.nix +++ b/pkgs/by-name/li/libexif/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "libexif"; - version = "0.6.24"; + version = "0.6.25"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "${pname}-${builtins.replaceStrings [ "." ] [ "_" ] version}-release"; - sha256 = "sha256-Eqgnm31s8iPJdhTpk5HM89HSZTXTK+e7YZ/CCdbeJX4="; + sha256 = "sha256-H8YzfNO2FCrYAwEA4bkOpRdxISK9RXaHVuK8zz70TlM="; }; nativeBuildInputs = [ From dd00c73e4c9aad9a2d1a443d62a7bbd6489e1b3a Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sat, 18 Jan 2025 06:28:09 +0000 Subject: [PATCH 027/343] s2n-tls: 1.5.10 -> 1.5.11 Changes: https://github.com/aws/s2n-tls/releases/tag/v1.5.11 --- pkgs/by-name/s2/s2n-tls/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/s2/s2n-tls/package.nix b/pkgs/by-name/s2/s2n-tls/package.nix index 2f327ea9e768b..283415040952c 100644 --- a/pkgs/by-name/s2/s2n-tls/package.nix +++ b/pkgs/by-name/s2/s2n-tls/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "s2n-tls"; - version = "1.5.10"; + version = "1.5.11"; src = fetchFromGitHub { owner = "aws"; repo = "s2n-tls"; rev = "v${version}"; - hash = "sha256-oIDWlWE9HE+Zrhei2D56U/dO1VEkbQg3VLrUIopg2oc="; + hash = "sha256-3eh4+y3XyO2sUfPhkOeF5fKgakFz9f4zLceYqklEYBw="; }; nativeBuildInputs = [ cmake ]; From a7bb9745cb0f543331c6b9b13c299e93510ea651 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oliv=C3=A9r=20Falvai?= Date: Sat, 18 Jan 2025 22:01:37 +0100 Subject: [PATCH 028/343] awscli2: make it build with darwin sandbox --- pkgs/by-name/aw/awscli2/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/aw/awscli2/package.nix b/pkgs/by-name/aw/awscli2/package.nix index 24064b1668e1e..a835aa5684e69 100644 --- a/pkgs/by-name/aw/awscli2/package.nix +++ b/pkgs/by-name/aw/awscli2/package.nix @@ -146,6 +146,9 @@ py.pkgs.buildPythonApplication rec { rm $out/nix-support/propagated-build-inputs ''; + # tests/unit/customizations/sso/test_utils.py uses sockets + __darwinAllowLocalNetworking = true; + pytestFlagsArray = [ "-Wignore::DeprecationWarning" ]; From d0d2f479c2f5aad8fd0b25b5c8c40147d9f83f51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oliv=C3=A9r=20Falvai?= Date: Sat, 18 Jan 2025 22:02:28 +0100 Subject: [PATCH 029/343] pythonPackages.pook: make it build with darwin sandbox --- pkgs/development/python-modules/pook/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/pook/default.nix b/pkgs/development/python-modules/pook/default.nix index 9b704e6b2e77c..f168ad2bba503 100644 --- a/pkgs/development/python-modules/pook/default.nix +++ b/pkgs/development/python-modules/pook/default.nix @@ -53,6 +53,9 @@ buildPythonPackage rec { "tests/unit/interceptors/" ]; + # Tests use sockets + __darwinAllowLocalNetworking = true; + meta = with lib; { description = "HTTP traffic mocking and testing"; homepage = "https://github.com/h2non/pook"; From 83efee239ff434bd7b8adcba2397902f20f5e156 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oliv=C3=A9r=20Falvai?= Date: Sat, 18 Jan 2025 22:02:50 +0100 Subject: [PATCH 030/343] pythonPackages.pytest-services: make it build with darwin sandbox --- pkgs/development/python-modules/pytest-services/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/pytest-services/default.nix b/pkgs/development/python-modules/pytest-services/default.nix index a8a0b69f363bc..537e06b5e04b7 100644 --- a/pkgs/development/python-modules/pytest-services/default.nix +++ b/pkgs/development/python-modules/pytest-services/default.nix @@ -66,6 +66,9 @@ buildPythonPackage rec { "test_xvfb" ]; + # Tests use sockets + __darwinAllowLocalNetworking = true; + meta = with lib; { description = "Services plugin for pytest testing framework"; homepage = "https://github.com/pytest-dev/pytest-services"; From 5b4e52e94ce748de047e934b67cb8e46e1de27d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oliv=C3=A9r=20Falvai?= Date: Sat, 18 Jan 2025 22:03:54 +0100 Subject: [PATCH 031/343] pythonPackages.waitress: make it build with darwin sandbox --- pkgs/development/python-modules/waitress/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/waitress/default.nix b/pkgs/development/python-modules/waitress/default.nix index 79e9b73780bb2..4a3fb719bb530 100644 --- a/pkgs/development/python-modules/waitress/default.nix +++ b/pkgs/development/python-modules/waitress/default.nix @@ -31,6 +31,9 @@ buildPythonPackage rec { "test_service_port" ]; + # Tests use sockets + __darwinAllowLocalNetworking = true; + meta = with lib; { homepage = "https://github.com/Pylons/waitress"; description = "Waitress WSGI server"; From baab5df8efc83fec1c95686b7f7d040ac235583b Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sun, 19 Jan 2025 09:51:17 +0000 Subject: [PATCH 032/343] lvm2: 2.03.29 -> 2.03.30 Changes: https://gitlab.com/lvmteam/lvm2/-/tags/v2_03_30 --- pkgs/os-specific/linux/lvm2/2_03.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/lvm2/2_03.nix b/pkgs/os-specific/linux/lvm2/2_03.nix index 558f54afadd8d..d45fb41336ba6 100644 --- a/pkgs/os-specific/linux/lvm2/2_03.nix +++ b/pkgs/os-specific/linux/lvm2/2_03.nix @@ -1,4 +1,4 @@ import ./common.nix { - version = "2.03.29"; - hash = "sha256-MMU3dstN32v57KKdDCjb+cWsFwwJFUMhITsRw9u1vpw="; + version = "2.03.30"; + hash = "sha256-rXar7LjciHcz4GxEnLmt0Eo1BvnweAwSiBem4aF87AU="; } From bfd2463b20a160d66d9149a58943455dd1abc5c9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 20 Jan 2025 00:39:29 +0000 Subject: [PATCH 033/343] sord: 0.16.16 -> 0.16.18 --- pkgs/by-name/so/sord/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/so/sord/package.nix b/pkgs/by-name/so/sord/package.nix index aeda79e8a4a58..faa786b97d78d 100644 --- a/pkgs/by-name/so/sord/package.nix +++ b/pkgs/by-name/so/sord/package.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "sord"; - version = "0.16.16"; + version = "0.16.18"; src = fetchFromGitHub { owner = "drobilla"; repo = pname; rev = "v${version}"; - hash = "sha256-GDs1m8KoEhJDdCf7kacQMZzCNPoZhESJds6KupQvOkU="; + hash = "sha256-cFobmmO2RHJdfCgTyGigzsdLpj7YF6U3r71i267Azks="; }; outputs = [ From 6e1ce1a647bbda8e174970a3811ad121bc79f6e7 Mon Sep 17 00:00:00 2001 From: Tristan Ross Date: Sat, 18 Jan 2025 22:15:42 -0800 Subject: [PATCH 034/343] perl: set ar, cc, and ld in the generic builder --- pkgs/development/perl-modules/generic/builder.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/perl-modules/generic/builder.sh b/pkgs/development/perl-modules/generic/builder.sh index 3c45dc3b4c5a4..c95b5cbb7d544 100644 --- a/pkgs/development/perl-modules/generic/builder.sh +++ b/pkgs/development/perl-modules/generic/builder.sh @@ -23,7 +23,9 @@ preConfigure() { local flagsArray=() concatTo flagsArray makeMakerFlags - perl Makefile.PL PREFIX=$out INSTALLDIRS=site "${flagsArray[@]}" PERL=$(type -P perl) FULLPERL=\"$fullperl/bin/perl\" + perl Makefile.PL AR=$AR FULL_AR=$AR CC=$CC LD=$CC CPPRUN="$CC -E" \ + PREFIX=$out INSTALLDIRS=site "${flagsArray[@]}" \ + PERL=$(type -P perl) FULLPERL=\"$fullperl/bin/perl\" } if test -n "$perlPreHook"; then From 365e9b3b0b48056067ef942417096b84a31c0b63 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Mon, 20 Jan 2025 06:29:55 +0000 Subject: [PATCH 035/343] sratom: 0.6.16 - 0.6.18 Changes: https://drobilla.net/2025/01/19/sratom-0-6-18.html --- pkgs/by-name/sr/sratom/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sr/sratom/package.nix b/pkgs/by-name/sr/sratom/package.nix index b92c4d2f67e9b..bcff1fc39ee97 100644 --- a/pkgs/by-name/sr/sratom/package.nix +++ b/pkgs/by-name/sr/sratom/package.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { pname = "sratom"; - version = "0.6.16"; + version = "0.6.18"; outputs = [ "out" @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://download.drobilla.net/${pname}-${version}.tar.xz"; - hash = "sha256-ccFXmRGD5T0FVTk7tCccdcm19dq3Sl7yLyCLsi3jIsQ="; + hash = "sha256-TGptngtNbAHMBqiEmRD+zrkuZmyzh3nGFN0kBKmTHpI="; }; strictDeps = true; From ceba2c6c3ba235cbf2b92666ff26d98838db774c Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Mon, 20 Jan 2025 06:35:33 +0000 Subject: [PATCH 036/343] serd: 0.32.2 -> 0.32.4 Changes: https://drobilla.net/2025/01/19/serd-0-32-4.html --- pkgs/by-name/se/serd/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/se/serd/package.nix b/pkgs/by-name/se/serd/package.nix index 750591e0f2e23..4c830a3e430ed 100644 --- a/pkgs/by-name/se/serd/package.nix +++ b/pkgs/by-name/se/serd/package.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { pname = "serd"; - version = "0.32.2"; + version = "0.32.4"; outputs = [ "out" @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://download.drobilla.net/${pname}-${version}.tar.xz"; - hash = "sha256-333CyW8rod7P11bkWOBh3tfYFY0lVVTnaTSDrAljxWs="; + hash = "sha256-y++1aejbaGvoxpyzhmqVOMfLBV6PJCF91qRHHv+n00k="; }; nativeBuildInputs = [ From 261db7efdc493542cc868e39c602d86658e8080a Mon Sep 17 00:00:00 2001 From: FliegendeWurst Date: Sun, 19 Jan 2025 12:21:41 +0100 Subject: [PATCH 037/343] llvmPackages.openmp: fix cross build --- pkgs/development/compilers/llvm/common/openmp/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/compilers/llvm/common/openmp/default.nix b/pkgs/development/compilers/llvm/common/openmp/default.nix index 68c50e06abd30..52e04dd03abc3 100644 --- a/pkgs/development/compilers/llvm/common/openmp/default.nix +++ b/pkgs/development/compilers/llvm/common/openmp/default.nix @@ -14,6 +14,7 @@ , clang-unwrapped , perl , pkg-config +, python3 , version , devExtraCmakeFlags ? [] }: @@ -45,6 +46,7 @@ stdenv.mkDerivation (rec { nativeBuildInputs = [ cmake + python3.pythonOnBuildForHost ] ++ lib.optionals (lib.versionAtLeast release_version "15") [ ninja ] ++ [ perl ] ++ lib.optionals (lib.versionAtLeast release_version "14") [ @@ -53,6 +55,7 @@ stdenv.mkDerivation (rec { buildInputs = [ (if stdenv.buildPlatform == stdenv.hostPlatform then llvm else targetLlvm) + python3 ]; cmakeFlags = lib.optionals (lib.versions.major release_version == "13") [ From 95f46cf70bdc142b0b7eadfe91b2e8bf8c389aff Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Mon, 20 Jan 2025 21:52:41 +0000 Subject: [PATCH 038/343] serd: access to `version` via `finalAttrs` --- pkgs/by-name/se/serd/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/se/serd/package.nix b/pkgs/by-name/se/serd/package.nix index 4c830a3e430ed..f7deb8c01c13b 100644 --- a/pkgs/by-name/se/serd/package.nix +++ b/pkgs/by-name/se/serd/package.nix @@ -13,7 +13,7 @@ writeScript, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "serd"; version = "0.32.4"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ]; src = fetchurl { - url = "https://download.drobilla.net/${pname}-${version}.tar.xz"; + url = "https://download.drobilla.net/serd-${finalAttrs.version}.tar.xz"; hash = "sha256-y++1aejbaGvoxpyzhmqVOMfLBV6PJCF91qRHHv+n00k="; }; @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { new_version="$(curl -s https://drobilla.net/category/serd/ | pcregrep -o1 'download.drobilla.net/serd-([0-9.]+).tar.xz' | head -n1)" - update-source-version ${pname} "$new_version" + update-source-version ${finalAttrs.pname} "$new_version" ''; }; @@ -67,4 +67,4 @@ stdenv.mkDerivation rec { mainProgram = "serdi"; platforms = lib.platforms.unix; }; -} +}) From 5481eb6b7edceabdac5613a4b2fffd195bf75d6e Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Tue, 21 Jan 2025 06:32:06 +0000 Subject: [PATCH 039/343] libzip: 1.11.2 -> 1.11.3 Changes: https://libzip.org/news/release-1.11.3.html --- pkgs/by-name/li/libzip/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/li/libzip/package.nix b/pkgs/by-name/li/libzip/package.nix index 8a4e56f86065f..6c6cbc95c7fc0 100644 --- a/pkgs/by-name/li/libzip/package.nix +++ b/pkgs/by-name/li/libzip/package.nix @@ -19,11 +19,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "libzip"; - version = "1.11.2"; + version = "1.11.3"; src = fetchurl { url = "https://libzip.org/download/libzip-${finalAttrs.version}.tar.gz"; - hash = "sha256-aypDg3AF4cI/3+5TK3j4BoY+QS0gibnEK0mrCMvNdmU="; + hash = "sha256-dmU/E13eMDYDbFAOEYYWSP+/nh/FsjP/RzxgiX2dsOo="; }; outputs = [ From 0662d80a4e138906a4b707437194a16eda0ce36a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 21 Jan 2025 07:50:47 +0000 Subject: [PATCH 040/343] dav1d: 1.5.0 -> 1.5.1 --- pkgs/by-name/da/dav1d/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/da/dav1d/package.nix b/pkgs/by-name/da/dav1d/package.nix index a17e26b2981f4..144bbe552a20b 100644 --- a/pkgs/by-name/da/dav1d/package.nix +++ b/pkgs/by-name/da/dav1d/package.nix @@ -27,13 +27,13 @@ assert useVulkan -> withExamples; stdenv.mkDerivation rec { pname = "dav1d"; - version = "1.5.0"; + version = "1.5.1"; src = fetchFromGitHub { owner = "videolan"; repo = pname; rev = version; - hash = "sha256-eOMQj88vlgoxguV+eK4iWXFjUPiXwqRTJlhehev+yGY="; + hash = "sha256-qcs9QoZ/uWEQ8l1ChZ8nYctZnnWJ0VvCw1q2rEktC9g="; }; outputs = [ From f53e20736f23e243c14a8ea6c0e3fa0a0b34ca1b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 21 Jan 2025 10:33:20 +0000 Subject: [PATCH 041/343] libmaxminddb: 1.11.0 -> 1.12.2 --- pkgs/by-name/li/libmaxminddb/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/li/libmaxminddb/package.nix b/pkgs/by-name/li/libmaxminddb/package.nix index 539fa33d2c545..ee2d191d7239c 100644 --- a/pkgs/by-name/li/libmaxminddb/package.nix +++ b/pkgs/by-name/li/libmaxminddb/package.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "libmaxminddb"; - version = "1.11.0"; + version = "1.12.2"; src = fetchurl { url = meta.homepage + "/releases/download/${version}/${pname}-${version}.tar.gz"; - sha256 = "sha256-su6nmpb+13rU1sOew0/tg9Rfy3WjHFiVaBPVjc8wsZ8="; + sha256 = "sha256-G/v477o+1kYuBOIlkGrVzl/pWKo9YmoSNbKiJT1gB0M="; }; meta = with lib; { From 0ac2e31b54cb69a7229b33e6b100d4a7f43278f7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 21 Jan 2025 15:29:18 +0000 Subject: [PATCH 042/343] libipt: 2.1.1 -> 2.1.2 --- pkgs/by-name/li/libipt/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/li/libipt/package.nix b/pkgs/by-name/li/libipt/package.nix index 73f14cec3603a..8b2baaad6ce18 100644 --- a/pkgs/by-name/li/libipt/package.nix +++ b/pkgs/by-name/li/libipt/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "libipt"; - version = "2.1.1"; + version = "2.1.2"; src = fetchFromGitHub { owner = "intel"; repo = "libipt"; rev = "v${version}"; - sha256 = "sha256-tyOheitSlccf/n3mklGL2oAKLBKYT60LSLre9/G/b9Q="; + sha256 = "sha256-rO2Mf2/BfKlPh1wHe0qTuyQAyqpSB/j3Q+JWpNDyNm0="; }; nativeBuildInputs = [ cmake ]; From 0f126632da421a8c7da53d3e411a4c10bbcbca18 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Wed, 22 Jan 2025 06:34:54 +0000 Subject: [PATCH 043/343] coreutils: 9.5 -> 9.6 Changes: https://savannah.gnu.org/news/?id=10715 --- pkgs/tools/misc/coreutils/default.nix | 17 +------ .../fix-mix-flags-deps-libintl.patch | 49 ------------------- .../coreutils/fix-test-failure-musl.patch | 23 --------- 3 files changed, 2 insertions(+), 87 deletions(-) delete mode 100644 pkgs/tools/misc/coreutils/fix-mix-flags-deps-libintl.patch delete mode 100644 pkgs/tools/misc/coreutils/fix-test-failure-musl.patch diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix index d7ce076e8a85b..9e841d6338c97 100644 --- a/pkgs/tools/misc/coreutils/default.nix +++ b/pkgs/tools/misc/coreutils/default.nix @@ -48,26 +48,13 @@ let in stdenv.mkDerivation rec { pname = "coreutils" + (optionalString (!minimal) "-full"); - version = "9.5"; + version = "9.6"; src = fetchurl { url = "mirror://gnu/coreutils/coreutils-${version}.tar.xz"; - hash = "sha256-zTKO3qyS9qZl3p8yPJO3Eq8YWLwuDYjz9xAEaUcKG4o="; + hash = "sha256-egEkMns5j9nrGmq95YM4mCFCLHRP+hBzSyT1V2ENMoM="; }; - patches = - [ - # https://lists.gnu.org/archive/html/bug-coreutils/2024-05/msg00037.html - # This is not precisely the patch provided - this is a diff of the Makefile.in - # after the patch was applied and autoreconf was run, since adding autoreconf - # here causes infinite recursion. - ./fix-mix-flags-deps-libintl.patch - ] - ++ lib.optionals stdenv.hostPlatform.isMusl [ - # https://lists.gnu.org/archive/html/bug-coreutils/2024-03/msg00089.html - ./fix-test-failure-musl.patch - ]; - postPatch = '' # The test tends to fail on btrfs, f2fs and maybe other unusual filesystems. diff --git a/pkgs/tools/misc/coreutils/fix-mix-flags-deps-libintl.patch b/pkgs/tools/misc/coreutils/fix-mix-flags-deps-libintl.patch deleted file mode 100644 index f6002b55faf69..0000000000000 --- a/pkgs/tools/misc/coreutils/fix-mix-flags-deps-libintl.patch +++ /dev/null @@ -1,49 +0,0 @@ ---- a/Makefile.in 2024-05-21 17:03:50.488979000 -0700 -+++ b/Makefile.in 2024-05-21 17:18:56.243091000 -0700 -@@ -692,8 +692,6 @@ - @USE_PCLMUL_CRC32_TRUE@am__append_211 = $(cksum_pclmul_ldadd) - @USE_AVX2_WC_LINECOUNT_TRUE@am__append_212 = src/libwc_avx2.a - @USE_AVX2_WC_LINECOUNT_TRUE@am__append_213 = $(wc_avx2_ldadd) --@SINGLE_BINARY_FALSE@src_coreutils_DEPENDENCIES = \ --@SINGLE_BINARY_FALSE@ $(am__DEPENDENCIES_2) - # Command arch - # Command hostname - # Command chroot -@@ -2825,6 +2823,12 @@ - nodist_src_coreutils_OBJECTS = - src_coreutils_OBJECTS = $(am_src_coreutils_OBJECTS) \ - $(nodist_src_coreutils_OBJECTS) -+@SINGLE_BINARY_FALSE@src_coreutils_DEPENDENCIES = \ -+@SINGLE_BINARY_FALSE@ $(am__DEPENDENCIES_2) -+@SINGLE_BINARY_TRUE@src_coreutils_DEPENDENCIES = \ -+@SINGLE_BINARY_TRUE@ $(am__DEPENDENCIES_1) \ -+@SINGLE_BINARY_TRUE@ $(am__DEPENDENCIES_2) \ -+@SINGLE_BINARY_TRUE@ $(am__DEPENDENCIES_1) - src_coreutils_LINK = $(CCLD) $(src_coreutils_CFLAGS) $(CFLAGS) \ - $(AM_LDFLAGS) $(LDFLAGS) -o $@ - am__objects_221 = src/copy.$(OBJEXT) src/cp-hash.$(OBJEXT) \ -@@ -7492,7 +7496,12 @@ - src_libstdbuf_so_CFLAGS = -fPIC $(AM_CFLAGS) - # Single binary dependencies - @SINGLE_BINARY_TRUE@src_coreutils_CFLAGS = -DSINGLE_BINARY $(AM_CFLAGS) --@SINGLE_BINARY_TRUE@src_coreutils_DEPENDENCIES = $(LDADD) $(single_binary_deps) -+ -+# Creates symlinks or shebangs to the installed programs when building -+# coreutils single binary. -+@SINGLE_BINARY_TRUE@EXTRA_src_coreutils_DEPENDENCIES = \ -+@SINGLE_BINARY_TRUE@ $(single_binary_deps) \ -+@SINGLE_BINARY_TRUE@ src/coreutils_$(single_binary_install_type) - @SINGLE_BINARY_TRUE@src_libsinglebin_dir_a_DEPENDENCIES = src/libsinglebin_ls.a - @SINGLE_BINARY_TRUE@src_libsinglebin_vdir_a_DEPENDENCIES = src/libsinglebin_ls.a - @SINGLE_BINARY_TRUE@src_libsinglebin_arch_a_DEPENDENCIES = src/libsinglebin_uname.a -@@ -7880,10 +7889,6 @@ - @SINGLE_BINARY_TRUE@src_libsinglebin_yes_a_DEPENDENCIES = $(src_yes_DEPENDENCIES) - @SINGLE_BINARY_TRUE@src_libsinglebin_yes_a_CFLAGS = "-Dmain=single_binary_main_yes (int, char **); int single_binary_main_yes" -Dusage=_usage_yes $(src_coreutils_CFLAGS) - --# Creates symlinks or shebangs to the installed programs when building --# coreutils single binary. --@SINGLE_BINARY_TRUE@EXTRA_src_coreutils_DEPENDENCIES = src/coreutils_$(single_binary_install_type) -- - # false exits nonzero even with --help or --version. - # test doesn't support --help or --version. - # Tell automake to exempt then from that installcheck test. diff --git a/pkgs/tools/misc/coreutils/fix-test-failure-musl.patch b/pkgs/tools/misc/coreutils/fix-test-failure-musl.patch deleted file mode 100644 index 2d54dd27ab3fb..0000000000000 --- a/pkgs/tools/misc/coreutils/fix-test-failure-musl.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 1defda6356c29c7f731bddb9e9231f594e01d9c9 -(adjusted so it can be applied on coreutils to coreutils tarball) - -Reported by Adept's Lab via Pádraig Brady at -. - -diff --git a/gnulib-tests/test-canonicalize.c b/gnulib-tests/test-canonicalize.c -index 6763a525c9..5d19285c00 100644 ---- a/gnulib-tests/test-canonicalize.c -+++ b/gnulib-tests/test-canonicalize.c -@@ -394,9 +394,9 @@ main (void) - ASSERT (stat ("/", &st1) == 0); - ASSERT (stat ("//", &st2) == 0); - bool same = psame_inode (&st1, &st2); --#if defined __MVS__ || defined MUSL_LIBC -- /* On IBM z/OS and musl libc, "/" and "//" both canonicalize to -- themselves, yet they both have st_dev == st_ino == 1. */ -+#if defined __MVS__ -+ /* On IBM z/OS, "/" and "//" both canonicalize to themselves, yet they both -+ have st_dev == st_ino == 1. */ - same = false; - #endif - if (same) From 702d03842740b572ee77bfb3d949ef0929a756d5 Mon Sep 17 00:00:00 2001 From: misilelaboratory Date: Wed, 22 Jan 2025 21:07:33 +0900 Subject: [PATCH 044/343] perl: 5.40.0 -> 5.40.1 Signed-off-by: misilelaboratory --- pkgs/development/interpreters/perl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/perl/default.nix b/pkgs/development/interpreters/perl/default.nix index 8fd99172be109..3c27f488b3610 100644 --- a/pkgs/development/interpreters/perl/default.nix +++ b/pkgs/development/interpreters/perl/default.nix @@ -65,8 +65,8 @@ in rec { # Maint version perl540 = callPackage ./interpreter.nix { self = perl540; - version = "5.40.0"; - sha256 = "sha256-x0A0jzVzljJ6l5XT6DI7r9D+ilx4NfwcuroMyN/nFh8="; + version = "5.40.1"; + sha256 = "sha256-AvjEW7N57Qw951FPrUjHFP1Gvo8LU2v9UyAFAWWh7iY="; inherit passthruFun; }; } From 20a84908cd1b6c1554d96b12dac241b936555992 Mon Sep 17 00:00:00 2001 From: misilelaboratory Date: Thu, 23 Jan 2025 01:17:13 +0900 Subject: [PATCH 045/343] iproute2: 6.12.0 -> 6.13.0 Signed-off-by: misilelaboratory --- pkgs/by-name/ip/iproute2/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ip/iproute2/package.nix b/pkgs/by-name/ip/iproute2/package.nix index d1b963a26035d..ab192d828ea36 100644 --- a/pkgs/by-name/ip/iproute2/package.nix +++ b/pkgs/by-name/ip/iproute2/package.nix @@ -17,11 +17,11 @@ stdenv.mkDerivation rec { pname = "iproute2"; - version = "6.12.0"; + version = "6.13.0"; src = fetchurl { url = "mirror://kernel/linux/utils/net/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-u9FB73tdASfMIVKEO6YfJ03DKBT6Pg8T59B6CAvvU9k="; + hash = "sha256-pDqkMzjYgrRNAeVJ8/EFqSrp/uoyqC+uRaiOekkwKBk="; }; patches = [ From f5bc15e449594009d67dbb5b02103e1d9c018252 Mon Sep 17 00:00:00 2001 From: misilelaboratory Date: Thu, 23 Jan 2025 02:45:48 +0900 Subject: [PATCH 046/343] perl538: 5.38.2 -> 5.38.3 Signed-off-by: misilelaboratory --- pkgs/development/interpreters/perl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/perl/default.nix b/pkgs/development/interpreters/perl/default.nix index 3c27f488b3610..5c9034a0472a8 100644 --- a/pkgs/development/interpreters/perl/default.nix +++ b/pkgs/development/interpreters/perl/default.nix @@ -57,8 +57,8 @@ in rec { # Maint version perl538 = callPackage ./interpreter.nix { self = perl538; - version = "5.38.2"; - sha256 = "sha256-oKMVNEUet7g8fWWUpJdUOlTUiLyQygD140diV39AZV4="; + version = "5.38.3"; + sha256 = "sha256-ioAzhZ3R116wyRWO7dc4TfGva0aipOhQc7B+bMfFuHM="; inherit passthruFun; }; From cebe2f93e3bab3fce1c10e9e51ff108bd3169732 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Thu, 23 Jan 2025 06:18:41 +0000 Subject: [PATCH 047/343] mupdf: 1.25.2 -> 1.25.3 Changes: https://mupdf.com/releases/history --- pkgs/by-name/mu/mupdf/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/mu/mupdf/package.nix b/pkgs/by-name/mu/mupdf/package.nix index 93839bb440234..79fc67987ca68 100644 --- a/pkgs/by-name/mu/mupdf/package.nix +++ b/pkgs/by-name/mu/mupdf/package.nix @@ -62,12 +62,12 @@ let in stdenv.mkDerivation rec { - version = "1.25.2"; + version = "1.25.3"; pname = "mupdf"; src = fetchurl { url = "https://mupdf.com/downloads/archive/${pname}-${version}-source.tar.gz"; - hash = "sha256-Nsz2peaR4Yis+NtumNCL8F8nu0zjBDLcFfx20ympLU0="; + hash = "sha256-uXTXBqloBTPRBLQRIiTHvz3pPye+fKQbS/tRVSYk8Kk="; }; patches = [ From 78a09ac680cb37ef934165195d6fbefd23adcaef Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sat, 18 Jan 2025 06:54:44 +0000 Subject: [PATCH 048/343] pahole: 1.27 -> 1.29 Changes: - https://lore.kernel.org/bpf/Z1RcnB8WD8wZphcr@x1/T/ - https://lore.kernel.org/bpf/Z4-TDt42dTKZvCo6@x1/T/ --- pkgs/by-name/pa/pahole/package.nix | 18 +++--------------- .../pa/pahole/threading-reproducibility.patch | 6 ++---- 2 files changed, 5 insertions(+), 19 deletions(-) diff --git a/pkgs/by-name/pa/pahole/package.nix b/pkgs/by-name/pa/pahole/package.nix index 444b165cb80d0..b75d39b34f57a 100644 --- a/pkgs/by-name/pa/pahole/package.nix +++ b/pkgs/by-name/pa/pahole/package.nix @@ -10,15 +10,14 @@ argp-standalone, musl-obstack, nixosTests, - fetchpatch, }: stdenv.mkDerivation rec { pname = "pahole"; - version = "1.27"; + version = "1.29"; src = fetchzip { url = "https://git.kernel.org/pub/scm/devel/pahole/pahole.git/snapshot/pahole-${version}.tar.gz"; - hash = "sha256-BwA17lc2yegmOzLfoIu8OmG/PVdc+4sOGzB8Jc4ZjGM="; + hash = "sha256-ke7WIIz0ZURw3Pgmt7WNL9WPbcv5B998Rflw/8/JQ8U="; }; nativeBuildInputs = [ @@ -39,22 +38,11 @@ stdenv.mkDerivation rec { patches = [ # https://github.com/acmel/dwarves/pull/51 / https://lkml.kernel.org/r/20240626032253.3406460-1-asmadeus@codewreck.org ./threading-reproducibility.patch - # https://github.com/acmel/dwarves/issues/53 - (fetchpatch { - name = "fix-clang-btf-generation-bug.patch"; - url = "https://github.com/acmel/dwarves/commit/6a2b27c0f512619b0e7a769a18a0fb05bb3789a5.patch"; - hash = "sha256-Le1BAew/a/QKkYNLgSQxEvZ9mEEglUw8URwz1kiheeE="; - }) - (fetchpatch { - name = "fix-clang-btf-generation-bug-2.patch"; - url = "https://github.com/acmel/dwarves/commit/94a01bde592c555b3eb526aeb4c2ad695c5660d8.patch"; - hash = "sha256-SMIxLEBjBkprAqVNX1h7nXxAsgbwvCD/Bz7c1ekwg5w="; - }) ]; # Put libraries in "lib" subdirectory, not top level of $out cmakeFlags = [ - "-D__LIB=lib" + "-DCMAKE_INSTALL_LIBDIR=lib" "-DLIBBPF_EMBEDDED=OFF" ]; diff --git a/pkgs/by-name/pa/pahole/threading-reproducibility.patch b/pkgs/by-name/pa/pahole/threading-reproducibility.patch index 3c76d9c8521e7..0cc9a6154407c 100644 --- a/pkgs/by-name/pa/pahole/threading-reproducibility.patch +++ b/pkgs/by-name/pa/pahole/threading-reproducibility.patch @@ -1,5 +1,3 @@ -diff --git a/pahole.c b/pahole.c -index 954498d2ad4f..2b010658330c 100644 --- a/pahole.c +++ b/pahole.c @@ -3705,6 +3705,10 @@ int main(int argc, char *argv[]) @@ -10,6 +8,6 @@ index 954498d2ad4f..2b010658330c 100644 + if (getenv("SOURCE_DATE_EPOCH")) + conf_load.reproducible_build = true; + - if (languages.str && parse_languages()) - return rc; + if (show_running_kernel_vmlinux) { + const char *vmlinux = vmlinux_path__find_running_kernel(); From 42d80b7a7ec5e116b165d82ba27bce57ecda36c2 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Thu, 23 Jan 2025 06:41:32 +0000 Subject: [PATCH 049/343] python3Packages.pymupdf: 1.25.1 -> 1.25.2 Changes: https://github.com/pymupdf/PyMuPDF/releases/tag/1.25.2 --- .../python-modules/pymupdf/default.nix | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pymupdf/default.nix b/pkgs/development/python-modules/pymupdf/default.nix index b73c6bd05998e..c05baaa6c444d 100644 --- a/pkgs/development/python-modules/pymupdf/default.nix +++ b/pkgs/development/python-modules/pymupdf/default.nix @@ -4,6 +4,7 @@ buildPythonPackage, pythonOlder, fetchFromGitHub, + fetchpatch, python, # build-system @@ -41,7 +42,7 @@ let in buildPythonPackage rec { pname = "pymupdf"; - version = "1.25.1"; + version = "1.25.2"; pyproject = true; disabled = pythonOlder "3.7"; @@ -50,9 +51,19 @@ buildPythonPackage rec { owner = "pymupdf"; repo = "PyMuPDF"; tag = version; - hash = "sha256-kdu8CuQJ5+h8+PS66acWEfcttgALiD+JBoWWyGtjBzs="; + hash = "sha256-6XbHQ8PE9IF0kngUhYkFSGjwgt+r+19v+PeDAQin2Ko="; }; + patches = [ + # Fix build against mupdf-1.25.3: + # https://github.com/pymupdf/PyMuPDF/pull/4248 + (fetchpatch { + name = "mupdf-1.25.3.patch"; + url = "https://github.com/pymupdf/PyMuPDF/commit/f42ef85058fee087d3f5e565f34a7657aad11240.patch"; + hash = "sha256-X5JF8nPLj4uubdEdvUJ5aEf0yZkW+ks99pzua0vCrZc="; + }) + ]; + # swig is not wrapped as Python package # libclang calls itself just clang in wheel metadata postPatch = '' From 9f93116aa0684a19a83bc971841893dc87c98bd7 Mon Sep 17 00:00:00 2001 From: rewine Date: Thu, 23 Jan 2025 13:14:46 +0800 Subject: [PATCH 050/343] boost: fix operator<< for shared_ptr and intrusive_ptr --- pkgs/development/libraries/boost/generic.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix index 593c8b8deddf4..64194a509446e 100644 --- a/pkgs/development/libraries/boost/generic.nix +++ b/pkgs/development/libraries/boost/generic.nix @@ -222,6 +222,15 @@ stdenv.mkDerivation { extraPrefix = "libs/python/"; hash = "sha256-0IHK55JSujYcwEVOuLkwOa/iPEkdAKQlwVWR42p/X2U="; }) + ] + ++ lib.optional (lib.versionAtLeast version "1.87") [ + # Fix operator<< for shared_ptr and intrusive_ptr + # https://github.com/boostorg/smart_ptr/issues/115 + (fetchpatch { + url = "https://github.com/boostorg/smart_ptr/commit/e7433ba54596da97cb7859455cd37ca140305a9c.patch"; + relative = "include"; + hash = "sha256-9JvKQOAB19wQpWLNAhuB9eL8qKqXWTQHAJIXdLYMNG8="; + }) ]; meta = with lib; { From a9d5785365b8fc79189b924143b062ce062b1825 Mon Sep 17 00:00:00 2001 From: FliegendeWurst Date: Tue, 21 Jan 2025 16:35:39 +0100 Subject: [PATCH 051/343] protobuf: add hook to provide protoc path --- .../libraries/protobuf/generic.nix | 23 +++++++++++-------- .../libraries/protobuf/setup-hook.sh | 9 ++++++++ 2 files changed, 22 insertions(+), 10 deletions(-) create mode 100644 pkgs/development/libraries/protobuf/setup-hook.sh diff --git a/pkgs/development/libraries/protobuf/generic.nix b/pkgs/development/libraries/protobuf/generic.nix index f8cfa4daff036..d528262e3180f 100644 --- a/pkgs/development/libraries/protobuf/generic.nix +++ b/pkgs/development/libraries/protobuf/generic.nix @@ -13,6 +13,7 @@ zlib, version, hash, + replaceVars, versionCheckHook, # downstream dependencies @@ -36,9 +37,9 @@ stdenv.mkDerivation (finalAttrs: { inherit hash; }; - postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' + postPatch = lib.optionalString (stdenv.hostPlatform.isDarwin && lib.versionOlder version "29") '' substituteInPlace src/google/protobuf/testing/googletest.cc \ - --replace 'tmpnam(b)' '"'$TMPDIR'/foo"' + --replace-fail 'tmpnam(b)' '"'$TMPDIR'/foo"' ''; patches = lib.optionals (lib.versionOlder version "22") [ @@ -50,15 +51,17 @@ stdenv.mkDerivation (finalAttrs: { }) ]; - nativeBuildInputs = - [ - cmake - ] - ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ - # protoc of the same version must be available for build. For non-cross builds, it's able to - # re-use the executable generated as part of the build + # hook to provide the path to protoc executable, used at build time + build_protobuf = + if (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) then buildPackages."protobuf_${lib.versions.major version}" - ]; + else + (placeholder "out"); + setupHook = ./setup-hook.sh; + + nativeBuildInputs = [ + cmake + ]; buildInputs = [ gtest diff --git a/pkgs/development/libraries/protobuf/setup-hook.sh b/pkgs/development/libraries/protobuf/setup-hook.sh new file mode 100644 index 0000000000000..a41f112ab2aa3 --- /dev/null +++ b/pkgs/development/libraries/protobuf/setup-hook.sh @@ -0,0 +1,9 @@ +ProtobufCMakeFlags() { + cmakeFlagsArray+=( + -DPROTOC_EXE="@build_protobuf@/bin/protoc" + -DProtobuf_PROTOC_EXE="@build_protobuf@/bin/protoc" + -DProtobuf_PROTOC_EXECUTABLE="@build_protobuf@/bin/protoc" + ) +} + +preConfigureHooks+=(ProtobufCMakeFlags) From 26d1630bae2ca44958a40ae81cf8de900738a163 Mon Sep 17 00:00:00 2001 From: FliegendeWurst Date: Tue, 21 Jan 2025 16:35:39 +0100 Subject: [PATCH 052/343] opencv4: use latest protobuf, remove no longer needed cross fix --- pkgs/development/libraries/opencv/4.x.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/opencv/4.x.nix b/pkgs/development/libraries/opencv/4.x.nix index e05c1f65dd129..dc7883b27c88c 100644 --- a/pkgs/development/libraries/opencv/4.x.nix +++ b/pkgs/development/libraries/opencv/4.x.nix @@ -12,7 +12,7 @@ , glib , glog , gflags -, protobuf_21 +, protobuf_29 , config , ocl-icd , buildPackages @@ -308,7 +308,7 @@ effectiveStdenv.mkDerivation { glib glog pcre2 - protobuf_21 + protobuf_29 zlib ] ++ optionals enablePython [ pythonPackages.python @@ -419,7 +419,6 @@ effectiveStdenv.mkDerivation { (cmakeBool "OPENCV_GENERATE_PKGCONFIG" true) (cmakeBool "WITH_OPENMP" true) (cmakeBool "BUILD_PROTOBUF" false) - (cmakeOptionType "path" "Protobuf_PROTOC_EXECUTABLE" (getExe buildPackages.protobuf_21)) (cmakeBool "PROTOBUF_UPDATE_FILES" true) (cmakeBool "OPENCV_ENABLE_NONFREE" enableUnfree) (cmakeBool "BUILD_TESTS" runAccuracyTests) From 40a3a48d08143ab7f0e8481658bae69d872d048e Mon Sep 17 00:00:00 2001 From: FliegendeWurst Date: Tue, 21 Jan 2025 16:35:39 +0100 Subject: [PATCH 053/343] monero-gui: use latest protobuf --- pkgs/applications/blockchains/monero-gui/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/blockchains/monero-gui/default.nix b/pkgs/applications/blockchains/monero-gui/default.nix index 57c949f451f39..790f691b79b22 100644 --- a/pkgs/applications/blockchains/monero-gui/default.nix +++ b/pkgs/applications/blockchains/monero-gui/default.nix @@ -30,7 +30,7 @@ trezorSupport ? true, hidapi, libusb1, - protobuf_21, + protobuf, python3, udev, }: @@ -77,7 +77,7 @@ stdenv.mkDerivation rec { ++ lib.optionals trezorSupport [ hidapi libusb1 - protobuf_21 + protobuf python3 ] ++ lib.optionals (trezorSupport && stdenv.hostPlatform.isLinux) [ From fc29afa6fcfc60f1ee7402f94b8947c1c92fe717 Mon Sep 17 00:00:00 2001 From: FliegendeWurst Date: Tue, 21 Jan 2025 16:35:39 +0100 Subject: [PATCH 054/343] monero-cli: use latest protobuf, mark cross as broken --- pkgs/applications/blockchains/monero-cli/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/blockchains/monero-cli/default.nix b/pkgs/applications/blockchains/monero-cli/default.nix index 0b4f90b2313f4..e39d5374b9ad7 100644 --- a/pkgs/applications/blockchains/monero-cli/default.nix +++ b/pkgs/applications/blockchains/monero-cli/default.nix @@ -23,7 +23,7 @@ trezorSupport ? true, hidapi, libusb1, - protobuf_21, + protobuf, udev, }: @@ -96,7 +96,7 @@ stdenv.mkDerivation rec { python3 hidapi libusb1 - protobuf_21 + protobuf ] ++ lib.optionals (trezorSupport && stdenv.hostPlatform.isLinux) [ udev ]; @@ -138,5 +138,7 @@ stdenv.mkDerivation rec { rnhmjoj ]; mainProgram = "monero-wallet-cli"; + # internal build tool generate_translations_header is tricky to compile for the build platform + broken = !stdenv.buildPlatform.canExecute stdenv.hostPlatform; }; } From 3ba60f2e504b3677e25e865eb836e1741e2ae4e8 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Fri, 24 Jan 2025 06:33:18 +0000 Subject: [PATCH 055/343] aws-c-auth: 0.8.0 -> 0.8.1 Changes: https://github.com/awslabs/aws-c-auth/releases/tag/v0.8.1 --- pkgs/by-name/aw/aws-c-auth/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/aw/aws-c-auth/package.nix b/pkgs/by-name/aw/aws-c-auth/package.nix index dc840631bffb7..d915ec34e5621 100644 --- a/pkgs/by-name/aw/aws-c-auth/package.nix +++ b/pkgs/by-name/aw/aws-c-auth/package.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "aws-c-auth"; # nixpkgs-update: no auto update - version = "0.8.0"; + version = "0.8.1"; src = fetchFromGitHub { owner = "awslabs"; repo = "aws-c-auth"; rev = "v${version}"; - hash = "sha256-wVHTfiAejAra8LnytxSJijUXHDmEwAj5D+wXOKq32B4="; + hash = "sha256-p8D79BRjaPlhzap/FWbqMlkrbVELSgeJW8CljxBAaCI="; }; nativeBuildInputs = [ From 1c4cadc0a81f534b997af6e48ffd51dc5a90824f Mon Sep 17 00:00:00 2001 From: misilelab Date: Sat, 11 Jan 2025 18:49:57 +0900 Subject: [PATCH 056/343] cmake: 3.13.3 -> 3.13.5 Signed-off-by: misilelaboratory --- pkgs/by-name/cm/cmake/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/cm/cmake/package.nix b/pkgs/by-name/cm/cmake/package.nix index cae5089ffdfc1..0ca8cf87762da 100644 --- a/pkgs/by-name/cm/cmake/package.nix +++ b/pkgs/by-name/cm/cmake/package.nix @@ -48,11 +48,11 @@ stdenv.mkDerivation (finalAttrs: { + lib.optionalString isMinimalBuild "-minimal" + lib.optionalString cursesUI "-cursesUI" + lib.optionalString qt5UI "-qt5UI"; - version = "3.31.3"; + version = "3.31.5"; src = fetchurl { url = "https://cmake.org/files/v${lib.versions.majorMinor finalAttrs.version}/cmake-${finalAttrs.version}.tar.gz"; - hash = "sha256-+sRbxtQQtJsxE6uGYHSIjWyencgaFBh0RG6yOaw4y4c="; + hash = "sha256-ZvtToUVki+VrRvqejMreOk0N/JLkAeUs52va0f6kPSc="; }; patches = [ From 85a56d3848425e40baa2f633054be3597f373c01 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sat, 25 Jan 2025 06:57:39 +0000 Subject: [PATCH 057/343] gumbo: 0.12.3 -> 0.13.0 Changes: https://codeberg.org/gumbo-parser/gumbo-parser/releases/tag/0.13.0 --- pkgs/by-name/gu/gumbo/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gu/gumbo/package.nix b/pkgs/by-name/gu/gumbo/package.nix index c4e6742558377..21886b96e9ed5 100644 --- a/pkgs/by-name/gu/gumbo/package.nix +++ b/pkgs/by-name/gu/gumbo/package.nix @@ -5,14 +5,14 @@ stdenv.mkDerivation rec { pname = "gumbo"; - version = "0.12.3"; + version = "0.13.0"; src = fetchFromGitea { domain = "codeberg.org"; owner = "gumbo-parser"; repo = "gumbo-parser"; rev = version; - hash = "sha256-C5+MCQ/hC+lfjxPykiAJspYQtI1G7/mFa4XlPrDJl/c="; + hash = "sha256-QpGOBKNPBryCXZKKEQMv9TXJiNyXESBFiR4wM0lmjiI="; }; nativeBuildInputs = [ autoreconfHook ]; From 6b0a29262ac82255a8e06ec807bf3fca22527c8b Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sat, 25 Jan 2025 06:59:47 +0000 Subject: [PATCH 058/343] gumbo: enable parallel building --- pkgs/by-name/gu/gumbo/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/gu/gumbo/package.nix b/pkgs/by-name/gu/gumbo/package.nix index 21886b96e9ed5..d7506c58c5446 100644 --- a/pkgs/by-name/gu/gumbo/package.nix +++ b/pkgs/by-name/gu/gumbo/package.nix @@ -17,6 +17,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; + enableParallelBuilding = true; + meta = with lib; { description = "C99 HTML parsing algorithm"; homepage = "https://codeberg.org/gumbo-parser/gumbo-parser"; From b7f046b9d4152003661bba9202cca77b9f4f66a4 Mon Sep 17 00:00:00 2001 From: FliegendeWurst Date: Fri, 24 Jan 2025 08:25:56 +0100 Subject: [PATCH 059/343] libsForQt5.extra-cmake-modules: fix strictDeps usage --- .../kde-frameworks/extra-cmake-modules/default.nix | 12 ++++++++++++ .../kde-frameworks/extra-cmake-modules/setup-hook.sh | 6 ++++++ 2 files changed, 18 insertions(+) diff --git a/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/default.nix b/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/default.nix index 11a807d190ada..c3aa3f518e22d 100644 --- a/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/default.nix +++ b/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/default.nix @@ -2,6 +2,7 @@ mkDerivation, lib, fetchpatch, + bash, cmake, pkg-config, }: @@ -19,11 +20,22 @@ mkDerivation { outputs = [ "out" ]; # this package has no runtime components + nativeBuildInputs = [ + cmake + ]; + + buildInputs = [ + bash + ]; + + # note: these will be propagated into the same list extra-cmake-modules is in propagatedBuildInputs = [ cmake pkg-config ]; + strictDeps = true; + setupHook = ./setup-hook.sh; meta = with lib; { diff --git a/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/setup-hook.sh b/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/setup-hook.sh index abf330fd9662e..853a163fab983 100644 --- a/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/setup-hook.sh +++ b/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/setup-hook.sh @@ -1,3 +1,9 @@ +ecmCMakeFlags() { + appendToVar cmakeFlags "-DECM_DIR=@out@/share/ECM/cmake" +} + +preConfigureHooks+=(ecmCMakeFlags) + ecmEnvHook() { addToSearchPath XDG_DATA_DIRS "$1/share" addToSearchPath XDG_CONFIG_DIRS "$1/etc/xdg" From cb1b74a675147ad5bbd8d923a58d09a851454479 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 26 Jan 2025 01:18:39 +0000 Subject: [PATCH 060/343] fluidsynth: 2.4.2 -> 2.4.3 --- pkgs/applications/audio/fluidsynth/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/fluidsynth/default.nix b/pkgs/applications/audio/fluidsynth/default.nix index e1fe7689a7fb2..f0aab08ffb7f7 100644 --- a/pkgs/applications/audio/fluidsynth/default.nix +++ b/pkgs/applications/audio/fluidsynth/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "fluidsynth"; - version = "2.4.2"; + version = "2.4.3"; src = fetchFromGitHub { owner = "FluidSynth"; repo = "fluidsynth"; rev = "v${version}"; - hash = "sha256-rpTL1eOm3PQIBuxoPEZwj64QXasNQN80kGSW7h6dDdw="; + hash = "sha256-LaJcWrHgt/RzlDQmpzOjF/9ugD5d+8XWRt7pU3SM5Rk="; }; outputs = [ "out" "dev" "man" ]; From fde48ae2ceab50774b81d32d050a9c7a7b6f7dee Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sun, 26 Jan 2025 06:48:32 +0000 Subject: [PATCH 061/343] xz: 5.6.3 -> 5.6.4 Changes: https://github.com/tukaani-project/xz/releases/tag/v5.6.4 --- pkgs/tools/compression/xz/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/compression/xz/default.nix b/pkgs/tools/compression/xz/default.nix index 658e8d8216a8a..09ceed93bbc89 100644 --- a/pkgs/tools/compression/xz/default.nix +++ b/pkgs/tools/compression/xz/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "xz"; - version = "5.6.3"; + version = "5.6.4"; src = fetchurl { url = with finalAttrs; "https://github.com/tukaani-project/xz/releases/download/v${version}/xz-${version}.tar.xz"; - hash = "sha256-2wWQYptvD6NudK6l+XMdxvjfBoznt7r6RTAYMqXuvDo="; + hash = "sha256-gpzP5512l0j3VX56RCmmTQaFjifh42LiXQGre5MdnJU="; }; strictDeps = true; From 2fc18d426cc54eed1ad935ad1d373505ea792859 Mon Sep 17 00:00:00 2001 From: Andrew Marshall Date: Tue, 7 Jan 2025 23:12:40 -0500 Subject: [PATCH 062/343] git: link git-credential-osxkeychain into standard path MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The Git that Apple ships has this at this location `$(git --exec-path)/git-credential-osxkeychain`, while we previously only linked it into `$out/bin`. Link it to the former as well to maintain compatibility with tooling that expects it to be where Apple’s Git distribution puts it. --- pkgs/applications/version-management/git/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/version-management/git/default.nix b/pkgs/applications/version-management/git/default.nix index 082b1c9f37aa1..4dd0f9c7c888b 100644 --- a/pkgs/applications/version-management/git/default.nix +++ b/pkgs/applications/version-management/git/default.nix @@ -283,6 +283,7 @@ stdenv.mkDerivation (finalAttrs: { done '') + lib.optionalString osxkeychainSupport '' + ln -s $out/share/git/contrib/credential/osxkeychain/git-credential-osxkeychain $out/libexec/git-core/ # enable git-credential-osxkeychain on darwin if desired (default) mkdir -p $out/etc cat > $out/etc/gitconfig << EOF From 872d6618268e3880da037f9d7dbb6b19e2a78106 Mon Sep 17 00:00:00 2001 From: Andrew Marshall Date: Sun, 26 Jan 2025 08:14:51 -0500 Subject: [PATCH 063/343] gitMinimal: disable osxkeychainSupport This should have no need in builds (as it should be irrelevant in the sandbox). While it likely has a minimal effect on closure size, it should reduce the probability of mass rebuilds by reducing the scope of gitMinimal. --- pkgs/top-level/all-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index abec87a7de8bf..b54c848f0d63a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1156,6 +1156,7 @@ with pkgs; gitMinimal = git.override { withManual = false; + osxkeychainSupport = false; pythonSupport = false; perlSupport = false; withpcre2 = false; From a8f509677f4a392d75b21b72de4bc74d52b177fb Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 26 Jan 2025 16:37:03 +0100 Subject: [PATCH 064/343] various: replace substituteAll with replaceVars Some easy ones. --- pkgs/build-support/buildenv/builder.pl | 2 -- pkgs/build-support/buildenv/default.nix | 5 ++--- pkgs/development/python-modules/psycopg/default.nix | 5 ++--- pkgs/development/python-modules/pypass/default.nix | 5 ++--- pkgs/servers/sql/postgresql/generic.nix | 5 ++--- 5 files changed, 8 insertions(+), 14 deletions(-) diff --git a/pkgs/build-support/buildenv/builder.pl b/pkgs/build-support/buildenv/builder.pl index d416ff58e2cb9..76606716d808e 100755 --- a/pkgs/build-support/buildenv/builder.pl +++ b/pkgs/build-support/buildenv/builder.pl @@ -1,5 +1,3 @@ -#! @perl@ -w - use strict; use feature 'signatures'; use Cwd 'abs_path'; diff --git a/pkgs/build-support/buildenv/default.nix b/pkgs/build-support/buildenv/default.nix index df5bce5feed47..6aaa59df06421 100644 --- a/pkgs/build-support/buildenv/default.nix +++ b/pkgs/build-support/buildenv/default.nix @@ -5,13 +5,12 @@ buildPackages, runCommand, lib, - substituteAll, + replaceVars, writeClosure, }: let - builder = substituteAll { - src = ./builder.pl; + builder = replaceVars ./builder.pl { inherit (builtins) storeDir; }; in diff --git a/pkgs/development/python-modules/psycopg/default.nix b/pkgs/development/python-modules/psycopg/default.nix index b25dd7e325e5f..25436138ff8fc 100644 --- a/pkgs/development/python-modules/psycopg/default.nix +++ b/pkgs/development/python-modules/psycopg/default.nix @@ -5,7 +5,7 @@ fetchFromGitHub, fetchurl, pythonOlder, - substituteAll, + replaceVars, # build libpq, @@ -45,8 +45,7 @@ let }; patches = [ - (substituteAll { - src = ./ctypes.patch; + (replaceVars ./ctypes.patch { libpq = "${libpq}/lib/libpq${stdenv.hostPlatform.extensions.sharedLibrary}"; libc = "${stdenv.cc.libc}/lib/libc.so.6"; }) diff --git a/pkgs/development/python-modules/pypass/default.nix b/pkgs/development/python-modules/pypass/default.nix index d1581e8985476..ee73ddc09ec47 100644 --- a/pkgs/development/python-modules/pypass/default.nix +++ b/pkgs/development/python-modules/pypass/default.nix @@ -13,7 +13,7 @@ pythonAtLeast, pytestCheckHook, setuptools, - substituteAll, + replaceVars, tree, xclip, }: @@ -32,8 +32,7 @@ buildPythonPackage rec { # Set absolute nix store paths to the executables that pypass uses patches = [ - (substituteAll { - src = ./mark-executables.patch; + (replaceVars ./mark-executables.patch { git_exec = "${gitMinimal}/bin/git"; grep_exec = "${gnugrep}/bin/grep"; gpg_exec = "${gnupg}/bin/gpg2"; diff --git a/pkgs/servers/sql/postgresql/generic.nix b/pkgs/servers/sql/postgresql/generic.nix index 1ea97c93f4259..00b9f0e15ce15 100644 --- a/pkgs/servers/sql/postgresql/generic.nix +++ b/pkgs/servers/sql/postgresql/generic.nix @@ -7,7 +7,7 @@ let fetchpatch, fetchurl, lib, - substituteAll, + replaceVars, writeShellScriptBin, # source specification @@ -304,8 +304,7 @@ let hash = "sha256-EQJkDR0eb7QWCjyMzXMn+Vbcwx3MMdC83oN7XSVJP0U="; }) - (substituteAll { - src = ./patches/locale-binary-path.patch; + (replaceVars ./patches/locale-binary-path.patch { locale = "${ if stdenv.hostPlatform.isDarwin then darwin.adv_cmds else lib.getBin stdenv.cc.libc }/bin/locale"; From 7fea091aa812b0755fd1d80cac4da679192cd852 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sat, 25 Jan 2025 17:03:49 +0100 Subject: [PATCH 065/343] {lua-5,luajit}: fix missing @ lua @ reference in utils.sh --- pkgs/development/interpreters/lua-5/interpreter.nix | 5 ++--- pkgs/development/interpreters/lua-5/utils.sh | 7 +------ pkgs/development/interpreters/luajit/default.nix | 5 ++--- 3 files changed, 5 insertions(+), 12 deletions(-) diff --git a/pkgs/development/interpreters/lua-5/interpreter.nix b/pkgs/development/interpreters/lua-5/interpreter.nix index 54435308d1c18..02868d749fa6c 100644 --- a/pkgs/development/interpreters/lua-5/interpreter.nix +++ b/pkgs/development/interpreters/lua-5/interpreter.nix @@ -7,7 +7,7 @@ makeWrapper, self, packageOverrides ? (final: prev: { }), - substituteAll, + replaceVars, pkgsBuildBuild, pkgsBuildHost, pkgsBuildTarget, @@ -149,8 +149,7 @@ stdenv.mkDerivation ( postInstall = '' mkdir -p "$out/nix-support" "$out/share/doc/lua" "$out/lib/pkgconfig" cp ${ - substituteAll { - src = ./utils.sh; + replaceVars ./utils.sh { luapathsearchpaths = lib.escapeShellArgs finalAttrs.LuaPathSearchPaths; luacpathsearchpaths = lib.escapeShellArgs finalAttrs.LuaCPathSearchPaths; } diff --git a/pkgs/development/interpreters/lua-5/utils.sh b/pkgs/development/interpreters/lua-5/utils.sh index 2365af08dc9cb..50b6270042030 100644 --- a/pkgs/development/interpreters/lua-5/utils.sh +++ b/pkgs/development/interpreters/lua-5/utils.sh @@ -118,15 +118,10 @@ buildLuaPath() { echo "BUILD_LUA_PATH" -# # set -x # # Create an empty table of paths (see doc on loadFromPropagatedInputs -# # for how this is used). Build up the program_PATH and program_LUA_PATH -# # variables. - # declare -gA luaPathsSeen=() +# # for how this is used). Build up the program_PATH variable. # # shellcheck disable=SC2034 program_PATH= - luaPathsSeen["@lua@"]=1 -# addToSearchPath program_PATH @lua@/bin for path in $luaPath; do _addToLuaPath "$path" done diff --git a/pkgs/development/interpreters/luajit/default.nix b/pkgs/development/interpreters/luajit/default.nix index 147884c59f012..88d318b207b3e 100644 --- a/pkgs/development/interpreters/luajit/default.nix +++ b/pkgs/development/interpreters/luajit/default.nix @@ -4,7 +4,7 @@ buildPackages, version, src, - substituteAll, + replaceVars, extraMeta ? { }, self, packageOverrides ? (final: prev: { }), @@ -102,8 +102,7 @@ stdenv.mkDerivation (finalAttrs: { postInstall = '' mkdir -p $out/nix-support cp ${ - substituteAll { - src = ../lua-5/utils.sh; + replaceVars ../lua-5/utils.sh { luapathsearchpaths = lib.escapeShellArgs finalAttrs.LuaPathSearchPaths; luacpathsearchpaths = lib.escapeShellArgs finalAttrs.LuaCPathSearchPaths; } From c61f629dd9d3f2ab0629899fbc890a124282cad4 Mon Sep 17 00:00:00 2001 From: Jared Baur Date: Sat, 11 Jan 2025 00:54:34 +0000 Subject: [PATCH 066/343] c-ares: 1.27.0 -> 1.34.4 --- pkgs/development/libraries/c-ares/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/c-ares/default.nix b/pkgs/development/libraries/c-ares/default.nix index 913c65e93f972..aeeda1bf50738 100644 --- a/pkgs/development/libraries/c-ares/default.nix +++ b/pkgs/development/libraries/c-ares/default.nix @@ -18,14 +18,12 @@ stdenv.mkDerivation rec { pname = "c-ares"; - version = "1.27.0"; + version = "1.34.4"; src = fetchurl { # Note: tag name varies in some versions, e.g. v1.30.0, c-ares-1_17_0. - url = "https://github.com/c-ares/${pname}/releases/download/cares-${ - builtins.replaceStrings [ "." ] [ "_" ] version - }/${pname}-${version}.tar.gz"; - hash = "sha256-CnK+ZpWZVcQ+KvL70DQY6Cor1UZGBOyaYhR+N6zrQgs="; + url = "https://github.com/c-ares/${pname}/releases/download/v${version}/${pname}-${version}.tar.gz"; + hash = "sha256-+jjb7WWe5MxaMt9eJ97aV1+mhSx5pyuhr4XeNaauIi8="; }; outputs = [ @@ -50,6 +48,10 @@ stdenv.mkDerivation rec { curl = (curl.override { c-aresSupport = true; }).tests.withCheck; }; + preFixup = lib.optionalString withCMake '' + substituteInPlace $out/lib/pkgconfig/libcares.pc --replace-fail \''${prefix}/ "" + ''; + meta = with lib; { description = "C library for asynchronous DNS requests"; homepage = "https://c-ares.haxx.se"; From eb96c8dc5b69f2838e3ff8e6ce6ba69956ada02c Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sun, 26 Jan 2025 13:10:53 +0100 Subject: [PATCH 067/343] postgresql: refactor `postgresqlVersions` attribute & tests Every postgresql testcase essentially does the following things: * Filter `postgresqlVersions` for server packages * Filter postgresql server packages for suitable ones (i.e. extensions must support the given version) * Generate an attribute-set of testcases The first item became necessary in 7ab1e888334ddc2745b285e3df0b0efd5839d0f8 given that `postgresql/default.nix` now exposes JIT and non-JIT servers AND a `libpq` that is not suitable for the tests here. This changes restructures this a little bit, i.e.: * Having an attribute-set that contains a bunch of postgresql servers and a single client package seems odd (and the sole consumer of `postgresqlVersions` in nixpkgs, the test suite, has to take that into account). Hence, postgresql's default.nix now provides `libpq` (the client) and a `postgresqlVersions` attribute with all supported JIT and non-JIT variants of postgresql. * Each test-case gets a third argument, a function called `genTests`: this function sets `recurseForDerivations = true;` and generates an attribute-set of tests for each postgresql version given a function that returns a testcase or multiple test-cases (`makeTestFor`). The argument to `makeTestFor` is a postgresql server package. This function also accepts a filter predicate that is passed against `filterAttrs` to remove postgresql server packages that are not suitable for the test (e.g. because the version isn't supported by the extension to test). I checked by making sure that the `.drv` doesn't change on staging with this change on top for postgresq, postgresql-jit, postgresql-wal-receiver, postgresql-tls-client-cert, anonymizer, pgjwt, pgvecto-rs, timescaledb, tsja and wal2json. --- nixos/tests/postgresql/anonymizer.nix | 13 +++++------- nixos/tests/postgresql/default.nix | 20 ++++++++++++++++++- nixos/tests/postgresql/pgjwt.nix | 13 +++++------- nixos/tests/postgresql/pgvecto-rs.nix | 13 +++++------- nixos/tests/postgresql/postgresql-jit.nix | 13 +++++------- .../postgresql/postgresql-tls-client-cert.nix | 10 ++-------- .../postgresql/postgresql-wal-receiver.nix | 10 ++-------- nixos/tests/postgresql/postgresql.nix | 10 ++-------- nixos/tests/postgresql/timescaledb.nix | 13 +++++------- nixos/tests/postgresql/tsja.nix | 13 +++++------- nixos/tests/postgresql/wal2json.nix | 13 +++++------- pkgs/servers/sql/postgresql/default.nix | 8 ++++++-- pkgs/top-level/all-packages.nix | 7 ++++--- 13 files changed, 70 insertions(+), 86 deletions(-) diff --git a/nixos/tests/postgresql/anonymizer.nix b/nixos/tests/postgresql/anonymizer.nix index abbcd4890976d..d59a26f101e8c 100644 --- a/nixos/tests/postgresql/anonymizer.nix +++ b/nixos/tests/postgresql/anonymizer.nix @@ -1,6 +1,7 @@ { pkgs, makeTest, + genTests, }: let @@ -107,11 +108,7 @@ let ''; }; in -lib.recurseIntoAttrs ( - lib.concatMapAttrs (n: p: { ${n} = makeTestFor p; }) ( - lib.filterAttrs (_: p: p ? pkgs && !p.pkgs.anonymizer.meta.broken) pkgs.postgresqlVersions - ) - // { - passthru.override = p: makeTestFor p; - } -) +genTests { + inherit makeTestFor; + filter = _: p: !p.pkgs.anonymizer.meta.broken; +} diff --git a/nixos/tests/postgresql/default.nix b/nixos/tests/postgresql/default.nix index 4fe7e7a37e7ef..91f7694208b19 100644 --- a/nixos/tests/postgresql/default.nix +++ b/nixos/tests/postgresql/default.nix @@ -7,7 +7,25 @@ with import ../../lib/testing-python.nix { inherit system pkgs; }; let - importWithArgs = path: import path { inherit pkgs makeTest; }; + inherit (pkgs.lib) + recurseIntoAttrs + filterAttrs + mapAttrs + const + ; + genTests = + { + makeTestFor, + filter ? (_: _: true), + }: + recurseIntoAttrs ( + mapAttrs (const makeTestFor) (filterAttrs filter pkgs.postgresqlVersions) + // { + passthru.override = makeTestFor; + } + ); + + importWithArgs = path: import path { inherit pkgs makeTest genTests; }; in { # postgresql diff --git a/nixos/tests/postgresql/pgjwt.nix b/nixos/tests/postgresql/pgjwt.nix index 27033a1383b1d..f00d9a939d3d1 100644 --- a/nixos/tests/postgresql/pgjwt.nix +++ b/nixos/tests/postgresql/pgjwt.nix @@ -1,6 +1,7 @@ { pkgs, makeTest, + genTests, }: let @@ -48,11 +49,7 @@ let ''; }; in -lib.recurseIntoAttrs ( - lib.concatMapAttrs (n: p: { ${n} = makeTestFor p; }) ( - lib.filterAttrs (_: p: p ? pkgs && !p.pkgs.pgjwt.meta.broken) pkgs.postgresqlVersions - ) - // { - passthru.override = p: makeTestFor p; - } -) +genTests { + inherit makeTestFor; + filter = _: p: !p.pkgs.pgjwt.meta.broken; +} diff --git a/nixos/tests/postgresql/pgvecto-rs.nix b/nixos/tests/postgresql/pgvecto-rs.nix index 98241ec480907..300449617e9b5 100644 --- a/nixos/tests/postgresql/pgvecto-rs.nix +++ b/nixos/tests/postgresql/pgvecto-rs.nix @@ -1,6 +1,7 @@ { pkgs, makeTest, + genTests, }: let @@ -72,11 +73,7 @@ let ''; }; in -lib.recurseIntoAttrs ( - lib.concatMapAttrs (n: p: { ${n} = makeTestFor p; }) ( - lib.filterAttrs (_: p: p ? pkgs && !p.pkgs.pgvecto-rs.meta.broken) pkgs.postgresqlVersions - ) - // { - passthru.override = p: makeTestFor p; - } -) +genTests { + inherit makeTestFor; + filter = _: p: !p.pkgs.pgvecto-rs.meta.broken; +} diff --git a/nixos/tests/postgresql/postgresql-jit.nix b/nixos/tests/postgresql/postgresql-jit.nix index 5d0406062eae3..e082ff1413279 100644 --- a/nixos/tests/postgresql/postgresql-jit.nix +++ b/nixos/tests/postgresql/postgresql-jit.nix @@ -1,6 +1,7 @@ { pkgs, makeTest, + genTests, }: let @@ -48,11 +49,7 @@ let ''; }; in -lib.recurseIntoAttrs ( - lib.concatMapAttrs (n: p: { ${n} = makeTestFor p; }) ( - lib.filterAttrs (n: _: lib.hasSuffix "_jit" n) pkgs.postgresqlVersions - ) - // { - passthru.override = p: makeTestFor p; - } -) +genTests { + inherit makeTestFor; + filter = n: _: lib.hasSuffix "_jit" n; +} diff --git a/nixos/tests/postgresql/postgresql-tls-client-cert.nix b/nixos/tests/postgresql/postgresql-tls-client-cert.nix index 0861416d6c40f..117b9b0e24a9e 100644 --- a/nixos/tests/postgresql/postgresql-tls-client-cert.nix +++ b/nixos/tests/postgresql/postgresql-tls-client-cert.nix @@ -1,6 +1,7 @@ { pkgs, makeTest, + genTests, }: let @@ -128,11 +129,4 @@ let ''; }; in -lib.recurseIntoAttrs ( - lib.concatMapAttrs (n: p: { ${n} = makeTestFor p; }) ( - lib.filterAttrs (_: p: p ? pkgs) pkgs.postgresqlVersions - ) - // { - passthru.override = p: makeTestFor p; - } -) +genTests { inherit makeTestFor; } diff --git a/nixos/tests/postgresql/postgresql-wal-receiver.nix b/nixos/tests/postgresql/postgresql-wal-receiver.nix index eee6c0c14de15..c99c3889c0279 100644 --- a/nixos/tests/postgresql/postgresql-wal-receiver.nix +++ b/nixos/tests/postgresql/postgresql-wal-receiver.nix @@ -1,6 +1,7 @@ { pkgs, makeTest, + genTests, }: let @@ -108,11 +109,4 @@ let ''; }; in -lib.recurseIntoAttrs ( - lib.concatMapAttrs (n: p: { ${n} = makeTestFor p; }) ( - lib.filterAttrs (_: p: p ? pkgs) pkgs.postgresqlVersions - ) - // { - passthru.override = p: makeTestFor p; - } -) +genTests { inherit makeTestFor; } diff --git a/nixos/tests/postgresql/postgresql.nix b/nixos/tests/postgresql/postgresql.nix index 0aa56330ce011..7741d14808eb1 100644 --- a/nixos/tests/postgresql/postgresql.nix +++ b/nixos/tests/postgresql/postgresql.nix @@ -1,6 +1,7 @@ { pkgs, makeTest, + genTests, }: let @@ -262,11 +263,4 @@ let ''; }; in -lib.recurseIntoAttrs ( - lib.concatMapAttrs (n: p: { ${n} = makeTestFor p; }) ( - lib.filterAttrs (_: p: p ? pkgs) pkgs.postgresqlVersions - ) - // { - passthru.override = p: makeTestFor p; - } -) +genTests { inherit makeTestFor; } diff --git a/nixos/tests/postgresql/timescaledb.nix b/nixos/tests/postgresql/timescaledb.nix index acfe5ed7ecc6f..7ad8b0fcc9720 100644 --- a/nixos/tests/postgresql/timescaledb.nix +++ b/nixos/tests/postgresql/timescaledb.nix @@ -1,6 +1,7 @@ { pkgs, makeTest, + genTests, }: let @@ -91,11 +92,7 @@ in # Not run by default, because this requires allowUnfree. # To run these tests: # NIXPKGS_ALLOW_UNFREE=1 nix-build -A nixosTests.postgresql.timescaledb -lib.dontRecurseIntoAttrs ( - lib.concatMapAttrs (n: p: { ${n} = makeTestFor p; }) ( - lib.filterAttrs (_: p: p ? pkgs && !p.pkgs.timescaledb.meta.broken) pkgs.postgresqlVersions - ) - // { - passthru.override = p: makeTestFor p; - } -) +lib.dontRecurseIntoAttrs (genTests { + inherit makeTestFor; + filter = _: p: !p.pkgs.timescaledb.meta.broken; +}) diff --git a/nixos/tests/postgresql/tsja.nix b/nixos/tests/postgresql/tsja.nix index 34437068ae67c..4cc5bd124139c 100644 --- a/nixos/tests/postgresql/tsja.nix +++ b/nixos/tests/postgresql/tsja.nix @@ -1,6 +1,7 @@ { pkgs, makeTest, + genTests, }: let @@ -41,11 +42,7 @@ let ''; }; in -lib.recurseIntoAttrs ( - lib.concatMapAttrs (n: p: { ${n} = makeTestFor p; }) ( - lib.filterAttrs (_: p: p ? pkgs && !p.pkgs.tsja.meta.broken) pkgs.postgresqlVersions - ) - // { - passthru.override = p: makeTestFor p; - } -) +genTests { + inherit makeTestFor; + filter = _: p: !p.pkgs.tsja.meta.broken; +} diff --git a/nixos/tests/postgresql/wal2json.nix b/nixos/tests/postgresql/wal2json.nix index 644ade741d835..abfe606737539 100644 --- a/nixos/tests/postgresql/wal2json.nix +++ b/nixos/tests/postgresql/wal2json.nix @@ -1,6 +1,7 @@ { pkgs, makeTest, + genTests, }: let @@ -43,11 +44,7 @@ let ''; }; in -lib.recurseIntoAttrs ( - lib.concatMapAttrs (n: p: { ${n} = makeTestFor p; }) ( - lib.filterAttrs (_: p: p ? pkgs && !p.pkgs.wal2json.meta.broken) pkgs.postgresqlVersions - ) - // { - passthru.override = p: makeTestFor p; - } -) +genTests { + inherit makeTestFor; + filter = _: p: !p.pkgs.wal2json.meta.broken; +} diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index cfff0f4a98b98..c6a47a424959e 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -33,5 +33,9 @@ let libpq = self.callPackage ./libpq.nix { }; in -# variations without and with JIT -(mkAttributes false) // (mkAttributes true) // { inherit libpq; } +{ + # variations without and with JIT + postgresqlVersions = mkAttributes false // mkAttributes true; + + inherit libpq; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index abec87a7de8bf..2fea98c75cea8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11688,10 +11688,11 @@ with pkgs; asciidoc = asciidoc-full; }; - postgresqlVersions = import ../servers/sql/postgresql pkgs; - inherit (postgresqlVersions) - libpq + inherit (import ../servers/sql/postgresql pkgs) + postgresqlVersions + libpq; + inherit (postgresqlVersions) postgresql_13 postgresql_14 postgresql_15 From 8b9a57c1a984e82e83fa6f8d71458d1bc1c880ad Mon Sep 17 00:00:00 2001 From: Emily Date: Mon, 27 Jan 2025 01:00:01 +0000 Subject: [PATCH 068/343] llvmPackages: fix broken symlink in `mkExtraBuildCommandsBasicRt` --- pkgs/development/compilers/llvm/common/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/compilers/llvm/common/default.nix b/pkgs/development/compilers/llvm/common/default.nix index 7d2ef2e3f135d..96992bee19875 100644 --- a/pkgs/development/compilers/llvm/common/default.nix +++ b/pkgs/development/compilers/llvm/common/default.nix @@ -337,7 +337,6 @@ let mkExtraBuildCommands0 cc + '' ln -s "${targetLlvmLibraries.compiler-rt-no-libc.out}/lib" "$rsrc/lib" - ln -s "${targetLlvmLibraries.compiler-rt-no-libc.out}/share" "$rsrc/share" ''; mkExtraBuildCommands = cc: From d1b1c3cf5d8464c31afc2b559769ebc22da59a73 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Mon, 27 Jan 2025 07:04:35 +0000 Subject: [PATCH 069/343] libseccomp: 2.5.5 -> 2.6.0 Changes: https://github.com/seccomp/libseccomp/releases/tag/v2.6.0 --- pkgs/by-name/li/libseccomp/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/li/libseccomp/package.nix b/pkgs/by-name/li/libseccomp/package.nix index 9ff313c84a65e..2d238f64dc663 100644 --- a/pkgs/by-name/li/libseccomp/package.nix +++ b/pkgs/by-name/li/libseccomp/package.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "libseccomp"; - version = "2.5.5"; + version = "2.6.0"; src = fetchurl { url = "https://github.com/seccomp/libseccomp/releases/download/v${version}/libseccomp-${version}.tar.gz"; - hash = "sha256-JIosik2bmFiqa69ScSw0r+/PnJ6Ut23OAsHJqiX7M3U="; + hash = "sha256-g7YIUjLRWIw3ncm5yuR7s3QHzyYubnSZPGG6ctKnhNw="; }; outputs = [ From 869586e6ddc7758fbc9646797532a3b4c6a4eb6f Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Mon, 27 Jan 2025 07:20:16 +0000 Subject: [PATCH 070/343] libimagequant: 4.3.3 -> 4.3.4 Changes: https://github.com/ImageOptim/libimagequant/compare/4.3.3...4.3.4 --- pkgs/by-name/li/libimagequant/Cargo.lock | 34 +++++++++++------------ pkgs/by-name/li/libimagequant/package.nix | 4 +-- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/pkgs/by-name/li/libimagequant/Cargo.lock b/pkgs/by-name/li/libimagequant/Cargo.lock index 2c9cecbf894cb..ff75c4e1d8edf 100644 --- a/pkgs/by-name/li/libimagequant/Cargo.lock +++ b/pkgs/by-name/li/libimagequant/Cargo.lock @@ -16,15 +16,15 @@ checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50" [[package]] name = "bitflags" -version = "2.6.0" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" +checksum = "8f68f53c83ab957f72c32642f3868eec03eb974d1fb82e453128456482613d36" [[package]] name = "bytemuck" -version = "1.20.0" +version = "1.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b37c88a63ffd85d15b406896cc343916d7cf57838a847b3a6f2ca5d39a5695a" +checksum = "ef657dfab802224e671f5818e9a4935f9b1957ed18e58292690cc39e7a4092a3" [[package]] name = "c_test" @@ -36,9 +36,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.2.2" +version = "1.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f34d93e62b03caf570cccc334cbc6c2fceca82f39211051345108adcba3eebdc" +checksum = "13208fcbb66eaeffe09b99fffbe1af420f00a7b35aa99ad683dfc1aa76145229" dependencies = [ "shlex", ] @@ -60,9 +60,9 @@ dependencies = [ [[package]] name = "crossbeam-deque" -version = "0.8.5" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d" +checksum = "9dd111b7b7f7d55b72c0a6ae361660ee5853c9af73f70c3c2ef6858b950e2e51" dependencies = [ "crossbeam-epoch", "crossbeam-utils", @@ -79,9 +79,9 @@ dependencies = [ [[package]] name = "crossbeam-utils" -version = "0.8.20" +version = "0.8.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" +checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28" [[package]] name = "either" @@ -101,7 +101,7 @@ dependencies = [ [[package]] name = "imagequant" -version = "4.3.3" +version = "4.3.4" dependencies = [ "arrayvec", "lodepng", @@ -122,15 +122,15 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.167" +version = "0.2.169" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09d6582e104315a817dff97f75133544b2e094ee22447d2acf4a74e189ba06fc" +checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a" [[package]] name = "lodepng" -version = "3.10.7" +version = "3.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b2dea7cda68e381418c985fd8f32a9c279a21ae8c715f2376adb20c27a0fad3" +checksum = "a7720115060cd38dcfe5c758525a43fd34dc615d0566374212ff0dc3b6151eac" dependencies = [ "crc32fast", "flate2", @@ -140,9 +140,9 @@ dependencies = [ [[package]] name = "miniz_oxide" -version = "0.8.0" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1" +checksum = "b8402cab7aefae129c6977bb0ff1b8fd9a04eb5b51efc50a70bea51cda0c7924" dependencies = [ "adler2", ] diff --git a/pkgs/by-name/li/libimagequant/package.nix b/pkgs/by-name/li/libimagequant/package.nix index d1e3c6e4470c8..d340ed1008d52 100644 --- a/pkgs/by-name/li/libimagequant/package.nix +++ b/pkgs/by-name/li/libimagequant/package.nix @@ -14,13 +14,13 @@ rustPlatform.buildRustPackage rec { pname = "libimagequant"; - version = "4.3.3"; + version = "4.3.4"; src = fetchFromGitHub { owner = "ImageOptim"; repo = "libimagequant"; rev = version; - hash = "sha256-l5YWT0lZ9+RSa347CEjfPX+MPZBQkraKADEBWg4ssNY="; + hash = "sha256-2P8FiRfOuCHxJrB+rnDDOFsrFjPv5GMBK/5sq7eb32w="; }; cargoLock = { From d61d9233df70e41b302602c242255c0b06266695 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 27 Jan 2025 10:53:17 +0000 Subject: [PATCH 071/343] flatbuffers: 24.12.23 -> 25.1.24 --- pkgs/development/libraries/flatbuffers/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/flatbuffers/default.nix b/pkgs/development/libraries/flatbuffers/default.nix index 71c47c43089eb..f2430aa47b2df 100644 --- a/pkgs/development/libraries/flatbuffers/default.nix +++ b/pkgs/development/libraries/flatbuffers/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "flatbuffers"; - version = "24.12.23"; + version = "25.1.24"; src = fetchFromGitHub { owner = "google"; repo = "flatbuffers"; rev = "v${version}"; - hash = "sha256-6L6Eb+2xGXEqLYITWsNNPW4FTvfPFSmChK4hLusk5gU="; + hash = "sha256-LApjF14eoqcT11Jp9SaJQbtvK8iIelTY4GJKqjVCpCM="; }; nativeBuildInputs = [ From 4bf87e58ac6983016e9b37437323a109e67775fc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 28 Jan 2025 03:21:19 +0000 Subject: [PATCH 072/343] wavpack: 5.7.0 -> 5.8.0 --- pkgs/by-name/wa/wavpack/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/wa/wavpack/package.nix b/pkgs/by-name/wa/wavpack/package.nix index 906521e602dd0..fb7dea59c9515 100644 --- a/pkgs/by-name/wa/wavpack/package.nix +++ b/pkgs/by-name/wa/wavpack/package.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { pname = "wavpack"; - version = "5.7.0"; + version = "5.8.0"; enableParallelBuilding = true; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { owner = "dbry"; repo = "WavPack"; rev = version; - hash = "sha256-vFZxg1mVqE7Kp38vEGA5V8m2tjqhssFsUZURixhlfk0="; + hash = "sha256-JT4WOlga3jyHMznEJmgc6EQIAVBZdlazmQphJC1+r4s="; }; outputs = [ From e96c70a7ff61a9a6b82f3ca7767c5b0ccf7ac872 Mon Sep 17 00:00:00 2001 From: TomaSajt <62384384+TomaSajt@users.noreply.github.com> Date: Mon, 27 Jan 2025 00:45:25 +0100 Subject: [PATCH 073/343] rustPlatform.fetchCargoVendor: set strictDeps and dontConfigure by default --- pkgs/build-support/rust/fetch-cargo-vendor.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/build-support/rust/fetch-cargo-vendor.nix b/pkgs/build-support/rust/fetch-cargo-vendor.nix index 899c799c5fcc3..d166cb0c44e6b 100644 --- a/pkgs/build-support/rust/fetch-cargo-vendor.nix +++ b/pkgs/build-support/rust/fetch-cargo-vendor.nix @@ -71,6 +71,9 @@ let runHook postBuild ''; + strictDeps = true; + + dontConfigure = true; dontInstall = true; dontFixup = true; From 3b14303c5955c413cb7ad942b8c4e68b60146d43 Mon Sep 17 00:00:00 2001 From: Mikael Voss Date: Sun, 19 Jan 2025 12:28:21 +0100 Subject: [PATCH 074/343] libsecret: enable TPM support --- pkgs/by-name/li/libsecret/package.nix | 110 +++++++++++++++++++++++--- 1 file changed, 97 insertions(+), 13 deletions(-) diff --git a/pkgs/by-name/li/libsecret/package.nix b/pkgs/by-name/li/libsecret/package.nix index f422de359ca2e..52bf76bc68a78 100644 --- a/pkgs/by-name/li/libsecret/package.nix +++ b/pkgs/by-name/li/libsecret/package.nix @@ -24,8 +24,51 @@ gjs, libintl, dbus, + withTpm2Tss ? false, + abrmdSupport ? false, + writeShellApplication, + tpm2-tss, + tpm2-abrmd, + libsecret, }: +assert abrmdSupport -> withTpm2Tss; + +let + tpm-emu = writeShellApplication { + name = "tpm-emu"; + runtimeInputs = [ + dbus + tpm2-abrmd + ]; + + text = '' + coproc { + # Monitor session bus for name acquisition + dbus-monitor "type='signal',interface='org.freedesktop.DBus',member='NameAcquired',arg0='com.intel.tss2.Tabrmd'" + } + + # Discard initial dbus-monitor output + while read -r -t 0.1 -u "''${COPROC[0]}"; do :; done + + tpm2-abrmd \ + --tcti=libtpms \ + --allow-root \ + --flush-all \ + --session & + + # Terminate tpm2-abrmd on exit + # shellcheck disable=SC2064 # immediate expansion intended + trap "kill '$!'" EXIT + + # Wait for daemon to become available to avoid spurious test failures + read -r -t 60 -u "''${COPROC[0]}" + kill "$COPROC_PID" + + TCTI="tabrmd:bus_type=session" "$@" + ''; + }; +in stdenv.mkDerivation rec { pname = "libsecret"; version = "0.21.6"; @@ -62,9 +105,12 @@ stdenv.mkDerivation rec { gobject-introspection ]; - buildInputs = [ - libgcrypt - ]; + buildInputs = + [ + libgcrypt + ] + ++ lib.optionals withTpm2Tss [ tpm2-tss ] + ++ lib.optionals abrmdSupport [ tpm2-abrmd ]; propagatedBuildInputs = [ glib @@ -81,6 +127,7 @@ stdenv.mkDerivation rec { mesonFlags = [ (lib.mesonBool "introspection" withIntrospection) (lib.mesonBool "gtk_doc" withIntrospection) + (lib.mesonBool "tpm2" withTpm2Tss) (lib.mesonOption "bashcompdir" "share/bash-completion/completions") ]; @@ -93,19 +140,39 @@ stdenv.mkDerivation rec { # dbus-run-session defaults to FHS path substituteInPlace meson.build --replace-fail \ "exe_wrapper: dbus_run_session," \ - "exe_wrapper: [dbus_run_session, '--config-file=${dbus}/share/dbus-1/session.conf']," + "exe_wrapper: [dbus_run_session, '--config-file=${dbus}/share/dbus-1/session.conf'${lib.optionalString withTpm2Tss ", '${lib.getExe tpm-emu}'"}]," ''; - preCheck = '' - # Our gobject-introspection patches make the shared library paths absolute - # in the GIR files. When running tests, the library is not yet installed, - # though, so we need to replace the absolute path with a local one during build. - # We are using a symlink that will be overwitten during installation. - mkdir -p $out/lib $out/lib - ln -s "$PWD/libsecret/libmock-service.so" "$out/lib/libmock-service.so" - ln -s "$PWD/libsecret/libsecret-1.so.0" "$out/lib/libsecret-1.so.0" + preConfigure = lib.optionalString abrmdSupport '' + # Add dependencies on TCTI modules required for user‐space TPM resource + # manager support so that they can be loaded at run time through dlopen(). + mesonFlagsArray+=("-Dc_link_args=-Wl,--push-state,--no-as-needed -ltss2-tcti-tabrmd -ltss2-tcti-device -Wl,--pop-state") ''; + preCheck = + '' + # Our gobject-introspection patches make the shared library paths absolute + # in the GIR files. When running tests, the library is not yet installed, + # though, so we need to replace the absolute path with a local one during build. + # We are using a symlink that will be overwitten during installation. + mkdir -p $out/lib $out/lib + ln -s "$PWD/libsecret/libmock-service.so" "$out/lib/libmock-service.so" + ln -s "$PWD/libsecret/libsecret-1.so.0" "$out/lib/libsecret-1.so.0" + '' + + lib.optionalString (withTpm2Tss && !abrmdSupport) '' + # If abrmdSupport is disabled, the user‐space resource manager TCTI + # module is not linked at compile time. It is however needed during + # testing because the TPM emulator lacks an integrated resource manager + # The module path is therefore injected temporarly using the + # LD_LIBRARY_PATH environment variable, so that it may be found by + # dlopen(). + # + # If abrmdSupport is enabled, this is avoided to check that the + # module has been properly linked and can be located through the + # DT_RUNPATH and DT_NEEDED entries in libsecret-1.so. + export LD_LIBRARY_PATH+=":${lib.makeLibraryPath [ tpm2-abrmd ]}" + ''; + checkPhase = '' runHook preCheck @@ -130,6 +197,18 @@ stdenv.mkDerivation rec { # Does not seem to use the odd-unstable policy: https://gitlab.gnome.org/GNOME/libsecret/issues/30 versionPolicy = "none"; }; + + tests = { + libsecret-tpm2 = libsecret.override { + withTpm2Tss = true; + abrmdSupport = false; + }; + + libsecret-tpm2-abrmd = libsecret.override { + withTpm2Tss = true; + abrmdSupport = true; + }; + }; }; meta = { @@ -137,6 +216,11 @@ stdenv.mkDerivation rec { homepage = "https://gitlab.gnome.org/GNOME/libsecret"; license = lib.licenses.lgpl21Plus; mainProgram = "secret-tool"; - inherit (glib.meta) platforms maintainers; + platforms = + if withTpm2Tss then + lib.intersectLists glib.meta.platforms tpm2-tss.meta.platforms + else + glib.meta.platforms; + inherit (glib.meta) maintainers; }; } From 1244a54f747174479e5355b4382830a59cbc1b9e Mon Sep 17 00:00:00 2001 From: Defelo Date: Tue, 28 Jan 2025 22:10:47 +0100 Subject: [PATCH 075/343] rustPlatform.fetchCargoVendor: reuse http session across requests --- pkgs/build-support/rust/fetch-cargo-vendor-util.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/build-support/rust/fetch-cargo-vendor-util.py b/pkgs/build-support/rust/fetch-cargo-vendor-util.py index bb70a559fe966..a0c1104cedf3f 100644 --- a/pkgs/build-support/rust/fetch-cargo-vendor-util.py +++ b/pkgs/build-support/rust/fetch-cargo-vendor-util.py @@ -31,7 +31,7 @@ def get_lockfile_version(cargo_lock_toml: dict[str, Any]) -> int: return version -def download_file_with_checksum(url: str, destination_path: Path) -> str: +def create_http_session() -> requests.Session: retries = Retry( total=5, backoff_factor=0.5, @@ -40,7 +40,10 @@ def download_file_with_checksum(url: str, destination_path: Path) -> str: session = requests.Session() session.mount('http://', HTTPAdapter(max_retries=retries)) session.mount('https://', HTTPAdapter(max_retries=retries)) + return session + +def download_file_with_checksum(session: requests.Session, url: str, destination_path: Path) -> str: sha256_hash = hashlib.sha256() with session.get(url, stream=True) as response: if not response.ok: @@ -66,7 +69,7 @@ def get_download_url_for_tarball(pkg: dict[str, Any]) -> str: return f"https://crates.io/api/v1/crates/{pkg["name"]}/{pkg["version"]}/download" -def download_tarball(pkg: dict[str, Any], out_dir: Path) -> None: +def download_tarball(session: requests.Session, pkg: dict[str, Any], out_dir: Path) -> None: url = get_download_url_for_tarball(pkg) filename = f"{pkg["name"]}-{pkg["version"]}.tar.gz" @@ -78,7 +81,7 @@ def download_tarball(pkg: dict[str, Any], out_dir: Path) -> None: tarball_out_dir = out_dir / "tarballs" / filename eprint(f"Fetching {url} -> tarballs/{filename}") - calculated_checksum = download_file_with_checksum(url, tarball_out_dir) + calculated_checksum = download_file_with_checksum(session, url, tarball_out_dir) if calculated_checksum != expected_checksum: raise Exception(f"Hash mismatch! File fetched from {url} had checksum {calculated_checksum}, expected {expected_checksum}.") @@ -157,7 +160,8 @@ def create_vendor_staging(lockfile_path: Path, out_dir: Path) -> None: with mp.Pool(min(5, mp.cpu_count())) as pool: if len(registry_packages) != 0: (out_dir / "tarballs").mkdir() - tarball_args_gen = ((pkg, out_dir) for pkg in registry_packages) + session = create_http_session() + tarball_args_gen = ((session, pkg, out_dir) for pkg in registry_packages) pool.starmap(download_tarball, tarball_args_gen) From e0d1accdeef5866226c90032fbdf0197b5d9bb43 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Tue, 28 Jan 2025 22:54:06 +0000 Subject: [PATCH 076/343] pkgsi686Linux.libredirect: do no fail on 64-bit inodes Without the change `pkgsi686Linux.libredirect` tests fail on `btrfs` where inodes are outside 32-bit range: $ nix build --no-link -f. -L pkgsi686Linux.libredirect ... libredirect> test: test.c:95: main: Assertion `stat(TESTPATH, &testsb) != -1' failed. As libredirect` intends to test 32-bit syscall interface let's just skip the overflows. --- pkgs/by-name/li/libredirect/test.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/li/libredirect/test.c b/pkgs/by-name/li/libredirect/test.c index e5685fcb31b71..59a47d8a02ae9 100644 --- a/pkgs/by-name/li/libredirect/test.c +++ b/pkgs/by-name/li/libredirect/test.c @@ -92,11 +92,15 @@ int main(int argc, char *argv[]) assert(access(TESTPATH, X_OK) == 0); - assert(stat(TESTPATH, &testsb) != -1); + // On EOVERFLOW checks below: when TESTPATH lands on a filesystem + // that requires 64-bit inode values (like btrfs used for a while) + // it will fail on 32-bit systems. + + assert(stat(TESTPATH, &testsb) != -1 || errno == EOVERFLOW); #ifdef __GLIBC__ assert(stat64(TESTPATH, &testsb64) != -1); #endif - assert(fstatat(123, TESTPATH, &testsb, 0) != -1); + assert(fstatat(123, TESTPATH, &testsb, 0) != -1 || errno == EOVERFLOW); #ifdef __GLIBC__ assert(fstatat64(123, TESTPATH, &testsb64, 0) != -1); #endif From efb7d4f32774bad72e9f31e205cbf5efc9c4b28b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 28 Jan 2025 02:10:33 +0100 Subject: [PATCH 077/343] util-linuxMinimal: build without pam and shadow These depend on python via audit preventing the use of libuuid from util-linux in python builds. --- pkgs/top-level/all-packages.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0f2de6a7b18d9..cdcabbf17d860 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12502,6 +12502,8 @@ with pkgs; util-linuxMinimal = util-linux.override { nlsSupport = false; ncursesSupport = false; + pamSupport = false; + shadowSupport = false; systemdSupport = false; translateManpages = false; }; From 94e717e8ff1283e5120759ebab13f70939d895d5 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 28 Jan 2025 02:11:22 +0100 Subject: [PATCH 078/343] cpython: provide libuuid for the _uuid module MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Relying on libuuid offers synchronization primitives, so that "no two processes can obtain the same UUID"¹. [1] https://docs.python.org/3/library/uuid.html#module-uuid --- pkgs/development/interpreters/python/cpython/default.nix | 2 ++ pkgs/development/interpreters/python/default.nix | 1 + 2 files changed, 3 insertions(+) diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix index d0cb05268d43f..eb839b446c13e 100644 --- a/pkgs/development/interpreters/python/cpython/default.nix +++ b/pkgs/development/interpreters/python/cpython/default.nix @@ -15,6 +15,7 @@ , bzip2 , expat , libffi +, libuuid , libxcrypt , mpdecimal , ncurses @@ -166,6 +167,7 @@ let bzip2 expat libffi + libuuid libxcrypt mpdecimal ncurses diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index 582c37cd2c791..edc187ac2a169 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -117,6 +117,7 @@ in { gdbm = null; sqlite = null; tzdata = null; + libuuid = null; libffi = libffiBoot; # without test suite stripConfig = true; stripIdlelib = true; From ec413d40ad1c4c09615d029ae298a71b9b729901 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 30 Jan 2025 01:31:21 +0000 Subject: [PATCH 079/343] libsepol: 3.7 -> 3.8 --- pkgs/by-name/li/libsepol/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/li/libsepol/package.nix b/pkgs/by-name/li/libsepol/package.nix index 01e038d4ec0c3..09feeb1e2fdfd 100644 --- a/pkgs/by-name/li/libsepol/package.nix +++ b/pkgs/by-name/li/libsepol/package.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { pname = "libsepol"; - version = "3.7"; + version = "3.8"; se_url = "https://github.com/SELinuxProject/selinux/releases/download"; outputs = [ @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${se_url}/${version}/libsepol-${version}.tar.gz"; - sha256 = "sha256-zXQeJSROfvbNk01jNhQTGiZsPq6rM9i/pF6Kk7RcyQE="; + sha256 = "sha256-hE+9vwIzS5zgODOtimcQU/Z7QHbXLbTwPg7iZl7C61U="; }; postPatch = lib.optionalString stdenv.hostPlatform.isStatic '' From f3ef7bf9f94510d80ca2721329d0d7debad21458 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 29 Jan 2025 03:04:12 +0100 Subject: [PATCH 080/343] =?UTF-8?q?gtk3:=203.24.43=20=E2=86=92=203.24.48?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gtk/-/compare/3.24.43...3.24.48 --- pkgs/development/libraries/gtk/3.x.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/gtk/3.x.nix b/pkgs/development/libraries/gtk/3.x.nix index 984ab02bf6454..e995b48a1557f 100644 --- a/pkgs/development/libraries/gtk/3.x.nix +++ b/pkgs/development/libraries/gtk/3.x.nix @@ -63,7 +63,7 @@ in stdenv.mkDerivation (finalAttrs: { pname = "gtk+3"; - version = "3.24.43"; + version = "3.24.48"; outputs = [ "out" "dev" ] ++ lib.optional withIntrospection "devdoc"; outputBin = "dev"; @@ -76,8 +76,8 @@ stdenv.mkDerivation (finalAttrs: { src = let inherit (finalAttrs) version; in fetchurl { - url = "mirror://gnome/sources/gtk+/${lib.versions.majorMinor version}/gtk+-${version}.tar.xz"; - hash = "sha256-fgTwZIUVA0uAa3SuXXdNh8/7GiqWxGjLW+R21Rvy88c="; + url = "mirror://gnome/sources/gtk/${lib.versions.majorMinor version}/gtk-${version}.tar.xz"; + hash = "sha256-0Qzp6p30TBAW2NFyHznlXT1gf8+4UzSuwNI2zcmnBVY="; }; patches = [ @@ -233,7 +233,7 @@ stdenv.mkDerivation (finalAttrs: { passthru = { updateScript = gnome.updateScript { - packageName = "gtk+"; + packageName = "gtk"; attrPath = "gtk3"; freeze = true; }; From 4745969cb31fb6155f5a2c4323117cd7effa05f2 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Fri, 17 Jan 2025 15:29:07 +0100 Subject: [PATCH 081/343] meson.setupHook: build test targets In Meson 1.7, these will no longer be built by default [1], so because we're running meson test with --no-rebuild, we need to build them before running the test. Doing this in checkPhase makes more sense than in buildPhase, because allows buildPhase to work without test-only dependencies, something we've had to work around in the past by adding options to packages to disable building the tests. The meson-test-prereq target has been available since Meson 0.63.0 according to the documentation, so we can do this ahead of actually upgrading to Meson 1.7.0. Link: https://mesonbuild.com/Release-notes-for-1-7-0.html#test-targets-no-longer-built-by-default [1] --- pkgs/by-name/me/meson/setup-hook.sh | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/by-name/me/meson/setup-hook.sh b/pkgs/by-name/me/meson/setup-hook.sh index b2061a12058ca..1885265eabbfe 100644 --- a/pkgs/by-name/me/meson/setup-hook.sh +++ b/pkgs/by-name/me/meson/setup-hook.sh @@ -58,6 +58,14 @@ mesonCheckPhase() { flagsArray+=("--timeout-multiplier=0") fi + # Parallel building is enabled by default. + local buildCores=1 + if [ "${enableParallelBuilding-1}" ]; then + buildCores="$NIX_BUILD_CORES" + fi + + TERM=dumb ninja -j"$buildCores" $ninjaFlags "${ninjaFlagsArray[@]}" meson-test-prereq + echoCmd 'mesonCheckPhase flags' "${flagsArray[@]}" meson test --no-rebuild --print-errorlogs "${flagsArray[@]}" From 562b6042f16770e1343342eb8f67638c27fe576e Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Thu, 30 Jan 2025 06:32:48 +0000 Subject: [PATCH 082/343] meson: 1.6.1 -> 1.7.0 Changes: https://github.com/mesonbuild/meson/blob/1.7.0/docs/markdown/Release-notes-for-1.7.0.md --- pkgs/by-name/me/meson/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/me/meson/package.nix b/pkgs/by-name/me/meson/package.nix index d4bd67c4b4948..79d0e5b7eb545 100644 --- a/pkgs/by-name/me/meson/package.nix +++ b/pkgs/by-name/me/meson/package.nix @@ -28,13 +28,13 @@ let in python3.pkgs.buildPythonApplication rec { pname = "meson"; - version = "1.6.1"; + version = "1.7.0"; src = fetchFromGitHub { owner = "mesonbuild"; repo = "meson"; tag = version; - hash = "sha256-t0JItqEbf2YqZnu5mVsCO9YGzB7WlCfsIwi76nHJ/WI="; + hash = "sha256-nvaq+9evQSj/ahK68nj8FckG4nA1gs2DqcZxFEFH1iU="; }; patches = [ From e64988cb6685e05b12f6f0a7285ef0f9adf4102a Mon Sep 17 00:00:00 2001 From: misilelab Date: Thu, 30 Jan 2025 04:34:30 +0900 Subject: [PATCH 083/343] fontconfig: 2.15.0 -> 2.16.0 Signed-off-by: misilelab --- pkgs/development/libraries/fontconfig/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/fontconfig/default.nix b/pkgs/development/libraries/fontconfig/default.nix index c7f14c8d86d4c..7caccd4a28813 100644 --- a/pkgs/development/libraries/fontconfig/default.nix +++ b/pkgs/development/libraries/fontconfig/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "fontconfig"; - version = "2.15.0"; + version = "2.16.0"; outputs = [ "bin" @@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: { url = with finalAttrs; "https://www.freedesktop.org/software/fontconfig/release/${pname}-${version}.tar.xz"; - hash = "sha256-Y6BljQ4G4PqIYQZFK1jvBPIfWCAuoCqUw53g0zNdfA4="; + hash = "sha256-ajPcVVzJuosQyvdpWHjvE07rNtCvNmBB9jmx2ptu0iA="; }; nativeBuildInputs = [ @@ -51,6 +51,9 @@ stdenv.mkDerivation (finalAttrs: { postPatch = '' # Requires networking. sed -i '/check_PROGRAMS += test-crbug1004254/d' test/Makefile.am + + # Test causes error without patch shebangs. + patchShebangs doc/check-whitespace-in-args.py ''; configureFlags = From b9f7683ecc09e11102839f9e8b5b37dddd798f8c Mon Sep 17 00:00:00 2001 From: Connor Baker Date: Thu, 30 Jan 2025 17:58:23 +0000 Subject: [PATCH 084/343] doc: add redirect for no-broken-symlinks.sh --- doc/redirects.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/doc/redirects.json b/doc/redirects.json index 4fada4e6cf2f5..10f383a2613d6 100644 --- a/doc/redirects.json +++ b/doc/redirects.json @@ -20,6 +20,9 @@ "nixpkgs-manual": [ "index.html#nixpkgs-manual" ], + "no-broken-symlinks.sh": [ + "index.html#no-broken-symlinks.sh" + ], "preface": [ "index.html#preface" ], From 5926f753b31528738be20c2826005c59ee72167d Mon Sep 17 00:00:00 2001 From: Connor Baker Date: Thu, 30 Jan 2025 18:08:38 +0000 Subject: [PATCH 085/343] no-broken-symlinks: clean up error log output --- pkgs/build-support/setup-hooks/no-broken-symlinks.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/build-support/setup-hooks/no-broken-symlinks.sh b/pkgs/build-support/setup-hooks/no-broken-symlinks.sh index 6609c08e8436e..e2694c2b7bdec 100644 --- a/pkgs/build-support/setup-hooks/no-broken-symlinks.sh +++ b/pkgs/build-support/setup-hooks/no-broken-symlinks.sh @@ -51,10 +51,10 @@ noBrokenSymlinks() { fi if [[ $path == "$symlinkTarget" ]]; then - nixErrorLog "the symlink $path is reflexive $symlinkTarget" + nixErrorLog "the symlink $path is reflexive" numReflexiveSymlinks+=1 elif [[ ! -e $symlinkTarget ]]; then - nixErrorLog "the symlink $path points to a missing target $symlinkTarget" + nixErrorLog "the symlink $path points to a missing target: $symlinkTarget" numDanglingSymlinks+=1 else nixDebugLog "the symlink $path is irreflexive and points to a target which exists" From 4ff5979e5100613e77c5c3ebb11f86761bfd9ffe Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 30 Jan 2025 23:35:40 +0000 Subject: [PATCH 086/343] directx-headers: 1.614.1 -> 1.615.0 --- pkgs/by-name/di/directx-headers/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/di/directx-headers/package.nix b/pkgs/by-name/di/directx-headers/package.nix index 0acb2db0edc0e..2c8773045ab5f 100644 --- a/pkgs/by-name/di/directx-headers/package.nix +++ b/pkgs/by-name/di/directx-headers/package.nix @@ -7,13 +7,13 @@ }: stdenv.mkDerivation rec { pname = "directx-headers"; - version = "1.614.1"; + version = "1.615.0"; src = fetchFromGitHub { owner = "microsoft"; repo = "DirectX-Headers"; rev = "v${version}"; - hash = "sha256-CDmzKdV40EExLpOHPAUnytqG9x1+IGW4AZldfYs5YJk="; + hash = "sha256-1s/lrvUUOBGVAtfyAG2b/9raQVj2Hcjw9/RtqBO7ENA="; }; nativeBuildInputs = [ From c5b890c4139f854329caa6232c02fe2a592f3847 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20M=C3=B6ller?= Date: Fri, 31 Jan 2025 08:29:56 +0100 Subject: [PATCH 087/343] patch-shebangs: fix `env -S` with only one argument MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In case `patchShebangs` encounters an `env -S` interpreter with only one argument following, it would duplicate that argument and most likely invalidate the resulting interpreter line. Reproducer: ```nix (import {}).writeTextFile { name = "patch-shebangs-env-s"; text = '' #!/bin/env -S bash ''; executable = true; checkPhase = '' patchShebangs $out ''; } ``` The resulting file would contain ``` #!/nix/store/pw…fk-coreutils-9.5/bin/env -S /nix/store/4f…g60-bash-5.2p37/bin/bash bash ``` instead of the correct ``` #!/nix/store/pw…fk-coreutils-9.5/bin/env -S /nix/store/4f…g60-bash-5.2p37/bin/bash ``` --- pkgs/build-support/setup-hooks/patch-shebangs.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/setup-hooks/patch-shebangs.sh b/pkgs/build-support/setup-hooks/patch-shebangs.sh index f22da254a7914..a7b2b110f23f0 100644 --- a/pkgs/build-support/setup-hooks/patch-shebangs.sh +++ b/pkgs/build-support/setup-hooks/patch-shebangs.sh @@ -89,7 +89,7 @@ patchShebangs() { if [[ "$oldPath" == *"/bin/env" ]]; then if [[ $arg0 == "-S" ]]; then arg0=${args%% *} - args=${args#* } + [[ "$args" == *" "* ]] && args=${args#* } || args= newPath="$(PATH="${!pathName}" type -P "env" || true)" args="-S $(PATH="${!pathName}" type -P "$arg0" || true) $args" From 0f391bb2f20243a609758ecd8c426671c31c9a19 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 31 Jan 2025 10:43:23 +0000 Subject: [PATCH 088/343] mvfst: 2025.01.06.00 -> 2025.01.27.00 --- pkgs/by-name/mv/mvfst/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/mv/mvfst/package.nix b/pkgs/by-name/mv/mvfst/package.nix index 0179fa3621e71..96a182cdf63db 100644 --- a/pkgs/by-name/mv/mvfst/package.nix +++ b/pkgs/by-name/mv/mvfst/package.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "mvfst"; - version = "2025.01.06.00"; + version = "2025.01.27.00"; outputs = [ "bin" @@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "facebook"; repo = "mvfst"; tag = "v${finalAttrs.version}"; - hash = "sha256-xgqVksPcm9CStAK32oNz7DT0CVzFb8ANohNxtyP0iT0="; + hash = "sha256-8qYybElhtZyx87aZnR6r5exrLewsInS1U2m+zVPXSyw="; }; patches = [ From 4e54dd0c519c6f5d0101de9e01f719e3ac16820a Mon Sep 17 00:00:00 2001 From: DavHau Date: Wed, 1 Jan 2025 02:39:01 +0700 Subject: [PATCH 089/343] format pkgs/build-support/rust/hooks/default.nix --- pkgs/build-support/rust/hooks/default.nix | 84 ++++++++++++++--------- 1 file changed, 52 insertions(+), 32 deletions(-) diff --git a/pkgs/build-support/rust/hooks/default.nix b/pkgs/build-support/rust/hooks/default.nix index 37d1b66862558..35d2e9844dae1 100644 --- a/pkgs/build-support/rust/hooks/default.nix +++ b/pkgs/build-support/rust/hooks/default.nix @@ -1,59 +1,72 @@ -{ buildPackages -, callPackage -, cargo -, cargo-nextest -, clang -, lib -, makeSetupHook -, maturin -, rust -, rustc -, stdenv +{ + buildPackages, + callPackage, + cargo, + cargo-nextest, + clang, + lib, + makeSetupHook, + maturin, + rust, + rustc, + stdenv, -# This confusingly-named parameter indicates the *subdirectory of -# `target/` from which to copy the build artifacts. It is derived -# from a stdenv platform (or a JSON file). -, target ? stdenv.hostPlatform.rust.cargoShortTarget + # This confusingly-named parameter indicates the *subdirectory of + # `target/` from which to copy the build artifacts. It is derived + # from a stdenv platform (or a JSON file). + target ? stdenv.hostPlatform.rust.cargoShortTarget, }: { - cargoBuildHook = callPackage ({ }: + cargoBuildHook = callPackage ( + { }: makeSetupHook { name = "cargo-build-hook.sh"; propagatedBuildInputs = [ cargo ]; substitutions = { inherit (rust.envVars) rustHostPlatformSpec setEnv; }; - } ./cargo-build-hook.sh) {}; + } ./cargo-build-hook.sh + ) { }; - cargoCheckHook = callPackage ({ }: + cargoCheckHook = callPackage ( + { }: makeSetupHook { name = "cargo-check-hook.sh"; propagatedBuildInputs = [ cargo ]; substitutions = { inherit (rust.envVars) rustHostPlatformSpec setEnv; }; - } ./cargo-check-hook.sh) {}; + } ./cargo-check-hook.sh + ) { }; - cargoInstallHook = callPackage ({ }: + cargoInstallHook = callPackage ( + { }: makeSetupHook { name = "cargo-install-hook.sh"; propagatedBuildInputs = [ ]; substitutions = { targetSubdirectory = target; }; - } ./cargo-install-hook.sh) {}; + } ./cargo-install-hook.sh + ) { }; - cargoNextestHook = callPackage ({ }: + cargoNextestHook = callPackage ( + { }: makeSetupHook { name = "cargo-nextest-hook.sh"; - propagatedBuildInputs = [ cargo cargo-nextest ]; + propagatedBuildInputs = [ + cargo + cargo-nextest + ]; substitutions = { inherit (rust.envVars) rustHostPlatformSpec; }; - } ./cargo-nextest-hook.sh) {}; + } ./cargo-nextest-hook.sh + ) { }; - cargoSetupHook = callPackage ({ }: + cargoSetupHook = callPackage ( + { }: makeSetupHook { name = "cargo-setup-hook.sh"; propagatedBuildInputs = [ ]; @@ -71,12 +84,16 @@ [target."${stdenv.hostPlatform.rust.rustcTarget}"] "linker" = "${rust.envVars.ccForHost}" ''} - "rustflags" = [ "-C", "target-feature=${if stdenv.hostPlatform.isStatic then "+" else "-"}crt-static" ] + "rustflags" = [ "-C", "target-feature=${ + if stdenv.hostPlatform.isStatic then "+" else "-" + }crt-static" ] ''; }; - } ./cargo-setup-hook.sh) {}; + } ./cargo-setup-hook.sh + ) { }; - maturinBuildHook = callPackage ({ pkgsHostTarget }: + maturinBuildHook = callPackage ( + { pkgsHostTarget }: makeSetupHook { name = "maturin-build-hook.sh"; propagatedBuildInputs = [ @@ -87,14 +104,17 @@ substitutions = { inherit (rust.envVars) rustTargetPlatformSpec setEnv; }; - } ./maturin-build-hook.sh) {}; + } ./maturin-build-hook.sh + ) { }; - bindgenHook = callPackage ({}: makeSetupHook { + bindgenHook = callPackage ( + { }: + makeSetupHook { name = "rust-bindgen-hook"; substitutions = { libclang = (lib.getLib clang.cc); inherit clang; }; - } - ./rust-bindgen-hook.sh) {}; + } ./rust-bindgen-hook.sh + ) { }; } From db4cf6cb1dd04630efa35706050884d18a700374 Mon Sep 17 00:00:00 2001 From: DavHau Date: Wed, 1 Jan 2025 02:40:34 +0700 Subject: [PATCH 090/343] rust: fix splicing for rust hooks This fixes a long standing issue where rust hooks behave differently when used inside buildRustPackage vs inside mkDerivation, which lead to surprising behavior, like for example the package being built for the wrong paltform or the linker not being found especially in cross compilation scenarios. The reason for this inconsitency was, that buildRustPackage consumed the hooks in a non-spliced form, via [this inherit statement](https://github.com/NixOS/nixpkgs/blob/4506ece030a0c82d078edd0360ea8af6b4d94035/pkgs/development/compilers/rust/make-rust-platform.nix#L60), and therefore the usual platform shift on the hooks introduced by putting them in `nativeBuildInputs` was not applied here. Thoug whenever the hook was used inside other builders like `mkDerivation` the platform shift did apply correctly as the hook was consumed via the spliced package set, introducing the inconsitecy. Because of the wrong (non-spliced) use in buildRustPackage, most rust hooks have been designed with the wrong build/host/target shift in mind which is fixed by this change. Due to the inconsitent behavior between different builders, workarounds like `rust.envVars`, which were previously introduced, likely become obsolete by this change. This likely fixes a bunch of cross compilation issues for rust packages that are not based on `buildRustPackage` but instead consume the hooks directly. Done: - ensure that `buildRustPackage` consumes spliced hooks by using makeScopeWithSplicing' in make-rust-platform.nix. - refactor hooks to make them refer to correct build/host/target packages. - remove `rust.envVars` workaround from all rust hooks - implement tests for most rust hooks in /pkgs/test/rut-hooks The newly added tests can be executed for native as well as cross compilation via: ``` nix-build -A tests.rust-hooks -A pkgsCross.riscv64.tests.rust-hooks ``` --- .../rust/build-rust-package/default.nix | 1 + .../rust/hooks/cargo-build-hook.sh | 4 +- .../rust/hooks/cargo-check-hook.sh | 4 +- .../rust/hooks/cargo-nextest-hook.sh | 2 +- pkgs/build-support/rust/hooks/default.nix | 43 ++++---- .../rust/hooks/maturin-build-hook.sh | 4 +- .../compilers/rust/make-rust-platform.nix | 102 +++++++++-------- pkgs/test/default.nix | 2 + pkgs/test/rust-hooks/default.nix | 104 ++++++++++++++++++ pkgs/test/rust-hooks/hello/Cargo.lock | 7 ++ pkgs/test/rust-hooks/hello/Cargo.toml | 6 + pkgs/test/rust-hooks/hello/src/hello.rs | 3 + pkgs/test/rust-hooks/hello/src/lib.rs | 1 + pkgs/test/rust-hooks/hello/src/main.rs | 5 + pkgs/test/rust-hooks/hello/tests/my_test.rs | 6 + 15 files changed, 216 insertions(+), 78 deletions(-) create mode 100644 pkgs/test/rust-hooks/default.nix create mode 100644 pkgs/test/rust-hooks/hello/Cargo.lock create mode 100644 pkgs/test/rust-hooks/hello/Cargo.toml create mode 100644 pkgs/test/rust-hooks/hello/src/hello.rs create mode 100644 pkgs/test/rust-hooks/hello/src/lib.rs create mode 100644 pkgs/test/rust-hooks/hello/src/main.rs create mode 100644 pkgs/test/rust-hooks/hello/tests/my_test.rs diff --git a/pkgs/build-support/rust/build-rust-package/default.nix b/pkgs/build-support/rust/build-rust-package/default.nix index 909ec8f4c05f8..7a34c4df28f7f 100644 --- a/pkgs/build-support/rust/build-rust-package/default.nix +++ b/pkgs/build-support/rust/build-rust-package/default.nix @@ -185,6 +185,7 @@ stdenv.mkDerivation ( cargoInstallHook cargoSetupHook rustc + cargo ]; buildInputs = diff --git a/pkgs/build-support/rust/hooks/cargo-build-hook.sh b/pkgs/build-support/rust/hooks/cargo-build-hook.sh index 749ebed8b01b7..d372d3a3f9d35 100644 --- a/pkgs/build-support/rust/hooks/cargo-build-hook.sh +++ b/pkgs/build-support/rust/hooks/cargo-build-hook.sh @@ -19,7 +19,7 @@ cargoBuildHook() { local flagsArray=( "-j" "$NIX_BUILD_CORES" - "--target" "@rustHostPlatformSpec@" + "--target" "@rustcTarget@" "--offline" ) @@ -38,7 +38,7 @@ cargoBuildHook() { concatTo flagsArray cargoBuildFlags echoCmd 'cargoBuildHook flags' "${flagsArray[@]}" - @setEnv@ cargo build "${flagsArray[@]}" + cargo build "${flagsArray[@]}" if [ -n "${buildAndTestSubdir-}" ]; then popd diff --git a/pkgs/build-support/rust/hooks/cargo-check-hook.sh b/pkgs/build-support/rust/hooks/cargo-check-hook.sh index 965e2b4514471..55055b3d55aa1 100644 --- a/pkgs/build-support/rust/hooks/cargo-check-hook.sh +++ b/pkgs/build-support/rust/hooks/cargo-check-hook.sh @@ -30,7 +30,7 @@ cargoCheckHook() { fi flagsArray+=( - "--target" "@rustHostPlatformSpec@" + "--target" "@rustcTarget@" "--offline" ) @@ -38,7 +38,7 @@ cargoCheckHook() { concatTo flagsArray cargoTestFlags checkFlags checkFlagsArray echoCmd 'cargoCheckHook flags' "${flagsArray[@]}" - @setEnv@ cargo test "${flagsArray[@]}" + cargo test "${flagsArray[@]}" if [[ -n "${buildAndTestSubdir-}" ]]; then popd diff --git a/pkgs/build-support/rust/hooks/cargo-nextest-hook.sh b/pkgs/build-support/rust/hooks/cargo-nextest-hook.sh index 4719d1bad8ae9..9d9b90976b222 100644 --- a/pkgs/build-support/rust/hooks/cargo-nextest-hook.sh +++ b/pkgs/build-support/rust/hooks/cargo-nextest-hook.sh @@ -10,7 +10,7 @@ cargoNextestHook() { fi local flagsArray=( - "--target" "@rustHostPlatformSpec@" + "--target" "@rustcTarget@" "--offline" ) diff --git a/pkgs/build-support/rust/hooks/default.nix b/pkgs/build-support/rust/hooks/default.nix index 35d2e9844dae1..f8feb79000abc 100644 --- a/pkgs/build-support/rust/hooks/default.nix +++ b/pkgs/build-support/rust/hooks/default.nix @@ -4,17 +4,19 @@ cargo, cargo-nextest, clang, + diffutils, lib, makeSetupHook, maturin, rust, rustc, stdenv, + pkgsTargetTarget, # This confusingly-named parameter indicates the *subdirectory of # `target/` from which to copy the build artifacts. It is derived # from a stdenv platform (or a JSON file). - target ? stdenv.hostPlatform.rust.cargoShortTarget, + target ? stdenv.targetPlatform.rust.cargoShortTarget, }: { @@ -22,9 +24,8 @@ { }: makeSetupHook { name = "cargo-build-hook.sh"; - propagatedBuildInputs = [ cargo ]; substitutions = { - inherit (rust.envVars) rustHostPlatformSpec setEnv; + inherit (stdenv.targetPlatform.rust) rustcTarget; }; } ./cargo-build-hook.sh ) { }; @@ -33,9 +34,8 @@ { }: makeSetupHook { name = "cargo-check-hook.sh"; - propagatedBuildInputs = [ cargo ]; substitutions = { - inherit (rust.envVars) rustHostPlatformSpec setEnv; + inherit (stdenv.targetPlatform.rust) rustcTarget; }; } ./cargo-check-hook.sh ) { }; @@ -44,7 +44,6 @@ { }: makeSetupHook { name = "cargo-install-hook.sh"; - propagatedBuildInputs = [ ]; substitutions = { targetSubdirectory = target; }; @@ -55,12 +54,9 @@ { }: makeSetupHook { name = "cargo-nextest-hook.sh"; - propagatedBuildInputs = [ - cargo - cargo-nextest - ]; + propagatedBuildInputs = [ cargo-nextest ]; substitutions = { - inherit (rust.envVars) rustHostPlatformSpec; + inherit (stdenv.targetPlatform.rust) rustcTarget; }; } ./cargo-nextest-hook.sh ) { }; @@ -75,19 +71,20 @@ # Specify the stdenv's `diff` by abspath to ensure that the user's build # inputs do not cause us to find the wrong `diff`. - diff = "${lib.getBin buildPackages.diffutils}/bin/diff"; + diff = "${lib.getBin diffutils}/bin/diff"; - cargoConfig = '' - [target."${stdenv.buildPlatform.rust.rustcTarget}"] - "linker" = "${rust.envVars.ccForBuild}" - ${lib.optionalString (stdenv.buildPlatform.config != stdenv.hostPlatform.config) '' + cargoConfig = + lib.optionalString (stdenv.hostPlatform.config != stdenv.targetPlatform.config) '' + [target."${stdenv.targetPlatform.rust.rustcTarget}"] + "linker" = "${pkgsTargetTarget.stdenv.cc}/bin/${pkgsTargetTarget.stdenv.cc.targetPrefix}cc" + '' + + '' [target."${stdenv.hostPlatform.rust.rustcTarget}"] - "linker" = "${rust.envVars.ccForHost}" - ''} - "rustflags" = [ "-C", "target-feature=${ - if stdenv.hostPlatform.isStatic then "+" else "-" - }crt-static" ] - ''; + "linker" = "${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc" + "rustflags" = [ "-C", "target-feature=${ + if pkgsTargetTarget.stdenv.targetPlatform.isStatic then "+" else "-" + }crt-static" ] + ''; }; } ./cargo-setup-hook.sh ) { }; @@ -102,7 +99,7 @@ pkgsHostTarget.rustc ]; substitutions = { - inherit (rust.envVars) rustTargetPlatformSpec setEnv; + inherit (stdenv.targetPlatform.rust) rustcTarget; }; } ./maturin-build-hook.sh ) { }; diff --git a/pkgs/build-support/rust/hooks/maturin-build-hook.sh b/pkgs/build-support/rust/hooks/maturin-build-hook.sh index 899fc9e32e21f..2039339fc80c4 100644 --- a/pkgs/build-support/rust/hooks/maturin-build-hook.sh +++ b/pkgs/build-support/rust/hooks/maturin-build-hook.sh @@ -20,7 +20,7 @@ maturinBuildHook() { local flagsArray=( "--jobs=$NIX_BUILD_CORES" "--offline" - "--target" "@rustTargetPlatformSpec@" + "--target" "@rustcTarget@" "--manylinux" "off" "--strip" "--release" @@ -31,7 +31,7 @@ maturinBuildHook() { concatTo flagsArray maturinBuildFlags echoCmd 'maturinBuildHook flags' "${flagsArray[@]}" - @setEnv@ maturin build "${flagsArray[@]}" + maturin build "${flagsArray[@]}" if [ -n "${buildAndTestSubdir-}" ]; then popd diff --git a/pkgs/development/compilers/rust/make-rust-platform.nix b/pkgs/development/compilers/rust/make-rust-platform.nix index dfe97ead03ca5..e7d0da9cbb5b1 100644 --- a/pkgs/development/compilers/rust/make-rust-platform.nix +++ b/pkgs/development/compilers/rust/make-rust-platform.nix @@ -1,12 +1,13 @@ { lib, buildPackages, - callPackage, callPackages, cargo-auditable, config, stdenv, runCommand, + generateSplicesForMkScope, + makeScopeWithSplicing', }@prev: { @@ -17,59 +18,64 @@ ... }: -rec { - fetchCargoTarball = buildPackages.callPackage ../../../build-support/rust/fetch-cargo-tarball { - git = buildPackages.gitMinimal; - inherit cargo; - }; +(makeScopeWithSplicing' { + otherSplices = generateSplicesForMkScope "rustPlatform"; + f = + self: + let + inherit (self) callPackage; + in + { + fetchCargoTarball = buildPackages.callPackage ../../../build-support/rust/fetch-cargo-tarball { + git = buildPackages.gitMinimal; + inherit cargo; + }; - fetchCargoVendor = buildPackages.callPackage ../../../build-support/rust/fetch-cargo-vendor.nix { - inherit cargo; - }; + fetchCargoVendor = buildPackages.callPackage ../../../build-support/rust/fetch-cargo-vendor.nix { + inherit cargo; + }; - buildRustPackage = callPackage ../../../build-support/rust/build-rust-package { - inherit - stdenv - cargoBuildHook - cargoCheckHook - cargoInstallHook - cargoNextestHook - cargoSetupHook - fetchCargoTarball - fetchCargoVendor - importCargoLock - rustc - cargo - cargo-auditable - ; - }; + buildRustPackage = callPackage ../../../build-support/rust/build-rust-package { + inherit + stdenv + rustc + cargo + cargo-auditable + ; + }; - importCargoLock = buildPackages.callPackage ../../../build-support/rust/import-cargo-lock.nix { - inherit cargo; - }; + importCargoLock = buildPackages.callPackage ../../../build-support/rust/import-cargo-lock.nix { + inherit cargo; + }; - rustcSrc = callPackage ./rust-src.nix { - inherit runCommand rustc; - }; + rustcSrc = callPackage ./rust-src.nix { + inherit runCommand rustc; + }; - rustLibSrc = callPackage ./rust-lib-src.nix { - inherit runCommand rustc; - }; + rustLibSrc = callPackage ./rust-lib-src.nix { + inherit runCommand rustc; + }; - # Hooks - inherit - (callPackages ../../../build-support/rust/hooks { - inherit stdenv cargo rustc; - }) - cargoBuildHook - cargoCheckHook - cargoInstallHook - cargoNextestHook - cargoSetupHook - maturinBuildHook - bindgenHook - ; -} + # Hooks + inherit + (callPackages ../../../build-support/rust/hooks { + inherit + stdenv + cargo + rustc + callPackage + ; + }) + cargoBuildHook + cargoCheckHook + cargoInstallHook + cargoNextestHook + cargoSetupHook + maturinBuildHook + bindgenHook + ; + }; +}) // lib.optionalAttrs config.allowAliases { rust = { rustc = lib.warn "rustPlatform.rust.rustc is deprecated. Use rustc instead." rustc; diff --git a/pkgs/test/default.nix b/pkgs/test/default.nix index 78b1ad61ea8e2..7fc0943ba44e0 100644 --- a/pkgs/test/default.nix +++ b/pkgs/test/default.nix @@ -210,4 +210,6 @@ with pkgs; substitute = recurseIntoAttrs (callPackage ./substitute { }); build-environment-info = callPackage ./build-environment-info { }; + + rust-hooks = recurseIntoAttrs (callPackages ./rust-hooks { }); } diff --git a/pkgs/test/rust-hooks/default.nix b/pkgs/test/rust-hooks/default.nix new file mode 100644 index 0000000000000..edd2ee29e16dd --- /dev/null +++ b/pkgs/test/rust-hooks/default.nix @@ -0,0 +1,104 @@ +{ + rustPlatform, + stdenv, + cargo, +}: +{ + /* + test each hook individually, to make sure that: + - each hook works properly outside of buildRustPackage + - each hook is usable independantly from each other + */ + cargoSetupHook = stdenv.mkDerivation { + name = "test-cargoSetupHook"; + src = ./hello; + cargoVendorDir = "hello"; + nativeBuildInputs = [ + rustPlatform.cargoSetupHook + cargo + ]; + buildPhase = '' + cargo build --profile release --target ${stdenv.hostPlatform.rust.rustcTarget} + ''; + installPhase = '' + mkdir -p $out/bin + mv target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/hello $out/bin/ + ''; + }; + + cargoBuildHook = stdenv.mkDerivation { + name = "test-cargoBuildHook"; + src = ./hello; + cargoBuildType = "release"; + "CARGO_TARGET_${stdenv.hostPlatform.rust.cargoEnvVarTarget}_LINKER" = + "${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc"; + nativeBuildInputs = [ + rustPlatform.cargoBuildHook + cargo + ]; + installPhase = '' + mkdir -p $out/bin + mv target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/hello $out/bin/ + ''; + }; + + cargoInstallHook = stdenv.mkDerivation { + name = "test-cargoInstallHook"; + src = ./hello; + cargoBuildType = "release"; + "CARGO_TARGET_${stdenv.hostPlatform.rust.cargoEnvVarTarget}_LINKER" = + "${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc"; + nativeBuildInputs = [ + rustPlatform.cargoInstallHook + cargo + ]; + buildPhase = '' + cargo build --profile release --target ${stdenv.hostPlatform.rust.rustcTarget} + runHook postBuild + ''; + }; + + cargoCheckHook = stdenv.mkDerivation { + name = "test-cargoCheckHook"; + src = ./hello; + cargoBuildType = "release"; + "CARGO_TARGET_${stdenv.hostPlatform.rust.cargoEnvVarTarget}_LINKER" = + "${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc"; + nativeBuildInputs = [ + rustPlatform.cargoCheckHook + cargo + ]; + buildPhase = '' + cargo build --profile release --target ${stdenv.hostPlatform.rust.rustcTarget} + runHook postBuild + ''; + installPhase = '' + mkdir -p $out/bin + mv target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/hello $out/bin/ + ''; + cargoCheckType = "release"; + doCheck = true; + }; + + cargoNextestHook = stdenv.mkDerivation { + name = "test-cargoNextestHook"; + src = ./hello; + cargoBuildType = "release"; + "CARGO_TARGET_${stdenv.hostPlatform.rust.cargoEnvVarTarget}_LINKER" = + "${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc"; + nativeBuildInputs = [ + rustPlatform.cargoNextestHook + cargo + ]; + buildPhase = '' + cargo build --profile release --target ${stdenv.hostPlatform.rust.rustcTarget} + runHook postBuild + ''; + installPhase = '' + mkdir -p $out/bin + mv target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/hello $out/bin/ + ''; + cargoCheckType = "release"; + doCheck = true; + }; +} diff --git a/pkgs/test/rust-hooks/hello/Cargo.lock b/pkgs/test/rust-hooks/hello/Cargo.lock new file mode 100644 index 0000000000000..c3aedd7700aaf --- /dev/null +++ b/pkgs/test/rust-hooks/hello/Cargo.lock @@ -0,0 +1,7 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "hello" +version = "0.1.0" diff --git a/pkgs/test/rust-hooks/hello/Cargo.toml b/pkgs/test/rust-hooks/hello/Cargo.toml new file mode 100644 index 0000000000000..fe619478a68ce --- /dev/null +++ b/pkgs/test/rust-hooks/hello/Cargo.toml @@ -0,0 +1,6 @@ +[package] +name = "hello" +version = "0.1.0" +edition = "2021" + +[dependencies] diff --git a/pkgs/test/rust-hooks/hello/src/hello.rs b/pkgs/test/rust-hooks/hello/src/hello.rs new file mode 100644 index 0000000000000..0cc3ffdd382e9 --- /dev/null +++ b/pkgs/test/rust-hooks/hello/src/hello.rs @@ -0,0 +1,3 @@ +pub fn hello() -> &'static str { + return "Hello, world!"; +} diff --git a/pkgs/test/rust-hooks/hello/src/lib.rs b/pkgs/test/rust-hooks/hello/src/lib.rs new file mode 100644 index 0000000000000..152adf1c8a0ae --- /dev/null +++ b/pkgs/test/rust-hooks/hello/src/lib.rs @@ -0,0 +1 @@ +pub mod hello; diff --git a/pkgs/test/rust-hooks/hello/src/main.rs b/pkgs/test/rust-hooks/hello/src/main.rs new file mode 100644 index 0000000000000..dee351b578010 --- /dev/null +++ b/pkgs/test/rust-hooks/hello/src/main.rs @@ -0,0 +1,5 @@ +mod hello; + +fn main() { + println!("{}", hello::hello()); +} diff --git a/pkgs/test/rust-hooks/hello/tests/my_test.rs b/pkgs/test/rust-hooks/hello/tests/my_test.rs new file mode 100644 index 0000000000000..e84057a42caae --- /dev/null +++ b/pkgs/test/rust-hooks/hello/tests/my_test.rs @@ -0,0 +1,6 @@ +use hello::hello; + +#[test] +fn test_hello() { + assert_eq!(hello::hello(), "Hello, world!"); +} From ff755cbeab4dd9a5c7b7e107f09a3de14f4a8401 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 31 Jan 2025 13:11:05 +0000 Subject: [PATCH 091/343] libajantv2: 17.1.0 -> 17.1.3 --- pkgs/by-name/li/libajantv2/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/li/libajantv2/package.nix b/pkgs/by-name/li/libajantv2/package.nix index ef582206401e6..2b9e8e9d03fa3 100644 --- a/pkgs/by-name/li/libajantv2/package.nix +++ b/pkgs/by-name/li/libajantv2/package.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "libajantv2"; - version = "17.1.0"; + version = "17.1.3"; src = fetchFromGitHub { owner = "aja-video"; repo = "libajantv2"; rev = "ntv2_${builtins.replaceStrings [ "." ] [ "_" ] version}"; - hash = "sha256-n9j98r1E9E0hv5gA8jCg/eQyqGuyU9JlZYm/zlcTQOo="; + hash = "sha256-7APoPj2LnvdwfuVforoJz0YxKU1WmAgRqIfXao4IZmY="; }; patches = [ ./use-system-mbedtls.patch From dd5617fef7e6cd9b5500460906609bf88708c27e Mon Sep 17 00:00:00 2001 From: Tom Fitzhenry Date: Fri, 31 Jan 2025 23:53:35 +1100 Subject: [PATCH 092/343] treewide: remove uses of now-removed nixUnstable MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit nixUnstable was removed in 2b4e18f3d4a7b80af21b640c0970f83b34efceff but is still referred to from a variety of places, including Hydra's cross-trunk jobset: ``` in job ‘armv7l-hf.nixUnstable.aarch64-linux’: error: … while evaluating a branch condition at /nix/store/m549zq6lcl10d1jqcdgcdaxxj9xdhxfv-source/lib/customisation.nix:479:5: 478| in 479| if drv == null then null else deepSeq drv' drv'; | ^ 480| … in the left operand of the update (//) operator at /nix/store/m549zq6lcl10d1jqcdgcdaxxj9xdhxfv-source/lib/meta.nix:43:9: 42| addMetaAttrs = newAttrs: drv: 43| drv // { meta = (drv.meta or {}) // newAttrs; }; | ^ 44| (stack trace truncated; use '--show-trace' to show the full, detailed trace) error: nixUnstable has been removed. For bleeding edge (Nix master, roughly weekly updated) use nixVersions.git, otherwise use nixVersions.latest. ``` --- doc/using/configuration.chapter.md | 12 ++++++------ .../build-fhsenv-bubblewrap/default.nix | 2 +- pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.8 | 2 +- pkgs/top-level/release-cross.nix | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/doc/using/configuration.chapter.md b/doc/using/configuration.chapter.md index d443cf1b8e54f..cea9532d6a7b6 100644 --- a/doc/using/configuration.chapter.md +++ b/doc/using/configuration.chapter.md @@ -193,7 +193,7 @@ source: ../config-options.json ### Build an environment {#sec-building-environment} -Using `packageOverrides`, it is possible to manage packages declaratively. This means that we can list all of our desired packages within a declarative Nix expression. For example, to have `aspell`, `bc`, `ffmpeg`, `coreutils`, `gdb`, `nixUnstable`, `emscripten`, `jq`, `nox`, and `silver-searcher`, we could use the following in `~/.config/nixpkgs/config.nix`: +Using `packageOverrides`, it is possible to manage packages declaratively. This means that we can list all of our desired packages within a declarative Nix expression. For example, to have `aspell`, `bc`, `ffmpeg`, `coreutils`, `gdb`, `nix`, `emscripten`, `jq`, `nox`, and `silver-searcher`, we could use the following in `~/.config/nixpkgs/config.nix`: ```nix { @@ -206,7 +206,7 @@ Using `packageOverrides`, it is possible to manage packages declaratively. This coreutils gdb ffmpeg - nixUnstable + nix emscripten jq nox @@ -230,7 +230,7 @@ To install it into our environment, you can just run `nix-env -iA nixpkgs.myPack coreutils gdb ffmpeg - nixUnstable + nix emscripten jq nox @@ -258,7 +258,7 @@ After building that new environment, look through `~/.nix-profile` to make sure bc coreutils ffmpeg - nixUnstable + nix emscripten jq nox @@ -292,7 +292,7 @@ This provides us with some useful documentation for using our packages. However coreutils ffmpeg man - nixUnstable + nix emscripten jq nox @@ -344,7 +344,7 @@ Configuring GNU info is a little bit trickier than man pages. To work correctly, coreutils ffmpeg man - nixUnstable + nix emscripten jq nox diff --git a/pkgs/build-support/build-fhsenv-bubblewrap/default.nix b/pkgs/build-support/build-fhsenv-bubblewrap/default.nix index c204628d16684..0a2deefc22e35 100644 --- a/pkgs/build-support/build-fhsenv-bubblewrap/default.nix +++ b/pkgs/build-support/build-fhsenv-bubblewrap/default.nix @@ -93,7 +93,7 @@ let files = [ # NixOS Compatibility "static" - "nix" # mainly for nixUnstable users, but also for access to nix/netrc + "nix" # mainly for nixVersions.git users, but also for access to nix/netrc # Shells "shells" "bashrc" diff --git a/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.8 b/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.8 index bd219998593cb..279c0003c83c1 100644 --- a/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.8 +++ b/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.8 @@ -272,7 +272,7 @@ relevant configuration options. Normally, .Nm first builds the -.Ql nixUnstable +.Ql nix attribute in Nixpkgs, and uses the resulting instance of the Nix package manager to build the new system configuration. This is necessary if the NixOS modules use features not provided by the currently installed version of Nix. This option diff --git a/pkgs/top-level/release-cross.nix b/pkgs/top-level/release-cross.nix index ace9220040b28..d29382562986d 100644 --- a/pkgs/top-level/release-cross.nix +++ b/pkgs/top-level/release-cross.nix @@ -5,7 +5,7 @@ e.g. - $ nix-build pkgs/top-level/release-cross.nix -A crossMingw32.nixUnstable --arg supportedSystems '[builtins.currentSystem]' + $ nix-build pkgs/top-level/release-cross.nix -A crossMingw32.nix --arg supportedSystems '[builtins.currentSystem]' To build all of the bootstrapFiles bundles on every enabled platform, use: @@ -70,7 +70,7 @@ let gmp = nativePlatforms; libcCross = nativePlatforms; nix = nativePlatforms; - nixUnstable = nativePlatforms; + nixVersions.git = nativePlatforms; mesa = nativePlatforms; rustc = nativePlatforms; cargo = nativePlatforms; From 0cba8ebde61cfb14fab08ae2eaeafee958755f5f Mon Sep 17 00:00:00 2001 From: Hraban Luyat Date: Fri, 31 Jan 2025 12:04:43 -0500 Subject: [PATCH 093/343] sbcl: 2.5.0 -> 2.5.1 --- pkgs/development/compilers/sbcl/default.nix | 6 +++--- pkgs/top-level/all-packages.nix | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix index 5a8348451e4ac..03d170dfd389e 100644 --- a/pkgs/development/compilers/sbcl/default.nix +++ b/pkgs/development/compilers/sbcl/default.nix @@ -20,12 +20,12 @@ let }; # By unofficial and very loose convention we keep the latest version of # SBCL, and the previous one in case someone quickly needs to roll back. - "2.4.11" = { - sha256 = "sha256-TwPlhG81g0wQcAu+Iy2kG6S9v4G9zKyx1N4kKXZXpBU="; - }; "2.5.0" = { sha256 = "sha256-Lhiv0Ijkot8ht3uuLhcM5XDRHabSdgcpImXxzGqKGbE="; }; + "2.5.1" = { + sha256 = "sha256-QTOzbNFtFNYzlpw3/VHCyJqOpdbhYRVSgZ2R9xshn4s="; + }; }; # Collection of pre-built SBCL binaries for platforms that need them for # bootstrapping. Ideally these are to be avoided. If ECL (or any other diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c164d7a5ec4c6..b42591fb68c49 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11073,17 +11073,17 @@ with pkgs; faslExt = "fasl"; flags = [ "--dynamic-space-size" "3000" ]; }; - sbcl_2_4_11 = wrapLisp { - pkg = callPackage ../development/compilers/sbcl { version = "2.4.11"; }; + sbcl_2_5_0 = wrapLisp { + pkg = callPackage ../development/compilers/sbcl { version = "2.5.0"; }; faslExt = "fasl"; flags = [ "--dynamic-space-size" "3000" ]; }; - sbcl_2_5_0 = wrapLisp { - pkg = callPackage ../development/compilers/sbcl { version = "2.5.0"; }; + sbcl_2_5_1 = wrapLisp { + pkg = callPackage ../development/compilers/sbcl { version = "2.5.1"; }; faslExt = "fasl"; flags = [ "--dynamic-space-size" "3000" ]; }; - sbcl = sbcl_2_5_0; + sbcl = sbcl_2_5_1; sbclPackages = recurseIntoAttrs sbcl.pkgs; From 51906a01b5cf41f05eebdff69b5cad04b2cca4a2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 31 Jan 2025 17:46:26 +0000 Subject: [PATCH 094/343] fb303: 2025.01.06.00 -> 2025.01.27.00 --- pkgs/by-name/fb/fb303/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fb/fb303/package.nix b/pkgs/by-name/fb/fb303/package.nix index c8f621acd9875..ff773b58e27bc 100644 --- a/pkgs/by-name/fb/fb303/package.nix +++ b/pkgs/by-name/fb/fb303/package.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "fb303"; - version = "2025.01.06.00"; + version = "2025.01.27.00"; outputs = [ "out" @@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "facebook"; repo = "fb303"; tag = "v${finalAttrs.version}"; - hash = "sha256-SW1dRo1Wr14eHzYPg7Wm4QypFpNGXeaFlreEVWWyWgs="; + hash = "sha256-xSE+3fJiwNJT3tzZWighX/Qe/sCXg18arMR2csUAPbs="; }; patches = [ From fc6f8e0a5b5e1129d2aefe293470f308a9afadd7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 31 Jan 2025 18:14:07 +0000 Subject: [PATCH 095/343] fbthrift: 2025.01.06.00 -> 2025.01.27.00 --- pkgs/by-name/fb/fbthrift/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fb/fbthrift/package.nix b/pkgs/by-name/fb/fbthrift/package.nix index 649564e6f8b54..a070d5273b1ad 100644 --- a/pkgs/by-name/fb/fbthrift/package.nix +++ b/pkgs/by-name/fb/fbthrift/package.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "fbthrift"; - version = "2025.01.06.00"; + version = "2025.01.27.00"; outputs = [ # Trying to split this up further into `bin`, `out`, and `dev` @@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "facebook"; repo = "fbthrift"; tag = "v${finalAttrs.version}"; - hash = "sha256-VIWUh238MJDGxf6j/yanom9SNnNjBBzGbpg/SAquN5E="; + hash = "sha256-HiPIpmRwlHSduwHV8EJSmhg7PYFDumx0TNo8uzJ9+j8="; }; patches = [ From 9edef67678690b4427a21f2389f816b3d8050170 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 31 Jan 2025 22:15:02 +0000 Subject: [PATCH 096/343] bmake: 20241124 -> 20250125 --- pkgs/by-name/bm/bmake/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/bm/bmake/package.nix b/pkgs/by-name/bm/bmake/package.nix index 27e75d875a7c3..c975c343e3d04 100644 --- a/pkgs/by-name/bm/bmake/package.nix +++ b/pkgs/by-name/bm/bmake/package.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "bmake"; - version = "20241124"; + version = "20250125"; src = fetchurl { url = "https://www.crufty.net/ftp/pub/sjg/bmake-${finalAttrs.version}.tar.gz"; - hash = "sha256-T2ZAYJHC+F6pZLI41p649xq0uqydykaHpxiDum3k3bI="; + hash = "sha256-TH230E27+tAOV63HUM3RgwlcxJS76vna8zhBXLWlmbI="; }; patches = [ From 3eacc4047d85235e413a0b06ddb44150e32a334d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 31 Jan 2025 23:45:59 +0000 Subject: [PATCH 097/343] umockdev: 0.19.0 -> 0.19.1 --- pkgs/by-name/um/umockdev/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/um/umockdev/package.nix b/pkgs/by-name/um/umockdev/package.nix index 99086e0f27887..50cf36a647fd9 100644 --- a/pkgs/by-name/um/umockdev/package.nix +++ b/pkgs/by-name/um/umockdev/package.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "umockdev"; - version = "0.19.0"; + version = "0.19.1"; outputs = [ "bin" @@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "https://github.com/martinpitt/umockdev/releases/download/${finalAttrs.version}/umockdev-${finalAttrs.version}.tar.xz"; - hash = "sha256-MF7J+i1s4yVugWHx7rwsF4ahNTbWfzHnYODgpNoNQlQ="; + hash = "sha256-LOzg6ONmuJtAcL508zicn3+iGspW2KU1fpbjDNjU9CY="; }; patches = [ From a86be4fb58b7a15b32fc2b125258c07a04e0a5dd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 1 Feb 2025 00:52:17 +0000 Subject: [PATCH 098/343] liblc3: 1.1.1 -> 1.1.2 --- pkgs/by-name/li/liblc3/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/li/liblc3/package.nix b/pkgs/by-name/li/liblc3/package.nix index 0da8995a793ff..8ab037e596bba 100644 --- a/pkgs/by-name/li/liblc3/package.nix +++ b/pkgs/by-name/li/liblc3/package.nix @@ -8,7 +8,7 @@ let name = "liblc3"; - version = "1.1.1"; + version = "1.1.2"; in stdenv.mkDerivation { pname = name; @@ -18,7 +18,7 @@ stdenv.mkDerivation { owner = "google"; repo = "liblc3"; rev = "v${version}"; - sha256 = "sha256-h9qy04FqlHXp0bOUoP4+WqI0yrM78e56S+DEn3HztYo="; + sha256 = "sha256-OWuj68+YztIh/dPvwqjW7ch7Ph3aiEIDvO9rMkVIrQ8="; }; outputs = [ From c0a7f07a6319004086551b59391cb17af92ccd57 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 1 Feb 2025 02:58:26 +0100 Subject: [PATCH 099/343] cpython: patch CVE-2025-0938 https://www.cve.org/CVERecord?id=CVE-2025-0938 --- .../python/cpython/CVE-2025-0938.patch | 200 ++++++++++++++++++ .../interpreters/python/cpython/default.nix | 2 + 2 files changed, 202 insertions(+) create mode 100644 pkgs/development/interpreters/python/cpython/CVE-2025-0938.patch diff --git a/pkgs/development/interpreters/python/cpython/CVE-2025-0938.patch b/pkgs/development/interpreters/python/cpython/CVE-2025-0938.patch new file mode 100644 index 0000000000000..4bd6916a62971 --- /dev/null +++ b/pkgs/development/interpreters/python/cpython/CVE-2025-0938.patch @@ -0,0 +1,200 @@ +From 6204ab9f989be3841c8c47e1e2cfe6a658fe16d5 Mon Sep 17 00:00:00 2001 +From: Seth Michael Larson +Date: Tue, 28 Jan 2025 14:09:00 -0600 +Subject: [PATCH 1/4] gh-105704: Disallow square brackets ( and ) in domain + names for parsed URLs + +--- + Lib/test/test_urlparse.py | 14 +++++++++++++ + Lib/urllib/parse.py | 20 +++++++++++++++++-- + ...-01-28-14-08-03.gh-issue-105704.EnhHxu.rst | 4 ++++ + 3 files changed, 36 insertions(+), 2 deletions(-) + create mode 100644 Misc/NEWS.d/next/Security/2025-01-28-14-08-03.gh-issue-105704.EnhHxu.rst + +diff --git a/Lib/test/test_urlparse.py b/Lib/test/test_urlparse.py +index 4516bdea6adb19..0f15a0998ff2ea 100644 +--- a/Lib/test/test_urlparse.py ++++ b/Lib/test/test_urlparse.py +@@ -1412,6 +1412,20 @@ def test_invalid_bracketed_hosts(self): + self.assertRaises(ValueError, urllib.parse.urlsplit, 'Scheme://user@[0439:23af::2309::fae7:1234]/Path?Query') + self.assertRaises(ValueError, urllib.parse.urlsplit, 'Scheme://user@[0439:23af:2309::fae7:1234:2342:438e:192.0.2.146]/Path?Query') + self.assertRaises(ValueError, urllib.parse.urlsplit, 'Scheme://user@]v6a.ip[/Path') ++ self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://prefix.[v6a.ip]') ++ self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://[v6a.ip].suffix') ++ self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://prefix.[v6a.ip]/') ++ self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://[v6a.ip].suffix/') ++ self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://prefix.[v6a.ip]?') ++ self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://[v6a.ip].suffix?') ++ self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://prefix.[::1]') ++ self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://[::1].suffix') ++ self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://prefix.[::1]/') ++ self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://[::1].suffix/') ++ self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://prefix.[::1]?') ++ self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://[::1].suffix?') ++ self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://user@prefix.[v6a.ip]') ++ self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://user@[v6a.ip].suffix') + + def test_splitting_bracketed_hosts(self): + p1 = urllib.parse.urlsplit('scheme://user@[v6a.ip]/path?query') +diff --git a/Lib/urllib/parse.py b/Lib/urllib/parse.py +index c412c729852272..9d51f4c6812b57 100644 +--- a/Lib/urllib/parse.py ++++ b/Lib/urllib/parse.py +@@ -439,6 +439,23 @@ def _checknetloc(netloc): + raise ValueError("netloc '" + netloc + "' contains invalid " + + "characters under NFKC normalization") + ++def _check_bracketed_netloc(netloc): ++ # Note that this function must mirror the splitting ++ # done in NetlocResultMixins._hostinfo(). ++ hostname_and_port = netloc.rpartition('@')[2] ++ before_bracket, have_open_br, bracketed = hostname_and_port.partition('[') ++ if have_open_br: ++ # No data is allowed before a bracket. ++ if before_bracket: ++ raise ValueError("Invalid IPv6 URL") ++ hostname, _, port = bracketed.partition(']') ++ # No data is allowed after the bracket but before the port delimiter. ++ if port and not port.startswith(":"): ++ raise ValueError("Invalid IPv6 URL") ++ else: ++ hostname, _, port = hostname_and_port.partition(':') ++ _check_bracketed_host(hostname) ++ + # Valid bracketed hosts are defined in + # https://www.rfc-editor.org/rfc/rfc3986#page-49 and https://url.spec.whatwg.org/ + def _check_bracketed_host(hostname): +@@ -505,8 +522,7 @@ def _urlsplit(url, scheme=None, allow_fragments=True): + (']' in netloc and '[' not in netloc)): + raise ValueError("Invalid IPv6 URL") + if '[' in netloc and ']' in netloc: +- bracketed_host = netloc.partition('[')[2].partition(']')[0] +- _check_bracketed_host(bracketed_host) ++ _check_bracketed_netloc(netloc) + if allow_fragments and '#' in url: + url, fragment = url.split('#', 1) + if '?' in url: +diff --git a/Misc/NEWS.d/next/Security/2025-01-28-14-08-03.gh-issue-105704.EnhHxu.rst b/Misc/NEWS.d/next/Security/2025-01-28-14-08-03.gh-issue-105704.EnhHxu.rst +new file mode 100644 +index 00000000000000..aaeac71678de87 +--- /dev/null ++++ b/Misc/NEWS.d/next/Security/2025-01-28-14-08-03.gh-issue-105704.EnhHxu.rst +@@ -0,0 +1,4 @@ ++When using ``urllib.parse.urlsplit()`` and ``urlparse()`` host parsing would ++not reject domain names containing square brackets (``[`` and ``]``). Square ++brackets are only valid for IPv6 and IPvFuture hosts according to `RFC 3986 ++Section 3.2.2 `__. + +From 3ab35e8d890e2c5d4e6b0c0299f94775a3ded9ae Mon Sep 17 00:00:00 2001 +From: Seth Michael Larson +Date: Thu, 30 Jan 2025 09:50:14 -0600 +Subject: [PATCH 2/4] Use Sphinx references + +Co-authored-by: Peter Bierma +--- + .../Security/2025-01-28-14-08-03.gh-issue-105704.EnhHxu.rst | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Misc/NEWS.d/next/Security/2025-01-28-14-08-03.gh-issue-105704.EnhHxu.rst b/Misc/NEWS.d/next/Security/2025-01-28-14-08-03.gh-issue-105704.EnhHxu.rst +index aaeac71678de87..fb8674f558db59 100644 +--- a/Misc/NEWS.d/next/Security/2025-01-28-14-08-03.gh-issue-105704.EnhHxu.rst ++++ b/Misc/NEWS.d/next/Security/2025-01-28-14-08-03.gh-issue-105704.EnhHxu.rst +@@ -1,4 +1,4 @@ +-When using ``urllib.parse.urlsplit()`` and ``urlparse()`` host parsing would ++When using :func:`urllib.parse.urlsplit()` and :func:`urllib.parse.urlparse()` host parsing would + not reject domain names containing square brackets (``[`` and ``]``). Square + brackets are only valid for IPv6 and IPvFuture hosts according to `RFC 3986 + Section 3.2.2 `__. + +From ebf92bb4d323d41778e5de6df177b26f18ecf7f9 Mon Sep 17 00:00:00 2001 +From: Seth Michael Larson +Date: Thu, 30 Jan 2025 11:10:35 -0600 +Subject: [PATCH 3/4] Add mismatched bracket test cases, fix news format + +--- + Lib/test/test_urlparse.py | 10 ++++++++++ + .../2025-01-28-14-08-03.gh-issue-105704.EnhHxu.rst | 8 ++++---- + 2 files changed, 14 insertions(+), 4 deletions(-) + +diff --git a/Lib/test/test_urlparse.py b/Lib/test/test_urlparse.py +index 0f15a0998ff2ea..f8ce61b2b49621 100644 +--- a/Lib/test/test_urlparse.py ++++ b/Lib/test/test_urlparse.py +@@ -1426,6 +1426,16 @@ def test_invalid_bracketed_hosts(self): + self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://[::1].suffix?') + self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://user@prefix.[v6a.ip]') + self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://user@[v6a.ip].suffix') ++ self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://[v6a.ip') ++ self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://v6a.ip]') ++ self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://]v6a.ip[') ++ self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://]v6a.ip') ++ self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://v6a.ip[') ++ self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://prefix.[v6a.ip') ++ self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://v6a.ip].suffix') ++ self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://prefix]v6a.ip[suffix') ++ self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://prefix]v6a.ip') ++ self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://v6a.ip[suffix') + + def test_splitting_bracketed_hosts(self): + p1 = urllib.parse.urlsplit('scheme://user@[v6a.ip]/path?query') +diff --git a/Misc/NEWS.d/next/Security/2025-01-28-14-08-03.gh-issue-105704.EnhHxu.rst b/Misc/NEWS.d/next/Security/2025-01-28-14-08-03.gh-issue-105704.EnhHxu.rst +index fb8674f558db59..bff1bc6b0d609c 100644 +--- a/Misc/NEWS.d/next/Security/2025-01-28-14-08-03.gh-issue-105704.EnhHxu.rst ++++ b/Misc/NEWS.d/next/Security/2025-01-28-14-08-03.gh-issue-105704.EnhHxu.rst +@@ -1,4 +1,4 @@ +-When using :func:`urllib.parse.urlsplit()` and :func:`urllib.parse.urlparse()` host parsing would +-not reject domain names containing square brackets (``[`` and ``]``). Square +-brackets are only valid for IPv6 and IPvFuture hosts according to `RFC 3986 +-Section 3.2.2 `__. ++When using :func:`urllib.parse.urlsplit` and :func:`urllib.parse.urlparse` host ++parsing would not reject domain names containing square brackets (``[`` and ++``]``). Square brackets are only valid for IPv6 and IPvFuture hosts according to ++`RFC 3986 Section 3.2.2 `__. + +From 2817b2e29c8b28a24f9eb97abce1e1b60b1162fa Mon Sep 17 00:00:00 2001 +From: Seth Michael Larson +Date: Thu, 30 Jan 2025 13:01:19 -0600 +Subject: [PATCH 4/4] Add more test coverage for ports + +--- + Lib/test/test_urlparse.py | 13 ++++++++++++- + 1 file changed, 12 insertions(+), 1 deletion(-) + +diff --git a/Lib/test/test_urlparse.py b/Lib/test/test_urlparse.py +index f8ce61b2b49621..b51cc006b73280 100644 +--- a/Lib/test/test_urlparse.py ++++ b/Lib/test/test_urlparse.py +@@ -1424,6 +1424,15 @@ def test_invalid_bracketed_hosts(self): + self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://[::1].suffix/') + self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://prefix.[::1]?') + self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://[::1].suffix?') ++ self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://prefix.[::1]:a') ++ self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://[::1].suffix:a') ++ self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://prefix.[::1]:a1') ++ self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://[::1].suffix:a1') ++ self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://prefix.[::1]:1a') ++ self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://[::1].suffix:1a') ++ self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://prefix.[::1]:') ++ self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://[::1].suffix:/') ++ self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://prefix.[::1]:?') + self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://user@prefix.[v6a.ip]') + self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://user@[v6a.ip].suffix') + self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://[v6a.ip') +@@ -1438,14 +1447,16 @@ def test_invalid_bracketed_hosts(self): + self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://v6a.ip[suffix') + + def test_splitting_bracketed_hosts(self): +- p1 = urllib.parse.urlsplit('scheme://user@[v6a.ip]/path?query') ++ p1 = urllib.parse.urlsplit('scheme://user@[v6a.ip]:1234/path?query') + self.assertEqual(p1.hostname, 'v6a.ip') + self.assertEqual(p1.username, 'user') + self.assertEqual(p1.path, '/path') ++ self.assertEqual(p1.port, 1234) + p2 = urllib.parse.urlsplit('scheme://user@[0439:23af:2309::fae7%test]/path?query') + self.assertEqual(p2.hostname, '0439:23af:2309::fae7%test') + self.assertEqual(p2.username, 'user') + self.assertEqual(p2.path, '/path') ++ self.assertIs(p2.port, None) + p3 = urllib.parse.urlsplit('scheme://user@[0439:23af:2309::fae7:1234:192.0.2.146%test]/path?query') + self.assertEqual(p3.hostname, '0439:23af:2309::fae7:1234:192.0.2.146%test') + self.assertEqual(p3.username, 'user') diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix index d0cb05268d43f..3b249843f4f17 100644 --- a/pkgs/development/interpreters/python/cpython/default.nix +++ b/pkgs/development/interpreters/python/cpython/default.nix @@ -252,6 +252,8 @@ in with passthru; stdenv.mkDerivation (finalAttrs: { # (since it will do a futile invocation of gcc (!) to find # libuuid, slowing down program startup a lot). noldconfigPatch + # https://www.cve.org/CVERecord?id=CVE-2025-0938 + ./CVE-2025-0938.patch ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform && stdenv.hostPlatform.isFreeBSD) [ # Cross compilation only supports a limited number of "known good" # configurations. If you're reading this and it's been a long time From 6a12ab0c22e87f845306158e3042445f35e1330c Mon Sep 17 00:00:00 2001 From: K900 Date: Fri, 31 Jan 2025 19:56:27 +0300 Subject: [PATCH 100/343] separateDebugInfo: don't create broken symlinks --- pkgs/build-support/setup-hooks/separate-debug-info.sh | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/build-support/setup-hooks/separate-debug-info.sh b/pkgs/build-support/setup-hooks/separate-debug-info.sh index ebc773a492186..9cec77b9b0cdd 100644 --- a/pkgs/build-support/setup-hooks/separate-debug-info.sh +++ b/pkgs/build-support/setup-hooks/separate-debug-info.sh @@ -43,10 +43,11 @@ _separateDebugInfo() { then echo "separate-debug-info: warning: multiple files with build id $id found, overwriting" fi - $OBJCOPY --only-keep-debug "$i" "$dst/${id:0:2}/${id:2}.debug" - - # Also a create a symlink .debug. - ln -sfn ".build-id/${id:0:2}/${id:2}.debug" "$dst/../$(basename "$i")" + ( + $OBJCOPY --only-keep-debug "$i" "$dst/${id:0:2}/${id:2}.debug" && + # Also a create a symlink .debug. + ln -sfn ".build-id/${id:0:2}/${id:2}.debug" "$dst/../$(basename "$i")" + ) ) || rmdir -p "$dst/${id:0:2}" done < <(find "$prefix" -type f -print0 | sort -z) } From 25f794db5887e7edf40afc3b1f0593d3d7de4ef8 Mon Sep 17 00:00:00 2001 From: K900 Date: Sat, 1 Feb 2025 15:19:29 +0300 Subject: [PATCH 101/343] Revert "qemu: remove broken symlink" This reverts commit bc002a41809b6621019d673cec1567714aedeb49. Hook is fixed now. --- pkgs/applications/virtualization/qemu/default.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index 9009bb618acd3..63675696b3b3b 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -226,9 +226,6 @@ stdenv.mkDerivation (finalAttrs: { # injected by the pkgsStatic stdenv # rm -f $out/nix-support/propagated-build-inputs - '' + lib.optionalString finalAttrs.separateDebugInfo '' - # HACK: remove broken symlink created by hook - rm $debug/lib/debug/s390-ccw.img ''; preBuild = "cd build"; From 18cbd7791db474062cbf8a3407ddccc582389d00 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Sat, 28 Dec 2024 10:28:38 -0500 Subject: [PATCH 102/343] ld64: switch to patch set from reckenrode/ld64 This patch set is functionally similar to the in-tree patches but contains the following improvements: - Directly use OpenSSL instead of compatibility stubs; - Builds the `dyldinfo` tool; - Replaces (some) Darwin and private headers with LLVM-based headers; - Uses LLVM instead of libtapi for reading text-based stubs; and - Builds ld64 as a cross-linker by default (with no prefix). --- .../ld/ld64/0005-Support-LTO-in-nixpkgs.patch | 48 -- ...SL-based-CoreCrypto-digest-functions.patch | 311 -------- pkgs/by-name/ld/ld64/gen_compile_stubs.py | 8 - pkgs/by-name/ld/ld64/meson.build | 211 ------ pkgs/by-name/ld/ld64/meson.options | 6 - pkgs/by-name/ld/ld64/package.nix | 223 +++--- ...001-Always-use-write-instead-of-mmap.patch | 50 ++ ...s.h-using-Clang-s-embed-extension-fo.patch | 30 + ...efinitions-instead-of-using-private-.patch | 56 ++ ...004-Removed-unused-Blob-clone-method.patch | 27 + ...omics-and-std-mutex-for-portability.patch} | 57 +- .../patches/0006-Add-Meson-build-system.patch | 328 +++++++++ .../0007-Add-CrashReporterClient-header.patch | 91 +++ ...patibility-headers-based-on-LLVM-s-h.patch | 662 ++++++++++++++++++ .../patches/0009-Support-LTO-in-nixpkgs.patch | 111 +++ ...d-vendored-libtapi-to-the-ld64-build.patch | 97 +++ ...-libtapi-to-build-with-upstream-LLVM.patch | 120 ++++ ...bcodedirectory-to-its-own-subproject.patch | 471 +++++++++++++ ...-Set-the-version-string-in-the-build.patch | 41 ++ ...crypto-and-CommonCrypto-with-OpenSSL.patch | 341 +++++++++ ...b_a_linker_signature-implementation.patch} | 48 +- .../0016-Add-dyldinfo-to-the-ld64-build.patch | 35 + .../patches/0017-Fix-dyldinfo-build.patch | 37 + ...ontainers-instead-of-LLVM-containers.patch | 37 + ...move-unused-and-incomplete-blob-clone.diff | 14 - 25 files changed, 2687 insertions(+), 773 deletions(-) delete mode 100644 pkgs/by-name/ld/ld64/0005-Support-LTO-in-nixpkgs.patch delete mode 100644 pkgs/by-name/ld/ld64/0007-Add-OpenSSL-based-CoreCrypto-digest-functions.patch delete mode 100644 pkgs/by-name/ld/ld64/gen_compile_stubs.py delete mode 100644 pkgs/by-name/ld/ld64/meson.build delete mode 100644 pkgs/by-name/ld/ld64/meson.options create mode 100644 pkgs/by-name/ld/ld64/patches/0001-Always-use-write-instead-of-mmap.patch create mode 100644 pkgs/by-name/ld/ld64/patches/0002-Add-compile_stubs.h-using-Clang-s-embed-extension-fo.patch create mode 100644 pkgs/by-name/ld/ld64/patches/0003-Inline-missing-definitions-instead-of-using-private-.patch create mode 100644 pkgs/by-name/ld/ld64/patches/0004-Removed-unused-Blob-clone-method.patch rename pkgs/by-name/ld/ld64/{0004-Use-std-atomics-and-std-mutex.patch => patches/0005-Use-std-atomics-and-std-mutex-for-portability.patch} (84%) create mode 100644 pkgs/by-name/ld/ld64/patches/0006-Add-Meson-build-system.patch create mode 100644 pkgs/by-name/ld/ld64/patches/0007-Add-CrashReporterClient-header.patch create mode 100644 pkgs/by-name/ld/ld64/patches/0008-Provide-mach-compatibility-headers-based-on-LLVM-s-h.patch create mode 100644 pkgs/by-name/ld/ld64/patches/0009-Support-LTO-in-nixpkgs.patch create mode 100644 pkgs/by-name/ld/ld64/patches/0010-Add-vendored-libtapi-to-the-ld64-build.patch create mode 100644 pkgs/by-name/ld/ld64/patches/0011-Modify-vendored-libtapi-to-build-with-upstream-LLVM.patch create mode 100644 pkgs/by-name/ld/ld64/patches/0012-Move-libcodedirectory-to-its-own-subproject.patch create mode 100644 pkgs/by-name/ld/ld64/patches/0013-Set-the-version-string-in-the-build.patch create mode 100644 pkgs/by-name/ld/ld64/patches/0014-Replace-corecrypto-and-CommonCrypto-with-OpenSSL.patch rename pkgs/by-name/ld/ld64/{0006-Add-libcd_is_blob_a_linker_signature-implementation.patch => patches/0015-Add-libcd_is_blob_a_linker_signature-implementation.patch} (73%) create mode 100644 pkgs/by-name/ld/ld64/patches/0016-Add-dyldinfo-to-the-ld64-build.patch create mode 100644 pkgs/by-name/ld/ld64/patches/0017-Fix-dyldinfo-build.patch create mode 100644 pkgs/by-name/ld/ld64/patches/0018-Use-STL-containers-instead-of-LLVM-containers.patch delete mode 100644 pkgs/by-name/ld/ld64/remove-unused-and-incomplete-blob-clone.diff diff --git a/pkgs/by-name/ld/ld64/0005-Support-LTO-in-nixpkgs.patch b/pkgs/by-name/ld/ld64/0005-Support-LTO-in-nixpkgs.patch deleted file mode 100644 index fec7e31b5cdfc..0000000000000 --- a/pkgs/by-name/ld/ld64/0005-Support-LTO-in-nixpkgs.patch +++ /dev/null @@ -1,48 +0,0 @@ -From faa5ab7c6e8d9a6c6157a2b681edad592ce78555 Mon Sep 17 00:00:00 2001 -From: Randy Eckenrode -Date: Sun, 7 Apr 2024 15:33:36 -0400 -Subject: [PATCH 5/8] Support LTO in nixpkgs - ---- - src/ld/InputFiles.cpp | 11 ++--------- - src/ld/parsers/lto_file.cpp | 2 +- - 2 files changed, 3 insertions(+), 10 deletions(-) - -diff --git a/src/ld/InputFiles.cpp b/src/ld/InputFiles.cpp -index 427ab09..b8a9870 100644 ---- a/src/ld/InputFiles.cpp -+++ b/src/ld/InputFiles.cpp -@@ -464,15 +464,8 @@ ld::File* InputFiles::makeFile(const Options::FileInfo& info, bool indirectDylib - if ( _options.overridePathlibLTO() != NULL ) { - libLTO = _options.overridePathlibLTO(); - } -- else if ( _NSGetExecutablePath(ldPath, &bufSize) != -1 ) { -- if ( realpath(ldPath, tmpPath) != NULL ) { -- char* lastSlash = strrchr(tmpPath, '/'); -- if ( lastSlash != NULL ) -- strcpy(lastSlash, "/../lib/libLTO.dylib"); -- libLTO = tmpPath; -- if ( realpath(tmpPath, libLTOPath) != NULL ) -- libLTO = libLTOPath; -- } -+ else { -+ libLTO = "@libllvm@/lib/libLTO.dylib"; - } - throwf("could not process llvm bitcode object file, because %s could not be loaded", libLTO); - } -diff --git a/src/ld/parsers/lto_file.cpp b/src/ld/parsers/lto_file.cpp -index 5318212..e18e974 100644 ---- a/src/ld/parsers/lto_file.cpp -+++ b/src/ld/parsers/lto_file.cpp -@@ -1807,7 +1807,7 @@ bool optimize( const std::vector& allAtoms, - - }; // namespace lto - --static const char *sLTODylib = "@rpath/libLTO.dylib"; -+static const char *sLTODylib = "@libllvm@/lib/libLTO.dylib"; - static std::atomic sLTOIsLoaded(false); - - static void *getHandle() { --- -2.45.1 - diff --git a/pkgs/by-name/ld/ld64/0007-Add-OpenSSL-based-CoreCrypto-digest-functions.patch b/pkgs/by-name/ld/ld64/0007-Add-OpenSSL-based-CoreCrypto-digest-functions.patch deleted file mode 100644 index 16879634338a6..0000000000000 --- a/pkgs/by-name/ld/ld64/0007-Add-OpenSSL-based-CoreCrypto-digest-functions.patch +++ /dev/null @@ -1,311 +0,0 @@ -From 36767c7345161baf0ab125f95c8557f8e24f25db Mon Sep 17 00:00:00 2001 -From: Randy Eckenrode -Date: Tue, 9 Apr 2024 19:28:17 -0400 -Subject: [PATCH 7/8] Add OpenSSL-based CoreCrypto digest functions - ---- - compat/CommonCrypto/CommonDigest.h | 6 +++ - compat/CommonCrypto/CommonDigestSPI.c | 21 +++++++++++ - compat/CommonCrypto/CommonDigestSPI.h | 14 +++++++ - compat/corecrypto/api_defines.h | 10 +++++ - compat/corecrypto/ccdigest.c | 53 +++++++++++++++++++++++++++ - compat/corecrypto/ccdigest.h | 27 ++++++++++++++ - compat/corecrypto/ccdigest_private.h | 19 ++++++++++ - compat/corecrypto/ccsha1.c | 22 +++++++++++ - compat/corecrypto/ccsha1.h | 9 +++++ - compat/corecrypto/ccsha2.c | 22 +++++++++++ - compat/corecrypto/ccsha2.h | 9 +++++ - 11 files changed, 212 insertions(+) - create mode 100644 compat/CommonCrypto/CommonDigest.h - create mode 100644 compat/CommonCrypto/CommonDigestSPI.c - create mode 100644 compat/CommonCrypto/CommonDigestSPI.h - create mode 100644 compat/corecrypto/api_defines.h - create mode 100644 compat/corecrypto/ccdigest.c - create mode 100644 compat/corecrypto/ccdigest.h - create mode 100644 compat/corecrypto/ccdigest_private.h - create mode 100644 compat/corecrypto/ccsha1.c - create mode 100644 compat/corecrypto/ccsha1.h - create mode 100644 compat/corecrypto/ccsha2.c - create mode 100644 compat/corecrypto/ccsha2.h - -diff --git a/compat/CommonCrypto/CommonDigest.h b/compat/CommonCrypto/CommonDigest.h -new file mode 100644 -index 0000000..a60eba7 ---- /dev/null -+++ b/compat/CommonCrypto/CommonDigest.h -@@ -0,0 +1,6 @@ -+// SPDX-License-Identifier: APSL-2.0 -+// CoreCrypto compatibility shims written by Randy Eckenrode © 2024 -+ -+#pragma once -+ -+#define CCSHA256_OUTPUT_SIZE 32 -diff --git a/compat/CommonCrypto/CommonDigestSPI.c b/compat/CommonCrypto/CommonDigestSPI.c -new file mode 100644 -index 0000000..41269fc ---- /dev/null -+++ b/compat/CommonCrypto/CommonDigestSPI.c -@@ -0,0 +1,21 @@ -+// SPDX-License-Identifier: APSL-2.0 -+// CoreCrypto compatibility shims written by Randy Eckenrode © 2024 -+ -+#include "CommonDigestSPI.h" -+ -+#include -+#include -+ -+#include -+ -+void CCDigest(int type, const uint8_t* bytes, size_t count, uint8_t* digest) { -+ if (type != kCCDigestSHA256) { -+ abort(); -+ } -+ const struct ccdigest_info* di = ccsha256_di(); -+ -+ ccdigest_di_decl(_di, ctx); -+ ccdigest_init(di, ctx); -+ ccdigest_update(di, ctx, count, bytes); -+ ccdigest_final(di, ctx, digest); -+} -diff --git a/compat/CommonCrypto/CommonDigestSPI.h b/compat/CommonCrypto/CommonDigestSPI.h -new file mode 100644 -index 0000000..172742a ---- /dev/null -+++ b/compat/CommonCrypto/CommonDigestSPI.h -@@ -0,0 +1,14 @@ -+// SPDX-License-Identifier: APSL-2.0 -+// CoreCrypto compatibility shims written by Randy Eckenrode © 2024 -+ -+#pragma once -+ -+#include -+ -+#include -+#include -+ -+ -+#define kCCDigestSHA256 10 -+ -+EXTERN_C void CCDigest(int type, const uint8_t* bytes, size_t count, uint8_t* digest); -diff --git a/compat/corecrypto/api_defines.h b/compat/corecrypto/api_defines.h -new file mode 100644 -index 0000000..13d1e7a ---- /dev/null -+++ b/compat/corecrypto/api_defines.h -@@ -0,0 +1,10 @@ -+// SPDX-License-Identifier: APSL-2.0 -+// CoreCrypto compatibility shims written by Randy Eckenrode © 2024 -+ -+#pragma once -+ -+#ifdef __cplusplus -+#define EXTERN_C extern "C" -+#else -+#define EXTERN_C -+#endif -diff --git a/compat/corecrypto/ccdigest.c b/compat/corecrypto/ccdigest.c -new file mode 100644 -index 0000000..e29dcb8 ---- /dev/null -+++ b/compat/corecrypto/ccdigest.c -@@ -0,0 +1,53 @@ -+// SPDX-License-Identifier: APSL-2.0 -+// CoreCrypto compatibility shims written by Randy Eckenrode © 2024 -+ -+#include "ccdigest.h" -+#include "ccdigest_private.h" -+ -+#include -+ -+#include -+ -+ -+struct ccdigest_context* _ccdigest_context_new(void) -+{ -+ struct ccdigest_context* ctx = malloc(sizeof(struct ccdigest_context)); -+ ctx->context = EVP_MD_CTX_new(); -+ return ctx; -+} -+ -+struct ccdigest_info* _ccdigest_newprovider(const char* name) -+{ -+ struct ccdigest_info* di = malloc(sizeof(struct ccdigest_info)); -+ di->provider = EVP_MD_fetch(NULL, name, NULL); -+ return di; -+} -+ -+void ccdigest_init(const struct ccdigest_info* di, struct ccdigest_context* ctx) -+{ -+ if (!EVP_DigestInit_ex2(ctx->context, di->provider, NULL)) { -+ ERR_print_errors_fp(stderr); -+ abort(); -+ } -+} -+ -+void ccdigest_update( -+ const struct ccdigest_info* _di, -+ struct ccdigest_context* ctx, -+ size_t count, -+ const void* bytes -+) -+{ -+ if (!EVP_DigestUpdate(ctx->context, bytes, count)) { -+ ERR_print_errors_fp(stderr); -+ abort(); -+ } -+} -+ -+void ccdigest_final(const struct ccdigest_info* _di, struct ccdigest_context* ctx, uint8_t* digest) -+{ -+ if (!EVP_DigestFinal_ex(ctx->context, digest, NULL)) { -+ ERR_print_errors_fp(stderr); -+ abort(); -+ } -+} -diff --git a/compat/corecrypto/ccdigest.h b/compat/corecrypto/ccdigest.h -new file mode 100644 -index 0000000..9af2394 ---- /dev/null -+++ b/compat/corecrypto/ccdigest.h -@@ -0,0 +1,27 @@ -+// SPDX-License-Identifier: APSL-2.0 -+// CoreCrypto compatibility shims written by Randy Eckenrode © 2024 -+ -+#pragma once -+ -+#include -+#include -+ -+#include "api_defines.h" -+ -+ -+struct ccdigest_info; -+struct ccdigest_context; -+ -+EXTERN_C struct ccdigest_context* _ccdigest_context_new(void); -+ -+#define ccdigest_di_decl(_di, ctxvar) \ -+ struct ccdigest_context* (ctxvar) = _ccdigest_context_new() -+ -+EXTERN_C void ccdigest_init(const struct ccdigest_info* di, struct ccdigest_context* ctx); -+EXTERN_C void ccdigest_update( -+ const struct ccdigest_info* _di, -+ struct ccdigest_context* ctx, -+ size_t count, -+ const void* bytes -+); -+EXTERN_C void ccdigest_final(const struct ccdigest_info* _di, struct ccdigest_context* ctx, uint8_t* digest); -diff --git a/compat/corecrypto/ccdigest_private.h b/compat/corecrypto/ccdigest_private.h -new file mode 100644 -index 0000000..0ea9759 ---- /dev/null -+++ b/compat/corecrypto/ccdigest_private.h -@@ -0,0 +1,19 @@ -+// SPDX-License-Identifier: APSL-2.0 -+// CoreCrypto compatibility shims written by Randy Eckenrode © 2024 -+ -+#pragma once -+ -+#include "api_defines.h" -+ -+#include -+ -+ -+struct ccdigest_info { -+ EVP_MD* provider; -+}; -+ -+struct ccdigest_context { -+ EVP_MD_CTX* context; -+}; -+ -+EXTERN_C struct ccdigest_info* _ccdigest_newprovider(const char* name); -diff --git a/compat/corecrypto/ccsha1.c b/compat/corecrypto/ccsha1.c -new file mode 100644 -index 0000000..e02b2b6 ---- /dev/null -+++ b/compat/corecrypto/ccsha1.c -@@ -0,0 +1,22 @@ -+// SPDX-License-Identifier: APSL-2.0 -+// CoreCrypto compatibility shims written by Randy Eckenrode © 2024 -+ -+#include "ccsha1.h" -+ -+#include -+ -+#include -+ -+#include "ccdigest_private.h" -+ -+ -+static struct ccdigest_info* di = NULL; -+ -+const struct ccdigest_info* ccsha1_di(void) -+{ -+ if (!di) { -+ di = _ccdigest_newprovider("SHA-1"); -+ assert(EVP_MD_get_size(di->provider) == CS_SHA1_LEN); -+ } -+ return di; -+} -diff --git a/compat/corecrypto/ccsha1.h b/compat/corecrypto/ccsha1.h -new file mode 100644 -index 0000000..8e3f85f ---- /dev/null -+++ b/compat/corecrypto/ccsha1.h -@@ -0,0 +1,9 @@ -+// SPDX-License-Identifier: APSL-2.0 -+// CoreCrypto compatibility shims written by Randy Eckenrode © 2024 -+ -+#pragma once -+ -+#include -+ -+ -+EXTERN_C const struct ccdigest_info* ccsha1_di(void); -diff --git a/compat/corecrypto/ccsha2.c b/compat/corecrypto/ccsha2.c -new file mode 100644 -index 0000000..6504503 ---- /dev/null -+++ b/compat/corecrypto/ccsha2.c -@@ -0,0 +1,22 @@ -+// SPDX-License-Identifier: APSL-2.0 -+// CoreCrypto compatibility shims written by Randy Eckenrode © 2024 -+ -+#include "ccsha2.h" -+ -+#include -+ -+#include -+ -+#include "ccdigest_private.h" -+ -+ -+static struct ccdigest_info* di = NULL; -+ -+const struct ccdigest_info* ccsha256_di(void) -+{ -+ if (!di) { -+ di = _ccdigest_newprovider("SHA-256"); -+ assert(EVP_MD_get_size(di->provider) == CS_SHA256_LEN); -+ } -+ return di; -+} -diff --git a/compat/corecrypto/ccsha2.h b/compat/corecrypto/ccsha2.h -new file mode 100644 -index 0000000..9f30e03 ---- /dev/null -+++ b/compat/corecrypto/ccsha2.h -@@ -0,0 +1,9 @@ -+// SPDX-License-Identifier: APSL-2.0 -+// CoreCrypto compatibility shims written by Randy Eckenrode © 2024 -+ -+#pragma once -+ -+#include -+ -+ -+EXTERN_C const struct ccdigest_info* ccsha256_di(void); --- -2.45.1 - diff --git a/pkgs/by-name/ld/ld64/gen_compile_stubs.py b/pkgs/by-name/ld/ld64/gen_compile_stubs.py deleted file mode 100644 index 30fe30789a107..0000000000000 --- a/pkgs/by-name/ld/ld64/gen_compile_stubs.py +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/env python -import sys -from pathlib import Path - -byteseq = (str(int(x)) for x in Path(sys.argv[1]).read_bytes()) - -print("#pragma once") -print(f"static const char compile_stubs[] = {{ {', '.join(byteseq)} }};") diff --git a/pkgs/by-name/ld/ld64/meson.build b/pkgs/by-name/ld/ld64/meson.build deleted file mode 100644 index c9068b75d026a..0000000000000 --- a/pkgs/by-name/ld/ld64/meson.build +++ /dev/null @@ -1,211 +0,0 @@ -# Build settings based on the upstream Xcode project. -# See: https://github.com/apple-oss-distributions/ld64/blob/main/ld64.xcodeproj/project.pbxproj - -# Project settings -project( - 'ld64', - 'c', 'cpp', - version : '@version@', - default_options : {'cpp_std': 'c++20'}, -) - -fs = import('fs') - -# Options -target_prefix = get_option('target_prefix') - - -# Dependencies -cc = meson.get_compiler('c') -cxx = meson.get_compiler('cpp') -python = find_program('python3') - -libtapi = cxx.find_library('tapi') -openssl = dependency('openssl', version : '>=3.0') -xar = cc.find_library('xar') - - -# Generated files - -compile_stubs_h = custom_target( - 'compile_stubs.h', - capture : true, - command : [python, '@INPUT0@', '@INPUT1@'], - input : ['gen_compile_stubs.py', 'compile_stubs'], - output : ['compile_stubs.h'], -) - -configure_h = custom_target( - 'configure_h', - command : ['bash', '@INPUT@'], - env : { - 'DERIVED_FILE_DIR' : meson.current_build_dir(), - 'RC_ProjectSourceVersion': '@version@' - }, - input : ['src/create_configure'], - output : ['configure.h'], -) - -incdirs = include_directories( - 'compat', - 'src/abstraction', - 'src/ld', - 'src/ld/code-sign-blobs', - 'src/ld/parsers', - 'src/ld/passes', - 'src/mach_o', -) - -# Dynamic libraries -libcodedirectory = library( - 'codedirectory', - dependencies : [openssl], - include_directories : incdirs, - install : true, - sources : [ - 'compat/corecrypto/ccdigest.c', - 'compat/corecrypto/ccsha1.c', - 'compat/corecrypto/ccsha2.c', - 'compat/libcodedirectory.c', - 'src/ld/libcodedirectory.c' - ], - soversion : 1, -) -install_headers( - 'src/ld/cs_blobs.h', - 'src/ld/libcodedirectory.h', -) - - -# Static libraries -libprunetrie = static_library( - 'prunetrie', - include_directories : incdirs, - install : true, - override_options : {'b_lto': false}, - sources : [ - 'src/mach_o/Error.cpp', - 'src/mach_o/ExportsTrie.cpp', - 'src/other/PruneTrie.cpp', - ], -) -install_headers( - 'src/other/prune_trie.h', - subdir : 'mach-o', -) - - -# Binaries -ld64 = executable( - f'@target_prefix@ld', - dependencies : [libtapi, openssl, xar], - include_directories : incdirs, - install : true, - cpp_args : [ - # Required for `_COMM_PAGE_CPU_CAPABILITIES64` in - # on `x86_64-darwin` - '-DPRIVATE', - ], - # These linker flags mirror those used in a release build of the Xcode project. - # See: https://github.com/apple-oss-distributions/ld64/blob/47f477cb721755419018f7530038b272e9d0cdea/ld64.xcodeproj/project.pbxproj#L1292-L1299. - link_args : [ - '-Wl,-exported_symbol,__mh_execute_header', - '-Wl,-stack_size,0x02000000', - '-Wl,-client_name,ld', - ], - link_with : [libcodedirectory], - sources : [ - compile_stubs_h, - configure_h, - 'compat/CommonCrypto/CommonDigestSPI.c', - 'compat/corecrypto/ccdigest.c', - 'compat/corecrypto/ccsha1.c', - 'compat/corecrypto/ccsha2.c', - 'src/ld/FatFile.cpp', - 'src/ld/InputFiles.cpp', - 'src/ld/Mangling.cpp', - 'src/ld/Options.cpp', - 'src/ld/OutputFile.cpp', - 'src/ld/PlatformSupport.cpp', - 'src/ld/Resolver.cpp', - 'src/ld/ResponseFiles.cpp', - 'src/ld/Snapshot.cpp', - 'src/ld/SymbolTable.cpp', - 'src/ld/code-sign-blobs/blob.cpp', - 'src/ld/code-sign-blobs/blob.h', - 'src/ld/debugline.c', - 'src/ld/ld.cpp', - 'src/ld/parsers/archive_file.cpp', - 'src/ld/parsers/generic_dylib_file.cpp', - 'src/ld/parsers/lto_file.cpp', - 'src/ld/parsers/macho_dylib_file.cpp', - 'src/ld/parsers/macho_relocatable_file.cpp', - 'src/ld/parsers/opaque_section_file.cpp', - 'src/ld/parsers/textstub_dylib_file.cpp', - 'src/ld/passes/bitcode_bundle.cpp', - 'src/ld/passes/branch_island.cpp', - 'src/ld/passes/branch_shim.cpp', - 'src/ld/passes/code_dedup.cpp', - 'src/ld/passes/compact_unwind.cpp', - 'src/ld/passes/dtrace_dof.cpp', - 'src/ld/passes/dylibs.cpp', - 'src/ld/passes/got.cpp', - 'src/ld/passes/huge.cpp', - 'src/ld/passes/inits.cpp', - 'src/ld/passes/objc.cpp', - 'src/ld/passes/objc_constants.cpp', - 'src/ld/passes/objc_stubs.cpp', - 'src/ld/passes/order.cpp', - 'src/ld/passes/stubs/stubs.cpp', - 'src/ld/passes/thread_starts.cpp', - 'src/ld/passes/tlvp.cpp', - 'src/mach_o/Error.cpp', - 'src/mach_o/ExportsTrie.cpp', - ], -) -install_man('doc/man/man1/ld-classic.1') - -# Extra tools -unwinddump = executable( - f'@target_prefix@unwinddump', - include_directories : incdirs, - install : true, - sources : [ - configure_h, - 'src/other/UnwindDump.cpp', - ], -) -install_man('doc/man/man1/unwinddump.1') - -machocheck = executable( - f'@target_prefix@machocheck', - include_directories : incdirs, - install : true, - sources : [ - configure_h, - 'src/other/machochecker.cpp', - ], -) - -objectdump = executable( - f'@target_prefix@ObjectDump', - include_directories : incdirs, - install : true, - sources : [ - configure_h, - 'src/ld/PlatformSupport.cpp', - 'src/ld/debugline.c', - 'src/ld/parsers/macho_relocatable_file.cpp', - 'src/other/ObjectDump.cpp', - ], -) - -objcimageinfo = executable( - f'@target_prefix@objcimageinfo', - include_directories : incdirs, - install : true, - sources : [ - configure_h, - 'src/other/objcimageinfo.cpp', - ], -) diff --git a/pkgs/by-name/ld/ld64/meson.options b/pkgs/by-name/ld/ld64/meson.options deleted file mode 100644 index 2417b81f0401e..0000000000000 --- a/pkgs/by-name/ld/ld64/meson.options +++ /dev/null @@ -1,6 +0,0 @@ -option( - 'target_prefix', - type : 'string', - value : '', - description: 'Specifies the prefix to use when building for cross-compilation (e.g., `aarch64-apple-darwin`)' -) diff --git a/pkgs/by-name/ld/ld64/package.nix b/pkgs/by-name/ld/ld64/package.nix index 074e92daa725b..c5cd1d7b9c1ed 100644 --- a/pkgs/by-name/ld/ld64/package.nix +++ b/pkgs/by-name/ld/ld64/package.nix @@ -1,75 +1,42 @@ { lib, - stdenv, - stdenvNoCC, - fetchFromGitHub, - fetchurl, - apple-sdk, - apple-sdk_14, cctools, + cmake, darwin, + fetchFromGitHub, libtapi, llvm, meson, ninja, openssl, pkg-config, - python3, - swiftPackages, + stdenv, xar, - gitUpdater, }: let - # The targetPrefix is prepended to binary names to allow multiple binutils on the PATH to be usable. - targetPrefix = lib.optionalString ( - stdenv.targetPlatform != stdenv.hostPlatform - ) "${stdenv.targetPlatform.config}-"; - - # ld64 needs CrashReporterClient.h, which is hard to find, but WebKit2 has it. - # Fetch it directly because the Darwin stdenv bootstrap can’t depend on fetchgit. - crashreporter_h = fetchurl { - url = "https://raw.githubusercontent.com/apple-oss-distributions/WebKit2/WebKit2-7605.1.33.0.2/Platform/spi/Cocoa/CrashReporterClientSPI.h"; - hash = "sha256-0ybVcwHuGEdThv0PPjYQc3SW0YVOyrM3/L9zG/l1Vtk="; + # ld64 uses `#embed` to embed `compile_stubs`, which is only implemented in Clang 19. + # This can be done unconditionally once the bootstrap tools have been updated. + hasEmbed = lib.versionAtLeast (lib.getVersion stdenv.cc) "19"; + + # Copy the files from their original sources instead of using patches to reduce the size of the patch set in nixpkgs. + otherSrcs = { + # The last version of ld64 to have dyldinfo + ld64 = fetchFromGitHub { + owner = "apple-oss-distributions"; + repo = "ld64"; + tag = "ld64-762"; + hash = "sha256-UIq/fwO40vk8yvoTfx+UlLhnuzkI0Ih+Ym6W/BwnP0s="; + }; + + # Provides the source files used in the vendored libtapi. The libtapi derivation puts `tapi-src` first. + libtapi = lib.head libtapi.srcs; }; - dyld = apple-sdk_14.sourceRelease "dyld"; - - libdispatchPrivate = apple-sdk.sourceRelease "libdispatch"; - - xnu = apple-sdk.sourceRelease "xnu"; - - privateHeaders = stdenvNoCC.mkDerivation { - name = "ld64-deps-private-headers"; - - buildCommand = '' - mkdir -p "$out/include/System" - for dir in arm i386 machine; do - cp -r '${xnu}/osfmk/'$dir "$out/include/System/$dir" - done + ld64src = lib.escapeShellArg "${otherSrcs.ld64}"; + libtapisrc = lib.escapeShellArg "${otherSrcs.libtapi}"; - substitute '${crashreporter_h}' "$out/include/CrashReporterClient.h" \ - --replace-fail 'USE(APPLE_INTERNAL_SDK)' '0' - - cp -r '${libdispatchPrivate}/private' "$out/include/dispatch" - - install -D -t "$out/include/mach-o" \ - '${dyld}/include/mach-o/dyld_priv.h' \ - '${cctools.src}/include/mach-o/loader.h' - - install -D -t "$out/include/mach-o/arm" \ - '${cctools.src}/include/mach-o/arm/reloc.h' - - install -D -t "$out/include/sys" \ - '${xnu}/bsd/sys/commpage.h' - - substituteInPlace "$out/include/mach-o/dyld_priv.h" \ - --replace-fail ', bridgeos(3.0)' "" - ''; - }; - - # Avoid pulling in all of Swift just to build libdispatch - libdispatch = swiftPackages.Dispatch.override { useSwift = false; }; + llvmPath = "${lib.getLib llvm}"; in stdenv.mkDerivation (finalAttrs: { pname = "ld64"; @@ -84,84 +51,90 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "apple-oss-distributions"; repo = "ld64"; - rev = "ld64-${finalAttrs.version}"; + tag = "ld64-${finalAttrs.version}"; hash = "sha256-hLkfqgBwVPlO4gfriYOawTO5E1zSD63ZcNetm1E5I70"; }; - xcodeHash = "sha256-+j7Ed/6aD46SJnr3DWPfWuYWylb2FNJRPmWsUVxZJHM="; - - postUnpack = '' - # Verify that the Xcode project has not changed unexpectedly. - hashType=$(echo $xcodeHash | cut -d- -f1) - expectedHash=$(echo $xcodeHash | cut -d- -f2) - hash=$(openssl "$hashType" -binary "$sourceRoot/ld64.xcodeproj/project.pbxproj" | base64) - - if [ "$hash" != "$expectedHash" ]; then - echo 'error: hash mismatch in ld64.xcodeproj/project.pbxproj' - echo " specified: $xcodeHash" - echo " got: $hashType-$hash" - echo - echo 'Upstream Xcode project has changed. Update `meson.build` with any changes, then update `xcodeHash`.' - echo 'Use `nix-hash --flat --sri --type sha256 ld64.xcodeproj/project.pbxproj` to regenerate it.' - exit 1 - fi + patches = + [ + # These patches are vendored from https://github.com/reckenrode/ld64/tree/ld64-951.9-nixpkgs. + # See their comments for more on what they do. + ./patches/0001-Always-use-write-instead-of-mmap.patch + ./patches/0003-Inline-missing-definitions-instead-of-using-private-.patch + ./patches/0004-Removed-unused-Blob-clone-method.patch + ./patches/0005-Use-std-atomics-and-std-mutex-for-portability.patch + ./patches/0006-Add-Meson-build-system.patch + ./patches/0007-Add-CrashReporterClient-header.patch + ./patches/0008-Provide-mach-compatibility-headers-based-on-LLVM-s-h.patch + ./patches/0009-Support-LTO-in-nixpkgs.patch + ./patches/0010-Add-vendored-libtapi-to-the-ld64-build.patch + ./patches/0011-Modify-vendored-libtapi-to-build-with-upstream-LLVM.patch + ./patches/0012-Move-libcodedirectory-to-its-own-subproject.patch + ./patches/0013-Set-the-version-string-in-the-build.patch + ./patches/0014-Replace-corecrypto-and-CommonCrypto-with-OpenSSL.patch + ./patches/0015-Add-libcd_is_blob_a_linker_signature-implementation.patch + ./patches/0016-Add-dyldinfo-to-the-ld64-build.patch + ./patches/0017-Fix-dyldinfo-build.patch + ./patches/0018-Use-STL-containers-instead-of-LLVM-containers.patch + ] + ++ lib.optionals (hasEmbed) [ + ./patches/0002-Add-compile_stubs.h-using-Clang-s-embed-extension-fo.patch + ]; + + prePatch = '' + # Copy dyldinfo source files + cp ${ld64src}/doc/man/man1/dyldinfo.1 doc/man/man1/dyldinfo.1 + cp ${ld64src}/src/other/dyldinfo.cpp src/other/dyldinfo.cpp + + # Copy files needed from libtapi by ld64 + mkdir -p subprojects/libtapi/tapi + cp ${libtapisrc}/tools/libtapi/*.cpp subprojects/libtapi + cp ${libtapisrc}/LICENSE.TXT subprojects/libtapi/LICENSE.TXT + + declare -a tapiHeaders=( + APIVersion.h + Defines.h + LinkerInterfaceFile.h + PackedVersion32.h + Symbol.h + Version.h + Version.inc.in + tapi.h + ) + for header in "''${tapiHeaders[@]}"; do + cp ${libtapisrc}/include/tapi/$header subprojects/libtapi/tapi/$header + done ''; - patches = [ - # Use std::atomic for atomics. Replaces private APIs (`os/lock_private.h`) with standard APIs. - ./0004-Use-std-atomics-and-std-mutex.patch - # ld64 assumes the default libLTO.dylib can be found relative to its bindir, which is - # not the case in nixpkgs. Override it to default to `stdenv.cc`’s libLTO.dylib. - ./0005-Support-LTO-in-nixpkgs.patch - # Add implementation of missing function required for code directory support. - ./0006-Add-libcd_is_blob_a_linker_signature-implementation.patch - # Add OpenSSL implementation of CoreCrypto digest functions. Avoids use of private and non-free APIs. - ./0007-Add-OpenSSL-based-CoreCrypto-digest-functions.patch - ./remove-unused-and-incomplete-blob-clone.diff - ]; - - postPatch = '' - substitute ${./meson.build} meson.build \ - --subst-var version - cp ${./meson.options} meson.options - - # Match the version format used by upstream. - sed -i src/ld/Options.cpp \ - -e '1iconst char ld_classicVersionString[] = "@(#)PROGRAM:ld PROJECT:ld64-${finalAttrs.version}\\n";' - - # Instead of messing around with trying to extract and run the script from the Xcode project, - # just use our own Python script to generate `compile_stubs.h` - cp ${./gen_compile_stubs.py} gen_compile_stubs.py - - # Enable LTO support using LLVM’s libLTO.dylib by default. - substituteInPlace src/ld/InputFiles.cpp \ - --subst-var-by libllvm '${lib.getLib llvm}' - substituteInPlace src/ld/parsers/lto_file.cpp \ - --subst-var-by libllvm '${lib.getLib llvm}' - - # Use portable includes - substituteInPlace src/ld/code-sign-blobs/endian.h \ - --replace-fail '#include ' '#include ' + # Clang 16 doesn’t support C23, but the patchset expects a compiler that supports it. Only `#embed` is used, so stub + # out its usage and request an older C standard version. This can be dropped once the bootstrap tools are updated. + postPatch = lib.optionalString (!hasEmbed) '' + for meson_build in meson.build subprojects/libcodedirectory/meson.build subprojects/libtapi/meson.build; do + substituteInPlace $meson_build --replace-fail c23 c2x + done + echo '#pragma once' > src/ld/compile_stubs.h + echo 'static const char compile_stubs[] = "";' >> src/ld/compile_stubs.h ''; - strictDeps = true; - - env.NIX_CFLAGS_COMPILE = "-DTARGET_OS_BRIDGE=0 -I${privateHeaders}/include"; + xcodeHash = "sha256-+j7Ed/6aD46SJnr3DWPfWuYWylb2FNJRPmWsUVxZJHM="; + xcodeProject = "ld64.xcodeproj"; nativeBuildInputs = [ + cmake + darwin.xcodeProjectCheckHook meson ninja openssl pkg-config - python3 ]; buildInputs = [ - libtapi llvm openssl xar - ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libdispatch ]; + ]; + + dontUseCmakeConfigure = true; # CMake is only needed because it’s used by Meson to find LLVM. # Note for overrides: ld64 cannot be built as a debug build because of UB in its iteration implementations, # which trigger libc++ debug assertions due to trying to take the address of the first element of an emtpy vector. @@ -170,7 +143,8 @@ stdenv.mkDerivation (finalAttrs: { mesonFlags = [ (lib.mesonOption "b_ndebug" "if-release") (lib.mesonOption "default_library" (if stdenv.hostPlatform.isStatic then "static" else "shared")) - ] ++ lib.optionals (targetPrefix != "") [ (lib.mesonOption "target_prefix" targetPrefix) ]; + (lib.mesonOption "libllvm_path" llvmPath) + ]; doInstallCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; @@ -182,17 +156,24 @@ stdenv.mkDerivation (finalAttrs: { cd "$NIX_BUILD_TOP/$sourceRoot" - export NIX_CFLAGS_COMPILE+=" --ld-path=$out/bin/${targetPrefix}ld" + export NIX_CFLAGS_COMPILE+=" --ld-path=$out/bin/ld" export NIX_CFLAGS_LINK+=" -L$SDKROOT/usr/lib" - meson setup build-install-check -Db_lto=true --buildtype=$mesonBuildType${ - lib.optionalString (targetPrefix != "") " -Dtarget_prefix=${targetPrefix}" + meson setup build-install-check --buildtype=$mesonBuildType ${ + lib.escapeShellArgs [ + (lib.mesonBool "b_lto" true) + (lib.mesonOption "libllvm_path" llvmPath) + ] } cd build-install-check - ninja ${targetPrefix}ld "-j$NIX_BUILD_CORES" + ninja src/ld/ld "-j$NIX_BUILD_CORES" # Confirm that ld found the LTO library and reports it. - ./${targetPrefix}ld -v 2>&1 | grep -q 'LTO support' + if ./src/ld/ld -v 2>&1 | grep -q 'LTO support'; then + echo "LTO: supported" + else + echo "LTO: not supported" && exit 1 + fi runHook postInstallCheck ''; @@ -205,8 +186,6 @@ stdenv.mkDerivation (finalAttrs: { __structuredAttrs = true; - passthru.updateScript = gitUpdater { rev-prefix = "ld64-"; }; - meta = { description = "The classic linker for Darwin"; homepage = "https://opensource.apple.com/releases/"; diff --git a/pkgs/by-name/ld/ld64/patches/0001-Always-use-write-instead-of-mmap.patch b/pkgs/by-name/ld/ld64/patches/0001-Always-use-write-instead-of-mmap.patch new file mode 100644 index 0000000000000..5e6648eb60400 --- /dev/null +++ b/pkgs/by-name/ld/ld64/patches/0001-Always-use-write-instead-of-mmap.patch @@ -0,0 +1,50 @@ +From 49489b079a3a2fd42f62c62441981cc734b0d7e7 Mon Sep 17 00:00:00 2001 +From: Randy Eckenrode +Date: Wed, 13 Nov 2024 13:53:14 -0500 +Subject: [PATCH 01/18] Always use `write` instead of `mmap` + +This is already required on aarch64-darwin (even under Rosetta 2), so also do it on x86_64-darwin to +avoid needing to use private headers to get the definition of `_COMM_PAGE_CPU_CAPABILITIES64`. +--- + src/ld/OutputFile.cpp | 18 ++---------------- + 1 file changed, 2 insertions(+), 16 deletions(-) + +diff --git a/src/ld/OutputFile.cpp b/src/ld/OutputFile.cpp +index edefb71..487b338 100644 +--- a/src/ld/OutputFile.cpp ++++ b/src/ld/OutputFile.cpp +@@ -57,7 +57,7 @@ extern "C" { + + #include + #include +-#include ++ + + #include "ExportsTrie.h" + +@@ -4011,21 +4011,7 @@ void OutputFile::writeOutputFile(ld::Internal& state) + } + + // assume mappable by default +- bool outputIsMappableFile = true; +- +-#if __arm64__ +- // work around VM limitation on Apple Silicon and use write() instead of mmap() to produce output file +- outputIsMappableFile = false; +-#elif __x86_64__ +-#ifndef kIsTranslated +- #define kIsTranslated 0x4000000000000000ULL +-#endif +- // +- bool isTranslated = ((*(uint64_t*)_COMM_PAGE_CPU_CAPABILITIES64) & kIsTranslated); +- if ( isTranslated ) { +- outputIsMappableFile = false; +- } +-#endif ++ bool outputIsMappableFile = false; + + // rdar://107066824 (ld64: provide an environment variable or so to switch to the + // allocate+pwrite writing mode (instead of mmap) on Intels) +-- +2.47.2 + diff --git a/pkgs/by-name/ld/ld64/patches/0002-Add-compile_stubs.h-using-Clang-s-embed-extension-fo.patch b/pkgs/by-name/ld/ld64/patches/0002-Add-compile_stubs.h-using-Clang-s-embed-extension-fo.patch new file mode 100644 index 0000000000000..472bfc1666c06 --- /dev/null +++ b/pkgs/by-name/ld/ld64/patches/0002-Add-compile_stubs.h-using-Clang-s-embed-extension-fo.patch @@ -0,0 +1,30 @@ +From 966a7c3af74fb0de0f97d344b14890dc2d45f7e1 Mon Sep 17 00:00:00 2001 +From: Randy Eckenrode +Date: Wed, 13 Nov 2024 13:53:14 -0500 +Subject: [PATCH 02/18] =?UTF-8?q?Add=20compile=5Fstubs.h=20using=20Clang?= + =?UTF-8?q?=E2=80=99s=20`#embed`=20extension=20for=20C++?= +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +--- + src/ld/compile_stubs.h | 7 +++++++ + 1 file changed, 7 insertions(+) + create mode 100644 src/ld/compile_stubs.h + +diff --git a/src/ld/compile_stubs.h b/src/ld/compile_stubs.h +new file mode 100644 +index 0000000..88b8462 +--- /dev/null ++++ b/src/ld/compile_stubs.h +@@ -0,0 +1,7 @@ ++// SPDX-License-Identifier: APSL-2.0 ++ ++#pragma once ++ ++static const char compile_stubs[] = { ++#embed "../../compile_stubs" suffix(, '\0') if_empty('\0') ++}; +-- +2.47.2 + diff --git a/pkgs/by-name/ld/ld64/patches/0003-Inline-missing-definitions-instead-of-using-private-.patch b/pkgs/by-name/ld/ld64/patches/0003-Inline-missing-definitions-instead-of-using-private-.patch new file mode 100644 index 0000000000000..7622f9a8e70f5 --- /dev/null +++ b/pkgs/by-name/ld/ld64/patches/0003-Inline-missing-definitions-instead-of-using-private-.patch @@ -0,0 +1,56 @@ +From ddcefc16f5db7fd36c885cf3bcd3713c8383e93b Mon Sep 17 00:00:00 2001 +From: Randy Eckenrode +Date: Wed, 13 Nov 2024 13:53:14 -0500 +Subject: [PATCH 03/18] Inline missing definitions instead of using private + mach-o/dyld_private.h header + +Based on: https://github.com/llvm/llvm-project/blob/38870fe124eb5e6e24136f9d3e4551a62370faee/libunwind/src/AddressSpace.hpp#L57-L67 +--- + src/ld/Options.cpp | 1 - + src/ld/parsers/libunwind/AddressSpace.hpp | 10 +++++++++- + 2 files changed, 9 insertions(+), 2 deletions(-) + +diff --git a/src/ld/Options.cpp b/src/ld/Options.cpp +index 991387f..cde3fad 100644 +--- a/src/ld/Options.cpp ++++ b/src/ld/Options.cpp +@@ -35,7 +35,6 @@ + #include + #include + #include +-#include + + #include + #include +diff --git a/src/ld/parsers/libunwind/AddressSpace.hpp b/src/ld/parsers/libunwind/AddressSpace.hpp +index eb47390..0788cc2 100644 +--- a/src/ld/parsers/libunwind/AddressSpace.hpp ++++ b/src/ld/parsers/libunwind/AddressSpace.hpp +@@ -35,7 +35,6 @@ + #include + #include + #include +-#include + #include + + #include "FileAbstraction.hpp" +@@ -73,7 +72,16 @@ bool _dyld_find_unwind_sections(void* addr, dyld_unwind_sections* info) + } + #endif // 0 + ++struct dyld_unwind_sections ++{ ++ const struct mach_header* mh; ++ const void* dwarf_section; ++ uintptr_t dwarf_section_length; ++ const void* compact_unwind_section; ++ uintptr_t compact_unwind_section_length; ++}; + ++extern "C" bool _dyld_find_unwind_sections(void*, dyld_unwind_sections*); + + namespace libunwind { + +-- +2.47.2 + diff --git a/pkgs/by-name/ld/ld64/patches/0004-Removed-unused-Blob-clone-method.patch b/pkgs/by-name/ld/ld64/patches/0004-Removed-unused-Blob-clone-method.patch new file mode 100644 index 0000000000000..05c45d651a1b6 --- /dev/null +++ b/pkgs/by-name/ld/ld64/patches/0004-Removed-unused-Blob-clone-method.patch @@ -0,0 +1,27 @@ +From 3c0038576173103e8aaa5286f853046b619c35fe Mon Sep 17 00:00:00 2001 +From: Randy Eckenrode +Date: Wed, 13 Nov 2024 13:53:14 -0500 +Subject: [PATCH 04/18] Removed unused `Blob::clone` method + +Fixes a compiler error due to a missing `BlobCore::clone` method. +--- + src/ld/code-sign-blobs/blob.h | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/src/ld/code-sign-blobs/blob.h b/src/ld/code-sign-blobs/blob.h +index 19c63a9..2ac0aa8 100644 +--- a/src/ld/code-sign-blobs/blob.h ++++ b/src/ld/code-sign-blobs/blob.h +@@ -179,9 +179,6 @@ public: + return p; + return NULL; + } +- +- BlobType *clone() const +- { assert(validateBlob()); return specific(this->BlobCore::clone()); } + + static BlobType *readBlob(int fd) + { return specific(BlobCore::readBlob(fd, _magic, sizeof(BlobType), 0), true); } +-- +2.47.2 + diff --git a/pkgs/by-name/ld/ld64/0004-Use-std-atomics-and-std-mutex.patch b/pkgs/by-name/ld/ld64/patches/0005-Use-std-atomics-and-std-mutex-for-portability.patch similarity index 84% rename from pkgs/by-name/ld/ld64/0004-Use-std-atomics-and-std-mutex.patch rename to pkgs/by-name/ld/ld64/patches/0005-Use-std-atomics-and-std-mutex-for-portability.patch index 8c414fcb51d8b..536076529a2e7 100644 --- a/pkgs/by-name/ld/ld64/0004-Use-std-atomics-and-std-mutex.patch +++ b/pkgs/by-name/ld/ld64/patches/0005-Use-std-atomics-and-std-mutex-for-portability.patch @@ -1,20 +1,20 @@ -From 5e92d65ef2b5cc07dc25b5b1bf645b314599f5d1 Mon Sep 17 00:00:00 2001 +From effdf4d0f3a3d2332ec2a61eefe076ff37964594 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode -Date: Sat, 6 Apr 2024 20:29:25 -0400 -Subject: [PATCH 4/8] Use std::atomics and std::mutex +Date: Wed, 13 Nov 2024 13:53:14 -0500 +Subject: [PATCH 05/18] Use std::atomics and std::mutex for portability --- - src/ld/InputFiles.cpp | 13 ++++++------- + src/ld/InputFiles.cpp | 15 +++++++-------- src/ld/InputFiles.h | 9 +++++---- - src/ld/OutputFile.cpp | 13 ++++++------- + src/ld/OutputFile.cpp | 13 +++++++------ src/ld/ld.cpp | 11 +++++------ - 4 files changed, 22 insertions(+), 24 deletions(-) + 4 files changed, 24 insertions(+), 24 deletions(-) diff --git a/src/ld/InputFiles.cpp b/src/ld/InputFiles.cpp -index ec53a60..427ab09 100644 +index 4d49ba3..e045e90 100644 --- a/src/ld/InputFiles.cpp +++ b/src/ld/InputFiles.cpp -@@ -42,7 +42,6 @@ +@@ -42,12 +42,11 @@ #include #include #include @@ -22,6 +22,12 @@ index ec53a60..427ab09 100644 #if HAVE_LIBDISPATCH #include #endif + +-#include ++#include + #include + #include + #include @@ -387,16 +386,16 @@ ld::File* InputFiles::makeFile(const Options::FileInfo& info, bool indirectDylib ld::relocatable::File* objResult = mach_o::relocatable::parse(p, len, info.path, info.modTime, info.ordinal, objOpts); @@ -55,7 +61,7 @@ index ec53a60..427ab09 100644 } diff --git a/src/ld/InputFiles.h b/src/ld/InputFiles.h -index c18ccf8..ffff26b 100644 +index c18ccf8..40353fa 100644 --- a/src/ld/InputFiles.h +++ b/src/ld/InputFiles.h @@ -46,6 +46,7 @@ @@ -74,31 +80,28 @@ index c18ccf8..ffff26b 100644 - volatile int64_t _totalArchiveSize; - volatile int32_t _totalObjectLoaded; - volatile int32_t _totalArchivesLoaded; -+ std::atomic _totalObjectSize; -+ std::atomic _totalArchiveSize; -+ std::atomic _totalObjectLoaded; -+ std::atomic _totalArchivesLoaded; ++ std::atomic _totalObjectSize; ++ std::atomic _totalArchiveSize; ++ std::atomic _totalObjectLoaded; ++ std::atomic _totalArchivesLoaded; int32_t _totalDylibsLoaded; diff --git a/src/ld/OutputFile.cpp b/src/ld/OutputFile.cpp -index e2c0397..15912a2 100644 +index 487b338..2a175a7 100644 --- a/src/ld/OutputFile.cpp +++ b/src/ld/OutputFile.cpp -@@ -43,11 +43,10 @@ - #include - #include - #include --#include +@@ -47,7 +47,8 @@ extern "C" { #include } -#include ++ +#include #include #include #include -@@ -1362,7 +1361,7 @@ void OutputFile::rangeCheckRISCVBranch20(int64_t displacement, ld::Internal& sta +@@ -1315,7 +1316,7 @@ void OutputFile::rangeCheckRISCVBranch20(int64_t displacement, ld::Internal& sta #if SUPPORT_ARCH_arm64e @@ -107,7 +110,7 @@ index e2c0397..15912a2 100644 #endif void OutputFile::applyFixUps(ld::Internal& state, uint64_t mhAddress, const ld::Atom* atom, uint8_t* buffer) -@@ -1737,11 +1736,11 @@ void OutputFile::applyFixUps(ld::Internal& state, uint64_t mhAddress, const ld:: +@@ -1690,11 +1691,11 @@ void OutputFile::applyFixUps(ld::Internal& state, uint64_t mhAddress, const ld:: } else { auto fixupOffset = (uintptr_t)(fixUpLocation - mhAddress); @@ -121,7 +124,7 @@ index e2c0397..15912a2 100644 // Zero out this entry which we will expect later. set64LE(fixUpLocation, 0); } -@@ -1768,11 +1767,11 @@ void OutputFile::applyFixUps(ld::Internal& state, uint64_t mhAddress, const ld:: +@@ -1721,11 +1722,11 @@ void OutputFile::applyFixUps(ld::Internal& state, uint64_t mhAddress, const ld:: } else { auto fixupOffset = (uintptr_t)(fixUpLocation - mhAddress); @@ -136,7 +139,7 @@ index e2c0397..15912a2 100644 set64LE(fixUpLocation, 0); } diff --git a/src/ld/ld.cpp b/src/ld/ld.cpp -index b7590a3..f1bf9df 100644 +index b532c9a..8608ea5 100644 --- a/src/ld/ld.cpp +++ b/src/ld/ld.cpp @@ -47,9 +47,8 @@ extern "C" double log2 ( double ); @@ -150,7 +153,7 @@ index b7590a3..f1bf9df 100644 #include #include #include -@@ -1603,8 +1602,8 @@ int main(int argc, const char* argv[]) +@@ -1539,8 +1538,8 @@ int main(int argc, const char* argv[]) statistics.vmEnd.faults-statistics.vmStart.faults); fprintf(stderr, "memory active: %lu, wired: %lu\n", statistics.vmEnd.active_count * vm_page_size, statistics.vmEnd.wire_count * vm_page_size); char temp[40]; @@ -161,7 +164,7 @@ index b7590a3..f1bf9df 100644 fprintf(stderr, "processed %3u dylib files\n", inputFiles._totalDylibsLoaded); fprintf(stderr, "wrote output file totaling %15s bytes\n", commatize(out.fileSize(), temp)); } -@@ -1634,12 +1633,12 @@ int main(int argc, const char* argv[]) +@@ -1570,12 +1569,12 @@ int main(int argc, const char* argv[]) #ifndef NDEBUG // now that the linker is multi-threaded, only allow one assert() to be processed @@ -172,10 +175,10 @@ index b7590a3..f1bf9df 100644 void __assert_rtn(const char* func, const char* file, int line, const char* failedexpr) { - os_lock_lock(&sAssertLock); -+ sAssertLock.lock(); ++ sAssertLock.lock(); Snapshot *snapshot = Snapshot::globalSnapshot; -- -2.45.1 +2.47.2 diff --git a/pkgs/by-name/ld/ld64/patches/0006-Add-Meson-build-system.patch b/pkgs/by-name/ld/ld64/patches/0006-Add-Meson-build-system.patch new file mode 100644 index 0000000000000..c03f5f5a2fb28 --- /dev/null +++ b/pkgs/by-name/ld/ld64/patches/0006-Add-Meson-build-system.patch @@ -0,0 +1,328 @@ +From 099f663adc119ade6509569505358a0955c2b02a Mon Sep 17 00:00:00 2001 +From: Randy Eckenrode +Date: Wed, 13 Nov 2024 13:53:14 -0500 +Subject: [PATCH 06/18] Add Meson build system + +--- + meson.build | 42 +++++++++++++++++++ + meson.options | 5 +++ + src/abstraction/meson.build | 3 ++ + src/ld/meson.build | 68 +++++++++++++++++++++++++++++++ + src/ld/parsers/meson.build | 26 ++++++++++++ + src/mach_o/meson.build | 13 ++++++ + src/meson.build | 16 ++++++++ + src/other/meson.build | 80 +++++++++++++++++++++++++++++++++++++ + 8 files changed, 253 insertions(+) + create mode 100644 meson.build + create mode 100644 meson.options + create mode 100644 src/abstraction/meson.build + create mode 100644 src/ld/meson.build + create mode 100644 src/ld/parsers/meson.build + create mode 100644 src/mach_o/meson.build + create mode 100644 src/meson.build + create mode 100644 src/other/meson.build + +diff --git a/meson.build b/meson.build +new file mode 100644 +index 0000000..cd4e8da +--- /dev/null ++++ b/meson.build +@@ -0,0 +1,42 @@ ++project( ++ 'ld64', ++ 'c', 'cpp', ++ default_options : {'c_std': 'c23', 'cpp_std': 'c++23'}, ++ license : 'APSL-2.0', ++ license_files : 'APPLE_LICENSE', ++ meson_version : '>=1.6.0', ++ version : '954.16', ++) ++ ++add_project_arguments( ++ # Avoid needing to link libSupport, which helps avoid a dependency on LLVM in packages ++ # that link libprunetrie.a (such as cctools). ++ '-DLLVM_DISABLE_ABI_BREAKING_CHECKS_ENFORCING=1', ++ language : 'cpp', ++) ++ ++ ++cc = meson.get_compiler('c') ++cxx = meson.get_compiler('cpp') ++ ++ ++libcodedirectory_dep = dependency( ++ 'libcodedirectory', ++ version : '=819.6.1', ++) ++libtapi_dep = dependency( ++ 'libtapi', ++ version : [ '>=1500' , '<1600' ], ++) ++llvm_dep = dependency( ++ 'llvm', ++ version : '>=19.1' ++).partial_dependency(includes : true) # ld64 only needs LLVM headers for ADTs. ++openssl_dep = dependency( ++ 'openssl', ++ version : '>=3.0' ++) ++xar_dep = cc.find_library('xar') ++ ++ ++subdir('src') +diff --git a/meson.options b/meson.options +new file mode 100644 +index 0000000..dd40e66 +--- /dev/null ++++ b/meson.options +@@ -0,0 +1,5 @@ ++option( ++ 'libllvm_path', ++ type : 'string', ++ description: 'Specifies the default path to LLVM for `libLTO.dylib`' ++) +diff --git a/src/abstraction/meson.build b/src/abstraction/meson.build +new file mode 100644 +index 0000000..eae50ea +--- /dev/null ++++ b/src/abstraction/meson.build +@@ -0,0 +1,3 @@ ++abstraction_dep = declare_dependency( ++ include_directories : [ '.' ] ++) +diff --git a/src/ld/meson.build b/src/ld/meson.build +new file mode 100644 +index 0000000..8bc85b7 +--- /dev/null ++++ b/src/ld/meson.build +@@ -0,0 +1,68 @@ ++subdir('parsers') ++ ++executable( ++ 'ld', ++ cpp_args : [ ++ '-Wno-c23-extensions', ++ '-Wno-vla-cxx-extension', ++ ], ++ dependencies : [ ++ abstraction_dep, ++ libcodedirectory_dep, ++ libtapi_dep, ++ llvm_dep, ++ mach_o_dep, ++ openssl_dep, ++ parsers_dep, ++ xar_dep, ++ ], ++ include_directories : [ ++ 'code-sign-blobs', ++ 'parsers', ++ 'passes', ++ ], ++ install : true, ++ # These linker flags mirror those used in a release build of the Xcode project. ++ # See: https://github.com/apple-oss-distributions/ld64/blob/47f477cb721755419018f7530038b272e9d0cdea/ld64.xcodeproj/project.pbxproj#L1292-L1299. ++ link_args : [ ++ '-Wl,-exported_symbol,__mh_execute_header', ++ '-Wl,-stack_size,0x02000000', ++ '-Wl,-client_name,ld', ++ ], ++ sources : [ ++ configure_h, ++ 'FatFile.cpp', ++ 'InputFiles.cpp', ++ 'Mangling.cpp', ++ 'Options.cpp', ++ 'OutputFile.cpp', ++ 'PlatformSupport.cpp', ++ 'Resolver.cpp', ++ 'ResponseFiles.cpp', ++ 'Snapshot.cpp', ++ 'SymbolTable.cpp', ++ 'code-sign-blobs/blob.cpp', ++ 'code-sign-blobs/blob.h', ++ 'debugline.c', ++ 'ld.cpp', ++ 'libcodedirectory.c', ++ 'passes/bitcode_bundle.cpp', ++ 'passes/branch_island.cpp', ++ 'passes/branch_shim.cpp', ++ 'passes/code_dedup.cpp', ++ 'passes/compact_unwind.cpp', ++ 'passes/dtrace_dof.cpp', ++ 'passes/dylibs.cpp', ++ 'passes/got.cpp', ++ 'passes/huge.cpp', ++ 'passes/inits.cpp', ++ 'passes/objc.cpp', ++ 'passes/objc_constants.cpp', ++ 'passes/objc_stubs.cpp', ++ 'passes/order.cpp', ++ 'passes/stubs/stubs.cpp', ++ 'passes/thread_starts.cpp', ++ 'passes/tlvp.cpp', ++ ], ++) ++install_man(meson.global_source_root() / 'doc/man/man1/ld-classic.1') +diff --git a/src/ld/parsers/meson.build b/src/ld/parsers/meson.build +new file mode 100644 +index 0000000..a88f651 +--- /dev/null ++++ b/src/ld/parsers/meson.build +@@ -0,0 +1,26 @@ ++parsers = static_library( ++ 'parsers', ++ cpp_args : [ '-Wno-vla-cxx-extension' ], ++ dependencies : [ ++ abstraction_dep, ++ libtapi_dep, ++ ], ++ include_directories : [ ++ '..', # For ld64 headers ++ ], ++ sources : [ ++ configure_h, ++ 'archive_file.cpp', ++ 'generic_dylib_file.cpp', ++ 'lto_file.cpp', ++ 'macho_dylib_file.cpp', ++ 'macho_relocatable_file.cpp', ++ 'opaque_section_file.cpp', ++ 'textstub_dylib_file.cpp', ++ ], ++) ++ ++parsers_dep = declare_dependency( ++ include_directories : [ '.' ], ++ link_with : parsers, ++) +diff --git a/src/mach_o/meson.build b/src/mach_o/meson.build +new file mode 100644 +index 0000000..88d4f7a +--- /dev/null ++++ b/src/mach_o/meson.build +@@ -0,0 +1,13 @@ ++mach_o = static_library( ++ 'mach_o', ++ cpp_args : [ '-Wno-vla-cxx-extension' ], ++ sources : [ ++ 'Error.cpp', ++ 'ExportsTrie.cpp', ++ ], ++) ++ ++mach_o_dep = declare_dependency( ++ include_directories : [ '.' ], ++ link_with : mach_o, ++) +diff --git a/src/meson.build b/src/meson.build +new file mode 100644 +index 0000000..e1e3b1a +--- /dev/null ++++ b/src/meson.build +@@ -0,0 +1,16 @@ ++configure_h = custom_target( ++ 'configure_h', ++ command : [ find_program('bash'), '@INPUT@' ], ++ env : { ++ 'DERIVED_FILE_DIR' : meson.current_build_dir(), ++ 'RC_ProjectSourceVersion': meson.project_version(), ++ }, ++ input : 'create_configure', ++ output : 'configure.h', ++) ++ ++subdir('abstraction') ++subdir('mach_o') ++ ++subdir('ld') ++subdir('other') +diff --git a/src/other/meson.build b/src/other/meson.build +new file mode 100644 +index 0000000..067a69c +--- /dev/null ++++ b/src/other/meson.build +@@ -0,0 +1,80 @@ ++machocheck = executable( ++ 'machocheck', ++ dependencies : [ ++ abstraction_dep, ++ llvm_dep, ++ ], ++ include_directories : [ '../ld' ], ++ install : true, ++ sources : [ ++ configure_h, ++ 'machochecker.cpp', ++ ], ++) ++ ++ObjectDump = executable( ++ 'ObjectDump', ++ cpp_args : [ '-Wno-vla-cxx-extension' ], ++ dependencies : [ ++ abstraction_dep, ++ libtapi_dep, ++ parsers_dep, ++ ], ++ include_directories : [ '../ld' ], ++ install : true, ++ sources : [ ++ configure_h, ++ '../ld/PlatformSupport.cpp', ++ '../ld/debugline.c', ++ 'ObjectDump.cpp', ++ ], ++) ++ ++objcimageinfo = executable( ++ 'objcimageinfo', ++ dependencies : [ ++ abstraction_dep, ++ llvm_dep, ++ ], ++ include_directories : [ '../ld' ], ++ install : true, ++ sources : [ ++ configure_h, ++ 'objcimageinfo.cpp', ++ ], ++) ++ ++unwinddump = executable( ++ 'unwinddump', ++ dependencies : [ ++ abstraction_dep, ++ llvm_dep, ++ ], ++ include_directories : [ '../ld' ], ++ install : true, ++ sources : [ ++ configure_h, ++ 'UnwindDump.cpp', ++ ], ++) ++install_man(meson.global_source_root() / 'doc/man/man1/unwinddump.1') ++ ++static_library( ++ 'prunetrie', ++ cpp_args : [ '-Wno-vla-cxx-extension' ], ++ dependencies : [ ++ abstraction_dep, ++ mach_o_dep ++ ], ++ include_directories : [ '../ld' ], ++ install : true, ++ override_options : {'b_lto': false}, ++ sources : [ ++ configure_h, ++ 'PruneTrie.cpp', ++ ], ++) ++install_headers( ++ 'prune_trie.h', ++ subdir : 'mach-o', ++) +-- +2.47.2 + diff --git a/pkgs/by-name/ld/ld64/patches/0007-Add-CrashReporterClient-header.patch b/pkgs/by-name/ld/ld64/patches/0007-Add-CrashReporterClient-header.patch new file mode 100644 index 0000000000000..b3b84c8396faa --- /dev/null +++ b/pkgs/by-name/ld/ld64/patches/0007-Add-CrashReporterClient-header.patch @@ -0,0 +1,91 @@ +From 8bc85cdac6c39215d0d7ea4facfea593efe785ec Mon Sep 17 00:00:00 2001 +From: Randy Eckenrode +Date: Wed, 13 Nov 2024 13:53:14 -0500 +Subject: [PATCH 07/18] Add CrashReporterClient header + +Based on: https://github.com/apple-oss-distributions/WebKit2/blob/523170e4638816ec4a39c8128a4f3c4ab70a6f89/Platform/spi/Cocoa/CrashReporterClientSPI.h +--- + include/CrashReporterClient.h | 48 +++++++++++++++++++++++++++++++++++ + include/meson.build | 4 +++ + meson.build | 1 + + 3 files changed, 53 insertions(+) + create mode 100644 include/CrashReporterClient.h + create mode 100644 include/meson.build + +diff --git a/include/CrashReporterClient.h b/include/CrashReporterClient.h +new file mode 100644 +index 0000000..f892448 +--- /dev/null ++++ b/include/CrashReporterClient.h +@@ -0,0 +1,48 @@ ++/* ++ * Copyright (C) 2017 Apple Inc. All rights reserved. ++ * ++ * Redistribution and use in source and binary forms, with or without ++ * modification, are permitted provided that the following conditions ++ * are met: ++ * 1. Redistributions of source code must retain the above copyright ++ * notice, this list of conditions and the following disclaimer. ++ * 2. Redistributions in binary form must reproduce the above copyright ++ * notice, this list of conditions and the following disclaimer in the ++ * documentation and/or other materials provided with the distribution. ++ * ++ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' ++ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, ++ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR ++ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS ++ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR ++ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF ++ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS ++ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN ++ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ++ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF ++ * THE POSSIBILITY OF SUCH DAMAGE. ++ */ ++#pragma once ++ ++#define CRASHREPORTER_ANNOTATIONS_SECTION "__crash_info" ++#define CRASHREPORTER_ANNOTATIONS_VERSION 5 ++#define CRASH_REPORTER_CLIENT_HIDDEN __attribute__((visibility("hidden"))) ++ ++#define _crc_make_getter(attr) ((const char *)(unsigned long)gCRAnnotations.attr) ++#define _crc_make_setter(attr, arg) (gCRAnnotations.attr = (uint64_t)(unsigned long)(arg)) ++#define CRGetCrashLogMessage() _crc_make_getter(message) ++#define CRSetCrashLogMessage(m) _crc_make_setter(message, m) ++ ++struct crashreporter_annotations_t { ++ uint64_t version; ++ uint64_t message; ++ uint64_t signature_string; ++ uint64_t backtrace; ++ uint64_t message2; ++ uint64_t thread; ++ uint64_t dialog_mode; ++ uint64_t abort_cause; ++}; ++ ++CRASH_REPORTER_CLIENT_HIDDEN ++extern struct crashreporter_annotations_t gCRAnnotations; +diff --git a/include/meson.build b/include/meson.build +new file mode 100644 +index 0000000..bbe6fcb +--- /dev/null ++++ b/include/meson.build +@@ -0,0 +1,4 @@ ++add_project_arguments( ++ '-I' + meson.global_source_root() / 'include', ++ language : [ 'c', 'cpp' ], ++) +diff --git a/meson.build b/meson.build +index cd4e8da..a79f03f 100644 +--- a/meson.build ++++ b/meson.build +@@ -39,4 +39,5 @@ openssl_dep = dependency( + xar_dep = cc.find_library('xar') + + ++subdir('include') + subdir('src') +-- +2.47.2 + diff --git a/pkgs/by-name/ld/ld64/patches/0008-Provide-mach-compatibility-headers-based-on-LLVM-s-h.patch b/pkgs/by-name/ld/ld64/patches/0008-Provide-mach-compatibility-headers-based-on-LLVM-s-h.patch new file mode 100644 index 0000000000000..5991e1452bf32 --- /dev/null +++ b/pkgs/by-name/ld/ld64/patches/0008-Provide-mach-compatibility-headers-based-on-LLVM-s-h.patch @@ -0,0 +1,662 @@ +From 5ce3538352b162cfaacca4a7e3c5e04fabf1d169 Mon Sep 17 00:00:00 2001 +From: Randy Eckenrode +Date: Wed, 13 Nov 2024 13:53:14 -0500 +Subject: [PATCH 08/18] =?UTF-8?q?Provide=20mach=20compatibility=20headers?= + =?UTF-8?q?=20based=20on=20LLVM=E2=80=99s=20headers?= +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +--- + include/mach-o/fat.h | 16 ++ + include/mach-o/loader.h | 224 +++++++++++++++++++++++ + include/mach-o/nlist.h | 61 ++++++ + include/mach/machine.h | 200 ++++++++++++++++++++ + include/mach/vm_prot.h | 13 ++ + src/abstraction/MachOFileAbstraction.hpp | 32 ++-- + 6 files changed, 530 insertions(+), 16 deletions(-) + create mode 100644 include/mach-o/fat.h + create mode 100644 include/mach-o/loader.h + create mode 100644 include/mach-o/nlist.h + create mode 100644 include/mach/machine.h + create mode 100644 include/mach/vm_prot.h + +diff --git a/include/mach-o/fat.h b/include/mach-o/fat.h +new file mode 100644 +index 0000000..82f5dc1 +--- /dev/null ++++ b/include/mach-o/fat.h +@@ -0,0 +1,16 @@ ++// SPDX-License-Identifier: APSL-2.0 ++ ++// Derive `fat.h` from LLVM to avoid macro conflicts. ++ ++#pragma once ++ ++#include ++ ++using llvm::MachO::fat_arch; ++using llvm::MachO::fat_arch_64; ++using llvm::MachO::fat_header; ++ ++using llvm::MachO::FAT_CIGAM; ++using llvm::MachO::FAT_CIGAM_64; ++using llvm::MachO::FAT_MAGIC; ++using llvm::MachO::FAT_MAGIC_64; +diff --git a/include/mach-o/loader.h b/include/mach-o/loader.h +new file mode 100644 +index 0000000..5306a20 +--- /dev/null ++++ b/include/mach-o/loader.h +@@ -0,0 +1,224 @@ ++// SPDX-License-Identifier: APSL-2.0 ++ ++// Derive `loader.h` from LLVM to avoid macro conflicts. ++ ++#pragma once ++ ++#include ++ ++#include ++ ++using llvm::MachO::mach_header; ++using llvm::MachO::mach_header_64; ++ ++using llvm::MachO::data_in_code_entry; ++ ++using llvm::MachO::dylib_table_of_contents; ++ ++using llvm::MachO::dylib_module; ++using llvm::MachO::dylib_module_64; ++ ++using llvm::MachO::section; ++using llvm::MachO::section_64; ++ ++using llvm::MachO::build_tool_version; ++using llvm::MachO::build_version_command; ++using llvm::MachO::dyld_info_command; ++using llvm::MachO::dylib; ++using llvm::MachO::dylib_command; ++using llvm::MachO::dylinker_command; ++using llvm::MachO::dysymtab_command; ++using llvm::MachO::encryption_info_command; ++using llvm::MachO::encryption_info_command_64; ++using llvm::MachO::entry_point_command; ++using llvm::MachO::linkedit_data_command; ++using llvm::MachO::linker_option_command; ++using llvm::MachO::load_command; ++using llvm::MachO::routines_command; ++using llvm::MachO::routines_command_64; ++using llvm::MachO::rpath_command; ++using llvm::MachO::segment_command; ++using llvm::MachO::segment_command_64; ++using llvm::MachO::source_version_command; ++using llvm::MachO::sub_client_command; ++using llvm::MachO::sub_framework_command; ++using llvm::MachO::sub_library_command; ++using llvm::MachO::sub_umbrella_command; ++using llvm::MachO::symtab_command; ++using llvm::MachO::thread_command; ++using llvm::MachO::twolevel_hints_command; ++using llvm::MachO::uuid_command; ++using llvm::MachO::version_min_command; ++ ++using llvm::MachO::LC_BUILD_VERSION; ++using llvm::MachO::LC_CODE_SIGNATURE; ++using llvm::MachO::LC_DATA_IN_CODE; ++using llvm::MachO::LC_DYLD_ENVIRONMENT; ++using llvm::MachO::LC_DYLD_INFO; ++using llvm::MachO::LC_DYLD_INFO_ONLY; ++using llvm::MachO::LC_DYSYMTAB; ++using llvm::MachO::LC_ENCRYPTION_INFO; ++using llvm::MachO::LC_ENCRYPTION_INFO_64; ++using llvm::MachO::LC_FUNCTION_STARTS; ++using llvm::MachO::LC_ID_DYLIB; ++using llvm::MachO::LC_ID_DYLINKER; ++using llvm::MachO::LC_LINKER_OPTION; ++using llvm::MachO::LC_LOAD_DYLIB; ++using llvm::MachO::LC_LOAD_DYLINKER; ++using llvm::MachO::LC_LOAD_UPWARD_DYLIB; ++using llvm::MachO::LC_LOAD_WEAK_DYLIB; ++using llvm::MachO::LC_MAIN; ++using llvm::MachO::LC_REEXPORT_DYLIB; ++using llvm::MachO::LC_REQ_DYLD; ++using llvm::MachO::LC_ROUTINES; ++using llvm::MachO::LC_ROUTINES_64; ++using llvm::MachO::LC_RPATH; ++using llvm::MachO::LC_SEGMENT; ++using llvm::MachO::LC_SEGMENT_64; ++using llvm::MachO::LC_SEGMENT_SPLIT_INFO; ++using llvm::MachO::LC_SOURCE_VERSION; ++using llvm::MachO::LC_SUB_CLIENT; ++using llvm::MachO::LC_SUB_FRAMEWORK; ++using llvm::MachO::LC_SUB_LIBRARY; ++using llvm::MachO::LC_SUB_UMBRELLA; ++using llvm::MachO::LC_SYMTAB; ++using llvm::MachO::LC_UNIXTHREAD; ++using llvm::MachO::LC_UUID; ++using llvm::MachO::LC_VERSION_MIN_IPHONEOS; ++using llvm::MachO::LC_VERSION_MIN_MACOSX; ++using llvm::MachO::LC_VERSION_MIN_TVOS; ++using llvm::MachO::LC_VERSION_MIN_WATCHOS; ++using llvm::MachO::LC_DYLIB_CODE_SIGN_DRS; ++using llvm::MachO::LC_NOTE; ++using llvm::MachO::LC_LAZY_LOAD_DYLIB; ++using llvm::MachO::LC_PREBIND_CKSUM; ++using llvm::MachO::LC_TWOLEVEL_HINTS; ++ ++using llvm::MachO::MH_ALLOW_STACK_EXECUTION; ++using llvm::MachO::MH_APP_EXTENSION_SAFE; ++using llvm::MachO::MH_BINDS_TO_WEAK; ++using llvm::MachO::MH_BUNDLE; ++using llvm::MachO::MH_CIGAM; ++using llvm::MachO::MH_CIGAM_64; ++using llvm::MachO::MH_DEAD_STRIPPABLE_DYLIB; ++using llvm::MachO::MH_DYLDLINK; ++using llvm::MachO::MH_DYLIB; ++using llvm::MachO::MH_DYLIB_STUB; ++using llvm::MachO::MH_DYLINKER; ++using llvm::MachO::MH_EXECUTE; ++using llvm::MachO::MH_LAZY_INIT; ++using llvm::MachO::MH_INCRLINK; ++using llvm::MachO::MH_HAS_TLV_DESCRIPTORS; ++using llvm::MachO::MH_KEXT_BUNDLE; ++using llvm::MachO::MH_MAGIC; ++using llvm::MachO::MH_MAGIC_64; ++using llvm::MachO::MH_NOUNDEFS; ++using llvm::MachO::MH_NO_HEAP_EXECUTION; ++using llvm::MachO::MH_NO_REEXPORTED_DYLIBS; ++using llvm::MachO::MH_OBJECT; ++using llvm::MachO::MH_PIE; ++using llvm::MachO::MH_PREBOUND; ++using llvm::MachO::MH_PRELOAD; ++using llvm::MachO::MH_SPLIT_SEGS; ++using llvm::MachO::MH_SUBSECTIONS_VIA_SYMBOLS; ++using llvm::MachO::MH_TWOLEVEL; ++using llvm::MachO::MH_WEAK_DEFINES; ++ ++using llvm::MachO::BIND_IMMEDIATE_MASK; ++ ++using llvm::MachO::BIND_OPCODE_ADD_ADDR_ULEB; ++using llvm::MachO::BIND_OPCODE_DONE; ++using llvm::MachO::BIND_OPCODE_DO_BIND; ++using llvm::MachO::BIND_OPCODE_DO_BIND_ADD_ADDR_IMM_SCALED; ++using llvm::MachO::BIND_OPCODE_DO_BIND_ADD_ADDR_ULEB; ++using llvm::MachO::BIND_OPCODE_DO_BIND_ULEB_TIMES_SKIPPING_ULEB; ++using llvm::MachO::BIND_OPCODE_SET_ADDEND_SLEB; ++using llvm::MachO::BIND_OPCODE_SET_DYLIB_ORDINAL_IMM; ++using llvm::MachO::BIND_OPCODE_SET_DYLIB_ORDINAL_ULEB; ++using llvm::MachO::BIND_OPCODE_SET_DYLIB_SPECIAL_IMM; ++using llvm::MachO::BIND_OPCODE_SET_SEGMENT_AND_OFFSET_ULEB; ++using llvm::MachO::BIND_OPCODE_SET_SYMBOL_TRAILING_FLAGS_IMM; ++using llvm::MachO::BIND_OPCODE_SET_TYPE_IMM; ++using llvm::MachO::BIND_OPCODE_MASK; ++ ++using llvm::MachO::BIND_SPECIAL_DYLIB_FLAT_LOOKUP; ++using llvm::MachO::BIND_SPECIAL_DYLIB_MAIN_EXECUTABLE; ++using llvm::MachO::BIND_SPECIAL_DYLIB_SELF; ++ ++using llvm::MachO::BIND_SYMBOL_FLAGS_NON_WEAK_DEFINITION; ++using llvm::MachO::BIND_SYMBOL_FLAGS_WEAK_IMPORT; ++ ++using llvm::MachO::BIND_TYPE_POINTER; ++using llvm::MachO::BIND_TYPE_TEXT_ABSOLUTE32; ++using llvm::MachO::BIND_TYPE_TEXT_PCREL32; ++ ++using llvm::MachO::DICE_KIND_ABS_JUMP_TABLE32; ++using llvm::MachO::DICE_KIND_DATA; ++using llvm::MachO::DICE_KIND_JUMP_TABLE16; ++using llvm::MachO::DICE_KIND_JUMP_TABLE32; ++using llvm::MachO::DICE_KIND_JUMP_TABLE8; ++ ++using llvm::MachO::EXPORT_SYMBOL_FLAGS_KIND_MASK; ++using llvm::MachO::EXPORT_SYMBOL_FLAGS_KIND_REGULAR; ++using llvm::MachO::EXPORT_SYMBOL_FLAGS_KIND_THREAD_LOCAL; ++using llvm::MachO::EXPORT_SYMBOL_FLAGS_REEXPORT; ++using llvm::MachO::EXPORT_SYMBOL_FLAGS_STUB_AND_RESOLVER; ++using llvm::MachO::EXPORT_SYMBOL_FLAGS_WEAK_DEFINITION; ++ ++using llvm::MachO::REBASE_IMMEDIATE_MASK; ++ ++using llvm::MachO::REBASE_OPCODE_MASK; ++using llvm::MachO::REBASE_OPCODE_ADD_ADDR_IMM_SCALED; ++using llvm::MachO::REBASE_OPCODE_ADD_ADDR_ULEB; ++using llvm::MachO::REBASE_OPCODE_DONE; ++using llvm::MachO::REBASE_OPCODE_DO_REBASE_ADD_ADDR_ULEB; ++using llvm::MachO::REBASE_OPCODE_DO_REBASE_IMM_TIMES; ++using llvm::MachO::REBASE_OPCODE_DO_REBASE_ULEB_TIMES; ++using llvm::MachO::REBASE_OPCODE_DO_REBASE_ULEB_TIMES_SKIPPING_ULEB; ++using llvm::MachO::REBASE_OPCODE_SET_SEGMENT_AND_OFFSET_ULEB; ++using llvm::MachO::REBASE_OPCODE_SET_TYPE_IMM; ++ ++using llvm::MachO::REBASE_TYPE_POINTER; ++using llvm::MachO::REBASE_TYPE_TEXT_ABSOLUTE32; ++using llvm::MachO::REBASE_TYPE_TEXT_PCREL32; ++ ++using llvm::MachO::S_4BYTE_LITERALS; ++using llvm::MachO::S_8BYTE_LITERALS; ++using llvm::MachO::S_16BYTE_LITERALS; ++using llvm::MachO::S_ATTR_DEBUG; ++using llvm::MachO::S_ATTR_EXT_RELOC; ++using llvm::MachO::S_ATTR_LIVE_SUPPORT; ++using llvm::MachO::S_ATTR_LOC_RELOC; ++using llvm::MachO::S_ATTR_LOC_RELOC; ++using llvm::MachO::S_ATTR_NO_DEAD_STRIP; ++using llvm::MachO::S_ATTR_PURE_INSTRUCTIONS; ++using llvm::MachO::S_ATTR_SELF_MODIFYING_CODE; ++using llvm::MachO::S_ATTR_SOME_INSTRUCTIONS; ++using llvm::MachO::S_COALESCED; ++using llvm::MachO::S_CSTRING_LITERALS; ++using llvm::MachO::S_DTRACE_DOF; ++using llvm::MachO::S_INTERPOSING; ++using llvm::MachO::S_LAZY_DYLIB_SYMBOL_POINTERS; ++using llvm::MachO::S_LAZY_SYMBOL_POINTERS; ++using llvm::MachO::S_LITERAL_POINTERS; ++using llvm::MachO::S_MOD_INIT_FUNC_POINTERS; ++using llvm::MachO::S_MOD_TERM_FUNC_POINTERS; ++using llvm::MachO::S_NON_LAZY_SYMBOL_POINTERS; ++using llvm::MachO::S_REGULAR; ++using llvm::MachO::S_SYMBOL_STUBS; ++using llvm::MachO::S_THREAD_LOCAL_INIT_FUNCTION_POINTERS; ++using llvm::MachO::S_THREAD_LOCAL_REGULAR; ++using llvm::MachO::S_THREAD_LOCAL_VARIABLES; ++using llvm::MachO::S_THREAD_LOCAL_VARIABLE_POINTERS; ++using llvm::MachO::S_THREAD_LOCAL_ZEROFILL; ++using llvm::MachO::S_ZEROFILL; ++ ++using llvm::MachO::SG_NORELOC; ++ ++using llvm::MachO::INDIRECT_SYMBOL_ABS; ++using llvm::MachO::INDIRECT_SYMBOL_LOCAL; ++using llvm::MachO::SECTION_TYPE; ++using llvm::MachO::TOOL_LD; ++ ++template ++inline constexpr int operator| (llvm::MachO::SectionType lhs, T rhs) { return (int) lhs | (int) rhs; } +diff --git a/include/mach-o/nlist.h b/include/mach-o/nlist.h +new file mode 100644 +index 0000000..3c319a4 +--- /dev/null ++++ b/include/mach-o/nlist.h +@@ -0,0 +1,61 @@ ++// SPDX-License-Identifier: APSL-2.0 ++ ++// Derive `nlist.h` from LLVM to avoid macro conflicts. ++ ++#pragma once ++ ++#include ++ ++using llvm::MachO::nlist; ++using llvm::MachO::nlist_64; ++ ++using llvm::MachO::N_ARM_THUMB_DEF; ++ ++using llvm::MachO::N_ABS; ++using llvm::MachO::N_EXT; ++using llvm::MachO::N_INDR; ++using llvm::MachO::N_PBUD; ++using llvm::MachO::N_PEXT; ++using llvm::MachO::N_SECT; ++using llvm::MachO::N_STAB; ++using llvm::MachO::N_TYPE; ++using llvm::MachO::N_UNDF; ++ ++using llvm::MachO::N_ALT_ENTRY; ++using llvm::MachO::N_NO_DEAD_STRIP; ++using llvm::MachO::N_SYMBOL_RESOLVER; ++using llvm::MachO::N_WEAK_DEF; ++using llvm::MachO::N_WEAK_REF; ++ ++#define N_REF_TO_WEAK 0x80 // Not defined in LLVM headers ++ ++using llvm::MachO::DYNAMIC_LOOKUP_ORDINAL; ++ ++using llvm::MachO::EXECUTABLE_ORDINAL; ++ ++using llvm::MachO::GET_COMM_ALIGN; ++using llvm::MachO::SET_COMM_ALIGN; ++ ++using llvm::MachO::GET_LIBRARY_ORDINAL; ++using llvm::MachO::SET_LIBRARY_ORDINAL; ++ ++using llvm::MachO::REFERENCE_FLAG_DEFINED; ++using llvm::MachO::REFERENCE_FLAG_PRIVATE_DEFINED; ++using llvm::MachO::REFERENCE_FLAG_PRIVATE_UNDEFINED_LAZY; ++using llvm::MachO::REFERENCE_FLAG_PRIVATE_UNDEFINED_NON_LAZY; ++using llvm::MachO::REFERENCE_FLAG_UNDEFINED_LAZY; ++using llvm::MachO::REFERENCE_FLAG_UNDEFINED_NON_LAZY; ++using llvm::MachO::REFERENCE_TYPE; ++ ++using llvm::MachO::REFERENCED_DYNAMICALLY; ++ ++using llvm::MachO::MAX_SECT; ++using llvm::MachO::NO_SECT; ++ ++using llvm::MachO::SELF_LIBRARY_ORDINAL; ++ ++template ++inline constexpr int operator| (llvm::MachO::NListType lhs, T rhs) { return (int) lhs | (int) rhs; } ++ ++template ++inline constexpr int operator| (T lhs, llvm::MachO::NListType rhs) { return (int) lhs | (int) rhs; } +diff --git a/include/mach/machine.h b/include/mach/machine.h +new file mode 100644 +index 0000000..9162c1d +--- /dev/null ++++ b/include/mach/machine.h +@@ -0,0 +1,200 @@ ++// SPDX-License-Identifier: APSL-2.0 ++ ++// Derive `machine.h` from LLVM to avoid macro conflicts. ++ ++#pragma once ++ ++#include_next ++ ++#undef CPU_ARCH_MASK ++ ++#undef CPU_ARCH_ABI64_32 ++#undef CPU_ARCH_ABI64 ++ ++#undef CPU_TYPE_ANY ++ ++#undef CPU_TYPE_ARM ++#undef CPU_TYPE_ARM64 ++#undef CPU_TYPE_ARM64_32 ++#undef CPU_TYPE_I386 ++#undef CPU_TYPE_X86 ++#undef CPU_TYPE_X86_64 ++#undef CPU_TYPE_MC98000 ++#undef CPU_TYPE_SPARC ++#undef CPU_TYPE_POWERPC ++#undef CPU_TYPE_POWERPC64 ++ ++#undef CPU_SUBTYPE_MASK ++ ++#undef CPU_SUBTYPE_ARM64E ++#undef CPU_SUBTYPE_ARM64_32_V8 ++#undef CPU_SUBTYPE_ARM64_ALL ++#undef CPU_SUBTYPE_ARM64_V8 ++#undef CPU_SUBTYPE_ARM_ALL ++#undef CPU_SUBTYPE_ARM_XSCALE ++#undef CPU_SUBTYPE_ARM_V4T ++#undef CPU_SUBTYPE_ARM_V5TEJ ++#undef CPU_SUBTYPE_ARM_V6 ++#undef CPU_SUBTYPE_ARM_V6M ++#undef CPU_SUBTYPE_ARM_V7 ++#undef CPU_SUBTYPE_ARM_V7EM ++#undef CPU_SUBTYPE_ARM_V7F ++#undef CPU_SUBTYPE_ARM_V7K ++#undef CPU_SUBTYPE_ARM_V7M ++#undef CPU_SUBTYPE_ARM_V7S ++#undef CPU_SUBTYPE_ARM_V8 ++ ++#undef CPU_SUBTYPE_I386_ALL ++#undef CPU_SUBTYPE_386 ++#undef CPU_SUBTYPE_486 ++#undef CPU_SUBTYPE_486SX ++#undef CPU_SUBTYPE_586 ++#undef CPU_SUBTYPE_PENT ++#undef CPU_SUBTYPE_PENTPRO ++#undef CPU_SUBTYPE_PENTII_M3 ++#undef CPU_SUBTYPE_PENTII_M5 ++#undef CPU_SUBTYPE_CELERON ++#undef CPU_SUBTYPE_CELERON_MOBILE ++#undef CPU_SUBTYPE_PENTIUM_3 ++#undef CPU_SUBTYPE_PENTIUM_3_M ++#undef CPU_SUBTYPE_PENTIUM_3_XEON ++#undef CPU_SUBTYPE_PENTIUM_M ++#undef CPU_SUBTYPE_PENTIUM_4 ++#undef CPU_SUBTYPE_PENTIUM_4_M ++#undef CPU_SUBTYPE_ITANIUM ++#undef CPU_SUBTYPE_ITANIUM_2 ++#undef CPU_SUBTYPE_XEON ++#undef CPU_SUBTYPE_XEON_MP ++ ++#undef CPU_SUBTYPE_X86_ALL ++#undef CPU_SUBTYPE_X86_ARCH1 ++ ++#undef CPU_SUBTYPE_X86_64_ALL ++#undef CPU_SUBTYPE_X86_64_H ++ ++#undef CPU_SUBTYPE_INTEL ++#undef CPU_SUBTYPE_INTEL_FAMILY ++#undef CPU_SUBTYPE_INTEL_FAMILY_MAX ++#undef CPU_SUBTYPE_INTEL_MODEL ++#undef CPU_SUBTYPE_INTEL_MODEL_ALL ++ ++#undef CPU_SUBTYPE_POWERPC_ALL ++#undef CPU_SUBTYPE_POWERPC_601 ++#undef CPU_SUBTYPE_POWERPC_602 ++#undef CPU_SUBTYPE_POWERPC_603 ++#undef CPU_SUBTYPE_POWERPC_603e ++#undef CPU_SUBTYPE_POWERPC_603ev ++#undef CPU_SUBTYPE_POWERPC_604 ++#undef CPU_SUBTYPE_POWERPC_604e ++#undef CPU_SUBTYPE_POWERPC_620 ++#undef CPU_SUBTYPE_POWERPC_750 ++#undef CPU_SUBTYPE_POWERPC_7400 ++#undef CPU_SUBTYPE_POWERPC_7450 ++#undef CPU_SUBTYPE_POWERPC_970 ++ ++#undef CPU_SUBTYPE_MC98601 ++ ++#undef CPU_SUBTYPE_SPARC_ALL ++ ++#undef CPU_SUBTYPE_LIB64 ++#undef CPU_SUBTYPE_MULTIPLE ++ ++#include ++ ++using llvm::MachO::CPU_ARCH_MASK; ++ ++using llvm::MachO::CPU_ARCH_ABI64_32; ++using llvm::MachO::CPU_ARCH_ABI64; ++ ++using llvm::MachO::CPU_TYPE_ANY; ++ ++using llvm::MachO::CPU_TYPE_ARM; ++using llvm::MachO::CPU_TYPE_ARM64; ++using llvm::MachO::CPU_TYPE_ARM64_32; ++using llvm::MachO::CPU_TYPE_I386; ++using llvm::MachO::CPU_TYPE_X86; ++using llvm::MachO::CPU_TYPE_X86_64; ++using llvm::MachO::CPU_TYPE_MC98000; ++using llvm::MachO::CPU_TYPE_SPARC; ++using llvm::MachO::CPU_TYPE_POWERPC; ++using llvm::MachO::CPU_TYPE_POWERPC64; ++ ++using llvm::MachO::CPU_SUBTYPE_MASK; ++ ++using llvm::MachO::CPU_SUBTYPE_ARM64E; ++using llvm::MachO::CPU_SUBTYPE_ARM64_32_V8; ++using llvm::MachO::CPU_SUBTYPE_ARM64_ALL; ++using llvm::MachO::CPU_SUBTYPE_ARM64_V8; ++using llvm::MachO::CPU_SUBTYPE_ARM_ALL; ++using llvm::MachO::CPU_SUBTYPE_ARM_XSCALE; ++using llvm::MachO::CPU_SUBTYPE_ARM_V4T; ++using llvm::MachO::CPU_SUBTYPE_ARM_V5TEJ; ++using llvm::MachO::CPU_SUBTYPE_ARM_V6; ++using llvm::MachO::CPU_SUBTYPE_ARM_V6M; ++using llvm::MachO::CPU_SUBTYPE_ARM_V7; ++using llvm::MachO::CPU_SUBTYPE_ARM_V7EM; ++using llvm::MachO::CPU_SUBTYPE_ARM_V7K; ++using llvm::MachO::CPU_SUBTYPE_ARM_V7M; ++using llvm::MachO::CPU_SUBTYPE_ARM_V7S; ++ ++using llvm::MachO::CPU_SUBTYPE_I386_ALL; ++using llvm::MachO::CPU_SUBTYPE_386; ++using llvm::MachO::CPU_SUBTYPE_486; ++using llvm::MachO::CPU_SUBTYPE_486SX; ++using llvm::MachO::CPU_SUBTYPE_586; ++using llvm::MachO::CPU_SUBTYPE_PENT; ++using llvm::MachO::CPU_SUBTYPE_PENTPRO; ++using llvm::MachO::CPU_SUBTYPE_PENTII_M3; ++using llvm::MachO::CPU_SUBTYPE_PENTII_M5; ++using llvm::MachO::CPU_SUBTYPE_CELERON; ++using llvm::MachO::CPU_SUBTYPE_CELERON_MOBILE; ++using llvm::MachO::CPU_SUBTYPE_PENTIUM_3; ++using llvm::MachO::CPU_SUBTYPE_PENTIUM_3_M; ++using llvm::MachO::CPU_SUBTYPE_PENTIUM_3_XEON; ++using llvm::MachO::CPU_SUBTYPE_PENTIUM_M; ++using llvm::MachO::CPU_SUBTYPE_PENTIUM_4; ++using llvm::MachO::CPU_SUBTYPE_PENTIUM_4_M; ++using llvm::MachO::CPU_SUBTYPE_ITANIUM; ++using llvm::MachO::CPU_SUBTYPE_ITANIUM_2; ++using llvm::MachO::CPU_SUBTYPE_XEON; ++using llvm::MachO::CPU_SUBTYPE_XEON_MP; ++ ++using llvm::MachO::CPU_SUBTYPE_X86_ALL; ++using llvm::MachO::CPU_SUBTYPE_X86_ARCH1; ++ ++using llvm::MachO::CPU_SUBTYPE_X86_64_ALL; ++using llvm::MachO::CPU_SUBTYPE_X86_64_H; ++ ++using llvm::MachO::CPU_SUBTYPE_INTEL; ++using llvm::MachO::CPU_SUBTYPE_INTEL_FAMILY; ++using llvm::MachO::CPU_SUBTYPE_INTEL_FAMILY_MAX; ++using llvm::MachO::CPU_SUBTYPE_INTEL_MODEL; ++using llvm::MachO::CPU_SUBTYPE_INTEL_MODEL_ALL; ++ ++using llvm::MachO::CPU_SUBTYPE_POWERPC_ALL; ++using llvm::MachO::CPU_SUBTYPE_POWERPC_601; ++using llvm::MachO::CPU_SUBTYPE_POWERPC_602; ++using llvm::MachO::CPU_SUBTYPE_POWERPC_603; ++using llvm::MachO::CPU_SUBTYPE_POWERPC_603e; ++using llvm::MachO::CPU_SUBTYPE_POWERPC_603ev; ++using llvm::MachO::CPU_SUBTYPE_POWERPC_604; ++using llvm::MachO::CPU_SUBTYPE_POWERPC_604e; ++using llvm::MachO::CPU_SUBTYPE_POWERPC_620; ++using llvm::MachO::CPU_SUBTYPE_POWERPC_750; ++using llvm::MachO::CPU_SUBTYPE_POWERPC_7400; ++using llvm::MachO::CPU_SUBTYPE_POWERPC_7450; ++using llvm::MachO::CPU_SUBTYPE_POWERPC_970; ++ ++using llvm::MachO::CPU_SUBTYPE_MC98601; ++ ++using llvm::MachO::CPU_SUBTYPE_SPARC_ALL; ++ ++using llvm::MachO::CPU_SUBTYPE_LIB64; ++using llvm::MachO::CPU_SUBTYPE_MULTIPLE; ++ ++// These definitions aren’t in the LLVM headers. ++#define CPU_TYPE_RISCV32 24 ++ ++#define CPU_SUBTYPE_ARM_V7F 10 ++#define CPU_SUBTYPE_ARM_V8 CPU_SUBTYPE_ARM64_V8 ++#define CPU_SUBTYPE_RISCV32_ALL 0 +diff --git a/include/mach/vm_prot.h b/include/mach/vm_prot.h +new file mode 100644 +index 0000000..e524808 +--- /dev/null ++++ b/include/mach/vm_prot.h +@@ -0,0 +1,13 @@ ++// SPDX-License-Identifier: APSL-2.0 ++ ++// Derive `vm_prot.h` from LLVM to avoid macro conflicts. ++ ++#pragma once ++ ++#include ++ ++using llvm::MachO::VM_PROT_EXECUTE; ++using llvm::MachO::VM_PROT_READ; ++using llvm::MachO::VM_PROT_WRITE; ++ ++#include_next +diff --git a/src/abstraction/MachOFileAbstraction.hpp b/src/abstraction/MachOFileAbstraction.hpp +index 71e7765..e8d9b5c 100644 +--- a/src/abstraction/MachOFileAbstraction.hpp ++++ b/src/abstraction/MachOFileAbstraction.hpp +@@ -847,8 +847,8 @@ public: + uint32_t cmdsize() const INLINE { return E::get32(fields.cmdsize); } + void set_cmdsize(uint32_t value) INLINE { E::set32(fields.cmdsize, value); } + +- uint32_t name_offset() const INLINE { return E::get32(fields.dylib.name.offset); } +- void set_name_offset(uint32_t value) INLINE { E::set32(fields.dylib.name.offset, value); } ++ uint32_t name_offset() const INLINE { return E::get32(fields.dylib.name); } ++ void set_name_offset(uint32_t value) INLINE { E::set32(fields.dylib.name, value); } + + uint32_t timestamp() const INLINE { return E::get32(fields.dylib.timestamp); } + void set_timestamp(uint32_t value) INLINE { E::set32(fields.dylib.timestamp, value); } +@@ -880,8 +880,8 @@ public: + uint32_t cmdsize() const INLINE { return E::get32(fields.cmdsize); } + void set_cmdsize(uint32_t value) INLINE { E::set32(fields.cmdsize, value); } + +- uint32_t name_offset() const INLINE { return E::get32(fields.name.offset); } +- void set_name_offset(uint32_t value) INLINE { E::set32(fields.name.offset, value); } ++ uint32_t name_offset() const INLINE { return E::get32(fields.name); } ++ void set_name_offset(uint32_t value) INLINE { E::set32(fields.name, value); } + + const char* name() const INLINE { return (const char*)&fields + name_offset(); } + void set_name_offset() INLINE { set_name_offset(sizeof(fields)); } +@@ -904,8 +904,8 @@ public: + uint32_t cmdsize() const INLINE { return E::get32(fields.cmdsize); } + void set_cmdsize(uint32_t value) INLINE { E::set32(fields.cmdsize, value); } + +- uint32_t umbrella_offset() const INLINE { return E::get32(fields.umbrella.offset); } +- void set_umbrella_offset(uint32_t value) INLINE { E::set32(fields.umbrella.offset, value); } ++ uint32_t umbrella_offset() const INLINE { return E::get32(fields.umbrella); } ++ void set_umbrella_offset(uint32_t value) INLINE { E::set32(fields.umbrella, value); } + + const char* umbrella() const INLINE { return (const char*)&fields + umbrella_offset(); } + void set_umbrella_offset() INLINE { set_umbrella_offset(sizeof(fields)); } +@@ -928,8 +928,8 @@ public: + uint32_t cmdsize() const INLINE { return E::get32(fields.cmdsize); } + void set_cmdsize(uint32_t value) INLINE { E::set32(fields.cmdsize, value); } + +- uint32_t client_offset() const INLINE { return E::get32(fields.client.offset); } +- void set_client_offset(uint32_t value) INLINE { E::set32(fields.client.offset, value); } ++ uint32_t client_offset() const INLINE { return E::get32(fields.client); } ++ void set_client_offset(uint32_t value) INLINE { E::set32(fields.client, value); } + + const char* client() const INLINE { return (const char*)&fields + client_offset(); } + void set_client_offset() INLINE { set_client_offset(sizeof(fields)); } +@@ -952,8 +952,8 @@ public: + uint32_t cmdsize() const INLINE { return E::get32(fields.cmdsize); } + void set_cmdsize(uint32_t value) INLINE { E::set32(fields.cmdsize, value); } + +- uint32_t sub_umbrella_offset() const INLINE { return E::get32(fields.sub_umbrella.offset); } +- void set_sub_umbrella_offset(uint32_t value) INLINE { E::set32(fields.sub_umbrella.offset, value); } ++ uint32_t sub_umbrella_offset() const INLINE { return E::get32(fields.sub_umbrella); } ++ void set_sub_umbrella_offset(uint32_t value) INLINE { E::set32(fields.sub_umbrella, value); } + + const char* sub_umbrella() const INLINE { return (const char*)&fields + sub_umbrella_offset(); } + void set_sub_umbrella_offset() INLINE { set_sub_umbrella_offset(sizeof(fields)); } +@@ -976,8 +976,8 @@ public: + uint32_t cmdsize() const INLINE { return E::get32(fields.cmdsize); } + void set_cmdsize(uint32_t value) INLINE { E::set32(fields.cmdsize, value); } + +- uint32_t sub_library_offset() const INLINE { return E::get32(fields.sub_library.offset); } +- void set_sub_library_offset(uint32_t value) INLINE { E::set32(fields.sub_library.offset, value); } ++ uint32_t sub_library_offset() const INLINE { return E::get32(fields.sub_library); } ++ void set_sub_library_offset(uint32_t value) INLINE { E::set32(fields.sub_library, value); } + + const char* sub_library() const INLINE { return (const char*)&fields + sub_library_offset(); } + void set_sub_library_offset() INLINE { set_sub_library_offset(sizeof(fields)); } +@@ -1355,8 +1355,8 @@ public: + uint32_t cmdsize() const INLINE { return E::get32(fields.cmdsize); } + void set_cmdsize(uint32_t value) INLINE { E::set32(fields.cmdsize, value); } + +- uint32_t path_offset() const INLINE { return E::get32(fields.path.offset); } +- void set_path_offset(uint32_t value) INLINE { E::set32(fields.path.offset, value); } ++ uint32_t path_offset() const INLINE { return E::get32(fields.path); } ++ void set_path_offset(uint32_t value) INLINE { E::set32(fields.path, value); } + + const char* path() const INLINE { return (const char*)&fields + path_offset(); } + void set_path_offset() INLINE { set_path_offset(sizeof(fields)); } +@@ -1381,8 +1381,8 @@ template <> struct macho_nlist_content > { struct nlist_ + template + class macho_nlist { + public: +- uint32_t n_strx() const INLINE { return E::get32(entry.fields.n_un.n_strx); } +- void set_n_strx(uint32_t value) INLINE { E::set32((uint32_t&)entry.fields.n_un.n_strx, value); } ++ uint32_t n_strx() const INLINE { return E::get32(entry.fields.n_strx); } ++ void set_n_strx(uint32_t value) INLINE { E::set32((uint32_t&)entry.fields.n_strx, value); } + + uint8_t n_type() const INLINE { return entry.fields.n_type; } + void set_n_type(uint8_t value) INLINE { entry.fields.n_type = value; } +-- +2.47.2 + diff --git a/pkgs/by-name/ld/ld64/patches/0009-Support-LTO-in-nixpkgs.patch b/pkgs/by-name/ld/ld64/patches/0009-Support-LTO-in-nixpkgs.patch new file mode 100644 index 0000000000000..0fc0f83266f59 --- /dev/null +++ b/pkgs/by-name/ld/ld64/patches/0009-Support-LTO-in-nixpkgs.patch @@ -0,0 +1,111 @@ +From 6a023ee77ca48497382050998d9b33c56330f735 Mon Sep 17 00:00:00 2001 +From: Randy Eckenrode +Date: Wed, 13 Nov 2024 13:53:14 -0500 +Subject: [PATCH 09/18] Support LTO in nixpkgs + +--- + src/ld/InputFiles.cpp | 11 ++--------- + src/ld/meson.build | 13 ++++++++++++- + src/ld/parsers/lto_file.cpp | 2 +- + src/ld/parsers/meson.build | 13 ++++++++++++- + 4 files changed, 27 insertions(+), 12 deletions(-) + +diff --git a/src/ld/InputFiles.cpp b/src/ld/InputFiles.cpp +index e045e90..d5341d9 100644 +--- a/src/ld/InputFiles.cpp ++++ b/src/ld/InputFiles.cpp +@@ -464,15 +464,8 @@ ld::File* InputFiles::makeFile(const Options::FileInfo& info, bool indirectDylib + if ( _options.overridePathlibLTO() != NULL ) { + libLTO = _options.overridePathlibLTO(); + } +- else if ( _NSGetExecutablePath(ldPath, &bufSize) != -1 ) { +- if ( realpath(ldPath, tmpPath) != NULL ) { +- char* lastSlash = strrchr(tmpPath, '/'); +- if ( lastSlash != NULL ) +- strcpy(lastSlash, "/../lib/libLTO.dylib"); +- libLTO = tmpPath; +- if ( realpath(tmpPath, libLTOPath) != NULL ) +- libLTO = libLTOPath; +- } ++ else { ++ libLTO = "@libllvm_path@/lib/libLTO.dylib"; + } + throwf("could not process llvm bitcode object file, because %s could not be loaded", libLTO); + } +diff --git a/src/ld/meson.build b/src/ld/meson.build +index 8bc85b7..ad8359a 100644 +--- a/src/ld/meson.build ++++ b/src/ld/meson.build +@@ -1,5 +1,16 @@ + subdir('parsers') + ++InputFiles_cpp = configure_file( ++ configuration : { ++ 'libllvm_path' : get_option('libllvm_path'), ++ # Silence warnings ++ 'APPLE_LICENSE_HEADER_START' : '@APPLE_LICENSE_HEADER_START@', ++ 'APPLE_LICENSE_HEADER_END' : '@APPLE_LICENSE_HEADER_END@', ++ }, ++ input : 'InputFiles.cpp', ++ output : '@PLAINNAME@', ++) ++ + executable( + 'ld', + cpp_args : [ +@@ -31,8 +42,8 @@ executable( + ], + sources : [ + configure_h, ++ InputFiles_cpp, + 'FatFile.cpp', +- 'InputFiles.cpp', + 'Mangling.cpp', + 'Options.cpp', + 'OutputFile.cpp', +diff --git a/src/ld/parsers/lto_file.cpp b/src/ld/parsers/lto_file.cpp +index e32e2f8..1a3b846 100644 +--- a/src/ld/parsers/lto_file.cpp ++++ b/src/ld/parsers/lto_file.cpp +@@ -1839,7 +1839,7 @@ bool optimize( const std::vector& allAtoms, + + }; // namespace lto + +-static const char *sLTODylib = "@rpath/libLTO.dylib"; ++static const char *sLTODylib = "@libllvm_path@/lib/libLTO.dylib"; + static std::atomic sLTOIsLoaded(false); + + static void *getHandle() { +diff --git a/src/ld/parsers/meson.build b/src/ld/parsers/meson.build +index a88f651..7bd3e89 100644 +--- a/src/ld/parsers/meson.build ++++ b/src/ld/parsers/meson.build +@@ -1,3 +1,14 @@ ++lto_file_cpp = configure_file( ++ configuration : { ++ 'libllvm_path' : get_option('libllvm_path'), ++ # Silence warnings ++ 'APPLE_LICENSE_HEADER_START' : '@APPLE_LICENSE_HEADER_START@', ++ 'APPLE_LICENSE_HEADER_END' : '@APPLE_LICENSE_HEADER_END@', ++ }, ++ input : 'lto_file.cpp', ++ output : '@PLAINNAME@', ++) ++ + parsers = static_library( + 'parsers', + cpp_args : [ '-Wno-vla-cxx-extension' ], +@@ -10,9 +21,9 @@ parsers = static_library( + ], + sources : [ + configure_h, ++ lto_file_cpp, + 'archive_file.cpp', + 'generic_dylib_file.cpp', +- 'lto_file.cpp', + 'macho_dylib_file.cpp', + 'macho_relocatable_file.cpp', + 'opaque_section_file.cpp', +-- +2.47.2 + diff --git a/pkgs/by-name/ld/ld64/patches/0010-Add-vendored-libtapi-to-the-ld64-build.patch b/pkgs/by-name/ld/ld64/patches/0010-Add-vendored-libtapi-to-the-ld64-build.patch new file mode 100644 index 0000000000000..df3190da1bd72 --- /dev/null +++ b/pkgs/by-name/ld/ld64/patches/0010-Add-vendored-libtapi-to-the-ld64-build.patch @@ -0,0 +1,97 @@ +From 2846b56c7e1d88942bd3de96cbe3fec6b0304012 Mon Sep 17 00:00:00 2001 +From: Randy Eckenrode +Date: Wed, 13 Nov 2024 13:53:14 -0500 +Subject: [PATCH 10/18] Add vendored libtapi to the ld64 build + +--- + meson.build | 3 +- + subprojects/libtapi/meson.build | 44 ++++++++++++++++++++++++++++ + subprojects/libtapi/tapi/meson.build | 11 +++++++ + 3 files changed, 57 insertions(+), 1 deletion(-) + create mode 100644 subprojects/libtapi/meson.build + create mode 100644 subprojects/libtapi/tapi/meson.build + +diff --git a/meson.build b/meson.build +index a79f03f..244458c 100644 +--- a/meson.build ++++ b/meson.build +@@ -26,7 +26,8 @@ libcodedirectory_dep = dependency( + ) + libtapi_dep = dependency( + 'libtapi', +- version : [ '>=1500' , '<1600' ], ++ version : [ '>=1600' , '<1700' ], ++ fallback : [ 'libtapi', 'libtapi_dep' ], + ) + llvm_dep = dependency( + 'llvm', +diff --git a/subprojects/libtapi/meson.build b/subprojects/libtapi/meson.build +new file mode 100644 +index 0000000..9cd1dcc +--- /dev/null ++++ b/subprojects/libtapi/meson.build +@@ -0,0 +1,44 @@ ++project( ++ 'libtapi', ++ 'c', 'cpp', ++ default_options : {'c_std': 'c23', 'cpp_std': 'c++23'}, ++ license : 'NCSA', ++ license_files : 'LICENSE.TXT', ++ meson_version : '>=1.6.0', ++ version : '1600.0.11.8', ++) ++ ++ ++cc = meson.get_compiler('c') ++cxx = meson.get_compiler('cpp') ++ ++# libtapi only needs a subset of functionality from LLVM, so link only what it needs statically ++# to avoid ODR violations when loading LTO plugins (which don’t use these APIs). ++llvm_dep = dependency( ++ 'llvm', ++ modules : [ ++ 'Demangle', ++ 'TargetParser', ++ 'TextAPI', ++ ], ++ static : true, ++ version : '>=19.1' ++) ++ ++ ++subdir('tapi') ++ ++libtapi = static_library( ++ 'tapi', ++ sources : [ ++ 'APIVersion.cpp', ++ 'LinkerInterfaceFile.cpp', ++ 'Version.cpp', ++ ], ++) ++ ++libtapi_dep = declare_dependency( ++ dependencies : [ llvm_dep ], ++ include_directories : [ '.' ], ++ link_with : libtapi, ++) +diff --git a/subprojects/libtapi/tapi/meson.build b/subprojects/libtapi/tapi/meson.build +new file mode 100644 +index 0000000..c9e463a +--- /dev/null ++++ b/subprojects/libtapi/tapi/meson.build +@@ -0,0 +1,11 @@ ++version_components = meson.project_version().split('.') ++version_inc = configure_file( ++ configuration : { ++ 'TAPI_VERSION' : meson.project_version(), ++ 'TAPI_VERSION_MAJOR' : version_components[0], ++ 'TAPI_VERSION_MINOR' : version_components[1], ++ 'TAPI_VERSION_PATCH' : version_components[2], ++ }, ++ input : 'Version.inc.in', ++ output : '@BASENAME@', ++) +-- +2.47.2 + diff --git a/pkgs/by-name/ld/ld64/patches/0011-Modify-vendored-libtapi-to-build-with-upstream-LLVM.patch b/pkgs/by-name/ld/ld64/patches/0011-Modify-vendored-libtapi-to-build-with-upstream-LLVM.patch new file mode 100644 index 0000000000000..9702ca992a793 --- /dev/null +++ b/pkgs/by-name/ld/ld64/patches/0011-Modify-vendored-libtapi-to-build-with-upstream-LLVM.patch @@ -0,0 +1,120 @@ +From ef6039563489695e2593f0c156d13b01491d2644 Mon Sep 17 00:00:00 2001 +From: Randy Eckenrode +Date: Wed, 13 Nov 2024 13:53:14 -0500 +Subject: [PATCH 11/18] Modify vendored libtapi to build with upstream LLVM + +--- + subprojects/libtapi/LinkerInterfaceFile.cpp | 47 +++++++++------------ + 1 file changed, 21 insertions(+), 26 deletions(-) + +diff --git a/subprojects/libtapi/LinkerInterfaceFile.cpp b/subprojects/libtapi/LinkerInterfaceFile.cpp +index 76797e3..632eac8 100644 +--- a/subprojects/libtapi/LinkerInterfaceFile.cpp ++++ b/subprojects/libtapi/LinkerInterfaceFile.cpp +@@ -10,12 +10,12 @@ + /// \brief Implements the C++ linker interface file API. + /// + //===----------------------------------------------------------------------===// +-#include "tapi/Core/LLVM.h" +-#include "tapi/Core/Registry.h" +-#include "tapi/Core/Utils.h" +-#include "llvm/ADT/StringExtras.h" +-#include "llvm/Object/MachO.h" +-#include "llvm/TextAPI/InterfaceFile.h" ++#include ++#include ++#include ++#include ++#include ++#include + #include + #include + #include +@@ -27,10 +27,17 @@ using namespace llvm::MachO; + + TAPI_NAMESPACE_V1_BEGIN + +-using namespace tapi::internal; + using InterfaceFile = llvm::MachO::InterfaceFile; + using PackedVersion = llvm::MachO::PackedVersion; + ++/// Determine if tapi is running in a B&I context. ++static inline bool inBnIEnvironment() { ++ if (auto isBnI = llvm::sys::Process::GetEnv("RC_XBS")) ++ return (isBnI.value() == "YES") && ++ (!llvm::sys::Process::GetEnv("RC_BUILDIT")); ++ return false; ++} ++ + static PackedVersion parseVersion32(StringRef str) { + uint32_t version = 0; + if (str.empty()) +@@ -118,7 +125,7 @@ public: + void processSymbol(StringRef name, PackedVersion minOSVersion, + bool disallowWeakImports) { + // $ld$ $ $ +- if (!name.startswith("$ld$")) ++ if (!name.starts_with("$ld$")) + return; + + StringRef action, condition, symbolName; +@@ -127,7 +134,7 @@ public: + if (action.empty() || condition.empty() || symbolName.empty()) + return; + +- if (!condition.startswith("os")) ++ if (!condition.starts_with("os")) + return; + + auto version = parseVersion32(condition.drop_front(2)); +@@ -198,33 +205,21 @@ LinkerInterfaceFile::getSupportedFileExtensions() noexcept { + /// \brief Load and parse the provided TBD file in the buffer and return on + /// success the interface file. + static Expected> +-loadFile(std::unique_ptr buffer, +- ReadFlags readFlags = ReadFlags::Symbols) { +- Registry registry; +- registry.addYAMLReaders(); +- registry.addJSONReaders(); +- registry.addDiagnosticReader(); +- +- auto textFile = registry.readTextFile(std::move(buffer), readFlags); ++loadFile(std::unique_ptr buffer) { ++ auto textFile = llvm::MachO::TextAPIReader::get(buffer->getMemBufferRef()); + if (!textFile) + return textFile.takeError(); + + return std::unique_ptr( + cast(textFile.get().release())); +- +- return std::make_unique(InterfaceFile()); + } + + bool LinkerInterfaceFile::isSupported(const std::string &path, + const uint8_t *data, + size_t size) noexcept { +- Registry registry; +- registry.addYAMLReaders(); +- registry.addJSONReaders(); +- registry.addDiagnosticReader(); + auto memBuffer = MemoryBufferRef( + StringRef(reinterpret_cast(data), size), path); +- return registry.canRead(memBuffer); ++ return !!llvm::MachO::TextAPIReader::canRead(memBuffer); + } + + bool LinkerInterfaceFile::shouldPreferTextBasedStubFile( +@@ -316,8 +311,8 @@ bool LinkerInterfaceFile::Impl::init( + + switch (symbol->getKind()) { + case EncodeKind::GlobalSymbol: +- if (symbol->getName().startswith("$ld$") && +- !symbol->getName().startswith("$ld$previous")) ++ if (symbol->getName().starts_with("$ld$") && ++ !symbol->getName().starts_with("$ld$previous")) + continue; + addSymbol(symbol->getName(), symbol->getFlags()); + break; +-- +2.47.2 + diff --git a/pkgs/by-name/ld/ld64/patches/0012-Move-libcodedirectory-to-its-own-subproject.patch b/pkgs/by-name/ld/ld64/patches/0012-Move-libcodedirectory-to-its-own-subproject.patch new file mode 100644 index 0000000000000..31033dda81707 --- /dev/null +++ b/pkgs/by-name/ld/ld64/patches/0012-Move-libcodedirectory-to-its-own-subproject.patch @@ -0,0 +1,471 @@ +From 4f186ca22f34cda1cbdea131a15f2bc79db440ba Mon Sep 17 00:00:00 2001 +From: Randy Eckenrode +Date: Wed, 13 Nov 2024 13:53:14 -0500 +Subject: [PATCH 12/18] Move libcodedirectory to its own subproject + +--- + meson.build | 1 + + src/ld/meson.build | 1 - + subprojects/libcodedirectory/APPLE_LICENSE | 367 ++++++++++++++++++ + .../libcodedirectory}/cs_blobs.h | 0 + .../libcodedirectory}/libcodedirectory.c | 0 + .../libcodedirectory}/libcodedirectory.h | 0 + subprojects/libcodedirectory/meson.build | 33 ++ + 7 files changed, 401 insertions(+), 1 deletion(-) + create mode 100644 subprojects/libcodedirectory/APPLE_LICENSE + rename {src/ld => subprojects/libcodedirectory}/cs_blobs.h (100%) + rename {src/ld => subprojects/libcodedirectory}/libcodedirectory.c (100%) + rename {src/ld => subprojects/libcodedirectory}/libcodedirectory.h (100%) + create mode 100644 subprojects/libcodedirectory/meson.build + +diff --git a/meson.build b/meson.build +index 244458c..c053d20 100644 +--- a/meson.build ++++ b/meson.build +@@ -23,6 +23,7 @@ cxx = meson.get_compiler('cpp') + libcodedirectory_dep = dependency( + 'libcodedirectory', + version : '=819.6.1', ++ fallback : [ 'libcodedirectory', 'libcodedirectory_dep' ], + ) + libtapi_dep = dependency( + 'libtapi', +diff --git a/src/ld/meson.build b/src/ld/meson.build +index ad8359a..201e891 100644 +--- a/src/ld/meson.build ++++ b/src/ld/meson.build +@@ -56,7 +56,6 @@ executable( + 'code-sign-blobs/blob.h', + 'debugline.c', + 'ld.cpp', +- 'libcodedirectory.c', + 'passes/bitcode_bundle.cpp', + 'passes/branch_island.cpp', + 'passes/branch_shim.cpp', +diff --git a/subprojects/libcodedirectory/APPLE_LICENSE b/subprojects/libcodedirectory/APPLE_LICENSE +new file mode 100644 +index 0000000..fe81a60 +--- /dev/null ++++ b/subprojects/libcodedirectory/APPLE_LICENSE +@@ -0,0 +1,367 @@ ++APPLE PUBLIC SOURCE LICENSE ++Version 2.0 - August 6, 2003 ++ ++Please read this License carefully before downloading this software. ++By downloading or using this software, you are agreeing to be bound by ++the terms of this License. If you do not or cannot agree to the terms ++of this License, please do not download or use the software. ++ ++1. General; Definitions. This License applies to any program or other ++work which Apple Computer, Inc. ("Apple") makes publicly available and ++which contains a notice placed by Apple identifying such program or ++work as "Original Code" and stating that it is subject to the terms of ++this Apple Public Source License version 2.0 ("License"). As used in ++this License: ++ ++1.1 "Applicable Patent Rights" mean: (a) in the case where Apple is ++the grantor of rights, (i) claims of patents that are now or hereafter ++acquired, owned by or assigned to Apple and (ii) that cover subject ++matter contained in the Original Code, but only to the extent ++necessary to use, reproduce and/or distribute the Original Code ++without infringement; and (b) in the case where You are the grantor of ++rights, (i) claims of patents that are now or hereafter acquired, ++owned by or assigned to You and (ii) that cover subject matter in Your ++Modifications, taken alone or in combination with Original Code. ++ ++1.2 "Contributor" means any person or entity that creates or ++contributes to the creation of Modifications. ++ ++1.3 "Covered Code" means the Original Code, Modifications, the ++combination of Original Code and any Modifications, and/or any ++respective portions thereof. ++ ++1.4 "Externally Deploy" means: (a) to sublicense, distribute or ++otherwise make Covered Code available, directly or indirectly, to ++anyone other than You; and/or (b) to use Covered Code, alone or as ++part of a Larger Work, in any way to provide a service, including but ++not limited to delivery of content, through electronic communication ++with a client other than You. ++ ++1.5 "Larger Work" means a work which combines Covered Code or portions ++thereof with code not governed by the terms of this License. ++ ++1.6 "Modifications" mean any addition to, deletion from, and/or change ++to, the substance and/or structure of the Original Code, any previous ++Modifications, the combination of Original Code and any previous ++Modifications, and/or any respective portions thereof. When code is ++released as a series of files, a Modification is: (a) any addition to ++or deletion from the contents of a file containing Covered Code; ++and/or (b) any new file or other representation of computer program ++statements that contains any part of Covered Code. ++ ++1.7 "Original Code" means (a) the Source Code of a program or other ++work as originally made available by Apple under this License, ++including the Source Code of any updates or upgrades to such programs ++or works made available by Apple under this License, and that has been ++expressly identified by Apple as such in the header file(s) of such ++work; and (b) the object code compiled from such Source Code and ++originally made available by Apple under this License. ++ ++1.8 "Source Code" means the human readable form of a program or other ++work that is suitable for making modifications to it, including all ++modules it contains, plus any associated interface definition files, ++scripts used to control compilation and installation of an executable ++(object code). ++ ++1.9 "You" or "Your" means an individual or a legal entity exercising ++rights under this License. For legal entities, "You" or "Your" ++includes any entity which controls, is controlled by, or is under ++common control with, You, where "control" means (a) the power, direct ++or indirect, to cause the direction or management of such entity, ++whether by contract or otherwise, or (b) ownership of fifty percent ++(50%) or more of the outstanding shares or beneficial ownership of ++such entity. ++ ++2. Permitted Uses; Conditions & Restrictions. Subject to the terms ++and conditions of this License, Apple hereby grants You, effective on ++the date You accept this License and download the Original Code, a ++world-wide, royalty-free, non-exclusive license, to the extent of ++Apple's Applicable Patent Rights and copyrights covering the Original ++Code, to do the following: ++ ++2.1 Unmodified Code. You may use, reproduce, display, perform, ++internally distribute within Your organization, and Externally Deploy ++verbatim, unmodified copies of the Original Code, for commercial or ++non-commercial purposes, provided that in each instance: ++ ++(a) You must retain and reproduce in all copies of Original Code the ++copyright and other proprietary notices and disclaimers of Apple as ++they appear in the Original Code, and keep intact all notices in the ++Original Code that refer to this License; and ++ ++(b) You must include a copy of this License with every copy of Source ++Code of Covered Code and documentation You distribute or Externally ++Deploy, and You may not offer or impose any terms on such Source Code ++that alter or restrict this License or the recipients' rights ++hereunder, except as permitted under Section 6. ++ ++2.2 Modified Code. You may modify Covered Code and use, reproduce, ++display, perform, internally distribute within Your organization, and ++Externally Deploy Your Modifications and Covered Code, for commercial ++or non-commercial purposes, provided that in each instance You also ++meet all of these conditions: ++ ++(a) You must satisfy all the conditions of Section 2.1 with respect to ++the Source Code of the Covered Code; ++ ++(b) You must duplicate, to the extent it does not already exist, the ++notice in Exhibit A in each file of the Source Code of all Your ++Modifications, and cause the modified files to carry prominent notices ++stating that You changed the files and the date of any change; and ++ ++(c) If You Externally Deploy Your Modifications, You must make ++Source Code of all Your Externally Deployed Modifications either ++available to those to whom You have Externally Deployed Your ++Modifications, or publicly available. Source Code of Your Externally ++Deployed Modifications must be released under the terms set forth in ++this License, including the license grants set forth in Section 3 ++below, for as long as you Externally Deploy the Covered Code or twelve ++(12) months from the date of initial External Deployment, whichever is ++longer. You should preferably distribute the Source Code of Your ++Externally Deployed Modifications electronically (e.g. download from a ++web site). ++ ++2.3 Distribution of Executable Versions. In addition, if You ++Externally Deploy Covered Code (Original Code and/or Modifications) in ++object code, executable form only, You must include a prominent ++notice, in the code itself as well as in related documentation, ++stating that Source Code of the Covered Code is available under the ++terms of this License with information on how and where to obtain such ++Source Code. ++ ++2.4 Third Party Rights. You expressly acknowledge and agree that ++although Apple and each Contributor grants the licenses to their ++respective portions of the Covered Code set forth herein, no ++assurances are provided by Apple or any Contributor that the Covered ++Code does not infringe the patent or other intellectual property ++rights of any other entity. Apple and each Contributor disclaim any ++liability to You for claims brought by any other entity based on ++infringement of intellectual property rights or otherwise. As a ++condition to exercising the rights and licenses granted hereunder, You ++hereby assume sole responsibility to secure any other intellectual ++property rights needed, if any. For example, if a third party patent ++license is required to allow You to distribute the Covered Code, it is ++Your responsibility to acquire that license before distributing the ++Covered Code. ++ ++3. Your Grants. In consideration of, and as a condition to, the ++licenses granted to You under this License, You hereby grant to any ++person or entity receiving or distributing Covered Code under this ++License a non-exclusive, royalty-free, perpetual, irrevocable license, ++under Your Applicable Patent Rights and other intellectual property ++rights (other than patent) owned or controlled by You, to use, ++reproduce, display, perform, modify, sublicense, distribute and ++Externally Deploy Your Modifications of the same scope and extent as ++Apple's licenses under Sections 2.1 and 2.2 above. ++ ++4. Larger Works. You may create a Larger Work by combining Covered ++Code with other code not governed by the terms of this License and ++distribute the Larger Work as a single product. In each such instance, ++You must make sure the requirements of this License are fulfilled for ++the Covered Code or any portion thereof. ++ ++5. Limitations on Patent License. Except as expressly stated in ++Section 2, no other patent rights, express or implied, are granted by ++Apple herein. Modifications and/or Larger Works may require additional ++patent licenses from Apple which Apple may grant in its sole ++discretion. ++ ++6. Additional Terms. You may choose to offer, and to charge a fee for, ++warranty, support, indemnity or liability obligations and/or other ++rights consistent with the scope of the license granted herein ++("Additional Terms") to one or more recipients of Covered Code. ++However, You may do so only on Your own behalf and as Your sole ++responsibility, and not on behalf of Apple or any Contributor. You ++must obtain the recipient's agreement that any such Additional Terms ++are offered by You alone, and You hereby agree to indemnify, defend ++and hold Apple and every Contributor harmless for any liability ++incurred by or claims asserted against Apple or such Contributor by ++reason of any such Additional Terms. ++ ++7. Versions of the License. Apple may publish revised and/or new ++versions of this License from time to time. Each version will be given ++a distinguishing version number. Once Original Code has been published ++under a particular version of this License, You may continue to use it ++under the terms of that version. You may also choose to use such ++Original Code under the terms of any subsequent version of this ++License published by Apple. No one other than Apple has the right to ++modify the terms applicable to Covered Code created under this ++License. ++ ++8. NO WARRANTY OR SUPPORT. The Covered Code may contain in whole or in ++part pre-release, untested, or not fully tested works. The Covered ++Code may contain errors that could cause failures or loss of data, and ++may be incomplete or contain inaccuracies. You expressly acknowledge ++and agree that use of the Covered Code, or any portion thereof, is at ++Your sole and entire risk. THE COVERED CODE IS PROVIDED "AS IS" AND ++WITHOUT WARRANTY, UPGRADES OR SUPPORT OF ANY KIND AND APPLE AND ++APPLE'S LICENSOR(S) (COLLECTIVELY REFERRED TO AS "APPLE" FOR THE ++PURPOSES OF SECTIONS 8 AND 9) AND ALL CONTRIBUTORS EXPRESSLY DISCLAIM ++ALL WARRANTIES AND/OR CONDITIONS, EXPRESS OR IMPLIED, INCLUDING, BUT ++NOT LIMITED TO, THE IMPLIED WARRANTIES AND/OR CONDITIONS OF ++MERCHANTABILITY, OF SATISFACTORY QUALITY, OF FITNESS FOR A PARTICULAR ++PURPOSE, OF ACCURACY, OF QUIET ENJOYMENT, AND NONINFRINGEMENT OF THIRD ++PARTY RIGHTS. APPLE AND EACH CONTRIBUTOR DOES NOT WARRANT AGAINST ++INTERFERENCE WITH YOUR ENJOYMENT OF THE COVERED CODE, THAT THE ++FUNCTIONS CONTAINED IN THE COVERED CODE WILL MEET YOUR REQUIREMENTS, ++THAT THE OPERATION OF THE COVERED CODE WILL BE UNINTERRUPTED OR ++ERROR-FREE, OR THAT DEFECTS IN THE COVERED CODE WILL BE CORRECTED. NO ++ORAL OR WRITTEN INFORMATION OR ADVICE GIVEN BY APPLE, AN APPLE ++AUTHORIZED REPRESENTATIVE OR ANY CONTRIBUTOR SHALL CREATE A WARRANTY. ++You acknowledge that the Covered Code is not intended for use in the ++operation of nuclear facilities, aircraft navigation, communication ++systems, or air traffic control machines in which case the failure of ++the Covered Code could lead to death, personal injury, or severe ++physical or environmental damage. ++ ++9. LIMITATION OF LIABILITY. TO THE EXTENT NOT PROHIBITED BY LAW, IN NO ++EVENT SHALL APPLE OR ANY CONTRIBUTOR BE LIABLE FOR ANY INCIDENTAL, ++SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES ARISING OUT OF OR RELATING ++TO THIS LICENSE OR YOUR USE OR INABILITY TO USE THE COVERED CODE, OR ++ANY PORTION THEREOF, WHETHER UNDER A THEORY OF CONTRACT, WARRANTY, ++TORT (INCLUDING NEGLIGENCE), PRODUCTS LIABILITY OR OTHERWISE, EVEN IF ++APPLE OR SUCH CONTRIBUTOR HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH ++DAMAGES AND NOTWITHSTANDING THE FAILURE OF ESSENTIAL PURPOSE OF ANY ++REMEDY. SOME JURISDICTIONS DO NOT ALLOW THE LIMITATION OF LIABILITY OF ++INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO THIS LIMITATION MAY NOT APPLY ++TO YOU. In no event shall Apple's total liability to You for all ++damages (other than as may be required by applicable law) under this ++License exceed the amount of fifty dollars ($50.00). ++ ++10. Trademarks. This License does not grant any rights to use the ++trademarks or trade names "Apple", "Apple Computer", "Mac", "Mac OS", ++"QuickTime", "QuickTime Streaming Server" or any other trademarks, ++service marks, logos or trade names belonging to Apple (collectively ++"Apple Marks") or to any trademark, service mark, logo or trade name ++belonging to any Contributor. You agree not to use any Apple Marks in ++or as part of the name of products derived from the Original Code or ++to endorse or promote products derived from the Original Code other ++than as expressly permitted by and in strict compliance at all times ++with Apple's third party trademark usage guidelines which are posted ++at http://www.apple.com/legal/guidelinesfor3rdparties.html. ++ ++11. Ownership. Subject to the licenses granted under this License, ++each Contributor retains all rights, title and interest in and to any ++Modifications made by such Contributor. Apple retains all rights, ++title and interest in and to the Original Code and any Modifications ++made by or on behalf of Apple ("Apple Modifications"), and such Apple ++Modifications will not be automatically subject to this License. Apple ++may, at its sole discretion, choose to license such Apple ++Modifications under this License, or on different terms from those ++contained in this License or may choose not to license them at all. ++ ++12. Termination. ++ ++12.1 Termination. This License and the rights granted hereunder will ++terminate: ++ ++(a) automatically without notice from Apple if You fail to comply with ++any term(s) of this License and fail to cure such breach within 30 ++days of becoming aware of such breach; ++ ++(b) immediately in the event of the circumstances described in Section ++13.5(b); or ++ ++(c) automatically without notice from Apple if You, at any time during ++the term of this License, commence an action for patent infringement ++against Apple; provided that Apple did not first commence ++an action for patent infringement against You in that instance. ++ ++12.2 Effect of Termination. Upon termination, You agree to immediately ++stop any further use, reproduction, modification, sublicensing and ++distribution of the Covered Code. All sublicenses to the Covered Code ++which have been properly granted prior to termination shall survive ++any termination of this License. Provisions which, by their nature, ++should remain in effect beyond the termination of this License shall ++survive, including but not limited to Sections 3, 5, 8, 9, 10, 11, ++12.2 and 13. No party will be liable to any other for compensation, ++indemnity or damages of any sort solely as a result of terminating ++this License in accordance with its terms, and termination of this ++License will be without prejudice to any other right or remedy of ++any party. ++ ++13. Miscellaneous. ++ ++13.1 Government End Users. The Covered Code is a "commercial item" as ++defined in FAR 2.101. Government software and technical data rights in ++the Covered Code include only those rights customarily provided to the ++public as defined in this License. This customary commercial license ++in technical data and software is provided in accordance with FAR ++12.211 (Technical Data) and 12.212 (Computer Software) and, for ++Department of Defense purchases, DFAR 252.227-7015 (Technical Data -- ++Commercial Items) and 227.7202-3 (Rights in Commercial Computer ++Software or Computer Software Documentation). Accordingly, all U.S. ++Government End Users acquire Covered Code with only those rights set ++forth herein. ++ ++13.2 Relationship of Parties. This License will not be construed as ++creating an agency, partnership, joint venture or any other form of ++legal association between or among You, Apple or any Contributor, and ++You will not represent to the contrary, whether expressly, by ++implication, appearance or otherwise. ++ ++13.3 Independent Development. Nothing in this License will impair ++Apple's right to acquire, license, develop, have others develop for ++it, market and/or distribute technology or products that perform the ++same or similar functions as, or otherwise compete with, ++Modifications, Larger Works, technology or products that You may ++develop, produce, market or distribute. ++ ++13.4 Waiver; Construction. Failure by Apple or any Contributor to ++enforce any provision of this License will not be deemed a waiver of ++future enforcement of that or any other provision. Any law or ++regulation which provides that the language of a contract shall be ++construed against the drafter will not apply to this License. ++ ++13.5 Severability. (a) If for any reason a court of competent ++jurisdiction finds any provision of this License, or portion thereof, ++to be unenforceable, that provision of the License will be enforced to ++the maximum extent permissible so as to effect the economic benefits ++and intent of the parties, and the remainder of this License will ++continue in full force and effect. (b) Notwithstanding the foregoing, ++if applicable law prohibits or restricts You from fully and/or ++specifically complying with Sections 2 and/or 3 or prevents the ++enforceability of either of those Sections, this License will ++immediately terminate and You must immediately discontinue any use of ++the Covered Code and destroy all copies of it that are in your ++possession or control. ++ ++13.6 Dispute Resolution. Any litigation or other dispute resolution ++between You and Apple relating to this License shall take place in the ++Northern District of California, and You and Apple hereby consent to ++the personal jurisdiction of, and venue in, the state and federal ++courts within that District with respect to this License. The ++application of the United Nations Convention on Contracts for the ++International Sale of Goods is expressly excluded. ++ ++13.7 Entire Agreement; Governing Law. This License constitutes the ++entire agreement between the parties with respect to the subject ++matter hereof. This License shall be governed by the laws of the ++United States and the State of California, except that body of ++California law concerning conflicts of law. ++ ++Where You are located in the province of Quebec, Canada, the following ++clause applies: The parties hereby confirm that they have requested ++that this License and all related documents be drafted in English. Les ++parties ont exige que le present contrat et tous les documents ++connexes soient rediges en anglais. ++ ++EXHIBIT A. ++ ++"Portions Copyright (c) 1999-2003 Apple Computer, Inc. All Rights ++Reserved. ++ ++This file contains Original Code and/or Modifications of Original Code ++as defined in and that are subject to the Apple Public Source License ++Version 2.0 (the 'License'). You may not use this file except in ++compliance with the License. Please obtain a copy of the License at ++http://www.opensource.apple.com/apsl/ and read it before using this ++file. ++ ++The Original Code and all software distributed under the License are ++distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER ++EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES, ++INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY, ++FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT. ++Please see the License for the specific language governing rights and ++limitations under the License." +diff --git a/src/ld/cs_blobs.h b/subprojects/libcodedirectory/cs_blobs.h +similarity index 100% +rename from src/ld/cs_blobs.h +rename to subprojects/libcodedirectory/cs_blobs.h +diff --git a/src/ld/libcodedirectory.c b/subprojects/libcodedirectory/libcodedirectory.c +similarity index 100% +rename from src/ld/libcodedirectory.c +rename to subprojects/libcodedirectory/libcodedirectory.c +diff --git a/src/ld/libcodedirectory.h b/subprojects/libcodedirectory/libcodedirectory.h +similarity index 100% +rename from src/ld/libcodedirectory.h +rename to subprojects/libcodedirectory/libcodedirectory.h +diff --git a/subprojects/libcodedirectory/meson.build b/subprojects/libcodedirectory/meson.build +new file mode 100644 +index 0000000..de8a4ae +--- /dev/null ++++ b/subprojects/libcodedirectory/meson.build +@@ -0,0 +1,33 @@ ++project( ++ 'libcodedirectory', ++ 'c', ++ default_options : {'c_std': 'c23'}, ++ license : 'APSL-2.0', ++ license_files : 'APPLE_LICENSE', ++ meson_version : '>=1.6.0', ++ version : '819.6.1', ++) ++ ++ ++cc = meson.get_compiler('c') ++ ++openssl_dep = dependency('openssl', version : '>=3.0') ++ ++ ++libcodedirectory = library( ++ 'codedirectory', ++ c_args : [ '-Wno-gnu-folding-constant' ], ++ dependencies : [ openssl_dep ], ++ install : true, ++ sources : [ 'libcodedirectory.c' ], ++ soversion : 1, ++) ++install_headers( ++ 'cs_blobs.h', ++ 'libcodedirectory.h', ++) ++ ++libcodedirectory_dep = declare_dependency( ++ include_directories : [ '.' ], ++ link_with : libcodedirectory, ++) +-- +2.47.2 + diff --git a/pkgs/by-name/ld/ld64/patches/0013-Set-the-version-string-in-the-build.patch b/pkgs/by-name/ld/ld64/patches/0013-Set-the-version-string-in-the-build.patch new file mode 100644 index 0000000000000..7f515218090c4 --- /dev/null +++ b/pkgs/by-name/ld/ld64/patches/0013-Set-the-version-string-in-the-build.patch @@ -0,0 +1,41 @@ +From fb1ec0eeac424d72175b14b08da9c2d85681b245 Mon Sep 17 00:00:00 2001 +From: Randy Eckenrode +Date: Sun, 17 Nov 2024 10:02:34 -0500 +Subject: [PATCH 13/18] Set the version string in the build + +--- + src/ld/meson.build | 11 +++++++++++ + 1 file changed, 11 insertions(+) + +diff --git a/src/ld/meson.build b/src/ld/meson.build +index 201e891..769ac28 100644 +--- a/src/ld/meson.build ++++ b/src/ld/meson.build +@@ -11,6 +11,16 @@ InputFiles_cpp = configure_file( + output : '@PLAINNAME@', + ) + ++version_string_cpp = configure_file( ++ capture : true, ++ command : [ ++ find_program('bash', native : true), ++ '-c', ++ 'echo \'extern const char ld_classicVersionString[] = "@(#)PROGRAM:ld PROJECT:ld64-' + meson.project_version() + '\\n";\'' ++ ], ++ output : 'version_string.cpp', ++) ++ + executable( + 'ld', + cpp_args : [ +@@ -43,6 +53,7 @@ executable( + sources : [ + configure_h, + InputFiles_cpp, ++ version_string_cpp, + 'FatFile.cpp', + 'Mangling.cpp', + 'Options.cpp', +-- +2.47.2 + diff --git a/pkgs/by-name/ld/ld64/patches/0014-Replace-corecrypto-and-CommonCrypto-with-OpenSSL.patch b/pkgs/by-name/ld/ld64/patches/0014-Replace-corecrypto-and-CommonCrypto-with-OpenSSL.patch new file mode 100644 index 0000000000000..bf506c2f6f996 --- /dev/null +++ b/pkgs/by-name/ld/ld64/patches/0014-Replace-corecrypto-and-CommonCrypto-with-OpenSSL.patch @@ -0,0 +1,341 @@ +From b2cfb2019b79e674a507a8b428bba4b82b2276d0 Mon Sep 17 00:00:00 2001 +From: Randy Eckenrode +Date: Wed, 13 Nov 2024 13:53:14 -0500 +Subject: [PATCH 14/18] Replace corecrypto and CommonCrypto with OpenSSL + +--- + src/ld/LinkEdit.hpp | 2 - + src/ld/OutputFile.cpp | 78 ++++++++++++---- + subprojects/libcodedirectory/cs_blobs.h | 1 + + .../libcodedirectory/libcodedirectory.c | 90 +++++++++++++------ + 4 files changed, 126 insertions(+), 45 deletions(-) + +diff --git a/src/ld/LinkEdit.hpp b/src/ld/LinkEdit.hpp +index 4a6d5fe..818fcdf 100644 +--- a/src/ld/LinkEdit.hpp ++++ b/src/ld/LinkEdit.hpp +@@ -30,8 +30,6 @@ + #include + #include + #include +-#include +-#include + + #include + #include +diff --git a/src/ld/OutputFile.cpp b/src/ld/OutputFile.cpp +index 2a175a7..69b476f 100644 +--- a/src/ld/OutputFile.cpp ++++ b/src/ld/OutputFile.cpp +@@ -43,10 +43,6 @@ + #include + #include + #include +-#include +-extern "C" { +- #include +-} + + #include + #include +@@ -56,9 +52,10 @@ extern "C" { + #include + #include + +-#include + #include + ++#include ++#include + + #include "ExportsTrie.h" + +@@ -79,6 +76,17 @@ uint32_t sAdrpNA = 0; + uint32_t sAdrpNoped = 0; + uint32_t sAdrpNotNoped = 0; + ++static void ++EVP_MD_cleanup(EVP_MD** digest) { ++ EVP_MD_free(*digest); ++ *digest = nullptr; ++} ++ ++static void ++EVP_MD_CTX_cleanup(EVP_MD_CTX** context) { ++ EVP_MD_CTX_free(*context); ++ *context = nullptr; ++} + + + OutputFile::OutputFile(const Options& opts, ld::Internal& state) +@@ -3834,7 +3842,7 @@ void OutputFile::computeContentUUID(ld::Internal& state, uint8_t* wholeBuffer) + { + const bool log = false; + if ( (_options.outputKind() != Options::kObjectFile) || state.someObjectFileHasDwarf ) { +- uint8_t digest[CCSHA256_OUTPUT_SIZE]; ++ uint8_t digest[CS_SHA256_LEN]; + std::vector> excludeRegions; + uint64_t bitcodeCmdOffset; + uint64_t bitcodeCmdEnd; +@@ -3902,18 +3910,27 @@ void OutputFile::computeContentUUID(ld::Internal& state, uint8_t* wholeBuffer) + excludeRegions.emplace_back(std::pair(symbolTableCmdOffset, symbolTableCmdOffset+symbolTableCmdSize)); + if ( log ) fprintf(stderr, "linkedit SegCmdOffset=0x%08llX, size=0x%08llX\n", symbolTableCmdOffset, symbolTableCmdSize); + } +- const ccdigest_info* di = ccsha256_di(); +- ccdigest_di_decl(di, ctx); +- ccdigest_init(di, ctx); ++ ++ [[gnu::cleanup(EVP_MD_cleanup)]] EVP_MD* sha256_digest = EVP_MD_fetch(nullptr, "SHA-256", nullptr); ++ [[gnu::cleanup(EVP_MD_CTX_cleanup)]] EVP_MD_CTX* context = EVP_MD_CTX_new(); ++ ++ if ( !EVP_DigestInit_ex2(context, sha256_digest, nullptr) ) { ++ ERR_print_errors_fp(stderr); ++ abort(); ++ } ++ + // rdar://problem/19487042 include the output leaf file name in the hash + const char* lastSlash = strrchr(_options.outputFilePath(), '/'); +- if ( lastSlash != NULL ) { +- ccdigest_update(di, ctx, strlen(lastSlash), lastSlash); ++ if ( lastSlash != NULL && !EVP_DigestUpdate(context, lastSlash, strlen(lastSlash)) ) { ++ ERR_print_errors_fp(stderr); ++ abort(); + } ++ + // use train name when calculating a binary's UUID + const char* buildName = _options.buildContextName(); +- if ( buildName != NULL ) { +- ccdigest_update(di, ctx, strlen(buildName), buildName); ++ if ( buildName != NULL && !EVP_DigestUpdate(context, buildName, strlen(buildName)) ) { ++ ERR_print_errors_fp(stderr); ++ abort(); + } + + if ( !excludeRegions.empty() ) { +@@ -3937,22 +3954,47 @@ void OutputFile::computeContentUUID(ld::Internal& state, uint8_t* wholeBuffer) + // Measure the ranges we want in parallel + struct Digest + { +- uint8_t digest[CCSHA256_OUTPUT_SIZE]; ++ uint8_t digest[CS_SHA256_LEN]; + }; + __block std::vector digests(regionsToMeasure.size()); + dispatch_apply(regionsToMeasure.size(), DISPATCH_APPLY_AUTO, ^(size_t index) { + uint64_t startOffset = regionsToMeasure[index].first; + uint64_t size = regionsToMeasure[index].second; +- CCDigest(kCCDigestSHA256, &wholeBuffer[startOffset], size, digests[index].digest); ++ ++ [[gnu::cleanup(EVP_MD_cleanup)]] EVP_MD* sha256_digest = EVP_MD_fetch(nullptr, "SHA-256", nullptr); ++ [[gnu::cleanup(EVP_MD_CTX_cleanup)]] EVP_MD_CTX* context = EVP_MD_CTX_new(); ++ ++ if (!EVP_DigestInit_ex2(context, sha256_digest, nullptr)) { ++ ERR_print_errors_fp(stderr); ++ abort(); ++ } ++ if (!EVP_DigestUpdate(context, &wholeBuffer[startOffset], size)) { ++ ERR_print_errors_fp(stderr); ++ abort(); ++ } ++ if (!EVP_DigestFinal_ex(context, digests[index].digest, nullptr)) { ++ ERR_print_errors_fp(stderr); ++ abort(); ++ } + }); + + // Merge the resuls in serial +- ccdigest_update(di, ctx, digests.size() * sizeof(Digest), digests.data()); ++ if ( !EVP_DigestUpdate(context, digests.data(), digests.size() * sizeof(Digest)) ) { ++ ERR_print_errors_fp(stderr); ++ abort(); ++ } + } else { +- ccdigest_update(di, ctx, _fileSize, wholeBuffer); ++ if ( !EVP_DigestUpdate(context, wholeBuffer, _fileSize) ) { ++ ERR_print_errors_fp(stderr); ++ abort(); ++ } ++ } ++ ++ if ( !EVP_DigestFinal_ex(context, digest, nullptr) ) { ++ ERR_print_errors_fp(stderr); ++ abort(); + } + +- ccdigest_final(di, ctx, digest); + if ( log ) fprintf(stderr, "uuid=%02X, %02X, %02X, %02X, %02X, %02X, %02X, %02X\n", digest[0], digest[1], digest[2], + digest[3], digest[4], digest[5], digest[6], digest[7]); + +diff --git a/subprojects/libcodedirectory/cs_blobs.h b/subprojects/libcodedirectory/cs_blobs.h +index 899a6a2..ce9cac6 100644 +--- a/subprojects/libcodedirectory/cs_blobs.h ++++ b/subprojects/libcodedirectory/cs_blobs.h +@@ -129,6 +129,7 @@ enum { + CS_SHA1_LEN = 20, + CS_SHA256_LEN = 32, + CS_SHA256_TRUNCATED_LEN = 20, ++ CS_SHA384_LEN = 48, + + CS_CDHASH_LEN = 20, /* always - larger hashes are truncated */ + CS_HASH_MAX_SIZE = 48, /* max size of the hash we'll support */ +diff --git a/subprojects/libcodedirectory/libcodedirectory.c b/subprojects/libcodedirectory/libcodedirectory.c +index 583ac96..02e31b1 100644 +--- a/subprojects/libcodedirectory/libcodedirectory.c ++++ b/subprojects/libcodedirectory/libcodedirectory.c +@@ -14,10 +14,6 @@ + #include + #include + +-#include +-#include +-#include +- + #define LIBCD_HAS_PLATFORM_VERSION 1 + #include "libcodedirectory.h" + +@@ -46,6 +42,21 @@ + #include + #endif + ++#include ++#include ++ ++static void ++EVP_MD_cleanup(EVP_MD** digest) { ++ EVP_MD_free(*digest); ++ *digest = NULL; ++} ++ ++static void ++EVP_MD_CTX_cleanup(EVP_MD_CTX** context) { ++ EVP_MD_CTX_free(*context); ++ *context = NULL; ++} ++ + #define MIN(a, b) (((a) < (b)) ? (a) : (b)) + #define MAX(a, b) (((a) > (b)) ? (a) : (b)) + +@@ -459,17 +470,17 @@ void libcd_set_exec_seg (libcd *s, uint64_t base, uint64_t limit, uint64_t flags + + struct _hash_info { + size_t hash_len; +- const struct ccdigest_info *(*di)(void); ++ const char* name; + }; + + static const struct _hash_info _known_hash_types[] = { + { 0, NULL }, +- { CS_SHA1_LEN, ccsha1_di }, // CS_HASHTYPE_SHA1 +- { CS_SHA256_LEN, ccsha256_di }, // CS_HASHTYPE_SHA256 +- // { 0, NULL }, // CS_HASHTYPE_SHA256_TRUNCATED, unsupported +- // { 0, NULL }, // CS_HASHTYPE_SHA384, unsupported ++ { CS_SHA1_LEN, "SHA-1" }, // CS_HASHTYPE_SHA1 ++ { CS_SHA256_LEN, "SHA-256" }, // CS_HASHTYPE_SHA256 ++ { CS_HASHTYPE_SHA256_TRUNCATED, "SHA-256" }, // CS_HASHTYPE_SHA256_TRUNCATED ++ { CS_SHA384_LEN, "SHA-384" }, // CS_HASHTYPE_SHA384 + }; +-static const size_t _max_known_hash_len = CS_SHA256_LEN; ++static const size_t _max_known_hash_len = CS_SHA384_LEN; + static const int _known_hash_types_count = sizeof(_known_hash_types)/sizeof(_known_hash_types[0]); + + static struct _hash_info const * +@@ -781,8 +792,8 @@ _libcd_hash_page(libcd *s, + uint8_t page_hash[_max_known_hash_len] = {0}; + const unsigned int page_no = (unsigned int)page_idx; + +- struct ccdigest_info const *di = hi->di(); +- ccdigest_di_decl(di, ctx); ++ [[gnu::cleanup(EVP_MD_cleanup)]] EVP_MD* digest = EVP_MD_fetch(NULL, hi->name, NULL); ++ [[gnu::cleanup(EVP_MD_CTX_cleanup)]] EVP_MD_CTX* context = EVP_MD_CTX_new(); + + const size_t pos = page_idx * _cs_page_bytes; + uint8_t page[_cs_page_bytes] = {0}; +@@ -794,9 +805,18 @@ _libcd_hash_page(libcd *s, + return LIBCD_SERIALIZE_READ_PAGE_ERROR; + } + +- ccdigest_init(di, ctx); +- ccdigest_update(di, ctx, read_bytes, page); +- ccdigest_final(di, ctx, page_hash); ++ if (!EVP_DigestInit_ex2(context, digest, NULL)) { ++ ERR_print_errors_fp(stderr); ++ abort(); ++ } ++ if (!EVP_DigestUpdate(context, page, read_bytes)) { ++ ERR_print_errors_fp(stderr); ++ abort(); ++ } ++ if (!EVP_DigestFinal_ex(context, page_hash, NULL)) { ++ ERR_print_errors_fp(stderr); ++ abort(); ++ } + + memcpy(hash_destination, page_hash, hi->hash_len); + +@@ -894,16 +914,25 @@ _libcd_serialize_cd (libcd *s, uint32_t hash_type) + //// code directory hashes + { + if (s->special_slot_count > 0) { +- struct ccdigest_info const *di = hi->di(); +- ccdigest_di_decl(di, ctx); ++ [[gnu::cleanup(EVP_MD_cleanup)]] EVP_MD* digest = EVP_MD_fetch(NULL, hi->name, NULL); ++ [[gnu::cleanup(EVP_MD_CTX_cleanup)]] EVP_MD_CTX* context = EVP_MD_CTX_new(); + + uint8_t *special_slot_buf = calloc(s->special_slot_count, hi->hash_len); + + struct _sslot_data *sslot = NULL; + SLIST_FOREACH(sslot, &s->sslot_data, entries) { +- ccdigest_init(di, ctx); +- ccdigest_update(di, ctx, sslot->len, sslot->data); +- ccdigest_final(di, ctx, special_slot_buf + (s->special_slot_count-sslot->slot)*hi->hash_len); ++ if (!EVP_DigestInit_ex2(context, digest, NULL)) { ++ ERR_print_errors_fp(stderr); ++ abort(); ++ } ++ if (!EVP_DigestUpdate(context, sslot->data, sslot->len)) { ++ ERR_print_errors_fp(stderr); ++ abort(); ++ } ++ if (!EVP_DigestFinal_ex(context, special_slot_buf + (s->special_slot_count-sslot->slot)*hi->hash_len, NULL)) { ++ ERR_print_errors_fp(stderr); ++ abort(); ++ } + } + memcpy(cursor, special_slot_buf, s->special_slot_count*hi->hash_len); + cursor += s->special_slot_count*hi->hash_len; +@@ -949,17 +978,28 @@ _libcd_serialize_cd (libcd *s, uint32_t hash_type) + + //Record the cdhash for this codedirectory + { +- struct ccdigest_info const *di = hi->di(); +- ccdigest_di_decl(di, ctx); ++ [[gnu::cleanup(EVP_MD_cleanup)]] EVP_MD* digest = EVP_MD_fetch(NULL, hi->name, NULL); ++ [[gnu::cleanup(EVP_MD_CTX_cleanup)]] EVP_MD_CTX* context = EVP_MD_CTX_new(); ++ + uint8_t *cdhash_buf = calloc(1, hi->hash_len); + if (cdhash_buf == NULL) { + _libcd_err("Failed to allocated memory for cdhash"); + free(cd_mem); + return LIBCD_SERIALIZE_NO_MEM; + } +- ccdigest_init(di, ctx); +- ccdigest_update(di, ctx, cd_size, cd_mem); +- ccdigest_final(di, ctx, cdhash_buf); ++ ++ if (!EVP_DigestInit_ex2(context, digest, NULL)) { ++ ERR_print_errors_fp(stderr); ++ abort(); ++ } ++ if (!EVP_DigestUpdate(context, cd_mem, cd_size)) { ++ ERR_print_errors_fp(stderr); ++ abort(); ++ } ++ if (!EVP_DigestFinal_ex(context, cdhash_buf, NULL)) { ++ ERR_print_errors_fp(stderr); ++ abort(); ++ } + + for (size_t i = 0; i < s->hash_types_count; i++) { + if (s->cdhashes[i].set) { +-- +2.47.2 + diff --git a/pkgs/by-name/ld/ld64/0006-Add-libcd_is_blob_a_linker_signature-implementation.patch b/pkgs/by-name/ld/ld64/patches/0015-Add-libcd_is_blob_a_linker_signature-implementation.patch similarity index 73% rename from pkgs/by-name/ld/ld64/0006-Add-libcd_is_blob_a_linker_signature-implementation.patch rename to pkgs/by-name/ld/ld64/patches/0015-Add-libcd_is_blob_a_linker_signature-implementation.patch index e5485ab4cadc4..b3befd74efe96 100644 --- a/pkgs/by-name/ld/ld64/0006-Add-libcd_is_blob_a_linker_signature-implementation.patch +++ b/pkgs/by-name/ld/ld64/patches/0015-Add-libcd_is_blob_a_linker_signature-implementation.patch @@ -1,26 +1,21 @@ -From add8bae5577ebe1c98cf7a711f87a3578a51d313 Mon Sep 17 00:00:00 2001 +From 1894e5752ebfe0572684c235da3cdcdfd10f29a1 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode -Date: Mon, 8 Apr 2024 22:42:40 -0400 -Subject: [PATCH 6/8] Add libcd_is_blob_a_linker_signature implementation +Date: Sat, 16 Nov 2024 16:21:17 -0500 +Subject: [PATCH 15/18] Add libcd_is_blob_a_linker_signature implementation --- - compat/libcodedirectory.c | 74 +++++++++++++++++++++++++++++++++++++++ - src/ld/libcodedirectory.h | 8 +++++ - 2 files changed, 82 insertions(+) - create mode 100644 compat/libcodedirectory.c + .../libcodedirectory/libcodedirectory.c | 68 +++++++++++++++++++ + .../libcodedirectory/libcodedirectory.h | 9 +++ + 2 files changed, 77 insertions(+) -diff --git a/compat/libcodedirectory.c b/compat/libcodedirectory.c -new file mode 100644 -index 0000000..e584dfc ---- /dev/null -+++ b/compat/libcodedirectory.c -@@ -0,0 +1,74 @@ -+// SPDX-License-Identifier: APSL-2.0 -+// libcd_is_blob_a_linker_signature implementation written by Randy Eckenrode © 2024 -+ -+#include -+ -+#include +diff --git a/subprojects/libcodedirectory/libcodedirectory.c b/subprojects/libcodedirectory/libcodedirectory.c +index 02e31b1..89908b9 100644 +--- a/subprojects/libcodedirectory/libcodedirectory.c ++++ b/subprojects/libcodedirectory/libcodedirectory.c +@@ -1221,3 +1221,71 @@ libcd_get_cdhash_for_type(libcd *s, int hash_type, uint8_t* cdhash_buf, size_t c + } + return LIBCD_CDHASH_TYPE_NOT_FOUND; + } + +// References: +// - https://forums.developer.apple.com/forums/thread/702351 @@ -43,7 +38,7 @@ index 0000000..e584dfc + +static inline const uint8_t* find_code_directory(const uint8_t* data, size_t size) { + const uint8_t* index_ptr = data + offsetof(CS_SuperBlob, index); -+ ++ + // There also needs to be space for the actual blobs, but there must be at least enough space + // for the blob indexes. If there’s not, then something’s wrong, and the blob is invalid. + uint32_t count = read32be(data + offsetof(CS_SuperBlob, count)); @@ -89,11 +84,11 @@ index 0000000..e584dfc + + return LIBCD_SIGNATURE_QUERY_SUCCESS; +} -diff --git a/src/ld/libcodedirectory.h b/src/ld/libcodedirectory.h -index 0e989a9..7532648 100644 ---- a/src/ld/libcodedirectory.h -+++ b/src/ld/libcodedirectory.h -@@ -116,6 +116,14 @@ enum libcd_set_linkage_ret { +diff --git a/subprojects/libcodedirectory/libcodedirectory.h b/subprojects/libcodedirectory/libcodedirectory.h +index 0e989a9..67a5a22 100644 +--- a/subprojects/libcodedirectory/libcodedirectory.h ++++ b/subprojects/libcodedirectory/libcodedirectory.h +@@ -116,6 +116,15 @@ enum libcd_set_linkage_ret { enum libcd_set_linkage_ret libcd_set_linkage(libcd *s, int linkage_hash_type, uint8_t *linkage_hash); @@ -104,10 +99,11 @@ index 0e989a9..7532648 100644 +}; + +enum libcd_signature_query_ret libcd_is_blob_a_linker_signature(const uint8_t* data, size_t size, int* linker_signed); ++ + __END_DECLS #endif // H_LIBCODEDIRECTORY -- -2.45.1 +2.47.2 diff --git a/pkgs/by-name/ld/ld64/patches/0016-Add-dyldinfo-to-the-ld64-build.patch b/pkgs/by-name/ld/ld64/patches/0016-Add-dyldinfo-to-the-ld64-build.patch new file mode 100644 index 0000000000000..e35a00d393e87 --- /dev/null +++ b/pkgs/by-name/ld/ld64/patches/0016-Add-dyldinfo-to-the-ld64-build.patch @@ -0,0 +1,35 @@ +From 1bd02ac97fd47d8f7c8f1f21893d7107ae2319b5 Mon Sep 17 00:00:00 2001 +From: Randy Eckenrode +Date: Sun, 17 Nov 2024 10:02:34 -0500 +Subject: [PATCH 16/18] Add dyldinfo to the ld64 build + +--- + src/other/meson.build | 15 +++++++++++++++ + 1 file changed, 15 insertions(+) + +diff --git a/src/other/meson.build b/src/other/meson.build +index 067a69c..663b9ee 100644 +--- a/src/other/meson.build ++++ b/src/other/meson.build +@@ -1,3 +1,18 @@ ++dyldinfo = executable( ++ 'dyldinfo', ++ dependencies : [ ++ abstraction_dep, ++ llvm_dep, ++ ], ++ include_directories : [ '../ld' ], ++ install : true, ++ sources : [ ++ configure_h, ++ 'dyldinfo.cpp', ++ ], ++) ++install_man(meson.global_source_root() / 'doc/man/man1/dyldinfo.1') ++ + machocheck = executable( + 'machocheck', + dependencies : [ +-- +2.47.2 + diff --git a/pkgs/by-name/ld/ld64/patches/0017-Fix-dyldinfo-build.patch b/pkgs/by-name/ld/ld64/patches/0017-Fix-dyldinfo-build.patch new file mode 100644 index 0000000000000..7e06fd5ac18df --- /dev/null +++ b/pkgs/by-name/ld/ld64/patches/0017-Fix-dyldinfo-build.patch @@ -0,0 +1,37 @@ +From 477911db0045e8b1925fcd5db523aab2888fdcc9 Mon Sep 17 00:00:00 2001 +From: Randy Eckenrode +Date: Sun, 17 Nov 2024 10:02:34 -0500 +Subject: [PATCH 17/18] Fix dyldinfo build + +`isSubType` was removed in 907, but the fix is simple. This mirrors the +changes that were made in that update to other parts of ld64. +--- + src/other/dyldinfo.cpp | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +diff --git a/src/other/dyldinfo.cpp b/src/other/dyldinfo.cpp +index dbfd0de..96aa109 100644 +--- a/src/other/dyldinfo.cpp ++++ b/src/other/dyldinfo.cpp +@@ -427,7 +427,7 @@ DyldInfoPrinter::DyldInfoPrinter(const uint8_t* fileContent, uint32_t fileLen + if ( printArch ) { + for (const ArchInfo* t=archInfoArray; t->archName != NULL; ++t) { + if ( (cpu_type_t)fHeader->cputype() == t->cpuType ) { +- if ( t->isSubType && ((cpu_subtype_t)fHeader->cpusubtype() != t->cpuSubType) ) ++ if ( ((cpu_subtype_t)fHeader->cpusubtype() != t->cpuSubType) ) + continue; + printf("for arch %s:\n", t->archName); + } +@@ -2801,8 +2801,7 @@ int main(int argc, const char* argv[]) + for (const ArchInfo* t=archInfoArray; t->archName != NULL; ++t) { + if ( strcmp(t->archName,arch) == 0 ) { + sPreferredArch = t->cpuType; +- if ( t->isSubType ) +- sPreferredSubArch = t->cpuSubType; ++ sPreferredSubArch = t->cpuSubType; + found = true; + break; + } +-- +2.47.2 + diff --git a/pkgs/by-name/ld/ld64/patches/0018-Use-STL-containers-instead-of-LLVM-containers.patch b/pkgs/by-name/ld/ld64/patches/0018-Use-STL-containers-instead-of-LLVM-containers.patch new file mode 100644 index 0000000000000..8f3eadb34e234 --- /dev/null +++ b/pkgs/by-name/ld/ld64/patches/0018-Use-STL-containers-instead-of-LLVM-containers.patch @@ -0,0 +1,37 @@ +From 98119b91fc3cf85d65c2e320707324af3c56565d Mon Sep 17 00:00:00 2001 +From: Randy Eckenrode +Date: Wed, 13 Nov 2024 13:53:14 -0500 +Subject: [PATCH 18/18] Use STL containers instead of LLVM containers +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Upstream LLVM doesn’t support `std::string_view` in `DenseMap`s. +--- + src/abstraction/Containers.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/abstraction/Containers.h b/src/abstraction/Containers.h +index a27dc83..fca312c 100644 +--- a/src/abstraction/Containers.h ++++ b/src/abstraction/Containers.h +@@ -31,14 +31,14 @@ + #include + #include + +-#define USE_LLVM_CONTAINERS 1 ++#define USE_LLVM_CONTAINERS 0 + + #if USE_LLVM_CONTAINERS + #include "../llvm/llvm-DenseSet.h" + #include "../llvm/llvm-DenseMap.h" + #else + // Include DenseMapInfo helpers even when not using LLVM containers. +-#include "../llvm/llvm-DenseMapInfo.h" ++// #include "../llvm/llvm-DenseMapInfo.h" + #endif + + namespace ld { +-- +2.47.2 + diff --git a/pkgs/by-name/ld/ld64/remove-unused-and-incomplete-blob-clone.diff b/pkgs/by-name/ld/ld64/remove-unused-and-incomplete-blob-clone.diff deleted file mode 100644 index 88dd4304f6f72..0000000000000 --- a/pkgs/by-name/ld/ld64/remove-unused-and-incomplete-blob-clone.diff +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/src/ld/code-sign-blobs/blob.h b/src/ld/code-sign-blobs/blob.h -index 19c63a9..1dfb380 100644 ---- a/src/ld/code-sign-blobs/blob.h -+++ b/src/ld/code-sign-blobs/blob.h -@@ -180,9 +180,6 @@ public: - return NULL; - } - -- BlobType *clone() const -- { assert(validateBlob()); return specific(this->BlobCore::clone()); } -- - static BlobType *readBlob(int fd) - { return specific(BlobCore::readBlob(fd, _magic, sizeof(BlobType), 0), true); } - From d91bce4ad55ee81cdb13c294cdab0599d0b96536 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Tue, 14 Jan 2025 18:13:55 -0500 Subject: [PATCH 103/343] ld64: 951.9 -> 954.16 https://github.com/apple-oss-distributions/ld64/compare/ld64-951.9...ld64-954.16 --- pkgs/by-name/ld/ld64/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ld/ld64/package.nix b/pkgs/by-name/ld/ld64/package.nix index c5cd1d7b9c1ed..8eefeea6d7688 100644 --- a/pkgs/by-name/ld/ld64/package.nix +++ b/pkgs/by-name/ld/ld64/package.nix @@ -40,7 +40,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "ld64"; - version = "951.9"; + version = "954.16"; outputs = [ "out" @@ -52,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "apple-oss-distributions"; repo = "ld64"; tag = "ld64-${finalAttrs.version}"; - hash = "sha256-hLkfqgBwVPlO4gfriYOawTO5E1zSD63ZcNetm1E5I70"; + hash = "sha256-CVIyL2J9ISZnI4+r+wp4QtOb3+3Tmz2z2Z7/qeRqHS0="; }; patches = @@ -116,7 +116,7 @@ stdenv.mkDerivation (finalAttrs: { echo 'static const char compile_stubs[] = "";' >> src/ld/compile_stubs.h ''; - xcodeHash = "sha256-+j7Ed/6aD46SJnr3DWPfWuYWylb2FNJRPmWsUVxZJHM="; + xcodeHash = "sha256-qip/1eiGn8PdLThonhPq3oq2veN4E1zOiamDPBfTeNE="; xcodeProject = "ld64.xcodeproj"; nativeBuildInputs = [ From 324efa8ec7e93f30f038fbee646bbf0eb86c2aa9 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Sat, 28 Dec 2024 10:32:44 -0500 Subject: [PATCH 104/343] darwin.binutils: link unprefixed ld64 with prefix in binutils ld64 is a cross-linker by default (albeit only to Darwin platforms), so it is built without a prefix in the ld64 package. The linker in the binutils package is expected to be prefixed, so adjust the build command accordingly to make sure the linker is still linked correctly. --- pkgs/os-specific/darwin/binutils/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/darwin/binutils/default.nix b/pkgs/os-specific/darwin/binutils/default.nix index f01b8d43a2bee..d45258fff303d 100644 --- a/pkgs/os-specific/darwin/binutils/default.nix +++ b/pkgs/os-specific/darwin/binutils/default.nix @@ -106,7 +106,7 @@ stdenvNoCC.mkDerivation { makeWrapper "${lib.getBin clang-unwrapped}/bin/clang" "$out/bin/${targetPrefix}as" \ --add-flags "-x assembler -integrated-as -c" - ln -s '${lib.getBin ld64}/bin/${targetPrefix}ld' "$out/bin/${targetPrefix}ld" + ln -s '${lib.getBin ld64}/bin/ld' "$out/bin/${targetPrefix}ld" ${linkManPages (lib.getMan ld64) "ld" "ld"} ${linkManPages (lib.getMan ld64) "ld-classic" "ld-classic"} ${linkManPages (lib.getMan ld64) "ld64" "ld64"} From 93fbc62302af3c0869d32e354704f63961d6c88b Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sun, 2 Feb 2025 06:17:54 +0000 Subject: [PATCH 105/343] gdb: 16.1 -> 16.2 Changes: https://lists.gnu.org/archive/html/info-gnu/2025-02/msg00000.html --- pkgs/development/tools/misc/gdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/gdb/default.nix b/pkgs/development/tools/misc/gdb/default.nix index efca728164418..8967827c1168a 100644 --- a/pkgs/development/tools/misc/gdb/default.nix +++ b/pkgs/development/tools/misc/gdb/default.nix @@ -53,11 +53,11 @@ assert pythonSupport -> python3 != null; stdenv.mkDerivation rec { pname = targetPrefix + basename + lib.optionalString hostCpuOnly "-host-cpu-only"; - version = "16.1"; + version = "16.2"; src = fetchurl { url = "mirror://gnu/gdb/${basename}-${version}.tar.xz"; - hash = "sha256-wsxczKApt6fDh5zoqWUo/f0Fa02ITysFEej3vHIzVcY="; + hash = "sha256-QALLfyP0XDfHkFNqE6cglCzkvgQC2SnJCF6S8Q1IARk="; }; postPatch = From 4a06ebaf70e87ff780c1d35dd91b90a4dbaa677f Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sun, 26 Jan 2025 07:26:34 +0000 Subject: [PATCH 106/343] which: 2.21 -> 2.23 Dropped LARGEFILE support override as it was upstreamed as: https://git.savannah.gnu.org/cgit/which.git/commit/?id=ff99c8a2aa84237e4546078a2b62a7b2798cd53b Changes: - https://git.savannah.gnu.org/cgit/which.git/tree/NEWS?id=a5f8db60de0f5af76b8ef358ce1a5e55b8556e4e - https://git.savannah.gnu.org/cgit/which.git/diff/NEWS?id=3e2c8f8acc3a333b66b06de234bc9324c6fe5500 --- pkgs/by-name/wh/which/package.nix | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/wh/which/package.nix b/pkgs/by-name/wh/which/package.nix index ae9deecdec54a..a739a54f474db 100644 --- a/pkgs/by-name/wh/which/package.nix +++ b/pkgs/by-name/wh/which/package.nix @@ -6,23 +6,16 @@ stdenv.mkDerivation rec { pname = "which"; - version = "2.21"; + version = "2.23"; src = fetchurl { url = "mirror://gnu/which/which-${version}.tar.gz"; - hash = "sha256-9KJFuUEks3fYtJZGv0IfkVXTaqdhS26/g3BdP/x26q0="; + hash = "sha256-osVYIm/E2eTOMxvS/Tw/F/lVEV0sAORHYYpO+ZeKKnM="; }; strictDeps = true; enableParallelBuilding = true; - env.NIX_CFLAGS_COMPILE = toString ( - # Enable 64-bit file API. Otherwise `which` fails to find tools - # on filesystems with 64-bit inodes (like `btrfs`) when running - # binaries from 32-bit systems (like `i686-linux`). - lib.optional stdenv.hostPlatform.is32bit "-D_FILE_OFFSET_BITS=64" - ); - meta = { homepage = "https://www.gnu.org/software/which/"; description = "Shows the full path of (shell) commands"; From db161f84c91baab682ac90e6d127283db9abe0f4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 2 Feb 2025 07:26:23 +0000 Subject: [PATCH 107/343] fizz: 2025.01.06.00 -> 2025.01.27.00 --- pkgs/by-name/fi/fizz/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fi/fizz/package.nix b/pkgs/by-name/fi/fizz/package.nix index 3d09d856ef4fa..498061f63041d 100644 --- a/pkgs/by-name/fi/fizz/package.nix +++ b/pkgs/by-name/fi/fizz/package.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "fizz"; - version = "2025.01.06.00"; + version = "2025.01.27.00"; outputs = [ "bin" @@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "facebookincubator"; repo = "fizz"; tag = "v${finalAttrs.version}"; - hash = "sha256-ENMWP4CkJHe6Z0qsRNkmgw8NcYQvduAs7jIZLwirsCs="; + hash = "sha256-Gt1DaEcpto25dkT6QsGg3jNp8vvAuWJrzCqelknK+IU="; }; patches = [ From bbae80ff651353c44b9e70c714fcdb1e662e3822 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 2 Feb 2025 10:43:49 +0000 Subject: [PATCH 108/343] wangle: 2025.01.06.00 -> 2025.01.27.00 --- pkgs/by-name/wa/wangle/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/wa/wangle/package.nix b/pkgs/by-name/wa/wangle/package.nix index 5d1a723a1b829..ed13b75dd2634 100644 --- a/pkgs/by-name/wa/wangle/package.nix +++ b/pkgs/by-name/wa/wangle/package.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "wangle"; - version = "2025.01.06.00"; + version = "2025.01.27.00"; outputs = [ "out" @@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "facebook"; repo = "wangle"; tag = "v${finalAttrs.version}"; - hash = "sha256-H10BwlKypOuxqrV8BpeJd7gWUqYrCaoW0HwV4I7nxu0="; + hash = "sha256-aZnDqMQ2Xh/v5zhyvR8ovHgISjTy8eGoGXg69Ee3Ejk="; }; patches = [ From 46eecf6113b7a5a82d187a3845b9ffba5e45252c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 2 Feb 2025 12:43:11 +0000 Subject: [PATCH 109/343] protobufc: 1.5.0 -> 1.5.1 --- pkgs/by-name/pr/protobufc/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pr/protobufc/package.nix b/pkgs/by-name/pr/protobufc/package.nix index e35fc7ad1aca1..7273982206f5a 100644 --- a/pkgs/by-name/pr/protobufc/package.nix +++ b/pkgs/by-name/pr/protobufc/package.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "protobuf-c"; - version = "1.5.0"; + version = "1.5.1"; src = fetchFromGitHub { owner = "protobuf-c"; repo = "protobuf-c"; tag = "v${version}"; - hash = "sha256-Dkpcc7ZfvAIVY91trRiHuiRFcUGUbQxbheYKTBcq80I="; + hash = "sha256-usfONVSq0/V9GRrBx9RwO/hCrVJ8d17mvAgTKpKUssQ="; }; outputs = [ From de8a02609c14de8c4d3cd0ec12b4503f19a3aeb2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 2 Feb 2025 12:47:51 +0000 Subject: [PATCH 110/343] memcached: 1.6.34 -> 1.6.35 --- pkgs/by-name/me/memcached/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/me/memcached/package.nix b/pkgs/by-name/me/memcached/package.nix index 6188c9e3a044f..b8362c2535a80 100644 --- a/pkgs/by-name/me/memcached/package.nix +++ b/pkgs/by-name/me/memcached/package.nix @@ -1,12 +1,12 @@ {lib, stdenv, fetchurl, cyrus_sasl, libevent, nixosTests }: stdenv.mkDerivation rec { - version = "1.6.34"; + version = "1.6.35"; pname = "memcached"; src = fetchurl { url = "https://memcached.org/files/${pname}-${version}.tar.gz"; - sha256 = "sha256-DVOA4uCltPzvHYmjaKEcTwZobGAXwf/3eLO0V48GdOw="; + sha256 = "sha256-60UpMX7sgY78RDUt3R+Vn9IIgr7RrikqV4i9eklm98E="; }; configureFlags = [ From d72d8e0f4736c543ac1c39463c8ff3ad0d8dbc71 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 2 Feb 2025 18:52:41 +0000 Subject: [PATCH 111/343] spdlog: 1.15.0 -> 1.15.1 --- pkgs/by-name/sp/spdlog/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sp/spdlog/package.nix b/pkgs/by-name/sp/spdlog/package.nix index 802c8fe5f0d73..da33fbf603331 100644 --- a/pkgs/by-name/sp/spdlog/package.nix +++ b/pkgs/by-name/sp/spdlog/package.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "spdlog"; - version = "1.15.0"; + version = "1.15.1"; src = fetchFromGitHub { owner = "gabime"; repo = "spdlog"; rev = "v${version}"; - hash = "sha256-HCpnN28qWreg0NvL6Q9pfSSxOTHgV6glHt6P0FbH/Cw="; + hash = "sha256-4QZVCounDbtkP+58fejHGWjquWT3b03b9TNGs45dN7c="; }; nativeBuildInputs = [ cmake ]; From c1907fbbf03ca1b775e7391073a1c55872c9d33d Mon Sep 17 00:00:00 2001 From: K900 Date: Sat, 1 Feb 2025 15:20:05 +0300 Subject: [PATCH 112/343] gcc: rework, clean up, and document the cursed symlink hack Fixes dangling symlinks. Also flips the direction of symlinks on cross from $lib/$target/lib -> $lib/lib to $lib/lib -> $lib/$target/lib --- .../compilers/gcc/common/builder.nix | 211 ++++++++++-------- .../compilers/gcc/common/libgcc.nix | 13 +- 2 files changed, 126 insertions(+), 98 deletions(-) diff --git a/pkgs/development/compilers/gcc/common/builder.nix b/pkgs/development/compilers/gcc/common/builder.nix index 633251910dbe1..1cb2933977de3 100644 --- a/pkgs/development/compilers/gcc/common/builder.nix +++ b/pkgs/development/compilers/gcc/common/builder.nix @@ -210,110 +210,137 @@ originalAttrs: ''; preInstall = + # What follows is a horribly cursed hack. + # + # GCC will install its libraries to $out/lib, $out/lib32, $out/lib64, + # $out/$targetConfig/lib, $out/$targetConfig/lib32 or $out/$targetConfig/lib64, + # depending on whether it's built as native or cross, and the exact target spec. + # + # We can't predict what it's actually going to do, and we also can't just tell it + # to always install to $out/lib, but we want everything to end up in $out/lib + # for consistency (multilib weirdness aside). + # + # So, we create a bunch of symlinks before we run GCC's install phase, + # redirecting every possible directory it may want to write to to the place + # we actually want things to be installed. + # We will then nuke the symlinks in postInstall. + # + # FIXME: there must be a better way to do this. '' - mkdir -p "$out/''${targetConfig}/lib" - mkdir -p "''${!outputLib}/''${targetConfig}/lib" + declare -ga compatibilitySymlinks=() + + makeCompatibilitySymlink() { + for output in "$out" "''${!outputLib}"; do + local linkTarget="$1" + local linkName="$output/$2" + + echo "Creating compatibility symlink: $linkTarget -> $linkName" + + mkdir -p "$(dirname "$linkName")" + ln -s "$linkTarget" "$linkName" + compatibilitySymlinks+=("$linkName") + done + } '' + - # if cross-compiling, link from $lib/lib to $lib/${targetConfig}. - # since native-compiles have $lib/lib as a directory (not a - # symlink), this ensures that in every case we can assume that - # $lib/lib contains the .so files - lib.optionalString (with stdenv; targetPlatform.config != hostPlatform.config) '' - ln -Ts "''${!outputLib}/''${targetConfig}/lib" $lib/lib + # This will redirect $output/lib{32,64} to $output/lib. + # Multilib is special, because it creates $out/lib (for 32-bit) + # and $out/lib64 (for 64-bit). No other targets can have both. + lib.optionalString (!enableMultilib) '' + makeCompatibilitySymlink lib lib32 + makeCompatibilitySymlink lib lib64 '' + - # Make `lib64` symlinks to `lib`. - lib.optionalString - (!enableMultilib && stdenv.hostPlatform.is64bit && !stdenv.hostPlatform.isMips64n32) - '' - ln -s lib "$out/''${targetConfig}/lib64" - ln -s lib "''${!outputLib}/''${targetConfig}/lib64" - '' - + - # On mips platforms, gcc follows the IRIX naming convention: - # - # $PREFIX/lib = mips32 - # $PREFIX/lib32 = mips64n32 - # $PREFIX/lib64 = mips64 - # - # Make `lib32` symlinks to `lib`. - lib.optionalString (!enableMultilib && stdenv.targetPlatform.isMips64n32) '' - ln -s lib "$out/''${targetConfig}/lib32" - ln -s lib "''${!outputLib}/''${targetConfig}/lib32" + # This will redirect $output/$targetConfig/lib{,32,64} to $output/lib. + lib.optionalString (with stdenv; targetPlatform.config != hostPlatform.config) '' + makeCompatibilitySymlink lib $targetConfig/lib32 + makeCompatibilitySymlink lib $targetConfig/lib64 + makeCompatibilitySymlink ../lib $targetConfig/lib ''; - postInstall = '' - # Move runtime libraries to lib output. - moveToOutput "''${targetConfig+$targetConfig/}lib/lib*.so*" "''${!outputLib}" - moveToOutput "''${targetConfig+$targetConfig/}lib/lib*.la" "''${!outputLib}" - moveToOutput "''${targetConfig+$targetConfig/}lib/lib*.dylib" "''${!outputLib}" - moveToOutput "''${targetConfig+$targetConfig/}lib/lib*.dll.a" "''${!outputLib}" - moveToOutput "''${targetConfig+$targetConfig/}lib/lib*.dll" "''${!outputLib}" - moveToOutput "share/gcc-*/python" "''${!outputLib}" - - if [ -z "$enableShared" ]; then - moveToOutput "''${targetConfig+$targetConfig/}lib/lib*.a" "''${!outputLib}" - fi - - for i in "''${!outputLib}/''${targetConfig}"/lib/*.{la,py}; do - substituteInPlace "$i" --replace "$out" "''${!outputLib}" - done - - if [ -n "$enableMultilib" ]; then - moveToOutput "''${targetConfig+$targetConfig/}lib64/lib*.so*" "''${!outputLib}" - moveToOutput "''${targetConfig+$targetConfig/}lib64/lib*.la" "''${!outputLib}" - moveToOutput "''${targetConfig+$targetConfig/}lib64/lib*.dylib" "''${!outputLib}" - moveToOutput "''${targetConfig+$targetConfig/}lib64/lib*.dll.a" "''${!outputLib}" - moveToOutput "''${targetConfig+$targetConfig/}lib64/lib*.dll" "''${!outputLib}" - - for i in "''${!outputLib}/''${targetConfig}"/lib64/*.{la,py}; do - substituteInPlace "$i" --replace "$out" "''${!outputLib}" - done - fi - - # Remove `fixincl' to prevent a retained dependency on the - # previous gcc. - rm -rf $out/libexec/gcc/*/*/install-tools - rm -rf $out/lib/gcc/*/*/install-tools - - # More dependencies with the previous gcc or some libs (gccbug stores the build command line) - rm -rf $out/bin/gccbug + postInstall = + '' + # Clean up our compatibility symlinks (see above) + for link in "''${compatibilitySymlinks[@]}"; do + echo "Removing compatibility symlink: $link" + rm -f "$link" + done + + # Move runtime libraries to lib output. + moveToOutput "lib/lib*.so*" "''${!outputLib}" + moveToOutput "lib/lib*.la" "''${!outputLib}" + moveToOutput "lib/lib*.dylib" "''${!outputLib}" + moveToOutput "lib/lib*.dll.a" "''${!outputLib}" + moveToOutput "lib/lib*.dll" "''${!outputLib}" + moveToOutput "share/gcc-*/python" "''${!outputLib}" + + if [ -z "$enableShared" ]; then + moveToOutput "lib/lib*.a" "''${!outputLib}" + fi - if type "install_name_tool"; then - for i in "''${!outputLib}"/lib/*.*.dylib "''${!outputLib}"/lib/*.so.[0-9]; do - install_name_tool -id "$i" "$i" || true - for old_path in $(otool -L "$i" | grep "$out" | awk '{print $1}'); do - new_path=`echo "$old_path" | sed "s,$out,''${!outputLib},"` - install_name_tool -change "$old_path" "$new_path" "$i" || true - done - done - fi + for i in "''${!outputLib}"/lib/*.{la,py}; do + substituteInPlace "$i" --replace "$out" "''${!outputLib}" + done - # Get rid of some "fixed" header files - rm -rfv $out/lib/gcc/*/*/include-fixed/{root,linux,sys/mount.h,bits/statx.h,pthread.h} + if [ -n "$enableMultilib" ]; then + moveToOutput "lib64/lib*.so*" "''${!outputLib}" + moveToOutput "lib64/lib*.la" "''${!outputLib}" + moveToOutput "lib64/lib*.dylib" "''${!outputLib}" + moveToOutput "lib64/lib*.dll.a" "''${!outputLib}" + moveToOutput "lib64/lib*.dll" "''${!outputLib}" - # Replace hard links for i686-pc-linux-gnu-gcc etc. with symlinks. - for i in $out/bin/*-gcc*; do - if cmp -s $out/bin/gcc $i; then - ln -sfn gcc $i - fi - done + for i in "''${!outputLib}"/lib64/*.{la,py}; do + substituteInPlace "$i" --replace "$out" "''${!outputLib}" + done + fi - for i in $out/bin/c++ $out/bin/*-c++* $out/bin/*-g++*; do - if cmp -s $out/bin/g++ $i; then - ln -sfn g++ $i - fi - done + # Remove `fixincl' to prevent a retained dependency on the + # previous gcc. + rm -rf $out/libexec/gcc/*/*/install-tools + rm -rf $out/lib/gcc/*/*/install-tools + + # More dependencies with the previous gcc or some libs (gccbug stores the build command line) + rm -rf $out/bin/gccbug + + if type "install_name_tool"; then + for i in "''${!outputLib}"/lib/*.*.dylib "''${!outputLib}"/lib/*.so.[0-9]; do + install_name_tool -id "$i" "$i" || true + for old_path in $(otool -L "$i" | grep "$out" | awk '{print $1}'); do + new_path=`echo "$old_path" | sed "s,$out,''${!outputLib},"` + install_name_tool -change "$old_path" "$new_path" "$i" || true + done + done + fi - # Two identical man pages are shipped (moving and compressing is done later) - for i in "$out"/share/man/man1/*g++.1; do - if test -e "$i"; then - man_prefix=`echo "$i" | sed "s,.*/\(.*\)g++.1,\1,"` - ln -sf "$man_prefix"gcc.1 "$i" - fi - done - ''; + # Get rid of some "fixed" header files + rm -rfv $out/lib/gcc/*/*/include-fixed/{root,linux,sys/mount.h,bits/statx.h,pthread.h} + + # Replace hard links for i686-pc-linux-gnu-gcc etc. with symlinks. + for i in $out/bin/*-gcc*; do + if cmp -s $out/bin/gcc $i; then + ln -sfn gcc $i + fi + done + + for i in $out/bin/c++ $out/bin/*-c++* $out/bin/*-g++*; do + if cmp -s $out/bin/g++ $i; then + ln -sfn g++ $i + fi + done + + # Two identical man pages are shipped (moving and compressing is done later) + for i in "$out"/share/man/man1/*g++.1; do + if test -e "$i"; then + man_prefix=`echo "$i" | sed "s,.*/\(.*\)g++.1,\1,"` + ln -sf "$man_prefix"gcc.1 "$i" + fi + done + '' + + + # Recreate the target symlink so GCC can find libgcc_s on non-split builds. + lib.optionalString (with stdenv; targetPlatform.config != hostPlatform.config) '' + ln -s $lib/lib $lib/$targetConfig/lib + ''; } // lib.optionalAttrs ((stdenv.targetPlatform.config != stdenv.hostPlatform.config) && withoutTargetLibc) { dontCheckForBrokenSymlinks = true; diff --git a/pkgs/development/compilers/gcc/common/libgcc.nix b/pkgs/development/compilers/gcc/common/libgcc.nix index 3d4bd90677632..d38be2f6b76af 100644 --- a/pkgs/development/compilers/gcc/common/libgcc.nix +++ b/pkgs/development/compilers/gcc/common/libgcc.nix @@ -105,14 +105,15 @@ lib.pipe drv + lib.optionalString enableLibGccOutput ( '' # move libgcc from lib to its own output (libgcc) - mkdir -p $libgcc/${targetPlatformSlash}lib - mv $lib/${targetPlatformSlash}lib/libgcc_s.so $libgcc/${targetPlatformSlash}lib/ - mv $lib/${targetPlatformSlash}lib/libgcc_s.so.${libgcc_s-version-major} $libgcc/${targetPlatformSlash}lib/ - ln -s $libgcc/${targetPlatformSlash}lib/libgcc_s.so $lib/${targetPlatformSlash}lib/ - ln -s $libgcc/${targetPlatformSlash}lib/libgcc_s.so.${libgcc_s-version-major} $lib/${targetPlatformSlash}lib/ + mkdir -p $libgcc/lib + mv $lib/lib/libgcc_s.so $libgcc/lib/ + mv $lib/lib/libgcc_s.so.${libgcc_s-version-major} $libgcc/lib/ + ln -s $libgcc/lib/libgcc_s.so $lib/lib/ + ln -s $libgcc/lib/libgcc_s.so.${libgcc_s-version-major} $lib/lib/ '' + lib.optionalString (targetPlatformSlash != "") '' - ln -s ${targetPlatformSlash}lib $libgcc/lib + mkdir -p $libgcc/${targetPlatformSlash} + ln -s $libgcc/lib $libgcc/${targetPlatformSlash}lib '' # # Nixpkgs ordinarily turns dynamic linking into pseudo-static linking: From 97a3367a330c6648d2bdf6036d960aface807651 Mon Sep 17 00:00:00 2001 From: K900 Date: Sun, 2 Feb 2025 09:49:23 +0300 Subject: [PATCH 113/343] Revert "gcc: disable symlink checks on cross + nolibc for now" This reverts commit 3fd43d5d7494068b2c8a9d904406f64d430dd029. The proper fix is now in. --- pkgs/development/compilers/gcc/common/builder.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/development/compilers/gcc/common/builder.nix b/pkgs/development/compilers/gcc/common/builder.nix index 1cb2933977de3..1a99835aa2bd5 100644 --- a/pkgs/development/compilers/gcc/common/builder.nix +++ b/pkgs/development/compilers/gcc/common/builder.nix @@ -3,7 +3,6 @@ stdenv, enableMultilib, targetConfig, - withoutTargetLibc, }: let @@ -342,7 +341,4 @@ originalAttrs: ln -s $lib/lib $lib/$targetConfig/lib ''; } - // lib.optionalAttrs ((stdenv.targetPlatform.config != stdenv.hostPlatform.config) && withoutTargetLibc) { - dontCheckForBrokenSymlinks = true; - } )) From ef8b15027cb12180863e85f1c8f56643f25ef03c Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sun, 2 Feb 2025 22:03:13 +0000 Subject: [PATCH 114/343] SDL2: 2.30.11 -> 2.30.12 Changes: https://github.com/libsdl-org/SDL/releases/tag/release-2.30.12 --- pkgs/development/libraries/SDL2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/SDL2/default.nix b/pkgs/development/libraries/SDL2/default.nix index a1db79c06a866..4d4b446af7426 100644 --- a/pkgs/development/libraries/SDL2/default.nix +++ b/pkgs/development/libraries/SDL2/default.nix @@ -70,13 +70,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "SDL2"; - version = "2.30.11"; + version = "2.30.12"; src = fetchFromGitHub { owner = "libsdl-org"; repo = "SDL"; rev = "release-${finalAttrs.version}"; - hash = "sha256-2NVZNqYhnAsljuF0BhBSJ5HmE9cS41gJep4Q3VxUGkY="; + hash = "sha256-9f7V15p8Cso1TVxcd7bEFGO3C3oIhQikyLh4pWXLaiA="; }; dontDisableStatic = if withStatic then 1 else 0; outputs = [ From 3250c94d987c5ebcf24a5bfcd3c7de5ec43e3e84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luka=20Bla=C5=A1kovi=C4=87?= Date: Sun, 2 Feb 2025 10:55:20 +0000 Subject: [PATCH 115/343] cargo,clippy,rustfmt,rustc: 1.84.0 -> 1.84.1 --- pkgs/development/compilers/rust/1_84.nix | 32 ++++++++++++------------ 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/pkgs/development/compilers/rust/1_84.nix b/pkgs/development/compilers/rust/1_84.nix index 6b98d8817bccd..5a076c84c88c5 100644 --- a/pkgs/development/compilers/rust/1_84.nix +++ b/pkgs/development/compilers/rust/1_84.nix @@ -47,8 +47,8 @@ let in import ./default.nix { - rustcVersion = "1.84.0"; - rustcSha256 = "Fc7nOVsH/94CIGBFWzFANm7DoSy76o8e8v83GpzKUb8="; + rustcVersion = "1.84.1"; + rustcSha256 = "Xi+11JYopUn3Zxssz5hVqzef1EKDGnwq8W4M3MMbs3U="; llvmSharedForBuild = llvmSharedFor pkgsBuildBuild; llvmSharedForHost = llvmSharedFor pkgsBuildHost; @@ -106,23 +106,23 @@ import ./default.nix # Note: the version MUST be the same version that we are building. Upstream # ensures that each released compiler can compile itself: # https://github.com/NixOS/nixpkgs/pull/351028#issuecomment-2438244363 - bootstrapVersion = "1.84.0"; + bootstrapVersion = "1.84.1"; # fetch hashes by running `print-hashes.sh ${bootstrapVersion}` bootstrapHashes = { - i686-unknown-linux-gnu = "3f9fea653bc68139fa1476f9b00ec55a2637650960872029cfc91ea729d0fd82"; - x86_64-unknown-linux-gnu = "de2b041a6e62ec2c37c517eb58518f68fde5fc2f076218393ae06145d92a5682"; - x86_64-unknown-linux-musl = "0e98d242074f566f72bf48dfbd6c8457f6cbc02be7e8e8dac04347ad15ad3f41"; - arm-unknown-linux-gnueabihf = "e571a4e57e60360e0783cd9d4bcc10290394cfd312ede5e4fcc81aebd0625307"; - armv7-unknown-linux-gnueabihf = "b63040017c831aa607d18287d8af6548daca038e9bb95030e0e1f0d45c9c471f"; - aarch64-unknown-linux-gnu = "282d281cb389bdc2c0671c2a74eeda46e010a158810d2137c3a948ae6c713543"; - aarch64-unknown-linux-musl = "1055e2c6f8e3823f5213eb55eb77e63cf6b9bd6eb243897dae7259f4d8ab8c54"; - x86_64-apple-darwin = "eafe087277ad8d7473f978d0779b4504d5b8064a781784aebd3e33c2541a13ce"; - aarch64-apple-darwin = "506dfc14115d2efa96fad9fa542d67027525aa46882a8e1ffb41e891737b689b"; - powerpc64le-unknown-linux-gnu = "26a60519303194e245968b2d34d405a49e20bdb86b240ab230e973e03c283c86"; - riscv64gc-unknown-linux-gnu = "4534d86f55f1851c90097bfc03e38ab88ba6893940a7dcb6dce9139f0aa377fa"; - s390x-unknown-linux-gnu = "76099d34b8e5ae4d47e55e7bd472918cde2c2945b97dca926c739082c051ab2b"; - x86_64-unknown-freebsd = "b484de5908612b3ea132bdd76afde1c980c6bf70cf6f1b27e13d74b3729136b9"; + i686-unknown-linux-gnu = "9a2f107b35ca55439a7de0a74a893ff285766e086f96fb1d7049301b196c5da8"; + x86_64-unknown-linux-gnu = "106c89f23ce1c763fcbea8e2714b2ba869bf7af70804813987a4483896398933"; + x86_64-unknown-linux-musl = "e52236e269ce8f713691d78895365a376002980c011b4bbdd27e4bee0ec1ee9a"; + arm-unknown-linux-gnueabihf = "02273a6326639dedf0c627421851f85b88884d3811de2a7390f189575d23b4b4"; + armv7-unknown-linux-gnueabihf = "434895ed6cf922a3c0fe11a6af7f4e382093cc9edf6c250e49fbfcecd25ada59"; + aarch64-unknown-linux-gnu = "be89f6ad9b70cc4b25182ae299f94ab047a713a51fddf95284823c8afe4aef85"; + aarch64-unknown-linux-musl = "8a80398ed1942e8020599b8f1c53ae9775a6c8bed6af252c48a5fb967accd5f1"; + x86_64-apple-darwin = "c2c80ffef15946abfb08dac6ad54c07f9d95ae56c65fc94c4c10e07b60acb883"; + aarch64-apple-darwin = "49be10fa1a1de14e36d37cc412b7c44e01896c0a86a2d0d35ee26704a59adba7"; + powerpc64le-unknown-linux-gnu = "7c56d9b5e2dfbd6a0a18307d96b703d6d70d1cf7bb337ea8865dfdd5e0a38d84"; + riscv64gc-unknown-linux-gnu = "0e07fe7a0df2220cea37581061ed52576a44dec10866ec8f860f71a98bf41412"; + s390x-unknown-linux-gnu = "9d6ab731c0cb315349cf5cbbeb88149adbd7165dbeec76f7c723d0b9796c4422"; + x86_64-unknown-freebsd = "7aa4089315d3ac9eefd7f885283df99b2c4cb930316f0be3bf867d41217b6d05"; }; selectRustPackage = pkgs: pkgs.rust_1_84; From 0394aa35edc9ed4dcec22d2023a2d4389333a31d Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 3 Feb 2025 11:03:06 +0100 Subject: [PATCH 116/343] python3Packages.pandas: fix build for musl Since 8ed4a0d4d28d ("ffado: unpin python311"), pandas is necessary to build ffado. This patch will be included in the next release of pandas. --- pkgs/development/python-modules/pandas/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/development/python-modules/pandas/default.nix b/pkgs/development/python-modules/pandas/default.nix index 241f60fa75fed..2a96029a4139e 100644 --- a/pkgs/development/python-modules/pandas/default.nix +++ b/pkgs/development/python-modules/pandas/default.nix @@ -3,6 +3,7 @@ stdenv, buildPythonPackage, fetchFromGitHub, + fetchpatch, pythonOlder, # build-system @@ -76,6 +77,14 @@ let hash = "sha256-6YUROcqOV2P1AbJF9IMBIqTt7/PSTeXDwGgE4uI9GME="; }; + patches = [ + (fetchpatch { + name = "musl.patch"; + url = "https://github.com/pandas-dev/pandas/commit/1e487982ff7501f07e2bba7a7d924fb92b3d5c7f.patch"; + hash = "sha256-F1pVce1W951Ea82Ux198e5fBFH6kDOG+EeslDTYbjio="; + }) + ]; + postPatch = '' substituteInPlace pyproject.toml \ --replace-fail "meson-python==0.13.1" "meson-python>=0.13.1" \ From 456cfd0fdb482a6b9248a96165bca80f14c91637 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sun, 2 Feb 2025 23:51:09 +0100 Subject: [PATCH 117/343] spidermonkey_78: drop --- .../interpreters/spidermonkey/78.nix | 4 - .../spidermonkey/add-riscv64-support.patch | 123 ------------------ .../interpreters/spidermonkey/common.nix | 46 +------ pkgs/top-level/aliases.nix | 3 +- pkgs/top-level/all-packages.nix | 4 - 5 files changed, 6 insertions(+), 174 deletions(-) delete mode 100644 pkgs/development/interpreters/spidermonkey/78.nix delete mode 100644 pkgs/development/interpreters/spidermonkey/add-riscv64-support.patch diff --git a/pkgs/development/interpreters/spidermonkey/78.nix b/pkgs/development/interpreters/spidermonkey/78.nix deleted file mode 100644 index 05124a417fef9..0000000000000 --- a/pkgs/development/interpreters/spidermonkey/78.nix +++ /dev/null @@ -1,4 +0,0 @@ -import ./common.nix { - version = "78.15.0"; - hash = "sha512-rD3nNbJGzk8OFhnNJmQyH/o3QkDOaEPnhdeaNQ3DDJZ5lrvMXjswHLPYIsqYHL6hFnWPxBIvFzjXXd/RFltjeA==="; -} diff --git a/pkgs/development/interpreters/spidermonkey/add-riscv64-support.patch b/pkgs/development/interpreters/spidermonkey/add-riscv64-support.patch deleted file mode 100644 index 9d5d7c5507dc1..0000000000000 --- a/pkgs/development/interpreters/spidermonkey/add-riscv64-support.patch +++ /dev/null @@ -1,123 +0,0 @@ -# HG changeset patch -# User John Paul Adrian Glaubitz -# Date 1592464269 0 -# Thu Jun 18 07:11:09 2020 +0000 -# Node ID 5de7d747a962df5f8aefc016a62d7270ac18879e -# Parent e4b11f027efc1f8c2710ae3f52487a8f10a8fb39 -Bug 1318905 - build: Add riscv64 as target architecture to mozbuild r=glandium - -Adds the basic definitions for riscv64 to mozbuild, allowing to build Spidermonkey. - -Differential Revision: https://phabricator.services.mozilla.com/D78623 - -diff -r e4b11f027efc -r 5de7d747a962 build/moz.configure/init.configure ---- a/build/moz.configure/init.configure Sun May 31 17:11:57 2020 +0000 -+++ b/build/moz.configure/init.configure Thu Jun 18 07:11:09 2020 +0000 -@@ -741,6 +741,9 @@ - elif cpu.startswith('aarch64'): - canonical_cpu = 'aarch64' - endianness = 'little' -+ elif cpu in ('riscv64', 'riscv64gc'): -+ canonical_cpu = 'riscv64' -+ endianness = 'little' - elif cpu == 'sh4': - canonical_cpu = 'sh4' - endianness = 'little' -diff -r e4b11f027efc -r 5de7d747a962 python/mozbuild/mozbuild/configure/constants.py ---- a/python/mozbuild/mozbuild/configure/constants.py Sun May 31 17:11:57 2020 +0000 -+++ b/python/mozbuild/mozbuild/configure/constants.py Thu Jun 18 07:11:09 2020 +0000 -@@ -49,6 +49,7 @@ - 'mips64': 64, - 'ppc': 32, - 'ppc64': 64, -+ 'riscv64': 64, - 's390': 32, - 's390x': 64, - 'sh4': 32, -@@ -87,6 +88,7 @@ - ('sparc', '__sparc__'), - ('mips64', '__mips64'), - ('mips32', '__mips__'), -+ ('riscv64', '__riscv && __riscv_xlen == 64'), - ('sh4', '__sh__'), - )) - -diff -r e4b11f027efc -r 5de7d747a962 python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py ---- a/python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py Sun May 31 17:11:57 2020 +0000 -+++ b/python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py Thu Jun 18 07:11:09 2020 +0000 -@@ -1208,6 +1208,10 @@ - 'mips-unknown-linux-gnu': big_endian + { - '__mips__': 1, - }, -+ 'riscv64-unknown-linux-gnu': little_endian + { -+ '__riscv': 1, -+ '__riscv_xlen': 64, -+ }, - 'sh4-unknown-linux-gnu': little_endian + { - '__sh__': 1, - }, -# HG changeset patch -# User John Paul Adrian Glaubitz -# Date 1592464269 0 -# Thu Jun 18 07:11:09 2020 +0000 -# Node ID e3d924797cb2d508ff938414168e98ccf66f07fe -# Parent 5de7d747a962df5f8aefc016a62d7270ac18879e -Bug 1318905 - js:jit: Enable AtomicOperations-feeling-lucky.h on riscv64 r=lth - -This allows the build on riscv64 to use the atomic operations provided by GCC. - -Differential Revision: https://phabricator.services.mozilla.com/D78624 - -diff -r 5de7d747a962 -r e3d924797cb2 js/src/jit/AtomicOperations.h ---- a/js/src/jit/AtomicOperations.h Thu Jun 18 07:11:09 2020 +0000 -+++ b/js/src/jit/AtomicOperations.h Thu Jun 18 07:11:09 2020 +0000 -@@ -391,7 +391,7 @@ - #elif defined(__ppc__) || defined(__PPC__) || defined(__sparc__) || \ - defined(__ppc64__) || defined(__PPC64__) || defined(__ppc64le__) || \ - defined(__PPC64LE__) || defined(__alpha__) || defined(__hppa__) || \ -- defined(__sh__) || defined(__s390__) || defined(__s390x__) -+ defined(__sh__) || defined(__s390__) || defined(__s390x__) || defined(__riscv) - # include "jit/shared/AtomicOperations-feeling-lucky.h" - #else - # error "No AtomicOperations support provided for this platform" -diff -r 5de7d747a962 -r e3d924797cb2 js/src/jit/shared/AtomicOperations-feeling-lucky-gcc.h ---- a/js/src/jit/shared/AtomicOperations-feeling-lucky-gcc.h Thu Jun 18 07:11:09 2020 +0000 -+++ b/js/src/jit/shared/AtomicOperations-feeling-lucky-gcc.h Thu Jun 18 07:11:09 2020 +0000 -@@ -63,6 +63,11 @@ - # define HAS_64BIT_LOCKFREE - #endif - -+#if defined(__riscv) && __riscv_xlen == 64 -+# define HAS_64BIT_ATOMICS -+# define HAS_64BIT_LOCKFREE -+#endif -+ - #ifdef __sparc__ - # ifdef __LP64__ - # define HAS_64BIT_ATOMICS -# HG changeset patch -# User John Paul Adrian Glaubitz -# Date 1592464269 0 -# Thu Jun 18 07:11:09 2020 +0000 -# Node ID 3f652d12b8bc0bd213020d488ecb4d3710bb11fa -# Parent e3d924797cb2d508ff938414168e98ccf66f07fe -Bug 1318905 - mfbt:tests: Define RETURN_INSTR for riscv64 in TestPoisonArea r=glandium - -Define RETURN_INSTR for riscv64 in TestPoisonArea, i.e. the riscv64 assembly -opcodes for "ret ; ret". - -Differential Revision: https://phabricator.services.mozilla.com/D78625 - -diff -r e3d924797cb2 -r 3f652d12b8bc mfbt/tests/TestPoisonArea.cpp ---- a/mfbt/tests/TestPoisonArea.cpp Thu Jun 18 07:11:09 2020 +0000 -+++ b/mfbt/tests/TestPoisonArea.cpp Thu Jun 18 07:11:09 2020 +0000 -@@ -132,6 +132,9 @@ - #elif defined _ARCH_PPC || defined _ARCH_PWR || defined _ARCH_PWR2 - # define RETURN_INSTR 0x4E800020 /* blr */ - -+#elif defined __riscv -+# define RETURN_INSTR 0x80828082 /* ret; ret */ -+ - #elif defined __sparc || defined __sparcv9 - # define RETURN_INSTR 0x81c3e008 /* retl */ - diff --git a/pkgs/development/interpreters/spidermonkey/common.nix b/pkgs/development/interpreters/spidermonkey/common.nix index ba6861839386e..f4f0024107ba4 100644 --- a/pkgs/development/interpreters/spidermonkey/common.nix +++ b/pkgs/development/interpreters/spidermonkey/common.nix @@ -50,24 +50,7 @@ stdenv.mkDerivation (finalAttrs: rec { }; patches = - lib.optionals (lib.versionOlder version "91") [ - # Fix build failure on armv7l using Debian patch - # Upstream bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1526653 - (fetchpatch { - url = "https://salsa.debian.org/mozilla-team/firefox/commit/fd6847c9416f9eebde636e21d794d25d1be8791d.patch"; - hash = "sha512-K8U3Qyo7g4si2r/8kJdXyRoTrDHAY48x/YJ7YL+YBwlpfNQcHxX+EZvhRzW8FHYW+f7kOnJu9QykhE8PhSQ9zQ=="; - }) - - # Remove this when updating to 79 - The patches are already applied upstream - # https://bugzilla.mozilla.org/show_bug.cgi?id=1318905 - - # Combination of 3 changesets, modified to apply on 78: - # - https://hg.mozilla.org/mozilla-central/rev/06d7e1b6b7e7 - # - https://hg.mozilla.org/mozilla-central/rev/ec48f15d085c - # - https://hg.mozilla.org/mozilla-central/rev/6803dda74d33 - ./add-riscv64-support.patch - ] - ++ lib.optionals (lib.versionAtLeast version "102" && lib.versionOlder version "128") [ + lib.optionals (lib.versionAtLeast version "102" && lib.versionOlder version "128") [ # use pkg-config at all systems ./always-check-for-pkg-config.patch ./allow-system-s-nspr-and-icu-on-bootstrapped-sysroot.patch @@ -95,17 +78,9 @@ stdenv.mkDerivation (finalAttrs: rec { m4 perl pkg-config - # 78 requires python up to 3.9 # 91 does not build with python 3.12: ModuleNotFoundError: No module named 'six.moves' # 102 does not build with python 3.12: ModuleNotFoundError: No module named 'distutils' - ( - if lib.versionOlder version "91" then - python39 - else if lib.versionOlder version "115" then - python311 - else - python3 - ) + (if lib.versionOlder version "115" then python311 else python3) rustc rustc.llvmPackages.llvm # for llvm-objdump which @@ -115,17 +90,13 @@ stdenv.mkDerivation (finalAttrs: rec { rust-cbindgen rustPlatform.bindgenHook ] - ++ lib.optionals (lib.versionOlder version "91") [ - autoconf213 - yasm # to buid icu? seems weird - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ xcbuild ]; buildInputs = [ - (if lib.versionOlder version "91" then icu67 else icu) + icu nspr readline zlib @@ -174,12 +145,6 @@ stdenv.mkDerivation (finalAttrs: rec { enableParallelBuilding = true; - # cc-rs insists on using -mabi=lp64 (soft-float) for riscv64, - # while we have a double-float toolchain - env.NIX_CFLAGS_COMPILE = lib.optionalString ( - with stdenv.hostPlatform; isRiscV && is64bit && lib.versionOlder version "91" - ) "-mabi=lp64d"; - postPatch = lib.optionalString (lib.versionOlder version "102") '' # This patch is a manually applied fix of # https://bugzilla.mozilla.org/show_bug.cgi?id=1644600 @@ -194,9 +159,6 @@ stdenv.mkDerivation (finalAttrs: rec { lib.optionalString (lib.versionAtLeast version "128") '' export MOZBUILD_STATE_PATH=$TMPDIR/mozbuild '' - + lib.optionalString (lib.versionOlder version "91") '' - export CXXFLAGS="-fpermissive" - '' + '' export LIBXUL_DIST=$out export PYTHON="${buildPackages.python3.interpreter}" @@ -238,7 +200,7 @@ stdenv.mkDerivation (finalAttrs: rec { meta = with lib; { description = "Mozilla's JavaScript engine written in C/C++"; homepage = "https://spidermonkey.dev/"; - license = licenses.mpl20; # TODO: MPL/GPL/LGPL tri-license for 78. + license = licenses.mpl20; maintainers = with maintainers; [ abbradar lostnet diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index e4a46966569c3..abaed10fbf9c6 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1309,7 +1309,8 @@ mapAliases { solana-validator = throw "'solana-validator' is obsoleted by solana-cli, which also includes the validator binary"; # Added 2024-12-20 spectral = throw "'spectral' has been renamed to/replaced by 'neochat'"; # Converted to throw 2024-10-17 # spidermonkey is not ABI upwards-compatible, so only allow this for nix-shell - spidermonkey = throw "'spidermonkey' has been renamed to/replaced by 'spidermonkey_78'"; # Converted to throw 2024-10-17 + spidermonkey = throw "'spidermonkey' has been renamed to/replaced by 'spidermonkey_91'"; # Converted to throw 2024-10-17 + spidermonkey_78 = throw "'spidermonkey_78' has been removed because it was unused."; # Added 2025-02-02 spidermonkey_102 = throw "'spidermonkey_102' is EOL since 2023/03"; # Added 2024-08-07 spotify-unwrapped = spotify; # added 2022-11-06 spring-boot = throw "'spring-boot' has been renamed to/replaced by 'spring-boot-cli'"; # Converted to throw 2024-10-17 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4d77737cb5907..ab5d97c9cd7cf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7349,9 +7349,6 @@ with pkgs; inherit ({ - spidermonkey_78 = callPackage ../development/interpreters/spidermonkey/78.nix { - inherit (darwin) libobjc; - }; spidermonkey_91 = callPackage ../development/interpreters/spidermonkey/91.nix { inherit (darwin) libobjc; }; @@ -7362,7 +7359,6 @@ with pkgs; inherit (darwin) libobjc; }; }) - spidermonkey_78 spidermonkey_91 spidermonkey_115 spidermonkey_128 From 4f680c2bf76e59a75562d42c4f95c14b25667871 Mon Sep 17 00:00:00 2001 From: Mitchell Pleune Date: Sun, 2 Feb 2025 18:30:38 +0000 Subject: [PATCH 118/343] glog: patch /usr/bin/true in tests Tests appear to use `/usr/bin/true` as a fake mailer, which causes an error in the check phase. This does not cause the tests to fail, and this is why the replace is a warn and not fail. Patching it nonetheless. --- pkgs/by-name/gl/glog/package.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gl/glog/package.nix b/pkgs/by-name/gl/glog/package.nix index ed30b55a60f4a..e6b0ff6c7795d 100644 --- a/pkgs/by-name/gl/glog/package.nix +++ b/pkgs/by-name/gl/glog/package.nix @@ -6,9 +6,10 @@ gflags, gtest, perl, + pkgsBuildHost, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: rec { pname = "glog"; version = "0.7.1"; @@ -19,6 +20,11 @@ stdenv.mkDerivation rec { sha256 = "sha256-+nwWP6VBmhgU7GCPSEGUzvUSCc48wXME181WpJ5ABP4="; }; + postPatch = lib.optionalString finalAttrs.doCheck '' + substituteInPlace src/logging_unittest.cc \ + --replace-warn "/usr/bin/true" "${pkgsBuildHost.coreutils}/bin/true" + ''; + nativeBuildInputs = [ cmake ]; buildInputs = [ gtest ]; @@ -90,4 +96,4 @@ stdenv.mkDerivation rec { r-burns ]; }; -} +}) From c540331279eeb13074c6f7a09f83082f6dca112c Mon Sep 17 00:00:00 2001 From: Yueh-Shun Li Date: Thu, 23 Jan 2025 00:22:22 +0800 Subject: [PATCH 119/343] buildPython*: make name-relaed attributes overridable via overrideAttrs Make name, pname and version overridable via overrideAttrs for Python packgaes constructed with buildPython*. --- .../interpreters/python/mk-python-derivation.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/development/interpreters/python/mk-python-derivation.nix b/pkgs/development/interpreters/python/mk-python-derivation.nix index 3e0cbdcb4212f..fe2e79a72ef45 100644 --- a/pkgs/development/interpreters/python/mk-python-derivation.nix +++ b/pkgs/development/interpreters/python/mk-python-derivation.nix @@ -120,8 +120,6 @@ let in { - name ? "${attrs.pname}-${attrs.version}", - # Build-time dependencies for the package nativeBuildInputs ? [ ], @@ -228,7 +226,7 @@ let throwMismatch = attrName: drv: let - myName = "'${namePrefix}${name}'"; + myName = "'${finalAttrs.name}'"; theirName = "'${drv.name}'"; optionalLocation = let @@ -280,7 +278,7 @@ let (cleanAttrs attrs) // { - name = namePrefix + name; + name = namePrefix + attrs.name or "${finalAttrs.pname}-${finalAttrs.version}"; nativeBuildInputs = [ From 1d6fd5edf03d3b7d3e4eab7750e1be41477a9ea9 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Mon, 3 Feb 2025 22:31:28 +0000 Subject: [PATCH 120/343] audit: 4.0.2 -> 4.0.3 Changes: https://github.com/linux-audit/audit-userspace/releases/tag/v4.0.3 --- pkgs/by-name/au/audit/package.nix | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/pkgs/by-name/au/audit/package.nix b/pkgs/by-name/au/audit/package.nix index f68c340e7c2c0..0ad9ac9f055af 100644 --- a/pkgs/by-name/au/audit/package.nix +++ b/pkgs/by-name/au/audit/package.nix @@ -1,8 +1,7 @@ { lib, stdenv, - fetchurl, - fetchpatch, + fetchFromGitHub, autoreconfHook, bash, buildPackages, @@ -18,21 +17,15 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "audit"; - version = "4.0.2"; + version = "4.0.3"; - src = fetchurl { - url = "https://people.redhat.com/sgrubb/audit/audit-${finalAttrs.version}.tar.gz"; - hash = "sha256-1dG11Q7kotDReHW8aua9an1bNNlVfqhHo5+uxTH6qgo="; + src = fetchFromGitHub { + owner = "linux-audit"; + repo = "audit-userspace"; + tag = "v${finalAttrs.version}"; + hash = "sha256-+M5Nai/ruK16udsHcMwv1YoVQbCLKNuz/4FCXaLbiCw="; }; - patches = [ - (fetchpatch { - name = "static.patch"; - url = "https://github.com/linux-audit/audit-userspace/commit/a89664b45c30a853a6f80b19730984bd78432142.patch"; - hash = "sha256-HsaL9Bfo1MQ1JBKIS9ckNTapGk5eshjWWKh4M+e+Y9c="; - }) - ]; - postPatch = '' substituteInPlace bindings/swig/src/auditswig.i \ --replace-fail "/usr/include/linux/audit.h" \ From 4134fdc75cae752e1f5ea1843b67650c50ba618b Mon Sep 17 00:00:00 2001 From: Yueh-Shun Li Date: Mon, 27 Jan 2025 02:01:28 +0800 Subject: [PATCH 121/343] buildPython*: always specify attributes catchConflicts and dontWrapPythonPrograms Always specify catchConflicts and dontWrapPythonPrograms. Make them overrideAttrs-overridable. --- .../interpreters/python/mk-python-derivation.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/development/interpreters/python/mk-python-derivation.nix b/pkgs/development/interpreters/python/mk-python-derivation.nix index 3e0cbdcb4212f..c3e986872ae43 100644 --- a/pkgs/development/interpreters/python/mk-python-derivation.nix +++ b/pkgs/development/interpreters/python/mk-python-derivation.nix @@ -100,8 +100,6 @@ let "nativeCheckInputs" "doCheck" "doInstallCheck" - "dontWrapPythonPrograms" - "catchConflicts" "pyproject" "format" "disabledTestPaths" @@ -282,6 +280,8 @@ let name = namePrefix + name; + inherit catchConflicts; + nativeBuildInputs = [ python @@ -289,7 +289,7 @@ let ensureNewerSourcesForZipFilesHook # move to wheel installer (pip) or builder (setuptools, flit, ...)? pythonRemoveTestsDirHook ] - ++ optionals (catchConflicts && !isBootstrapPackage && !isSetuptoolsDependency) [ + ++ optionals (finalAttrs.catchConflicts && !isBootstrapPackage && !isSetuptoolsDependency) [ # # 1. When building a package that is also part of the bootstrap chain, we # must ignore conflicts after installation, because there will be one with @@ -386,8 +386,10 @@ let nativeInstallCheckInputs = nativeCheckInputs; installCheckInputs = checkInputs; + inherit dontWrapPythonPrograms; + postFixup = - optionalString (!dontWrapPythonPrograms) '' + optionalString (!finalAttrs.dontWrapPythonPrograms) '' wrapPythonPrograms '' + attrs.postFixup or ""; From 56f7b2149d9920a302cb81f66eae634c32d02926 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 4 Feb 2025 00:57:44 +0000 Subject: [PATCH 122/343] liburing: 2.8 -> 2.9 --- pkgs/by-name/li/liburing/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/li/liburing/package.nix b/pkgs/by-name/li/liburing/package.nix index 744f05c3be226..ae3683b51b80c 100644 --- a/pkgs/by-name/li/liburing/package.nix +++ b/pkgs/by-name/li/liburing/package.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "liburing"; - version = "2.8"; + version = "2.9"; src = fetchFromGitHub { owner = "axboe"; repo = "liburing"; tag = "liburing-${version}"; - hash = "sha256-10zmoMDzO41oNRVXE/6FzDGPVRVJTJTARVUmc1b7f+o="; + hash = "sha256-zOC53i52YJsH3AQIy4afjTGlX/IvVnW2QnYOppFxKiI="; }; separateDebugInfo = true; From 154f977ac6fd9fda34545f9117bc4724cac8d1bf Mon Sep 17 00:00:00 2001 From: DavHau Date: Tue, 4 Feb 2025 12:02:15 +0700 Subject: [PATCH 123/343] rust/hooks: move tests to hooks and add to passthru --- pkgs/build-support/rust/hooks/default.nix | 38 ++++++++++++++++++- .../rust/hooks/test}/default.nix | 10 ++--- .../test/example-rust-project}/Cargo.lock | 0 .../test/example-rust-project}/Cargo.toml | 0 .../test/example-rust-project}/src/hello.rs | 0 .../test/example-rust-project}/src/lib.rs | 0 .../test/example-rust-project}/src/main.rs | 0 .../example-rust-project}/tests/my_test.rs | 0 pkgs/test/default.nix | 2 +- 9 files changed, 43 insertions(+), 7 deletions(-) rename pkgs/{test/rust-hooks => build-support/rust/hooks/test}/default.nix (94%) rename pkgs/{test/rust-hooks/hello => build-support/rust/hooks/test/example-rust-project}/Cargo.lock (100%) rename pkgs/{test/rust-hooks/hello => build-support/rust/hooks/test/example-rust-project}/Cargo.toml (100%) rename pkgs/{test/rust-hooks/hello => build-support/rust/hooks/test/example-rust-project}/src/hello.rs (100%) rename pkgs/{test/rust-hooks/hello => build-support/rust/hooks/test/example-rust-project}/src/lib.rs (100%) rename pkgs/{test/rust-hooks/hello => build-support/rust/hooks/test/example-rust-project}/src/main.rs (100%) rename pkgs/{test/rust-hooks/hello => build-support/rust/hooks/test/example-rust-project}/tests/my_test.rs (100%) diff --git a/pkgs/build-support/rust/hooks/default.nix b/pkgs/build-support/rust/hooks/default.nix index f8feb79000abc..76baa7d18168d 100644 --- a/pkgs/build-support/rust/hooks/default.nix +++ b/pkgs/build-support/rust/hooks/default.nix @@ -17,8 +17,9 @@ # `target/` from which to copy the build artifacts. It is derived # from a stdenv platform (or a JSON file). target ? stdenv.targetPlatform.rust.cargoShortTarget, + tests, + pkgsCross, }: - { cargoBuildHook = callPackage ( { }: @@ -27,6 +28,13 @@ substitutions = { inherit (stdenv.targetPlatform.rust) rustcTarget; }; + passthru.tests = + { + test = tests.rust-hooks.cargoBuildHook; + } + // lib.optionalAttrs (stdenv.isLinux) { + testCross = pkgsCross.riscv64.tests.rust-hooks.cargoBuildHook; + }; } ./cargo-build-hook.sh ) { }; @@ -37,6 +45,13 @@ substitutions = { inherit (stdenv.targetPlatform.rust) rustcTarget; }; + passthru.tests = + { + test = tests.rust-hooks.cargoCheckHook; + } + // lib.optionalAttrs (stdenv.isLinux) { + testCross = pkgsCross.riscv64.tests.rust-hooks.cargoCheckHook; + }; } ./cargo-check-hook.sh ) { }; @@ -47,6 +62,13 @@ substitutions = { targetSubdirectory = target; }; + passthru.tests = + { + test = tests.rust-hooks.cargoInstallHook; + } + // lib.optionalAttrs (stdenv.isLinux) { + testCross = pkgsCross.riscv64.tests.rust-hooks.cargoInstallHook; + }; } ./cargo-install-hook.sh ) { }; @@ -58,6 +80,13 @@ substitutions = { inherit (stdenv.targetPlatform.rust) rustcTarget; }; + passthru.tests = + { + test = tests.rust-hooks.cargoNextestHook; + } + // lib.optionalAttrs (stdenv.isLinux) { + testCross = pkgsCross.riscv64.tests.rust-hooks.cargoNextestHook; + }; } ./cargo-nextest-hook.sh ) { }; @@ -86,6 +115,13 @@ }crt-static" ] ''; }; + passthru.tests = + { + test = tests.rust-hooks.cargoSetupHook; + } + // lib.optionalAttrs (stdenv.isLinux) { + testCross = pkgsCross.riscv64.tests.rust-hooks.cargoSetupHook; + }; } ./cargo-setup-hook.sh ) { }; diff --git a/pkgs/test/rust-hooks/default.nix b/pkgs/build-support/rust/hooks/test/default.nix similarity index 94% rename from pkgs/test/rust-hooks/default.nix rename to pkgs/build-support/rust/hooks/test/default.nix index edd2ee29e16dd..774f0ee548604 100644 --- a/pkgs/test/rust-hooks/default.nix +++ b/pkgs/build-support/rust/hooks/test/default.nix @@ -11,7 +11,7 @@ */ cargoSetupHook = stdenv.mkDerivation { name = "test-cargoSetupHook"; - src = ./hello; + src = ./example-rust-project; cargoVendorDir = "hello"; nativeBuildInputs = [ rustPlatform.cargoSetupHook @@ -28,7 +28,7 @@ cargoBuildHook = stdenv.mkDerivation { name = "test-cargoBuildHook"; - src = ./hello; + src = ./example-rust-project; cargoBuildType = "release"; "CARGO_TARGET_${stdenv.hostPlatform.rust.cargoEnvVarTarget}_LINKER" = "${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc"; @@ -44,7 +44,7 @@ cargoInstallHook = stdenv.mkDerivation { name = "test-cargoInstallHook"; - src = ./hello; + src = ./example-rust-project; cargoBuildType = "release"; "CARGO_TARGET_${stdenv.hostPlatform.rust.cargoEnvVarTarget}_LINKER" = "${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc"; @@ -60,7 +60,7 @@ cargoCheckHook = stdenv.mkDerivation { name = "test-cargoCheckHook"; - src = ./hello; + src = ./example-rust-project; cargoBuildType = "release"; "CARGO_TARGET_${stdenv.hostPlatform.rust.cargoEnvVarTarget}_LINKER" = "${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc"; @@ -82,7 +82,7 @@ cargoNextestHook = stdenv.mkDerivation { name = "test-cargoNextestHook"; - src = ./hello; + src = ./example-rust-project; cargoBuildType = "release"; "CARGO_TARGET_${stdenv.hostPlatform.rust.cargoEnvVarTarget}_LINKER" = "${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc"; diff --git a/pkgs/test/rust-hooks/hello/Cargo.lock b/pkgs/build-support/rust/hooks/test/example-rust-project/Cargo.lock similarity index 100% rename from pkgs/test/rust-hooks/hello/Cargo.lock rename to pkgs/build-support/rust/hooks/test/example-rust-project/Cargo.lock diff --git a/pkgs/test/rust-hooks/hello/Cargo.toml b/pkgs/build-support/rust/hooks/test/example-rust-project/Cargo.toml similarity index 100% rename from pkgs/test/rust-hooks/hello/Cargo.toml rename to pkgs/build-support/rust/hooks/test/example-rust-project/Cargo.toml diff --git a/pkgs/test/rust-hooks/hello/src/hello.rs b/pkgs/build-support/rust/hooks/test/example-rust-project/src/hello.rs similarity index 100% rename from pkgs/test/rust-hooks/hello/src/hello.rs rename to pkgs/build-support/rust/hooks/test/example-rust-project/src/hello.rs diff --git a/pkgs/test/rust-hooks/hello/src/lib.rs b/pkgs/build-support/rust/hooks/test/example-rust-project/src/lib.rs similarity index 100% rename from pkgs/test/rust-hooks/hello/src/lib.rs rename to pkgs/build-support/rust/hooks/test/example-rust-project/src/lib.rs diff --git a/pkgs/test/rust-hooks/hello/src/main.rs b/pkgs/build-support/rust/hooks/test/example-rust-project/src/main.rs similarity index 100% rename from pkgs/test/rust-hooks/hello/src/main.rs rename to pkgs/build-support/rust/hooks/test/example-rust-project/src/main.rs diff --git a/pkgs/test/rust-hooks/hello/tests/my_test.rs b/pkgs/build-support/rust/hooks/test/example-rust-project/tests/my_test.rs similarity index 100% rename from pkgs/test/rust-hooks/hello/tests/my_test.rs rename to pkgs/build-support/rust/hooks/test/example-rust-project/tests/my_test.rs diff --git a/pkgs/test/default.nix b/pkgs/test/default.nix index 7fc0943ba44e0..dfeeef7fcf4f6 100644 --- a/pkgs/test/default.nix +++ b/pkgs/test/default.nix @@ -211,5 +211,5 @@ with pkgs; build-environment-info = callPackage ./build-environment-info { }; - rust-hooks = recurseIntoAttrs (callPackages ./rust-hooks { }); + rust-hooks = recurseIntoAttrs (callPackages ../build-support/rust/hooks/test { }); } From a20a850011be50a2a26f4454ea9317fbe2a71dd6 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Thu, 16 Jan 2025 09:16:43 +0100 Subject: [PATCH 124/343] opencv: 4.9.0 -> 4.11.0 Diff: https://github.com/opencv/opencv/compare/4.9.0...4.11.0 Changelog: https://github.com/opencv/opencv/wiki/OpenCV-Change-Logs#version4110 --- pkgs/development/libraries/opencv/4.x.nix | 32 +++++++++++------------ pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 16 insertions(+), 18 deletions(-) diff --git a/pkgs/development/libraries/opencv/4.x.nix b/pkgs/development/libraries/opencv/4.x.nix index dc7883b27c88c..f7b5fc367523f 100644 --- a/pkgs/development/libraries/opencv/4.x.nix +++ b/pkgs/development/libraries/opencv/4.x.nix @@ -44,7 +44,7 @@ , enableCublas ? enableCuda , enableCudnn ? false # NOTE: CUDNN has a large impact on closure size so we disable it by default , enableCufft ? enableCuda -, cudaPackages ? {} +, cudaPackages ? cudaPackages , nvidia-optical-flow-sdk , enableLto ? true @@ -104,7 +104,7 @@ let inherit (lib.strings) cmakeBool cmakeFeature cmakeOptionType concatStrings concatStringsSep optionalString; inherit (lib.trivial) flip; - version = "4.9.0"; + version = "4.11.0"; # It's necessary to consistently use backendStdenv when building with CUDA # support, otherwise we get libstdc++ errors downstream @@ -114,22 +114,22 @@ let src = fetchFromGitHub { owner = "opencv"; repo = "opencv"; - rev = version; - hash = "sha256-3qqu4xlRyMbPKHHTIT+iRRGtpFlcv0NU8GNZpgjdi6k="; + tag = version; + hash = "sha256-oiU4CwoMfuUbpDtujJVTShMCzc5GsnIaprC4DzkSzEM="; }; contribSrc = fetchFromGitHub { owner = "opencv"; repo = "opencv_contrib"; - rev = version; - hash = "sha256-K74Ghk4uDqj4OWEzDxT2R3ERi+jkAWZszzezRenfuZ8="; + tag = version; + hash = "sha256-YNd96qFJ8SHBgDEEsoNps888myGZdELbbuYCae9pW3M="; }; testDataSrc = fetchFromGitHub { owner = "opencv"; repo = "opencv_extra"; - rev = version; - hash = "sha256-pActKi7aN5EOZq2Fpf5mALnZq71c037/R3Q6wJ4uCfQ="; + tag = version; + hash = "sha256-EqlGlemztYlk03MX1LAviArWT+OA3/qL3jfgHYC+SP8="; }; # Contrib must be built in order to enable Tesseract support: @@ -140,16 +140,16 @@ let src = fetchFromGitHub { owner = "opencv"; repo = "opencv_3rdparty"; - rev = "0cc4aa06bf2bef4b05d237c69a5a96b9cd0cb85a"; - hash = "sha256-/kHivOgCkY9YdcRRaVgytXal3ChE9xFfGAB0CfFO5ec="; + rev = "7f55c0c26be418d494615afca15218566775c725"; + hash = ""; } + "/ippicv"; files = let name = platform: "ippicv_2021.10.0_${platform}_20230919_general.tgz"; in if effectiveStdenv.hostPlatform.system == "x86_64-linux" then - { ${name "lnx_intel64"} = "606a19b207ebedfe42d59fd916cc4850"; } + { ${name "lnx_intel64"} = ""; } else if effectiveStdenv.hostPlatform.system == "i686-linux" then - { ${name "lnx_ia32"} = "ea08487b810baad2f68aca87b74a2db9"; } + { ${name "lnx_ia32"} = ""; } else if effectiveStdenv.hostPlatform.system == "x86_64-darwin" then - { ${name "mac_intel64"} = "14f01c5a4780bfae9dde9b0aaf5e56fc"; } + { ${name "mac_intel64"} = ""; } else throw "ICV is not available for this platform (or not yet supported by this package)"; dst = ".cache/ippicv"; @@ -210,10 +210,10 @@ let ade = rec { src = fetchurl { url = "https://github.com/opencv/ade/archive/${name}"; - hash = "sha256-WG/GudVpkO10kOJhoKXFMj672kggvyRYCIpezal3wcE="; + hash = "sha256-O+Yshk3N2Lkl6S9qWxWnoDmBngSms88IiCfwjPLMB78="; }; - name = "v0.1.2d.zip"; - md5 = "dbb095a8bf3008e91edbbf45d8d34885"; + name = "v0.1.2e.zip"; + md5 = ""; dst = ".cache/ade"; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 381c4897a2943..49d38e8e7facf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10133,8 +10133,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) AVFoundation Cocoa VideoDecodeAcceleration CoreMedia MediaToolbox Accelerate; pythonPackages = python3Packages; - # TODO(@connorbaker): OpenCV 4.9 only supports up to CUDA 12.3. - cudaPackages = cudaPackages_12_3; # TODO: LTO does not work. # https://github.com/NixOS/nixpkgs/issues/343123 enableLto = false; From 68d77d536567b43c89f74416d1267f2bc0068f7e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 4 Feb 2025 13:37:17 +0000 Subject: [PATCH 125/343] hwdata: 0.391 -> 0.392 --- pkgs/by-name/hw/hwdata/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/hw/hwdata/package.nix b/pkgs/by-name/hw/hwdata/package.nix index 748727e61fe70..fd1125591b872 100644 --- a/pkgs/by-name/hw/hwdata/package.nix +++ b/pkgs/by-name/hw/hwdata/package.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "hwdata"; - version = "0.391"; + version = "0.392"; src = fetchFromGitHub { owner = "vcrhonek"; repo = "hwdata"; rev = "v${version}"; - hash = "sha256-GF3UCx/CE4ByQTsDeRFqlBUoKwGjmTi+7/JE65U7H+o="; + hash = "sha256-DjtPoPZZwFmVRZTOG4A+2KXI6zw68QEwq0iFRoV+5c4="; }; configureFlags = [ "--datadir=${placeholder "out"}/share" ]; From e958740516dbe011823a861a62b16ff6afcf5e22 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Tue, 4 Feb 2025 15:38:43 +0200 Subject: [PATCH 126/343] python312Packages.pythran: 0.16.1 -> 0.17.0 Diff: https://github.com/serge-sans-paille/pythran/compare/refs/tags/0.16.1...0.17.0 Changelog: https://github.com/serge-sans-paille/pythran/blob/refs/tags/0.17.0/Changelog --- pkgs/development/python-modules/pythran/default.nix | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/pythran/default.nix b/pkgs/development/python-modules/pythran/default.nix index 711c160d11959..c8873f5d3eedd 100644 --- a/pkgs/development/python-modules/pythran/default.nix +++ b/pkgs/development/python-modules/pythran/default.nix @@ -25,22 +25,17 @@ let in buildPythonPackage rec { pname = "pythran"; - version = "0.16.1"; + version = "0.17.0"; pyproject = true; src = fetchFromGitHub { owner = "serge-sans-paille"; repo = "pythran"; tag = version; - hash = "sha256-wiQmShniYZmB8hk/MC5FWFf1s5vqEHiYBkXTo4OeZ+E="; + hash = "sha256-JG1FH2UAekFF9Vv7wCn/L7gJlVKv5AxqgGrj8pejqeY="; }; patches = [ - (fetchpatch2 { - name = "bump-gast-to-0.6.0.patch"; - url = "https://github.com/serge-sans-paille/pythran/commit/840a0e706ec39963aec6bcd1f118bf33177c20b4.patch"; - hash = "sha256-FHGXWuAX/Nmn6uEfQgAXfUxIdApDwSfHHtOStxyme/0="; - }) # Hardcode path to mp library (substituteAll { src = ./0001-hardcode-path-to-libgomp.patch; From cfd4f2c85527d644d7bca7924e83e03bff3f9eca Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Tue, 4 Feb 2025 16:11:22 +0100 Subject: [PATCH 127/343] python3Packages.mako: backport test fix Test has been changed to avoid relying on floats, so no need to disable it any more. --- .../python-modules/mako/default.nix | 30 +++++++++++-------- 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/mako/default.nix b/pkgs/development/python-modules/mako/default.nix index caeda4a13dd3d..4c2f7ae8c5f31 100644 --- a/pkgs/development/python-modules/mako/default.nix +++ b/pkgs/development/python-modules/mako/default.nix @@ -4,6 +4,7 @@ buildPythonPackage, pythonOlder, fetchFromGitHub, + fetchpatch, isPyPy, # build-system @@ -36,6 +37,14 @@ buildPythonPackage rec { hash = "sha256-7KttExqHxv//q8ol7eOFIrgRHbQySQTvL7Rd9VooX0Y="; }; + patches = [ + (fetchpatch { + name = "float-precision.patch"; + url = "https://github.com/sqlalchemy/mako/commit/188d5431a5c93b937da03e70c4c2c8c42cd9a502.patch"; + hash = "sha256-/ROS6WkSqYXJsX6o1AejUg/faS3lUAimrRJzS74Bwws="; + }) + ]; + build-system = [ setuptools ]; dependencies = [ markupsafe ]; @@ -51,18 +60,15 @@ buildPythonPackage rec { pytestCheckHook ] ++ lib.flatten (lib.attrValues optional-dependencies); - disabledTests = - lib.optionals isPyPy [ - # https://github.com/sqlalchemy/mako/issues/315 - "test_alternating_file_names" - # https://github.com/sqlalchemy/mako/issues/238 - "test_file_success" - "test_stdin_success" - # fails on pypy2.7 - "test_bytestring_passthru" - ] - # https://github.com/sqlalchemy/mako/issues/408 - ++ lib.optional (stdenv.targetPlatform.useLLVM or false) "test_future_import"; + disabledTests = lib.optionals isPyPy [ + # https://github.com/sqlalchemy/mako/issues/315 + "test_alternating_file_names" + # https://github.com/sqlalchemy/mako/issues/238 + "test_file_success" + "test_stdin_success" + # fails on pypy2.7 + "test_bytestring_passthru" + ]; meta = with lib; { description = "Super-fast templating language"; From 83ccb86861153e02d6301f2f6093488c8409c234 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Tue, 4 Feb 2025 10:56:24 +0100 Subject: [PATCH 128/343] libtiff: fix static (properly) Fixing this was a very confusing time, and the wrong version of the patch ended up getting applied, which did not actually fix static. Swap it out for the accepted upstream patch. --- pkgs/by-name/li/libtiff/package.nix | 8 ++++++- pkgs/by-name/li/libtiff/static.patch | 36 ---------------------------- 2 files changed, 7 insertions(+), 37 deletions(-) delete mode 100644 pkgs/by-name/li/libtiff/static.patch diff --git a/pkgs/by-name/li/libtiff/package.nix b/pkgs/by-name/li/libtiff/package.nix index 03564fced8022..49d39705ef799 100644 --- a/pkgs/by-name/li/libtiff/package.nix +++ b/pkgs/by-name/li/libtiff/package.nix @@ -43,7 +43,13 @@ stdenv.mkDerivation (finalAttrs: { # libc++abi 11 has an `#include `, this picks up files name # `version` in the project's include paths ./rename-version.patch - ./static.patch + + # https://gitlab.com/libtiff/libtiff/-/merge_requests/685 + (fetchpatch { + name = "static.patch"; + url = "https://gitlab.com/libtiff/libtiff/-/commit/e6f3d60187a699507d6c85c5c63a8f258d8b8ebc.patch"; + hash = "sha256-TZE7nyOPojxnR9/jiZbv2LgKS2Yz+Db9lbLgeefrQsc="; + }) ]; postPatch = '' diff --git a/pkgs/by-name/li/libtiff/static.patch b/pkgs/by-name/li/libtiff/static.patch deleted file mode 100644 index 0eecc5d149b8a..0000000000000 --- a/pkgs/by-name/li/libtiff/static.patch +++ /dev/null @@ -1,36 +0,0 @@ -From ed5fcc718075021fe670daee6dd426a5e12d6842 Mon Sep 17 00:00:00 2001 -From: Alyssa Ross -Date: Thu, 19 Dec 2024 16:51:51 +0100 -Subject: [PATCH] Fix name of Lerc package - -Lerc calls its CMake package "Lerc", not "LERC". This meant that, -even if building libtiff with -DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON, -Lerc's CMake files wouldn't be used as intended. - -Link: https://gitlab.com/libtiff/libtiff/-/merge_requests/686 ---- - cmake/{FindLERC.cmake => FindLerc.cmake} | 0 - cmake/LERCCodec.cmake | 2 +- - 2 files changed, 1 insertion(+), 1 deletion(-) - rename cmake/{FindLERC.cmake => FindLerc.cmake} (100%) - -diff --git a/cmake/FindLERC.cmake b/cmake/FindLerc.cmake -similarity index 100% -rename from cmake/FindLERC.cmake -rename to cmake/FindLerc.cmake -diff --git a/cmake/LERCCodec.cmake b/cmake/LERCCodec.cmake -index 54504ca1..237f8d7e 100644 ---- a/cmake/LERCCodec.cmake -+++ b/cmake/LERCCodec.cmake -@@ -25,7 +25,7 @@ - - # libLerc - set(LERC_SUPPORT FALSE) --find_package(LERC) -+find_package(Lerc) - option(lerc "use libLerc (required for LERC compression)" ${LERC_FOUND}) - if (lerc AND LERC_FOUND AND ZIP_SUPPORT) - set(LERC_SUPPORT TRUE) --- -2.47.0 - From bc6ffb69f03c16a739711086daa23c01e80232fb Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Tue, 4 Feb 2025 16:45:19 +0100 Subject: [PATCH 129/343] haskell.compiler: unify logic determining whether NCG is available This change only consolidates the logic for the source built GHCs which have used the same logic (at least as long as you'd only use the respective supported version ranges of the expressions as inputs). --- pkgs/development/compilers/ghc/8.10.7.nix | 9 ++++++--- pkgs/development/compilers/ghc/common-hadrian.nix | 6 +----- pkgs/development/compilers/ghc/common-have-ncg.nix | 14 ++++++++++++++ .../compilers/ghc/common-make-native-bignum.nix | 9 ++------- 4 files changed, 23 insertions(+), 15 deletions(-) create mode 100644 pkgs/development/compilers/ghc/common-have-ncg.nix diff --git a/pkgs/development/compilers/ghc/8.10.7.nix b/pkgs/development/compilers/ghc/8.10.7.nix index c0d9e2b371f76..ed14b48743b01 100644 --- a/pkgs/development/compilers/ghc/8.10.7.nix +++ b/pkgs/development/compilers/ghc/8.10.7.nix @@ -1,3 +1,7 @@ +let + version = "8.10.7"; +in + { lib, stdenv, @@ -32,8 +36,7 @@ libffi ? null, libffi_3_3 ? null, - useLLVM ? - !(stdenv.targetPlatform.isx86 || stdenv.targetPlatform.isPower || stdenv.targetPlatform.isSparc), + useLLVM ? !(import ./common-have-ncg.nix { inherit lib stdenv version; }), # LLVM is conceptually a run-time-only dependency, but for # non-x86, we need LLVM to bootstrap later stages, so it becomes a # build-time dependency too. @@ -271,7 +274,7 @@ in stdenv.mkDerivation ( rec { - version = "8.10.7"; + inherit version; pname = "${targetPrefix}ghc${variantSuffix}"; src = fetchurl { diff --git a/pkgs/development/compilers/ghc/common-hadrian.nix b/pkgs/development/compilers/ghc/common-hadrian.nix index 3a6ea450f37ed..7974cba0824c9 100644 --- a/pkgs/development/compilers/ghc/common-hadrian.nix +++ b/pkgs/development/compilers/ghc/common-hadrian.nix @@ -39,11 +39,7 @@ , # GHC can be built with system libffi or a bundled one. libffi ? null -, useLLVM ? !(stdenv.targetPlatform.isx86 - || stdenv.targetPlatform.isPower - || stdenv.targetPlatform.isAarch64 - || stdenv.targetPlatform.isGhcjs - || (lib.versionAtLeast version "9.12" && stdenv.targetPlatform.isRiscV64)) +, useLLVM ? !(import ./common-have-ncg.nix { inherit lib stdenv version; }) , # LLVM is conceptually a run-time-only dependency, but for # non-x86, we need LLVM to bootstrap later stages, so it becomes a # build-time dependency too. diff --git a/pkgs/development/compilers/ghc/common-have-ncg.nix b/pkgs/development/compilers/ghc/common-have-ncg.nix new file mode 100644 index 0000000000000..1b92a0700ac2e --- /dev/null +++ b/pkgs/development/compilers/ghc/common-have-ncg.nix @@ -0,0 +1,14 @@ +# Determines whether the Native Code Generation (NCG) backend of the given +# GHC `version` is supported for compiling to `stdenv.targetPlatform`. +{ + version, + stdenv, + lib, +}: + +stdenv.targetPlatform.isx86 +|| stdenv.targetPlatform.isPower +|| (lib.versionOlder version "9.4" && stdenv.targetPlatform.isSparc) +|| (lib.versionAtLeast version "9.2" && stdenv.targetPlatform.isAarch64) +|| (lib.versionAtLeast version "9.6" && stdenv.targetPlatform.isGhcjs) +|| (lib.versionAtLeast version "9.12" && stdenv.targetPlatform.isRiscV64) diff --git a/pkgs/development/compilers/ghc/common-make-native-bignum.nix b/pkgs/development/compilers/ghc/common-make-native-bignum.nix index 412e8d7d4671c..b204a1c703638 100644 --- a/pkgs/development/compilers/ghc/common-make-native-bignum.nix +++ b/pkgs/development/compilers/ghc/common-make-native-bignum.nix @@ -34,13 +34,8 @@ # GHC can be built with system libffi or a bundled one. libffi ? null, - useLLVM ? - !( - stdenv.targetPlatform.isx86 - || stdenv.targetPlatform.isPower - || (lib.versionOlder version "9.4" && stdenv.targetPlatform.isSparc) - || (lib.versionAtLeast version "9.2" && stdenv.targetPlatform.isAarch64) - ), + useLLVM ? !(import ./common-have-ncg.nix { inherit lib stdenv version; }), + # LLVM is conceptually a run-time-only dependency, but for # non-x86, we need LLVM to bootstrap later stages, so it becomes a # build-time dependency too. From d0d7d525be063af2a34f1897cb36fc6aed828a6e Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Tue, 4 Feb 2025 16:48:54 +0100 Subject: [PATCH 130/343] haskell.compiler.ghc*Binary: use common NCG/useLLVM logic See bc6ffb69f03c16a739711086daa23c01e80232fb for context. --- pkgs/development/compilers/ghc/8.10.7-binary.nix | 2 +- pkgs/development/compilers/ghc/9.2.4-binary.nix | 7 +------ pkgs/development/compilers/ghc/9.6.3-binary.nix | 7 +------ 3 files changed, 3 insertions(+), 13 deletions(-) diff --git a/pkgs/development/compilers/ghc/8.10.7-binary.nix b/pkgs/development/compilers/ghc/8.10.7-binary.nix index c4a20e7af4bcf..6137777f27470 100644 --- a/pkgs/development/compilers/ghc/8.10.7-binary.nix +++ b/pkgs/development/compilers/ghc/8.10.7-binary.nix @@ -204,7 +204,7 @@ let ghcBinDists.${distSetName}.${stdenv.hostPlatform.system} or (throw "cannot bootstrap GHC on this platform ('${stdenv.hostPlatform.system}' with libc '${distSetName}')"); - useLLVM = !stdenv.targetPlatform.isx86; + useLLVM = !(import ./common-have-ncg.nix { inherit lib stdenv version; }); libPath = lib.makeLibraryPath ( # Add arch-specific libraries. diff --git a/pkgs/development/compilers/ghc/9.2.4-binary.nix b/pkgs/development/compilers/ghc/9.2.4-binary.nix index c5a704e8ad869..e5e21a91b611a 100644 --- a/pkgs/development/compilers/ghc/9.2.4-binary.nix +++ b/pkgs/development/compilers/ghc/9.2.4-binary.nix @@ -193,12 +193,7 @@ let ) binDistUsed.archSpecificLibraries )).nixPackage; - # GHC has other native backends (like PowerPC), but here only the ones - # we ship bindists for matter. - useLLVM = - !( - stdenv.targetPlatform.isx86 || (stdenv.targetPlatform.isAarch64 && stdenv.targetPlatform.isDarwin) - ); + useLLVM = !(import ./common-have-ncg.nix { inherit lib stdenv version; }); libPath = lib.makeLibraryPath ( # Add arch-specific libraries. diff --git a/pkgs/development/compilers/ghc/9.6.3-binary.nix b/pkgs/development/compilers/ghc/9.6.3-binary.nix index ef4828814854a..e392fdd02f5bf 100644 --- a/pkgs/development/compilers/ghc/9.6.3-binary.nix +++ b/pkgs/development/compilers/ghc/9.6.3-binary.nix @@ -192,12 +192,7 @@ let ) binDistUsed.archSpecificLibraries )).nixPackage; - # GHC has other native backends (like PowerPC), but here only the ones - # we ship bindists for matter. - useLLVM = - !( - stdenv.targetPlatform.isx86 || (stdenv.targetPlatform.isAarch64 && stdenv.targetPlatform.isDarwin) - ); + useLLVM = !(import ./common-have-ncg.nix { inherit lib stdenv version; }); libPath = lib.makeLibraryPath ( # Add arch-specific libraries. From dab4611ba4715e8854dde6c0187fc50ed2b3847b Mon Sep 17 00:00:00 2001 From: Mitchell Pleune Date: Sat, 1 Feb 2025 05:01:46 +0000 Subject: [PATCH 131/343] libuv: disable thread_affinity test fixes NixOS/nixpkgs#378438 --- pkgs/development/libraries/libuv/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/libuv/default.nix b/pkgs/development/libraries/libuv/default.nix index 421d2d07e934f..37e6c5a90b126 100644 --- a/pkgs/development/libraries/libuv/default.nix +++ b/pkgs/development/libraries/libuv/default.nix @@ -52,6 +52,7 @@ stdenv.mkDerivation (finalAttrs: { "getaddrinfo_fail" "getaddrinfo_fail_sync" "tcp_connect6_link_local" + "thread_affinity" # else "test must be run with cpu 0 affinity" when affinity is set "threadpool_multiple_event_loops" # times out on slow machines "get_passwd" # passed on NixOS but failed on other Linuxes "tcp_writealot" From 899caf80aade72824f83e0398987df2ad71aff16 Mon Sep 17 00:00:00 2001 From: Paul Meyer Date: Tue, 4 Feb 2025 22:25:07 +0100 Subject: [PATCH 132/343] go_1_23: 1.23.5 -> 1.23.6 Signed-off-by: Paul Meyer --- pkgs/development/compilers/go/1.23.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/go/1.23.nix b/pkgs/development/compilers/go/1.23.nix index 76a3e85486811..514cf806be38c 100644 --- a/pkgs/development/compilers/go/1.23.nix +++ b/pkgs/development/compilers/go/1.23.nix @@ -49,11 +49,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "go"; - version = "1.23.5"; + version = "1.23.6"; src = fetchurl { url = "https://go.dev/dl/go${finalAttrs.version}.src.tar.gz"; - hash = "sha256-pvP0u9PmvdYm95tmjyEvu1ZJ2vdQhPt5tnigrk2XQjs="; + hash = "sha256-A5xbBOZSedrO7opvcecL0Fz1uAF4K293xuGeLtBREiI="; }; strictDeps = true; From 05a564a0d0ee7c9d28988534cba52435ec0f6ffb Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 4 Feb 2025 23:35:43 +0100 Subject: [PATCH 133/343] cpython: add isPy313, isPy314 helpers --- pkgs/development/interpreters/python/passthrufun.nix | 2 ++ pkgs/development/interpreters/python/python-packages-base.nix | 2 ++ 2 files changed, 4 insertions(+) diff --git a/pkgs/development/interpreters/python/passthrufun.nix b/pkgs/development/interpreters/python/passthrufun.nix index fde2bab1e86c2..d4e20aa24fc94 100644 --- a/pkgs/development/interpreters/python/passthrufun.nix +++ b/pkgs/development/interpreters/python/passthrufun.nix @@ -119,6 +119,8 @@ rec { isPy310 = pythonVersion == "3.10"; isPy311 = pythonVersion == "3.11"; isPy312 = pythonVersion == "3.12"; + isPy313 = pythonVersion == "3.13"; + isPy314 = pythonVersion == "3.14"; isPy2 = lib.strings.substring 0 1 pythonVersion == "2"; isPy3 = lib.strings.substring 0 1 pythonVersion == "3"; isPy3k = isPy3; diff --git a/pkgs/development/interpreters/python/python-packages-base.nix b/pkgs/development/interpreters/python/python-packages-base.nix index 19c230a0b94ec..66a7c823fecca 100644 --- a/pkgs/development/interpreters/python/python-packages-base.nix +++ b/pkgs/development/interpreters/python/python-packages-base.nix @@ -126,6 +126,8 @@ in isPy310 isPy311 isPy312 + isPy313 + isPy314 isPy3k isPyPy pythonAtLeast From 0690e42a7c688c0077c5d335a68672d66a2c715e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 4 Feb 2025 23:41:31 +0100 Subject: [PATCH 134/343] python313: 3.13.1 -> 3.13.2 https://docs.python.org/release/3.13.2/whatsnew/changelog.html --- pkgs/development/interpreters/python/cpython/default.nix | 3 ++- pkgs/development/interpreters/python/default.nix | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix index 3b249843f4f17..e285959f2378b 100644 --- a/pkgs/development/interpreters/python/cpython/default.nix +++ b/pkgs/development/interpreters/python/cpython/default.nix @@ -252,6 +252,7 @@ in with passthru; stdenv.mkDerivation (finalAttrs: { # (since it will do a futile invocation of gcc (!) to find # libuuid, slowing down program startup a lot). noldconfigPatch + ] ++ optionals (!isPy313) [ # https://www.cve.org/CVERecord?id=CVE-2025-0938 ./CVE-2025-0938.patch ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform && stdenv.hostPlatform.isFreeBSD) [ @@ -296,7 +297,7 @@ in with passthru; stdenv.mkDerivation (finalAttrs: { ] ++ optionals (pythonOlder "3.12") [ # https://github.com/python/cpython/issues/90656 ./loongarch-support.patch - ] ++ optionals (pythonAtLeast "3.12" && pythonOlder "3.14") [ + ] ++ optionals (isPy312 || isPy314) [ ./3.12/CVE-2024-12254.patch ] ++ optionals (pythonAtLeast "3.11" && pythonOlder "3.13") [ # backport fix for https://github.com/python/cpython/issues/95855 diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index 582c37cd2c791..55c662742242c 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -87,10 +87,10 @@ in { sourceVersion = { major = "3"; minor = "13"; - patch = "1"; + patch = "2"; suffix = ""; }; - hash = "sha256-nPlCe+6eIkLjh33Q9rZBwYU8pGHznWUDziYKWcgL8Nk="; + hash = "sha256-2YS8xXzWfKqyb33vQuUjscAVu8XcB4Ns9PC2P6FZ61Y="; inherit passthruFun; }; From 5628a3fb23c0485ee6cc553e4e9916ff7b6354b0 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 4 Feb 2025 23:53:44 +0100 Subject: [PATCH 135/343] python312: 3.12.8 -> 3.12.9 https://docs.python.org/release/3.12.9/whatsnew/changelog.html --- pkgs/development/interpreters/python/cpython/default.nix | 4 ++-- pkgs/development/interpreters/python/default.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix index e285959f2378b..d160030a52cbd 100644 --- a/pkgs/development/interpreters/python/cpython/default.nix +++ b/pkgs/development/interpreters/python/cpython/default.nix @@ -252,7 +252,7 @@ in with passthru; stdenv.mkDerivation (finalAttrs: { # (since it will do a futile invocation of gcc (!) to find # libuuid, slowing down program startup a lot). noldconfigPatch - ] ++ optionals (!isPy313) [ + ] ++ optionals (!isPy312 && !isPy313) [ # https://www.cve.org/CVERecord?id=CVE-2025-0938 ./CVE-2025-0938.patch ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform && stdenv.hostPlatform.isFreeBSD) [ @@ -297,7 +297,7 @@ in with passthru; stdenv.mkDerivation (finalAttrs: { ] ++ optionals (pythonOlder "3.12") [ # https://github.com/python/cpython/issues/90656 ./loongarch-support.patch - ] ++ optionals (isPy312 || isPy314) [ + ] ++ optionals isPy314 [ ./3.12/CVE-2024-12254.patch ] ++ optionals (pythonAtLeast "3.11" && pythonOlder "3.13") [ # backport fix for https://github.com/python/cpython/issues/95855 diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index 55c662742242c..7c0036ea1b1e5 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -20,10 +20,10 @@ sourceVersion = { major = "3"; minor = "12"; - patch = "8"; + patch = "9"; suffix = ""; }; - hash = "sha256-yQkVe7JewRTlhpEkzCqcSk1MHpV8pP9VPx7caSEBFU4="; + hash = "sha256-ciCDXZ+Qs3wAbphCqN/0WAqspDGGdPlHMCuNKPP4ERI="; }; }; From 10053c5dfd67af52347bee51643d8664e28a8f0a Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Tue, 4 Feb 2025 12:23:11 +0100 Subject: [PATCH 136/343] bash: Deprecate unnecessary withDocs flag Bash is distributing the rendered docs with the source, so no build tools are used or needed anymore. This was not the case originally, see dd91141a06860bea45b0e4a4a33f4c3980965325 --- pkgs/shells/bash/5.nix | 7 ++++--- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/shells/bash/5.nix b/pkgs/shells/bash/5.nix index 9ca6e396e6769..ac172d6da1113 100644 --- a/pkgs/shells/bash/5.nix +++ b/pkgs/shells/bash/5.nix @@ -9,8 +9,7 @@ # patch for cygwin requires readline support , interactive ? stdenv.hostPlatform.isCygwin , readline -, withDocs ? false -, texinfo +, withDocs ? null , forFHSEnv ? false , pkgsStatic @@ -22,6 +21,9 @@ let inherit sha256; }); in +lib.warnIf (withDocs != null) '' + bash: `.override { withDocs = true; }` is deprecated, the docs are always included. +'' stdenv.mkDerivation rec { pname = "bash${lib.optionalString interactive "-interactive"}"; version = "5.2${patch_suffix}"; @@ -101,7 +103,6 @@ stdenv.mkDerivation rec { # Note: Bison is needed because the patches above modify parse.y. depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ updateAutotoolsGnuConfigScriptsHook bison ] - ++ lib.optional withDocs texinfo ++ lib.optional stdenv.hostPlatform.isDarwin stdenv.cc.bintools; buildInputs = lib.optional interactive readline; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 30f86fc3ec116..4a201065591ca 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5592,11 +5592,9 @@ with pkgs; # WARNING: this attribute is used by nix-shell so it shouldn't be removed/renamed bashInteractive = callPackage ../shells/bash/5.nix { interactive = true; - withDocs = true; }; bashInteractiveFHS = callPackage ../shells/bash/5.nix { interactive = true; - withDocs = true; forFHSEnv = true; }; From e3491c9e40bea9c51414a2c3e81e2854e42fe719 Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Tue, 4 Feb 2025 13:04:31 +0100 Subject: [PATCH 137/343] bash: Make interactive the default The status quo of `bash` not being interactive is frustrating for many users, because trying to use it interactively is just messed up, and `bashInteractive` is not intuitive and barely discoverable. This was brought to my (and many others) attention by @stahnma in his [talk at CfgMgmtCamp 2025](https://cfp.cfgmgmtcamp.org/ghent2025/talk/YUVUTN/), where he highlighted this as one of the frustrations he ran into when learning Nix. Why this is fine: - No reason for not making interactive the default was given in the original commit (6c6ff6f36ff26932aa730875bd237c8e37210f0e), but probably it was due to the increase in closure size - The closure size only increases by 6.9MiB (19.5%) today, with the added dependency on the store paths for readline and ncurses, which are needed on systems in almost all cases anyways - If somebody really needs to get a more minimal system, they can use the newly-introduced `bashNonInteractive` instead now - Though to apply it consistently, they'll need to do that in an overlay like ``` final: prev: { bash = self.bashNonInteractive; } ``` Or alternatively using the `system.replaceDependencies.replacements` NixOS option approach. While there's also other such `*Interactive` packages that could use the same treatment, `bash` is a great start. This was already attempted before in https://github.com/NixOS/nixpkgs/pull/151227, but was not continued for unknown reason. To avoid stdenv becoming bigger, all uses of bash in the (working) stdenv's are changed to the explicitly non-interactive version here. This commit will however still cause a mass rebuild for all packages (and reverse deps) making use of the default bash. --- pkgs/by-name/gr/groff/package.nix | 4 ++-- pkgs/by-name/li/libxo/package.nix | 4 ++-- .../interpreters/python/cpython/default.nix | 8 +++---- .../development/libraries/gettext/default.nix | 4 ++-- .../development/tools/misc/texinfo/common.nix | 4 ++-- .../tools/misc/texinfo/packages.nix | 4 ++-- pkgs/shells/bash/5.nix | 3 +-- pkgs/stdenv/darwin/default.nix | 22 +++++++++---------- pkgs/stdenv/freebsd/default.nix | 8 +++---- pkgs/stdenv/generic/common-path.nix | 2 +- pkgs/stdenv/linux/default.nix | 6 ++--- pkgs/tools/compression/zstd/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 15 +++++++------ 13 files changed, 44 insertions(+), 44 deletions(-) diff --git a/pkgs/by-name/gr/groff/package.nix b/pkgs/by-name/gr/groff/package.nix index bcc71885fd87a..fe25d58d66ecb 100644 --- a/pkgs/by-name/gr/groff/package.nix +++ b/pkgs/by-name/gr/groff/package.nix @@ -22,7 +22,7 @@ pkg-config, texinfo, bison, - bash, + bashNonInteractive, }: stdenv.mkDerivation rec { @@ -79,7 +79,7 @@ stdenv.mkDerivation rec { buildInputs = [ perl - bash + bashNonInteractive ] ++ lib.optionals enableGhostscript [ ghostscript diff --git a/pkgs/by-name/li/libxo/package.nix b/pkgs/by-name/li/libxo/package.nix index 8e20b8edc7b1a..f8747a754e0e9 100644 --- a/pkgs/by-name/li/libxo/package.nix +++ b/pkgs/by-name/li/libxo/package.nix @@ -1,7 +1,7 @@ { lib, autoreconfHook, - bash, + bashNonInteractive, libtool, fetchFromGitHub, nix-update-script, @@ -48,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ autoreconfHook # For patchShebangs in postInstall - bash + bashNonInteractive perl ]; diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix index d0cb05268d43f..917048ca3e943 100644 --- a/pkgs/development/interpreters/python/cpython/default.nix +++ b/pkgs/development/interpreters/python/cpython/default.nix @@ -24,7 +24,7 @@ , zlib # platform-specific dependencies -, bash +, bashNonInteractive , darwin , windows @@ -235,7 +235,7 @@ in with passthru; stdenv.mkDerivation (finalAttrs: { inherit nativeBuildInputs; buildInputs = lib.optionals (!stdenv.hostPlatform.isWindows) [ - bash # only required for patchShebangs + bashNonInteractive # only required for patchShebangs ] ++ buildInputs; prePatch = optionalString stdenv.hostPlatform.isDarwin '' @@ -329,7 +329,7 @@ in with passthru; stdenv.mkDerivation (finalAttrs: { postPatch = optionalString (!stdenv.hostPlatform.isWindows) '' substituteInPlace Lib/subprocess.py \ - --replace-fail "'/bin/sh'" "'${bash}/bin/sh'" + --replace-fail "'/bin/sh'" "'${bashNonInteractive}/bin/sh'" '' + optionalString mimetypesSupport '' substituteInPlace Lib/mimetypes.py \ --replace-fail "@mime-types@" "${mailcap}" @@ -611,7 +611,7 @@ in with passthru; stdenv.mkDerivation (finalAttrs: { ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ # Ensure we don't have references to build-time packages. # These typically end up in shebangs. - pythonOnBuildForHost buildPackages.bash + pythonOnBuildForHost buildPackages.bashNonInteractive ]; separateDebugInfo = true; diff --git a/pkgs/development/libraries/gettext/default.nix b/pkgs/development/libraries/gettext/default.nix index d0f937ea038fc..9194e93449ed7 100644 --- a/pkgs/development/libraries/gettext/default.nix +++ b/pkgs/development/libraries/gettext/default.nix @@ -3,7 +3,7 @@ lib, fetchurl, libiconv, - bash, + bashNonInteractive, updateAutotoolsGnuConfigScriptsHook, }: @@ -84,7 +84,7 @@ stdenv.mkDerivation rec { ]; buildInputs = lib.optionals (!stdenv.hostPlatform.isMinGW) [ - bash + bashNonInteractive ] ++ lib.optionals (!stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isCygwin) [ # HACK, see #10874 (and 14664) diff --git a/pkgs/development/tools/misc/texinfo/common.nix b/pkgs/development/tools/misc/texinfo/common.nix index da9b2c9cbcb09..35b34db5a88b1 100644 --- a/pkgs/development/tools/misc/texinfo/common.nix +++ b/pkgs/development/tools/misc/texinfo/common.nix @@ -5,7 +5,7 @@ fetchurl, perl, libintl, - bash, + bashNonInteractive, updateAutotoolsGnuConfigScriptsHook, gnulib, gawk, @@ -83,7 +83,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ updateAutotoolsGnuConfigScriptsHook ]; buildInputs = [ - bash + bashNonInteractive libintl ] ++ optionals stdenv.hostPlatform.isSunOS [ diff --git a/pkgs/development/tools/misc/texinfo/packages.nix b/pkgs/development/tools/misc/texinfo/packages.nix index 1c215819a9a21..b0ff25deebcf5 100644 --- a/pkgs/development/tools/misc/texinfo/packages.nix +++ b/pkgs/development/tools/misc/texinfo/packages.nix @@ -6,7 +6,7 @@ fetchurl, perl, libintl, - bash, + bashNonInteractive, updateAutotoolsGnuConfigScriptsHook, gnulib, gawk, @@ -57,7 +57,7 @@ let xz libintl libiconv - bash + bashNonInteractive gnulib gawk freebsd diff --git a/pkgs/shells/bash/5.nix b/pkgs/shells/bash/5.nix index ac172d6da1113..6d758f27878c0 100644 --- a/pkgs/shells/bash/5.nix +++ b/pkgs/shells/bash/5.nix @@ -6,8 +6,7 @@ , bison , util-linux - # patch for cygwin requires readline support -, interactive ? stdenv.hostPlatform.isCygwin +, interactive ? true , readline , withDocs ? null , forFHSEnv ? false diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix index dd5993b366950..dd1035cc3d539 100644 --- a/pkgs/stdenv/darwin/default.nix +++ b/pkgs/stdenv/darwin/default.nix @@ -153,7 +153,7 @@ let runtimeShell = prevStage.ccWrapperStdenv.shell; }; - bash = prevStage.bash or bootstrapTools; + bashNonInteractive = prevStage.bashNonInteractive or bootstrapTools; thisStdenv = import ../generic { name = "${name}-stdenv-darwin"; @@ -168,7 +168,7 @@ let inherit extraNativeBuildInputs; preHook = - lib.optionalString (!isBuiltByNixpkgsCompiler bash) '' + lib.optionalString (!isBuiltByNixpkgsCompiler bashNonInteractive) '' # Don't patch #!/interpreter because it leads to retained # dependencies on the bootstrapTools in the final stdenv. dontPatchShebangs=1 @@ -181,9 +181,9 @@ let export PATH_LOCALE=${prevStage.darwin.locale}/share/locale ''; - shell = bash + "/bin/bash"; + shell = bashNonInteractive + "/bin/bash"; initialPath = [ - bash + bashNonInteractive prevStage.file bootstrapTools ]; @@ -328,7 +328,7 @@ let # SDK packages include propagated packages and source release packages built during the bootstrap. sdkPackages = prevStage: { inherit (prevStage) - bash + bashNonInteractive libpng libxml2 libxo @@ -408,7 +408,7 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check # stage should only access the stage that came before it. ccWrapperStdenv = self.stdenv; - bash = bootstrapTools // { + bashNonInteractive = bootstrapTools // { shellPath = "/bin/bash"; }; @@ -600,7 +600,7 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check (llvmLibrariesPackages prevStage) { inherit (prevStage) - bash + bashNonInteractive cctools coreutils cpio @@ -847,14 +847,14 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check inherit (prevStage) ccWrapperStdenv; # Avoid an infinite recursion due to the SDK’s including ncurses, which depends on bash in its `dev` output. - bash = super.bash.override { stdenv = self.darwin.bootstrapStdenv; }; + bashNonInteractive = super.bashNonInteractive.override { stdenv = self.darwin.bootstrapStdenv; }; # Avoid pulling in a full python and its extra dependencies for the llvm/clang builds. libxml2 = super.libxml2.override { pythonSupport = false; }; # Use Bash from this stage to avoid propagating Bash from a previous stage to the final stdenv. ncurses = super.ncurses.override { - stdenv = self.darwin.bootstrapStdenv.override { shell = lib.getExe self.bash; }; + stdenv = self.darwin.bootstrapStdenv.override { shell = lib.getExe self.bashNonInteractive; }; }; darwin = super.darwin.overrideScope ( @@ -1162,7 +1162,7 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check extraAttrs = { inherit bootstrapTools; libc = prevStage.darwin.libSystem; - shellPackage = prevStage.bash; + shellPackage = prevStage.bashNonInteractive; }; disallowedRequisites = [ bootstrapTools.out ]; @@ -1172,7 +1172,7 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check with prevStage; [ apple-sdk - bash + bashNonInteractive bzip2.bin bzip2.out cc.expand-response-params diff --git a/pkgs/stdenv/freebsd/default.nix b/pkgs/stdenv/freebsd/default.nix index 8286b5d6076b5..c0a6f7e8ea080 100644 --- a/pkgs/stdenv/freebsd/default.nix +++ b/pkgs/stdenv/freebsd/default.nix @@ -74,7 +74,7 @@ let expand-response-params = ""; bsdcp = linkBootstrap { paths = [ "bin/bsdcp" ]; }; patchelf = linkBootstrap { paths = [ "bin/patchelf" ]; }; - bash = linkBootstrap { + bashNonInteractive = linkBootstrap { paths = [ "bin/bash" "bin/sh" @@ -376,13 +376,13 @@ let gawk diffutils patch - bash + bashNonInteractive xz gzip bzip2 bsdcp ]; - shell = "${prevStage.bash}/bin/bash"; + shell = "${prevStage.bashNonInteractive}/bin/bash"; stdenvNoCC = import ../generic { inherit config @@ -471,7 +471,7 @@ in # we CAN'T import LLVM because the compiler built here is used to build the final compiler and the final compiler must not be built by the bootstrap compiler inherit (bootstrapTools) patchelf - bash + bashNonInteractive curl coreutils diffutils diff --git a/pkgs/stdenv/generic/common-path.nix b/pkgs/stdenv/generic/common-path.nix index 32c8e278ad27f..9eeacd91bcbb4 100644 --- a/pkgs/stdenv/generic/common-path.nix +++ b/pkgs/stdenv/generic/common-path.nix @@ -10,7 +10,7 @@ pkgs.gzip pkgs.bzip2.bin pkgs.gnumake - pkgs.bash + pkgs.bashNonInteractive pkgs.patch pkgs.xz.bin diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index bae24800471bb..01faee1e69245 100644 --- a/pkgs/stdenv/linux/default.nix +++ b/pkgs/stdenv/linux/default.nix @@ -770,7 +770,7 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check bzip2 xz zlib - bash + bashNonInteractive binutils coreutils diffutils @@ -806,7 +806,7 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check gzip bzip2 xz - bash + bashNonInteractive binutils.bintools coreutils diffutils @@ -866,7 +866,7 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check gzip bzip2 xz - bash + bashNonInteractive coreutils diffutils findutils diff --git a/pkgs/tools/compression/zstd/default.nix b/pkgs/tools/compression/zstd/default.nix index 27f66232b7adf..9923adf3e0017 100644 --- a/pkgs/tools/compression/zstd/default.nix +++ b/pkgs/tools/compression/zstd/default.nix @@ -3,7 +3,7 @@ stdenv, fetchFromGitHub, cmake, - bash, + bashNonInteractive, gnugrep, fixDarwinDylibNames, file, @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake ] ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; - buildInputs = lib.optional stdenv.hostPlatform.isUnix bash; + buildInputs = lib.optional stdenv.hostPlatform.isUnix bashNonInteractive; patches = [ # This patches makes sure we do not attempt to use the MD5 implementation diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4a201065591ca..5d964e35e1b8c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5586,17 +5586,18 @@ with pkgs; ### SHELLS runtimeShell = "${runtimeShellPackage}${runtimeShellPackage.shellPath}"; - runtimeShellPackage = bash; + runtimeShellPackage = bashNonInteractive; - bash = lowPrio (callPackage ../shells/bash/5.nix { }); + bash = callPackage ../shells/bash/5.nix { }; + bashNonInteractive = lowPrio (callPackage ../shells/bash/5.nix { + interactive = false; + }); # WARNING: this attribute is used by nix-shell so it shouldn't be removed/renamed - bashInteractive = callPackage ../shells/bash/5.nix { - interactive = true; - }; - bashInteractiveFHS = callPackage ../shells/bash/5.nix { - interactive = true; + bashInteractive = bash; + bashFHS = callPackage ../shells/bash/5.nix { forFHSEnv = true; }; + bashInteractiveFHS = bashFHS; carapace = callPackage ../shells/carapace { buildGoModule = buildGo123Module; From e78debdfa7de0edbe97abf84c01b0a097055b3c5 Mon Sep 17 00:00:00 2001 From: Lin Jian Date: Tue, 4 Feb 2025 04:00:17 +0800 Subject: [PATCH 138/343] emacs: enable strictDeps for elisp packages This is a step towards the goal[1] of enabling strictDeps by default in Nixpkgs. This helps users write better buildInputs/nativeBuildinputs and checkInputs/nativeCheckInputs. It also makes the build faster because it reduces unnecessary runs of hooks added by addEnvHooks. Previously, emacs was only in nativeBuildInputs. After strictDeps is enabled, emacs has to be also in buildInputs to provide a header file needed[2] by dynamic modules from an elisp package. Only some elisp packages contain dynamic modules but we always add emacs to buildInputs since there is no harm. [1]: https://github.com/NixOS/nixpkgs/issues/178468 [2]: info "(elisp) Module Initialization" --- pkgs/applications/editors/emacs/build-support/generic.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/editors/emacs/build-support/generic.nix b/pkgs/applications/editors/emacs/build-support/generic.nix index 282d42d76284b..94f791d8f6cde 100644 --- a/pkgs/applications/editors/emacs/build-support/generic.nix +++ b/pkgs/applications/editors/emacs/build-support/generic.nix @@ -67,7 +67,7 @@ libBuildHelper.extendMkDerivation' stdenv.mkDerivation ( ''; inherit packageRequires; - buildInputs = finalAttrs.packageRequires ++ buildInputs; + buildInputs = [ emacs ] ++ finalAttrs.packageRequires ++ buildInputs; nativeBuildInputs = [ emacs texinfo @@ -77,6 +77,8 @@ libBuildHelper.extendMkDerivation' stdenv.mkDerivation ( setupHook = args.setupHook or setupHook; + strictDeps = args.strictDeps or true; + inherit turnCompilationWarningToError ignoreCompilationError; meta = From 1b5f66935d4d4365b89dde6c6407aaab48d83ad1 Mon Sep 17 00:00:00 2001 From: Lin Jian Date: Tue, 4 Feb 2025 04:07:35 +0800 Subject: [PATCH 139/343] emacsPackages.lsp-bridge: fix build when strictDeps is enabled --- .../emacs/elisp-packages/manual-packages/lsp-bridge/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lsp-bridge/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lsp-bridge/default.nix index cf1c84b3fd8bc..e7ae5f90b7a4b 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lsp-bridge/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lsp-bridge/default.nix @@ -56,7 +56,9 @@ melpaBuild { checkInputs = [ # Emacs packages tempel + ]; + nativeCheckInputs = [ # Executables basedpyright git From 544a3883c58abd7a3fc898bab86a4cde2e0c5097 Mon Sep 17 00:00:00 2001 From: Lin Jian Date: Tue, 4 Feb 2025 04:08:32 +0800 Subject: [PATCH 140/343] emacsPackages.erlang: fix build when strictDeps is enabled --- .../editors/emacs/elisp-packages/melpa-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix index c632a27869be3..0b378079f542e 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix @@ -214,8 +214,10 @@ let }); erlang = super.erlang.overrideAttrs (attrs: { - buildInputs = attrs.buildInputs ++ [ + nativeBuildInputs = attrs.nativeBuildInputs or [ ] ++ [ pkgs.perl + ]; + buildInputs = attrs.buildInputs or [ ] ++ [ pkgs.ncurses ]; }); From d5f17b0e32d586703100da45db16b16b7c25b5fa Mon Sep 17 00:00:00 2001 From: Lin Jian Date: Tue, 4 Feb 2025 04:09:12 +0800 Subject: [PATCH 141/343] emacsPackages.zmq: fix build when strictDeps is enabled --- .../editors/emacs/elisp-packages/melpa-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix index 0b378079f542e..1c04ae5c8be7d 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix @@ -597,11 +597,13 @@ let export EZMQ_LIBDIR=$(mktemp -d) make ''; - nativeBuildInputs = old.nativeBuildInputs ++ [ + nativeBuildInputs = old.nativeBuildInputs or [ ] ++ [ pkgs.autoconf pkgs.automake pkgs.pkg-config pkgs.libtool + ]; + buildInputs = old.buildInputs or [ ] ++ [ (pkgs.zeromq.override { enableDrafts = true; }) ]; postInstall = (old.postInstall or "") + "\n" + '' From 76c1961929918a0397b4e111f42674456e8438e9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 5 Feb 2025 00:30:26 +0000 Subject: [PATCH 142/343] amf-headers: 1.4.35 -> 1.4.36 --- pkgs/by-name/am/amf-headers/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/am/amf-headers/package.nix b/pkgs/by-name/am/amf-headers/package.nix index 1fa67faf9cd8f..45ed5afaaedba 100644 --- a/pkgs/by-name/am/amf-headers/package.nix +++ b/pkgs/by-name/am/amf-headers/package.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "amf-headers"; - version = "1.4.35"; + version = "1.4.36"; src = fetchFromGitHub { owner = "GPUOpen-LibrariesAndSDKs"; repo = "AMF"; rev = "v${version}"; - sha256 = "sha256-QhiM9JMEVbkTiY03hOWj0hYjHbf5lEZUz597+d3zY5E="; + sha256 = "sha256-u6gvdc1acemd01TO5EbuF3H7HkEJX4GUx73xCo71yPY="; }; installPhase = '' From 19cb56507a7103330c6d0e4fa2b36d712ee504f8 Mon Sep 17 00:00:00 2001 From: Lin Jian Date: Wed, 5 Feb 2025 11:52:08 +0800 Subject: [PATCH 143/343] emacs: stop adding packageRequires to buildInputs According to dependency propagation rules[1], this is redundant since we already add packageRequires to propagatedBuildInputs. [1]: https://github.com/NixOS/nixpkgs/blob/730c3a8ddf044683369f6184e47a23431f19823d/doc/stdenv/stdenv.chapter.md?plain=1#L314-L344 --- pkgs/applications/editors/emacs/build-support/generic.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/editors/emacs/build-support/generic.nix b/pkgs/applications/editors/emacs/build-support/generic.nix index 94f791d8f6cde..3dd047273389f 100644 --- a/pkgs/applications/editors/emacs/build-support/generic.nix +++ b/pkgs/applications/editors/emacs/build-support/generic.nix @@ -67,7 +67,7 @@ libBuildHelper.extendMkDerivation' stdenv.mkDerivation ( ''; inherit packageRequires; - buildInputs = [ emacs ] ++ finalAttrs.packageRequires ++ buildInputs; + buildInputs = [ emacs ] ++ buildInputs; nativeBuildInputs = [ emacs texinfo From 67195ad54a58430b47777545b370c20aa713bee5 Mon Sep 17 00:00:00 2001 From: Lin Jian Date: Wed, 5 Feb 2025 11:20:09 +0800 Subject: [PATCH 144/343] emacs: move the setup hook from elisp build helper to emacs The hook is used to construct EMACSLOADPATH and EMACSNATIVELOADPATH from elisp packages in buildInputs for emacs in nativeBuildInputs to use during the build of an elisp package. Emacs is the right place to set this hook, which is similar to the fact that cc-wrapper[1] is the right place to set a hook[2] constructing NIX_CFLAGS_COMPILE. [1]: https://github.com/NixOS/nixpkgs/blob/17bfa4436fdbee1374b1797c8a9ddc8a3570cf51/pkgs/build-support/cc-wrapper/default.nix#L461 [2]: https://github.com/NixOS/nixpkgs/blob/17bfa4436fdbee1374b1797c8a9ddc8a3570cf51/pkgs/build-support/cc-wrapper/setup-hook.sh#L86 --- .../editors/emacs/build-support/elpa.nix | 2 -- .../editors/emacs/build-support/generic.nix | 18 ------------------ .../editors/emacs/build-support/melpa.nix | 2 -- pkgs/applications/editors/emacs/make-emacs.nix | 3 +++ .../emacs-funcs.sh => setup-hook.sh} | 2 ++ 5 files changed, 5 insertions(+), 22 deletions(-) rename pkgs/applications/editors/emacs/{build-support/emacs-funcs.sh => setup-hook.sh} (94%) diff --git a/pkgs/applications/editors/emacs/build-support/elpa.nix b/pkgs/applications/editors/emacs/build-support/elpa.nix index 1b30a5ac898d8..995ed9879387f 100644 --- a/pkgs/applications/editors/emacs/build-support/elpa.nix +++ b/pkgs/applications/editors/emacs/build-support/elpa.nix @@ -5,7 +5,6 @@ stdenv, emacs, texinfo, - writeText, }: let @@ -15,7 +14,6 @@ let stdenv emacs texinfo - writeText ; }; libBuildHelper = import ./lib-build-helper.nix; diff --git a/pkgs/applications/editors/emacs/build-support/generic.nix b/pkgs/applications/editors/emacs/build-support/generic.nix index 94f791d8f6cde..c239d2c864eb1 100644 --- a/pkgs/applications/editors/emacs/build-support/generic.nix +++ b/pkgs/applications/editors/emacs/build-support/generic.nix @@ -5,27 +5,12 @@ stdenv, emacs, texinfo, - writeText, ... }: let inherit (lib) optionalAttrs; - setupHook = writeText "setup-hook.sh" '' - source ${./emacs-funcs.sh} - - if [[ ! -v emacsHookDone ]]; then - emacsHookDone=1 - - # If this is for a wrapper derivation, emacs and the dependencies are all - # run-time dependencies. If this is for precompiling packages into bytecode, - # emacs is a compile-time dependency of the package. - addEnvHooks "$hostOffset" addEmacsVars - addEnvHooks "$targetOffset" addEmacsVars - fi - ''; - libBuildHelper = import ./lib-build-helper.nix; in @@ -75,8 +60,6 @@ libBuildHelper.extendMkDerivation' stdenv.mkDerivation ( propagatedBuildInputs = finalAttrs.packageRequires ++ propagatedBuildInputs; propagatedUserEnvPkgs = finalAttrs.packageRequires ++ propagatedUserEnvPkgs; - setupHook = args.setupHook or setupHook; - strictDeps = args.strictDeps or true; inherit turnCompilationWarningToError ignoreCompilationError; @@ -102,7 +85,6 @@ libBuildHelper.extendMkDerivation' stdenv.mkDerivation ( # the current package's elisp files are in the load path, otherwise # (require 'file-b) from file-a.el in the same package will fail. mkdir -p $out/share/emacs/native-lisp - source ${./emacs-funcs.sh} addEmacsVars "$out" # package-activate-all is used to activate packages. In other builder diff --git a/pkgs/applications/editors/emacs/build-support/melpa.nix b/pkgs/applications/editors/emacs/build-support/melpa.nix index 6aa9d2502d76f..df0cea7098ef6 100644 --- a/pkgs/applications/editors/emacs/build-support/melpa.nix +++ b/pkgs/applications/editors/emacs/build-support/melpa.nix @@ -7,7 +7,6 @@ fetchFromGitHub, emacs, texinfo, - writeText, }: let @@ -17,7 +16,6 @@ let stdenv emacs texinfo - writeText ; }; libBuildHelper = import ./lib-build-helper.nix; diff --git a/pkgs/applications/editors/emacs/make-emacs.nix b/pkgs/applications/editors/emacs/make-emacs.nix index 775fc03b48926..6a7dbf488591e 100644 --- a/pkgs/applications/editors/emacs/make-emacs.nix +++ b/pkgs/applications/editors/emacs/make-emacs.nix @@ -61,6 +61,7 @@ texinfo, webkitgtk_4_0, wrapGAppsHook3, + writeText, zlib, # Boolean flags @@ -508,6 +509,8 @@ mkDerivation (finalAttrs: { patchelf --add-needed "libXcursor.so.1" "$out/bin/emacs" ''; + setupHook = ./setup-hook.sh; + passthru = { inherit withNativeCompilation; inherit withTreeSitter; diff --git a/pkgs/applications/editors/emacs/build-support/emacs-funcs.sh b/pkgs/applications/editors/emacs/setup-hook.sh similarity index 94% rename from pkgs/applications/editors/emacs/build-support/emacs-funcs.sh rename to pkgs/applications/editors/emacs/setup-hook.sh index b6b2a3bd374d9..15b1840de2c14 100644 --- a/pkgs/applications/editors/emacs/build-support/emacs-funcs.sh +++ b/pkgs/applications/editors/emacs/setup-hook.sh @@ -21,3 +21,5 @@ addEmacsVars () { addToEmacsNativeLoadPath "$1/share/emacs/native-lisp" fi } + +addEnvHooks "$targetOffset" addEmacsVars From 1bde8cce944face86f5edfe8b2810d21a91ebbb7 Mon Sep 17 00:00:00 2001 From: Lin Jian Date: Wed, 5 Feb 2025 16:49:48 +0800 Subject: [PATCH 145/343] emacs: replace ad hoc implementation with lib.extendMkDerivation This causes 0 rebuilds. --- .../editors/emacs/build-support/elpa.nix | 51 +-- .../editors/emacs/build-support/generic.nix | 190 +++++------ .../emacs/build-support/lib-build-helper.nix | 5 - .../editors/emacs/build-support/melpa.nix | 307 +++++++++--------- .../editors/emacs/build-support/trivial.nix | 54 ++- 5 files changed, 301 insertions(+), 306 deletions(-) delete mode 100644 pkgs/applications/editors/emacs/build-support/lib-build-helper.nix diff --git a/pkgs/applications/editors/emacs/build-support/elpa.nix b/pkgs/applications/editors/emacs/build-support/elpa.nix index 995ed9879387f..fcaef43953efb 100644 --- a/pkgs/applications/editors/emacs/build-support/elpa.nix +++ b/pkgs/applications/editors/emacs/build-support/elpa.nix @@ -16,40 +16,41 @@ let texinfo ; }; - libBuildHelper = import ./lib-build-helper.nix; in -libBuildHelper.extendMkDerivation' genericBuild ( - finalAttrs: +lib.extendMkDerivation { + constructDrv = genericBuild; + extendDrvArgs = + finalAttrs: - { - pname, - dontUnpack ? true, - meta ? { }, - ... - }@args: + { + pname, + dontUnpack ? true, + meta ? { }, + ... + }@args: - { + { - elpa2nix = args.elpa2nix or ./elpa2nix.el; + elpa2nix = args.elpa2nix or ./elpa2nix.el; - inherit dontUnpack; + inherit dontUnpack; - installPhase = - args.installPhase or '' - runHook preInstall + installPhase = + args.installPhase or '' + runHook preInstall - emacs --batch -Q -l "$elpa2nix" \ - -f elpa2nix-install-package \ - "$src" "$out/share/emacs/site-lisp/elpa" + emacs --batch -Q -l "$elpa2nix" \ + -f elpa2nix-install-package \ + "$src" "$out/share/emacs/site-lisp/elpa" - runHook postInstall - ''; + runHook postInstall + ''; - meta = { - homepage = args.src.meta.homepage or "https://elpa.gnu.org/packages/${pname}.html"; - } // meta; - } + meta = { + homepage = args.src.meta.homepage or "https://elpa.gnu.org/packages/${pname}.html"; + } // meta; + }; -) +} diff --git a/pkgs/applications/editors/emacs/build-support/generic.nix b/pkgs/applications/editors/emacs/build-support/generic.nix index e61fb8bfe074d..ddab4bc70a002 100644 --- a/pkgs/applications/editors/emacs/build-support/generic.nix +++ b/pkgs/applications/editors/emacs/build-support/generic.nix @@ -11,100 +11,100 @@ let inherit (lib) optionalAttrs; - libBuildHelper = import ./lib-build-helper.nix; - in -libBuildHelper.extendMkDerivation' stdenv.mkDerivation ( - finalAttrs: - - { - buildInputs ? [ ], - nativeBuildInputs ? [ ], - packageRequires ? [ ], - propagatedBuildInputs ? [ ], - propagatedUserEnvPkgs ? [ ], - postInstall ? "", - meta ? { }, - turnCompilationWarningToError ? false, - ignoreCompilationError ? false, - ... - }@args: - - { - name = args.name or "emacs-${finalAttrs.pname}-${finalAttrs.version}"; - - unpackCmd = - args.unpackCmd or '' - case "$curSrc" in - *.el) - # keep original source filename without the hash - local filename=$(basename "$curSrc") - filename="''${filename:33}" - cp $curSrc $filename - chmod +w $filename - sourceRoot="." - ;; - *) - _defaultUnpack "$curSrc" - ;; - esac - ''; - - inherit packageRequires; - buildInputs = [ emacs ] ++ buildInputs; - nativeBuildInputs = [ - emacs - texinfo - ] ++ nativeBuildInputs; - propagatedBuildInputs = finalAttrs.packageRequires ++ propagatedBuildInputs; - propagatedUserEnvPkgs = finalAttrs.packageRequires ++ propagatedUserEnvPkgs; - - strictDeps = args.strictDeps or true; - - inherit turnCompilationWarningToError ignoreCompilationError; - - meta = - { - broken = false; - platforms = emacs.meta.platforms; - } - // optionalAttrs ((args.src.meta.homepage or "") != "") { - homepage = args.src.meta.homepage; - } - // meta; - } - - // optionalAttrs (emacs.withNativeCompilation or false) { - - addEmacsNativeLoadPath = args.addEmacsNativeLoadPath or true; - - postInstall = - '' - # Besides adding the output directory to the native load path, make sure - # the current package's elisp files are in the load path, otherwise - # (require 'file-b) from file-a.el in the same package will fail. - mkdir -p $out/share/emacs/native-lisp - addEmacsVars "$out" - - # package-activate-all is used to activate packages. In other builder - # helpers, package-initialize is used for this purpose because - # package-activate-all is not available before Emacs 27. - find $out/share/emacs -type f -name '*.el' -not -name ".dir-locals.el" -print0 \ - | xargs --verbose -0 -I {} -n 1 -P $NIX_BUILD_CORES sh -c \ - "emacs \ - --batch \ - -f package-activate-all \ - --eval '(setq native-comp-eln-load-path (cdr native-comp-eln-load-path))' \ - --eval '(let ((default-directory \"$out/share/emacs/site-lisp\")) (normal-top-level-add-subdirs-to-load-path))' \ - --eval '(setq large-file-warning-threshold nil)' \ - --eval '(setq byte-compile-error-on-warn ${ - if finalAttrs.turnCompilationWarningToError then "t" else "nil" - })' \ - -f batch-native-compile {} \ - || exit ${if finalAttrs.ignoreCompilationError then "0" else "\\$?"}" - '' - + postInstall; - } - -) +lib.extendMkDerivation { + constructDrv = stdenv.mkDerivation; + extendDrvArgs = + finalAttrs: + + { + buildInputs ? [ ], + nativeBuildInputs ? [ ], + packageRequires ? [ ], + propagatedBuildInputs ? [ ], + propagatedUserEnvPkgs ? [ ], + postInstall ? "", + meta ? { }, + turnCompilationWarningToError ? false, + ignoreCompilationError ? false, + ... + }@args: + + { + name = args.name or "emacs-${finalAttrs.pname}-${finalAttrs.version}"; + + unpackCmd = + args.unpackCmd or '' + case "$curSrc" in + *.el) + # keep original source filename without the hash + local filename=$(basename "$curSrc") + filename="''${filename:33}" + cp $curSrc $filename + chmod +w $filename + sourceRoot="." + ;; + *) + _defaultUnpack "$curSrc" + ;; + esac + ''; + + inherit packageRequires; + buildInputs = [ emacs ] ++ buildInputs; + nativeBuildInputs = [ + emacs + texinfo + ] ++ nativeBuildInputs; + propagatedBuildInputs = finalAttrs.packageRequires ++ propagatedBuildInputs; + propagatedUserEnvPkgs = finalAttrs.packageRequires ++ propagatedUserEnvPkgs; + + strictDeps = args.strictDeps or true; + + inherit turnCompilationWarningToError ignoreCompilationError; + + meta = + { + broken = false; + platforms = emacs.meta.platforms; + } + // optionalAttrs ((args.src.meta.homepage or "") != "") { + homepage = args.src.meta.homepage; + } + // meta; + } + + // optionalAttrs (emacs.withNativeCompilation or false) { + + addEmacsNativeLoadPath = args.addEmacsNativeLoadPath or true; + + postInstall = + '' + # Besides adding the output directory to the native load path, make sure + # the current package's elisp files are in the load path, otherwise + # (require 'file-b) from file-a.el in the same package will fail. + mkdir -p $out/share/emacs/native-lisp + addEmacsVars "$out" + + # package-activate-all is used to activate packages. In other builder + # helpers, package-initialize is used for this purpose because + # package-activate-all is not available before Emacs 27. + find $out/share/emacs -type f -name '*.el' -not -name ".dir-locals.el" -print0 \ + | xargs --verbose -0 -I {} -n 1 -P $NIX_BUILD_CORES sh -c \ + "emacs \ + --batch \ + -f package-activate-all \ + --eval '(setq native-comp-eln-load-path (cdr native-comp-eln-load-path))' \ + --eval '(let ((default-directory \"$out/share/emacs/site-lisp\")) (normal-top-level-add-subdirs-to-load-path))' \ + --eval '(setq large-file-warning-threshold nil)' \ + --eval '(setq byte-compile-error-on-warn ${ + if finalAttrs.turnCompilationWarningToError then "t" else "nil" + })' \ + -f batch-native-compile {} \ + || exit ${if finalAttrs.ignoreCompilationError then "0" else "\\$?"}" + '' + + postInstall; + }; + +} diff --git a/pkgs/applications/editors/emacs/build-support/lib-build-helper.nix b/pkgs/applications/editors/emacs/build-support/lib-build-helper.nix deleted file mode 100644 index 23267f592359e..0000000000000 --- a/pkgs/applications/editors/emacs/build-support/lib-build-helper.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ - extendMkDerivation' = - mkDerivationBase: attrsOverlay: fpargs: - (mkDerivationBase fpargs).overrideAttrs attrsOverlay; -} diff --git a/pkgs/applications/editors/emacs/build-support/melpa.nix b/pkgs/applications/editors/emacs/build-support/melpa.nix index df0cea7098ef6..1258f8b7c26dc 100644 --- a/pkgs/applications/editors/emacs/build-support/melpa.nix +++ b/pkgs/applications/editors/emacs/build-support/melpa.nix @@ -18,7 +18,6 @@ let texinfo ; }; - libBuildHelper = import ./lib-build-helper.nix; packageBuild = stdenv.mkDerivation { name = "package-build"; @@ -42,156 +41,158 @@ let in -libBuildHelper.extendMkDerivation' genericBuild ( - finalAttrs: - - { - /* - pname: Nix package name without special symbols and without version or - "emacs-" prefix. - */ - pname, - /* - ename: Original Emacs package name, possibly containing special symbols. - Default: pname - */ - ename ? pname, - /* - version: Either a stable version such as "1.2" or an unstable version. - An unstable version can use either Nix format (preferred) such as - "1.2-unstable-2024-06-01" or MELPA format such as "20240601.1230". - */ - version, - /* - commit: Optional package history commit. - Default: src.rev or "unknown" - This will be written into the generated package but it is not needed during - the build process. - */ - commit ? (finalAttrs.src.rev or "unknown"), - /* - files: Optional recipe property specifying the files used to build the package. - If null, do not set it in recipe, keeping the default upstream behaviour. - Default: null - */ - files ? null, - /* - recipe: Optional MELPA recipe. - Default: a minimally functional recipe - This can be a path of a recipe file, a string of the recipe content or an empty string. - The default value is used if it is an empty string. - */ - recipe ? "", - preUnpack ? "", - postUnpack ? "", - meta ? { }, - ... - }@args: - - { - - elpa2nix = args.elpa2nix or ./elpa2nix.el; - melpa2nix = args.melpa2nix or ./melpa2nix.el; - - inherit - commit - ename - files - recipe - ; +lib.extendMkDerivation { + constructDrv = genericBuild; + extendDrvArgs = + finalAttrs: + + { + /* + pname: Nix package name without special symbols and without version or + "emacs-" prefix. + */ + pname, + /* + ename: Original Emacs package name, possibly containing special symbols. + Default: pname + */ + ename ? pname, + /* + version: Either a stable version such as "1.2" or an unstable version. + An unstable version can use either Nix format (preferred) such as + "1.2-unstable-2024-06-01" or MELPA format such as "20240601.1230". + */ + version, + /* + commit: Optional package history commit. + Default: src.rev or "unknown" + This will be written into the generated package but it is not needed during + the build process. + */ + commit ? (finalAttrs.src.rev or "unknown"), + /* + files: Optional recipe property specifying the files used to build the package. + If null, do not set it in recipe, keeping the default upstream behaviour. + Default: null + */ + files ? null, + /* + recipe: Optional MELPA recipe. + Default: a minimally functional recipe + This can be a path of a recipe file, a string of the recipe content or an empty string. + The default value is used if it is an empty string. + */ + recipe ? "", + preUnpack ? "", + postUnpack ? "", + meta ? { }, + ... + }@args: + + { + + elpa2nix = args.elpa2nix or ./elpa2nix.el; + melpa2nix = args.melpa2nix or ./melpa2nix.el; + + inherit + commit + ename + files + recipe + ; + + packageBuild = args.packageBuild or packageBuild; + + melpaVersion = + args.melpaVersion or ( + let + parsed = + lib.flip builtins.match version + # match -unstable-YYYY-MM-DD format + "^.*-unstable-([[:digit:]]{4})-([[:digit:]]{2})-([[:digit:]]{2})$"; + unstableVersionInNixFormat = parsed != null; # heuristics + date = builtins.concatStringsSep "" parsed; + time = "0"; # unstable version in nix format lacks this info + in + if unstableVersionInNixFormat then date + "." + time else finalAttrs.version + ); + + preUnpack = + '' + mkdir -p "$NIX_BUILD_TOP/recipes" + recipeFile="$NIX_BUILD_TOP/recipes/$ename" + if [ -r "$recipe" ]; then + ln -s "$recipe" "$recipeFile" + nixInfoLog "link recipe" + elif [ -n "$recipe" ]; then + printf "%s" "$recipe" > "$recipeFile" + nixInfoLog "write recipe" + else + cat > "$recipeFile" <<'EOF' + (${finalAttrs.ename} :fetcher git :url "" ${ + lib.optionalString (finalAttrs.files != null) ":files ${finalAttrs.files}" + }) + EOF + nixInfoLog "use default recipe" + fi + nixInfoLog "recipe content:" "$(< $recipeFile)" + unset -v recipeFile + + ln -s "$packageBuild" "$NIX_BUILD_TOP/package-build" + + mkdir -p "$NIX_BUILD_TOP/packages" + '' + + preUnpack; + + postUnpack = + '' + mkdir -p "$NIX_BUILD_TOP/working" + ln -s "$NIX_BUILD_TOP/$sourceRoot" "$NIX_BUILD_TOP/working/$ename" + '' + + postUnpack; + + buildPhase = + args.buildPhase or '' + runHook preBuild + + # This is modified from stdenv buildPhase. foundMakefile is used in stdenv checkPhase. + if [[ ! ( -z "''${makeFlags-}" && -z "''${makefile:-}" && ! ( -e Makefile || -e makefile || -e GNUmakefile ) ) ]]; then + foundMakefile=1 + fi + + pushd "$NIX_BUILD_TOP" + + emacs --batch -Q \ + -L "$NIX_BUILD_TOP/package-build" \ + -l "$melpa2nix" \ + -f melpa2nix-build-package \ + $ename $melpaVersion $commit + + popd + + runHook postBuild + ''; + + installPhase = + args.installPhase or '' + runHook preInstall + + archive="$NIX_BUILD_TOP/packages/$ename-$melpaVersion.el" + if [ ! -f "$archive" ]; then + archive="$NIX_BUILD_TOP/packages/$ename-$melpaVersion.tar" + fi + + emacs --batch -Q \ + -l "$elpa2nix" \ + -f elpa2nix-install-package \ + "$archive" "$out/share/emacs/site-lisp/elpa" + + runHook postInstall + ''; + + meta = { + homepage = args.src.meta.homepage or "https://melpa.org/#/${pname}"; + } // meta; + }; - packageBuild = args.packageBuild or packageBuild; - - melpaVersion = - args.melpaVersion or ( - let - parsed = - lib.flip builtins.match version - # match -unstable-YYYY-MM-DD format - "^.*-unstable-([[:digit:]]{4})-([[:digit:]]{2})-([[:digit:]]{2})$"; - unstableVersionInNixFormat = parsed != null; # heuristics - date = builtins.concatStringsSep "" parsed; - time = "0"; # unstable version in nix format lacks this info - in - if unstableVersionInNixFormat then date + "." + time else finalAttrs.version - ); - - preUnpack = - '' - mkdir -p "$NIX_BUILD_TOP/recipes" - recipeFile="$NIX_BUILD_TOP/recipes/$ename" - if [ -r "$recipe" ]; then - ln -s "$recipe" "$recipeFile" - nixInfoLog "link recipe" - elif [ -n "$recipe" ]; then - printf "%s" "$recipe" > "$recipeFile" - nixInfoLog "write recipe" - else - cat > "$recipeFile" <<'EOF' - (${finalAttrs.ename} :fetcher git :url "" ${ - lib.optionalString (finalAttrs.files != null) ":files ${finalAttrs.files}" - }) - EOF - nixInfoLog "use default recipe" - fi - nixInfoLog "recipe content:" "$(< $recipeFile)" - unset -v recipeFile - - ln -s "$packageBuild" "$NIX_BUILD_TOP/package-build" - - mkdir -p "$NIX_BUILD_TOP/packages" - '' - + preUnpack; - - postUnpack = - '' - mkdir -p "$NIX_BUILD_TOP/working" - ln -s "$NIX_BUILD_TOP/$sourceRoot" "$NIX_BUILD_TOP/working/$ename" - '' - + postUnpack; - - buildPhase = - args.buildPhase or '' - runHook preBuild - - # This is modified from stdenv buildPhase. foundMakefile is used in stdenv checkPhase. - if [[ ! ( -z "''${makeFlags-}" && -z "''${makefile:-}" && ! ( -e Makefile || -e makefile || -e GNUmakefile ) ) ]]; then - foundMakefile=1 - fi - - pushd "$NIX_BUILD_TOP" - - emacs --batch -Q \ - -L "$NIX_BUILD_TOP/package-build" \ - -l "$melpa2nix" \ - -f melpa2nix-build-package \ - $ename $melpaVersion $commit - - popd - - runHook postBuild - ''; - - installPhase = - args.installPhase or '' - runHook preInstall - - archive="$NIX_BUILD_TOP/packages/$ename-$melpaVersion.el" - if [ ! -f "$archive" ]; then - archive="$NIX_BUILD_TOP/packages/$ename-$melpaVersion.tar" - fi - - emacs --batch -Q \ - -l "$elpa2nix" \ - -f elpa2nix-install-package \ - "$archive" "$out/share/emacs/site-lisp/elpa" - - runHook postInstall - ''; - - meta = { - homepage = args.src.meta.homepage or "https://melpa.org/#/${pname}"; - } // meta; - } - -) +} diff --git a/pkgs/applications/editors/emacs/build-support/trivial.nix b/pkgs/applications/editors/emacs/build-support/trivial.nix index 9a3b59246497b..f95b6f3cdfc35 100644 --- a/pkgs/applications/editors/emacs/build-support/trivial.nix +++ b/pkgs/applications/editors/emacs/build-support/trivial.nix @@ -2,40 +2,38 @@ { callPackage, lib, ... }@envargs: -let - libBuildHelper = import ./lib-build-helper.nix; -in +lib.extendMkDerivation { + constructDrv = callPackage ./generic.nix envargs; + extendDrvArgs = + finalAttrs: -libBuildHelper.extendMkDerivation' (callPackage ./generic.nix envargs) ( - finalAttrs: + args: - args: + { + buildPhase = + args.buildPhase or '' + runHook preBuild - { - buildPhase = - args.buildPhase or '' - runHook preBuild + # This is modified from stdenv buildPhase. foundMakefile is used in stdenv checkPhase. + if [[ ! ( -z "''${makeFlags-}" && -z "''${makefile:-}" && ! ( -e Makefile || -e makefile || -e GNUmakefile ) ) ]]; then + foundMakefile=1 + fi - # This is modified from stdenv buildPhase. foundMakefile is used in stdenv checkPhase. - if [[ ! ( -z "''${makeFlags-}" && -z "''${makefile:-}" && ! ( -e Makefile || -e makefile || -e GNUmakefile ) ) ]]; then - foundMakefile=1 - fi + emacs -l package -f package-initialize -L . --batch -f batch-byte-compile *.el - emacs -l package -f package-initialize -L . --batch -f batch-byte-compile *.el + runHook postBuild + ''; - runHook postBuild - ''; + installPhase = + args.installPhase or '' + runHook preInstall - installPhase = - args.installPhase or '' - runHook preInstall + LISPDIR=$out/share/emacs/site-lisp + install -d $LISPDIR + install *.el *.elc $LISPDIR - LISPDIR=$out/share/emacs/site-lisp - install -d $LISPDIR - install *.el *.elc $LISPDIR + runHook postInstall + ''; + }; - runHook postInstall - ''; - } - -) +} From faaacb5ce2c82e80a1a1b5f58267512e90d0577f Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Mon, 27 Jan 2025 03:17:27 +0100 Subject: [PATCH 146/343] cmake: set CMAKE_BUILD_PARALLEL_LEVEL https://cmake.org/cmake/help/latest/envvar/CMAKE_BUILD_PARALLEL_LEVEL.html --- pkgs/by-name/cm/cmake/setup-hook.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/cm/cmake/setup-hook.sh b/pkgs/by-name/cm/cmake/setup-hook.sh index 3df8b9bd986b0..a6f5a4f57a5b7 100755 --- a/pkgs/by-name/cm/cmake/setup-hook.sh +++ b/pkgs/by-name/cm/cmake/setup-hook.sh @@ -131,6 +131,9 @@ cmakeConfigurePhase() { enableParallelBuilding=1 echo "cmake: enabled parallel building" fi + if [[ "$enableParallelBuilding" -ne 0 ]]; then + export CMAKE_BUILD_PARALLEL_LEVEL=$NIX_BUILD_CORES + fi if ! [[ -v enableParallelInstalling ]]; then enableParallelInstalling=1 From 5d3a18acc1f71ab276fdea69c743fddd6b9af39e Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Mon, 27 Jan 2025 03:19:37 +0100 Subject: [PATCH 147/343] python3Packages.pyhepmc: use default CMAKE_BUILD_PARALLEL_LEVEL --- pkgs/development/python-modules/pyhepmc/default.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/development/python-modules/pyhepmc/default.nix b/pkgs/development/python-modules/pyhepmc/default.nix index 427d9ecabeba7..44ee5b78be858 100644 --- a/pkgs/development/python-modules/pyhepmc/default.nix +++ b/pkgs/development/python-modules/pyhepmc/default.nix @@ -43,10 +43,6 @@ buildPythonPackage rec { CMAKE_ARGS = [ "-DEXTERNAL_PYBIND11=ON" ]; - preBuild = '' - export CMAKE_BUILD_PARALLEL_LEVEL="$NIX_BUILD_CORES" - ''; - nativeCheckInputs = [ graphviz pytestCheckHook From f8fbe0731d2c10f08f6c7aa6e1632a9bed2d84be Mon Sep 17 00:00:00 2001 From: Simon Hauser Date: Tue, 4 Feb 2025 08:07:26 +0100 Subject: [PATCH 148/343] python313Packages.paramiko: 3.5.0 -> 3.5.1 Changelog: https://www.paramiko.org/changelog.html#3.5.1 --- pkgs/development/python-modules/paramiko/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/paramiko/default.nix b/pkgs/development/python-modules/paramiko/default.nix index ca46a101158ba..2e531c16a2e3c 100644 --- a/pkgs/development/python-modules/paramiko/default.nix +++ b/pkgs/development/python-modules/paramiko/default.nix @@ -18,12 +18,12 @@ buildPythonPackage rec { pname = "paramiko"; - version = "3.5.0"; + version = "3.5.1"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-rRHlQNpPVc7dpSkx8aP4Eqgjinr39ipg3lOM2AuygSQ="; + hash = "sha256-ssZlvEWyshW9fX8DmQGxSwZ9oA86EeZkCZX9WPJmSCI="; }; patches = [ From 2a2d89fa856efd08930b4d47dc9895f0cb779ab2 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 5 Feb 2025 16:54:24 +0100 Subject: [PATCH 149/343] cacert: 3.107 -> 3.108 https://github.com/nss-dev/nss/compare/NSS_3_107_BRANCH...NSS_3_108_RTM Adds the D-Trust 2023 TLS Roots. (mozbz#1938245) --- pkgs/data/misc/cacert/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/misc/cacert/default.nix b/pkgs/data/misc/cacert/default.nix index 15b1528316f8d..3a78ed813f929 100644 --- a/pkgs/data/misc/cacert/default.nix +++ b/pkgs/data/misc/cacert/default.nix @@ -23,7 +23,7 @@ let lib.concatStringsSep "\n\n" extraCertificateStrings ); - srcVersion = "3.107"; + srcVersion = "3.108"; version = if nssOverride != null then nssOverride.version else srcVersion; meta = with lib; { homepage = "https://curl.haxx.se/docs/caextract.html"; @@ -47,7 +47,7 @@ let owner = "nss-dev"; repo = "nss"; rev = "NSS_${lib.replaceStrings [ "." ] [ "_" ] version}_RTM"; - hash = "sha256-c6ks/pBvZHipNkmBy784s96zMYP+D9q3VlVrPVSohLw="; + hash = "sha256-L2XRj3D8SsS2QYQFDLwGtaPoZ7tN4kz8hGdVKefFSu8="; }; dontBuild = true; From 913528a75d9bcb295e77f1dba9676f6d3157428e Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sun, 28 Apr 2024 15:49:10 +0100 Subject: [PATCH 150/343] ncurses: 6.4 -> 6.5 Changes: https://lists.gnu.org/archive/html/info-gnu/2024-04/msg00004.html Co-authored-by: Sandro --- pkgs/development/libraries/ncurses/default.nix | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix index 0a713f848e52b..1a38261db70b1 100644 --- a/pkgs/development/libraries/ncurses/default.nix +++ b/pkgs/development/libraries/ncurses/default.nix @@ -16,15 +16,12 @@ }: stdenv.mkDerivation (finalAttrs: { - version = "6.4.20221231"; + version = "6.5"; pname = "ncurses" + lib.optionalString (abiVersion == "5") "-abi5-compat"; src = fetchurl { - urls = [ - "https://invisible-island.net/archives/ncurses/ncurses-${lib.versions.majorMinor finalAttrs.version}.tar.gz" - "https://ftp.gnu.org/gnu/ncurses/ncurses-${lib.versions.majorMinor finalAttrs.version}.tar.gz" - ]; - hash = "sha256-aTEoPZrIfFBz8wtikMTHXyFjK7T8NgOsgQCBK+0kgVk="; + url = "https://invisible-island.net/archives/ncurses/ncurses-${finalAttrs.version}.tar.gz"; + hash = "sha256-E22RvCaamleF5fnpgLx2q1dCj2BM4+WlqQzrx2eXHMY="; }; outputs = [ "out" "dev" "man" ]; From faf10ffd4d440333bc052c06ca2e0e071b72354a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 6 Feb 2025 01:29:47 +0000 Subject: [PATCH 151/343] hdf5-cpp: 1.14.5 -> 1.14.6 --- pkgs/tools/misc/hdf5/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/hdf5/default.nix b/pkgs/tools/misc/hdf5/default.nix index 4ee7101efd53c..23e469383adc8 100644 --- a/pkgs/tools/misc/hdf5/default.nix +++ b/pkgs/tools/misc/hdf5/default.nix @@ -31,7 +31,7 @@ let in stdenv.mkDerivation rec { - version = "1.14.5"; + version = "1.14.6"; pname = "hdf5" + lib.optionalString cppSupport "-cpp" @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { owner = "HDFGroup"; repo = "hdf5"; rev = "hdf5_${version}"; - hash = "sha256-bvtSeyqqrBXVAMzUtiKOhO9RR4SCO+3GnsLux4Mig6I="; + hash = "sha256-mJTax+VWAL3Amkq3Ij8fxazY2nfpMOTxYMUQlTvY/rg="; }; passthru = { From c04ff867f31bfa03478497f20302a640246a0563 Mon Sep 17 00:00:00 2001 From: Lin Jian Date: Thu, 6 Feb 2025 23:51:59 +0800 Subject: [PATCH 152/343] emacsPackages.lsp-bridge: fix error introduced by git merge --- .../elisp-packages/manual-packages/lsp-bridge/default.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lsp-bridge/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lsp-bridge/default.nix index bbd643c531c18..13d04b7b5a235 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lsp-bridge/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lsp-bridge/default.nix @@ -66,9 +66,6 @@ melpaBuild { go gopls python - ]; - - nativeCheckInputs = [ writableTmpDirAsHomeHook ]; From a037949fa3b0c78c5a67d804bc96d9275a2a2a0f Mon Sep 17 00:00:00 2001 From: Joao Palharini Date: Tue, 14 Jan 2025 10:27:18 -0300 Subject: [PATCH 153/343] libpng: 1.6.43 -> 1.6.46 --- pkgs/development/libraries/libpng/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/libpng/default.nix b/pkgs/development/libraries/libpng/default.nix index 9e508efcec84e..42846a114cb53 100644 --- a/pkgs/development/libraries/libpng/default.nix +++ b/pkgs/development/libraries/libpng/default.nix @@ -10,21 +10,21 @@ assert zlib != null; let - patchVersion = "1.6.43"; + patchVersion = "1.6.46"; patch_src = fetchurl { url = "mirror://sourceforge/libpng-apng/libpng-${patchVersion}-apng.patch.gz"; - hash = "sha256-0QdXnpDVU4bQDmCG6nUJQvIqBLmrR2u6DGYHcM76/iI="; + hash = "sha256-Kb7C39BG71HVLz5TIPkfr/yWvge0HZy51D2d9Veg0wM="; }; whenPatched = lib.optionalString apngSupport; in stdenv.mkDerivation (finalAttrs: { pname = "libpng" + whenPatched "-apng"; - version = "1.6.43"; + version = "1.6.46"; src = fetchurl { url = "mirror://sourceforge/libpng/libpng-${finalAttrs.version}.tar.xz"; - hash = "sha256-alygZSOSotfJ2yrltAIQhDwLvAgcvUEIJasAzFnxSmw="; + hash = "sha256-86qLcAOZirkqTpkGwY0ZhT6Zn507ypvRZo9U+oFwfLE="; }; postPatch = whenPatched "gunzip < ${patch_src} | patch -Np1" From 12147fbbc666d918a3e1df36be396fca37946424 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 6 Feb 2025 21:43:25 +0100 Subject: [PATCH 154/343] python313Packages.types-greenlet: init at 3.1.0.20241221 --- .../python-modules/types-greenlet/default.nix | 31 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/development/python-modules/types-greenlet/default.nix diff --git a/pkgs/development/python-modules/types-greenlet/default.nix b/pkgs/development/python-modules/types-greenlet/default.nix new file mode 100644 index 0000000000000..b5cf7e5d0a4ad --- /dev/null +++ b/pkgs/development/python-modules/types-greenlet/default.nix @@ -0,0 +1,31 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + setuptools, +}: + +buildPythonPackage rec { + pname = "types-greenlet"; + version = "3.1.0.20241221"; + pyproject = true; + + src = fetchPypi { + pname = "types_greenlet"; + inherit version; + hash = "sha256-e89X9T4QNsmsuULqh793bDmZXmM1ekUCVB7r5dsLWJc="; + }; + + build-system = [ setuptools ]; + + doCheck = false; + + pythonImportsCheck = [ "greenlet-stubs" ]; + + meta = { + description = "Typing stubs for greenlet"; + homepage = "https://github.com/python/typeshed"; + license = lib.licenses.asl20; + maintainers = [ ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7e557091f1dae..02ffcd8ffbd24 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -17531,6 +17531,8 @@ self: super: with self; { types-futures = callPackage ../development/python-modules/types-futures { }; + types-greenlet = callPackage ../development/python-modules/types-greenlet { }; + types-html5lib = callPackage ../development/python-modules/types-html5lib { }; types-ipaddress = callPackage ../development/python-modules/types-ipaddress { }; From 706eb97de9da1b73f68a9d47fb6469aa7db2dc99 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 6 Feb 2025 21:56:18 +0100 Subject: [PATCH 155/343] python313Packages.sqlalchemy: 2.0.37 -> 2.0.38 https://github.com/sqlalchemy/sqlalchemy/releases/tag/rel_2_0_38 --- .../python-modules/sqlalchemy/default.nix | 33 +++++++++---------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/pkgs/development/python-modules/sqlalchemy/default.nix b/pkgs/development/python-modules/sqlalchemy/default.nix index 44a129176dfe2..fff3fe067247c 100644 --- a/pkgs/development/python-modules/sqlalchemy/default.nix +++ b/pkgs/development/python-modules/sqlalchemy/default.nix @@ -15,6 +15,7 @@ # optionals aiomysql, + # TODO: aioodbc aiosqlite, asyncmy, asyncpg, @@ -28,10 +29,11 @@ psycopg, psycopg2, psycopg2cffi, - # TODO: pymssql + pymssql, pymysql, pyodbc, - # TODO: sqlcipher3 + sqlcipher3, + types-greenlet, # tests mock, @@ -41,7 +43,7 @@ buildPythonPackage rec { pname = "sqlalchemy"; - version = "2.0.37"; + version = "2.0.38"; pyproject = true; disabled = pythonOlder "3.7"; @@ -50,27 +52,28 @@ buildPythonPackage rec { owner = "sqlalchemy"; repo = "sqlalchemy"; tag = "rel_${lib.replaceStrings [ "." ] [ "_" ] version}"; - hash = "sha256-KyYENF0c+Ki3k0Ba8v0quY86Jqi6EN3d0onHmzFnSOw="; + hash = "sha256-If4PEBD67pm0fs1TZkJTKNuFPRfc6SxIEm94ymyDvow="; }; postPatch = '' sed -i '/tag_build = dev/d' setup.cfg ''; - nativeBuildInputs = [ setuptools ] ++ lib.optionals (!isPyPy) [ cython ]; + build-system = [ setuptools ] ++ lib.optionals (!isPyPy) [ cython ]; - propagatedBuildInputs = [ + dependencies = [ greenlet typing-extensions ]; optional-dependencies = lib.fix (self: { asyncio = [ greenlet ]; - mypy = [ mypy ]; - mssql = [ pyodbc ]; - mssql_pymysql = [ - # TODO: pymssql + mypy = [ + mypy + types-greenlet ]; + mssql = [ pyodbc ]; + mssql_pymysql = [ pymssql ]; mssql_pyodbc = [ pyodbc ]; mysql = [ mysqlclient ]; mysql_connector = [ mysql-connector ]; @@ -86,14 +89,10 @@ buildPythonPackage rec { postgresql_psycopgbinary = [ psycopg ]; pymysql = [ pymysql ]; aiomysql = [ aiomysql ] ++ self.asyncio; + # TODO: aioodbc asyncmy = [ asyncmy ] ++ self.asyncio; - aiosqlite = [ - aiosqlite - typing-extensions - ] ++ self.asyncio; - sqlcipher = [ - # TODO: sqlcipher3 - ]; + aiosqlite = [ aiosqlite ] ++ self.asyncio; + sqlcipher = [ sqlcipher3 ]; }); nativeCheckInputs = [ From cd67c04bdb920dec46eea29483cceaed4fe17873 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 5 Feb 2025 11:20:34 +0100 Subject: [PATCH 156/343] python313Packages.aiozoneinfo: 0.2.1 -> 0.2.3 Diff: https://github.com/bluetooth-devices/aiozoneinfo/compare/refs/tags/v0.2.1...v0.2.3 Changelog: https://github.com/bluetooth-devices/aiozoneinfo/blob/0.2.3/CHANGELOG.md --- pkgs/development/python-modules/aiozoneinfo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiozoneinfo/default.nix b/pkgs/development/python-modules/aiozoneinfo/default.nix index 778fe976cae92..f0f0c22aa8b6b 100644 --- a/pkgs/development/python-modules/aiozoneinfo/default.nix +++ b/pkgs/development/python-modules/aiozoneinfo/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "aiozoneinfo"; - version = "0.2.1"; + version = "0.2.3"; pyproject = true; disabled = pythonOlder "3.9"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "bluetooth-devices"; repo = "aiozoneinfo"; tag = "v${version}"; - hash = "sha256-u7yQiy5xKK1A19cmpXjA4MMK4q7RvtuvwkUECnddzG8="; + hash = "sha256-7qd6Yk/K4BLocu8eQK0hLaw2r1jhWIHBr9W4KsAvmx8="; }; postPatch = '' From 33b5e7511785d5331efaead5d46a2f45547e780c Mon Sep 17 00:00:00 2001 From: Greg Hellings Date: Fri, 10 Jan 2025 09:51:30 -0600 Subject: [PATCH 157/343] icu: Bump default version from 74 to 76 --- doc/release-notes/rl-2505.section.md | 2 ++ pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/doc/release-notes/rl-2505.section.md b/doc/release-notes/rl-2505.section.md index 9c3a264db53ed..ba25fef1bfde8 100644 --- a/doc/release-notes/rl-2505.section.md +++ b/doc/release-notes/rl-2505.section.md @@ -12,6 +12,8 @@ It should generally be replaced with `rustPlatform.fetchCargoVendor`, but `rustPlatform.importCargoLock` may also be appropriate in some circumstances. `rustPlatform.buildRustPackage` users must set `useFetchCargoVendor` to `true` and regenerate the `cargoHash`. +- Default ICU version updated from 74 to 76 + ### Titanium removed {#sec-nixpkgs-release-25.05-incompatibilities-titanium-removed} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 78c9dc08dfddc..4bb983495e3a9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9269,7 +9269,7 @@ with pkgs; # # `icuReal` is provided in case the upstream icu package is needed on Darwin instead of the fork. # Note that the versioned icu packages always correspond to the upstream versions. - icuReal = icu74; + icuReal = icu76; icu = if stdenv.hostPlatform.isDarwin then darwin.ICU else icuReal; idasen = with python3Packages; toPythonApplication idasen; From 7c9ea7233557afb41b95c93590e5fc925449093c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 7 Feb 2025 01:07:55 +0000 Subject: [PATCH 158/343] libtasn1: 4.19.0 -> 4.20.0 --- pkgs/by-name/li/libtasn1/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/li/libtasn1/package.nix b/pkgs/by-name/li/libtasn1/package.nix index 21986252b919f..cc3ed0716a780 100644 --- a/pkgs/by-name/li/libtasn1/package.nix +++ b/pkgs/by-name/li/libtasn1/package.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { pname = "libtasn1"; - version = "4.19.0"; + version = "4.20.0"; src = fetchurl { url = "mirror://gnu/libtasn1/libtasn1-${version}.tar.gz"; - sha256 = "sha256-FhPwrBz0hNbsDOO4wG1WJjzHJC8cI7MNgtI940WmP3o="; + sha256 = "sha256-kuDjvUwC1K7udgNrLd2D8McyukzaXLcdWDJysjWHp2w="; }; outputs = [ From e1f9b54314c32251849622629a47bc2ca75e891a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 7 Feb 2025 02:58:23 +0100 Subject: [PATCH 159/343] python313Packages.django_4: 4.2.18 -> 4.2.19 https://docs.djangoproject.com/en/4.2/releases/4.2.19/ --- pkgs/development/python-modules/django/4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django/4.nix b/pkgs/development/python-modules/django/4.nix index cb833a407c602..1c9ad471581b7 100644 --- a/pkgs/development/python-modules/django/4.nix +++ b/pkgs/development/python-modules/django/4.nix @@ -44,7 +44,7 @@ buildPythonPackage rec { pname = "django"; - version = "4.2.18"; + version = "4.2.19"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -53,7 +53,7 @@ buildPythonPackage rec { owner = "django"; repo = "django"; rev = "refs/tags/${version}"; - hash = "sha256-aOTfZDJsEfWHXxkvTgyc2E9ye3LpzHG1bJTo40Dke4I="; + hash = "sha256-aSTrtZs8WyZ/wr01N7Mi7M3A8MlZ6rB9fBuMdCkKkok="; }; patches = From 71b850c3ec2dc5ccc7f17dff077f73797d8a501e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 7 Feb 2025 04:43:30 +0100 Subject: [PATCH 160/343] python313Packages.hypothesis: 6.124.1 -> 6.125.2 https://hypothesis.readthedocs.io/en/latest/changes.html#v6-125-2 --- pkgs/development/python-modules/hypothesis/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hypothesis/default.nix b/pkgs/development/python-modules/hypothesis/default.nix index 7865b913a8138..ceb79e3d04a04 100644 --- a/pkgs/development/python-modules/hypothesis/default.nix +++ b/pkgs/development/python-modules/hypothesis/default.nix @@ -13,6 +13,7 @@ python, sortedcontainers, stdenv, + pythonAtLeast, pythonOlder, sphinxHook, sphinx-rtd-theme, @@ -23,7 +24,7 @@ buildPythonPackage rec { pname = "hypothesis"; - version = "6.124.1"; + version = "6.125.2"; pyproject = true; disabled = pythonOlder "3.7"; @@ -32,7 +33,7 @@ buildPythonPackage rec { owner = "HypothesisWorks"; repo = "hypothesis"; rev = "hypothesis-python-${version}"; - hash = "sha256-d8uvkCiEASP5sF6kvuxqAss/KC0RNgG9n9ZdCcBTPCs="; + hash = "sha256-W+rTh9ymJTvq7KA4w8YrG6Z10tcfrtKGJ1MW716nVHs="; }; # I tried to package sphinx-selective-exclude, but it throws @@ -86,6 +87,9 @@ buildPythonPackage rec { "test_observability" "test_assume_has_status_reason" "test_observability_captures_stateful_reprs" + ] + ++ lib.optionals (pythonAtLeast "3.13") [ + "test_clean_source" ]; pythonImportsCheck = [ "hypothesis" ]; From b158812f3b9f787f3023c5bf207c34a347e55019 Mon Sep 17 00:00:00 2001 From: Sefa Eyeoglu Date: Wed, 5 Feb 2025 09:52:36 +0100 Subject: [PATCH 161/343] curl: 8.11.1 -> 8.12.0 https://github.com/curl/curl/releases/tag/curl-8_12_0 https://curl.se/ch/8.12.0.html Fixes three low severity vulnerabilities: - CVE-2025-0725: https://curl.se/docs/CVE-2025-0725.html - CVE-2025-0665: https://curl.se/docs/CVE-2025-0665.html - CVE-2025-0167: https://curl.se/docs/CVE-2025-0167.html Signed-off-by: Sefa Eyeoglu --- .../cu/curlMinimal/fix-eventfd-free.patch | 33 ----- .../curlMinimal/fix-password-only-netrc.patch | 123 ------------------ pkgs/by-name/cu/curlMinimal/package.nix | 11 +- 3 files changed, 2 insertions(+), 165 deletions(-) delete mode 100644 pkgs/by-name/cu/curlMinimal/fix-eventfd-free.patch delete mode 100644 pkgs/by-name/cu/curlMinimal/fix-password-only-netrc.patch diff --git a/pkgs/by-name/cu/curlMinimal/fix-eventfd-free.patch b/pkgs/by-name/cu/curlMinimal/fix-eventfd-free.patch deleted file mode 100644 index 5b0979fd4cbdc..0000000000000 --- a/pkgs/by-name/cu/curlMinimal/fix-eventfd-free.patch +++ /dev/null @@ -1,33 +0,0 @@ -From ff5091aa9f73802e894b1cbdf24ab84e103200e2 Mon Sep 17 00:00:00 2001 -From: Andy Pan -Date: Thu, 12 Dec 2024 12:48:56 +0000 -Subject: [PATCH] async-thread: avoid closing eventfd twice - -When employing eventfd for socketpair, there is only one file -descriptor. Closing that fd twice might result in fd corruption. -Thus, we should avoid closing the eventfd twice, following the -pattern in lib/multi.c. - -Fixes #15725 -Closes #15727 -Reported-by: Christian Heusel ---- - lib/asyn-thread.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/lib/asyn-thread.c b/lib/asyn-thread.c -index a58e4b790494..32d496b107cb 100644 ---- a/lib/asyn-thread.c -+++ b/lib/asyn-thread.c -@@ -195,9 +195,11 @@ void destroy_thread_sync_data(struct thread_sync_data *tsd) - * close one end of the socket pair (may be done in resolver thread); - * the other end (for reading) is always closed in the parent thread. - */ -+#ifndef USE_EVENTFD - if(tsd->sock_pair[1] != CURL_SOCKET_BAD) { - wakeup_close(tsd->sock_pair[1]); - } -+#endif - #endif - memset(tsd, 0, sizeof(*tsd)); - } diff --git a/pkgs/by-name/cu/curlMinimal/fix-password-only-netrc.patch b/pkgs/by-name/cu/curlMinimal/fix-password-only-netrc.patch deleted file mode 100644 index c0a442cc8f69f..0000000000000 --- a/pkgs/by-name/cu/curlMinimal/fix-password-only-netrc.patch +++ /dev/null @@ -1,123 +0,0 @@ -From 9fce2c55d4b0273ac99b59bd8cb982a6d96b88cf Mon Sep 17 00:00:00 2001 -From: Daniel Stenberg -Date: Tue, 17 Dec 2024 23:56:42 +0100 -Subject: [PATCH] netrc: fix password-only entries - -When a specific hostname matched, and only a password is set before -another machine is specified in the netrc file, the parser would not be -happy and stop there and return the password-only state. It instead -continued and did not return a match. - -Add test 2005 to verify this case - -Regression from e9b9bba, shipped in 8.11.1. - -Reported-by: Ben Zanin -Fixes #15767 -Closes #15768 ---- - lib/netrc.c | 7 +++++- - tests/data/Makefile.am | 2 +- - tests/data/test2005 | 55 ++++++++++++++++++++++++++++++++++++++++++ - 3 files changed, 62 insertions(+), 2 deletions(-) - create mode 100644 tests/data/test2005 - -diff --git a/lib/netrc.c b/lib/netrc.c -index cbc86484f6f8..b517c1dfab67 100644 ---- a/lib/netrc.c -+++ b/lib/netrc.c -@@ -267,7 +267,8 @@ static int parsenetrc(struct store_netrc *store, - retcode = NETRC_FAILED; /* allocation failed */ - goto out; - } -- found |= FOUND_PASSWORD; -+ if(!specific_login || our_login) -+ found |= FOUND_PASSWORD; - keyword = NONE; - } - else if(strcasecompare("login", tok)) -@@ -276,6 +277,10 @@ static int parsenetrc(struct store_netrc *store, - keyword = PASSWORD; - else if(strcasecompare("machine", tok)) { - /* a new machine here */ -+ if(found & FOUND_PASSWORD) { -+ done = TRUE; -+ break; -+ } - state = HOSTFOUND; - keyword = NONE; - found = 0; -diff --git a/tests/data/Makefile.am b/tests/data/Makefile.am -index bd9a0bbaaff1..105108309d52 100644 ---- a/tests/data/Makefile.am -+++ b/tests/data/Makefile.am -@@ -238,7 +238,7 @@ test1941 test1942 test1943 test1944 test1945 test1946 test1947 test1948 \ - test1955 test1956 test1957 test1958 test1959 test1960 test1964 \ - test1970 test1971 test1972 test1973 test1974 test1975 test1976 \ - \ --test2000 test2001 test2002 test2003 test2004 \ -+test2000 test2001 test2002 test2003 test2004 test2005 \ - \ - test2023 \ - test2024 test2025 test2026 test2027 test2028 test2029 test2030 test2031 \ -diff --git a/tests/data/test2005 b/tests/data/test2005 -new file mode 100644 -index 000000000000..91e256298a40 ---- /dev/null -+++ b/tests/data/test2005 -@@ -0,0 +1,55 @@ -+ -+ -+ -+HTTP -+netrc -+ -+ -+# -+# Server-side -+ -+ -+HTTP/1.1 200 OK -+Date: Fri, 05 Aug 2022 10:09:00 GMT -+Server: test-server/fake -+Content-Type: text/plain -+Content-Length: 6 -+Connection: close -+ -+-foo- -+ -+ -+ -+# -+# Client-side -+ -+ -+http -+ -+ -+netrc match with password only in file, no username. machine follows -+ -+ -+--netrc-optional --netrc-file %LOGDIR/netrc%TESTNUMBER http://%HOSTIP:%HTTPPORT/ -+ -+ -+machine %HOSTIP -+password 5up3r53cr37 -+ -+machine example.com -+ -+ -+ -+# -+# Verify data after the test has been "shot" -+ -+ -+GET / HTTP/1.1 -+Host: %HOSTIP:%HTTPPORT -+Authorization: Basic %b64[:5up3r53cr37]b64% -+User-Agent: curl/%VERSION -+Accept: */* -+ -+ -+ -+ diff --git a/pkgs/by-name/cu/curlMinimal/package.nix b/pkgs/by-name/cu/curlMinimal/package.nix index 1c58c12f98606..dc599c8410397 100644 --- a/pkgs/by-name/cu/curlMinimal/package.nix +++ b/pkgs/by-name/cu/curlMinimal/package.nix @@ -53,23 +53,16 @@ in stdenv.mkDerivation (finalAttrs: { pname = "curl"; - version = "8.11.1"; + version = "8.12.0"; src = fetchurl { urls = [ "https://curl.haxx.se/download/curl-${finalAttrs.version}.tar.xz" "https://github.com/curl/curl/releases/download/curl-${builtins.replaceStrings [ "." ] [ "_" ] finalAttrs.version}/curl-${finalAttrs.version}.tar.xz" ]; - hash = "sha256-x8p9tIsJCXQ+rvNCUNoCwZvGHU8dzt1mA/EJQJU2q1Y="; + hash = "sha256-mkYox2S+axqZCVZ8E+jncQQWCd9DshWPysTgXqcJfl0="; }; - patches = [ - # https://github.com/curl/curl/issues/15725 - ./fix-eventfd-free.patch - # https://github.com/curl/curl/issues/15767 - ./fix-password-only-netrc.patch - ]; - # this could be accomplished by updateAutotoolsGnuConfigScriptsHook, but that causes infinite recursion # necessary for FreeBSD code path in configure postPatch = '' From 4608f17aa64c42756c12d751da6ffacf90d98c19 Mon Sep 17 00:00:00 2001 From: Sefa Eyeoglu Date: Wed, 5 Feb 2025 09:55:03 +0100 Subject: [PATCH 162/343] curl: add Scrumplex to maintainers Signed-off-by: Sefa Eyeoglu --- pkgs/by-name/cu/curlMinimal/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/cu/curlMinimal/package.nix b/pkgs/by-name/cu/curlMinimal/package.nix index dc599c8410397..ee0a8924a6c6a 100644 --- a/pkgs/by-name/cu/curlMinimal/package.nix +++ b/pkgs/by-name/cu/curlMinimal/package.nix @@ -222,7 +222,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Command line tool for transferring files with URL syntax"; homepage = "https://curl.se/"; license = lib.licenses.curl; - maintainers = with lib.maintainers; [ lovek323 ]; + maintainers = with lib.maintainers; [ lovek323 Scrumplex ]; platforms = lib.platforms.all; # Fails to link against static brotli or gss broken = stdenv.hostPlatform.isStatic && (brotliSupport || gssSupport); From 9b93ca3c824b9990b4f742eabef0dce47fc855a2 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Wed, 5 Feb 2025 19:50:45 +0100 Subject: [PATCH 163/343] gdk-pixbuf: fix static MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We're unfortunately going to have to patch here, because an equivalent of static-deps.patch has been submitted upstream at least 3 times at this point, but these merge requests have all been ignored for more than a year. I have submitted static-lerc.patch upstream as well, but I'm not holding out hope… --- .../libraries/gdk-pixbuf/default.nix | 19 +++-- .../libraries/gdk-pixbuf/static-deps.patch | 31 ++++++++ .../libraries/gdk-pixbuf/static-lerc.patch | 79 +++++++++++++++++++ 3 files changed, 123 insertions(+), 6 deletions(-) create mode 100644 pkgs/development/libraries/gdk-pixbuf/static-deps.patch create mode 100644 pkgs/development/libraries/gdk-pixbuf/static-lerc.patch diff --git a/pkgs/development/libraries/gdk-pixbuf/default.nix b/pkgs/development/libraries/gdk-pixbuf/default.nix index 37e90255a403f..8c1d6926bcb93 100644 --- a/pkgs/development/libraries/gdk-pixbuf/default.nix +++ b/pkgs/development/libraries/gdk-pixbuf/default.nix @@ -51,6 +51,9 @@ stdenv.mkDerivation (finalAttrs: { patches = [ # Move installed tests to a separate output ./installed-tests-path.patch + + ./static-deps.patch + ./static-lerc.patch ]; # gdk-pixbuf-thumbnailer is not wrapped therefore strictDeps will work @@ -88,12 +91,16 @@ stdenv.mkDerivation (finalAttrs: { libpng ]; - mesonFlags = [ - "-Dgio_sniffing=false" - (lib.mesonBool "gtk_doc" withIntrospection) - (lib.mesonEnable "introspection" withIntrospection) - (lib.mesonEnable "others" true) - ]; + mesonFlags = + [ + "-Dgio_sniffing=false" + (lib.mesonBool "gtk_doc" withIntrospection) + (lib.mesonEnable "introspection" withIntrospection) + (lib.mesonEnable "others" true) + ] + ++ lib.optionals stdenv.hostPlatform.isStatic [ + "-Dbuiltin_loaders=all" + ]; postPatch = '' chmod +x build-aux/* # patchShebangs only applies to executables diff --git a/pkgs/development/libraries/gdk-pixbuf/static-deps.patch b/pkgs/development/libraries/gdk-pixbuf/static-deps.patch new file mode 100644 index 0000000000000..da52e432b4e77 --- /dev/null +++ b/pkgs/development/libraries/gdk-pixbuf/static-deps.patch @@ -0,0 +1,31 @@ +From 1b7cac1cbdb7078f575a3222be451a9bf1ac35ec Mon Sep 17 00:00:00 2001 +From: Alyssa Ross +Date: Wed, 31 Jan 2024 15:33:02 +0100 +Subject: [PATCH] build: add missing dependency to gdkpixbuf_dep + +This should match the dependencies passed to the library() call that +creates gdkpixbuf. Otherwise, linking the gdkpixbuf_bin executables +will fail if -Ddefault_library=static, because static libraries don't +carry dependency information themselves. +--- +Link: https://gitlab.gnome.org/GNOME/gdk-pixbuf/-/merge_requests/161 + + gdk-pixbuf/meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/gdk-pixbuf/meson.build b/gdk-pixbuf/meson.build +index a11926eee..450484d68 100644 +--- a/gdk-pixbuf/meson.build ++++ b/gdk-pixbuf/meson.build +@@ -269,7 +269,7 @@ endif + gdkpixbuf_dep = declare_dependency( + link_with: gdkpixbuf, + include_directories: root_inc, +- dependencies: gdk_pixbuf_deps, ++ dependencies: [ gdk_pixbuf_deps, included_loaders_deps ], + sources: [ gdkpixbuf_enum_h, built_girs ], + ) + meson.override_dependency('gdk-pixbuf-2.0', gdkpixbuf_dep) +-- +GitLab + diff --git a/pkgs/development/libraries/gdk-pixbuf/static-lerc.patch b/pkgs/development/libraries/gdk-pixbuf/static-lerc.patch new file mode 100644 index 0000000000000..737844a078abe --- /dev/null +++ b/pkgs/development/libraries/gdk-pixbuf/static-lerc.patch @@ -0,0 +1,79 @@ +From 3bca69d889fe545dda4ed9a8fab8ff3fe38ba487 Mon Sep 17 00:00:00 2001 +From: Alyssa Ross +Date: Wed, 5 Feb 2025 19:37:27 +0100 +Subject: [PATCH] build: fix linking with libtiff with lerc support + +Lerc is written in C++. When C and C++ objects are linked, a C++ +linker should be used to ensure C++-specific things are correctly +handled. See e.g. this comment in the Meson source for reference[1]. +One symptom of using a C linker to link with C++ objects is that +libstdc++ won't be linked when building static executables, causing +link failures. + +Unfortunately, Meson does not know whether dependencies found by +pkg-config are C++, and therefore require a C++ linker, so we have to +tell it ourselves to use a C++ linker. There's no way to check +whether libtiff is built with Lerc support, so we always use a C++ +linker if one is available and libtiff support is enabled. If a C++ +linker ends up being used to link only C objects, it shouldn't do any +harm. + +[1]: https://github.com/mesonbuild/meson/blob/9fd5281befe7881c9d1210c9e6865382bc0f2b08/mesonbuild/build.py#L1558-L1565 +--- +Link: https://gitlab.gnome.org/GNOME/gdk-pixbuf/-/merge_requests/181 + + gdk-pixbuf/meson.build | 6 ++++++ + meson.build | 6 ++++++ + 2 files changed, 12 insertions(+) + +diff --git a/gdk-pixbuf/meson.build b/gdk-pixbuf/meson.build +index 570625bfe..5cc11355f 100644 +--- a/gdk-pixbuf/meson.build ++++ b/gdk-pixbuf/meson.build +@@ -333,6 +333,11 @@ gdkpixbuf_bin = [ + [ 'gdk-pixbuf-query-loaders', [ 'queryloaders.c' ] ], + ] + ++bin_link_language = 'c' ++if loaders_cpp ++ bin_link_language = 'cpp' ++endif ++ + foreach bin: gdkpixbuf_bin + bin_name = bin[0] + bin_source = bin.get(1, bin_name + '.c') +@@ -342,6 +347,7 @@ foreach bin: gdkpixbuf_bin + dependencies: gdk_pixbuf_deps + [ gdkpixbuf_dep ], + include_directories: [ root_inc, gdk_pixbuf_inc ], + c_args: common_cflags + gdk_pixbuf_cflags, ++ link_language : bin_link_language, + install: true) + meson.override_find_program(bin_name, bin) + +diff --git a/meson.build b/meson.build +index f0d4812f4..31b3197fc 100644 +--- a/meson.build ++++ b/meson.build +@@ -345,6 +345,8 @@ endif + + # Don't check and build the tiff loader if native_windows_loaders is true + tiff_opt = get_option('tiff') ++tiff_dep = dependency('', required: false) ++loaders_cpp = false + if not tiff_opt.disabled() and not native_windows_loaders + # We currently don't have a fallback subproject, but this handles error + # reporting if tiff_opt is enabled. +@@ -353,6 +355,10 @@ if not tiff_opt.disabled() and not native_windows_loaders + if tiff_dep.found() + enabled_loaders += 'tiff' + loaders_deps += tiff_dep ++ ++ # If libtiff is built with LERC support, it should be linked with ++ # a C++ linker. ++ loaders_cpp = loaders_cpp or add_languages('cpp', required: false, native: false) + endif + endif + +-- +GitLab + From f4d78bac18c314c3c19fe8cbbffb7474603a613f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 7 Feb 2025 17:32:23 +0100 Subject: [PATCH 164/343] python313Packages.aiohttp: 3.11.11 -> 3.11.12 https://github.com/aio-libs/aiohttp/blob/v3.11.12/CHANGES.rst --- pkgs/development/python-modules/aiohttp/default.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiohttp/default.nix b/pkgs/development/python-modules/aiohttp/default.nix index b9f1f9e1c72ac..bf6a0326ff4ef 100644 --- a/pkgs/development/python-modules/aiohttp/default.nix +++ b/pkgs/development/python-modules/aiohttp/default.nix @@ -3,6 +3,7 @@ stdenv, buildPythonPackage, fetchFromGitHub, + fetchpatch2, substituteAll, isPy310, isPyPy, @@ -45,14 +46,14 @@ buildPythonPackage rec { pname = "aiohttp"; - version = "3.11.11"; + version = "3.11.12"; pyproject = true; src = fetchFromGitHub { owner = "aio-libs"; repo = "aiohttp"; tag = "v${version}"; - hash = "sha256-a4h8oFJxo1TSuhIjdUC0wqJSsepmzq6vjn5mwjw4bIw="; + hash = "sha256-GveluMxw100ZllDF+MT4QkZVD9q7UWHwF7IBK85J/j0="; }; patches = [ @@ -61,6 +62,12 @@ buildPythonPackage rec { llhttpDev = lib.getDev llhttp; llhttpLib = lib.getLib llhttp; }) + (fetchpatch2 { + # https://github.com/aio-libs/aiohttp/issues/10421 + # https://github.com/aio-libs/aiohttp/pull/10423 + url = "https://github.com/aio-libs/aiohttp/commit/51daf7190e7674773c22011a4e443df8b5e66437.patch"; + hash = "sha256-fADetk2tqg92J2sSgzKVTEhbQRSYl6430dxdVZuFx5I="; + }) ]; postPatch = '' From 1a1dbb7191c92ac3460d48b3a2cc995d0185ccb9 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 28 Jan 2025 01:10:51 +0100 Subject: [PATCH 165/343] librsvg: Fix update script This was missed in cace2b6eae83f813290074bc572ade8dff09c4fe --- pkgs/development/libraries/librsvg/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/librsvg/default.nix b/pkgs/development/libraries/librsvg/default.nix index 78f83a9a9d0f8..4be391239d5e6 100644 --- a/pkgs/development/libraries/librsvg/default.nix +++ b/pkgs/development/libraries/librsvg/default.nix @@ -209,7 +209,7 @@ stdenv.mkDerivation (finalAttrs: { nix ] } - update-source-version librsvg --ignore-same-version --source-key=cargoDeps > /dev/null + update-source-version librsvg --ignore-same-version --source-key=cargoDeps.vendorStaging > /dev/null '' ]; # Experimental feature: do not copy! From c202e21f6445759ce7b46387c4590f07fb0cab8a Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 28 Jan 2025 00:12:59 +0000 Subject: [PATCH 166/343] =?UTF-8?q?librsvg:=202.58.3=20=E2=86=92=202.59.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/librsvg/-/compare/2.58.3...2.59.2 - Ported to Meson. - Switched from gdk-pixbuf to Rust image loaders for external images. - Added Avif support. We also enable tests. --- .../development/libraries/librsvg/default.nix | 112 ++++++++---------- pkgs/top-level/all-packages.nix | 3 +- 2 files changed, 50 insertions(+), 65 deletions(-) diff --git a/pkgs/development/libraries/librsvg/default.nix b/pkgs/development/libraries/librsvg/default.nix index 4be391239d5e6..1c2b33ec094d2 100644 --- a/pkgs/development/libraries/librsvg/default.nix +++ b/pkgs/development/libraries/librsvg/default.nix @@ -3,25 +3,29 @@ stdenv, fetchurl, pkg-config, + meson, + ninja, glib, gdk-pixbuf, installShellFiles, pango, + freetype, + harfbuzz, cairo, libxml2, bzip2, - libintl, - ApplicationServices, + dav1d, Foundation, - libobjc, rustPlatform, rustc, + cargo-c, cargo-auditable-cargo-wrapper, gi-docgen, python3Packages, gnome, vala, - writeScript, + writeShellScript, + shared-mime-info, withIntrospection ? lib.meta.availableOn stdenv.hostPlatform gobject-introspection && stdenv.hostPlatform.emulatorAvailable buildPackages, @@ -45,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "librsvg"; - version = "2.58.3"; + version = "2.59.2"; outputs = [ @@ -58,13 +62,13 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/librsvg/${lib.versions.majorMinor finalAttrs.version}/librsvg-${finalAttrs.version}.tar.xz"; - hash = "sha256-SfKaCpL0wtGaLLQelqsvzn61veQYUMipFPz2VeMRCUQ="; + hash = "sha256-7NKT+wzDOMFwFxu8e8++pnJdBByV8xOF3JNUCZM+RZc="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) src; name = "librsvg-deps-${finalAttrs.version}"; - hash = "sha256-cO79X3M0B6WN4w0JeBh00EyaIdHcthOkeKhaYdTn2BQ="; + hash = "sha256-M8iNNWpYgLIm0X3sTjAaRIFYLIHnMyrkcsayFrLg25Y="; dontConfigure = true; }; @@ -79,7 +83,10 @@ stdenv.mkDerivation (finalAttrs: { gdk-pixbuf installShellFiles pkg-config + meson + ninja rustc + cargo-c cargo-auditable-cargo-wrapper python3Packages.docutils vala @@ -94,14 +101,13 @@ stdenv.mkDerivation (finalAttrs: { [ libxml2 bzip2 + dav1d pango - libintl - vala # for share/vala/Makefile.vapigen + freetype + vala ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - ApplicationServices Foundation - libobjc ]; propagatedBuildInputs = [ @@ -110,64 +116,43 @@ stdenv.mkDerivation (finalAttrs: { cairo ]; - configureFlags = - [ - (lib.enableFeature withIntrospection "introspection") - (lib.enableFeature withIntrospection "vala") + mesonFlags = [ + (lib.mesonEnable "introspection" withIntrospection) + (lib.mesonEnable "vala" withIntrospection) + (lib.mesonBool "tests" finalAttrs.finalPackage.doCheck) + ]; - "--enable-always-build-tests" - ] - ++ lib.optional stdenv.hostPlatform.isDarwin "--disable-Bsymbolic" - ++ lib.optional ( - stdenv.buildPlatform != stdenv.hostPlatform - ) "RUST_TARGET=${stdenv.hostPlatform.rust.rustcTarget}"; + # Probably broken MIME type detection. + doCheck = !stdenv.isDarwin; - doCheck = false; # all tests fail on libtool-generated rsvg-convert not being able to find coreutils + env = { + PKG_CONFIG_GDK_PIXBUF_2_0_GDK_PIXBUF_QUERY_LOADERS = writeShellScript "gdk-pixbuf-loader-loaders-wrapped" '' + ${lib.optionalString (stdenv.hostPlatform.emulatorAvailable buildPackages) (stdenv.hostPlatform.emulator buildPackages)} ${lib.getDev gdk-pixbuf}/bin/gdk-pixbuf-query-loaders + ''; + }; - GDK_PIXBUF_QUERYLOADERS = writeScript "gdk-pixbuf-loader-loaders-wrapped" '' - ${lib.optionalString (stdenv.hostPlatform.emulatorAvailable buildPackages) (stdenv.hostPlatform.emulator buildPackages)} ${lib.getDev gdk-pixbuf}/bin/gdk-pixbuf-query-loaders - ''; + postPatch = '' + patchShebangs \ + meson/cargo_wrapper.py \ + meson/makedef.py \ - # librsvg only links Foundation, but it also requiers libobjc. - env = lib.optionalAttrs stdenv.hostPlatform.isDarwin { NIX_LDFLAGS = "-lobjc"; }; + # Fix thumbnailer path + substituteInPlace gdk-pixbuf-loader/librsvg.thumbnailer.in \ + --replace-fail '@bindir@/gdk-pixbuf-thumbnailer' '${gdk-pixbuf}/bin/gdk-pixbuf-thumbnailer' - preConfigure = '' - PKG_CONFIG_VAPIGEN_VAPIGEN="$(type -p vapigen)" - export PKG_CONFIG_VAPIGEN_VAPIGEN + # Fix pkg-config file Requires section. + # https://gitlab.gnome.org/GNOME/librsvg/-/issues/1150 + substituteInPlace rsvg/meson.build \ + --replace-fail 'requires: library_dependencies_sole,' 'requires: [cairo_dep, gio_dep, glib_dep, pixbuf_dep],' ''; - # It wants to add loaders and update the loaders.cache in gdk-pixbuf - # Patching the Makefiles to it creates rsvg specific loaders and the - # relevant loader.cache here. - # The loaders.cache can be used by setting GDK_PIXBUF_MODULE_FILE to - # point to this file in a wrapper. - postConfigure = - '' - GDK_PIXBUF=$out/lib/gdk-pixbuf-2.0/2.10.0 - mkdir -p $GDK_PIXBUF/loaders - sed -i gdk-pixbuf-loader/Makefile \ - -e "s#gdk_pixbuf_moduledir = .*#gdk_pixbuf_moduledir = $GDK_PIXBUF/loaders#" \ - -e "s#gdk_pixbuf_cache_file = .*#gdk_pixbuf_cache_file = $GDK_PIXBUF/loaders.cache#" \ - -e "s#\$(GDK_PIXBUF_QUERYLOADERS)#GDK_PIXBUF_MODULEDIR=$GDK_PIXBUF/loaders \$(GDK_PIXBUF_QUERYLOADERS)#" - - # Fix thumbnailer path - sed -e "s#@bindir@\(/gdk-pixbuf-thumbnailer\)#${gdk-pixbuf}/bin\1#g" \ - -i gdk-pixbuf-loader/librsvg.thumbnailer.in - - # 'error: linker `cc` not found' when cross-compiling - export RUSTFLAGS="-Clinker=$CC" - '' - + - lib.optionalString - ( - (stdenv.buildPlatform != stdenv.hostPlatform) - && (stdenv.hostPlatform.emulatorAvailable buildPackages) - ) - '' - # the replacement is the native conditional - substituteInPlace gdk-pixbuf-loader/Makefile \ - --replace 'RUN_QUERY_LOADER_TEST = false' 'RUN_QUERY_LOADER_TEST = test -z "$(DESTDIR)"' \ - ''; + preCheck = '' + # Tests complain: Fontconfig error: No writable cache directories + export HOME=$TMPDIR + + # https://gitlab.gnome.org/GNOME/librsvg/-/issues/258#note_251789 + export XDG_DATA_DIRS=${shared-mime-info}/share:$XDG_DATA_DIRS + ''; # Not generated when cross compiling. postInstall = @@ -176,7 +161,8 @@ stdenv.mkDerivation (finalAttrs: { in lib.optionalString (stdenv.hostPlatform.emulatorAvailable buildPackages) '' # Merge gdkpixbuf and librsvg loaders - cat ${lib.getLib gdk-pixbuf}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache $GDK_PIXBUF/loaders.cache > $GDK_PIXBUF/loaders.cache.tmp + GDK_PIXBUF=$out/${gdk-pixbuf.binaryDir} + cat ${lib.getLib gdk-pixbuf}/${gdk-pixbuf.binaryDir}/loaders.cache $GDK_PIXBUF/loaders.cache > $GDK_PIXBUF/loaders.cache.tmp mv $GDK_PIXBUF/loaders.cache.tmp $GDK_PIXBUF/loaders.cache installShellCompletion --cmd rsvg-convert \ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 84621c59fda6a..55bca0f7aca4a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9724,8 +9724,7 @@ with pkgs; }; librsvg = callPackage ../development/libraries/librsvg { - inherit (darwin) libobjc; - inherit (darwin.apple_sdk.frameworks) ApplicationServices Foundation; + inherit (darwin.apple_sdk.frameworks) Foundation; }; libsigcxx = callPackage ../development/libraries/libsigcxx { }; From 5a3fb974780323d4c3fcce7a60841fc4994611d0 Mon Sep 17 00:00:00 2001 From: Lin Jian Date: Fri, 7 Feb 2025 00:01:04 +0800 Subject: [PATCH 167/343] emacs: fix string indentation for preUnpack of melpaBuild --- .../editors/emacs/build-support/melpa.nix | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/pkgs/applications/editors/emacs/build-support/melpa.nix b/pkgs/applications/editors/emacs/build-support/melpa.nix index 1258f8b7c26dc..bdca913e865d3 100644 --- a/pkgs/applications/editors/emacs/build-support/melpa.nix +++ b/pkgs/applications/editors/emacs/build-support/melpa.nix @@ -119,28 +119,28 @@ lib.extendMkDerivation { preUnpack = '' - mkdir -p "$NIX_BUILD_TOP/recipes" - recipeFile="$NIX_BUILD_TOP/recipes/$ename" - if [ -r "$recipe" ]; then - ln -s "$recipe" "$recipeFile" - nixInfoLog "link recipe" - elif [ -n "$recipe" ]; then - printf "%s" "$recipe" > "$recipeFile" - nixInfoLog "write recipe" - else - cat > "$recipeFile" <<'EOF' + mkdir -p "$NIX_BUILD_TOP/recipes" + recipeFile="$NIX_BUILD_TOP/recipes/$ename" + if [ -r "$recipe" ]; then + ln -s "$recipe" "$recipeFile" + nixInfoLog "link recipe" + elif [ -n "$recipe" ]; then + printf "%s" "$recipe" > "$recipeFile" + nixInfoLog "write recipe" + else + cat > "$recipeFile" <<'EOF' (${finalAttrs.ename} :fetcher git :url "" ${ lib.optionalString (finalAttrs.files != null) ":files ${finalAttrs.files}" }) EOF - nixInfoLog "use default recipe" - fi - nixInfoLog "recipe content:" "$(< $recipeFile)" - unset -v recipeFile + nixInfoLog "use default recipe" + fi + nixInfoLog "recipe content:" "$(< $recipeFile)" + unset -v recipeFile - ln -s "$packageBuild" "$NIX_BUILD_TOP/package-build" + ln -s "$packageBuild" "$NIX_BUILD_TOP/package-build" - mkdir -p "$NIX_BUILD_TOP/packages" + mkdir -p "$NIX_BUILD_TOP/packages" '' + preUnpack; From f0a6620784a99f69c4fa3563b4b219ad9eca9234 Mon Sep 17 00:00:00 2001 From: Artturin Date: Fri, 7 Feb 2025 19:35:03 +0200 Subject: [PATCH 168/343] librsvg: Put vala behind gobject-introspection conditional `vala` depends on `gobject-introspection` --- pkgs/development/libraries/librsvg/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/librsvg/default.nix b/pkgs/development/libraries/librsvg/default.nix index 1c2b33ec094d2..4f6e93674408f 100644 --- a/pkgs/development/libraries/librsvg/default.nix +++ b/pkgs/development/libraries/librsvg/default.nix @@ -89,12 +89,12 @@ stdenv.mkDerivation (finalAttrs: { cargo-c cargo-auditable-cargo-wrapper python3Packages.docutils - vala rustPlatform.cargoSetupHook ] ++ lib.optionals withIntrospection [ gobject-introspection gi-docgen + vala # vala bindings require GObject introspection ]; buildInputs = @@ -104,7 +104,9 @@ stdenv.mkDerivation (finalAttrs: { dav1d pango freetype - vala + ] + ++ lib.optionals withIntrospection [ + vala # for share/vala/Makefile.vapigen ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Foundation From 566feea79e6f2cbab742ac302be086cabc8cdf65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 7 Feb 2025 16:04:24 -0800 Subject: [PATCH 169/343] python313Packages.pikepdf: 9.5.1 -> 9.5.2 Diff: https://github.com/pikepdf/pikepdf/compare/refs/tags/v9.5.1...v9.5.2 Changelog: https://github.com/pikepdf/pikepdf/blob/v9.5.2/docs/releasenotes/version9.rst --- pkgs/development/python-modules/pikepdf/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/pikepdf/default.nix b/pkgs/development/python-modules/pikepdf/default.nix index 558d76e1eafec..da0ebb79b504d 100644 --- a/pkgs/development/python-modules/pikepdf/default.nix +++ b/pkgs/development/python-modules/pikepdf/default.nix @@ -25,11 +25,9 @@ buildPythonPackage rec { pname = "pikepdf"; - version = "9.5.1"; + version = "9.5.2"; pyproject = true; - disabled = pythonOlder "3.9"; - src = fetchFromGitHub { owner = "pikepdf"; repo = "pikepdf"; @@ -40,7 +38,7 @@ buildPythonPackage rec { postFetch = '' rm "$out/.git_archival.txt" ''; - hash = "sha256-Tzfzn0P9wGD1BbJ96F5CJXOk2CiLcd5qK+G8gVmkVtE="; + hash = "sha256-VYbfElC4YJFoO5VV4DVQ2Cu91RcFlsnZmRqJaNH8qRw="; }; patches = [ From 18f8faa9a7490b0a11efae47705722c14f6b7c02 Mon Sep 17 00:00:00 2001 From: Mitchell Pleune Date: Sat, 8 Feb 2025 01:16:39 +0000 Subject: [PATCH 170/343] pulseaudio: disable pthread_setaffinity_np test Fails builds in LXC containers where not all cores are enabled, causing the pthread_setaffinity_np call to return EINVAL --- pkgs/servers/pulseaudio/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/servers/pulseaudio/default.nix b/pkgs/servers/pulseaudio/default.nix index fa3333433ebb8..e548337948ab3 100644 --- a/pkgs/servers/pulseaudio/default.nix +++ b/pkgs/servers/pulseaudio/default.nix @@ -95,6 +95,11 @@ stdenv.mkDerivation rec { }) ]; + postPatch = '' + # Fails in LXC containers where not all cores are enabled, where this setaffinity call will return EINVAL + sed -i "/fail_unless(pthread_setaffinity_np/d" src/tests/once-test.c + ''; + outputs = [ "out" "dev" From 5dbfbc05e052e9d0d3e6e5bbbc12d6b48ab779b1 Mon Sep 17 00:00:00 2001 From: Mitchell Pleune Date: Fri, 7 Feb 2025 20:50:25 -0500 Subject: [PATCH 171/343] python3Packages.twisted: disable test_cpuCount test (#380245) This test checks for the number of availaible CPU cores using two different methods, and asserts that they are equal. In situations such as LXC containers that do not have all cores availaible, one method can still return the real total CPU core count, and the other will return the number enabled. This causes a needless build fail in LXC. --- pkgs/development/python-modules/twisted/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/twisted/default.nix b/pkgs/development/python-modules/twisted/default.nix index e461ba2df1632..199944707eb47 100644 --- a/pkgs/development/python-modules/twisted/default.nix +++ b/pkgs/development/python-modules/twisted/default.nix @@ -109,6 +109,10 @@ buildPythonPackage rec { "MulticastTests.test_multicast" "MulticastTests.test_multiListen" ]; + "src/twisted/trial/test/test_script.py" = [ + # Fails in LXC containers with less than all cores availaible (limits.cpu) + "AutoJobsTests.test_cpuCount" + ]; "src/twisted/internet/test/test_unix.py" = [ # flaky? "UNIXTestsBuilder.test_sendFileDescriptorTriggersPauseProducing" From 09549ed17fa0b1e26b15cc6f148102153dc16217 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 8 Feb 2025 11:53:01 +1000 Subject: [PATCH 172/343] gtest: 1.15.2 -> 1.16.0 (#380242) https://github.com/google/googletest/releases/tag/v1.16.0 --- pkgs/by-name/gt/gtest/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gt/gtest/package.nix b/pkgs/by-name/gt/gtest/package.nix index db81b1f957923..2678e192a3751 100644 --- a/pkgs/by-name/gt/gtest/package.nix +++ b/pkgs/by-name/gt/gtest/package.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { pname = "gtest"; - version = "1.15.2"; + version = "1.16.0"; outputs = [ "out" @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { owner = "google"; repo = "googletest"; rev = "v${version}"; - hash = "sha256-1OJ2SeSscRBNr7zZ/a8bJGIqAnhkg45re0j3DtPfcXM="; + hash = "sha256-01PK9LxqHno89gypd7ze5gDP4V3en2J5g6JZRqohDB0="; }; patches = [ From 536c98cb3283e5697f46c300569d472a7edd46a1 Mon Sep 17 00:00:00 2001 From: K900 Date: Sat, 8 Feb 2025 11:54:21 +0300 Subject: [PATCH 173/343] Revert "gcc: rework, clean up, and document the cursed symlink hack" --- .../compilers/gcc/common/builder.nix | 215 ++++++++---------- .../compilers/gcc/common/libgcc.nix | 13 +- 2 files changed, 102 insertions(+), 126 deletions(-) diff --git a/pkgs/development/compilers/gcc/common/builder.nix b/pkgs/development/compilers/gcc/common/builder.nix index 1a99835aa2bd5..633251910dbe1 100644 --- a/pkgs/development/compilers/gcc/common/builder.nix +++ b/pkgs/development/compilers/gcc/common/builder.nix @@ -3,6 +3,7 @@ stdenv, enableMultilib, targetConfig, + withoutTargetLibc, }: let @@ -209,136 +210,112 @@ originalAttrs: ''; preInstall = - # What follows is a horribly cursed hack. - # - # GCC will install its libraries to $out/lib, $out/lib32, $out/lib64, - # $out/$targetConfig/lib, $out/$targetConfig/lib32 or $out/$targetConfig/lib64, - # depending on whether it's built as native or cross, and the exact target spec. - # - # We can't predict what it's actually going to do, and we also can't just tell it - # to always install to $out/lib, but we want everything to end up in $out/lib - # for consistency (multilib weirdness aside). - # - # So, we create a bunch of symlinks before we run GCC's install phase, - # redirecting every possible directory it may want to write to to the place - # we actually want things to be installed. - # We will then nuke the symlinks in postInstall. - # - # FIXME: there must be a better way to do this. '' - declare -ga compatibilitySymlinks=() - - makeCompatibilitySymlink() { - for output in "$out" "''${!outputLib}"; do - local linkTarget="$1" - local linkName="$output/$2" - - echo "Creating compatibility symlink: $linkTarget -> $linkName" - - mkdir -p "$(dirname "$linkName")" - ln -s "$linkTarget" "$linkName" - compatibilitySymlinks+=("$linkName") - done - } + mkdir -p "$out/''${targetConfig}/lib" + mkdir -p "''${!outputLib}/''${targetConfig}/lib" '' + - # This will redirect $output/lib{32,64} to $output/lib. - # Multilib is special, because it creates $out/lib (for 32-bit) - # and $out/lib64 (for 64-bit). No other targets can have both. - lib.optionalString (!enableMultilib) '' - makeCompatibilitySymlink lib lib32 - makeCompatibilitySymlink lib lib64 + # if cross-compiling, link from $lib/lib to $lib/${targetConfig}. + # since native-compiles have $lib/lib as a directory (not a + # symlink), this ensures that in every case we can assume that + # $lib/lib contains the .so files + lib.optionalString (with stdenv; targetPlatform.config != hostPlatform.config) '' + ln -Ts "''${!outputLib}/''${targetConfig}/lib" $lib/lib '' + - # This will redirect $output/$targetConfig/lib{,32,64} to $output/lib. - lib.optionalString (with stdenv; targetPlatform.config != hostPlatform.config) '' - makeCompatibilitySymlink lib $targetConfig/lib32 - makeCompatibilitySymlink lib $targetConfig/lib64 - makeCompatibilitySymlink ../lib $targetConfig/lib + # Make `lib64` symlinks to `lib`. + lib.optionalString + (!enableMultilib && stdenv.hostPlatform.is64bit && !stdenv.hostPlatform.isMips64n32) + '' + ln -s lib "$out/''${targetConfig}/lib64" + ln -s lib "''${!outputLib}/''${targetConfig}/lib64" + '' + + + # On mips platforms, gcc follows the IRIX naming convention: + # + # $PREFIX/lib = mips32 + # $PREFIX/lib32 = mips64n32 + # $PREFIX/lib64 = mips64 + # + # Make `lib32` symlinks to `lib`. + lib.optionalString (!enableMultilib && stdenv.targetPlatform.isMips64n32) '' + ln -s lib "$out/''${targetConfig}/lib32" + ln -s lib "''${!outputLib}/''${targetConfig}/lib32" ''; - postInstall = - '' - # Clean up our compatibility symlinks (see above) - for link in "''${compatibilitySymlinks[@]}"; do - echo "Removing compatibility symlink: $link" - rm -f "$link" - done - - # Move runtime libraries to lib output. - moveToOutput "lib/lib*.so*" "''${!outputLib}" - moveToOutput "lib/lib*.la" "''${!outputLib}" - moveToOutput "lib/lib*.dylib" "''${!outputLib}" - moveToOutput "lib/lib*.dll.a" "''${!outputLib}" - moveToOutput "lib/lib*.dll" "''${!outputLib}" - moveToOutput "share/gcc-*/python" "''${!outputLib}" - - if [ -z "$enableShared" ]; then - moveToOutput "lib/lib*.a" "''${!outputLib}" - fi + postInstall = '' + # Move runtime libraries to lib output. + moveToOutput "''${targetConfig+$targetConfig/}lib/lib*.so*" "''${!outputLib}" + moveToOutput "''${targetConfig+$targetConfig/}lib/lib*.la" "''${!outputLib}" + moveToOutput "''${targetConfig+$targetConfig/}lib/lib*.dylib" "''${!outputLib}" + moveToOutput "''${targetConfig+$targetConfig/}lib/lib*.dll.a" "''${!outputLib}" + moveToOutput "''${targetConfig+$targetConfig/}lib/lib*.dll" "''${!outputLib}" + moveToOutput "share/gcc-*/python" "''${!outputLib}" + + if [ -z "$enableShared" ]; then + moveToOutput "''${targetConfig+$targetConfig/}lib/lib*.a" "''${!outputLib}" + fi - for i in "''${!outputLib}"/lib/*.{la,py}; do - substituteInPlace "$i" --replace "$out" "''${!outputLib}" - done + for i in "''${!outputLib}/''${targetConfig}"/lib/*.{la,py}; do + substituteInPlace "$i" --replace "$out" "''${!outputLib}" + done - if [ -n "$enableMultilib" ]; then - moveToOutput "lib64/lib*.so*" "''${!outputLib}" - moveToOutput "lib64/lib*.la" "''${!outputLib}" - moveToOutput "lib64/lib*.dylib" "''${!outputLib}" - moveToOutput "lib64/lib*.dll.a" "''${!outputLib}" - moveToOutput "lib64/lib*.dll" "''${!outputLib}" + if [ -n "$enableMultilib" ]; then + moveToOutput "''${targetConfig+$targetConfig/}lib64/lib*.so*" "''${!outputLib}" + moveToOutput "''${targetConfig+$targetConfig/}lib64/lib*.la" "''${!outputLib}" + moveToOutput "''${targetConfig+$targetConfig/}lib64/lib*.dylib" "''${!outputLib}" + moveToOutput "''${targetConfig+$targetConfig/}lib64/lib*.dll.a" "''${!outputLib}" + moveToOutput "''${targetConfig+$targetConfig/}lib64/lib*.dll" "''${!outputLib}" - for i in "''${!outputLib}"/lib64/*.{la,py}; do - substituteInPlace "$i" --replace "$out" "''${!outputLib}" - done - fi + for i in "''${!outputLib}/''${targetConfig}"/lib64/*.{la,py}; do + substituteInPlace "$i" --replace "$out" "''${!outputLib}" + done + fi - # Remove `fixincl' to prevent a retained dependency on the - # previous gcc. - rm -rf $out/libexec/gcc/*/*/install-tools - rm -rf $out/lib/gcc/*/*/install-tools - - # More dependencies with the previous gcc or some libs (gccbug stores the build command line) - rm -rf $out/bin/gccbug - - if type "install_name_tool"; then - for i in "''${!outputLib}"/lib/*.*.dylib "''${!outputLib}"/lib/*.so.[0-9]; do - install_name_tool -id "$i" "$i" || true - for old_path in $(otool -L "$i" | grep "$out" | awk '{print $1}'); do - new_path=`echo "$old_path" | sed "s,$out,''${!outputLib},"` - install_name_tool -change "$old_path" "$new_path" "$i" || true - done - done - fi + # Remove `fixincl' to prevent a retained dependency on the + # previous gcc. + rm -rf $out/libexec/gcc/*/*/install-tools + rm -rf $out/lib/gcc/*/*/install-tools - # Get rid of some "fixed" header files - rm -rfv $out/lib/gcc/*/*/include-fixed/{root,linux,sys/mount.h,bits/statx.h,pthread.h} - - # Replace hard links for i686-pc-linux-gnu-gcc etc. with symlinks. - for i in $out/bin/*-gcc*; do - if cmp -s $out/bin/gcc $i; then - ln -sfn gcc $i - fi - done - - for i in $out/bin/c++ $out/bin/*-c++* $out/bin/*-g++*; do - if cmp -s $out/bin/g++ $i; then - ln -sfn g++ $i - fi - done - - # Two identical man pages are shipped (moving and compressing is done later) - for i in "$out"/share/man/man1/*g++.1; do - if test -e "$i"; then - man_prefix=`echo "$i" | sed "s,.*/\(.*\)g++.1,\1,"` - ln -sf "$man_prefix"gcc.1 "$i" - fi - done - '' - + - # Recreate the target symlink so GCC can find libgcc_s on non-split builds. - lib.optionalString (with stdenv; targetPlatform.config != hostPlatform.config) '' - ln -s $lib/lib $lib/$targetConfig/lib - ''; + # More dependencies with the previous gcc or some libs (gccbug stores the build command line) + rm -rf $out/bin/gccbug + + if type "install_name_tool"; then + for i in "''${!outputLib}"/lib/*.*.dylib "''${!outputLib}"/lib/*.so.[0-9]; do + install_name_tool -id "$i" "$i" || true + for old_path in $(otool -L "$i" | grep "$out" | awk '{print $1}'); do + new_path=`echo "$old_path" | sed "s,$out,''${!outputLib},"` + install_name_tool -change "$old_path" "$new_path" "$i" || true + done + done + fi + + # Get rid of some "fixed" header files + rm -rfv $out/lib/gcc/*/*/include-fixed/{root,linux,sys/mount.h,bits/statx.h,pthread.h} + + # Replace hard links for i686-pc-linux-gnu-gcc etc. with symlinks. + for i in $out/bin/*-gcc*; do + if cmp -s $out/bin/gcc $i; then + ln -sfn gcc $i + fi + done + + for i in $out/bin/c++ $out/bin/*-c++* $out/bin/*-g++*; do + if cmp -s $out/bin/g++ $i; then + ln -sfn g++ $i + fi + done + + # Two identical man pages are shipped (moving and compressing is done later) + for i in "$out"/share/man/man1/*g++.1; do + if test -e "$i"; then + man_prefix=`echo "$i" | sed "s,.*/\(.*\)g++.1,\1,"` + ln -sf "$man_prefix"gcc.1 "$i" + fi + done + ''; + } + // lib.optionalAttrs ((stdenv.targetPlatform.config != stdenv.hostPlatform.config) && withoutTargetLibc) { + dontCheckForBrokenSymlinks = true; } )) diff --git a/pkgs/development/compilers/gcc/common/libgcc.nix b/pkgs/development/compilers/gcc/common/libgcc.nix index d38be2f6b76af..3d4bd90677632 100644 --- a/pkgs/development/compilers/gcc/common/libgcc.nix +++ b/pkgs/development/compilers/gcc/common/libgcc.nix @@ -105,15 +105,14 @@ lib.pipe drv + 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.${libgcc_s-version-major} $libgcc/lib/ - ln -s $libgcc/lib/libgcc_s.so $lib/lib/ - ln -s $libgcc/lib/libgcc_s.so.${libgcc_s-version-major} $lib/lib/ + mkdir -p $libgcc/${targetPlatformSlash}lib + mv $lib/${targetPlatformSlash}lib/libgcc_s.so $libgcc/${targetPlatformSlash}lib/ + mv $lib/${targetPlatformSlash}lib/libgcc_s.so.${libgcc_s-version-major} $libgcc/${targetPlatformSlash}lib/ + ln -s $libgcc/${targetPlatformSlash}lib/libgcc_s.so $lib/${targetPlatformSlash}lib/ + ln -s $libgcc/${targetPlatformSlash}lib/libgcc_s.so.${libgcc_s-version-major} $lib/${targetPlatformSlash}lib/ '' + lib.optionalString (targetPlatformSlash != "") '' - mkdir -p $libgcc/${targetPlatformSlash} - ln -s $libgcc/lib $libgcc/${targetPlatformSlash}lib + ln -s ${targetPlatformSlash}lib $libgcc/lib '' # # Nixpkgs ordinarily turns dynamic linking into pseudo-static linking: From b4b0914097642758bc9754c25e3d6727d595bdca Mon Sep 17 00:00:00 2001 From: Jade Lovelace Date: Fri, 7 Feb 2025 19:54:41 +0000 Subject: [PATCH 174/343] tcl: fix on static architectures This is a bit of a silly one. It's a symbol redefinition problem caused by autoconf being pessimistic, then a funny eval error where `stdenv.hostPlatform.extensions.dynamicLibrary` is not defined, say, when the platform does not support dynamic libraries. Fixes: https://github.com/NixOS/nixpkgs/issues/380168 --- pkgs/development/interpreters/tcl/generic.nix | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/tcl/generic.nix b/pkgs/development/interpreters/tcl/generic.nix index 51519f61b0f2e..43b9aefbde201 100644 --- a/pkgs/development/interpreters/tcl/generic.nix +++ b/pkgs/development/interpreters/tcl/generic.nix @@ -80,7 +80,14 @@ let "--disable-zipfs" ] ++ [ + # During cross compilation, the tcl build system assumes that libc + # functions are broken if it cannot test if they are broken or not and + # then causes a link error on static platforms due to symbol conflict. + # These functions are *checks notes* strtoul and strstr. These are + # never broken on modern platforms! "tcl_cv_strtod_unbroken=ok" + "tcl_cv_strtoul_unbroken=ok" + "tcl_cv_strstr_unbroken=ok" ] ++ lib.optional stdenv.hostPlatform.is64bit "--enable-64bit"; @@ -89,11 +96,17 @@ let postInstall = let dllExtension = stdenv.hostPlatform.extensions.sharedLibrary; + staticExtension = stdenv.hostPlatform.extensions.staticLibrary; in '' make install-private-headers ln -s $out/bin/tclsh${release} $out/bin/tclsh - ln -s $out/lib/libtcl${release}${dllExtension} $out/lib/libtcl${dllExtension} + if [[ -e $out/lib/libtcl${release}${staticExtension} ]]; then + ln -s $out/lib/libtcl${release}${staticExtension} $out/lib/libtcl${staticExtension} + fi + ${lib.optionalString (!stdenv.hostPlatform.isStatic) '' + ln -s $out/lib/libtcl${release}${dllExtension} $out/lib/libtcl${dllExtension} + ''} ''; meta = with lib; { From bf0f3484634ecce9f708f1369b6976beea737382 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 8 Feb 2025 10:45:47 +0100 Subject: [PATCH 175/343] libtasn1: add meta.changelog It's quite useful for r-ryantm's automatic pull requests. --- pkgs/by-name/li/libtasn1/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/li/libtasn1/package.nix b/pkgs/by-name/li/libtasn1/package.nix index cc3ed0716a780..badcca1215802 100644 --- a/pkgs/by-name/li/libtasn1/package.nix +++ b/pkgs/by-name/li/libtasn1/package.nix @@ -50,5 +50,6 @@ stdenv.mkDerivation rec { ''; license = licenses.lgpl2Plus; platforms = platforms.all; + changelog = "https://gitlab.com/gnutls/libtasn1/-/blob/v${version}/NEWS"; }; } From aa7d855d6318a039d0af1df507b5bd76179f5b53 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sat, 8 Feb 2025 12:13:36 +0100 Subject: [PATCH 176/343] openldap: fix static Closes: https://github.com/NixOS/nixpkgs/pull/235270 --- pkgs/by-name/op/openldap/package.nix | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/op/openldap/package.nix b/pkgs/by-name/op/openldap/package.nix index c353a4422d4cb..ccf8dcbc1635c 100644 --- a/pkgs/by-name/op/openldap/package.nix +++ b/pkgs/by-name/op/openldap/package.nix @@ -12,6 +12,10 @@ systemdMinimal, libxcrypt, + # options + withModules ? !stdenv.hostPlatform.isStatic, + withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemdMinimal, + # passthru nixosTests, }: @@ -25,6 +29,14 @@ stdenv.mkDerivation rec { hash = "sha256-LLfcc+nINA3/DZk1f7qleKvzDMZhnwUhlyxVVoHmsv8="; }; + patches = [ + (fetchurl { + name = "test069-sleep.patch"; + url = "https://bugs.openldap.org/attachment.cgi?id=1051"; + hash = "sha256-9LcFTswMQojrwHD+PRvlnSrwrISCFcboHypBwoDIZc0="; + }) + ]; + # TODO: separate "out" and "bin" outputs = [ "out" @@ -46,12 +58,16 @@ stdenv.mkDerivation rec { (cyrus_sasl.override { inherit openssl; }) - libsodium libtool openssl ] ++ lib.optionals (stdenv.hostPlatform.isLinux) [ libxcrypt # causes linking issues on *-darwin + ] + ++ lib.optionals withModules [ + libsodium + ] + ++ lib.optionals withSystemd [ systemdMinimal ]; @@ -61,10 +77,10 @@ stdenv.mkDerivation rec { configureFlags = [ - "--enable-argon2" "--enable-crypt" - "--enable-modules" "--enable-overlays" + (lib.enableFeature withModules "argon2") + (lib.enableFeature withModules "modules") ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "--with-yielding_select=yes" @@ -126,7 +142,7 @@ stdenv.mkDerivation rec { "INSTALL=install" ]; - postInstall = '' + postInstall = lib.optionalString withModules '' for module in $extraContribModules; do make $installFlags install -C contrib/slapd-modules/$module done From 9040833b3f88f47fd3d92470f0e1ea8e95acee5d Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sat, 8 Feb 2025 12:30:14 +0100 Subject: [PATCH 177/343] libpsl: backport pkg-config static fix This was merged 9 months ago, and still no release, so let's backport it, because the alternative is adding the same hack as curl in other packages, like libsoup. --- pkgs/by-name/cu/curlMinimal/package.nix | 5 ----- pkgs/by-name/li/libpsl/package.nix | 11 +++++++++++ 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/cu/curlMinimal/package.nix b/pkgs/by-name/cu/curlMinimal/package.nix index 1c58c12f98606..90eb467c4df7c 100644 --- a/pkgs/by-name/cu/curlMinimal/package.nix +++ b/pkgs/by-name/cu/curlMinimal/package.nix @@ -123,11 +123,6 @@ stdenv.mkDerivation (finalAttrs: { preConfigure = '' sed -e 's|/usr/bin|/no-such-path|g' -i.bak configure rm src/tool_hugehelp.c - '' + lib.optionalString (pslSupport && stdenv.hostPlatform.isStatic) '' - # curl doesn't understand that libpsl2 has deps because it doesn't use - # pkg-config. - # https://github.com/curl/curl/pull/12919 - configureFlagsArray+=("LIBS=-lidn2 -lunistring") ''; configureFlags = [ diff --git a/pkgs/by-name/li/libpsl/package.nix b/pkgs/by-name/li/libpsl/package.nix index 15cfedbdae893..81dd87ded09ce 100644 --- a/pkgs/by-name/li/libpsl/package.nix +++ b/pkgs/by-name/li/libpsl/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchurl, + fetchpatch, autoreconfHook, docbook_xsl, docbook_xml_dtd_43, @@ -25,6 +26,16 @@ stdenv.mkDerivation rec { hash = "sha256-mp9qjG7bplDPnqVUdc0XLdKEhzFoBOnHMgLZdXLNOi0="; }; + patches = [ + # Can be dropped on next release, or if we switch to Meson for + # this package. Test pkgsStatic.curl still builds. + (fetchpatch { + name = "static.patch"; + url = "https://github.com/rockdaboot/libpsl/commit/490bd6f98a2addcade55028ea60c36cce07e21e4.patch"; + hash = "sha256-7Uu9gaVuA9Aly2mmnhUVgv2BYQTSBODJ2rDl5xp0uVY="; + }) + ]; + outputs = [ "out" From 91e2c22089fb24b73e6b78bf17853cb5dc1dcf07 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sat, 8 Feb 2025 14:36:10 +0100 Subject: [PATCH 178/343] duktape: fix static Upstream build system has no way to build a shared library, but having the command line tool is better than nothing. --- pkgs/by-name/du/duktape/package.nix | 30 +++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/pkgs/by-name/du/duktape/package.nix b/pkgs/by-name/du/duktape/package.nix index c285f44a5e4ad..9cb67506022b4 100644 --- a/pkgs/by-name/du/duktape/package.nix +++ b/pkgs/by-name/du/duktape/package.nix @@ -21,19 +21,25 @@ stdenv.mkDerivation (finalAttrs: { validatePkgConfig ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ fixDarwinDylibNames ]; - buildPhase = '' - make -f Makefile.sharedlibrary - make -f Makefile.cmdline - ''; + buildPhase = + '' + make -f Makefile.cmdline + '' + + lib.optionalString (!stdenv.hostPlatform.isStatic) '' + make -f Makefile.sharedlibrary + ''; - installPhase = '' - install -d $out/bin - install -m755 duk $out/bin/ - install -d $out/lib/pkgconfig - install -d $out/include - make -f Makefile.sharedlibrary install INSTALL_PREFIX=$out - substituteAll ${./duktape.pc.in} $out/lib/pkgconfig/duktape.pc - ''; + installPhase = + '' + install -d $out/bin + install -m755 duk $out/bin/ + '' + + lib.optionalString (!stdenv.hostPlatform.isStatic) '' + install -d $out/lib/pkgconfig + install -d $out/include + make -f Makefile.sharedlibrary install INSTALL_PREFIX=$out + substituteAll ${./duktape.pc.in} $out/lib/pkgconfig/duktape.pc + ''; enableParallelBuilding = true; From efbd153c406e00dd3f300e2a91c686509c6896d5 Mon Sep 17 00:00:00 2001 From: Artturin Date: Fri, 7 Feb 2025 19:44:51 +0200 Subject: [PATCH 179/343] xfce.{{libxfce4{util,ui,windowing},xfconf,xfce4-panel,garcon,thunar}}: Conditionalize gobject-introspection and vala gobject-introspection doesn't support static Although the dependencies for these don't build on static this can still be useful in the future or for preventing additional issues being created for xfce packages. Tested on native by changing the conditionals to false. --- pkgs/desktops/xfce/core/garcon/default.nix | 12 ++++++++-- .../desktops/xfce/core/libxfce4ui/default.nix | 22 +++++++++++++------ .../xfce/core/libxfce4util/default.nix | 11 +++++++--- .../xfce/core/libxfce4windowing/default.nix | 12 +++++++--- pkgs/desktops/xfce/core/thunar/default.nix | 10 ++++++--- .../xfce/core/xfce4-panel/default.nix | 15 ++++++++----- pkgs/desktops/xfce/core/xfconf/default.nix | 18 ++++++++++----- 7 files changed, 72 insertions(+), 28 deletions(-) diff --git a/pkgs/desktops/xfce/core/garcon/default.nix b/pkgs/desktops/xfce/core/garcon/default.nix index 6f40696c3d441..9a27b045700a7 100644 --- a/pkgs/desktops/xfce/core/garcon/default.nix +++ b/pkgs/desktops/xfce/core/garcon/default.nix @@ -1,4 +1,10 @@ -{ lib, mkXfceDerivation, gobject-introspection, gtk3, libxfce4ui, libxfce4util }: +{ stdenv, lib, mkXfceDerivation, gtk3, libxfce4ui, libxfce4util, + withIntrospection ? + lib.meta.availableOn stdenv.hostPlatform gobject-introspection + && stdenv.hostPlatform.emulatorAvailable buildPackages, + buildPackages, + gobject-introspection, +}: mkXfceDerivation { category = "xfce"; @@ -7,7 +13,9 @@ mkXfceDerivation { sha256 = "sha256-MeZkDb2QgGMaloO6Nwlj9JmZByepd6ERqpAWqrVv1xw="; - nativeBuildInputs = [ gobject-introspection ]; + nativeBuildInputs = lib.optionals withIntrospection [ + gobject-introspection + ]; buildInputs = [ gtk3 libxfce4ui libxfce4util ]; diff --git a/pkgs/desktops/xfce/core/libxfce4ui/default.nix b/pkgs/desktops/xfce/core/libxfce4ui/default.nix index 12c2d29681596..8862c6dffe035 100644 --- a/pkgs/desktops/xfce/core/libxfce4ui/default.nix +++ b/pkgs/desktops/xfce/core/libxfce4ui/default.nix @@ -1,9 +1,8 @@ { + stdenv, mkXfceDerivation, lib, - gobject-introspection, perl, - vala, libICE, libSM, libepoxy, @@ -13,6 +12,12 @@ xfconf, gtk3, libxfce4util, + withIntrospection ? + lib.meta.availableOn stdenv.hostPlatform gobject-introspection + && stdenv.hostPlatform.emulatorAvailable buildPackages, + buildPackages, + gobject-introspection, + vala, }: mkXfceDerivation { @@ -22,11 +27,14 @@ mkXfceDerivation { sha256 = "sha256-M+OapPHQ/WxlkUzHPx+ELstVyGoZanCxCL0N8hDWSN8="; - nativeBuildInputs = [ - gobject-introspection - perl - vala - ]; + nativeBuildInputs = + [ + perl + ] + ++ lib.optionals withIntrospection [ + gobject-introspection + vala # vala bindings require GObject introspection + ]; buildInputs = [ libICE diff --git a/pkgs/desktops/xfce/core/libxfce4util/default.nix b/pkgs/desktops/xfce/core/libxfce4util/default.nix index d2486d2fd2567..620141aac6981 100644 --- a/pkgs/desktops/xfce/core/libxfce4util/default.nix +++ b/pkgs/desktops/xfce/core/libxfce4util/default.nix @@ -1,9 +1,14 @@ { + stdenv, mkXfceDerivation, lib, - gobject-introspection, vala, glib, + withIntrospection ? + lib.meta.availableOn stdenv.hostPlatform gobject-introspection + && stdenv.hostPlatform.emulatorAvailable buildPackages, + buildPackages, + gobject-introspection, }: mkXfceDerivation { @@ -13,9 +18,9 @@ mkXfceDerivation { sha256 = "sha256-0qbJSCXHsVz3XILHICFhciyz92LgMZiR7XFLAESHRGQ="; - nativeBuildInputs = [ + nativeBuildInputs = lib.optionals withIntrospection [ gobject-introspection - vala + vala # vala bindings require GObject introspection ]; propagatedBuildInputs = [ diff --git a/pkgs/desktops/xfce/core/libxfce4windowing/default.nix b/pkgs/desktops/xfce/core/libxfce4windowing/default.nix index 3392ee2a7685f..06064785eaf1a 100644 --- a/pkgs/desktops/xfce/core/libxfce4windowing/default.nix +++ b/pkgs/desktops/xfce/core/libxfce4windowing/default.nix @@ -1,6 +1,6 @@ -{ lib +{ stdenv +, lib , mkXfceDerivation -, gobject-introspection , wayland-scanner , glib , gtk3 @@ -11,6 +11,11 @@ , wayland , wayland-protocols , wlr-protocols +, withIntrospection ? + lib.meta.availableOn stdenv.hostPlatform gobject-introspection + && stdenv.hostPlatform.emulatorAvailable buildPackages +, buildPackages +, gobject-introspection }: mkXfceDerivation { @@ -21,8 +26,9 @@ mkXfceDerivation { sha256 = "sha256-Xw1hs854K5dZCAYoBMoqJzdSxPRFUYqEpWxg4DLSK5Q="; nativeBuildInputs = [ - gobject-introspection wayland-scanner + ] ++ lib.optionals withIntrospection [ + gobject-introspection ]; buildInputs = [ diff --git a/pkgs/desktops/xfce/core/thunar/default.nix b/pkgs/desktops/xfce/core/thunar/default.nix index 23e6799845ca7..31b5b15fa6927 100644 --- a/pkgs/desktops/xfce/core/thunar/default.nix +++ b/pkgs/desktops/xfce/core/thunar/default.nix @@ -1,4 +1,5 @@ -{ mkXfceDerivation +{ stdenv +, mkXfceDerivation , lib , docbook_xsl , exo @@ -14,10 +15,12 @@ , pcre2 , xfce4-panel , xfconf -, gobject-introspection , makeWrapper , symlinkJoin , thunarPlugins ? [] +, withIntrospection ? false +, buildPackages +, gobject-introspection }: let unwrapped = mkXfceDerivation { @@ -29,8 +32,9 @@ let unwrapped = mkXfceDerivation { nativeBuildInputs = [ docbook_xsl - gobject-introspection libxslt + ] ++ lib.optionals withIntrospection [ + gobject-introspection ]; buildInputs = [ diff --git a/pkgs/desktops/xfce/core/xfce4-panel/default.nix b/pkgs/desktops/xfce/core/xfce4-panel/default.nix index 6c924b068441d..d686899cd4086 100644 --- a/pkgs/desktops/xfce/core/xfce4-panel/default.nix +++ b/pkgs/desktops/xfce/core/xfce4-panel/default.nix @@ -1,9 +1,9 @@ -{ lib +{ stdenv +, lib , mkXfceDerivation , cairo , exo , garcon -, gobject-introspection , gtk-layer-shell , gtk3 , libdbusmenu-gtk3 @@ -12,9 +12,14 @@ , libxfce4util , libxfce4windowing , tzdata -, vala , wayland , xfconf +, withIntrospection ? + lib.meta.availableOn stdenv.hostPlatform gobject-introspection + && stdenv.hostPlatform.emulatorAvailable buildPackages +, buildPackages +, gobject-introspection +, vala }: mkXfceDerivation { @@ -24,9 +29,9 @@ mkXfceDerivation { sha256 = "sha256-tLWjU0M7tuE+qqDwaE1CtnOjDiPWno8Mf7hhxYxbvjo="; - nativeBuildInputs = [ + nativeBuildInputs = lib.optionals withIntrospection [ gobject-introspection - vala + vala # vala bindings require GObject introspection ]; buildInputs = [ diff --git a/pkgs/desktops/xfce/core/xfconf/default.nix b/pkgs/desktops/xfce/core/xfconf/default.nix index 8ca8990c17b70..dc97afbba935d 100644 --- a/pkgs/desktops/xfce/core/xfconf/default.nix +++ b/pkgs/desktops/xfce/core/xfconf/default.nix @@ -1,4 +1,5 @@ { + stdenv, lib, mkXfceDerivation, gobject-introspection, @@ -6,6 +7,10 @@ vala, libxfce4util, glib, + withIntrospection ? + lib.meta.availableOn stdenv.hostPlatform gobject-introspection + && stdenv.hostPlatform.emulatorAvailable buildPackages, + buildPackages, }: mkXfceDerivation { @@ -15,11 +20,14 @@ mkXfceDerivation { sha256 = "sha256-U+Sk7ubBr1ZD1GLQXlxrx0NQdhV/WpVBbnLcc94Tjcw="; - nativeBuildInputs = [ - gobject-introspection - perl - vala - ]; + nativeBuildInputs = + [ + perl + ] + ++ lib.optionals withIntrospection [ + gobject-introspection + vala # vala bindings require GObject introspection + ]; buildInputs = [ libxfce4util ]; From fe5e11faed6241aacf7220436088789287507494 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sat, 8 Feb 2025 16:28:50 +0000 Subject: [PATCH 180/343] stdenv, cmake: drop `--oldincludedir` Without the change the build of upcoming `sqlite-3.49.0` will fail as: > Error: Unknown option --oldincludedir > Try: 'configure --help' for options Looking at https://www.gnu.org/prep/standards/html_node/Directory-Variables.html it feels like it's something that predates gcc and it should be an alias to `--includedir=`. Let's just drop the setting of `--oldincludedir=` (and `cmake` equivalent). --- pkgs/build-support/setup-hooks/multiple-outputs.sh | 2 +- pkgs/by-name/cm/cmake/setup-hook.sh | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/build-support/setup-hooks/multiple-outputs.sh b/pkgs/build-support/setup-hooks/multiple-outputs.sh index 45096d833b427..cc3ab4816fa21 100644 --- a/pkgs/build-support/setup-hooks/multiple-outputs.sh +++ b/pkgs/build-support/setup-hooks/multiple-outputs.sh @@ -85,7 +85,7 @@ _multioutConfig() { prependToVar configureFlags \ --bindir="${!outputBin}"/bin --sbindir="${!outputBin}"/sbin \ - --includedir="${!outputInclude}"/include --oldincludedir="${!outputInclude}"/include \ + --includedir="${!outputInclude}"/include \ --mandir="${!outputMan}"/share/man --infodir="${!outputInfo}"/share/info \ --docdir="${!outputDoc}"/share/doc/"${shareDocName}" \ --libdir="${!outputLib}"/lib --libexecdir="${!outputLib}"/libexec \ diff --git a/pkgs/by-name/cm/cmake/setup-hook.sh b/pkgs/by-name/cm/cmake/setup-hook.sh index 3df8b9bd986b0..f9db8f0919acc 100755 --- a/pkgs/by-name/cm/cmake/setup-hook.sh +++ b/pkgs/by-name/cm/cmake/setup-hook.sh @@ -93,7 +93,6 @@ cmakeConfigurePhase() { prependToVar cmakeFlags "-DCMAKE_INSTALL_BINDIR=${!outputBin}/bin" prependToVar cmakeFlags "-DCMAKE_INSTALL_SBINDIR=${!outputBin}/sbin" prependToVar cmakeFlags "-DCMAKE_INSTALL_INCLUDEDIR=${!outputInclude}/include" - prependToVar cmakeFlags "-DCMAKE_INSTALL_OLDINCLUDEDIR=${!outputInclude}/include" prependToVar cmakeFlags "-DCMAKE_INSTALL_MANDIR=${!outputMan}/share/man" prependToVar cmakeFlags "-DCMAKE_INSTALL_INFODIR=${!outputInfo}/share/info" prependToVar cmakeFlags "-DCMAKE_INSTALL_DOCDIR=${!outputDoc}/share/doc/${shareDocName}" From 35bb379adf55a0c4e81286868242971027b0883d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 9 Feb 2025 03:31:44 +1000 Subject: [PATCH 181/343] wayland-protocols: 1.39 -> 1.40 (#367753) --- pkgs/development/libraries/wayland/protocols.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/wayland/protocols.nix b/pkgs/development/libraries/wayland/protocols.nix index 85b9d5fe4f929..9ec92e7ea20c2 100644 --- a/pkgs/development/libraries/wayland/protocols.nix +++ b/pkgs/development/libraries/wayland/protocols.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "wayland-protocols"; - version = "1.39"; + version = "1.40"; doCheck = stdenv.hostPlatform == stdenv.buildPlatform @@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "https://gitlab.freedesktop.org/wayland/${finalAttrs.pname}/-/releases/${finalAttrs.version}/downloads/${finalAttrs.pname}-${finalAttrs.version}.tar.xz"; - hash = "sha256-4dzcu/COLgqKAu5dmgvjpqr8OaS1H6fg0vGhZBHLcvo="; + hash = "sha256-shcReTJHwsQnY5FDkt+p/LnjcoyktKoRCtuNkV/ABok="; }; postPatch = lib.optionalString finalAttrs.doCheck '' From 4f3317d251b854d9c88d2a9d7d0ad1bbdbe12f42 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 8 Feb 2025 19:13:36 +0100 Subject: [PATCH 182/343] python313Packages.seccomp: add imports check --- pkgs/development/python-modules/seccomp/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/seccomp/default.nix b/pkgs/development/python-modules/seccomp/default.nix index 2e8830277b944..4e217dab7f8bf 100644 --- a/pkgs/development/python-modules/seccomp/default.nix +++ b/pkgs/development/python-modules/seccomp/default.nix @@ -24,6 +24,8 @@ buildPythonPackage rec { 'libraries=["seccomp"]' ''; + pythonImportsCheck = [ "seccomp" ]; + meta = with lib; { description = "Python bindings for libseccomp"; license = with licenses; [ lgpl21 ]; From c8dedb8230ebc24b1aab685b8f687edc89426efa Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 8 Feb 2025 19:14:29 +0100 Subject: [PATCH 183/343] libseccomp: test python bindings in passthru --- pkgs/by-name/li/libseccomp/package.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/by-name/li/libseccomp/package.nix b/pkgs/by-name/li/libseccomp/package.nix index 2d238f64dc663..a06233a88a644 100644 --- a/pkgs/by-name/li/libseccomp/package.nix +++ b/pkgs/by-name/li/libseccomp/package.nix @@ -7,6 +7,7 @@ which, gperf, nix-update-script, + python3Packages, }: stdenv.mkDerivation rec { @@ -51,6 +52,9 @@ stdenv.mkDerivation rec { passthru = { updateScript = nix-update-script { }; + tests = { + inherit (python3Packages) seccomp; + }; }; meta = with lib; { From 52887dda76c814cdec71b4b87e425ca9cf9c72e0 Mon Sep 17 00:00:00 2001 From: Immae Date: Sat, 8 Feb 2025 23:44:37 +0100 Subject: [PATCH 184/343] replace-workspace-values.py: Allow "package" key in Cargo.toml dependencies (#377721) * Allow "package" key in Cargo.toml dependencies * Update replace-workspace-values.py Some dependencies in Cargo.toml have a "package" key, which serves as an alias: ``` foo = { package = "original-name" ... } ``` which with nixpkgs triggered ``` > Copying to /nix/store/jay72vz43afnlymsah7v543zmnv6l7ck-gcli-0.3.0-vendor/subxt-0.37.0 > Patching /nix/store/jay72vz43afnlymsah7v543zmnv6l7ck-gcli-0.3.0-vendor/subxt-0.37.0/Cargo.toml > Traceback (most recent call last): > File "/nix/store/harh7nnnib9896dwqr0xjqrr0l8wdcw7-replace-workspace-values/bin/replace-workspace-values", line 127, in > main() > File "/nix/store/harh7nnnib9896dwqr0xjqrr0l8wdcw7-replace-workspace-values/bin/replace-workspace-values", line 104, in main > changed |= replace_dependencies(workspace_manifest, crate_manifest) > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ > File "/nix/store/harh7nnnib9896dwqr0xjqrr0l8wdcw7-replace-workspace-values/bin/replace-workspace-values", line 77, in replace_dependencies > changed |= replace_key(workspace_manifest, root[key], "dependencies", k) > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ > File "/nix/store/harh7nnnib9896dwqr0xjqrr0l8wdcw7-replace-workspace-values/bin/replace-workspace-values", line 58, in replace_key > raise Exception(f"Unhandled keys in inherited dependency {key}: {local_dep}") > Exception: Unhandled keys in inherited dependency codec: {'package': 'parity-scale-codec'} > Traceback (most recent call last): > File "/nix/store/qrf1j1w95va92fzv55lxpvw2dpm03bnr-fetch-cargo-vendor-util/bin/fetch-cargo-vendor-util", line 314, in > main() > File "/nix/store/qrf1j1w95va92fzv55lxpvw2dpm03bnr-fetch-cargo-vendor-util/bin/fetch-cargo-vendor-util", line 310, in main > subcommand_func() > File "/nix/store/qrf1j1w95va92fzv55lxpvw2dpm03bnr-fetch-cargo-vendor-util/bin/fetch-cargo-vendor-util", line 302, in > "create-vendor": lambda: create_vendor(vendor_staging_dir=Path(sys.argv[2]), out_dir=Path(sys.argv[3])) > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ > File "/nix/store/qrf1j1w95va92fzv55lxpvw2dpm03bnr-fetch-cargo-vendor-util/bin/fetch-cargo-vendor-util", line 259, in create_vendor > copy_and_patch_git_crate_subtree(git_tree, pkg["name"], crate_out_dir) > File "/nix/store/qrf1j1w95va92fzv55lxpvw2dpm03bnr-fetch-cargo-vendor-util/bin/fetch-cargo-vendor-util", line 215, in copy_and_patch_git_crate_subtree > subprocess.check_output(cmd) > File "/nix/store/qrc496n6fsqp4p5m5h8wmw5d5jwyw5mr-python3-3.12.8/lib/python3.12/subprocess.py", line 466, in check_output > return run(*popenargs, stdout=PIPE, timeout=timeout, check=True, > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ > File "/nix/store/qrc496n6fsqp4p5m5h8wmw5d5jwyw5mr-python3-3.12.8/lib/python3.12/subprocess.py", line 571, in run > raise CalledProcessError(retcode, process.args, > subprocess.CalledProcessError: Command '['replace-workspace-values', '/nix/store/jay72vz43afnlymsah7v543zmnv6l7ck-gcli-0.3.0-vendor/subxt-0.37.0/Cargo.toml', '/nix/store/c4jdggg9ihgi032pyc7g6ysdpb30xv1r-gcli-0.3.0-vendor-staging/git/00f181c1a5d8986e7146ddc72a745c793a9a1d8e/Cargo.toml']' returned non-zero exit status 1. ``` This fixes that --- pkgs/build-support/rust/replace-workspace-values.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/build-support/rust/replace-workspace-values.py b/pkgs/build-support/rust/replace-workspace-values.py index 003023ff2560a..a03bf42eae38a 100644 --- a/pkgs/build-support/rust/replace-workspace-values.py +++ b/pkgs/build-support/rust/replace-workspace-values.py @@ -53,6 +53,9 @@ def replace_key( if optional: final["optional"] = True + if "package" in local_dep: + final["package"] = local_dep.pop("package") + if local_dep: raise Exception(f"Unhandled keys in inherited dependency {key}: {local_dep}") From b852513e84c411c1af128a51b3013d3c64e020fd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 7 Feb 2025 14:23:11 +0000 Subject: [PATCH 185/343] fast-float: 7.0.0 -> 8.0.0 --- pkgs/by-name/fa/fast-float/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fa/fast-float/package.nix b/pkgs/by-name/fa/fast-float/package.nix index 2bb7cfcd22b8f..edebd6278d602 100644 --- a/pkgs/by-name/fa/fast-float/package.nix +++ b/pkgs/by-name/fa/fast-float/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "fast-float"; - version = "7.0.0"; + version = "8.0.0"; src = fetchFromGitHub { owner = "fastfloat"; repo = "fast_float"; rev = "v${finalAttrs.version}"; - hash = "sha256-CG5je117WYyemTe5PTqznDP0bvY5TeXn8Vu1Xh5yUzQ="; + hash = "sha256-shP+me3iqTRrsPGYrvcbnJNRZouQbW62T24xfkEgGSE="; }; nativeBuildInputs = [ cmake ]; From d298f046edabc84b56bd788e11eaf7ed72f8171c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 11 Dec 2024 21:05:07 +0100 Subject: [PATCH 186/343] eigen: 3.4.0 -> 3.4.0-unstable-2022-05-19 Fast forward to a version required by onnxruntime. --- pkgs/development/libraries/eigen/default.nix | 23 ++++---------------- 1 file changed, 4 insertions(+), 19 deletions(-) diff --git a/pkgs/development/libraries/eigen/default.nix b/pkgs/development/libraries/eigen/default.nix index e612add0c7b1e..8fe840bea596d 100644 --- a/pkgs/development/libraries/eigen/default.nix +++ b/pkgs/development/libraries/eigen/default.nix @@ -2,37 +2,22 @@ lib, stdenv, fetchFromGitLab, - fetchpatch, cmake, }: stdenv.mkDerivation rec { pname = "eigen"; - version = "3.4.0"; + version = "3.4.0-unstable-2022-05-19"; src = fetchFromGitLab { owner = "libeigen"; - repo = pname; - rev = version; - hash = "sha256-1/4xMetKMDOgZgzz3WMxfHUEpmdAm52RqZvz6i0mLEw="; + repo = "eigen"; + rev = "e7248b26a1ed53fa030c5c459f7ea095dfd276ac"; + hash = "sha256-uQ1YYV3ojbMVfHdqjXRyUymRPjJZV3WHT36PTxPRius="; }; patches = [ ./include-dir.patch - - # Fixes e.g. onnxruntime on aarch64-darwin: - # https://hydra.nixos.org/build/248915128/nixlog/1, - # originally suggested in https://github.com/NixOS/nixpkgs/pull/258392. - # - # The patch is from - # ["Fix vectorized reductions for Eigen::half"](https://gitlab.com/libeigen/eigen/-/merge_requests/699) - # which is two years old, - # but Eigen hasn't had a release in two years either: - # https://gitlab.com/libeigen/eigen/-/issues/2699. - (fetchpatch { - url = "https://gitlab.com/libeigen/eigen/-/commit/d0e3791b1a0e2db9edd5f1d1befdb2ac5a40efe0.patch"; - hash = "sha256-8qiNpuYehnoiGiqy0c3Mcb45pwrmc6W4rzCxoLDSvj0="; - }) ]; nativeBuildInputs = [ cmake ]; From 1b55dbf9cb1d457cdf128d47ea84ed8b284b2a3a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 9 Feb 2025 02:28:45 +0000 Subject: [PATCH 187/343] qpdf: 11.9.1 -> 11.10.0 --- pkgs/by-name/qp/qpdf/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/qp/qpdf/package.nix b/pkgs/by-name/qp/qpdf/package.nix index aa56c57ab7ffb..618e9741370ba 100644 --- a/pkgs/by-name/qp/qpdf/package.nix +++ b/pkgs/by-name/qp/qpdf/package.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "qpdf"; - version = "11.9.1"; + version = "11.10.0"; src = fetchFromGitHub { owner = "qpdf"; repo = "qpdf"; rev = "v${finalAttrs.version}"; - hash = "sha256-DhrOKjUPgNo61db8av0OTfM8mCNebQocQWtTWdt002s="; + hash = "sha256-X5VF7kwnpNNWuQ7iA12qh6JwGU/40EKnGxWst0U+T8k="; }; outputs = [ From bb92d2bed29a6b759af02aab3fc3303cecbe93bd Mon Sep 17 00:00:00 2001 From: K900 Date: Sun, 9 Feb 2025 09:35:20 +0300 Subject: [PATCH 188/343] curlMinimal: allow local networking on Darwin Makes tests pass on 8.12.0 Co-authored-by: Martin Weinelt --- pkgs/by-name/cu/curlMinimal/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/cu/curlMinimal/package.nix b/pkgs/by-name/cu/curlMinimal/package.nix index ee0a8924a6c6a..bd9f751126add 100644 --- a/pkgs/by-name/cu/curlMinimal/package.nix +++ b/pkgs/by-name/cu/curlMinimal/package.nix @@ -181,6 +181,8 @@ stdenv.mkDerivation (finalAttrs: { rm tests/data/test1592 ''; + __darwinAllowLocalNetworking = true; + postInstall = '' moveToOutput bin/curl-config "$dev" From 110af7ef47f385c811725c8194a8adc1f06526ab Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sat, 8 Feb 2025 12:50:41 +0100 Subject: [PATCH 189/343] Reapply "llvmPackages.openmp: Make OMPD customisable, add missing Python dependency" This reverts commit fa648b2835f6cc0e77bd3b246cf8c80f126f0139. Mass rebuild accidentally merged to master, now being resubmitted to staging. Python had been added as an unconditionial build input on staging in 261db7efdc49 ("llvmPackages.openmp: fix cross build"), but we're keeping it conditional here per discussion with the author of that change. Link: https://github.com/NixOS/nixpkgs/pull/380299#issuecomment-2645492202 --- .../compilers/llvm/common/openmp/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/llvm/common/openmp/default.nix b/pkgs/development/compilers/llvm/common/openmp/default.nix index 52e04dd03abc3..57ccee5155fff 100644 --- a/pkgs/development/compilers/llvm/common/openmp/default.nix +++ b/pkgs/development/compilers/llvm/common/openmp/default.nix @@ -17,7 +17,12 @@ , python3 , version , devExtraCmakeFlags ? [] +, ompdSupport ? true +, ompdGdbSupport ? ompdSupport }: + +assert lib.assertMsg (ompdGdbSupport -> ompdSupport) "OMPD GDB support requires OMPD support!"; + let pname = "openmp"; src' = @@ -55,10 +60,14 @@ stdenv.mkDerivation (rec { buildInputs = [ (if stdenv.buildPlatform == stdenv.hostPlatform then llvm else targetLlvm) + ] ++ lib.optionals (ompdSupport && ompdGdbSupport) [ python3 ]; - cmakeFlags = lib.optionals (lib.versions.major release_version == "13") [ + cmakeFlags = [ + (lib.cmakeBool "LIBOMP_OMPD_SUPPORT" ompdSupport) + (lib.cmakeBool "LIBOMP_OMPD_GDB_SUPPORT" ompdGdbSupport) + ] ++ lib.optionals (lib.versions.major release_version == "13") [ "-DLIBOMPTARGET_BUILD_AMDGCN_BCLIB=OFF" # Building the AMDGCN device RTL fails ] ++ lib.optionals (lib.versionAtLeast release_version "14") [ "-DCLANG_TOOL=${clang-unwrapped}/bin/clang" From d570710367a99267f01a6869f4dc7ed27160bae9 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sat, 8 Feb 2025 12:50:56 +0100 Subject: [PATCH 190/343] Reapply "llvmPackages.openmp: Build static libraries when appropriate" This reverts commit c006d5f0637d9a98d990e80e80b1fd932bb6025e. Mass rebuild accidentally merged to master, now being resubmitted to staging. --- pkgs/development/compilers/llvm/common/openmp/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/compilers/llvm/common/openmp/default.nix b/pkgs/development/compilers/llvm/common/openmp/default.nix index 57ccee5155fff..d1fc8f74b9d34 100644 --- a/pkgs/development/compilers/llvm/common/openmp/default.nix +++ b/pkgs/development/compilers/llvm/common/openmp/default.nix @@ -65,6 +65,7 @@ stdenv.mkDerivation (rec { ]; cmakeFlags = [ + (lib.cmakeBool "LIBOMP_ENABLE_SHARED" (!stdenv.hostPlatform.isStatic && stdenv.hostPlatform.hasSharedLibraries)) (lib.cmakeBool "LIBOMP_OMPD_SUPPORT" ompdSupport) (lib.cmakeBool "LIBOMP_OMPD_GDB_SUPPORT" ompdGdbSupport) ] ++ lib.optionals (lib.versions.major release_version == "13") [ From fb70653cda9f5f1fad2cd518517bfa1fd12bad55 Mon Sep 17 00:00:00 2001 From: Jared Baur Date: Wed, 22 Jan 2025 20:49:30 -0800 Subject: [PATCH 191/343] util-linux: 2.39.4 -> 2.40.4 --- .../ut/util-linux/fix-darwin-build.patch | 35 +++++++++++++++++++ pkgs/by-name/ut/util-linux/package.nix | 17 ++++----- 2 files changed, 42 insertions(+), 10 deletions(-) create mode 100644 pkgs/by-name/ut/util-linux/fix-darwin-build.patch diff --git a/pkgs/by-name/ut/util-linux/fix-darwin-build.patch b/pkgs/by-name/ut/util-linux/fix-darwin-build.patch new file mode 100644 index 0000000000000..c65266e886905 --- /dev/null +++ b/pkgs/by-name/ut/util-linux/fix-darwin-build.patch @@ -0,0 +1,35 @@ +From e47c6f751a7ef87640c61316ada774e8e9cc6b07 Mon Sep 17 00:00:00 2001 +From: Eugene Gershnik +Date: Mon, 6 May 2024 09:29:39 -0700 +Subject: [PATCH] libuuid: fix uuid_time on macOS without attribute((alias)) + +Weak aliases are not supported by clang on Darwin. +Instead this fix uses inline asm to make `_uuid_time` an alias to +`___uuid_time` + +It appears that on macOS the time API is purely 32 or 64 bit depending +on the build type. There is no ABI issue on that platform and `uuid_time` +can be unconditionally aliased to `_uuid_time`. This is all conjectural, +however, since I have no ability to make 32-bit builds for macOS - the +Apple toolchain doesn't support this since 2019. + +Fixes util-linux/util-linux#2873 +--- + libuuid/src/uuid_time.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/libuuid/src/uuid_time.c b/libuuid/src/uuid_time.c +index 9b415b3ee73..df0478e1909 100644 +--- a/libuuid/src/uuid_time.c ++++ b/libuuid/src/uuid_time.c +@@ -85,6 +85,10 @@ time_t __uuid_time(const uuid_t uu, struct timeval *ret_tv) + } + #if defined(__USE_TIME_BITS64) && defined(__GLIBC__) + extern time_t uuid_time64(const uuid_t uu, struct timeval *ret_tv) __attribute__((weak, alias("__uuid_time"))); ++#elif defined(__clang__) && defined(__APPLE__) ++__asm__(".globl _uuid_time"); ++__asm__(".set _uuid_time, ___uuid_time"); ++extern time_t uuid_time(const uuid_t uu, struct timeval *ret_tv); + #else + extern time_t uuid_time(const uuid_t uu, struct timeval *ret_tv) __attribute__((weak, alias("__uuid_time"))); + #endif diff --git a/pkgs/by-name/ut/util-linux/package.nix b/pkgs/by-name/ut/util-linux/package.nix index e726ec46d343d..c4c0bfa281940 100644 --- a/pkgs/by-name/ut/util-linux/package.nix +++ b/pkgs/by-name/ut/util-linux/package.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchurl, - fetchpatch, pkg-config, zlib, shadow, @@ -15,6 +14,7 @@ pam, systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemd, systemd, + sqlite, nlsSupport ? true, translateManpages ? true, po4a, @@ -27,21 +27,16 @@ stdenv.mkDerivation rec { pname = "util-linux" + lib.optionalString (!nlsSupport && !ncursesSupport && !systemdSupport) "-minimal"; - version = "2.39.4"; + version = "2.40.4"; src = fetchurl { url = "mirror://kernel/linux/utils/util-linux/v${lib.versions.majorMinor version}/util-linux-${version}.tar.xz"; - hash = "sha256-bE+HI9r9QcOdk+y/FlCfyIwzzVvTJ3iArlodl6AU/Q4="; + hash = "sha256-XB2vczsE6YWa/cO9h8xIEYDuD4i1wJRrFv3skxl1+3k="; }; patches = [ ./rtcwake-search-PATH-for-shutdown.patch - - (fetchpatch { - name = "basename.patch"; - url = "https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git/patch/?id=77454e58d58f904cfdc02d3ca5bb65f1bd8739fc"; - hash = "sha256-ELWC4bYN3rvn9XIN0XgCo55pXNfS2VpbZWuwzRLfO/0="; - }) + ./fix-darwin-build.patch ]; # We separate some of the utilities into their own outputs. This @@ -64,7 +59,7 @@ stdenv.mkDerivation rec { postPatch = '' - patchShebangs tests/run.sh + patchShebangs tests/run.sh tools/all_syscalls substituteInPlace sys-utils/eject.c \ --replace "/bin/umount" "$bin/bin/umount" @@ -95,6 +90,7 @@ stdenv.mkDerivation rec { (lib.withFeature ncursesSupport "ncursesw") (lib.withFeature systemdSupport "systemd") (lib.withFeatureAs systemdSupport "systemdsystemunitdir" "${placeholder "bin"}/lib/systemd/system/") + (lib.withFeatureAs systemdSupport "tmpfilesdir" "${placeholder "out"}/lib/tmpfiles.d") (lib.enableFeature translateManpages "poman") "SYSCONFSTATICDIR=${placeholder "lib"}/lib" ] @@ -121,6 +117,7 @@ stdenv.mkDerivation rec { [ zlib libxcrypt + sqlite ] ++ lib.optionals pamSupport [ pam ] ++ lib.optionals capabilitiesSupport [ libcap_ng ] From 6b365c5befbf823b21dc9279cd6fe607808bf609 Mon Sep 17 00:00:00 2001 From: K900 Date: Sun, 9 Feb 2025 11:34:56 +0300 Subject: [PATCH 192/343] Revert "perl: 5.40.0 -> 5.40.1; perl538: 5.38.2 -> 5.38.3" --- pkgs/development/interpreters/perl/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/interpreters/perl/default.nix b/pkgs/development/interpreters/perl/default.nix index 5c9034a0472a8..8fd99172be109 100644 --- a/pkgs/development/interpreters/perl/default.nix +++ b/pkgs/development/interpreters/perl/default.nix @@ -57,16 +57,16 @@ in rec { # Maint version perl538 = callPackage ./interpreter.nix { self = perl538; - version = "5.38.3"; - sha256 = "sha256-ioAzhZ3R116wyRWO7dc4TfGva0aipOhQc7B+bMfFuHM="; + version = "5.38.2"; + sha256 = "sha256-oKMVNEUet7g8fWWUpJdUOlTUiLyQygD140diV39AZV4="; inherit passthruFun; }; # Maint version perl540 = callPackage ./interpreter.nix { self = perl540; - version = "5.40.1"; - sha256 = "sha256-AvjEW7N57Qw951FPrUjHFP1Gvo8LU2v9UyAFAWWh7iY="; + version = "5.40.0"; + sha256 = "sha256-x0A0jzVzljJ6l5XT6DI7r9D+ilx4NfwcuroMyN/nFh8="; inherit passthruFun; }; } From 35c9771eee0ebddbe9dc3eccad81baeb9c149a96 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sun, 9 Feb 2025 11:04:56 +0100 Subject: [PATCH 193/343] gnupg: fix static Patch has been submitted upstream, but past experience trying to send patches to GnuPG does not make me optimistic that this will be dealt with any time soon. If it doesn't work out upstream I'll submit it to freepg, whose patchset we're already using. --- pkgs/tools/security/gnupg/24.nix | 3 ++ pkgs/tools/security/gnupg/static.patch | 38 ++++++++++++++++++++++++++ 2 files changed, 41 insertions(+) create mode 100644 pkgs/tools/security/gnupg/static.patch diff --git a/pkgs/tools/security/gnupg/24.nix b/pkgs/tools/security/gnupg/24.nix index 79bb6a5e6a339..439b966ae4e7e 100644 --- a/pkgs/tools/security/gnupg/24.nix +++ b/pkgs/tools/security/gnupg/24.nix @@ -4,6 +4,7 @@ fetchurl, fetchFromGitLab, buildPackages, + autoreconfHook, pkg-config, texinfo, gettext, @@ -44,6 +45,7 @@ stdenv.mkDerivation rec { depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ + autoreconfHook pkg-config texinfo libgpg-error @@ -82,6 +84,7 @@ stdenv.mkDerivation rec { [ ./fix-libusb-include-path.patch ./CVE-2022-3219.patch + ./static.patch ] ++ lib.map (v: "${freepgPatches}/STABLE-BRANCH-2-4-freepg/" + v) [ "0002-gpg-accept-subkeys-with-a-good-revocation-but-no-sel.patch" diff --git a/pkgs/tools/security/gnupg/static.patch b/pkgs/tools/security/gnupg/static.patch new file mode 100644 index 0000000000000..851ac74295435 --- /dev/null +++ b/pkgs/tools/security/gnupg/static.patch @@ -0,0 +1,38 @@ +From 440ccccb02ec438b4077b5885e5a1483e12c38b1 Mon Sep 17 00:00:00 2001 +From: Alyssa Ross +Date: Sun, 9 Feb 2025 08:51:32 +0100 +Subject: [PATCH] build: use pkg-config to find tss2-esys + +Otherwise, tss2-esys's dependencies (other tss2 libraries, OpenSSL) +won't be linked when tss2-esys is a static library. +--- +Link: https://dev.gnupg.org/D606 + + configure.ac | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +diff --git a/configure.ac b/configure.ac +index dc444657f..a60c1820c 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1574,8 +1574,8 @@ if test "$build_tpm2d" = "yes"; then + AC_SEARCH_LIBS([TSS_Create],[tss ibmtss],have_libtss=IBM, + [AC_MSG_ERROR([IBM TPM Software Stack requested but not found])]) + elif test "$with_tss" = intel; then +- AC_SEARCH_LIBS([Esys_Initialize],[tss2-esys],have_libtss=Intel, +- [AC_MSG_ERROR([Intel TPM Software Stack requested but not found])]) ++ PKG_CHECK_MODULES([LIBTSS], [tss2-esys tss2-mu tss2-rc tss2-tctildr],have_libtss=Intel, ++ [AC_MSG_ERROR([Intel TPM Software Stack requested but not found])]) + else + AC_MSG_ERROR([Invalid TPM Software Stack requested: $with_tss]) + fi +@@ -1605,7 +1605,6 @@ if test "$build_tpm2d" = "yes"; then + AC_MSG_WARN([Need Esys_TR_GetTpmHandle API (usually requires Intel TSS 2.4.0 or later, disabling TPM support)]) + have_libtss=no + ]) +- LIBTSS_LIBS="$LIBS -ltss2-mu -ltss2-rc -ltss2-tctildr" + AC_DEFINE(HAVE_INTEL_TSS, 1, [Defined if we have the Intel TSS]) + fi + LIBS="$_save_libs" +-- +2.47.0 From 9f46ed39ae9f8e57d04c0c5e0c3d1734da56a196 Mon Sep 17 00:00:00 2001 From: K900 Date: Sun, 9 Feb 2025 13:15:58 +0300 Subject: [PATCH 194/343] perlPackages: remove per-package LD=$CC workarounds Obsoleted by #374962. --- pkgs/top-level/perl-packages.nix | 42 -------------------------------- 1 file changed, 42 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index ec75478ec223c..f94f49cc9bf94 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1334,7 +1334,6 @@ with self; { url = "mirror://cpan/authors/id/Z/ZE/ZEFRAM/Authen-DecHpwd-2.007.tar.gz"; hash = "sha256-9DqTuwK0H3Mn2S+eljtpUF9nNQpS6PUHlvmK/E+z8Xc="; }; - perlPreHook = lib.optionalString stdenv.hostPlatform.isi686 "export LD=$CC"; # fix undefined reference to `__stack_chk_fail_local' propagatedBuildInputs = [ DataInteger DigestCRC ScalarString ]; meta = { description = "DEC VMS password hashing"; @@ -1367,7 +1366,6 @@ with self; { url = "mirror://cpan/authors/id/I/IO/IOANR/Authen-Krb5-1.905.tar.gz"; hash = "sha256-13sAuxUBpW9xGOkarAx+Qi2888QY+c6YuAF3HDqg900="; }; - perlPreHook = "export LD=$CC"; propagatedBuildInputs = [ pkgs.libkrb5 ]; buildInputs = [ DevelChecklib FileWhich PkgConfig ]; meta = { @@ -1648,7 +1646,6 @@ with self; { ''; buildInputs =[ ExtUtilsMakeMaker ]; propagatedBuildInputs = [ pkgs.zbar PerlMagick ]; - perlPreHook = lib.optionalString stdenv.hostPlatform.isDarwin "export LD=$CC"; meta = { description = "Perl interface to the ZBar Barcode Reader"; homepage = "https://metacpan.org/pod/Barcode::ZBar"; @@ -1896,7 +1893,6 @@ with self; { # Fix out of memory error on Perl 5.19.4 and later. ../development/perl-modules/boost-geometry-utils-fix-oom.patch ]; - perlPreHook = "export LD=$CC"; buildInputs = [ ExtUtilsCppGuess ExtUtilsTypemapsDefault ExtUtilsXSpp ModuleBuildWithXSpp ]; meta = { description = "Bindings for the Boost Geometry library"; @@ -5116,7 +5112,6 @@ with self; { hash = "sha256-PMcSbVhBEHI3qb4txcf7wWfPPEtM40Z4qESLhQdXAUw="; }; propagatedBuildInputs = [ ClassMix ]; - perlPreHook = lib.optionalString (stdenv.hostPlatform.isi686 || stdenv.hostPlatform.isDarwin) "export LD=$CC"; meta = { description = "Eksblowfish block cipher"; license = with lib.licenses; [ artistic1 gpl1Plus ]; @@ -5372,7 +5367,6 @@ with self; { hash = "sha256-k+vfqu/P6atoPwEhyF8kR12Bl/C87EYBghnkERQ03eM="; }; propagatedBuildInputs = [ DigestSHA1 ]; - perlPreHook = lib.optionalString (stdenv.hostPlatform.isi686 || stdenv.hostPlatform.isDarwin) "export LD=$CC"; meta = { description = "Emulate MySQL PASSWORD() function"; license = with lib.licenses; [ artistic1 gpl1Plus ]; @@ -5427,7 +5421,6 @@ with self; { hash = "sha256-fRbulczj61TBdGc6cpn0wIb7o6yF+EfQ4TT+7V93YBc="; }; propagatedBuildInputs = [ CryptOpenSSLRandom ]; - perlPreHook = "export LD=$CC"; meta = { description = "Scrypt password based key derivation function"; homepage = "https://github.com/DCIT/perl-Crypt-ScryptKDF"; @@ -5719,7 +5712,6 @@ with self; { url = "mirror://cpan/authors/id/G/GT/GTERMARS/CSS-Minifier-XS-0.13.tar.gz"; hash = "sha256-xBnjCM3IKvHCXWuNB7L/JjR6Yit6Y+wghWq+jbQFH4I="; }; - perlPreHook = lib.optionalString (stdenv.hostPlatform.isi686 || stdenv.hostPlatform.isDarwin) "export LD=$CC"; buildInputs = [ TestDiagINC ]; meta = { description = "XS based CSS minifier"; @@ -6348,7 +6340,6 @@ with self; { hash = "sha256-tVypHHafgTN8xrCrIMMmg4eOWyZj8cwljFEamZpd/dM="; }; buildInputs = [ HashUtilFieldHashCompat ModuleBuildXSUtil ScopeGuard TestException ]; - perlPreHook = lib.optionalString stdenv.hostPlatform.isi686 "export LD=$CC"; # fix undefined reference to `__stack_chk_fail_local' meta = { description = "Selection of utilities for data and data types"; homepage = "https://github.com/gfx/Perl-Data-Util"; @@ -7674,7 +7665,6 @@ with self; { hash = "sha256-z/jSTllF45RN6/ITmVprFVuR5YE0aRVrE9Ws819qXZ8="; }; propagatedBuildInputs = [ HashStoredIterator JSONXS PadWalker ]; - perlPreHook = lib.optionalString stdenv.hostPlatform.isDarwin "export LD=$CC"; meta = { description = "Perl side of the Perl debugger for IntelliJ IDEA and other JetBrains IDEs"; license = with lib.licenses; [ mit ]; @@ -9305,7 +9295,6 @@ with self; { url = "mirror://cpan/authors/id/A/AM/AMBS/ExtUtils-LibBuilder-0.08.tar.gz"; hash = "sha256-xRFx4G3lMDnwvKHZemRx7DeUH/Weij0csXDr3SVztdI="; }; - perlPreHook = "export LD=$CC"; meta = { description = "Tool to build C libraries"; license = with lib.licenses; [ artistic1 gpl1Plus ]; @@ -9999,7 +9988,6 @@ with self; { hash = "sha256-oC+/KFQGqKTZOZKE8DLy1VxWl1FUwuFnS9EJg3uAluw="; }; buildInputs = [ ExtUtilsCChecker ]; - perlPreHook = lib.optionalString (stdenv.hostPlatform.isi686 || stdenv.hostPlatform.isDarwin) "export LD=$CC"; # fix undefined reference to `__stack_chk_fail_local' meta = { description = "Modify attributes of symlinks without dereferencing them"; license = with lib.licenses; [ artistic1 gpl1Plus ]; @@ -10090,7 +10078,6 @@ with self; { url = "mirror://cpan/authors/id/L/LE/LEONT/File-Map-0.71.tar.gz"; hash = "sha256-yOJpM4BOhw1KupJiO3iGrIs8dgyY+/zTvcSyMFxGR1k="; }; - perlPreHook = "export LD=$CC"; propagatedBuildInputs = [ PerlIOLayers SubExporterProgressive ]; buildInputs = [ TestFatal TestWarnings ]; meta = { @@ -10656,7 +10643,6 @@ with self; { }; buildInputs = [ Test2Suite ]; propagatedBuildInputs = [ Future XSParseKeyword XSParseSublike ]; - perlPreHook = lib.optionalString stdenv.hostPlatform.isDarwin "export LD=$CC"; meta = { description = "Deferred subroutine syntax for futures"; license = with lib.licenses; [ artistic1 gpl1Plus ]; @@ -11615,7 +11601,6 @@ with self; { hash = "sha256-ucvE3NgjPo0dfxSB3beaSl+dtxgMs+8CtLy+4F5l6gw="; }; buildInputs = [ Test2Suite ]; - perlPreHook = lib.optionalString stdenv.hostPlatform.isDarwin "export LD=$CC"; meta = { description = "Functions for accessing a hashes internal iterator"; license = with lib.licenses; [ artistic1 gpl1Plus ]; @@ -11699,7 +11684,6 @@ with self; { hash = "sha256-Wl7viWUA0epsJKkIXs++mkOr7mjPxmwD+InSostoml0="; }; buildInputs = [ ModuleBuildPluggablePPPort TestRequires ]; - perlPreHook = lib.optionalString stdenv.hostPlatform.isi686 "export LD=$CC"; # fix undefined reference to `__stack_chk_fail_local' meta = { description = "Extremely fast HTML escaping"; homepage = "https://github.com/tokuhirom/HTML-Escape"; @@ -13392,7 +13376,6 @@ with self; { hash = "sha256-XZsDT1jwtv9bZGR708WpzgWypw7e4zn7wxc67nR8wFA="; }; buildInputs = [ TestDiagINC ]; - perlPreHook = lib.optionalString (stdenv.hostPlatform.isi686 || stdenv.hostPlatform.isDarwin) "export LD=$CC"; meta = { description = "XS based JavaScript minifier"; homepage = "https://metacpan.org/release/JavaScript-Minifier-XS"; @@ -14095,7 +14078,6 @@ with self; { }; buildInputs = [ TestException ]; propagatedBuildInputs = [ SubExporter ]; - perlPreHook = lib.optionalString stdenv.hostPlatform.isi686 "export LD=$CC"; # fix undefined reference to `__stack_chk_fail_local' meta = { description = "Linux specific special filehandles"; license = with lib.licenses; [ artistic1 gpl1Plus ]; @@ -14198,9 +14180,6 @@ with self; { url = "mirror://cpan/authors/id/R/RE/REHSACK/List-MoreUtils-XS-0.430.tar.gz"; hash = "sha256-6M5G1XwXnuzYdYKT6UAP8wCq8g/v4KnRW5/iMCucskI="; }; - preConfigure = '' - export LD=$CC - ''; meta = { description = "Provide the stuff missing in List::Util in XS"; homepage = "https://metacpan.org/release/List-MoreUtils-XS"; @@ -16267,7 +16246,6 @@ with self; { }; buildInputs = [ CaptureTiny CwdGuard FileCopyRecursiveReduced ]; propagatedBuildInputs = [ DevelCheckCompiler ]; - perlPreHook = "export LD=$CC"; meta = { description = "Module::Build class for building XS modules"; homepage = "https://github.com/hideo55/Module-Build-XSUtil"; @@ -17147,9 +17125,6 @@ with self; { }; buildInputs = [ DistCheckConflicts CPANMetaCheck TestCleanNamespaces TestFatal TestNeeds TestRequires ]; propagatedBuildInputs = [ ClassLoadXS DataOptList DevelGlobalDestruction DevelOverloadInfo DevelStackTrace EvalClosure MROCompat ModuleRuntimeConflicts PackageDeprecationManager PackageStashXS ParamsUtil SubExporter TryTiny ]; - preConfigure = '' - export LD=$CC - ''; meta = { description = "Postmodern object system for Perl 5"; homepage = "http://moose.perl.org"; @@ -18227,7 +18202,6 @@ with self; { hash = "sha256-zo3COUYVOkZ/8JdlFn7iWQ9cUCEg9IotlEFzPzmqMu4="; }; buildInputs = [ ModuleBuildXSUtil TestException TestFatal TestLeakTrace TestOutput TestRequires TryTiny ]; - perlPreHook = "export LD=$CC"; env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isi686 "-fno-stack-protector"; hardeningDisable = lib.optional stdenv.hostPlatform.isi686 "stackprotector"; meta = { @@ -18898,7 +18872,6 @@ with self; { }) ]; buildInputs = [ TestNoWarnings ]; - perlPreHook = "export LD=$CC"; meta = { description = "Internationalizing Domain Names in Applications (UTS #46)"; homepage = "https://metacpan.org/release/Net-IDN-Encode"; @@ -19667,7 +19640,6 @@ with self; { hash = "sha256-EpUKZkwGB+o/ynSA82XfVNF0YpH0XrsO2AkXt0+xXvU="; }; buildInputs = [ Test2Suite TestFatal TestRefcount ]; - perlPreHook = lib.optionalString stdenv.hostPlatform.isDarwin "export LD=$CC"; propagatedBuildInputs = [ XSParseKeyword XSParseSublike ]; meta = { description = "Simple syntax for lexical field-based objects"; @@ -20026,7 +19998,6 @@ with self; { url = "mirror://cpan/authors/id/Z/ZE/ZEFRAM/Params-Classify-0.015.tar.gz"; hash = "sha256-OY7BXNiZ/Ni+89ueoXSL9jHxX2wyviA+R1tn31EKWRQ="; }; - perlPreHook = lib.optionalString stdenv.hostPlatform.isi686 "export LD=$CC"; # fix undefined reference to `__stack_chk_fail_local' meta = { description = "Argument type classification"; license = with lib.licenses; [ artistic1 gpl1Plus ]; @@ -20056,7 +20027,6 @@ with self; { }; buildInputs = [ TestFatal TestRequires ]; propagatedBuildInputs = [ ModuleImplementation ]; - perlPreHook = "export LD=$CC"; meta = { description = "Validate method/function parameters"; homepage = "https://metacpan.org/release/Params-Validate"; @@ -20636,7 +20606,6 @@ with self; { url = "mirror://cpan/authors/id/L/LE/LEONT/PerlIO-Layers-0.012.tar.gz"; hash = "sha256-VC2lQvo2uz/de4d24jDTzMAqpnRM6bd7Tu9MyufASt8="; }; - perlPreHook = "export LD=$CC"; meta = { description = "Querying your filehandle's capabilities"; license = with lib.licenses; [ artistic1 gpl1Plus ]; @@ -22504,7 +22473,6 @@ with self; { # https://github.com/PerlGameDev/SDL/pull/304 ../development/perl-modules/sdl-modern-perl.patch ]; - perlPreHook = "export LD=$CC"; preCheck = "rm t/core_audiospec.t"; buildInputs = [ pkgs.SDL pkgs.SDL_gfx pkgs.SDL_mixer pkgs.SDL_image pkgs.SDL_ttf pkgs.SDL_Pango pkgs.SDL_net AlienSDL CaptureTiny TestDeep TestDifferences TestException TestMost TestWarn ]; propagatedBuildInputs = [ FileShareDir TieSimple ]; @@ -23826,7 +23794,6 @@ with self; { hash = "sha256-oSfa52RcGpVwzZopcMbcST1SL/BzGKNKOeQJCY9pESU="; }; propagatedBuildInputs = [ LexicalSealRequireHints ]; - perlPreHook = lib.optionalString stdenv.hostPlatform.isDarwin "export LD=$CC"; meta = { description = "Detect undeclared subroutines in compilation"; license = with lib.licenses; [ artistic1 gpl1Plus ]; @@ -23868,7 +23835,6 @@ with self; { url = "mirror://cpan/authors/id/T/TO/TODDR/Safe-Hole-0.14.tar.gz"; hash = "sha256-9PVui70GxP5K4G2xIYbeyt+6wep3XqGMbAKJSB0V7AU="; }; - perlPreHook = lib.optionalString stdenv.hostPlatform.isDarwin "export LD=$CC"; meta = { description = "Lib/Safe/Hole.pm"; homepage = "https://github.com/toddr/Safe-Hole"; @@ -23988,7 +23954,6 @@ with self; { }; buildInputs = [ Test2Suite ]; propagatedBuildInputs = [ XSParseKeyword ]; - perlPreHook = lib.optionalString (stdenv.hostPlatform.isi686 || stdenv.hostPlatform.isDarwin) "export LD=$CC"; meta = { description = "Try/catch/finally syntax for perl"; license = with lib.licenses; [ artistic1 gpl1Plus ]; @@ -24133,7 +24098,6 @@ with self; { }; nativeBuildInputs = [ pkgs.pkg-config ]; buildInputs = [ pkgs.libvirt CPANChanges TestPod TestPodCoverage XMLXPath ]; - perlPreHook = lib.optionalString stdenv.hostPlatform.isi686 "export LD=$CC"; # fix undefined reference to `__stack_chk_fail_local' meta = { description = "Libvirt Perl API"; homepage = "https://libvirt.org"; @@ -26594,7 +26558,6 @@ with self; { }; # libbtparse.so: cannot open shared object file patches = [ ../development/perl-modules/TextBibTeX-use-lib.patch ]; - perlPreHook = "export LD=$CC"; perlPostHook = lib.optionalString stdenv.hostPlatform.isDarwin '' oldPath="$(pwd)/btparse/src/libbtparse.dylib" newPath="$out/lib/libbtparse.dylib" @@ -26903,7 +26866,6 @@ with self; { hash = "sha256-U6cw/29IgrmavYVW8mqRH1gvZ1tZ8OFnJe0ey8CE7lA="; }; buildInputs = [ Filepushd ]; - perlPreHook = lib.optionalString stdenv.hostPlatform.isDarwin "export LD=$CC"; meta = { description = "Hoedown for Perl5"; homepage = "https://github.com/tokuhirom/Text-Markdown-Hoedown"; @@ -27944,7 +27906,6 @@ with self; { url = "mirror://cpan/authors/id/A/AR/ARODLAND/Unicode-CaseFold-1.01.tar.gz"; hash = "sha256-QYohKAj50Li7MwrJBQltLdNkl2dT1McVNNq5g2pjGU0="; }; - perlPreHook = lib.optionalString stdenv.hostPlatform.isi686 "export LD=$CC"; # fix undefined reference to `__stack_chk_fail_local' meta = { description = "Unicode case-folding for case-insensitive lookups"; homepage = "https://metacpan.org/release/Unicode-CaseFold"; @@ -29194,7 +29155,6 @@ with self; { }; buildInputs = [ ExtUtilsCChecker Test2Suite ]; propagatedBuildInputs = [ FileShareDir ]; - perlPreHook = lib.optionalString (stdenv.hostPlatform.isi686 || stdenv.hostPlatform.isDarwin) "export LD=$CC"; meta = { description = "XS functions to assist in parsing keyword syntax"; license = with lib.licenses; [ artistic1 gpl1Plus ]; @@ -29211,7 +29171,6 @@ with self; { }; buildInputs = [ Test2Suite ]; propagatedBuildInputs = [ FileShareDir ]; - perlPreHook = lib.optionalString stdenv.hostPlatform.isDarwin "export LD=$CC"; meta = { description = "XS functions to assist in parsing sub-like syntax"; license = with lib.licenses; [ artistic1 gpl1Plus ]; @@ -29273,7 +29232,6 @@ with self; { url = "mirror://cpan/authors/id/T/TO/TODDR/YAML-Syck-1.34.tar.gz"; hash = "sha256-zJFWzK69p5jr/i8xthnoBld/hg7RcEJi8X/608bjQVk="; }; - perlPreHook = lib.optionalString stdenv.hostPlatform.isDarwin "export LD=$CC"; meta = { description = "Fast, lightweight YAML loader and dumper"; homepage = "https://github.com/toddr/YAML-Syck"; From 455db8c553d4079d8f5a63ec2c8c063753a2f3d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 9 Feb 2025 11:24:40 +0100 Subject: [PATCH 195/343] util-linux: add a link to pull request with the patch --- pkgs/by-name/ut/util-linux/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/ut/util-linux/package.nix b/pkgs/by-name/ut/util-linux/package.nix index c4c0bfa281940..47975dc5c38d6 100644 --- a/pkgs/by-name/ut/util-linux/package.nix +++ b/pkgs/by-name/ut/util-linux/package.nix @@ -36,6 +36,7 @@ stdenv.mkDerivation rec { patches = [ ./rtcwake-search-PATH-for-shutdown.patch + # https://github.com/util-linux/util-linux/pull/3013 ./fix-darwin-build.patch ]; From 10c1939467607b9f2eea9c70bd4c2524f6ffe145 Mon Sep 17 00:00:00 2001 From: Connor Baker Date: Sat, 11 Jan 2025 01:51:58 +0100 Subject: [PATCH 196/343] cudaPackages.cudnn-frontend: init at 1.9.0 --- ...at-out-common-python-bindings-option.patch | 30 + ...-so-headers-can-be-discovered-when-i.patch | 84 +++ ...install-samples-and-tests-when-built.patch | 85 +++ ...fix-instances-of-maybe-uninitialized.patch | 591 ++++++++++++++++++ .../cudnn-frontend/CMakeLists.txt | 133 ++++ .../cudnn_frontend-config.cmake.in | 3 + .../cuda-modules/cudnn-frontend/default.nix | 134 ++++ pkgs/top-level/cuda-packages.nix | 1 + 8 files changed, 1061 insertions(+) create mode 100644 pkgs/development/cuda-modules/cudnn-frontend/0001-cmake-float-out-common-python-bindings-option.patch create mode 100644 pkgs/development/cuda-modules/cudnn-frontend/0002-cmake-add-config-so-headers-can-be-discovered-when-i.patch create mode 100644 pkgs/development/cuda-modules/cudnn-frontend/0003-cmake-install-samples-and-tests-when-built.patch create mode 100644 pkgs/development/cuda-modules/cudnn-frontend/0004-samples-fix-instances-of-maybe-uninitialized.patch create mode 100644 pkgs/development/cuda-modules/cudnn-frontend/CMakeLists.txt create mode 100644 pkgs/development/cuda-modules/cudnn-frontend/cudnn_frontend-config.cmake.in create mode 100644 pkgs/development/cuda-modules/cudnn-frontend/default.nix diff --git a/pkgs/development/cuda-modules/cudnn-frontend/0001-cmake-float-out-common-python-bindings-option.patch b/pkgs/development/cuda-modules/cudnn-frontend/0001-cmake-float-out-common-python-bindings-option.patch new file mode 100644 index 0000000000000..76ad1d57ffcdb --- /dev/null +++ b/pkgs/development/cuda-modules/cudnn-frontend/0001-cmake-float-out-common-python-bindings-option.patch @@ -0,0 +1,30 @@ +From eeef96e91bd3453160315bf4618b7b91ae7240ba Mon Sep 17 00:00:00 2001 +From: Connor Baker +Date: Sat, 18 Jan 2025 20:48:11 +0000 +Subject: [PATCH 1/4] cmake: float out common python bindings option + +--- + CMakeLists.txt | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 9739569..8944621 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -5,12 +5,11 @@ project(cudnn_frontend VERSION 1.9.0) + option(CUDNN_FRONTEND_SKIP_JSON_LIB "Defines whether FE should not include nlohmann/json.hpp." OFF) + option(CUDNN_FRONTEND_BUILD_SAMPLES "Defines if samples are built or not." ON) + option(CUDNN_FRONTEND_BUILD_TESTS "Defines if unittests are built or not." ON) ++option(CUDNN_FRONTEND_BUILD_PYTHON_BINDINGS "Defines if python bindings are built or not." OFF) + + if(MSVC OR MSYS OR MINGW) +- option(CUDNN_FRONTEND_BUILD_PYTHON_BINDINGS "Defines if python bindings are built or not." OFF) + add_compile_options(/W4 /WX) + else() +- option(CUDNN_FRONTEND_BUILD_PYTHON_BINDINGS "Defines if python bindings are built or not." OFF) + add_compile_options(-Wall -Wextra -Wpedantic -Werror -Wno-error=attributes -Wno-attributes -Wno-error=unused-function -Wno-unused-function) + endif() + +-- +2.47.0 + diff --git a/pkgs/development/cuda-modules/cudnn-frontend/0002-cmake-add-config-so-headers-can-be-discovered-when-i.patch b/pkgs/development/cuda-modules/cudnn-frontend/0002-cmake-add-config-so-headers-can-be-discovered-when-i.patch new file mode 100644 index 0000000000000..e3edf4913daac --- /dev/null +++ b/pkgs/development/cuda-modules/cudnn-frontend/0002-cmake-add-config-so-headers-can-be-discovered-when-i.patch @@ -0,0 +1,84 @@ +From da16ec51ea78f88f333ecf3df2a249fcc65ead24 Mon Sep 17 00:00:00 2001 +From: Connor Baker +Date: Sat, 18 Jan 2025 22:01:03 +0000 +Subject: [PATCH 2/4] cmake: add config so headers can be discovered when + installed + +--- + CMakeLists.txt | 39 +++++++++++++++++++++++++++++++--- + cudnn_frontend-config.cmake.in | 3 +++ + 2 files changed, 39 insertions(+), 3 deletions(-) + create mode 100644 cudnn_frontend-config.cmake.in + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 8944621..9b1bfba 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,4 +1,4 @@ +-cmake_minimum_required(VERSION 3.17) ++cmake_minimum_required(VERSION 3.23) + + project(cudnn_frontend VERSION 1.9.0) + +@@ -15,6 +15,15 @@ endif() + + add_library(cudnn_frontend INTERFACE) + ++# Add header files to library ++file(GLOB_RECURSE CUDNN_FRONTEND_INCLUDE_FILES "include/*") ++target_sources( ++ cudnn_frontend PUBLIC FILE_SET HEADERS ++ BASE_DIRS "$" ++ FILES "${CUDNN_FRONTEND_INCLUDE_FILES}" ++) ++unset(CUDNN_FRONTEND_INCLUDE_FILES) ++ + target_compile_definitions( + cudnn_frontend INTERFACE + $<$:CUDNN_FRONTEND_SKIP_JSON_LIB> +@@ -58,7 +67,31 @@ endif() + # * CMAKE_INSTALL_INCLUDEDIR + include(GNUInstallDirs) + ++# See https://cmake.org/cmake/help/latest/module/CMakePackageConfigHelpers.html#example-generating-package-files ++include(CMakePackageConfigHelpers) ++ ++# Install and export the header files ++install( ++ TARGETS cudnn_frontend ++ EXPORT cudnn_frontend_targets FILE_SET HEADERS ++) ++export( ++ EXPORT cudnn_frontend_targets ++ FILE "${CMAKE_CURRENT_BINARY_DIR}/cudnn_frontend/cudnn_frontend-targets.cmake" ++) ++install( ++ EXPORT cudnn_frontend_targets ++ FILE cudnn_frontend-targets.cmake ++ DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/cudnn_frontend" ++) ++ ++# Install the CMake configuration file for header discovery ++configure_package_config_file( ++ cudnn_frontend-config.cmake.in ++ "${CMAKE_CURRENT_BINARY_DIR}/cudnn_frontend-config.cmake" ++ INSTALL_DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/cudnn_frontend" ++) + install( +- DIRECTORY ${PROJECT_SOURCE_DIR}/include/ +- DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} ++ FILES "${CMAKE_CURRENT_BINARY_DIR}/cudnn_frontend-config.cmake" ++ DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/cudnn_frontend" + ) +diff --git a/cudnn_frontend-config.cmake.in b/cudnn_frontend-config.cmake.in +new file mode 100644 +index 0000000..8b2d843 +--- /dev/null ++++ b/cudnn_frontend-config.cmake.in +@@ -0,0 +1,3 @@ ++@PACKAGE_INIT@ ++ ++include(${CMAKE_CURRENT_LIST_DIR}/cudnn_frontend-targets.cmake) +-- +2.47.0 + diff --git a/pkgs/development/cuda-modules/cudnn-frontend/0003-cmake-install-samples-and-tests-when-built.patch b/pkgs/development/cuda-modules/cudnn-frontend/0003-cmake-install-samples-and-tests-when-built.patch new file mode 100644 index 0000000000000..a37e53bab0696 --- /dev/null +++ b/pkgs/development/cuda-modules/cudnn-frontend/0003-cmake-install-samples-and-tests-when-built.patch @@ -0,0 +1,85 @@ +From 53d5aaaad09b479cd8c0e148c9428baa33204024 Mon Sep 17 00:00:00 2001 +From: Connor Baker +Date: Sat, 18 Jan 2025 22:10:41 +0000 +Subject: [PATCH 3/4] cmake: install samples and tests when built + +--- + CMakeLists.txt | 12 +++++++++++- + samples/cpp/CMakeLists.txt | 2 ++ + samples/legacy_samples/CMakeLists.txt | 2 ++ + test/cpp/CMakeLists.txt | 2 ++ + 4 files changed, 17 insertions(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 9b1bfba..f6af111 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -70,11 +70,21 @@ include(GNUInstallDirs) + # See https://cmake.org/cmake/help/latest/module/CMakePackageConfigHelpers.html#example-generating-package-files + include(CMakePackageConfigHelpers) + +-# Install and export the header files ++# Install the components + install( + TARGETS cudnn_frontend + EXPORT cudnn_frontend_targets FILE_SET HEADERS + ) ++ ++if (CUDNN_FRONTEND_BUILD_SAMPLES) ++ install(TARGETS legacy_samples samples RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) ++endif() ++ ++if (CUDNN_FRONTEND_BUILD_TESTS) ++ install(TARGETS tests RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) ++endif() ++ ++# Export the targets + export( + EXPORT cudnn_frontend_targets + FILE "${CMAKE_CURRENT_BINARY_DIR}/cudnn_frontend/cudnn_frontend-targets.cmake" +diff --git a/samples/cpp/CMakeLists.txt b/samples/cpp/CMakeLists.txt +index 9b8a5eb..01b09bb 100644 +--- a/samples/cpp/CMakeLists.txt ++++ b/samples/cpp/CMakeLists.txt +@@ -69,8 +69,10 @@ target_link_libraries( + _cudnn_frontend_pch + CUDNN::cudnn + ++ CUDA::cublasLt + CUDA::cudart + CUDA::cuda_driver # Needed as calls all CUDA calls will eventually move to driver ++ CUDA::nvrtc + ) + + # target cmake properties +diff --git a/samples/legacy_samples/CMakeLists.txt b/samples/legacy_samples/CMakeLists.txt +index 019f17c..3b56329 100644 +--- a/samples/legacy_samples/CMakeLists.txt ++++ b/samples/legacy_samples/CMakeLists.txt +@@ -44,7 +44,9 @@ target_link_libraries( + _cudnn_frontend_pch + CUDNN::cudnn + ++ CUDA::cublasLt + CUDA::cudart ++ CUDA::nvrtc + ) + + # target cmake properties +diff --git a/test/cpp/CMakeLists.txt b/test/cpp/CMakeLists.txt +index e244cd0..2750294 100644 +--- a/test/cpp/CMakeLists.txt ++++ b/test/cpp/CMakeLists.txt +@@ -55,7 +55,9 @@ target_link_libraries( + + CUDNN::cudnn + ++ CUDA::cublasLt + CUDA::cudart ++ CUDA::nvrtc + ) + + # cuDNN dlopen's its libraries +-- +2.47.0 + diff --git a/pkgs/development/cuda-modules/cudnn-frontend/0004-samples-fix-instances-of-maybe-uninitialized.patch b/pkgs/development/cuda-modules/cudnn-frontend/0004-samples-fix-instances-of-maybe-uninitialized.patch new file mode 100644 index 0000000000000..d9119de872851 --- /dev/null +++ b/pkgs/development/cuda-modules/cudnn-frontend/0004-samples-fix-instances-of-maybe-uninitialized.patch @@ -0,0 +1,591 @@ +From 4ce40a0c3de0e8a7065caf1cf59a90493e084682 Mon Sep 17 00:00:00 2001 +From: Connor Baker +Date: Sat, 18 Jan 2025 22:22:21 +0000 +Subject: [PATCH 4/4] samples: fix instances of maybe-uninitialized + +--- + samples/cpp/convolution/dgrads.cpp | 6 +++--- + samples/cpp/convolution/fp8_fprop.cpp | 2 +- + samples/cpp/convolution/fprop.cpp | 10 +++++----- + samples/cpp/convolution/int8_fprop.cpp | 2 +- + samples/cpp/convolution/wgrads.cpp | 4 ++-- + samples/cpp/matmul/fp8_matmul.cpp | 2 +- + samples/cpp/matmul/int8_matmul.cpp | 2 +- + samples/cpp/matmul/matmuls.cpp | 8 ++++---- + samples/cpp/matmul/mixed_matmul.cpp | 2 +- + samples/cpp/misc/pointwise.cpp | 6 +++--- + samples/cpp/misc/resample.cpp | 6 +++--- + samples/cpp/misc/serialization.cpp | 4 ++-- + samples/cpp/misc/slice.cpp | 2 +- + samples/cpp/misc/sm_carveout.cpp | 2 +- + samples/cpp/norm/batchnorm.cpp | 8 ++++---- + samples/cpp/norm/layernorm.cpp | 8 ++++---- + samples/cpp/norm/rmsnorm.cpp | 6 +++--- + samples/cpp/sdpa/fp16_bwd.cpp | 2 +- + samples/cpp/sdpa/fp16_bwd_with_flexible_graphs.cpp | 2 +- + samples/cpp/sdpa/fp16_cached.cpp | 2 +- + samples/cpp/sdpa/fp16_fwd.cpp | 2 +- + samples/cpp/sdpa/fp16_fwd_with_custom_dropout.cpp | 2 +- + samples/cpp/sdpa/fp16_fwd_with_flexible_graphs.cpp | 2 +- + samples/cpp/sdpa/fp16_fwd_with_paged_caches.cpp | 2 +- + samples/cpp/sdpa/fp8_bwd.cpp | 4 ++-- + samples/cpp/sdpa/fp8_fwd.cpp | 2 +- + 26 files changed, 50 insertions(+), 50 deletions(-) + +diff --git a/samples/cpp/convolution/dgrads.cpp b/samples/cpp/convolution/dgrads.cpp +index 589cb5f..f66abf4 100644 +--- a/samples/cpp/convolution/dgrads.cpp ++++ b/samples/cpp/convolution/dgrads.cpp +@@ -65,7 +65,7 @@ TEST_CASE("Convolution Dgrad", "[dgrad][graph]") { + Surface w_tensor(64 * 32 * 3 * 3, false); + Surface dx_tensor(4 * 32 * 16 * 16, false); + +- int64_t workspace_size; ++ int64_t workspace_size = 0; + REQUIRE(graph.get_workspace_size(workspace_size).is_good()); + + Surface workspace(workspace_size, false); +@@ -122,7 +122,7 @@ TEST_CASE("Dgrad Drelu Graph", "[dgrad][graph]") { + Surface x_tensor(4 * 32 * 16 * 16, false); + Surface dx_tensor(4 * 32 * 16 * 16, false); + +- int64_t workspace_size; ++ int64_t workspace_size = 0; + REQUIRE(graph.get_workspace_size(workspace_size).is_good()); + Surface workspace(workspace_size, false); + +@@ -234,7 +234,7 @@ TEST_CASE("Dgrad Drelu DBNweight Graph", "[dgrad][graph]") { + Surface eq_scale_x_tensor(1 * 32 * 1 * 1, false); + Surface eq_bias_tensor(1 * 32 * 1 * 1, false); + +- int64_t workspace_size; ++ int64_t workspace_size = 0; + REQUIRE(graph.get_workspace_size(workspace_size).is_good()); + Surface workspace(workspace_size, false); + +diff --git a/samples/cpp/convolution/fp8_fprop.cpp b/samples/cpp/convolution/fp8_fprop.cpp +index dfcb7e2..8246ce4 100644 +--- a/samples/cpp/convolution/fp8_fprop.cpp ++++ b/samples/cpp/convolution/fp8_fprop.cpp +@@ -116,7 +116,7 @@ TEST_CASE("Convolution fp8 precision", "[conv][graph]") { + Surface Y_scale_gpu(1, false); + Surface amax_gpu(1, false); + +- int64_t workspace_size; ++ int64_t workspace_size = 0; + REQUIRE(graph->get_workspace_size(workspace_size).is_good()); + Surface workspace(workspace_size, false); + +diff --git a/samples/cpp/convolution/fprop.cpp b/samples/cpp/convolution/fprop.cpp +index bc1aaf0..d61fa4e 100644 +--- a/samples/cpp/convolution/fprop.cpp ++++ b/samples/cpp/convolution/fprop.cpp +@@ -80,7 +80,7 @@ TEST_CASE("Convolution fprop", "[conv][graph][caching]") { + std::unordered_map variant_pack = { + {X->get_uid(), x_tensor.devPtr}, {W->get_uid(), w_tensor.devPtr}, {Y->get_uid(), y_tensor.devPtr}}; + +- int64_t workspace_size; ++ int64_t workspace_size = 0; + REQUIRE(graph->get_workspace_size(workspace_size).is_good()); + Surface workspace(workspace_size, false); + +@@ -303,7 +303,7 @@ TEST_CASE("CSBR Graph", "[conv][graph][caching]") { + Surface b_tensor(k, false); + Surface y_tensor(n * k * h * w, false); // Should be p, q. + +- int64_t workspace_size; ++ int64_t workspace_size = 0; + REQUIRE(graph->get_workspace_size(workspace_size).is_good()); + Surface workspace(workspace_size, false); + +@@ -550,7 +550,7 @@ TEST_CASE("SBRCS", "[conv][genstats][graph]") { + {SUM, sum_tensor.devPtr}, + {SQ_SUM, sq_sum_tensor.devPtr}}; + +- int64_t workspace_size; ++ int64_t workspace_size = 0; + REQUIRE(graph->get_workspace_size(workspace_size).is_good()); + Surface workspace(workspace_size, false); + +@@ -651,7 +651,7 @@ TEST_CASE("CBR Graph NCHW", "[conv][graph][caching]") { + Surface y_tensor(n * k * h * w, false); // Should be p, q. + Surface z_tensor(n * k * h * w, false); // Should be p, q. + +- int64_t workspace_size; ++ int64_t workspace_size = 0; + REQUIRE(graph->get_workspace_size(workspace_size).is_good()); + Surface workspace(workspace_size, false); + +@@ -734,7 +734,7 @@ TEST_CASE("Convolution fprop large", "[conv][graph][caching]") { + std::unordered_map variant_pack = { + {X->get_uid(), x_tensor.devPtr}, {W->get_uid(), w_tensor.devPtr}, {Y->get_uid(), y_tensor.devPtr}}; + +- int64_t workspace_size; ++ int64_t workspace_size = 0; + REQUIRE(graph->get_workspace_size(workspace_size).is_good()); + Surface workspace(workspace_size, false); + +diff --git a/samples/cpp/convolution/int8_fprop.cpp b/samples/cpp/convolution/int8_fprop.cpp +index 3d5ac2f..e9248f5 100644 +--- a/samples/cpp/convolution/int8_fprop.cpp ++++ b/samples/cpp/convolution/int8_fprop.cpp +@@ -94,7 +94,7 @@ TEST_CASE("Conv with Int8 datatypes", "[conv][graph][caching]") { + std::unordered_map, void*> variant_pack = { + {X, x_tensor.devPtr}, {W, w_tensor.devPtr}, {Y, y_tensor.devPtr}}; + +- int64_t workspace_size; ++ int64_t workspace_size = 0; + REQUIRE(graph->get_workspace_size(workspace_size).is_good()); + Surface workspace(workspace_size, false); + +diff --git a/samples/cpp/convolution/wgrads.cpp b/samples/cpp/convolution/wgrads.cpp +index 2c58b26..26887dc 100644 +--- a/samples/cpp/convolution/wgrads.cpp ++++ b/samples/cpp/convolution/wgrads.cpp +@@ -64,7 +64,7 @@ TEST_CASE("Convolution Wgrad", "[wgrad][graph][wgrad][Conv_wgrad]") { + Surface dy_tensor(4 * 64 * 16 * 16, false); + Surface dw_tensor(64 * 64 * 3 * 3, false); + +- int64_t workspace_size; ++ int64_t workspace_size = 0; + REQUIRE(graph.get_workspace_size(workspace_size).is_good()); + Surface workspace(workspace_size, false); + +@@ -137,7 +137,7 @@ TEST_CASE("scale-bias-relu-wgrad Graph", "[wgrad][graph][scale-bias-relu-wgrad][ + Surface dy_tensor(4 * 64 * 16 * 16, false); + Surface dw_tensor(64 * 64 * 3 * 3, false); + +- int64_t workspace_size; ++ int64_t workspace_size = 0; + REQUIRE(graph.get_workspace_size(workspace_size).is_good()); + Surface workspace(workspace_size, false); + +diff --git a/samples/cpp/matmul/fp8_matmul.cpp b/samples/cpp/matmul/fp8_matmul.cpp +index c6470cd..f32c627 100644 +--- a/samples/cpp/matmul/fp8_matmul.cpp ++++ b/samples/cpp/matmul/fp8_matmul.cpp +@@ -115,7 +115,7 @@ TEST_CASE("Matmul fp8 precision", "[matmul][graph]") { + REQUIRE(graph.build_plans(handle, fe::BuildPlanPolicy_t::HEURISTICS_CHOICE).is_good()); + + Surface C_gpu(b * m * n, false); +- int64_t workspace_size; ++ int64_t workspace_size = 0; + REQUIRE(graph.get_workspace_size(workspace_size).is_good()); + Surface workspace(workspace_size, false); + +diff --git a/samples/cpp/matmul/int8_matmul.cpp b/samples/cpp/matmul/int8_matmul.cpp +index cf4353a..cb3ce34 100644 +--- a/samples/cpp/matmul/int8_matmul.cpp ++++ b/samples/cpp/matmul/int8_matmul.cpp +@@ -104,7 +104,7 @@ TEST_CASE("Int8 Matmul", "[matmul][graph]") { + // note this is a bf16 tensor, but half is used just for memory allocation + Surface C_gpu(b * m * n, false); + Surface Bias_gpu(b * m * n, false); +- int64_t workspace_size; ++ int64_t workspace_size = 0; + REQUIRE(graph.get_workspace_size(workspace_size).is_good()); + Surface workspace(workspace_size, false); + +diff --git a/samples/cpp/matmul/matmuls.cpp b/samples/cpp/matmul/matmuls.cpp +index ed0f10b..5c95713 100644 +--- a/samples/cpp/matmul/matmuls.cpp ++++ b/samples/cpp/matmul/matmuls.cpp +@@ -250,7 +250,7 @@ TEST_CASE("Matmul", "[matmul][graph]") { + + // Run cudnn graph + Surface C_gpu(b * m * n, false); +- int64_t workspace_size; ++ int64_t workspace_size = 0; + REQUIRE(graph.get_workspace_size(workspace_size).is_good()); + Surface workspace(workspace_size, false); + +@@ -319,7 +319,7 @@ TEST_CASE("Abs + Matmul", "[matmul][graph]") { + + // Run cudnn graph + Surface C_gpu(b * m * n, false); +- int64_t workspace_size; ++ int64_t workspace_size = 0; + REQUIRE(graph.get_workspace_size(workspace_size).is_good()); + Surface workspace(workspace_size, false); + +@@ -539,7 +539,7 @@ TEST_CASE("Matmul SBR Graph", "[matmul][graph]") { + auto [graph, A, B, bias, scale, O] = lookup_cache_or_build_graph( + handle, x_tensor.devPtr, w_tensor.devPtr, s_tensor.devPtr, b_tensor.devPtr, y_tensor.devPtr); + +- int64_t workspace_size; ++ int64_t workspace_size = 0; + REQUIRE(graph->get_workspace_size(workspace_size).is_good()); + Surface workspace(workspace_size, false); + +@@ -606,7 +606,7 @@ TEST_CASE("Matmul with restricted shared memory", "[matmul][graph]") { + + // Run cudnn graph + Surface C_gpu(b * m * n, false); +- int64_t workspace_size; ++ int64_t workspace_size = 0; + REQUIRE(graph.get_workspace_size(workspace_size).is_good()); + Surface workspace(workspace_size, false); + +diff --git a/samples/cpp/matmul/mixed_matmul.cpp b/samples/cpp/matmul/mixed_matmul.cpp +index ab3e195..a2b05bd 100644 +--- a/samples/cpp/matmul/mixed_matmul.cpp ++++ b/samples/cpp/matmul/mixed_matmul.cpp +@@ -96,7 +96,7 @@ TEST_CASE("Mixed Precision Matmul", "[matmul][graph]") { + //// Run cudnn graph + // note this is a bf16 tensor, but half is used just for memory allocation + Surface C_gpu(b * m * n, false); +- int64_t workspace_size; ++ int64_t workspace_size = 0; + REQUIRE(graph.get_workspace_size(workspace_size).is_good()); + Surface workspace(workspace_size, false); + +diff --git a/samples/cpp/misc/pointwise.cpp b/samples/cpp/misc/pointwise.cpp +index 8f8d699..e8f4cb1 100644 +--- a/samples/cpp/misc/pointwise.cpp ++++ b/samples/cpp/misc/pointwise.cpp +@@ -51,7 +51,7 @@ TEST_CASE("Reduction", "[reduction]") { + Surface C_gpu(n * n * n * n, false); + std::unordered_map, void*> variant_pack = {{A, A_gpu.devPtr}, + {C, C_gpu.devPtr}}; +- int64_t workspace_size; ++ int64_t workspace_size = 0; + REQUIRE(graph.get_workspace_size(workspace_size).is_good()); + Surface workspace(workspace_size, false); + +@@ -88,7 +88,7 @@ TEST_CASE("Fused scalar", "[scalar][graph]") { + + std::unordered_map, void*> variant_pack = {{A, A_gpu.devPtr}, + {C, C_gpu.devPtr}}; +- int64_t workspace_size; ++ int64_t workspace_size = 0; + REQUIRE(graph.get_workspace_size(workspace_size).is_good()); + Surface workspace(workspace_size, false); + +@@ -148,7 +148,7 @@ TEST_CASE("Fused Amax Reduction and type conversion", "[reduction]") { + + std::unordered_map, void*> variant_pack = { + {A, A_gpu.devPtr}, {scale, scale_gpu.devPtr}, {amax, amax_gpu.devPtr}, {C, C_gpu.devPtr}}; +- int64_t workspace_size; ++ int64_t workspace_size = 0; + REQUIRE(graph.get_workspace_size(workspace_size).is_good()); + Surface workspace(workspace_size, false); + +diff --git a/samples/cpp/misc/resample.cpp b/samples/cpp/misc/resample.cpp +index 3f782e7..21998c3 100644 +--- a/samples/cpp/misc/resample.cpp ++++ b/samples/cpp/misc/resample.cpp +@@ -69,7 +69,7 @@ TEST_CASE("Resample Max Pooling NHWC Inference", "[resample][pooling][max][graph + Surface Y_gpu(N * H * W * C, false); + std::unordered_map, void*> variant_pack = {{X, X_gpu.devPtr}, + {Y, Y_gpu.devPtr}}; +- int64_t workspace_size; ++ int64_t workspace_size = 0; + REQUIRE(graph.get_workspace_size(workspace_size).is_good()); + Surface workspace(workspace_size, false); + +@@ -132,7 +132,7 @@ TEST_CASE("Resample Max Pooling NHWC Training", "[resample][pooling][max][graph] + Surface Index_gpu(N * H * W * C / 8, false); + std::unordered_map, void*> variant_pack = { + {X, X_gpu.devPtr}, {Y, Y_gpu.devPtr}, {Index, Index_gpu.devPtr}}; +- int64_t workspace_size; ++ int64_t workspace_size = 0; + REQUIRE(graph.get_workspace_size(workspace_size).is_good()); + Surface workspace(workspace_size, false); + +@@ -186,7 +186,7 @@ TEST_CASE("Resample Avg Pooling", "[resample][pooling][average][graph]") { + Surface Y_gpu(N * H * W * C, false); + std::unordered_map, void*> variant_pack = {{X, X_gpu.devPtr}, + {Y, Y_gpu.devPtr}}; +- int64_t workspace_size; ++ int64_t workspace_size = 0; + REQUIRE(graph.get_workspace_size(workspace_size).is_good()); + Surface workspace(workspace_size, false); + +diff --git a/samples/cpp/misc/serialization.cpp b/samples/cpp/misc/serialization.cpp +index a130406..278bad8 100644 +--- a/samples/cpp/misc/serialization.cpp ++++ b/samples/cpp/misc/serialization.cpp +@@ -178,7 +178,7 @@ TEST_CASE("CSBR Graph with serialization", "[conv][graph][serialization]") { + Surface b_device_memory(k, false); + Surface y_device_memory(n * k * h * w, false); // Should be p, q. + +- int64_t workspace_size; ++ int64_t workspace_size = 0; + REQUIRE(graph->get_workspace_size(workspace_size).is_good()); + Surface workspace(workspace_size, false); + +@@ -401,7 +401,7 @@ TEST_CASE("SDPA Graph with serialization", "[sdpa][graph][serialization]") { + Surface dropoutSeed(scaleSize, false, seed_value); + Surface dropoutOffset(scaleSize, false, (int32_t)1); + +- int64_t workspace_size; ++ int64_t workspace_size = 0; + REQUIRE(graph->get_workspace_size(workspace_size).is_good()); + Surface workspace(workspace_size, false); + +diff --git a/samples/cpp/misc/slice.cpp b/samples/cpp/misc/slice.cpp +index 087ba36..78962c6 100644 +--- a/samples/cpp/misc/slice.cpp ++++ b/samples/cpp/misc/slice.cpp +@@ -80,7 +80,7 @@ TEST_CASE("Slice gemm", "[slice][gemm][graph][fusion]") { + Surface C_gpu(B * M * N, false); + std::unordered_map variant_pack = { + {a_uid, A_gpu.devPtr}, {b_uid, B_gpu.devPtr}, {c_uid, C_gpu.devPtr}}; +- int64_t workspace_size; ++ int64_t workspace_size = 0; + REQUIRE(graph.get_workspace_size(workspace_size).is_good()); + Surface workspace(workspace_size, false); + +diff --git a/samples/cpp/misc/sm_carveout.cpp b/samples/cpp/misc/sm_carveout.cpp +index d6818c0..b0e0651 100644 +--- a/samples/cpp/misc/sm_carveout.cpp ++++ b/samples/cpp/misc/sm_carveout.cpp +@@ -121,7 +121,7 @@ TEST_CASE("SGBN with SM carveout", "[batchnorm][graph][sm_carveout]") { + Surface Peer_stats_0_tensor(2 * 4 * c, false, true); + Surface Peer_stats_1_tensor(2 * 4 * c, false); + +- int64_t workspace_size; ++ int64_t workspace_size = 0; + REQUIRE(graph.get_workspace_size(workspace_size).is_good()); + Surface workspace(workspace_size, false); + +diff --git a/samples/cpp/norm/batchnorm.cpp b/samples/cpp/norm/batchnorm.cpp +index 5949365..a91a9bd 100644 +--- a/samples/cpp/norm/batchnorm.cpp ++++ b/samples/cpp/norm/batchnorm.cpp +@@ -96,7 +96,7 @@ TEST_CASE("BN Finalize Graph", "[batchnorm][graph]") { + Surface eq_scale_tensor(32, false); + Surface eq_bias_tensor(32, false); + +- int64_t workspace_size; ++ int64_t workspace_size = 0; + REQUIRE(graph.get_workspace_size(workspace_size).is_good()); + Surface workspace(workspace_size, false); + +@@ -226,7 +226,7 @@ TEST_CASE("SGBN Add Relu Graph", "[batchnorm][graph]") { + Surface Peer_stats_0_tensor(2 * 4 * 32, false, true); + Surface Peer_stats_1_tensor(2 * 4 * 32, false); + +- int64_t workspace_size; ++ int64_t workspace_size = 0; + REQUIRE(graph.get_workspace_size(workspace_size).is_good()); + Surface workspace(workspace_size, false); + +@@ -346,7 +346,7 @@ TEST_CASE("DBN Add Relu Graph", "[BN][graph][backward]") { + Surface Peer_stats_0_tensor(2 * 4 * 32, false, true); + Surface Peer_stats_1_tensor(2 * 4 * 32, false); + +- int64_t workspace_size; ++ int64_t workspace_size = 0; + REQUIRE(graph.get_workspace_size(workspace_size).is_good()); + Surface workspace(workspace_size, false); + +@@ -454,7 +454,7 @@ TEST_CASE("BN_inference DRelu DBN Graph", "[Batchnorm][graph][backward]") { + Surface Dbias_tensor(32, false); + Surface DX_tensor(4 * 32 * 16 * 16, false); + +- int64_t workspace_size; ++ int64_t workspace_size = 0; + REQUIRE(graph.get_workspace_size(workspace_size).is_good()); + Surface workspace(workspace_size, false); + +diff --git a/samples/cpp/norm/layernorm.cpp b/samples/cpp/norm/layernorm.cpp +index bac996f..7f69f34 100644 +--- a/samples/cpp/norm/layernorm.cpp ++++ b/samples/cpp/norm/layernorm.cpp +@@ -133,7 +133,7 @@ layernorm_fwd_dynamic_shapes(bool train = true) { + Surface Mean_tensor(max_stats_volume, false); + Surface Var_tensor(max_stats_volume, false); + +- int64_t workspace_size; ++ int64_t workspace_size = 0; + REQUIRE(graph.get_workspace_size(workspace_size).is_good()); + Surface workspace(workspace_size, false); + +@@ -232,7 +232,7 @@ TEST_CASE("LayerNorm Training", "[layernorm][graph]") { + Surface Bias_tensor(hidden_size, false); + Surface Y_tensor(batch_size * seq_length * hidden_size, false); + +- int64_t workspace_size; ++ int64_t workspace_size = 0; + REQUIRE(graph.get_workspace_size(workspace_size).is_good()); + Surface workspace(workspace_size, false); + +@@ -310,7 +310,7 @@ TEST_CASE("LayerNorm Inference", "[layernorm][graph]") { + Surface Bias_tensor(hidden_size, false); + Surface Y_tensor(batch_size * seq_length * hidden_size, false); + +- int64_t workspace_size; ++ int64_t workspace_size = 0; + REQUIRE(graph.get_workspace_size(workspace_size).is_good()); + Surface workspace(workspace_size, false); + +@@ -392,7 +392,7 @@ TEST_CASE("LayerNorm Backward", "[layernorm][graph]") { + Surface Dbias_tensor(hidden_size, false); + Surface DX_tensor(batch_size * seq_length * hidden_size, false); + +- int64_t workspace_size; ++ int64_t workspace_size = 0; + REQUIRE(graph.get_workspace_size(workspace_size).is_good()); + Surface workspace(workspace_size, false); + +diff --git a/samples/cpp/norm/rmsnorm.cpp b/samples/cpp/norm/rmsnorm.cpp +index 878086c..d5c919b 100644 +--- a/samples/cpp/norm/rmsnorm.cpp ++++ b/samples/cpp/norm/rmsnorm.cpp +@@ -78,7 +78,7 @@ TEST_CASE("RmsNorm Training", "[rmsnorm][graph]") { + Surface Scale_tensor(hidden_size, false); + Surface Y_tensor(batch_size * seq_length * hidden_size, false); + +- int64_t workspace_size; ++ int64_t workspace_size = 0; + REQUIRE(graph.get_workspace_size(workspace_size).is_good()); + Surface workspace(workspace_size, false); + +@@ -150,7 +150,7 @@ TEST_CASE("RmsNorm Inference", "[rmsnorm][graph]") { + Surface Bias_tensor(hidden_size, false); + Surface Y_tensor(batch_size * seq_length * hidden_size, false); + +- int64_t workspace_size; ++ int64_t workspace_size = 0; + REQUIRE(graph.get_workspace_size(workspace_size).is_good()); + Surface workspace(workspace_size, false); + +@@ -227,7 +227,7 @@ TEST_CASE("RmsNorm Backward", "[rmsnorm][graph]") { + Surface Dbias_tensor(hidden_size, false); + Surface DX_tensor(batch_size * seq_length * hidden_size, false); + +- int64_t workspace_size; ++ int64_t workspace_size = 0; + REQUIRE(graph.get_workspace_size(workspace_size).is_good()); + Surface workspace(workspace_size, false); + +diff --git a/samples/cpp/sdpa/fp16_bwd.cpp b/samples/cpp/sdpa/fp16_bwd.cpp +index 749cbed..1145008 100644 +--- a/samples/cpp/sdpa/fp16_bwd.cpp ++++ b/samples/cpp/sdpa/fp16_bwd.cpp +@@ -275,7 +275,7 @@ TEST_CASE("Toy sdpa backward", "[graph][sdpa][flash][backward]") { + } + + // Allocate workspace +- int64_t workspace_size; ++ int64_t workspace_size = 0; + REQUIRE(graph->get_workspace_size(workspace_size).is_good()); + Surface workspace(workspace_size, false); + +diff --git a/samples/cpp/sdpa/fp16_bwd_with_flexible_graphs.cpp b/samples/cpp/sdpa/fp16_bwd_with_flexible_graphs.cpp +index 62d6bb3..50205c3 100644 +--- a/samples/cpp/sdpa/fp16_bwd_with_flexible_graphs.cpp ++++ b/samples/cpp/sdpa/fp16_bwd_with_flexible_graphs.cpp +@@ -195,7 +195,7 @@ TEST_CASE("Toy sdpa backward with flexible graph", "[graph][sdpa][flash][backwar + {DV_UID, dV_tensor.devPtr}}; + + // Allocate workspace +- int64_t workspace_size; ++ int64_t workspace_size = 0; + REQUIRE(graph->get_workspace_size(workspace_size).is_good()); + Surface workspace(workspace_size, false); + +diff --git a/samples/cpp/sdpa/fp16_cached.cpp b/samples/cpp/sdpa/fp16_cached.cpp +index d046271..4f0d3f8 100644 +--- a/samples/cpp/sdpa/fp16_cached.cpp ++++ b/samples/cpp/sdpa/fp16_cached.cpp +@@ -146,7 +146,7 @@ TEST_CASE("Cached sdpa", "[graph][sdpa][flash]") { + {O_UID, o_tensor.devPtr}, + {STATS_UID, stats_tensor.devPtr}}; + +- int64_t workspace_size; ++ int64_t workspace_size = 0; + REQUIRE(fwd_graph2->get_workspace_size(workspace_size).is_good()); + Surface fwd_workspace(workspace_size, false); + +diff --git a/samples/cpp/sdpa/fp16_fwd.cpp b/samples/cpp/sdpa/fp16_fwd.cpp +index b3acf5e..63697a1 100644 +--- a/samples/cpp/sdpa/fp16_fwd.cpp ++++ b/samples/cpp/sdpa/fp16_fwd.cpp +@@ -210,7 +210,7 @@ TEST_CASE("Toy sdpa forward", "[graph][sdpa][flash][forward]") { + variant_pack[STATS_UID] = statsTensor.devPtr; + } + +- int64_t workspace_size; ++ int64_t workspace_size = 0; + REQUIRE(graph->get_workspace_size(workspace_size).is_good()); + Surface workspace(workspace_size, false); + +diff --git a/samples/cpp/sdpa/fp16_fwd_with_custom_dropout.cpp b/samples/cpp/sdpa/fp16_fwd_with_custom_dropout.cpp +index 36cfba4..0cb9d2f 100644 +--- a/samples/cpp/sdpa/fp16_fwd_with_custom_dropout.cpp ++++ b/samples/cpp/sdpa/fp16_fwd_with_custom_dropout.cpp +@@ -178,7 +178,7 @@ TEST_CASE("Toy sdpa forward with dropout", "[graph][sdpa][flash][forward]") { + variant_pack[STATS_UID] = statsTensor.devPtr; + } + +- int64_t workspace_size; ++ int64_t workspace_size = 0; + REQUIRE(graph->get_workspace_size(workspace_size).is_good()); + Surface workspace(workspace_size, false); + +diff --git a/samples/cpp/sdpa/fp16_fwd_with_flexible_graphs.cpp b/samples/cpp/sdpa/fp16_fwd_with_flexible_graphs.cpp +index 810de63..7d81afe 100644 +--- a/samples/cpp/sdpa/fp16_fwd_with_flexible_graphs.cpp ++++ b/samples/cpp/sdpa/fp16_fwd_with_flexible_graphs.cpp +@@ -186,7 +186,7 @@ TEST_CASE("Toy sdpa forward with flexible graph", "[graph][sdpa][flash][forward] + variant_pack[STATS_UID] = statsTensor.devPtr; + } + +- int64_t workspace_size; ++ int64_t workspace_size = 0; + REQUIRE(graph->get_workspace_size(workspace_size).is_good()); + Surface workspace(workspace_size, false); + +diff --git a/samples/cpp/sdpa/fp16_fwd_with_paged_caches.cpp b/samples/cpp/sdpa/fp16_fwd_with_paged_caches.cpp +index 18dd937..d195f6b 100644 +--- a/samples/cpp/sdpa/fp16_fwd_with_paged_caches.cpp ++++ b/samples/cpp/sdpa/fp16_fwd_with_paged_caches.cpp +@@ -268,7 +268,7 @@ TEST_CASE("Toy sdpa forward with paged caches", "[graph][sdpa][flash][paged][for + variant_pack[STATS_UID] = statsTensor.devPtr; + } + +- int64_t workspace_size; ++ int64_t workspace_size = 0; + REQUIRE(graph->get_workspace_size(workspace_size).is_good()); + Surface workspace(workspace_size, false); + +diff --git a/samples/cpp/sdpa/fp8_bwd.cpp b/samples/cpp/sdpa/fp8_bwd.cpp +index 82e542b..296f2f9 100644 +--- a/samples/cpp/sdpa/fp8_bwd.cpp ++++ b/samples/cpp/sdpa/fp8_bwd.cpp +@@ -214,7 +214,7 @@ TEST_CASE("sdpa_fp8_bprop", "[graph][sdpa][fp8][backward]") { + {Amax_dV, AMax_dV_Tensor.devPtr}, + {Amax_dP, AMax_dP_Tensor.devPtr}}; + +- int64_t workspace_size; ++ int64_t workspace_size = 0; + REQUIRE(mha_graph.get_workspace_size(workspace_size).is_good()); + Surface workspace(workspace_size, false); + +@@ -385,7 +385,7 @@ TEST_CASE("sdpa_fp8_gqa_bprop", "[graph][sdpa][fp8][backward]") { + {amax_dV, amax_dV_gpu.devPtr}, + {amax_dP, amax_dP_gpu.devPtr}}; + +- int64_t workspace_size; ++ int64_t workspace_size = 0; + REQUIRE(mha_graph.get_workspace_size(workspace_size).is_good()); + Surface workspace(workspace_size, false); + +diff --git a/samples/cpp/sdpa/fp8_fwd.cpp b/samples/cpp/sdpa/fp8_fwd.cpp +index 6ede98d..23abc3f 100644 +--- a/samples/cpp/sdpa/fp8_fwd.cpp ++++ b/samples/cpp/sdpa/fp8_fwd.cpp +@@ -146,7 +146,7 @@ TEST_CASE("sdpa_fp8_fprop", "[graph][sdpa][fp8][forward]") { + variant_pack[Stats] = stats_tensor.devPtr; + } + +- int64_t workspace_size; ++ int64_t workspace_size = 0; + REQUIRE(mha_graph.get_workspace_size(workspace_size).is_good()); + Surface workspace(workspace_size, false); + +-- +2.47.0 + diff --git a/pkgs/development/cuda-modules/cudnn-frontend/CMakeLists.txt b/pkgs/development/cuda-modules/cudnn-frontend/CMakeLists.txt new file mode 100644 index 0000000000000..409d70f76d878 --- /dev/null +++ b/pkgs/development/cuda-modules/cudnn-frontend/CMakeLists.txt @@ -0,0 +1,133 @@ +cmake_minimum_required(VERSION 3.23) + +project(cudnn_frontend VERSION 1.8.0) + +option(CUDNN_FRONTEND_SKIP_JSON_LIB "Defines whether FE should not include nlohmann/json.hpp." OFF) +option(CUDNN_FRONTEND_BUILD_SAMPLES "Defines if samples are built or not." ON) +option(CUDNN_FRONTEND_BUILD_TESTS "Defines if unittests are built or not." ON) +option(CUDNN_FRONTEND_BUILD_PYTHON_BINDINGS "Defines if python bindings are built or not." OFF) + +if(MSVC OR MSYS OR MINGW) + add_compile_options(/W4 /WX) +else() + add_compile_options(-Wall -Wextra -Wpedantic -Werror -Wno-error=attributes -Wno-attributes -Wno-error=unused-function -Wno-unused-function) +endif() + +add_library(cudnn_frontend INTERFACE) + +# Add header files to library +file(GLOB_RECURSE CUDNN_FRONTEND_INCLUDE_FILES "include/*") +target_sources( + cudnn_frontend + PUBLIC + FILE_SET + HEADERS + BASE_DIRS + "$" + FILES + "${CUDNN_FRONTEND_INCLUDE_FILES}" +) +unset(CUDNN_FRONTEND_INCLUDE_FILES) + +target_compile_definitions(cudnn_frontend INTERFACE $<$:CUDNN_FRONTEND_SKIP_JSON_LIB>) + +target_include_directories( + cudnn_frontend + INTERFACE + "$" + "$" +) + +# Find the cuda compiler +find_package(CUDAToolkit REQUIRED) + +target_include_directories(cudnn_frontend INTERFACE ${CUDAToolkit_INCLUDE_DIRS}) + +target_compile_features(cudnn_frontend INTERFACE cxx_std_17) + +# Make PCH for targets to link against +add_library(_cudnn_frontend_pch INTERFACE) +target_precompile_headers(_cudnn_frontend_pch INTERFACE ${PROJECT_SOURCE_DIR}/include/cudnn_frontend.h) + +if (CUDNN_FRONTEND_BUILD_SAMPLES) + add_subdirectory(samples) + target_link_libraries( + samples + PRIVATE + CUDA::cublasLt + CUDA::nvrtc + ) + target_link_libraries( + legacy_samples + PRIVATE + CUDA::cublasLt + CUDA::nvrtc + ) +endif() + +if (CUDNN_FRONTEND_BUILD_TESTS) + add_subdirectory(test) + target_link_libraries( + tests + CUDA::cublasLt + CUDA::nvrtc + ) +endif() + +if (CUDNN_FRONTEND_BUILD_PYTHON_BINDINGS) + add_subdirectory(python) +endif() + +# Introduce variables: +# * CMAKE_INSTALL_LIBDIR +# * CMAKE_INSTALL_BINDIR +# * CMAKE_INSTALL_INCLUDEDIR +include(GNUInstallDirs) + +# Install and export the header files +install( + TARGETS + cudnn_frontend + EXPORT + cudnn_frontend_targets + FILE_SET HEADERS +) + +if (CUDNN_FRONTEND_BUILD_SAMPLES) + install(TARGETS legacy_samples samples RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) +endif() + +if (CUDNN_FRONTEND_BUILD_TESTS) + install(TARGETS tests RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) +endif() + +# See https://cmake.org/cmake/help/latest/module/CMakePackageConfigHelpers.html#example-generating-package-files +include(CMakePackageConfigHelpers) + +export( + EXPORT + cudnn_frontend_targets + FILE + "${CMAKE_CURRENT_BINARY_DIR}/cudnn_frontend/cudnn_frontend-targets.cmake" +) +install( + EXPORT + cudnn_frontend_targets + FILE + cudnn_frontend-targets.cmake + DESTINATION + "${CMAKE_INSTALL_LIBDIR}/cmake/cudnn_frontend" +) + +configure_package_config_file( + cudnn_frontend-config.cmake.in + "${CMAKE_CURRENT_BINARY_DIR}/cudnn_frontend-config.cmake" + INSTALL_DESTINATION + "${CMAKE_INSTALL_LIBDIR}/cmake/cudnn_frontend" +) +install( + FILES + "${CMAKE_CURRENT_BINARY_DIR}/cudnn_frontend-config.cmake" + DESTINATION + "${CMAKE_INSTALL_LIBDIR}/cmake/cudnn_frontend" +) diff --git a/pkgs/development/cuda-modules/cudnn-frontend/cudnn_frontend-config.cmake.in b/pkgs/development/cuda-modules/cudnn-frontend/cudnn_frontend-config.cmake.in new file mode 100644 index 0000000000000..8b2d843096f98 --- /dev/null +++ b/pkgs/development/cuda-modules/cudnn-frontend/cudnn_frontend-config.cmake.in @@ -0,0 +1,3 @@ +@PACKAGE_INIT@ + +include(${CMAKE_CURRENT_LIST_DIR}/cudnn_frontend-targets.cmake) diff --git a/pkgs/development/cuda-modules/cudnn-frontend/default.nix b/pkgs/development/cuda-modules/cudnn-frontend/default.nix new file mode 100644 index 0000000000000..8b020eae55a0b --- /dev/null +++ b/pkgs/development/cuda-modules/cudnn-frontend/default.nix @@ -0,0 +1,134 @@ +{ + autoAddDriverRunpath, + catch2_3, + cmake, + cudaPackages, + fetchFromGitHub, + gitUpdater, + lib, + ninja, + nlohmann_json, + stdenv, +}: +let + inherit (lib.lists) optionals; + inherit (lib.strings) + cmakeBool + cmakeFeature + optionalString + ; + inherit (cudaPackages) + cuda_cccl + cuda_cudart + cuda_nvcc + cuda_nvrtc + cudnn + libcublas + ; +in + +# TODO(@connorbaker): This should be a hybrid C++/Python package. +stdenv.mkDerivation (finalAttrs: { + pname = "cudnn-frontend"; + version = "1.9.0"; + + src = fetchFromGitHub { + owner = "NVIDIA"; + repo = "cudnn-frontend"; + tag = "v${finalAttrs.version}"; + hash = "sha256-Vc5jqB1XHcJEdKG0nxbWLewW2fDezRVwjUSzPDubSGE="; + }; + + patches = [ + # https://github.com/NVIDIA/cudnn-frontend/pull/125 + ./0001-cmake-float-out-common-python-bindings-option.patch + ./0002-cmake-add-config-so-headers-can-be-discovered-when-i.patch + ./0003-cmake-install-samples-and-tests-when-built.patch + ./0004-samples-fix-instances-of-maybe-uninitialized.patch + ]; + + # nlohmann_json should be the only vendored dependency. + postPatch = '' + echo "patching source to use nlohmann_json from nixpkgs" + rm -rf include/cudnn_frontend/thirdparty/nlohmann + rmdir include/cudnn_frontend/thirdparty + substituteInPlace include/cudnn_frontend_utils.h \ + --replace-fail \ + '#include "cudnn_frontend/thirdparty/nlohmann/json.hpp"' \ + '#include ' + ''; + + # TODO: As a header-only library, we should make sure we have an `include` directory or similar which is not a + # superset of the `out` (`bin`) or `dev` outputs (whih is what the multiple-outputs setup hook does by default). + outputs = + [ + "out" + ] + ++ optionals finalAttrs.doCheck [ + "legacy_samples" + "samples" + "tests" + ]; + + nativeBuildInputs = [ + autoAddDriverRunpath # Needed for samples because it links against CUDA::cuda_driver + cmake + cuda_nvcc + ninja + ]; + + buildInputs = [ + cuda_cccl + cuda_cudart + ]; + + cmakeFlags = [ + (cmakeBool "FETCHCONTENT_FULLY_DISCONNECTED" true) + (cmakeFeature "FETCHCONTENT_TRY_FIND_PACKAGE_MODE" "ALWAYS") + (cmakeBool "CUDNN_FRONTEND_BUILD_SAMPLES" finalAttrs.doCheck) + (cmakeBool "CUDNN_FRONTEND_BUILD_TESTS" finalAttrs.doCheck) + (cmakeBool "CUDNN_FRONTEND_BUILD_PYTHON_BINDINGS" false) + ]; + + checkInputs = [ + cudnn + cuda_nvrtc + catch2_3 + libcublas + ]; + + enableParallelBuilding = true; + + propagatedBuildInputs = [ + nlohmann_json + ]; + + doCheck = true; + + postInstall = optionalString finalAttrs.doCheck '' + moveToOutput "bin/legacy_samples" "$legacy_samples" + moveToOutput "bin/samples" "$samples" + moveToOutput "bin/tests" "$tests" + if [[ -e "$out/bin" ]] + then + nixErrorLog "The bin directory in \$out should no longer exist." + exit 1 + fi + ''; + + passthru.updateScript = gitUpdater { + inherit (finalAttrs) pname version; + rev-prefix = "v"; + }; + + meta = { + description = "A c++ wrapper for the cudnn backend API"; + homepage = "https://github.com/NVIDIA/cudnn-frontend"; + license = lib.licenses.mit; + platforms = [ + "aarch64-linux" + "x86_64-linux" + ]; + maintainers = (with lib.maintainers; [ connorbaker ]) ++ lib.teams.cuda.members; + }; +}) diff --git a/pkgs/top-level/cuda-packages.nix b/pkgs/top-level/cuda-packages.nix index a8146d374c822..5c1c518222caa 100644 --- a/pkgs/top-level/cuda-packages.nix +++ b/pkgs/top-level/cuda-packages.nix @@ -79,6 +79,7 @@ let cudatoolkit = final.callPackage ../development/cuda-modules/cudatoolkit/redist-wrapper.nix { }; cudatoolkit-legacy-runfile = final.callPackage ../development/cuda-modules/cudatoolkit { }; + cudnn-frontend = final.callPackage ../development/cuda-modules/cudnn-frontend/default.nix { }; saxpy = final.callPackage ../development/cuda-modules/saxpy { }; nccl = final.callPackage ../development/cuda-modules/nccl { }; nccl-tests = final.callPackage ../development/cuda-modules/nccl-tests { }; From 63c41873fa82e62729cabdb7ab5810ef85e8d457 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 11 Dec 2024 21:03:45 +0100 Subject: [PATCH 197/343] onnxruntime: 1.18.1 -> 1.20.1 https://github.com/microsoft/onnxruntime/releases/tag/v1.19.0 https://github.com/microsoft/onnxruntime/releases/tag/v1.19.2 https://github.com/microsoft/onnxruntime/releases/tag/v1.20.0 https://github.com/microsoft/onnxruntime/releases/tag/v1.20.1 --- .../libraries/onnxruntime/default.nix | 73 ++++------ ...dependency-injection.patch => eigen.patch} | 22 ++- .../libraries/onnxruntime/nvcc-gsl.patch | 26 +--- .../libraries/onnxruntime/update-re2.patch | 132 ------------------ 4 files changed, 50 insertions(+), 203 deletions(-) rename pkgs/development/libraries/onnxruntime/{0001-eigen-allow-dependency-injection.patch => eigen.patch} (50%) delete mode 100644 pkgs/development/libraries/onnxruntime/update-re2.patch diff --git a/pkgs/development/libraries/onnxruntime/default.nix b/pkgs/development/libraries/onnxruntime/default.nix index 93a8e7c65a1c8..8904addf87fa5 100644 --- a/pkgs/development/libraries/onnxruntime/default.nix +++ b/pkgs/development/libraries/onnxruntime/default.nix @@ -2,9 +2,8 @@ , stdenv , lib , fetchFromGitHub -, fetchpatch2 , Foundation -, abseil-cpp_202401 +, abseil-cpp_202407 , cmake , cpuinfo , eigen @@ -12,6 +11,7 @@ , gbenchmark , glibcLocales , gtest +, howard-hinnant-date , libpng , nlohmann_json , nsync @@ -30,34 +30,33 @@ let - version = "1.18.1"; + version = "1.20.1"; - abseil-cpp = abseil-cpp_202401; + src = fetchFromGitHub { + owner = "microsoft"; + repo = "onnxruntime"; + tag = "v${version}"; + hash = "sha256-xIjR2HsVIqc78ojSXzoTGIxk7VndGYa8o4pVB8U8oXI="; + fetchSubmodules = true; + }; stdenv = throw "Use effectiveStdenv instead"; effectiveStdenv = if cudaSupport then cudaPackages.backendStdenv else inputs.stdenv; cudaArchitecturesString = cudaPackages.flags.cmakeCudaArchitecturesString; - howard-hinnant-date = fetchFromGitHub { - owner = "HowardHinnant"; - repo = "date"; - rev = "v3.0.1"; - sha256 = "sha256-ZSjeJKAcT7mPym/4ViDvIR9nFMQEBCSUtPEuMO27Z+I="; - }; - mp11 = fetchFromGitHub { owner = "boostorg"; repo = "mp11"; - rev = "boost-1.82.0"; + tag = "boost-1.82.0"; hash = "sha256-cLPvjkf2Au+B19PJNrUkTW/VPxybi1MpPxnIl4oo4/o="; }; safeint = fetchFromGitHub { owner = "dcleblanc"; repo = "safeint"; - rev = "ff15c6ada150a5018c5ef2172401cb4529eac9c0"; - hash = "sha256-PK1ce4C0uCR4TzLFg+elZdSk5DdPCRhhwT3LvEwWnPU="; + tag = "3.0.28"; + hash = "sha256-pjwjrqq6dfiVsXIhbBtbolhiysiFlFTnx5XcX77f+C0="; }; pytorch_clog = effectiveStdenv.mkDerivation { @@ -78,28 +77,26 @@ let onnx = fetchFromGitHub { owner = "onnx"; repo = "onnx"; - rev = "refs/tags/v1.16.1"; - hash = "sha256-I1wwfn91hdH3jORIKny0Xc73qW2P04MjkVCgcaNnQUE="; + tag = "v1.16.1"; + hash = "sha256-+NmWoZDXNJ8YQIWlUXV+czHyI8UtJedu2VG+1aR5L7s="; + # Apply backport of https://github.com/onnx/onnx/pull/6195 from 1.17.0 + postFetch = '' + pushd $out + patch -p1 < ${src}/cmake/patches/onnx/onnx.patch + popd + ''; }; cutlass = fetchFromGitHub { owner = "NVIDIA"; repo = "cutlass"; - rev = "v3.1.0"; - hash = "sha256-mpaiCxiYR1WaSSkcEPTzvcREenJWklD+HRdTT5/pD54="; + tag = "v3.5.1"; + hash = "sha256-sTGYN+bjtEqQ7Ootr/wvx3P9f8MCDSSj3qyCWjfdLEA="; }; in effectiveStdenv.mkDerivation rec { pname = "onnxruntime"; - inherit version; - - src = fetchFromGitHub { - owner = "microsoft"; - repo = "onnxruntime"; - rev = "refs/tags/v${version}"; - hash = "sha256-+zWtbLKekGhwdBU3bm1u2F7rYejQ62epE+HcHj05/8A="; - fetchSubmodules = true; - }; + inherit src version; patches = [ # If you stumble on these patches trying to update onnxruntime, check @@ -109,20 +106,7 @@ effectiveStdenv.mkDerivation rec { # - always try find_package first (FIND_PACKAGE_ARGS), # - use MakeAvailable instead of the low-level Populate, # - use Eigen3::Eigen as the target name (as declared by libeigen/eigen). - ./0001-eigen-allow-dependency-injection.patch - # Incorporate a patch that has landed upstream which exposes new - # 'abseil-cpp' libraries & modifies the 're2' CMakeLists to fix a - # configuration error that around missing 'gmock' exports. - # - # TODO: Check if it can be dropped after 1.19.0 - # https://github.com/microsoft/onnxruntime/commit/b522df0ae477e59f60acbe6c92c8a64eda96cace - ./update-re2.patch - # fix `error: template-id not allowed for constructor in C++20` - (fetchpatch2 { - name = "suppress-gcc-warning-in-TreeEnsembleAggregator.patch"; - url = "https://github.com/microsoft/onnxruntime/commit/10883d7997ed4b53f989a49bd4387c5769fbd12f.patch?full_index=1"; - hash = "sha256-NgvuCHE7axaUtZIjtQvDpagr+QtHdyL7xXkPQwZbhvY="; - }) + ./eigen.patch ] ++ lib.optionals cudaSupport [ # We apply the referenced 1064.patch ourselves to our nix dependency. # FIND_PACKAGE_ARGS for CUDA was added in https://github.com/microsoft/onnxruntime/commit/87744e5 so it might be possible to delete this patch after upgrading to 1.17.0 @@ -142,12 +126,14 @@ effectiveStdenv.mkDerivation rec { wheel ]) ++ lib.optionals cudaSupport [ cudaPackages.cuda_nvcc + cudaPackages.cudnn-frontend ]; buildInputs = [ cpuinfo eigen glibcLocales + howard-hinnant-date libpng nlohmann_json microsoft-gsl @@ -192,10 +178,8 @@ effectiveStdenv.mkDerivation rec { "-DABSL_ENABLE_INSTALL=ON" "-DFETCHCONTENT_FULLY_DISCONNECTED=ON" "-DFETCHCONTENT_QUIET=OFF" - "-DFETCHCONTENT_SOURCE_DIR_ABSEIL_CPP=${abseil-cpp.src}" - "-DFETCHCONTENT_SOURCE_DIR_DATE=${howard-hinnant-date}" + "-DFETCHCONTENT_SOURCE_DIR_ABSEIL_CPP=${abseil-cpp_202407.src}" "-DFETCHCONTENT_SOURCE_DIR_FLATBUFFERS=${flatbuffers_23.src}" - "-DFETCHCONTENT_SOURCE_DIR_GOOGLETEST=${gtest.src}" "-DFETCHCONTENT_SOURCE_DIR_GOOGLE_NSYNC=${nsync.src}" "-DFETCHCONTENT_SOURCE_DIR_MP11=${mp11}" "-DFETCHCONTENT_SOURCE_DIR_ONNX=${onnx}" @@ -229,6 +213,7 @@ effectiveStdenv.mkDerivation rec { postPatch = '' substituteInPlace cmake/libonnxruntime.pc.cmake.in \ --replace-fail '$'{prefix}/@CMAKE_INSTALL_ @CMAKE_INSTALL_ + echo "find_package(cudnn_frontend REQUIRED)" > cmake/external/cudnn_frontend.cmake '' + lib.optionalString (effectiveStdenv.hostPlatform.system == "aarch64-linux") '' # https://github.com/NixOS/nixpkgs/pull/226734#issuecomment-1663028691 rm -v onnxruntime/test/optimizer/nhwc_transformer_test.cc diff --git a/pkgs/development/libraries/onnxruntime/0001-eigen-allow-dependency-injection.patch b/pkgs/development/libraries/onnxruntime/eigen.patch similarity index 50% rename from pkgs/development/libraries/onnxruntime/0001-eigen-allow-dependency-injection.patch rename to pkgs/development/libraries/onnxruntime/eigen.patch index 0092ea4d1e8ef..3a58755812d4c 100644 --- a/pkgs/development/libraries/onnxruntime/0001-eigen-allow-dependency-injection.patch +++ b/pkgs/development/libraries/onnxruntime/eigen.patch @@ -1,13 +1,21 @@ diff --git a/cmake/external/eigen.cmake b/cmake/external/eigen.cmake -index b123adb..aab2483 100644 +index 339cded091..6264c8da69 100644 --- a/cmake/external/eigen.cmake +++ b/cmake/external/eigen.cmake -@@ -7,8 +7,13 @@ else () - eigen - URL ${DEP_URL_eigen} - URL_HASH SHA1=${DEP_SHA1_eigen} -+ FIND_PACKAGE_ARGS NAMES Eigen3 - ) +@@ -9,15 +9,21 @@ else () + URL ${DEP_URL_eigen} + URL_HASH SHA1=${DEP_SHA1_eigen} + PATCH_COMMAND ${Patch_EXECUTABLE} --binary --ignore-whitespace -p1 < ${PROJECT_SOURCE_DIR}/patches/eigen/eigen-aix.patch ++ FIND_PACKAGE_ARGS NAMES Eigen3 + ) + else() + FetchContent_Declare( + eigen + URL ${DEP_URL_eigen} + URL_HASH SHA1=${DEP_SHA1_eigen} ++ FIND_PACKAGE_ARGS NAMES Eigen3 + ) + endif() - FetchContent_Populate(eigen) - set(eigen_INCLUDE_DIRS "${eigen_SOURCE_DIR}") diff --git a/pkgs/development/libraries/onnxruntime/nvcc-gsl.patch b/pkgs/development/libraries/onnxruntime/nvcc-gsl.patch index ca94faab93942..c6ac77602fcad 100644 --- a/pkgs/development/libraries/onnxruntime/nvcc-gsl.patch +++ b/pkgs/development/libraries/onnxruntime/nvcc-gsl.patch @@ -1,12 +1,11 @@ diff --git a/cmake/external/onnxruntime_external_deps.cmake b/cmake/external/onnxruntime_external_deps.cmake -index 775576a..ccea13c 100644 +index 85746027d4..346ac37a54 100644 --- a/cmake/external/onnxruntime_external_deps.cmake +++ b/cmake/external/onnxruntime_external_deps.cmake -@@ -367,22 +367,12 @@ if (NOT WIN32) - endif() +@@ -422,14 +422,6 @@ if ((CPUINFO_SUPPORTED OR onnxruntime_USE_XNNPACK) AND NOT ANDROID) endif() --if(onnxruntime_USE_CUDA) + if(onnxruntime_USE_CUDA) - FetchContent_Declare( - GSL - URL ${DEP_URL_microsoft_gsl} @@ -15,19 +14,6 @@ index 775576a..ccea13c 100644 - FIND_PACKAGE_ARGS 4.0 NAMES Microsoft.GSL - ) -else() -- FetchContent_Declare( -- GSL -- URL ${DEP_URL_microsoft_gsl} -- URL_HASH SHA1=${DEP_SHA1_microsoft_gsl} -- FIND_PACKAGE_ARGS 4.0 NAMES Microsoft.GSL -- ) --endif() -+FetchContent_Declare( -+ GSL -+ URL ${DEP_URL_microsoft_gsl} -+ URL_HASH SHA1=${DEP_SHA1_microsoft_gsl} -+ FIND_PACKAGE_ARGS 4.0 NAMES Microsoft.GSL -+) - - FetchContent_Declare( - safeint + FetchContent_Declare( + GSL + URL ${DEP_URL_microsoft_gsl} diff --git a/pkgs/development/libraries/onnxruntime/update-re2.patch b/pkgs/development/libraries/onnxruntime/update-re2.patch deleted file mode 100644 index 7996721f8e111..0000000000000 --- a/pkgs/development/libraries/onnxruntime/update-re2.patch +++ /dev/null @@ -1,132 +0,0 @@ -From 0d1e631c365944d54e87bdce39beb13b225ba8f8 Mon Sep 17 00:00:00 2001 -From: Changming Sun -Date: Thu, 23 May 2024 14:30:15 -0700 -Subject: [PATCH] Update RE2 to the latest (#20775) - -Update RE2 to the latest. - -To keep the components up to date. - -(cherry picked from commit b522df0ae477e59f60acbe6c92c8a64eda96cace) ---- - cgmanifests/generated/cgmanifest.json | 2 +- - cmake/deps.txt | 4 +-- - cmake/external/abseil-cpp.cmake | 35 ++++++++++++++++++++++----- - cmake/external/helper_functions.cmake | 6 +++++ - 4 files changed, 38 insertions(+), 9 deletions(-) - -diff --git a/cgmanifests/generated/cgmanifest.json b/cgmanifests/generated/cgmanifest.json -index eb74178b3e..e3e9be67ae 100644 ---- a/cgmanifests/generated/cgmanifest.json -+++ b/cgmanifests/generated/cgmanifest.json -@@ -276,7 +276,7 @@ - "component": { - "type": "git", - "git": { -- "commitHash": "5723bb8950318135ed9cf4fc76bed988a087f536", -+ "commitHash": "2b354c6ad0d0479dcff68dab23fb0d1143a482c2", - "repositoryUrl": "https://github.com/google/re2.git" - }, - "comments": "re2" -diff --git a/cmake/deps.txt b/cmake/deps.txt -index d213b09034..d4d19dea08 100644 ---- a/cmake/deps.txt -+++ b/cmake/deps.txt -@@ -50,11 +50,11 @@ psimd;https://github.com/Maratyszcza/psimd/archive/072586a71b55b7f8c584153d223e9 - pthreadpool;https://github.com/Maratyszcza/pthreadpool/archive/4fe0e1e183925bf8cfa6aae24237e724a96479b8.zip;07a0aa91dd9bf86f31b95497e00f31d8a261a4bd - pybind11;https://github.com/pybind/pybind11/archive/refs/tags/v2.10.1.zip;769b6aa67a77f17a770960f604b727645b6f6a13 - pytorch_cpuinfo;https://github.com/pytorch/cpuinfo/archive/959002f82d7962a473d8bf301845f2af720e0aa4.zip;85da3caa60eb2b148613b443fbc2bfdc30689965 --re2;https://github.com/google/re2/archive/refs/tags/2022-06-01.zip;aa77313b76e91b531ee7f3e45f004c6a502a5374 -+re2;https://github.com/google/re2/archive/refs/tags/2024-05-01.tar.gz;206cfee5ee0b4c6844680ba66275e9e8faa77405 - safeint;https://github.com/dcleblanc/SafeInt/archive/refs/tags/3.0.28.zip;23f252040ff6cb9f1fd18575b32fa8fb5928daac - tensorboard;https://github.com/tensorflow/tensorboard/archive/373eb09e4c5d2b3cc2493f0949dc4be6b6a45e81.zip;67b833913605a4f3f499894ab11528a702c2b381 - cutlass;https://github.com/NVIDIA/cutlass/archive/refs/tags/v3.1.0.zip;757f90a795034a89d4f48a79d1f009f7a04c8dee - utf8_range;https://github.com/protocolbuffers/utf8_range/archive/72c943dea2b9240cd09efde15191e144bc7c7d38.zip;9925739c9debc0efa2adcb194d371a35b6a03156 - extensions;https://github.com/microsoft/onnxruntime-extensions/archive/94142d8391c9791ec71c38336436319a2d4ac7a0.zip;4365ac5140338b4cb75a39944a4be276e3829b3c - composable_kernel;https://github.com/ROCmSoftwarePlatform/composable_kernel/archive/5356c4a943a35e74d7cdc69486afcb8703b9a59a.zip;522382c2af437e09124287e5879ab64af5b2e299 --directx_headers;https://github.com/microsoft/DirectX-Headers/archive/refs/tags/v1.613.1.zip;47653509a3371eabb156360f42faf582f314bf2e -\ No newline at end of file -+directx_headers;https://github.com/microsoft/DirectX-Headers/archive/refs/tags/v1.613.1.zip;47653509a3371eabb156360f42faf582f314bf2e -diff --git a/cmake/external/abseil-cpp.cmake b/cmake/external/abseil-cpp.cmake -index 57cfbee464..c01195c99e 100644 ---- a/cmake/external/abseil-cpp.cmake -+++ b/cmake/external/abseil-cpp.cmake -@@ -45,10 +45,8 @@ endif() - - # TODO: since multiple ORT's dependencies depend on Abseil, the list below would vary from version to version. - # We'd better to not manually manage the list. --set(ABSEIL_LIBS absl::base -+set(ABSEIL_LIBS - absl::city --absl::core_headers --absl::fixed_array - absl::flags - absl::flat_hash_map - absl::flat_hash_set -@@ -60,9 +58,34 @@ absl::node_hash_set - absl::optional - absl::raw_hash_set - absl::raw_logging_internal --absl::span - absl::str_format --absl::strings -+absl::str_format_internal -+absl::bits -+absl::fixed_array -+absl::numeric_representation -+absl::utility -+absl::type_traits -+absl::string_view -+absl::core_headers -+absl::nullability -+absl::span -+absl::config - absl::synchronization -+absl::base -+absl::civil_time -+absl::debugging_internal -+absl::demangle_internal -+absl::graphcycles_internal -+absl::int128 -+absl::kernel_timeout_internal -+absl::log_severity -+absl::malloc_internal -+absl::spinlock_wait -+absl::stacktrace -+absl::string_view -+absl::strings -+absl::strings_internal -+absl::symbolize - absl::throw_delegate --absl::time) -+absl::time -+absl::time_zone) -\ No newline at end of file -diff --git a/cmake/external/helper_functions.cmake b/cmake/external/helper_functions.cmake -index 768e807b40..eefb3ba2e8 100644 ---- a/cmake/external/helper_functions.cmake -+++ b/cmake/external/helper_functions.cmake -@@ -159,7 +159,12 @@ macro(onnxruntime_fetchcontent_makeavailable) - endif() - - if(EXISTS ${__cmake_srcdir}/CMakeLists.txt) -+ set(CMAKE_SKIP_INSTALL_RULES TRUE) -+ if (__cmake_arg_SYSTEM) -+ add_subdirectory(${__cmake_srcdir} ${${__cmake_contentNameLower}_BINARY_DIR} SYSTEM) -+ else() - add_subdirectory(${__cmake_srcdir} ${${__cmake_contentNameLower}_BINARY_DIR} EXCLUDE_FROM_ALL) -+ endif() - get_property(subdir_import_targets DIRECTORY "${__cmake_srcdir}" PROPERTY BUILDSYSTEM_TARGETS) - foreach(subdir_target ${subdir_import_targets}) - if(TARGET ${subdir_target}) -@@ -176,6 +181,7 @@ macro(onnxruntime_fetchcontent_makeavailable) - set_target_properties(${subdir_target} PROPERTIES COMPILE_WARNING_AS_ERROR OFF) - endif() - endforeach() -+ set(CMAKE_SKIP_INSTALL_RULES FALSE) - endif() - - unset(__cmake_srcdir) --- -2.45.2 - From 47194d73ca6979f9e93fdab946c0db1ce6b826aa Mon Sep 17 00:00:00 2001 From: Peter Kling Date: Sun, 12 Jan 2025 03:48:27 +0100 Subject: [PATCH 198/343] onnxruntime: fix aarch64-darwin build --- pkgs/development/libraries/onnxruntime/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/onnxruntime/default.nix b/pkgs/development/libraries/onnxruntime/default.nix index 8904addf87fa5..2b91cf0315c1e 100644 --- a/pkgs/development/libraries/onnxruntime/default.nix +++ b/pkgs/development/libraries/onnxruntime/default.nix @@ -186,6 +186,8 @@ effectiveStdenv.mkDerivation rec { "-DFETCHCONTENT_SOURCE_DIR_RE2=${re2.src}" "-DFETCHCONTENT_SOURCE_DIR_SAFEINT=${safeint}" "-DFETCHCONTENT_TRY_FIND_PACKAGE_MODE=ALWAYS" + # fails to find protoc on darwin, so specify it + "-DONNX_CUSTOM_PROTOC_EXECUTABLE=${protobuf_21}/bin/protoc" "-Donnxruntime_BUILD_SHARED_LIB=ON" (lib.cmakeBool "onnxruntime_BUILD_UNIT_TESTS" doCheck) "-Donnxruntime_ENABLE_LTO=ON" From 5fea61163408370fa6adadb8d039d717539bd730 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sun, 9 Feb 2025 10:58:59 +0000 Subject: [PATCH 199/343] docs: mention promotion of `stackclashprotection` hardening flag to default enabled --- doc/stdenv/stdenv.chapter.md | 8 ++++---- nixos/doc/manual/release-notes/rl-2505.section.md | 2 ++ 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/doc/stdenv/stdenv.chapter.md b/doc/stdenv/stdenv.chapter.md index cd20185b8ffc9..80059a78733c3 100644 --- a/doc/stdenv/stdenv.chapter.md +++ b/doc/stdenv/stdenv.chapter.md @@ -1560,6 +1560,10 @@ intel_drv.so: undefined symbol: vgaHWFreeHWRec Adds the `-fzero-call-used-regs=used-gpr` compiler option. This causes the general-purpose registers that an architecture's calling convention considers "call-used" to be zeroed on return from the function. This can make it harder for attackers to construct useful ROP gadgets and also reduces the chance of data leakage from a function call. +#### `stackclashprotection` {#stackclashprotection} + +This flag adds the `-fstack-clash-protection` compiler option, which causes growth of a program's stack to access each successive page in order. This should force the guard page to be accessed and cause an attempt to "jump over" this guard page to crash. + ### Hardening flags disabled by default {#sec-hardening-flags-disabled-by-default} The following flags are disabled by default and should be enabled with `hardeningEnable` for packages that take untrusted input like network services. @@ -1599,10 +1603,6 @@ This should be turned off or fixed for build errors such as: sorry, unimplemented: __builtin_clear_padding not supported for variable length aggregates ``` -#### `stackclashprotection` {#stackclashprotection} - -This flag adds the `-fstack-clash-protection` compiler option, which causes growth of a program's stack to access each successive page in order. This should force the guard page to be accessed and cause an attempt to "jump over" this guard page to crash. - #### `pacret` {#pacret} This flag adds the `-mbranch-protection=pac-ret` compiler option on aarch64-linux targets. This uses ARM v8.3's Pointer Authentication feature to sign function return pointers before adding them to the stack. The pointer's authenticity is then validated before returning to its destination. This dramatically increases the difficulty of ROP exploitation techniques. diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md index 8067b2aad6704..d62c6914a6c9a 100644 --- a/nixos/doc/manual/release-notes/rl-2505.section.md +++ b/nixos/doc/manual/release-notes/rl-2505.section.md @@ -460,6 +460,8 @@ - `networking.wireguard` now has an optional networkd backend. It is enabled by default when `networking.useNetworkd` is enabled, and it can be enabled alongside scripted networking with `networking.wireguard.useNetworkd`. Some `networking.wireguard` options have slightly different behavior with the networkd and script-based backends, documented in each option. +- The `stackclashprotection` hardening flag has been enabled by default on compilers that support it. + - `services.avahi.ipv6` now defaults to true. - The Home Assistant module has new options {option}`services.home-assistant.blueprints.automation`, `services.home-assistant.blueprints.script`, and {option}`services.home-assistant.blueprints.template` that allow for the declarative installation of [blueprints](https://www.home-assistant.io/docs/blueprint/) into the appropriate configuration directories. From 7a3530c8dc478fe497369c93a713de587dc651fb Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sun, 9 Feb 2025 18:50:17 +0100 Subject: [PATCH 200/343] libproxy: fix build with introspection unavailable Fixes e.g. cross build for s390-linux. --- .../libraries/libproxy/default.nix | 38 ++++++++++++------- 1 file changed, 25 insertions(+), 13 deletions(-) diff --git a/pkgs/development/libraries/libproxy/default.nix b/pkgs/development/libraries/libproxy/default.nix index bb9d490b6fc71..2bf13ebe17584 100644 --- a/pkgs/development/libraries/libproxy/default.nix +++ b/pkgs/development/libraries/libproxy/default.nix @@ -17,17 +17,24 @@ stdenv, substituteAll, vala, + buildPackages, + withIntrospection ? + lib.meta.availableOn stdenv.hostPlatform gobject-introspection + && stdenv.hostPlatform.emulatorAvailable buildPackages, }: stdenv.mkDerivation (finalAttrs: { pname = "libproxy"; version = "0.5.9"; - outputs = [ - "out" - "dev" - "devdoc" - ]; + outputs = + [ + "out" + "dev" + ] + ++ lib.optionals withIntrospection [ + "devdoc" + ]; src = fetchFromGitHub { owner = "libproxy"; @@ -65,14 +72,17 @@ stdenv.mkDerivation (finalAttrs: { --replace-fail "requires_private: 'gobject-2.0'" "requires: 'gobject-2.0'" ''; - nativeBuildInputs = [ - gi-docgen - gobject-introspection - meson - ninja - pkg-config - vala - ]; + nativeBuildInputs = + [ + meson + ninja + pkg-config + ] + ++ lib.optionals withIntrospection [ + gi-docgen + gobject-introspection + vala + ]; buildInputs = [ @@ -95,6 +105,8 @@ stdenv.mkDerivation (finalAttrs: { [ # Prevent installing commit hook. "-Drelease=true" + (lib.mesonBool "docs" withIntrospection) + (lib.mesonBool "introspection" withIntrospection) ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "-Dconfig-gnome=false" From ed379bf876c433283ec7a07e55fc1cf464dea0d5 Mon Sep 17 00:00:00 2001 From: Lin Jian Date: Mon, 10 Feb 2025 01:54:48 +0800 Subject: [PATCH 201/343] elpa-packages: updated 2025-02-10 (from overlay) --- .../emacs/elisp-packages/elpa-generated.nix | 124 +++++++++++++----- 1 file changed, 94 insertions(+), 30 deletions(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix b/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix index 4450fb78c4658..733a37e3c1b71 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix @@ -1,5 +1,26 @@ { callPackage }: { + a68-mode = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "a68-mode"; + ename = "a68-mode"; + version = "1.0"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/a68-mode-1.0.tar"; + sha256 = "1fhmsix14wmysbp3w0zaywlf3m5wqmgydw2377zsgbaz7k3s3y8x"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/a68-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; ace-window = callPackage ( { avy, @@ -496,6 +517,28 @@ }; } ) { }; + auth-source-xoauth2-plugin = callPackage ( + { + elpaBuild, + fetchurl, + lib, + oauth2, + }: + elpaBuild { + pname = "auth-source-xoauth2-plugin"; + ename = "auth-source-xoauth2-plugin"; + version = "0.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/auth-source-xoauth2-plugin-0.1.tar"; + sha256 = "1mni58ckvcs33jnp78y39pg6rfnm4908iz6g7l7d9y8hbjwin4xm"; + }; + packageRequires = [ oauth2 ]; + meta = { + homepage = "https://elpa.gnu.org/packages/auth-source-xoauth2-plugin.html"; + license = lib.licenses.free; + }; + } + ) { }; auto-correct = callPackage ( { elpaBuild, @@ -581,6 +624,27 @@ }; } ) { }; + autorevert-tail-truncate = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "autorevert-tail-truncate"; + ename = "autorevert-tail-truncate"; + version = "1.0.0"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/autorevert-tail-truncate-1.0.0.tar"; + sha256 = "0p8gbcgmra4av4c0sbrazfb56vp564m2cyjrspkmsjlzwgl3634r"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/autorevert-tail-truncate.html"; + license = lib.licenses.free; + }; + } + ) { }; avy = callPackage ( { cl-lib ? null, @@ -1234,10 +1298,10 @@ elpaBuild { pname = "colorful-mode"; ename = "colorful-mode"; - version = "1.0.4"; + version = "1.1.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/colorful-mode-1.0.4.tar"; - sha256 = "0vy1rqv9aknns81v97j6dwr621hbs0489p7bhpg7k7qva39i97vs"; + url = "https://elpa.gnu.org/packages/colorful-mode-1.1.0.tar"; + sha256 = "1rq9jsa6imj6bw8s63sg7v6xc1zgrr4afrm4pydl280ly6cmp5bv"; }; packageRequires = [ compat ]; meta = { @@ -1511,10 +1575,10 @@ elpaBuild { pname = "consult-recoll"; ename = "consult-recoll"; - version = "0.8.1"; + version = "1.0.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/consult-recoll-0.8.1.tar"; - sha256 = "1zdmkq9cjb6kb0hf3ngm07r3mhrjal27x34i1bm7ri3089wbsp8v"; + url = "https://elpa.gnu.org/packages/consult-recoll-1.0.0.tar"; + sha256 = "1fjc5s1xn15vglmaqywnrpqnjb46w15xysk7n18ifqapcya5g0x0"; }; packageRequires = [ consult ]; meta = { @@ -2715,10 +2779,10 @@ elpaBuild { pname = "elisa"; ename = "elisa"; - version = "1.1.5"; + version = "1.1.7"; src = fetchurl { - url = "https://elpa.gnu.org/packages/elisa-1.1.5.tar"; - sha256 = "1ab8mvnsvip6ws4wflwkdpn8bilcqfryrcr0ps66v8dh80ws4iyh"; + url = "https://elpa.gnu.org/packages/elisa-1.1.7.tar"; + sha256 = "042bdbaxz521xs4ra89mn408vaqax0f0dn6xl6823f4vv1spq6k7"; }; packageRequires = [ async @@ -2766,10 +2830,10 @@ elpaBuild { pname = "ellama"; ename = "ellama"; - version = "0.13.4"; + version = "0.13.7"; src = fetchurl { - url = "https://elpa.gnu.org/packages/ellama-0.13.4.tar"; - sha256 = "1dsd9xj21x9v5wajzqvx1n4jbrnz29j3na9sz7l2hik7g090498f"; + url = "https://elpa.gnu.org/packages/ellama-0.13.7.tar"; + sha256 = "1nlav89rb1xdrjj4kb9pvz3wjvlvwyz7h11fm098g8s81r703hcx"; }; packageRequires = [ compat @@ -4899,10 +4963,10 @@ elpaBuild { pname = "llm"; ename = "llm"; - version = "0.22.0"; + version = "0.23.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/llm-0.22.0.tar"; - sha256 = "191chymh1ykngvwznb75ial3fnr98k3p3379gl6v8r55gic14byh"; + url = "https://elpa.gnu.org/packages/llm-0.23.0.tar"; + sha256 = "0a277fvi28xxjkr0884pdq23alk6rs3m42vs75r5ivv6ggznjzz9"; }; packageRequires = [ plz @@ -6011,10 +6075,10 @@ elpaBuild { pname = "org"; ename = "org"; - version = "9.7.20"; + version = "9.7.21"; src = fetchurl { - url = "https://elpa.gnu.org/packages/org-9.7.20.tar"; - sha256 = "06pp3092mzrn5fqs0rzhrsa3k8sknx96bwn7vr7w1y0n1m81s0ln"; + url = "https://elpa.gnu.org/packages/org-9.7.21.tar"; + sha256 = "0g2zwzidf4wzw0f120445a5j2297l9xgjbr0szhacspkfrxgjxg5"; }; packageRequires = [ ]; meta = { @@ -7550,10 +7614,10 @@ elpaBuild { pname = "scanner"; ename = "scanner"; - version = "0.2"; + version = "0.3"; src = fetchurl { - url = "https://elpa.gnu.org/packages/scanner-0.2.tar"; - sha256 = "1c42mg7m6fa7xw3svv741sgrc9zjl1zcq0vg45k61iqmnx8d44vp"; + url = "https://elpa.gnu.org/packages/scanner-0.3.tar"; + sha256 = "07cqbphpgcqz2bb204c26mh3pc4h4z792dz9pxh1fjwh4d0iasqy"; }; packageRequires = [ dash ]; meta = { @@ -8843,10 +8907,10 @@ elpaBuild { pname = "transient"; ename = "transient"; - version = "0.8.3"; + version = "0.8.4"; src = fetchurl { - url = "https://elpa.gnu.org/packages/transient-0.8.3.tar"; - sha256 = "0cx9h7knkyzalkyvbvl762mnl2mslcfxh899mf5wgqfavwkzgqp7"; + url = "https://elpa.gnu.org/packages/transient-0.8.4.tar"; + sha256 = "1dc636j9194i9pfj4rxxfy33f5rwsqp5qkf1c7a06yazblvgaqxi"; }; packageRequires = [ compat @@ -9679,10 +9743,10 @@ elpaBuild { pname = "window-tool-bar"; ename = "window-tool-bar"; - version = "0.2.1"; + version = "0.3"; src = fetchurl { - url = "https://elpa.gnu.org/packages/window-tool-bar-0.2.1.tar"; - sha256 = "06wf3kwc4sjd14ihagmahxjvk35skb28rh9yclpzbrvjqk0ss35v"; + url = "https://elpa.gnu.org/packages/window-tool-bar-0.3.tar"; + sha256 = "00kggfpfi1nj05mzy5zig0fs4as7qh99wqgvya3xj2kw8141cvd6"; }; packageRequires = [ compat ]; meta = { @@ -9985,10 +10049,10 @@ elpaBuild { pname = "yaml"; ename = "yaml"; - version = "1.0.0"; + version = "1.2.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/yaml-1.0.0.tar"; - sha256 = "0yvfrijjjm17qidyi50nrsvw2m3bqw6p72za7w8v4ywxfl7b59c6"; + url = "https://elpa.gnu.org/packages/yaml-1.2.0.tar"; + sha256 = "1j1shz85vdj7w7bslpmpfws92fi3afp44533irq8caf7zj9masph"; }; packageRequires = [ ]; meta = { From a8445ceb1b40f2f13c3472282edcb15c17aca277 Mon Sep 17 00:00:00 2001 From: Lin Jian Date: Mon, 10 Feb 2025 01:54:50 +0800 Subject: [PATCH 202/343] elpa-devel-packages: updated 2025-02-10 (from overlay) --- .../elisp-packages/elpa-devel-generated.nix | 300 +++++++++++------- 1 file changed, 182 insertions(+), 118 deletions(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-generated.nix b/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-generated.nix index 3552b5c42143a..999fbb5f43fa1 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-generated.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-generated.nix @@ -1,5 +1,26 @@ { callPackage }: { + a68-mode = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "a68-mode"; + ename = "a68-mode"; + version = "1.0.0.20250205.220528"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/a68-mode-1.0.0.20250205.220528.tar"; + sha256 = "0ds8kifvc3557xvb1vas7ivc4kn8wkjaqqj5h3azbh1bcbdj1xnp"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/a68-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; ace-window = callPackage ( { avy, @@ -440,10 +461,10 @@ elpaBuild { pname = "auctex"; ename = "auctex"; - version = "14.0.8.0.20250122.201658"; + version = "14.0.8.0.20250207.132239"; src = fetchurl { - url = "https://elpa.gnu.org/devel/auctex-14.0.8.0.20250122.201658.tar"; - sha256 = "1j6jnwkpv6m9zv159zg251zgxk1h7xy2fpnnwkn9d1y5yqvrzcaq"; + url = "https://elpa.gnu.org/devel/auctex-14.0.8.0.20250207.132239.tar"; + sha256 = "07x57jz5hpgky62h3rljrxbfcv850qfbm0nkny2bjg7cjhm97ih7"; }; packageRequires = [ ]; meta = { @@ -517,6 +538,28 @@ }; } ) { }; + auth-source-xoauth2-plugin = callPackage ( + { + elpaBuild, + fetchurl, + lib, + oauth2, + }: + elpaBuild { + pname = "auth-source-xoauth2-plugin"; + ename = "auth-source-xoauth2-plugin"; + version = "0.1.0.20250201.220645"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/auth-source-xoauth2-plugin-0.1.0.20250201.220645.tar"; + sha256 = "05rf750b9isjmwp9ys0g17njmd0428fqdl6sa8wakn286gpx2910"; + }; + packageRequires = [ oauth2 ]; + meta = { + homepage = "https://elpa.gnu.org/devel/auth-source-xoauth2-plugin.html"; + license = lib.licenses.free; + }; + } + ) { }; auto-correct = callPackage ( { elpaBuild, @@ -602,6 +645,27 @@ }; } ) { }; + autorevert-tail-truncate = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "autorevert-tail-truncate"; + ename = "autorevert-tail-truncate"; + version = "1.0.0.0.20250208.61538"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/autorevert-tail-truncate-1.0.0.0.20250208.61538.tar"; + sha256 = "1m00rr3mnv79vbczs7dg0fvqz1l0zyrbsqqz54gaqyl6r27hlwfl"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/autorevert-tail-truncate.html"; + license = lib.licenses.free; + }; + } + ) { }; avy = callPackage ( { cl-lib ? null, @@ -740,10 +804,10 @@ elpaBuild { pname = "blist"; ename = "blist"; - version = "0.4.0.20240807.40202"; + version = "0.4.0.20250207.24413"; src = fetchurl { - url = "https://elpa.gnu.org/devel/blist-0.4.0.20240807.40202.tar"; - sha256 = "1y1sfyvxca5g2rsh579lly1drr9qs1czb1z692fysir7l48p3y3w"; + url = "https://elpa.gnu.org/devel/blist-0.4.0.20250207.24413.tar"; + sha256 = "1raw8rvj3kghf4hpcz13c1jk8kpgjr9jlpq3y08aqh1k1y2y01w1"; }; packageRequires = [ ilist ]; meta = { @@ -859,10 +923,10 @@ elpaBuild { pname = "breadcrumb"; ename = "breadcrumb"; - version = "1.0.1.0.20231126.221621"; + version = "1.0.1.0.20250208.145328"; src = fetchurl { - url = "https://elpa.gnu.org/devel/breadcrumb-1.0.1.0.20231126.221621.tar"; - sha256 = "11qx345ggpm78dcvlrnji50b50wh3cv3i0ihxwxsw55n86kv9x0k"; + url = "https://elpa.gnu.org/devel/breadcrumb-1.0.1.0.20250208.145328.tar"; + sha256 = "1bj75faninnkm2cdy1x4c6f9kamf8wkwc1rf4il5khi6gyr0ki2z"; }; packageRequires = [ project ]; meta = { @@ -1254,10 +1318,10 @@ elpaBuild { pname = "colorful-mode"; ename = "colorful-mode"; - version = "1.0.4.0.20240924.193317"; + version = "1.1.0.0.20250208.162726"; src = fetchurl { - url = "https://elpa.gnu.org/devel/colorful-mode-1.0.4.0.20240924.193317.tar"; - sha256 = "06rzr4g2qv7d8hgil46v1vipq6rw4518sf5vqf22n8g893blcvjm"; + url = "https://elpa.gnu.org/devel/colorful-mode-1.1.0.0.20250208.162726.tar"; + sha256 = "1qdwl82shxgnds6131zlyhqgg0h2szqwj376pfvk450gmvmnk7g9"; }; packageRequires = [ compat ]; meta = { @@ -1461,10 +1525,10 @@ elpaBuild { pname = "consult"; ename = "consult"; - version = "2.0.0.20250128.173030"; + version = "2.0.0.20250207.161222"; src = fetchurl { - url = "https://elpa.gnu.org/devel/consult-2.0.0.20250128.173030.tar"; - sha256 = "15c7s2yv23k3qw19fn4kq7ngrkvxpd3vzrz1jd37sd6cdf067zzi"; + url = "https://elpa.gnu.org/devel/consult-2.0.0.20250207.161222.tar"; + sha256 = "150xaqhpz3awimsnpclky6gpn84j9fw3vsjhzwqqlpp5v3spb0kc"; }; packageRequires = [ compat ]; meta = { @@ -1512,7 +1576,7 @@ version = "0.4.1.0.20250202.52435"; src = fetchurl { url = "https://elpa.gnu.org/devel/consult-hoogle-0.4.1.0.20250202.52435.tar"; - sha256 = "sha256-9ywpFbFtrGZG52Qxp5dN8HxA3I+gjnHxlGUh31gUjto="; + sha256 = "1nlf2icdy8b5jkqp33m0izf40z7h9nbsfcb4wx36db3dn4ajjb7p"; }; packageRequires = [ consult ]; meta = { @@ -1531,10 +1595,10 @@ elpaBuild { pname = "consult-recoll"; ename = "consult-recoll"; - version = "0.8.1.0.20250106.172405"; + version = "1.0.0.0.20250205.171239"; src = fetchurl { - url = "https://elpa.gnu.org/devel/consult-recoll-0.8.1.0.20250106.172405.tar"; - sha256 = "178vlkdbjkjp6h2zcnwdfilnmk91rz41lbyrhy6xpjxz3s0jqdsx"; + url = "https://elpa.gnu.org/devel/consult-recoll-1.0.0.0.20250205.171239.tar"; + sha256 = "1mpvf601nyb8wz0brcxs2dvzf87s66wg83k9q6c605brnkg23cyb"; }; packageRequires = [ consult ]; meta = { @@ -1834,10 +1898,10 @@ elpaBuild { pname = "dape"; ename = "dape"; - version = "0.22.0.0.20250129.191028"; + version = "0.22.0.0.20250202.141832"; src = fetchurl { - url = "https://elpa.gnu.org/devel/dape-0.22.0.0.20250129.191028.tar"; - sha256 = "0xbcwfzscl1fnns8j4sg4xv6ynssxjz3bh6wr7d841wd9294ayim"; + url = "https://elpa.gnu.org/devel/dape-0.22.0.0.20250202.141832.tar"; + sha256 = "0z4c30v13z51hcpvbr2w18fj73f2rgvvjwwb0yn7vn0xrvlgsyap"; }; packageRequires = [ jsonrpc ]; meta = { @@ -1921,10 +1985,10 @@ elpaBuild { pname = "debbugs"; ename = "debbugs"; - version = "0.43.0.20250128.92424"; + version = "0.43.0.20250208.110220"; src = fetchurl { - url = "https://elpa.gnu.org/devel/debbugs-0.43.0.20250128.92424.tar"; - sha256 = "1nabm7k6r1qj1x48api5dpcaxm557xdmywbb5g851kyzvrbp8k1w"; + url = "https://elpa.gnu.org/devel/debbugs-0.43.0.20250208.110220.tar"; + sha256 = "1hwvdlx9gwm52vc3yddd58iwa1m69lr6wclwcc848ic8ag001zk2"; }; packageRequires = [ soap-client ]; meta = { @@ -1968,10 +2032,10 @@ elpaBuild { pname = "denote"; ename = "denote"; - version = "3.1.0.0.20250131.84208"; + version = "3.1.0.0.20250205.61207"; src = fetchurl { - url = "https://elpa.gnu.org/devel/denote-3.1.0.0.20250131.84208.tar"; - sha256 = "0krffkyisfmwfd19q2sdnvms2lf4iyadmab233ymzrskr1ai38sx"; + url = "https://elpa.gnu.org/devel/denote-3.1.0.0.20250205.61207.tar"; + sha256 = "0196s2jy08cf7pbysxlxzfziysm7sq87xkr19z1dxbd4284ad9qk"; }; packageRequires = [ ]; meta = { @@ -2257,10 +2321,10 @@ elpaBuild { pname = "dired-preview"; ename = "dired-preview"; - version = "0.3.0.0.20250127.85349"; + version = "0.3.0.0.20250205.94505"; src = fetchurl { - url = "https://elpa.gnu.org/devel/dired-preview-0.3.0.0.20250127.85349.tar"; - sha256 = "1b047qk02kbjkcqhaj74wyhw080f99kyx6d6yis4hazxlzxzh77k"; + url = "https://elpa.gnu.org/devel/dired-preview-0.3.0.0.20250205.94505.tar"; + sha256 = "1z9wg3z3kgmx3xv300r61ss5af23zs4cmhjn3xl7acn7ym6mpg33"; }; packageRequires = [ ]; meta = { @@ -2342,10 +2406,10 @@ elpaBuild { pname = "do-at-point"; ename = "do-at-point"; - version = "0.1.2.0.20241220.111054"; + version = "0.1.2.0.20250131.91127"; src = fetchurl { - url = "https://elpa.gnu.org/devel/do-at-point-0.1.2.0.20241220.111054.tar"; - sha256 = "0y9rgxnrar6gwqj3w622xdavi5gnb748kbym25q19a4vsjdazvi1"; + url = "https://elpa.gnu.org/devel/do-at-point-0.1.2.0.20250131.91127.tar"; + sha256 = "0bjw91hrv4d5vqrgkx9bas3nwgqyfpbar7b5d07m3agw436yafqf"; }; packageRequires = [ ]; meta = { @@ -2607,10 +2671,10 @@ elpaBuild { pname = "ef-themes"; ename = "ef-themes"; - version = "1.9.0.0.20250127.85559"; + version = "1.9.0.0.20250208.100006"; src = fetchurl { - url = "https://elpa.gnu.org/devel/ef-themes-1.9.0.0.20250127.85559.tar"; - sha256 = "10ifzbhb203gr93s03l9rqb9x467bmw3nz9062i5z6q4qycv33cz"; + url = "https://elpa.gnu.org/devel/ef-themes-1.9.0.0.20250208.100006.tar"; + sha256 = "0wns13m6cqxjh4kp8kmz3x0yicf4a48mbn962bdm3vgwy1wlhhyp"; }; packageRequires = [ ]; meta = { @@ -2635,10 +2699,10 @@ elpaBuild { pname = "eglot"; ename = "eglot"; - version = "1.18.0.20250129.85907"; + version = "1.18.0.20250208.134208"; src = fetchurl { - url = "https://elpa.gnu.org/devel/eglot-1.18.0.20250129.85907.tar"; - sha256 = "0456xa4ms9qjd5z90l61zd9jg68z26kf1y59gkaz153a63pary47"; + url = "https://elpa.gnu.org/devel/eglot-1.18.0.20250208.134208.tar"; + sha256 = "0sqm6z9phbdhy6f4dzcbk5w44j4kpxnk3hgd0y233v0nhxz80ahs"; }; packageRequires = [ eldoc @@ -2690,10 +2754,10 @@ elpaBuild { pname = "eldoc"; ename = "eldoc"; - version = "1.15.0.0.20250101.73917"; + version = "1.15.0.0.20250201.35652"; src = fetchurl { - url = "https://elpa.gnu.org/devel/eldoc-1.15.0.0.20250101.73917.tar"; - sha256 = "0pwicn9r2v85hpkxk7dibmxzy7iaj41r16lrybhm0kcw74lwhkkd"; + url = "https://elpa.gnu.org/devel/eldoc-1.15.0.0.20250201.35652.tar"; + sha256 = "1y2if2f1azw92qxlv5hxyjlhs95ysghwb7xxa5vl5wsn4drgc5pz"; }; packageRequires = [ ]; meta = { @@ -2736,10 +2800,10 @@ elpaBuild { pname = "elisa"; ename = "elisa"; - version = "1.1.5.0.20250128.73617"; + version = "1.1.7.0.20250202.204048"; src = fetchurl { - url = "https://elpa.gnu.org/devel/elisa-1.1.5.0.20250128.73617.tar"; - sha256 = "1cyh4d3v16lspjldzsni282smjx9icvdkly0qcwkhxn90mgfzxqm"; + url = "https://elpa.gnu.org/devel/elisa-1.1.7.0.20250202.204048.tar"; + sha256 = "0bs2cb2i18afd1vnrfszdj9kxqmr678l01a8l4rz19yv7iril299"; }; packageRequires = [ async @@ -2787,10 +2851,10 @@ elpaBuild { pname = "ellama"; ename = "ellama"; - version = "0.13.4.0.20250126.204518"; + version = "0.13.7.0.20250208.110313"; src = fetchurl { - url = "https://elpa.gnu.org/devel/ellama-0.13.4.0.20250126.204518.tar"; - sha256 = "05pcyswrnv138wpqigaiif3x95gwcb16kvl3s84czyz5ypgidl7w"; + url = "https://elpa.gnu.org/devel/ellama-0.13.7.0.20250208.110313.tar"; + sha256 = "0mglzqh4pjwzjqrrpkrg8296c32nv0ja778nmb27r6zdig9ss5zj"; }; packageRequires = [ compat @@ -2835,10 +2899,10 @@ elpaBuild { pname = "embark"; ename = "embark"; - version = "1.1.0.20250127.71505"; + version = "1.1.0.20250131.230144"; src = fetchurl { - url = "https://elpa.gnu.org/devel/embark-1.1.0.20250127.71505.tar"; - sha256 = "1drhc5sjvg5l17xqws889aggp1zw80zvj9vlh5j2m5m56szqnzgz"; + url = "https://elpa.gnu.org/devel/embark-1.1.0.20250131.230144.tar"; + sha256 = "0ky3cm9dn8hwms3nmzfkm339v859wc6qgchkqn4i7p2206bp4cqj"; }; packageRequires = [ compat ]; meta = { @@ -2859,10 +2923,10 @@ elpaBuild { pname = "embark-consult"; ename = "embark-consult"; - version = "1.1.0.20250127.71505"; + version = "1.1.0.20250131.230144"; src = fetchurl { - url = "https://elpa.gnu.org/devel/embark-consult-1.1.0.20250127.71505.tar"; - sha256 = "0kprj6wkd8qyg2fcb0an0sp8gxg38zb7aps8a97lmls50klk1v4m"; + url = "https://elpa.gnu.org/devel/embark-consult-1.1.0.20250131.230144.tar"; + sha256 = "1ggk135338cbxkhvzc4g9wyyvz2sxxqyx5yqwzsffx9yprp618ng"; }; packageRequires = [ compat @@ -2923,10 +2987,10 @@ elpaBuild { pname = "emms"; ename = "emms"; - version = "21.0.20250120.141327"; + version = "21.0.20250204.152247"; src = fetchurl { - url = "https://elpa.gnu.org/devel/emms-21.0.20250120.141327.tar"; - sha256 = "1vcpp171rgvgm3mf04z0ayha7avfvjkp17ybs98fjl09160ih3ny"; + url = "https://elpa.gnu.org/devel/emms-21.0.20250204.152247.tar"; + sha256 = "00m56k9j69xh03agj5xsw61brz69r54n2qqkyg0gs1ahaqcf52cc"; }; packageRequires = [ cl-lib @@ -3012,10 +3076,10 @@ elpaBuild { pname = "erc"; ename = "erc"; - version = "5.6.1snapshot0.20250125.100619"; + version = "5.6.1snapshot0.20250207.202136"; src = fetchurl { - url = "https://elpa.gnu.org/devel/erc-5.6.1snapshot0.20250125.100619.tar"; - sha256 = "0aj9bh1j752357ac50qgvs5yp90gfbzng4wri3d90x8nldxlnq33"; + url = "https://elpa.gnu.org/devel/erc-5.6.1snapshot0.20250207.202136.tar"; + sha256 = "1qdbq8yx10cfvids88vmvi3q8481fvypfpdx5490b4sbjkpsryqr"; }; packageRequires = [ compat ]; meta = { @@ -3708,10 +3772,10 @@ elpaBuild { pname = "gnugo"; ename = "gnugo"; - version = "3.1.2.0.20230911.4426"; + version = "3.1.2.0.20250131.151403"; src = fetchurl { - url = "https://elpa.gnu.org/devel/gnugo-3.1.2.0.20230911.4426.tar"; - sha256 = "0pxw1z6inw0ikagcfvi14i83sg6affii277mbyzh5liv655hn9rj"; + url = "https://elpa.gnu.org/devel/gnugo-3.1.2.0.20250131.151403.tar"; + sha256 = "1afx15bab0zx5iykx9fjn0k32m8rj58n2998kgvpmnyxwl449v77"; }; packageRequires = [ ascii-art-to-unicode @@ -4090,10 +4154,10 @@ elpaBuild { pname = "hyperbole"; ename = "hyperbole"; - version = "9.0.2pre0.20250130.145450"; + version = "9.0.2pre0.20250208.215943"; src = fetchurl { - url = "https://elpa.gnu.org/devel/hyperbole-9.0.2pre0.20250130.145450.tar"; - sha256 = "0z30yxv5945iipj7x8zjbzh65y9ymhrk7ws2a7slfhdmci998jzb"; + url = "https://elpa.gnu.org/devel/hyperbole-9.0.2pre0.20250208.215943.tar"; + sha256 = "1bqc2zvch5aldyjy6ncsyvw034rhxrpk9r27qrq706n3n3b140b8"; }; packageRequires = [ ]; meta = { @@ -4154,10 +4218,10 @@ elpaBuild { pname = "indent-bars"; ename = "indent-bars"; - version = "0.8.2.0.20250123.153037"; + version = "0.8.2.0.20250201.115728"; src = fetchurl { - url = "https://elpa.gnu.org/devel/indent-bars-0.8.2.0.20250123.153037.tar"; - sha256 = "1affd306vy71v6krn17wl0z7cq3305skksyxiq2h78fn8l1g4mc6"; + url = "https://elpa.gnu.org/devel/indent-bars-0.8.2.0.20250201.115728.tar"; + sha256 = "1xp9lhk1yz842b3z6j181ziql99b0pj1wy7nnpjlqxnga0pcf8z9"; }; packageRequires = [ compat ]; meta = { @@ -4467,10 +4531,10 @@ elpaBuild { pname = "jinx"; ename = "jinx"; - version = "1.12.0.20250128.70732"; + version = "1.12.0.20250207.140139"; src = fetchurl { - url = "https://elpa.gnu.org/devel/jinx-1.12.0.20250128.70732.tar"; - sha256 = "05ys8v3pdkg9058lx5rga6qrzp3d2vhzxwrmd1faazpc3j4h5bhm"; + url = "https://elpa.gnu.org/devel/jinx-1.12.0.20250207.140139.tar"; + sha256 = "0lankxybmh4d7vkyaadrm53ph4w165mnjmfmr8kfnsy7k16hqc41"; }; packageRequires = [ compat ]; meta = { @@ -4801,10 +4865,10 @@ elpaBuild { pname = "let-alist"; ename = "let-alist"; - version = "1.0.6.0.20250101.73917"; + version = "1.0.6.0.20250201.73956"; src = fetchurl { - url = "https://elpa.gnu.org/devel/let-alist-1.0.6.0.20250101.73917.tar"; - sha256 = "0lr22q8crlk160j38y5dyla1i3h882yv5zjh7f9rbfaqqs6w5xqm"; + url = "https://elpa.gnu.org/devel/let-alist-1.0.6.0.20250201.73956.tar"; + sha256 = "0qnp9dnnjmygirg8qncnc3mdi6kj08x63njsj6qwbb3276rr18w8"; }; packageRequires = [ ]; meta = { @@ -4918,10 +4982,10 @@ elpaBuild { pname = "llm"; ename = "llm"; - version = "0.22.0.0.20250129.233328"; + version = "0.23.0.0.20250208.202943"; src = fetchurl { - url = "https://elpa.gnu.org/devel/llm-0.22.0.0.20250129.233328.tar"; - sha256 = "0wflw00w13q8aifzgh137vmd7i7mfrv7nz6m103q9i68pz001z3n"; + url = "https://elpa.gnu.org/devel/llm-0.23.0.0.20250208.202943.tar"; + sha256 = "0mxrhq3vch02asbj7v4xfmi8n953byy5bc1s3g9nwb75cjlvrcvz"; }; packageRequires = [ plz @@ -5157,10 +5221,10 @@ elpaBuild { pname = "marginalia"; ename = "marginalia"; - version = "1.8.0.20250128.172920"; + version = "1.8.0.20250203.101833"; src = fetchurl { - url = "https://elpa.gnu.org/devel/marginalia-1.8.0.20250128.172920.tar"; - sha256 = "1kl9b91aqcjf969mkpvf2lc47xxlc2qzqkmjzdvvwdyzvqdcnfmn"; + url = "https://elpa.gnu.org/devel/marginalia-1.8.0.20250203.101833.tar"; + sha256 = "0yphb9wkg04c6fqb5cbblbk5vmnn15njhp774kivxhxjr7p282n3"; }; packageRequires = [ compat ]; meta = { @@ -5454,10 +5518,10 @@ elpaBuild { pname = "modus-themes"; ename = "modus-themes"; - version = "4.6.0.0.20250127.85644"; + version = "4.6.0.0.20250208.95815"; src = fetchurl { - url = "https://elpa.gnu.org/devel/modus-themes-4.6.0.0.20250127.85644.tar"; - sha256 = "197swh4imyz6y9q66nxlsh2sv23w92knq98wasq1qxywkqi5lrz8"; + url = "https://elpa.gnu.org/devel/modus-themes-4.6.0.0.20250208.95815.tar"; + sha256 = "1sg46vcysbffqjq0wcrsv7z80qv39yw6nl4clsga4il8wkph5n21"; }; packageRequires = [ ]; meta = { @@ -6014,10 +6078,10 @@ elpaBuild { pname = "orderless"; ename = "orderless"; - version = "1.3.0.20250101.92243"; + version = "1.3.0.20250201.234121"; src = fetchurl { - url = "https://elpa.gnu.org/devel/orderless-1.3.0.20250101.92243.tar"; - sha256 = "1n28izngnqs2xy2iw7s0mw78mx7b4ahwf8yirr1jlv00vc51qiab"; + url = "https://elpa.gnu.org/devel/orderless-1.3.0.20250201.234121.tar"; + sha256 = "1skvlpvn49qivvn33c3y9nx0v3mn8ds1cagddd070ykpqyccrihp"; }; packageRequires = [ compat ]; meta = { @@ -6035,10 +6099,10 @@ elpaBuild { pname = "org"; ename = "org"; - version = "9.8pre0.20250119.115347"; + version = "9.8pre0.20250202.170245"; src = fetchurl { - url = "https://elpa.gnu.org/devel/org-9.8pre0.20250119.115347.tar"; - sha256 = "0wjbfg93yqpkfyxdvpcpg3l98b054h9hkdl3kjcmxyvah8bas0zd"; + url = "https://elpa.gnu.org/devel/org-9.8pre0.20250202.170245.tar"; + sha256 = "13ipl0crx6n896084shax8i2j6cp7xc1x1acpvarjfwk7cix6s04"; }; packageRequires = [ ]; meta = { @@ -7014,10 +7078,10 @@ elpaBuild { pname = "python"; ename = "python"; - version = "0.28.0.20250130.120320"; + version = "0.28.0.20250204.222800"; src = fetchurl { - url = "https://elpa.gnu.org/devel/python-0.28.0.20250130.120320.tar"; - sha256 = "195j49w0m9ndp6c256dqz94my6wk7hpd29sg8qxh9h24lc9zyjzg"; + url = "https://elpa.gnu.org/devel/python-0.28.0.20250204.222800.tar"; + sha256 = "0ljnj4k793i53z9hgg148443x3q2yvmfp8f8kgjc0p0kz95d7m6m"; }; packageRequires = [ compat @@ -7621,10 +7685,10 @@ elpaBuild { pname = "scanner"; ename = "scanner"; - version = "0.2.0.20210104.105054"; + version = "0.3.0.20250208.195044"; src = fetchurl { - url = "https://elpa.gnu.org/devel/scanner-0.2.0.20210104.105054.tar"; - sha256 = "1ah74y9ragw3kycqwgxkmnxrzl7s2n43cjpw6r25hmbyzjnhdppm"; + url = "https://elpa.gnu.org/devel/scanner-0.3.0.20250208.195044.tar"; + sha256 = "0fxq0lylgdzsk398q2658gsd3xlr8wd63wlpvnx0vakzj824x2cb"; }; packageRequires = [ dash ]; meta = { @@ -8283,10 +8347,10 @@ elpaBuild { pname = "standard-themes"; ename = "standard-themes"; - version = "2.2.0.0.20250127.85517"; + version = "2.2.0.0.20250208.100140"; src = fetchurl { - url = "https://elpa.gnu.org/devel/standard-themes-2.2.0.0.20250127.85517.tar"; - sha256 = "00f0ph4gz1r0m9v489dvq2whvmjp82lapg7lhbsb2w871bk625jv"; + url = "https://elpa.gnu.org/devel/standard-themes-2.2.0.0.20250208.100140.tar"; + sha256 = "1g79nlv3csgd4qprv6gfb4pijlpcsypz24lij40szf53y325p7vl"; }; packageRequires = [ ]; meta = { @@ -8873,10 +8937,10 @@ elpaBuild { pname = "track-changes"; ename = "track-changes"; - version = "1.2.0.20250101.73917"; + version = "1.2.0.20250205.202103"; src = fetchurl { - url = "https://elpa.gnu.org/devel/track-changes-1.2.0.20250101.73917.tar"; - sha256 = "0w93lrbnpv567j9zn1vbw5h63d331ddi6n7cnhqi4c25kx55dzpw"; + url = "https://elpa.gnu.org/devel/track-changes-1.2.0.20250205.202103.tar"; + sha256 = "1hiaphb20cng08b806w68a24fy00yfpp2kpmwn1aw5xywxkqsgi7"; }; packageRequires = [ ]; meta = { @@ -8980,10 +9044,10 @@ elpaBuild { pname = "transient"; ename = "transient"; - version = "0.8.3.0.20250122.121927"; + version = "0.8.4.0.20250201.131431"; src = fetchurl { - url = "https://elpa.gnu.org/devel/transient-0.8.3.0.20250122.121927.tar"; - sha256 = "1cf0dmgw1ghi2z0k6a2a1hbpdfm29ddg5np7492dn55xlggmjlny"; + url = "https://elpa.gnu.org/devel/transient-0.8.4.0.20250201.131431.tar"; + sha256 = "1micgh8w9x0x95wis581f5p3mbhmiq5q3mg8rz1fn3xnjjiqr8a3"; }; packageRequires = [ compat @@ -9516,10 +9580,10 @@ elpaBuild { pname = "vertico"; ename = "vertico"; - version = "1.11.0.20250128.172940"; + version = "1.11.0.20250203.105541"; src = fetchurl { - url = "https://elpa.gnu.org/devel/vertico-1.11.0.20250128.172940.tar"; - sha256 = "0804xncv740vcb5kcg8i0mrpiha2j63f10dm3mcfy33kwbfafnba"; + url = "https://elpa.gnu.org/devel/vertico-1.11.0.20250203.105541.tar"; + sha256 = "14mykwn0wypd6h5s6l175q8ibsvqc6mnrnws6plmqzlpghir1ipk"; }; packageRequires = [ compat ]; meta = { @@ -9775,10 +9839,10 @@ elpaBuild { pname = "which-key"; ename = "which-key"; - version = "3.6.1.0.20250101.73917"; + version = "3.6.1.0.20250205.202103"; src = fetchurl { - url = "https://elpa.gnu.org/devel/which-key-3.6.1.0.20250101.73917.tar"; - sha256 = "05d6dbh0l7lb70rqqgqlwp1q32i4kr4lqkdgg4ngimyqnmm2xy5h"; + url = "https://elpa.gnu.org/devel/which-key-3.6.1.0.20250205.202103.tar"; + sha256 = "0n5f6r1kfiycmd96419yfr7vg65aq3g0hhgafhkwi73n6cbd9209"; }; packageRequires = [ ]; meta = { @@ -9818,10 +9882,10 @@ elpaBuild { pname = "window-tool-bar"; ename = "window-tool-bar"; - version = "0.2.1.0.20250101.73917"; + version = "0.3.0.20250208.111330"; src = fetchurl { - url = "https://elpa.gnu.org/devel/window-tool-bar-0.2.1.0.20250101.73917.tar"; - sha256 = "0cc1s4jrz9zy9986v27hlm6aj9iq11vd7xc4i2wymy47fkmqfbhl"; + url = "https://elpa.gnu.org/devel/window-tool-bar-0.3.0.20250208.111330.tar"; + sha256 = "1xg1jkb08hw0a1q9rfd3fvdkwmcd04syzj9lihlyww2am8ki286v"; }; packageRequires = [ compat ]; meta = { @@ -10124,10 +10188,10 @@ elpaBuild { pname = "yaml"; ename = "yaml"; - version = "1.0.0.0.20241129.211417"; + version = "1.2.0.0.20250208.153456"; src = fetchurl { - url = "https://elpa.gnu.org/devel/yaml-1.0.0.0.20241129.211417.tar"; - sha256 = "0wvyq8hwh10ldpd56xw7n6z4w2zhn4nyk949pyf78vigvr7rv8ll"; + url = "https://elpa.gnu.org/devel/yaml-1.2.0.0.20250208.153456.tar"; + sha256 = "13awmzwcmgs7ciinhr0crcw70zabj7lpxgk6afizcsdd0fahgg4m"; }; packageRequires = [ ]; meta = { From eb379b525a273506488c2f68addfe88776311fb2 Mon Sep 17 00:00:00 2001 From: Lin Jian Date: Mon, 10 Feb 2025 01:54:50 +0800 Subject: [PATCH 203/343] melpa-packages: updated 2025-02-10 (from overlay) --- .../elisp-packages/recipes-archive-melpa.json | 1410 +++++++++-------- 1 file changed, 734 insertions(+), 676 deletions(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json b/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json index bee4e57a74a59..cd6e6924f0007 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json +++ b/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json @@ -1880,11 +1880,11 @@ "repo": "bbatsov/adoc-mode", "unstable": { "version": [ - 20240218, - 1035 + 20250206, + 838 ], - "commit": "2c2eb8043623aa99d35aacbad2ee39188bf1bad3", - "sha256": "0ahvb703hgar9lm2zcikmjc5yqdg4lvw0f314isbww3479dlm5l2" + "commit": "20772277b8a5b8c08d49bd03043d5d4dd7a815e9", + "sha256": "0ln8xfvsdmr5p1axlk25gvnis2h8wh4ry74gglg02fwkrkqbs6w9" }, "stable": { "version": [ @@ -2096,19 +2096,19 @@ "repo": "t4ccer/agenix.el", "unstable": { "version": [ - 20240601, - 1304 + 20250209, + 551 ], - "commit": "b9c7ad33b534d80af207949cc06c0bcd1e60fd63", - "sha256": "0pibky4ndm765xwz6964yihl0v5pmfdj90rnalb5zld1bfv4dv1x" + "commit": "36ad60f0b7f2a12b730c6f568fcfd4daf2581158", + "sha256": "17l6j83i2xm3agrrbmg2pwccim6y9f65b1vsripv95fyxhp6l1mm" }, "stable": { "version": [ 1, - 2 + 3 ], - "commit": "c3afc8d109dc19bfe2f97ce47184ca748dbe4816", - "sha256": "0h7lk050c7arhnvv2anlgqq39r3690fw9l0n8bjk5qh38dsgwmah" + "commit": "36ad60f0b7f2a12b730c6f568fcfd4daf2581158", + "sha256": "17l6j83i2xm3agrrbmg2pwccim6y9f65b1vsripv95fyxhp6l1mm" } }, { @@ -3544,15 +3544,15 @@ "repo": "emacs-ansible/emacs-ansible", "unstable": { "version": [ - 20241129, - 309 + 20250208, + 241 ], "deps": [ "f", "s" ], - "commit": "03e285bb54a687e3fd9e21026b088fdac46679a0", - "sha256": "0hpb8bcpyynzkc90jygp284l79vfgl5xb2hig0h5j7n5xvjcg1g9" + "commit": "4601ff31f56af19c71e86fcc7a2d52b7c17e8abd", + "sha256": "001w2fqr5sajy3wpjzqp239hfc6dlbg2hhgz51sjq3a5lmh3cq5l" }, "stable": { "version": [ @@ -3841,11 +3841,11 @@ "repo": "radian-software/apheleia", "unstable": { "version": [ - 20250122, - 624 + 20250207, + 2227 ], - "commit": "049325e7734603e3c7ba05f26016beccafefb473", - "sha256": "14awhjd5l3azx68v6i3kfsbn6bns3y2y89zfbk9xmg59b87755bf" + "commit": "ba333e7ddce49fcbb34b7ad6e37ed880a90e4f4d", + "sha256": "08kmf0dm420f7k81q5jj1i2p15p481z0gg01lq07w4hq1nw6a0kk" }, "stable": { "version": [ @@ -4128,11 +4128,11 @@ "repo": "motform/arduino-cli-mode", "unstable": { "version": [ - 20250114, - 1011 + 20250207, + 1753 ], - "commit": "f4a26fcd9f0d4909a0f1e96db91b67a0a66bf2e5", - "sha256": "05irfiv32ksja0fiivlcv91j3bd2d8n1sr22lmrx099zipbf0xfp" + "commit": "de4721f11a82d33539f2552ce8942ed5158485c1", + "sha256": "1zfkr5v3d17sqp39b0dl39rmmqgjw1rv6vr0nix6mqsldc0hcl6d" } }, { @@ -6125,14 +6125,14 @@ "repo": "nameiwillforget/avy-act", "unstable": { "version": [ - 20250120, - 2336 + 20250201, + 1311 ], "deps": [ "avy" ], - "commit": "2e646ed82ebdb62eeb3224fcb26dea03b827bdcf", - "sha256": "02xpjiggk4n5yzsp418n57p2bzn3g6gmnz40n35h1p6gwq4drs1f" + "commit": "eb3be5667b5d1ae024910faf997a12456bca6aa8", + "sha256": "1np3dhv3sik04p7k3qbbnmhz5hx919whxiqdj2i6shiqfmidcygy" } }, { @@ -11258,26 +11258,26 @@ "repo": "kickingvegas/casual", "unstable": { "version": [ - 20250130, - 2100 + 20250204, + 1934 ], "deps": [ "transient" ], - "commit": "6d1ab1b23d7481fe4ebfdce3ebafb97dbb20c561", - "sha256": "0kpnv4mkzl03fx7h8cdrxd8qx1d99nywbn41f11zdgzvy4fr7mm0" + "commit": "0ba181cbef1abdd45f9504c62f71212d64113e77", + "sha256": "0cvz98zqmrzbyjx4azc100bpa6f0cxgwyj4ky0932kjl89h6kwh2" }, "stable": { "version": [ 2, 3, - 0 + 1 ], "deps": [ "transient" ], - "commit": "6d1ab1b23d7481fe4ebfdce3ebafb97dbb20c561", - "sha256": "0kpnv4mkzl03fx7h8cdrxd8qx1d99nywbn41f11zdgzvy4fr7mm0" + "commit": "0ba181cbef1abdd45f9504c62f71212d64113e77", + "sha256": "0cvz98zqmrzbyjx4azc100bpa6f0cxgwyj4ky0932kjl89h6kwh2" } }, { @@ -11410,11 +11410,11 @@ "repo": "catppuccin/emacs", "unstable": { "version": [ - 20241211, - 322 + 20250204, + 2016 ], - "commit": "893981bb3d7aff4c6e41427e92dc514164fdfb59", - "sha256": "0d9cykz6pw1i2iil1vyz9njqabfkli4fgrk97kl4wqggdvxahlc9" + "commit": "8d14c1968580f9aa66a84929fc8a9daf1e1e2b90", + "sha256": "1vl0ws6gmm26j1f98myzkhy7m1fzyxpaspdv7f5hsilmlx7mk35h" }, "stable": { "version": [ @@ -11899,7 +11899,7 @@ "repo": "worr/cfn-mode", "unstable": { "version": [ - 20250119, + 20250202, 904 ], "deps": [ @@ -11907,8 +11907,8 @@ "s", "yaml-mode" ], - "commit": "b59ec41be0abc8c9c3453c00a7a936c8d6588eef", - "sha256": "142z3b5zp2by0w5flr097bjmjzfvz78adnzcn9akpzdgp824vcja" + "commit": "fb15f876722350c87bf4fc5cc26e16aa4d1bf2c7", + "sha256": "0pr92p7sw8lh4glawbw97dzvfq7s8jsq0ylqjmc1xl3jws6aniy4" }, "stable": { "version": [ @@ -12172,14 +12172,14 @@ "repo": "xenodium/chatgpt-shell", "unstable": { "version": [ - 20250116, - 1203 + 20250207, + 926 ], "deps": [ "shell-maker" ], - "commit": "9c896feda89a2a879de807a5bd652beec7d6a3f6", - "sha256": "16idd626621q4ykwwgvgc77hqy02vh7lrw8w9l5c4vn030s3cvd2" + "commit": "be81dd78fd1a6e7f0e50a0e7d67c0542d47783a8", + "sha256": "1lb6bg3wr3p3l03p3imrk8f6fp5mnvqbgd6aafb9vzfqp81xqgly" }, "stable": { "version": [ @@ -13203,16 +13203,16 @@ "repo": "pprevos/citar-denote", "unstable": { "version": [ - 20250127, - 235 + 20250202, + 854 ], "deps": [ "citar", "dash", "denote" ], - "commit": "d030a2fa25dc1ae2e0733a86791503d661ec2fe0", - "sha256": "08s8f68bc33kk4r1x524y3n7psizirmb8x050wjh7yn0ksn7xs13" + "commit": "47f1ed2fbdd6ce88e65dd5ec77e984dfa4f72d49", + "sha256": "1lb8gy9gf4jdq5mfbkdmv4gwg1rw6h5vk3zn4mhly9p39baq69dv" }, "stable": { "version": [ @@ -15412,14 +15412,14 @@ "repo": "NicholasBHubbard/comint-histories", "unstable": { "version": [ - 20250123, - 327 + 20250204, + 222 ], "deps": [ "f" ], - "commit": "bb5d2332299d49837ec230b9a218e056b8305b7c", - "sha256": "114p6jka3m55yw79k5yv6azyn0skvdj6ibza4vi87683874wkfbs" + "commit": "15a2e3c89814927fce0cc01ab01824b09881c652", + "sha256": "0vcpw674gcpn5p0swy9sgwmfn1rsi2cd7nj92y9glc8paky3p3m0" } }, { @@ -16313,16 +16313,16 @@ "repo": "jcs-elpa/company-fuzzy", "unstable": { "version": [ - 20250101, - 1006 + 20250207, + 140 ], "deps": [ "company", "ht", "s" ], - "commit": "6b7f4bc22dff085961dc51799d0674e58eb1af0d", - "sha256": "06y5si2chn4h51i1wy44kq4kmbzl680gi8jx4fnmfm0pmbf9c86k" + "commit": "cc144309cecb9d0b913f182a7c9a85ea1089db31", + "sha256": "0dg6l12dg5frh6lg6jmis5rzjj7ibfhs7ar1vjyhs3z8vmz49w05" }, "stable": { "version": [ @@ -17658,11 +17658,11 @@ "repo": "jamescherti/compile-angel.el", "unstable": { "version": [ - 20250124, - 302 + 20250204, + 1654 ], - "commit": "ebf66bbcd25141762351a75e8122cffa4f235e19", - "sha256": "0y8r2bd3ly8pl1xzkjah74wii9507mm0bc8c4j7ixzwdrbi6alb9" + "commit": "71f6cae711c943354dea34d35b435f84f6607129", + "sha256": "1vy4bhjw2f9b2s194nz4bcmlhbibfhhn7dj7n0fk53ky03xs54cn" }, "stable": { "version": [ @@ -18142,14 +18142,14 @@ "repo": "minad/consult", "unstable": { "version": [ - 20250128, - 1730 + 20250207, + 1612 ], "deps": [ "compat" ], - "commit": "5b0c682d7092e02a0e8e0f047370be8c61ad3b4e", - "sha256": "0aryd22lcg2c0fq6ir5ajmjp81rc6kdv88z2q62pv46vmfwwm61h" + "commit": "c74ae6149172e3429b844c22d67e02b01abea1e4", + "sha256": "0fxcprca5p0ld95828mw49fz90cg127yal7nbdhk2gk133k3l1fa" }, "stable": { "version": [ @@ -18444,16 +18444,16 @@ "repo": "armindarvish/consult-gh", "unstable": { "version": [ - 20250126, - 1937 + 20250202, + 2110 ], "deps": [ "consult", "markdown-mode", "ox-gfm" ], - "commit": "efde6c64324e763caf2f4c79c7c9e1bc3913c04f", - "sha256": "1zw8lmxg5irldha01q7kpv41lqypya5wbz04y8xwdjm4x8lvpr3s" + "commit": "f2a4498d0a5aa9e03adc406c5013f9318385e57c", + "sha256": "0yv22iggcvjdvpv16sqblbcp761ksn2gf78zh0x1lss03vgivfap" }, "stable": { "version": [ @@ -18477,16 +18477,16 @@ "repo": "armindarvish/consult-gh", "unstable": { "version": [ - 20250126, - 1937 + 20250201, + 1318 ], "deps": [ "consult", "consult-gh", "embark-consult" ], - "commit": "efde6c64324e763caf2f4c79c7c9e1bc3913c04f", - "sha256": "1zw8lmxg5irldha01q7kpv41lqypya5wbz04y8xwdjm4x8lvpr3s" + "commit": "8a5c7ea1e732b01634c5f3533f72c002135c3421", + "sha256": "19cby16vmq3bj6m3s4mjrl65vdwjbhxjww0s9b2dg9fsfy70dlbx" }, "stable": { "version": [ @@ -18509,16 +18509,16 @@ "repo": "armindarvish/consult-gh", "unstable": { "version": [ - 20250126, - 1937 + 20250202, + 1941 ], "deps": [ "consult", "consult-gh", "forge" ], - "commit": "efde6c64324e763caf2f4c79c7c9e1bc3913c04f", - "sha256": "1zw8lmxg5irldha01q7kpv41lqypya5wbz04y8xwdjm4x8lvpr3s" + "commit": "2b3d90783583ef44006aea9552314e0b5ab2e47a", + "sha256": "1q7n6z2rw31jszn7nq1i68c6h0qiavygf7r94izvkrpywdy65m7w" }, "stable": { "version": [ @@ -18693,28 +18693,28 @@ "repo": "jao/consult-notmuch", "unstable": { "version": [ - 20250106, - 1511 + 20250205, + 1714 ], "deps": [ "consult", "notmuch" ], - "commit": "f7efa07ecc87aa63a76887fffc9796329a09a685", - "sha256": "1ynna4nqdzb9g735vxymchm503f01i4zcxwrdszk9nrazbcx651r" + "commit": "17d2a4ea8c180acd4fb805dcc1b17d9c6a1a4044", + "sha256": "1kgi3y1lkp1jd784ncyysr5yimyq6bjpvgx9wxfca14ylb8my37a" }, "stable": { "version": [ + 1, 0, - 8, - 1 + 0 ], "deps": [ "consult", "notmuch" ], - "commit": "d0d4129d45ccceddaeeaa3631eb42d5dd09a758b", - "sha256": "0gcd69i99prnskh1na7clydqgh1y9rbzkdc6dy9zmin9hfdrw1yd" + "commit": "17d2a4ea8c180acd4fb805dcc1b17d9c6a1a4044", + "sha256": "1kgi3y1lkp1jd784ncyysr5yimyq6bjpvgx9wxfca14ylb8my37a" } }, { @@ -18793,26 +18793,26 @@ "repo": "jao/consult-recoll", "unstable": { "version": [ - 20250106, - 1724 + 20250205, + 1712 ], "deps": [ "consult" ], - "commit": "93f37e139405368d44d7cb831d343045b63dfa96", - "sha256": "03znj61qwh2is07jgprkw79il72qrvk5pjd9l4p23zrcg7l05lc2" + "commit": "eddbc7ba70439881e4781fa73fb0fb240e02fd3b", + "sha256": "0w7c41fz6mm0i8annxr68icrcdmindafkvd3fnnnyw3ncm8vsygb" }, "stable": { "version": [ + 1, 0, - 8, - 1 + 0 ], "deps": [ "consult" ], - "commit": "ba68d052d9479aeaa5dda15a57a2c070df7d9bca", - "sha256": "02igkdhqpl3zylh5v3aw0a93krr2rzdy5kb6azvf4s461jpmwgqv" + "commit": "eddbc7ba70439881e4781fa73fb0fb240e02fd3b", + "sha256": "0w7c41fz6mm0i8annxr68icrcdmindafkvd3fnnnyw3ncm8vsygb" } }, { @@ -18872,15 +18872,15 @@ "repo": "eki3z/consult-todo", "unstable": { "version": [ - 20250131, - 1447 + 20250201, + 1342 ], "deps": [ "consult", "hl-todo" ], - "commit": "f661eed4d5eac1f08db499e23a3dd15c15f0dd62", - "sha256": "1l1qm6zi8cas1wjqpaf2qqnrq59mrxmxr0qxyqfywl730a6yw0l3" + "commit": "b50df0da6243d7a91016e1b8c9a208fb167695be", + "sha256": "1cj25n54dglj8frfb23w576yfn7rcv149xf2anjyv7w45mfgspnn" }, "stable": { "version": [ @@ -19103,8 +19103,8 @@ "repo": "chep/copilot-chat.el", "unstable": { "version": [ - 20250129, - 811 + 20250205, + 1106 ], "deps": [ "chatgpt-shell", @@ -19115,8 +19115,8 @@ "shell-maker", "transient" ], - "commit": "b7648e2f117403f2e12e00e0232a0953799cea24", - "sha256": "063lhwm84p06g47c4908imy1r9myjpdx9hzxra8ycj7vigrfpwkj" + "commit": "a3a9f13506f6bb8105c625bbd731e6c0e741eec2", + "sha256": "0igjhnz9447c0x3431l1f5k142v3bqcm5wzjppbhdx7gqf9i1cs6" }, "stable": { "version": [ @@ -20653,11 +20653,11 @@ "repo": "crystal-lang-tools/emacs-crystal-mode", "unstable": { "version": [ - 20231205, - 1943 + 20250203, + 1157 ], - "commit": "ea89b108fa4222df94ffb99e6e7eaec5d7aa4fea", - "sha256": "0h7nj0lwb90va0z1j3p2i14vggkn4j2hmnf3jknig5dfn39wwbpm" + "commit": "39993f821e6d7ca1da125d0ceba6218c3ca4c5b7", + "sha256": "09097r4l4gzasg7zcamdbmd5rgmw1piz5z9wfhmvfxp65gwv25cl" }, "stable": { "version": [ @@ -20875,15 +20875,15 @@ "repo": "neeasade/ct.el", "unstable": { "version": [ - 20250129, - 153 + 20250205, + 1258 ], "deps": [ "dash", "hsluv" ], - "commit": "87276ddb75663a20d629ace5e321f614583e8f71", - "sha256": "1iq4rvfgx83vvvmildfj76sjih3grrnm7l3qmr0gmp7cx62xfdvi" + "commit": "5dce87360e5a8c22e2ffde970ff4189cd7fa4138", + "sha256": "0czzbbnwmbpzcrf6m0wcqxj3nsc7vk5bb9x157gcwrip68g7gzyn" } }, { @@ -21835,8 +21835,8 @@ "repo": "emacs-lsp/dap-mode", "unstable": { "version": [ - 20241216, - 1315 + 20250131, + 1624 ], "deps": [ "bui", @@ -21849,8 +21849,8 @@ "posframe", "s" ], - "commit": "ffb795761273e1bdc3d0cd1ebdd43e36b7c08921", - "sha256": "1vzb3hhdlicy087faqlwm6r9kpmiypb9pacmyad7wk4i0q60ywdd" + "commit": "2a5524bef1528945311dd8557b18c53d6e95fa3d", + "sha256": "1xsl621bax8g4aq4m890b31f4mpsh9nywxazqxnlki52mv6a4m5d" }, "stable": { "version": [ @@ -22387,26 +22387,26 @@ "repo": "doublep/datetime", "unstable": { "version": [ - 20240418, - 1601 + 20250203, + 2047 ], "deps": [ "extmap" ], - "commit": "38f0e180ae36257d77ce9612dfca8404f39ddcfc", - "sha256": "114x0ldzczafil5f33g8m1clibakmy2kwmmwbs49ryn35hh60fg7" + "commit": "2601120d4d2857cdbad1cf8d4b84d77308920835", + "sha256": "0g5jplmhrm294zhwf8s3inhrqhnvlc2smhpp7qnqp926rjn48lmk" }, "stable": { "version": [ 0, 10, - 1 + 2 ], "deps": [ "extmap" ], - "commit": "41d0221ee2fc7b9f9c57cf930f0011edf977a2a8", - "sha256": "13fvpp9aashmlv9pc12fvf540f9s36wrcfskcx2hcm6r3kv91d54" + "commit": "b8e5fc2b7338f26ee816a3b03322c585dbd3b686", + "sha256": "1cihsn81fkp0bf62358kssk77wzlk3kngz1a1bfvpp2szpvgwbc7" } }, { @@ -23241,15 +23241,15 @@ "repo": "pprevos/denote-explore", "unstable": { "version": [ - 20250126, - 525 + 20250202, + 924 ], "deps": [ "dash", "denote" ], - "commit": "0fb807bd22a2cd031ef74c14904d760181749b96", - "sha256": "0ifpqwydjsb7cp1nmm6m73waamv407x02zbrg9ghk6g3gc70lasl" + "commit": "4dbc3441c9d6ae340aabc1e80ae9c86ca781d72e", + "sha256": "0jmldsizqiq5ldwk16j98dmyvn65wi6c37gkvljb40aj5gpbm83l" }, "stable": { "version": [ @@ -23759,11 +23759,11 @@ "repo": "ideasman42/emacs-diff-ansi", "unstable": { "version": [ - 20241208, - 511 + 20250208, + 2317 ], - "commit": "13f5938a087362776dd0e883734d48c610a0b379", - "sha256": "052gil83w9pylf63sqq2c3984gwy8jbr8a78ipyflwyas1l3yn80" + "commit": "463efc61b44bb34f34e44a1cb028f5f69ac1bed4", + "sha256": "1sbcmpgvd1c1qvv8iq7w2mvk00ndx2dzhsmkwmcfiwk75bb17hnv" } }, { @@ -25428,14 +25428,14 @@ "repo": "alexluigit/dirvish", "unstable": { "version": [ - 20250117, - 1539 + 20250209, + 1504 ], "deps": [ "transient" ], - "commit": "1bc2f93a9dc12a5a5a72b13fbb3ed9374a3b2ab7", - "sha256": "1hw9vhja8bhzb0j7qyv6r4wy1gq3km1ya4jm7mggm1lfjq0zhzmd" + "commit": "2eb0118681dd65836bfa7e3442f5ed152615b533", + "sha256": "0c207mz2naqhdcl93wjy958akv2yqlmxqripgvqlawzbaqaf5qjy" }, "stable": { "version": [ @@ -26149,11 +26149,11 @@ "repo": "ideasman42/emacs-doc-show-inline", "unstable": { "version": [ - 20241208, - 505 + 20250209, + 607 ], - "commit": "cc9d6b1d0dc0776331daa2d612c17473f1ddd337", - "sha256": "0hswfj09mrcjnl8f3px0glpjghl49z0g37i3s2kl428xaixdnfgf" + "commit": "2c23259d400d618018952581a22db5bdbac4768d", + "sha256": "1pgqx1wykq57p3gf3j51cx17cxwj1pxv18n3qbrigi0hdqmldh8s" } }, { @@ -27611,11 +27611,11 @@ "repo": "dylan-lang/dylan-emacs-support", "unstable": { "version": [ - 20241102, - 2315 + 20250209, + 721 ], - "commit": "21e5953e2b1832f6a2c72012bd13795dc1ede52f", - "sha256": "01jkk7gq6pqls6yvc6j77zmnppm2qpx876s596y7vz1q1c5i2fii" + "commit": "8cf635979a2233e14a2a72071d44ddb47109edef", + "sha256": "0jghp6b8n27dw62qzqz6afrny2a5gyj7ml2r9z0cazgxx4gbz34j" }, "stable": { "version": [ @@ -28348,14 +28348,14 @@ "repo": "jamescherti/easysession.el", "unstable": { "version": [ - 20250131, - 1341 + 20250207, + 127 ], "deps": [ "f" ], - "commit": "5325fd02e391504fc6edd93152150261718f22f1", - "sha256": "08vxmk0c6bkkj6393pijqwzbfahwmr99p4ccgdf8lwaa2nvljb01" + "commit": "bf955796138c155e7ecf62acbde465c3908f1691", + "sha256": "038gm369i790c8qyfifs5db2cm1g8vvxglbck16bxvmwvk2w4f6v" }, "stable": { "version": [ @@ -31165,8 +31165,8 @@ "repo": "s-kostyaev/elisa", "unstable": { "version": [ - 20250128, - 736 + 20250202, + 2040 ], "deps": [ "async", @@ -31174,14 +31174,14 @@ "llm", "plz" ], - "commit": "bfd4f2a2dab054adc788d82447432e059fbd0f8c", - "sha256": "08qsd0h6xs1j04mfkgjgwxgq2vlyn6jqcr0h59z69cmhps417jvp" + "commit": "b655b59d371639d357dcabe48f1c2cd1694ee8de", + "sha256": "1jwv4blhf9021758g212q8cf68a4hipj8nqgad00f54dxrr4s2h5" }, "stable": { "version": [ 1, 1, - 5 + 7 ], "deps": [ "async", @@ -31189,8 +31189,8 @@ "llm", "plz" ], - "commit": "bfd4f2a2dab054adc788d82447432e059fbd0f8c", - "sha256": "08qsd0h6xs1j04mfkgjgwxgq2vlyn6jqcr0h59z69cmhps417jvp" + "commit": "b655b59d371639d357dcabe48f1c2cd1694ee8de", + "sha256": "1jwv4blhf9021758g212q8cf68a4hipj8nqgad00f54dxrr4s2h5" } }, { @@ -31515,8 +31515,8 @@ "repo": "s-kostyaev/ellama", "unstable": { "version": [ - 20250126, - 2045 + 20250209, + 1407 ], "deps": [ "compat", @@ -31524,14 +31524,14 @@ "spinner", "transient" ], - "commit": "77ad1e2c38fbd205407eea48a4ccb56a8a2e18e3", - "sha256": "0qkdhgzlwav17jn46vsd001sj1h452vf6acng2nw0295zl8hdjsm" + "commit": "e037bbd213a0441c1aa37a72a4c9cb7039df38ef", + "sha256": "01bzcd8sk26rkz3aj9v1dxp9p0wjvivvl9xxxj0hlzar79w5ayki" }, "stable": { "version": [ 0, 13, - 4 + 9 ], "deps": [ "compat", @@ -31539,8 +31539,8 @@ "spinner", "transient" ], - "commit": "77ad1e2c38fbd205407eea48a4ccb56a8a2e18e3", - "sha256": "0qkdhgzlwav17jn46vsd001sj1h452vf6acng2nw0295zl8hdjsm" + "commit": "e037bbd213a0441c1aa37a72a4c9cb7039df38ef", + "sha256": "01bzcd8sk26rkz3aj9v1dxp9p0wjvivvl9xxxj0hlzar79w5ayki" } }, { @@ -32547,16 +32547,16 @@ "repo": "oantolin/embark", "unstable": { "version": [ - 20250127, - 1315 + 20250201, + 501 ], "deps": [ "compat", "consult", "embark" ], - "commit": "755cb49b59801ff420193cc0e3b1a7aa12bf22e3", - "sha256": "0n8khkgk3mnm48b9426radzmrgda0k6zcc0c0ws8yl2gpnkblkxn" + "commit": "d5df0eff182b014ab49328a4dbb1d69eb7faafbd", + "sha256": "0yirl32za3lx1spppckcdwx53hbyyrnnf8ry5wd2kx75j3nbirba" }, "stable": { "version": [ @@ -32756,16 +32756,16 @@ "url": "https://git.savannah.gnu.org/git/emms.git", "unstable": { "version": [ - 20250120, - 1913 + 20250204, + 2022 ], "deps": [ "cl-lib", "nadvice", "seq" ], - "commit": "6fe8f7a69807326255e514b024315e8d9f206a43", - "sha256": "09v4mhdc2zaxqlhrjz7587vglzva8lv5jv6wkbyi1if5vgj6ghrh" + "commit": "5e9922f2a45fc4b869bd4947540903ea15acfeb2", + "sha256": "004riskycjkj9c305yf0rkfkkbl95rwsxp6jpcb2ivaw5kn2ai5p" }, "stable": { "version": [ @@ -33670,14 +33670,14 @@ }, { "ename": "epkg", - "commit": "a74629656e9a23133219a0bd805982f1497b35d7", - "sha256": "0k9gx778ladcybyspfhbbzyzas1k6cad0f9sr9chbag01cn1jj1p", + "commit": "822cd8b6f44d8404c7f50b547f35f84d95b4b07e", + "sha256": "1bm8mxc4kwmrg8g38c4fyvmf4i50ky3xdv81dlxbpvqkyw9pda47", "fetcher": "github", "repo": "emacscollective/epkg", "unstable": { "version": [ - 20250101, - 1751 + 20250205, + 1933 ], "deps": [ "closql", @@ -33685,8 +33685,8 @@ "emacsql", "llama" ], - "commit": "d28ce2f7d57c2f082506d25e653b68673daf33c2", - "sha256": "0zdlymx44jgrzm68cnh636mpdazihqiakf5m3v1c2rhvh6cb6yg6" + "commit": "dad7206206f9d329695b5559a601591a2037709f", + "sha256": "18n5w378mx863dbsg7p64n613bp36swdmjl5ff3jdfrjirx78vr6" }, "stable": { "version": [ @@ -34403,10 +34403,10 @@ "version": [ 27, 2, - 1 + 2 ], - "commit": "4726e39654c7a7412f7c2f66c7eb567c978a9947", - "sha256": "0czalhx15g0sg5468pn7hhm2fqpcb8whd488d64vcywqddlgimfz" + "commit": "8a4e04e9c48d94ef1216b0426fa71ccfdd78f7d3", + "sha256": "0y287gvbl0zw7i2j27pp0lkcn8q408qv3fmxw669wm14q0q83yak" } }, { @@ -36113,20 +36113,20 @@ "repo": "mekeor/evenok", "unstable": { "version": [ - 20250126, - 2129 + 20250204, + 2341 ], - "commit": "591d06ab2d5bb7d145b2fbde182041a7fabd5c3a", - "sha256": "1cbyxb7y1s2bp9l9b1v1xa4n6xrrrrv63g8bapr36b2i9kpxjih5" + "commit": "473aa509a3d4135d5b2bebe978476a3d96779072", + "sha256": "0b58gsz32r3srbcr5jjqm2b9bhdnvfqy8xzgglvqjiy5cs489vpb" }, "stable": { "version": [ 0, - 11, - 1 + 12, + 0 ], - "commit": "1cdd8f8d09473bc8fb1c5157bd3a2129883701bc", - "sha256": "1qnncjdd2jc65zz2slm8pjgg64nqyvc9v8p6m0zl15xhh7kdavi3" + "commit": "d6600fc808e54dce44d3f8eb2b4e56a60c946c90", + "sha256": "0q587f56i8wdaj53dx9vyd0bd00skxjsascqirx7j1fc56bcfbrh" } }, { @@ -36137,11 +36137,11 @@ "repo": "beacoder/everlasting-scratch", "unstable": { "version": [ - 20240612, - 814 + 20250206, + 628 ], - "commit": "fa1b2af29e8bb463400bbea912ab4dfaa2b0c890", - "sha256": "10zckrrz0mh6alrmav8lbzyz4imh7966m7524jzm2576pn6mxf04" + "commit": "a990e8d2261e5ac109729eb8c2c8e1947e45c8ed", + "sha256": "0lhyaqwxwm54rw9lvhk6vqpnz4350dx45gxc4qgm0g6qgdzn78dk" }, "stable": { "version": [ @@ -39175,19 +39175,19 @@ "repo": "WJCFerguson/emacs-faff-theme", "unstable": { "version": [ - 20240619, - 1314 + 20250206, + 1617 ], - "commit": "763d524b5dd6273843256810e8531954335583bd", - "sha256": "117hbybdlcvgmisiagf247myww5b2q38yhi47fmlf9dqmpzfw4fz" + "commit": "b2e7072cd3bcfa47a55a1d45579373c988c1f8a4", + "sha256": "1i2qncwsd2i3zba673sa0vaqxq2mswflqwldjxxca7720yf1k6ng" }, "stable": { "version": [ 3, - 5 + 7 ], - "commit": "763d524b5dd6273843256810e8531954335583bd", - "sha256": "117hbybdlcvgmisiagf247myww5b2q38yhi47fmlf9dqmpzfw4fz" + "commit": "1ef3ec33c7605895d1fdd4755640ce929a778c81", + "sha256": "12y4l4q7kmknqckcc4j6rj681271q6agnd85zv4x885pizdy49fm" } }, { @@ -41223,11 +41223,11 @@ "repo": "flycheck/flycheck", "unstable": { "version": [ - 20250109, - 714 + 20250201, + 759 ], - "commit": "87ad201889b2055d0c4b0839d2f8b80eeccae59e", - "sha256": "0xv1vpyvsic51ndpqq2aqvr95hfvdwdfc22az9j8v2mdjwh3y1n7" + "commit": "af1e8ca7257298dd6c51ed4424c09283b4fedb7a", + "sha256": "1r5w7b4v4vk0b5dw07yz9mq27ngz4m55yl4a7ih7s252a9kca4dk" }, "stable": { "version": [ @@ -46279,14 +46279,14 @@ }, { "ename": "forge", - "commit": "5fad9ce9c4e730fd6073d479ce0d3aca9b2f18b9", - "sha256": "024yjicddxjkgqwia82rvi7zfnbbwjyb0ba7slri9fjhxkgcag71", + "commit": "37e21947bfaa74a6e941e886b302a87fb45b3fb3", + "sha256": "12h6f35wbrfcy2n9p4llwlwqv5b0p5lckci0zag2ig6f69f1p4ik", "fetcher": "github", "repo": "magit/forge", "unstable": { "version": [ - 20250129, - 2012 + 20250205, + 1920 ], "deps": [ "closql", @@ -46301,30 +46301,30 @@ "transient", "yaml" ], - "commit": "0e1579b49fd65bd2bba34487c03cec1dd977313d", - "sha256": "1ywkxx9k5m6bwfsn37v1cm6qqggsw7x6y3a4sk7sf5kaa44lqivc" + "commit": "add7868aaf7b8538f086d3a007c412419d08ead9", + "sha256": "0q0w6jv5aq5fc9ii710z32961vg1rmsrr750p9gg9qvqk82csm3g" }, "stable": { "version": [ 0, 4, - 6 + 7 ], "deps": [ "closql", "compat", - "dash", "emacsql", "ghub", "let-alist", + "llama", "magit", "markdown-mode", "seq", "transient", "yaml" ], - "commit": "0c9060626200902f7b0078a85566ef0eea8cc0b6", - "sha256": "0mh542c9hy401jcvammd89v9ja3zxc16k7zhfflq67x90987mwhp" + "commit": "33e240d360b8e3950e9c8b7024e3e763465c0c13", + "sha256": "1576ic28h5nanab092r2w7id66jv2wf3vw8fkhsbvm6fi4l6g4vg" } }, { @@ -47174,8 +47174,8 @@ "repo": "FStarLang/fstar-mode.el", "unstable": { "version": [ - 20240312, - 1632 + 20250201, + 28 ], "deps": [ "company", @@ -47185,8 +47185,8 @@ "quick-peek", "yasnippet" ], - "commit": "6e5d3ea858f3c8a9d01161d9089909c2b22fdfca", - "sha256": "1z1mcmmrfx1nx3d3374wb7qykzdc3qh9ssgs2wz7b5vnv9cbdfn6" + "commit": "36ffb46259a7bb67e5bfac977aae57d52a4915de", + "sha256": "1f2s5nm4rr7v793fa46cqkmijb9fzn0fxn3vywj83bsva3hqsf9z" }, "stable": { "version": [ @@ -47655,11 +47655,11 @@ "repo": "ShiroTakeda/gams-mode", "unstable": { "version": [ - 20241024, - 448 + 20250127, + 1458 ], - "commit": "0bbce5fd884960f7d797dbae4d2b27b0c6dc2241", - "sha256": "09xh3ymx7agh4vg46dkmyzhkh2ck9a464gg57r3vf4qn343jbv73" + "commit": "638656ed0c3a87c68d4afefe7686fa061bbcc0cf", + "sha256": "1kvl694h81f0dc97y9vgl8w1fspz6rivis8b6blcinnqr3622r1y" }, "stable": { "version": [ @@ -48735,14 +48735,14 @@ }, { "ename": "ghub", - "commit": "5fad9ce9c4e730fd6073d479ce0d3aca9b2f18b9", - "sha256": "1kdgwcjzrimfn44yf98pk6jy1cr95mh91mi977yfjhwvk7dhk5gr", + "commit": "8ab3f3fe146ef694110eeeae9b478ca1942cefa9", + "sha256": "1w6a40ryg3xiq0bh5hpkvp59hmkrnzbg7acpwxia2sjwzris7v2p", "fetcher": "github", "repo": "magit/ghub", "unstable": { "version": [ - 20250123, - 1204 + 20250204, + 1422 ], "deps": [ "compat", @@ -48750,22 +48750,23 @@ "llama", "treepy" ], - "commit": "02a83b5560114a18e7c3f79c7f3b356c11d46ee7", - "sha256": "1x1k3lyq63gynalx7parmz5x4qk8ls9gywwlpb1jz764kwz34nr8" + "commit": "077e339bd714a0b8cafcb4ce2b9ec684b0509022", + "sha256": "0fh6yyj0ya77sg65q8akqllvyracwgpp5cx8dr6pv5fp860c2w0d" }, "stable": { "version": [ 4, 2, - 0 + 1 ], "deps": [ "compat", "let-alist", + "llama", "treepy" ], - "commit": "97edaf450ef74f40e6c0bd6a35ebd3fcb710ca4d", - "sha256": "1dlvhpwz4i2z70xh4rzkq8d1wfhbc6n0hp17kdwsy5x5d891dczi" + "commit": "c5003950b5efd065a20983546a12ffcd079b4a93", + "sha256": "05jmljhf9g191rsjkrsirjr7qkm02yfprd43dq79nbflz7z615ss" } }, { @@ -50332,11 +50333,11 @@ "repo": "gleam-lang/gleam-mode", "unstable": { "version": [ - 20240819, - 1355 + 20250209, + 426 ], - "commit": "8d2f1cf6d4b7850bb8fa66cf26b7365f0ad1e925", - "sha256": "0cra6mivfgzhizb1nv448jkr6js39blb74hfyckg3l2yf0fdhjxj" + "commit": "8656c4080dd2bb7dd6d6167953d6463d090509b0", + "sha256": "09649yp39qdipvkw430mcilc9lpdg1bbbjgjgr4g9w5q9ma277fj" } }, { @@ -52330,15 +52331,15 @@ "repo": "karthink/gptel", "unstable": { "version": [ - 20250131, - 803 + 20250209, + 344 ], "deps": [ "compat", "transient" ], - "commit": "e1c01f86e602be606915ce18440fb775f8384e77", - "sha256": "1sg3vn4j03h7m7djdfxkw30d1mfj4pbr5a4a3wj5as312i712dj8" + "commit": "2dd3e317bf4af82cddfa1d1b127c04c17589c878", + "sha256": "13c88f2j03fdwhyl19j9r6lvgczb31v0q0nn79vhhsxw9bp22xzh" }, "stable": { "version": [ @@ -54227,11 +54228,11 @@ "repo": "haskell/haskell-mode", "unstable": { "version": [ - 20250116, - 1954 + 20250205, + 1440 ], - "commit": "4cec530008ef4054826eb1b55d6b26ae8e2807c0", - "sha256": "1h8sba2jyypd9g4wc84c8mmdbx2b0gcvzpxbxvjj12i427qs1fhw" + "commit": "495fb9688e12ed1bf945b4876f124ee38b84c039", + "sha256": "15yqaq6jblrj47h1fj11lmz05glgg40r5am6ynggwjipghchl817" }, "stable": { "version": [ @@ -54546,15 +54547,15 @@ "repo": "emacs-helm/helm", "unstable": { "version": [ - 20250130, - 1100 + 20250208, + 1033 ], "deps": [ "helm-core", "wfnames" ], - "commit": "9a75f112a1b8a1853bdd01f351595d8981547d26", - "sha256": "12y8hal4s4i5x5jhay9xmynq56s0cqibpygv2nsj9n0388shhdp1" + "commit": "80d5c9e68f7ce162967f0818ea8c9abb7d24594f", + "sha256": "1s4svjfw1x302s0hybby4y0rspdxx92drh8l7y1zhygdzsjb7bj5" }, "stable": { "version": [ @@ -55435,14 +55436,14 @@ "repo": "emacs-helm/helm", "unstable": { "version": [ - 20250128, - 1528 + 20250203, + 533 ], "deps": [ "async" ], - "commit": "474bb0cd74fa73076371f3b91f0d122c1d2d459e", - "sha256": "1vnwq84hil385xzswfnqb5i7ng301wmx9a37jp56bdlyyzgkahlh" + "commit": "23fd81de2ad895dec73b8f6a332483b64c4c6396", + "sha256": "1c23k43kgzavkl66bjq0l8sjpdyf29b4wh31a9dqk8dkxg99i4bs" }, "stable": { "version": [ @@ -55569,14 +55570,14 @@ "repo": "emacs-helm/helm-descbinds", "unstable": { "version": [ - 20240216, - 1154 + 20250204, + 451 ], "deps": [ "helm" ], - "commit": "ca03f02da4e54a1d0a2d5498b86e1639aa808d8c", - "sha256": "0rl0935pni1vi5v9wd7w19i214iiysxixcjkdvqk1plsaqnb3dag" + "commit": "c12bc85ef3ce342fe1c78cdd86117c05d5310789", + "sha256": "0dfm8a8dc3a75pizkjl6304aqx2m9yaqcjk8j0d802ad0zk31g64" }, "stable": { "version": [ @@ -57828,16 +57829,16 @@ "repo": "bbatsov/helm-projectile", "unstable": { "version": [ - 20250127, - 1601 + 20250207, + 2201 ], "deps": [ "cl-lib", "helm", "projectile" ], - "commit": "52ee6ad725d6a82adccb64849f5b7aa2c3aa769c", - "sha256": "0cs5wigpnqw3kn718xvkcc7f0zqdd9pijkiv46pi3c832zxa9r9w" + "commit": "8bfd2c58085036dd5dcdffa8283e6fcdc689a358", + "sha256": "08pdfkm43sqiyfsmqz0q617qrklw7qlag1lq05pipg501zh4p1k3" }, "stable": { "version": [ @@ -59240,8 +59241,8 @@ "repo": "Wilfred/helpful", "unstable": { "version": [ - 20240613, - 1523 + 20250131, + 1645 ], "deps": [ "dash", @@ -59249,8 +59250,8 @@ "f", "s" ], - "commit": "4ba24cac9fb14d5fdc32582cd947572040e82b2c", - "sha256": "1xhhm7avgv9iqnc9pdx8dzcx8p5xaqk81j5zp96qbv035mqkpzrx" + "commit": "34328c639ed7aad371a3f57209acad2a5bb66401", + "sha256": "127q15nnqzwa5a6rwlcg7srcrqdibs3ivzvdf7cw51sxgr11cwzb" }, "stable": { "version": [ @@ -60799,14 +60800,14 @@ "repo": "kaorahi/howm", "unstable": { "version": [ - 20250130, - 1113 + 20250202, + 1244 ], "deps": [ "cl-lib" ], - "commit": "7243d124161ad312a6dd115d7b8195593c9bf24f", - "sha256": "1q1srqb852537l4x3acch9k8d5mgmzm35k5jy1kbhjmvmr2kmi09" + "commit": "83e41a06994b92598eeefe78a23ba794b5474924", + "sha256": "1k3nldh00z1vzjrr8x733mfj1zx6n880gzm997cgrrr10vwap6zr" }, "stable": { "version": [ @@ -61426,11 +61427,11 @@ "url": "https://git.savannah.gnu.org/git/hyperbole.git", "unstable": { "version": [ - 20250130, - 1454 + 20250208, + 2159 ], - "commit": "7a7f039b696e428554babe369691f98399f5176a", - "sha256": "0z0yjg2gi0gh7kas6lg3qvaawjdbqqc1l5x28m73js7hyhb1pd50" + "commit": "c3ff71d9ce31a333470ab8d73fe13ab84ad8af66", + "sha256": "1b199h2j0yl6a30dyakqs97723wskxzwq2qvjnidgv2s713f63jf" }, "stable": { "version": [ @@ -65029,19 +65030,19 @@ "repo": "doublep/iter2", "unstable": { "version": [ - 20250110, - 2005 + 20250209, + 1516 ], - "commit": "727cdbc0b8a3c7e59d00c7e2ddd61694110be943", - "sha256": "05acp6rm98jsxf5j426xd22f4p2mrwipa5wdf9pv9mbnig6l9mjg" + "commit": "632232b5ee627bf5d299db0b7714b3b687a0124c", + "sha256": "176mj7f6wng4n62p39l56ni14mapr7a58nsaczv91xpry8bk1wsx" }, "stable": { "version": [ 2, - 0 + 1 ], - "commit": "8b3fb215d22161f303ecd6c96c0693b96bda3c4c", - "sha256": "17rraqidypxypmvqrh8k0ja57is178q72p6fxj3wlp7mbld1hcp3" + "commit": "4b5b33244a029a81679951bcf8bcda71012ed1c8", + "sha256": "09wypwp0fcj5m3gmh0ipkv6fqlad20iyb2g3952iz5yjdhapva9k" } }, { @@ -66845,14 +66846,14 @@ "repo": "minad/jinx", "unstable": { "version": [ - 20250128, - 707 + 20250207, + 1401 ], "deps": [ "compat" ], - "commit": "2144d03f7bcc3f461b4e67f913dfc0055e4ad7e2", - "sha256": "1cxnxwbxfq29793r6f8pvvw2mb9mj7pa7g7z5k46abplkq65ds3g" + "commit": "e1a5a8921e42cd4ae7cb0dba95fe968d04359ee0", + "sha256": "05n1354w733170wgv2m2r3516a7cax5k0k2z9gc66z16pmacwici" }, "stable": { "version": [ @@ -68785,15 +68786,15 @@ "repo": "ogdenwebb/emacs-kaolin-themes", "unstable": { "version": [ - 20250122, - 1521 + 20250207, + 1100 ], "deps": [ "autothemer", "cl-lib" ], - "commit": "0411236811220cad845b8f80ebe73e4a0317af05", - "sha256": "1f6wd5vm9p9nwa8km72g8c4g5q2cz915qxrjyjrjhgpp32pfq33d" + "commit": "95ef38ab680fecddd8141702b533f9a0a1577797", + "sha256": "0cqa704hbrfvqp1qf37w5vrpycn4ch8d0q5vvx5wgp6i4kv702fp" }, "stable": { "version": [ @@ -69537,28 +69538,28 @@ "repo": "khoj-ai/khoj", "unstable": { "version": [ - 20250130, - 1948 + 20250207, + 50 ], "deps": [ "dash", "transient" ], - "commit": "b111a9d6c6e1c2bf3564fe13747999ff88725b3e", - "sha256": "02f8pjav9gn3zipgjxw5j1ix47xm8qxw3lq4nl4g4dcndkx450a9" + "commit": "ff6cb80c84a690cc589d9f16c1fb9fe2ad22bf7d", + "sha256": "1zdfg22n8b7s6401hfr7aww5kqiiadrvplgf7qbya1s723y8vmxg" }, "stable": { "version": [ 1, - 35, - 3 + 36, + 4 ], "deps": [ "dash", "transient" ], - "commit": "b111a9d6c6e1c2bf3564fe13747999ff88725b3e", - "sha256": "02f8pjav9gn3zipgjxw5j1ix47xm8qxw3lq4nl4g4dcndkx450a9" + "commit": "ff6cb80c84a690cc589d9f16c1fb9fe2ad22bf7d", + "sha256": "1zdfg22n8b7s6401hfr7aww5kqiiadrvplgf7qbya1s723y8vmxg" } }, { @@ -69807,14 +69808,14 @@ "repo": "benjaminor/kkp", "unstable": { "version": [ - 20240227, - 1145 + 20250206, + 2000 ], "deps": [ "compat" ], - "commit": "ed9214329f11b095fc7bad06feb329b9f232258d", - "sha256": "1l9fcz0hj0z88rzamwwrslzkm8gpbpqvvghr3bpxjln8i0qgkasc" + "commit": "ad23d961c3a5dce83b1c9a6b4c65b48809c7af9a", + "sha256": "1yx2bambn4m16awndpqh0qp9hqc2mkawzc34sx07cragk1qhz8l2" } }, { @@ -72375,11 +72376,11 @@ "repo": "martianh/lingva.el", "unstable": { "version": [ - 20250130, - 1849 + 20250208, + 753 ], - "commit": "08dd55ae5c220bd2afc918ee8ef42c9387c9575c", - "sha256": "0q65a10f3kyyq8yk7mxj92rghdcdcacnj4bzc3hc137n654r5dfx" + "commit": "de11bdbd90c73106ce272e60ac030d2a9a2d5f5b", + "sha256": "0j534kxn00iyfvv8lghf3dzmsmhqw7svfxam4yyw3jrgbj4kjgas" } }, { @@ -73225,32 +73226,32 @@ }, { "ename": "llama", - "commit": "572e92d1737bf72a1b8d399ef847d9c34862a680", - "sha256": "0gw02dcpwm1v4qz123d7p1sifcjgvg1wf8zw6si91hslrskkicw0", + "commit": "8ab3f3fe146ef694110eeeae9b478ca1942cefa9", + "sha256": "1hmgmx332wcngg0lirbxzz0d7dzv64s7069w5g4xb5xw4iiaa5da", "fetcher": "github", "repo": "tarsius/llama", "unstable": { "version": [ - 20250120, - 2046 + 20250201, + 1300 ], "deps": [ "compat" ], - "commit": "0b6d79826f2cdc78fd7a0dcc4e59a4baca8c025b", - "sha256": "1zb3iqb1nks2y9i1033x4pa0kb7nb4jqwrcrkqrsq3w612213hkd" + "commit": "9802c215a3eea748d9d7f81a1465850388006897", + "sha256": "0f2v1fw5iahlh0ypbwxfpav48h43h0zqqmicgs2hg7r251ss2j8j" }, "stable": { "version": [ 0, - 5, + 6, 0 ], "deps": [ "compat" ], - "commit": "0b6d79826f2cdc78fd7a0dcc4e59a4baca8c025b", - "sha256": "1zb3iqb1nks2y9i1033x4pa0kb7nb4jqwrcrkqrsq3w612213hkd" + "commit": "9802c215a3eea748d9d7f81a1465850388006897", + "sha256": "0f2v1fw5iahlh0ypbwxfpav48h43h0zqqmicgs2hg7r251ss2j8j" } }, { @@ -73696,16 +73697,16 @@ "repo": "doublep/logview", "unstable": { "version": [ - 20241225, - 1410 + 20250203, + 1956 ], "deps": [ "compat", "datetime", "extmap" ], - "commit": "034c240c816188bf8be7441c9b0925abb92e861c", - "sha256": "12sh9mrpgff4sm1yr3zc2crpwiq3zrj3md0hd0mr69gdkq07xfw3" + "commit": "cac74558ed8f363f222d2e0d52eab5562436347a", + "sha256": "0kw8asfsv3pbjkzi55skibp94hrji80hxrankgnkrsl7dzq556qm" }, "stable": { "version": [ @@ -74376,14 +74377,14 @@ "repo": "emacs-languagetool/lsp-ltex", "unstable": { "version": [ - 20250101, - 852 + 20250131, + 1652 ], "deps": [ "lsp-mode" ], - "commit": "98435127e24719a398c41ebaf14d26928de4632a", - "sha256": "0jwn3869dwjw2nyfmhg6dkaz4fslwmb2k2h54gpiwzwv5a1pg03j" + "commit": "fc394cf8779e86e2d14c7ed209dafe225be90a6f", + "sha256": "1vhd9pm4445nf068g600dlnpnriq0a3ks69r5xj3wdic5l34yfvi" }, "stable": { "version": [ @@ -74452,8 +74453,8 @@ "repo": "emacs-lsp/lsp-mode", "unstable": { "version": [ - 20250129, - 2023 + 20250203, + 2137 ], "deps": [ "dash", @@ -74464,8 +74465,8 @@ "markdown-mode", "spinner" ], - "commit": "9a218948a4febea66c2609654a1b89dfd0e2b7d4", - "sha256": "0vyphmlld3jrxzqwvwcfxwhr4ni3i0jyiqylznn2m9ivlhnni9mh" + "commit": "230608ad65809806481adab40ecf41d3780e7b8d", + "sha256": "1196swvh0z3qw1iv7jgpjmwp72nnz6q6hpsy4pjldj5bjxx1lfac" }, "stable": { "version": [ @@ -75279,28 +75280,28 @@ "repo": "emacsorphanage/macrostep", "unstable": { "version": [ - 20241224, - 1752 + 20250202, + 2205 ], "deps": [ "cl-lib", "compat" ], - "commit": "02967fef0bcf114ab6439fdfb06e4af571d68799", - "sha256": "1c4lvipi1bjn56m4m69aq7x7agqzal3x04wwvnmibpgpbjkm8wnn" + "commit": "d0928626b4711dcf9f8f90439d23701118724199", + "sha256": "08l6sg7cj5hqp7j1y9w53k3m3fmzljb2d4rvjsfq4p63lgaam2qd" }, "stable": { "version": [ 0, 9, - 4 + 5 ], "deps": [ "cl-lib", "compat" ], - "commit": "31d4adcca4f08cfd7a45f85e691aaa7a9316b355", - "sha256": "0f0rjpjwzpw6hxqbh8ghr7838slf7w22z7szy68bbg3bbnrjjlai" + "commit": "8e8487712d150178be7297604d0f47fd036a6d8d", + "sha256": "1sdi8kmcvf39p1m6bahnzi3h0djg23lppb2hf1y1snihcf3ibwi9" } }, { @@ -75441,36 +75442,36 @@ "repo": "magit/magit", "unstable": { "version": [ - 20250131, - 1314 + 20250208, + 1839 ], "deps": [ "compat", - "dash", + "llama", "magit-section", "seq", "transient", "with-editor" ], - "commit": "c06dd3ff49b9a6ff76f56addd3ff248003a3affd", - "sha256": "0ackg09h7wrgzpfgrw5mhk8jcbl5bjsxwgdx477p515h8nn8qba8" + "commit": "085baa2ac96df90bdb2a1bedd3598df19919d731", + "sha256": "0w6phljp6l4fn7sa17n6jhfq8r0q03lv2xl5pqyrbdg8q373v1d7" }, "stable": { "version": [ 4, - 2, + 3, 0 ], "deps": [ "compat", - "dash", + "llama", "magit-section", "seq", "transient", "with-editor" ], - "commit": "7dfebba55bf687a25049882c2316166d968048ea", - "sha256": "0zmrd6xlrvlr0i1a75xwlknmyx4hvpfxaqjkl61n12gd8598ji1j" + "commit": "f52dfada8fa0fa6cd70886819868d84e198773a3", + "sha256": "1xz68154qmik4xs3ldl1gv87rb3famgd73k0174xbsr48d40ccyg" } }, { @@ -75568,30 +75569,28 @@ "repo": "gekoke/magit-file-icons", "unstable": { "version": [ - 20240627, - 1228 + 20250204, + 811 ], "deps": [ "el-patch", - "magit", "nerd-icons" ], - "commit": "861670d448df4fba6fb993941d41953cee230a7b", - "sha256": "0zldfmx9vx6fnaadx0q0vmgdsarfs284ffsj0b6qmcgxsbl2z67b" + "commit": "85e4bc0184eb34cd2a799c3749889c6f74f80bea", + "sha256": "1yjm2xy00vsq2d14w4xcpriiaraav07i389vbx6g8i79bajgln25" }, "stable": { "version": [ - 2, + 3, 0, - 0 + 1 ], "deps": [ "el-patch", - "magit", "nerd-icons" ], - "commit": "861670d448df4fba6fb993941d41953cee230a7b", - "sha256": "0zldfmx9vx6fnaadx0q0vmgdsarfs284ffsj0b6qmcgxsbl2z67b" + "commit": "85e4bc0184eb34cd2a799c3749889c6f74f80bea", + "sha256": "1yjm2xy00vsq2d14w4xcpriiaraav07i389vbx6g8i79bajgln25" } }, { @@ -75796,16 +75795,16 @@ "repo": "douo/magit-gptcommit", "unstable": { "version": [ - 20241127, - 131 + 20250209, + 903 ], "deps": [ "dash", "llm", "magit" ], - "commit": "dfec4f9a13af50b5506f375749f5d822ec7be71d", - "sha256": "0kwpi6wrdgvwamllf41k0amczw1d0m8djql9zfflzc2mgr95rfbc" + "commit": "2c3af41c40fb9fd849945b43f744bd788d3aa6f5", + "sha256": "140gcmdfkasf3rkgkal4a4j3kj1ni7b97y20bj7kja1rslcqrk48" } }, { @@ -76030,30 +76029,30 @@ "repo": "magit/magit", "unstable": { "version": [ - 20250126, - 2059 + 20250206, + 2317 ], "deps": [ "compat", - "dash", + "llama", "seq" ], - "commit": "a5962c0b916c1caf211a4f87fb85023068ab50b9", - "sha256": "0vyjdamws4505dwna3j60vzmc1v5b3smaykicp7hs9ksllr0j3sb" + "commit": "3f2a501ec8c327da166e000c5bd9dd77e139aa65", + "sha256": "0wjcmv075zd4z053cq1r80prmyiam9nnxvk487ydr6iy81slr6pm" }, "stable": { "version": [ 4, - 2, + 3, 0 ], "deps": [ "compat", - "dash", + "llama", "seq" ], - "commit": "7dfebba55bf687a25049882c2316166d968048ea", - "sha256": "0zmrd6xlrvlr0i1a75xwlknmyx4hvpfxaqjkl61n12gd8598ji1j" + "commit": "f52dfada8fa0fa6cd70886819868d84e198773a3", + "sha256": "1xz68154qmik4xs3ldl1gv87rb3famgd73k0174xbsr48d40ccyg" } }, { @@ -76822,14 +76821,14 @@ "repo": "minad/marginalia", "unstable": { "version": [ - 20250128, - 1729 + 20250203, + 1018 ], "deps": [ "compat" ], - "commit": "5282d5755ad1098c1f06113bf9180fd26450b92a", - "sha256": "1xr24wsxp7p4r3ycb2jqfsq7vagjwmjr5i13jb9qgwcq9wxmcgp4" + "commit": "a527fb03b76a2bce1e360c6e73a095e06922c3f3", + "sha256": "0q6n426yplj6iijsfx11lnlaz4l5iddav2dxml1p2zxvc4k2njy5" }, "stable": { "version": [ @@ -77309,30 +77308,30 @@ "repo": "martianh/mastodon.el", "unstable": { "version": [ - 20241223, - 1040 + 20250204, + 1902 ], "deps": [ "persist", "request", "tp" ], - "commit": "e2443f1cd425b31228e87739d1fc5035640bba06", - "sha256": "0jc6fyqrc0ygd00vq9ga1d9srawm2c0f1l64xg31dbbmhq2js8li" + "commit": "1dfe4368488d2b0539b7626b0c105343ca92322e", + "sha256": "0ry329cnbmb43xdh51xjgdx3mghrvyw221884vmyrnhh8fb3wnz9" }, "stable": { "version": [ 1, 1, - 8 + 9 ], "deps": [ "persist", "request", "tp" ], - "commit": "e2443f1cd425b31228e87739d1fc5035640bba06", - "sha256": "0jc6fyqrc0ygd00vq9ga1d9srawm2c0f1l64xg31dbbmhq2js8li" + "commit": "1dfe4368488d2b0539b7626b0c105343ca92322e", + "sha256": "0ry329cnbmb43xdh51xjgdx3mghrvyw221884vmyrnhh8fb3wnz9" } }, { @@ -78064,11 +78063,11 @@ "repo": "meow-edit/meow", "unstable": { "version": [ - 20250129, - 1800 + 20250201, + 1911 ], - "commit": "33414b9b1cd3207002a5b94d1300f2f4947e8126", - "sha256": "0bwimgrxbknl2f1q9vsdb8g35by7lfil0zqwyljcxpz6mb679zml" + "commit": "0314cd1bc661c8900bae5ef65d55f67a9ddc7193", + "sha256": "0knd02sx26cv76lci2w63fzvmvql30i052y2c15j1c9lhn7nz3pq" }, "stable": { "version": [ @@ -78519,11 +78518,14 @@ "repo": "org2blog/org2blog", "unstable": { "version": [ - 20250126, - 517 + 20250207, + 2147 ], - "commit": "175244a0b7dae8211cf42c17a51c35e9236eda71", - "sha256": "1fdx2zhszskkfff4qzcqs2xgqdyhq62hiqdfcc7130fxvqxxqv3k" + "deps": [ + "xml-rpc" + ], + "commit": "2310990794c80de8c01bba8c8a7ad5b012c0705d", + "sha256": "0b9h9wjazqrd0wjjf4fpwxgg9gpfcm8pab83ymmm1m9x7cdq4ps8" }, "stable": { "version": [ @@ -78709,11 +78711,11 @@ "repo": "daut/miasma-theme.el", "unstable": { "version": [ - 20241225, - 1559 + 20250202, + 950 ], - "commit": "251408da3b7243035c773c5c299353ab36bd2ec0", - "sha256": "0pb2caf4bj1aynj8mf1cy5syw0v3bf8xjxv78krpa6h9j3zpy7nb" + "commit": "56eff6ff70c41ea5a86641770f917ea622dce19f", + "sha256": "1iiwr8ly8cn8aw0gmwk9hdcapclkcr1nskdw5ndzqci41lp1hxbz" }, "stable": { "version": [ @@ -78953,15 +78955,15 @@ "repo": "eki3z/mini-echo.el", "unstable": { "version": [ - 20250123, - 1917 + 20250209, + 1407 ], "deps": [ "dash", "hide-mode-line" ], - "commit": "fe1fe43b3ad616a29288c82d8d7fe189dd2eccff", - "sha256": "1fgh93xzf4y3fhi7nby0h1vnay78sc2hv06ai5x3j972qz5b0v5v" + "commit": "197260e3e7121d60aa6f6d8f86de9a921fa1230c", + "sha256": "0dzj538cfdgpb5ca82nnfgwg7wiyahk81nav7gh4zijqzqiixkhi" }, "stable": { "version": [ @@ -79328,15 +79330,15 @@ "repo": "milanglacier/minuet-ai.el", "unstable": { "version": [ - 20250128, - 250 + 20250205, + 1919 ], "deps": [ "dash", "plz" ], - "commit": "cbc9e5a2658a0161eaaab3cfd4d8de7c7f04954f", - "sha256": "0qvy8k2fqsfk9h05nvigbiii08kcyzx9wcc8zz7s3pzs119f995z" + "commit": "034317580d67f5eb3113a0d597c509ccbcc57adc", + "sha256": "1hlzkn5qgv9dpis5y6vdi8ncyw3yl227cr5nf5k9y6mpkrxlyycm" }, "stable": { "version": [ @@ -80059,11 +80061,11 @@ "repo": "protesilaos/modus-themes", "unstable": { "version": [ - 20250127, - 856 + 20250208, + 958 ], - "commit": "4b10426687d2b417a93ccffbe8d05b2039aa7d7c", - "sha256": "06cmgqfmnjcin209s5jhmw9a4h7d5v84jbfqaxbbrw34bsdhwk4k" + "commit": "610ae60123707c4669651b8da3308e9c54b83620", + "sha256": "0wv8vyjpnmdqmwhizk35x9zz624zygx77ca659rigybmaczjk3ag" }, "stable": { "version": [ @@ -80083,11 +80085,11 @@ "repo": "kuanyui/moe-theme.el", "unstable": { "version": [ - 20240716, - 854 + 20250203, + 1808 ], - "commit": "4b3642157bfe9a9268310d321cfe67c8c236b5e1", - "sha256": "1smhp76aimy192s930d5pxpz4awbp1y0400vdzhqd5ii3q69ssb3" + "commit": "19a20cf08c0c72db97b8e1382a0ceba59f5f27c5", + "sha256": "0j07sxcb6mrdwl1w2jf117m3asvzlm8ld8bgvw82vx7lzh9aijpv" }, "stable": { "version": [ @@ -80714,14 +80716,14 @@ "repo": "alexispurslane/motion-selection-mode", "unstable": { "version": [ - 20250122, - 313 + 20250204, + 30 ], "deps": [ "god-mode" ], - "commit": "0349287a95418276d7868a8840a21eeaf8cb6a13", - "sha256": "1ki34nkgglgkn5x9wjil38ik3zqbl19impfbpky8y0azmbq1axry" + "commit": "96b8cbf18beb528f32cabdf77808b8db596f30be", + "sha256": "06yma18h3wlj2y5rg5kmpbrfyr7lhn7la9l8f6l467iw8smq8wn7" } }, { @@ -81337,11 +81339,11 @@ "repo": "Alexander-Miller/mu4e-column-faces", "unstable": { "version": [ - 20240318, - 2050 + 20250205, + 2118 ], - "commit": "d0387f277c1572160b3e80471252ff0305409988", - "sha256": "0xcbbinhh6r7larg3r3mgid1f2lf49z0hq1hy2ri3wj8zld6iyl3" + "commit": "b3586a9bf61f0cddd8a9f4cb214458f13d37955a", + "sha256": "0cvfyywygqm61j640j5nfv83dkcc5mg4zk8jrfn7176b3jvw7y4k" }, "stable": { "version": [ @@ -83437,8 +83439,8 @@ "repo": "ewantown/nice-org-html", "unstable": { "version": [ - 20250118, - 656 + 20250203, + 848 ], "deps": [ "dash", @@ -83446,8 +83448,8 @@ "s", "uuidgen" ], - "commit": "43925176313d7a2d7c7d89cbd8bc55a5bc7ad73a", - "sha256": "1mih36bjc923x56bnkry2s5j92fxnfwi0miz922iy6qqkd5fp2fr" + "commit": "8f35b640cf8335aa40ce9bb6e471e76b79192774", + "sha256": "1rsvl74d3amp5nsgdsjpyzrkywbaq1h6zshbs28kxxnc4da85nck" } }, { @@ -84442,11 +84444,11 @@ "repo": "ashton314/nordic-night", "unstable": { "version": [ - 20241204, - 2203 + 20250206, + 2258 ], - "commit": "bc7264f14461197919b434f7a30a319873404147", - "sha256": "13gy1si8jylsf45hkigvgplwi110x2jb3fpxih3jg81ili7909xy" + "commit": "7d37878b7e216dc28e4e00f2ecaad413c8712536", + "sha256": "1r2083fcxcf9mrvzxvfsm2j5cyidslvbspgj70lxf23wip5w5d7r" }, "stable": { "version": [ @@ -88153,14 +88155,14 @@ "repo": "abo-abo/orca", "unstable": { "version": [ - 20220828, - 4 + 20250205, + 1726 ], "deps": [ "zoutline" ], - "commit": "0687f416a5573f63b691d384454f5a793266ed97", - "sha256": "00a363vkqvryw5s7pj0kh8pqq5vvbf1pmbzz0b1z1fckwr49sv0f" + "commit": "c6105df2ff6cec9f7d109a4348cc16e62bb0feef", + "sha256": "1zl5gfdx96frla6r31iw1xwajdns86j9jccch6dhzvp0ikq3b1z9" } }, { @@ -88171,14 +88173,14 @@ "repo": "oantolin/orderless", "unstable": { "version": [ - 20250101, - 922 + 20250201, + 2341 ], "deps": [ "compat" ], - "commit": "411051c3257d60f0492cf88065193bb443b6ca0d", - "sha256": "05n5h53z3siz2ks9zb3k2p070mzzi7m2shrdjyxvylyxl1nybl5n" + "commit": "c7cb04499d94ee1c17affb29b1cfcd2a45116c97", + "sha256": "1g0qf17fmpabmi7ap057fy1rinqvvb0wa7famnakinhxw96l479d" }, "stable": { "version": [ @@ -88333,26 +88335,26 @@ "repo": "rksm/org-ai", "unstable": { "version": [ - 20241020, - 644 + 20250131, + 2236 ], "deps": [ "websocket" ], - "commit": "5adfde1bc7db9026747fbfae4c154eeac4ef8e59", - "sha256": "1h7cmrvj64zfdxx28a4ajmbibf30ff5a680s5hvlv5lmn13isg12" + "commit": "5a906fd4ecc4ff4d8ad561da14346a9d8b1d17db", + "sha256": "0agxq903w35ci144jr378ynaxl20hri3a42xl3m8h08a50x5s87j" }, "stable": { "version": [ 0, 5, - 4 + 5 ], "deps": [ "websocket" ], - "commit": "5adfde1bc7db9026747fbfae4c154eeac4ef8e59", - "sha256": "1h7cmrvj64zfdxx28a4ajmbibf30ff5a680s5hvlv5lmn13isg12" + "commit": "5a906fd4ecc4ff4d8ad561da14346a9d8b1d17db", + "sha256": "0agxq903w35ci144jr378ynaxl20hri3a42xl3m8h08a50x5s87j" } }, { @@ -90559,16 +90561,15 @@ "url": "https://repo.or.cz/org-link-beautify.git", "unstable": { "version": [ - 20250125, - 1539 + 20250204, + 1618 ], "deps": [ "nerd-icons", - "org", "qrencode" ], - "commit": "8f8bdb65a32cf6fd09b7dddf2f84d96934620cf4", - "sha256": "181qcrhs3r21pdzvpha4dab3rzx015y8pw5h6n8ikgwcspz7mvbn" + "commit": "1d088d4ea6efd4ccaf6b1efaaee2bb85dd73f98f", + "sha256": "1l1gw3987fd2xri1byvj1jx26gksc9a5adjr71c5zkva0gl2zhlq" }, "stable": { "version": [ @@ -91058,30 +91059,30 @@ "repo": "meedstrom/org-node", "unstable": { "version": [ - 20250131, - 957 + 20250203, + 1402 ], "deps": [ "compat", "el-job", "llama" ], - "commit": "884a5e2136591e41d20ee16b4f0aea7b6918adb9", - "sha256": "1vkprf35nvaqy8h7msi821j7jlbn4a8fgk690ib8czy2kbpp6pir" + "commit": "0f58a8e584e036a97aaa023813c273b9fc83f41e", + "sha256": "0h2kmpki4c8c87lm3wzpl23adilfrrg9vbcv2yf4s034r4bvd949" }, "stable": { "version": [ 1, 9, - 34 + 35 ], "deps": [ "compat", "el-job", "llama" ], - "commit": "884a5e2136591e41d20ee16b4f0aea7b6918adb9", - "sha256": "1vkprf35nvaqy8h7msi821j7jlbn4a8fgk690ib8czy2kbpp6pir" + "commit": "0f58a8e584e036a97aaa023813c273b9fc83f41e", + "sha256": "0h2kmpki4c8c87lm3wzpl23adilfrrg9vbcv2yf4s034r4bvd949" } }, { @@ -93735,8 +93736,8 @@ "repo": "org2blog/org2blog", "unstable": { "version": [ - 20250126, - 517 + 20250204, + 1933 ], "deps": [ "htmlize", @@ -93745,8 +93746,8 @@ "writegood-mode", "xml-rpc" ], - "commit": "175244a0b7dae8211cf42c17a51c35e9236eda71", - "sha256": "1fdx2zhszskkfff4qzcqs2xgqdyhq62hiqdfcc7130fxvqxxqv3k" + "commit": "f0b4d73e0aa531f508d979ba2365880f064700f9", + "sha256": "136i9xrnx0xr6bpa51yjhrr28r9zmi2q22442w9cc1xahwd8b7ia" }, "stable": { "version": [ @@ -97034,19 +97035,19 @@ "repo": "joostkremers/parsebib", "unstable": { "version": [ - 20250116, - 1521 + 20250208, + 2251 ], - "commit": "6843ecc22073484e0e48dbd63735b9b4ba103539", - "sha256": "0f3kssvyxjw75g3d5039zznbx3lr7hrcc8ma0gwd2fj0y8a63bjz" + "commit": "a25621930e67e267133b08698a72fa80a42edfc8", + "sha256": "0gh8bv6q9041q0b9spw7glj3lfvkj8yl743b4xc1y5mjj8alb466" }, "stable": { "version": [ 6, - 4 + 6 ], - "commit": "f0e57a3606d615a54a05d82edb94058a0a6d92a9", - "sha256": "1mx47gkn3l7hvknksfcl9r36hhm2hlskibvbkxd31sgzhzgjaxdr" + "commit": "a25621930e67e267133b08698a72fa80a42edfc8", + "sha256": "0gh8bv6q9041q0b9spw7glj3lfvkj8yl743b4xc1y5mjj8alb466" } }, { @@ -98546,14 +98547,14 @@ "repo": "emarsden/pg-el", "unstable": { "version": [ - 20250125, - 1305 + 20250208, + 1320 ], "deps": [ "peg" ], - "commit": "a945e203f4f2ca734ddebeaf96b0382c8770a383", - "sha256": "1fi6w24jhqdj114y75ncl42202d65sg3n97b5az61l74kgbx55fj" + "commit": "1f3cd5f9ee473c367040a2523dde0dfa852725c9", + "sha256": "1dq8h9b8n6s11nsdav2hlnwcppswy2ccfz18dhp2lvkd48dw469f" }, "stable": { "version": [ @@ -98779,10 +98780,10 @@ }, { "ename": "phoenix-dark-mono-theme", - "commit": "87e3b036fbcc96b047bbb141345a7b51f19d6951", - "sha256": "15in299j170n0wxmkg3cx1zzx1n7r1ifraqqzfqhcnk8i8lmc939", - "fetcher": "github", - "repo": "j0ni/phoenix-dark-mono", + "commit": "c5357c53a42f30b9c9c9872c27c141c5d6d91a8d", + "sha256": "1ixvsjdbmk6f63zdlgjdrw2z7mjvbf96cyw62c3wqlzsa6x78d1w", + "fetcher": "sourcehut", + "repo": "mhcat/phoenix-dark-mono", "unstable": { "version": [ 20170729, @@ -98794,10 +98795,10 @@ }, { "ename": "phoenix-dark-pink-theme", - "commit": "87e3b036fbcc96b047bbb141345a7b51f19d6951", - "sha256": "0bz6iw73d85bi12qqx6fdw3paqknrxvn0asbwjmgdcrlqrfczjlr", - "fetcher": "github", - "repo": "j0ni/phoenix-dark-pink", + "commit": "d98b48afa4ee2a5afbc22a226d3673d6d9641f12", + "sha256": "1i1p9h0ny0v1m90biiwy09qm41y35zzmv3f11j045c9qnc24bskx", + "fetcher": "sourcehut", + "repo": "mhcat/emacs-phoenix-dark-pink-theme", "unstable": { "version": [ 20190821, @@ -99194,6 +99195,30 @@ "sha256": "0a6jnnl74z1nr1w4qkllil4vv5k669vkjl5z6zc42b4sb5qrksw7" } }, + { + "ename": "pif", + "commit": "20aa5104c58dd78185ce1d9efb089ff67a8ce0d6", + "sha256": "186dv6bdrrj7sjdnp9bp0zfcq83w86x9y983klc8zqhmy9ssry31", + "fetcher": "github", + "repo": "oliverepper/pif", + "unstable": { + "version": [ + 20250207, + 1624 + ], + "commit": "c993c1446ff3460a2f599b84ac81e9f00c4c7333", + "sha256": "02ywbxfg7s1hsiwi2zqvhlqd8wfhfzasb3n6gsj0rl5ix8c7gsmw" + }, + "stable": { + "version": [ + 0, + 0, + 6 + ], + "commit": "c993c1446ff3460a2f599b84ac81e9f00c4c7333", + "sha256": "02ywbxfg7s1hsiwi2zqvhlqd8wfhfzasb3n6gsj0rl5ix8c7gsmw" + } + }, { "ename": "pig-mode", "commit": "a0d7c07d28e2f229b281201a781ebaceed6465ed", @@ -100886,16 +100911,16 @@ "repo": "SqrtMinusOne/pomm.el", "unstable": { "version": [ - 20240709, - 2156 + 20250202, + 1202 ], "deps": [ "alert", "seq", "transient" ], - "commit": "ba0b30888614a8dc932bd0ab198e08f78950c0e1", - "sha256": "1zd351gx3k31vmrs4g4q8fcqdwxp8zlqch40z4vhqy80alzlg88g" + "commit": "ee7b60c65e3d15e0fcf2169ff3ba4b43ebaa65d6", + "sha256": "1q8rak8gbmwbnm3r4cvd92bkdbwp5x28jk8vyw1sgpif71wizm01" }, "stable": { "version": [ @@ -101024,28 +101049,28 @@ "repo": "aki2o/emacs-pophint", "unstable": { "version": [ - 20240107, - 1043 + 20250202, + 713 ], "deps": [ "log4e", "yaxception" ], - "commit": "92854bb12c275980c89c9f6f33eaa36b633db6d7", - "sha256": "110lgic3r04q1xlw35vgmdi1ncafm8cp0a3zl5v9z3r5hmxghjv4" + "commit": "c37195caec62a56af77432a8bd92ac720689b5fe", + "sha256": "1gj3hhd6vdlzk9y60491w9y083273ajnv93n056h4f2iv9d2g10q" }, "stable": { "version": [ 1, - 4, + 5, 0 ], "deps": [ "log4e", "yaxception" ], - "commit": "92854bb12c275980c89c9f6f33eaa36b633db6d7", - "sha256": "110lgic3r04q1xlw35vgmdi1ncafm8cp0a3zl5v9z3r5hmxghjv4" + "commit": "c37195caec62a56af77432a8bd92ac720689b5fe", + "sha256": "1gj3hhd6vdlzk9y60491w9y083273ajnv93n056h4f2iv9d2g10q" } }, { @@ -101259,19 +101284,19 @@ "repo": "OpenSauce04/portage-modes", "unstable": { "version": [ - 20250112, - 1959 + 20250207, + 1057 ], - "commit": "05863001fb528ed737c3ba6b7872dbfe1646debd", - "sha256": "04l2kx21d6gsgpq5xf6jk3p5j51ci2lr8p77dzhgpagvpbp6lvgw" + "commit": "10ac263d717ec771e79fdfc1309ea822ec4ba501", + "sha256": "04qmdm8zdnnpq5qk0l3gn6465q1i0lhlxjrrdax2jpkf7hy9xr4m" }, "stable": { "version": [ 0, - 4 + 5 ], - "commit": "05863001fb528ed737c3ba6b7872dbfe1646debd", - "sha256": "04l2kx21d6gsgpq5xf6jk3p5j51ci2lr8p77dzhgpagvpbp6lvgw" + "commit": "10ac263d717ec771e79fdfc1309ea822ec4ba501", + "sha256": "04qmdm8zdnnpq5qk0l3gn6465q1i0lhlxjrrdax2jpkf7hy9xr4m" } }, { @@ -101637,6 +101662,21 @@ ], "commit": "9fa4ef4d1922cbd6dd37b631ea05aed0ef358178", "sha256": "1cm92263jqvq2lg378xqi8ikbqw98lxjpsl29sja2xg2wf6p7gml" + }, + "stable": { + "version": [ + 0, + 1, + 0 + ], + "deps": [ + "ghub", + "magit", + "magit-section", + "markdown-mode" + ], + "commit": "9fa4ef4d1922cbd6dd37b631ea05aed0ef358178", + "sha256": "1cm92263jqvq2lg378xqi8ikbqw98lxjpsl29sja2xg2wf6p7gml" } }, { @@ -102595,11 +102635,11 @@ "repo": "bbatsov/projectile", "unstable": { "version": [ - 20250131, - 1015 + 20250209, + 605 ], - "commit": "00ec14cadabfceea59f8124fa540058059bc3562", - "sha256": "005dlkk0y2q7gaf8bhqvh30m975k3wnfrln6syd3xx8q03x4rdjw" + "commit": "cdb22f6b588c8ffa508f6fda586ee1253c73490b", + "sha256": "0h38f64c2dfayjakwlj8xf86jnybclb8d9xj4v72fprssfp8vm55" }, "stable": { "version": [ @@ -103790,11 +103830,11 @@ "repo": "purescript-emacs/purescript-mode", "unstable": { "version": [ - 20241210, - 1117 + 20250204, + 1410 ], - "commit": "07e4d6ecfe677d595ed3759c912c0b262d886b98", - "sha256": "12g1mrfs6b07n0w3w41w32p5n7j4h5k5g69nymh5zyxjn207nif0" + "commit": "e0de552627487e4c6613318e42d4402563362d28", + "sha256": "0afrcaxrj2ih822s41l6cbdzn3acfmm0ajc2j1c82cmbwbh8xga3" } }, { @@ -104805,11 +104845,11 @@ "repo": "python-mode-devs/python-mode", "unstable": { "version": [ - 20240911, - 1346 + 20250206, + 947 ], - "commit": "16affa2f0f1a3b918547d665235a24bd57d4b9b2", - "sha256": "19w9w7pzmsq01gzbkdcv0shdh2b44ka5ql564d23hq1ly5wk3rkd" + "commit": "4162b0dc8359a50ea322a4a3874150d9b16a7cb5", + "sha256": "1qd0lzr4iq8gnaq1ssi632bw7cfhsdp5i2br3kcgxdykd5wxqkf7" }, "stable": { "version": [ @@ -104913,16 +104953,16 @@ "repo": "wavexx/python-x.el", "unstable": { "version": [ - 20241230, - 943 + 20250207, + 2008 ], "deps": [ "cl-lib", "folding", "python" ], - "commit": "122cc32c1e4c312b0c793788aca03eb20cdebc91", - "sha256": "01y9ac0c2qf0x6a8qwdxbsz7a8vfkjg7pmigbj5xgh06icfisi3z" + "commit": "6d98ab5fb46e93aece4320b509878fd078e2ba88", + "sha256": "0s3gq3mp6ig65qg0i49i6ynkgwpf6gdy14c246sr6zski69n59qd" }, "stable": { "version": [ @@ -105588,11 +105628,11 @@ "repo": "greghendershott/racket-mode", "unstable": { "version": [ - 20250125, - 2036 + 20250205, + 2128 ], - "commit": "a3bcfd2e25bb0e79a5d33b113e12a4375d99de76", - "sha256": "12vkhgwbwcqwb8gkahv4mdapr4qn0y15zqcik1krcf1pqf03vdrh" + "commit": "d9e66c7571722101a87a86ef611056c47b791ad4", + "sha256": "1basymv6r8aaq858s9ffniy0zi03hlzy4j6ffipilns2hf1ylgsp" } }, { @@ -106328,11 +106368,11 @@ "repo": "xenodium/ready-player", "unstable": { "version": [ - 20250130, - 742 + 20250204, + 2355 ], - "commit": "bb0752ebb760116d1205c4b7b71d4fc4e699c252", - "sha256": "1v2m5mrn7drp3dvipmiswy2s4jfqdc7cpa06hklp0vj5f5ljd08y" + "commit": "25355ab197e8a7c63196bf672719276093adc132", + "sha256": "199v2yry0jhjijzkhxcfg1h5wy24mvqq8wb1nlxmd1rs3z4563m2" }, "stable": { "version": [ @@ -109934,8 +109974,8 @@ "repo": "emacs-rustic/rustic", "unstable": { "version": [ - 20250130, - 1903 + 20250202, + 336 ], "deps": [ "dash", @@ -109949,8 +109989,8 @@ "spinner", "xterm-color" ], - "commit": "4404bdbf77a82f4d201d9bc4cb80d2a6c4a280b5", - "sha256": "0v3k6plxns1zpb21k4a0af4hg3v3x5y1fl6apz0lrlzw24pk852d" + "commit": "31ecd5582cd8f54c736a3ee5f0b0ec1f6d128dcf", + "sha256": "1mw7i98fkg3mqjp5g4sik1fhpmazz9igfyq5si7b86wdranvavds" }, "stable": { "version": [ @@ -110428,20 +110468,20 @@ "repo": "nicolaisingh/saveplace-pdf-view", "unstable": { "version": [ - 20240816, - 1351 + 20250207, + 1811 ], - "commit": "70e9ec40565021f4b5d51e4523f4c716183a8eef", - "sha256": "000xhr0f2hbdykycm7d5l1nc9knhh65dfnm307y39k236nwy4msc" + "commit": "79e76562bc5ef94c12837035fe504f07be8a8f25", + "sha256": "15799sqw8h2iasnlkcwnjdjmj9ssa9a9pvpyr6fqj0dw4g7056m5" }, "stable": { "version": [ 1, 0, - 7 + 8 ], - "commit": "70e9ec40565021f4b5d51e4523f4c716183a8eef", - "sha256": "000xhr0f2hbdykycm7d5l1nc9knhh65dfnm307y39k236nwy4msc" + "commit": "79e76562bc5ef94c12837035fe504f07be8a8f25", + "sha256": "15799sqw8h2iasnlkcwnjdjmj9ssa9a9pvpyr6fqj0dw4g7056m5" } }, { @@ -112901,15 +112941,15 @@ "repo": "chenyanming/shrface", "unstable": { "version": [ - 20250131, - 950 + 20250201, + 903 ], "deps": [ "language-detection", "org" ], - "commit": "899c7a074859b1e847bebde42f4edf68d7092958", - "sha256": "1l2v33z5d1fb51qb5mv0mx347x5q1ssbwr5dryhvsq8ln1lq06m4" + "commit": "e13af9a9f165b2a68277cdb8e868f9f5070cd608", + "sha256": "18wxw9rzajynvlqz0wa9f473drzv3nflh326z824vlsh8xjjwzg6" }, "stable": { "version": [ @@ -113180,14 +113220,14 @@ "repo": "emacs-sideline/sideline", "unstable": { "version": [ - 20250101, - 856 + 20250131, + 2055 ], "deps": [ "ht" ], - "commit": "709095ca022dd4ea4ceeb6ab18ce9b9dbda0d6a5", - "sha256": "01ccmmnizi2wakkb92zp922idcfsmmcspac1shf7lxjqfbbrpr0n" + "commit": "06565011f7f91fb819567f0a7b9974ba2c256199", + "sha256": "0a8z3pzapdrm248rrczbl35ggpl517fg9y6f5x7g8g6xdr918abs" }, "stable": { "version": [ @@ -113242,29 +113282,30 @@ "repo": "emacs-sideline/sideline-flycheck", "unstable": { "version": [ - 20250101, - 857 + 20250201, + 1746 ], "deps": [ "flycheck", "ht", "sideline" ], - "commit": "bce7bbc90edc3cdeb3144a8fb8d59f5529e3391b", - "sha256": "0mfznzv254rdam67vsdq7nbhiq97cilccbgh14ckq5f2v10sfpil" + "commit": "886b0d923aeaac5e6e4cd4ab42ee6a6a18553907", + "sha256": "1x23any4bdgwfwd10d68cjb8ymka5z8q7wfp3mmmg7461718vrz2" }, "stable": { "version": [ 0, - 1, + 2, 0 ], "deps": [ "flycheck", + "ht", "sideline" ], - "commit": "91d7f2d43cc8abbf96bcae389553b6d722c8bad9", - "sha256": "1lrjrp47h2crj7df4npvwpmd53amz37z37byp13nczxcq1yzw806" + "commit": "886b0d923aeaac5e6e4cd4ab42ee6a6a18553907", + "sha256": "1x23any4bdgwfwd10d68cjb8ymka5z8q7wfp3mmmg7461718vrz2" } }, { @@ -113275,26 +113316,26 @@ "repo": "emacs-sideline/sideline-flymake", "unstable": { "version": [ - 20250101, - 857 + 20250201, + 1749 ], "deps": [ "sideline" ], - "commit": "c3099660040fb360f4c02a74e50612aefdfe7999", - "sha256": "07882x0mxc95liqql873yil4s3cmv6hvf8aswxj3qq0kz0l9bv76" + "commit": "87459e2b083674520d7fc4ee36b6b04c990b2e4f", + "sha256": "0cncgf404ckcilhgzyr79wsr0bgkhklcdcd0scbnmfrn72dyzq9p" }, "stable": { "version": [ 0, - 1, + 2, 0 ], "deps": [ "sideline" ], - "commit": "97d6922b3101eb97fdca4c5516d3dc4c4ccd75a5", - "sha256": "11cy2yxdsjxa5np6hh6vk9rc8mfghsly1j7q28l8zz4990w2g27a" + "commit": "87459e2b083674520d7fc4ee36b6b04c990b2e4f", + "sha256": "0cncgf404ckcilhgzyr79wsr0bgkhklcdcd0scbnmfrn72dyzq9p" } }, { @@ -113774,11 +113815,11 @@ "repo": "laishulu/emacs-smart-input-source", "unstable": { "version": [ - 20250120, - 852 + 20250207, + 1321 ], - "commit": "16cde9e5c0a262933ff22e1e56d872b2cb64fa06", - "sha256": "1i3zqx730q442q1r6v74q1s8jpqaafllln5xba4961cpcn3nxqvx" + "commit": "e09728891a99a078470cc29a30a6e32f814682fe", + "sha256": "02r8z2dng0ian1qig5c1g5xwfa4azpkja9r5lwi4qyd9mkw5cjzy" } }, { @@ -114042,8 +114083,8 @@ "repo": "emacs-slack/emacs-slack", "unstable": { "version": [ - 20250130, - 1303 + 20250208, + 1653 ], "deps": [ "alert", @@ -114055,8 +114096,8 @@ "ts", "websocket" ], - "commit": "292a40a194bf6580d41f2cfd200911d5793817d7", - "sha256": "1r32blfa18n8xmn88pc7vjv955dq63l3n9n1l24kf49whdykkw2r" + "commit": "d81c18a90cec42bea58c74e902cfad27900f8de6", + "sha256": "0qmviqv67qzfl7w8sdl3l0ds6g7fhz58vx41d2mjm6ny0qd6ksq5" } }, { @@ -114114,14 +114155,14 @@ "repo": "slime/slime", "unstable": { "version": [ - 20250126, - 2243 + 20250203, + 1829 ], "deps": [ "macrostep" ], - "commit": "5006caa5b44665b53431ece0baa298f2ffc521eb", - "sha256": "12wxaa0r8jly16ng0r76qbla3slpsw3lavv85ad48jwzwsf65ws0" + "commit": "95b722de9f59b2af2d2b42d38669d43230e7af69", + "sha256": "17lhgjygpjrlpch7shimp7yami8vb18y1zsmhg66s7gimabgxqhm" }, "stable": { "version": [ @@ -114381,11 +114422,11 @@ "repo": "joaotavora/sly", "unstable": { "version": [ - 20240809, - 2119 + 20250203, + 2040 ], - "commit": "742355f7554ab6c46e5c1c9bdb89068f55359eaa", - "sha256": "1mxkcgh7g76mqn148zm2mhsh09whwh89wldlyfhq0d9h96zch451" + "commit": "c48defcf58596e035d473f3a125fdd1485593146", + "sha256": "0nzbsby7nliq6lfm3pqbqjrd3z51k71dck9alq3kr9mvirp2vw8q" }, "stable": { "version": [ @@ -115408,14 +115449,14 @@ "repo": "kyleam/snakemake-mode", "unstable": { "version": [ - 20231210, - 2008 + 20250204, + 207 ], "deps": [ "transient" ], - "commit": "5c47042e088d69375b6407a7eded166403d6fd81", - "sha256": "0spgvnsl8kpqq49flnwih3cnmdbmj45sc6czygiai4gwl6drambb" + "commit": "e4751a951a53c4d4610b2eb17469a21177cab6bc", + "sha256": "0b19bfk2d29v6ckh0sxyrrl8mzqqpmnxbs9rp58rf7ipk4rp6xwl" }, "stable": { "version": [ @@ -115528,15 +115569,15 @@ "repo": "SpringHan/sniem", "unstable": { "version": [ - 20250124, - 733 + 20250204, + 1138 ], "deps": [ "dash", "s" ], - "commit": "24c5279b4dc031755fb4ad7d64dbebd476d65750", - "sha256": "1442hv3qvfp11hs14mhpg0xkiay9x3yqrz795g61f9lv7wpm4gna" + "commit": "89161d8b3c19ffba8b52411de36f28aec1e401f2", + "sha256": "1ip0n50ja1gky3rdqc0y7fgm9f8ihakc48y8rqbhcq439m278jpv" } }, { @@ -115772,11 +115813,11 @@ "repo": "bbatsov/solarized-emacs", "unstable": { "version": [ - 20240725, - 1617 + 20250209, + 905 ], - "commit": "80ee6b99b022b20c27ffb44fb146f5878c9b5776", - "sha256": "0cb12zwndvlilhfnhq0yh0ygp86xhb04fgb807a1rwf3mgzrw57n" + "commit": "ac09b782f26936d72f0cf1bbe1ff8d589ca49b04", + "sha256": "0l8pzld3pwx5p74sc7amxfii0q7wh1pgnjzljy2ls43wxd2phrd2" }, "stable": { "version": [ @@ -115972,20 +116013,20 @@ "repo": "djgoku/sops", "unstable": { "version": [ - 20240907, - 1739 + 20250206, + 1651 ], - "commit": "46548b854b35983b2e9e5eb4276634dfc41abfa0", - "sha256": "0h2x5ngbf7pi82l5p0h6fm8jc98r3mx37rd7pj52qjyzq0x6nsqs" + "commit": "afeb1232b89335d77a3f4b6639ebe8a2b70fae3f", + "sha256": "1n49p86sfvhaig7mp17zm9mrsp14mmvgvprp1n16r6kgfx52wxzq" }, "stable": { "version": [ 0, 1, - 5 + 7 ], - "commit": "46548b854b35983b2e9e5eb4276634dfc41abfa0", - "sha256": "0h2x5ngbf7pi82l5p0h6fm8jc98r3mx37rd7pj52qjyzq0x6nsqs" + "commit": "afeb1232b89335d77a3f4b6639ebe8a2b70fae3f", + "sha256": "1n49p86sfvhaig7mp17zm9mrsp14mmvgvprp1n16r6kgfx52wxzq" } }, { @@ -117336,11 +117377,11 @@ "repo": "srfi-explorations/emacs-srfi", "unstable": { "version": [ - 20250127, - 2243 + 20250208, + 2126 ], - "commit": "f81391ab05ae1d4ea34ef1244b36f4961d3cfe83", - "sha256": "1yv0gc5bh11cn8pm6yxvq1np3zrn5jarhamyg0ny8vay5wdcnjnc" + "commit": "53196f48d35ea745a14573ab5ee4f3725728ebdc", + "sha256": "1ibbv82513za7vd6cm1cynxank78yq423rygrdbycfj8c5h03q4r" }, "stable": { "version": [ @@ -117613,8 +117654,8 @@ "repo": "daanturo/starhugger.el", "unstable": { "version": [ - 20241223, - 1047 + 20250204, + 1630 ], "deps": [ "compat", @@ -117623,13 +117664,13 @@ "s", "spinner" ], - "commit": "92ecc8e99a9bfaa19bf1a7581eb1d44d565c10a5", - "sha256": "1b8ms769030cnhblva31bgb4rp0h6zirmwgfgx0rh8xxzp2y0p1d" + "commit": "46f32d4444d4cf6a8937e89538371c97eb0a65dd", + "sha256": "19v8gaj1msnn94kmxrrapsb1ldrwjqf7hkw9wm25mv6f9h0lxjs8" }, "stable": { "version": [ 0, - 5, + 6, 0 ], "deps": [ @@ -117639,8 +117680,8 @@ "s", "spinner" ], - "commit": "22eceb806947edc1ad35e10fb99bdfc65fe26ca3", - "sha256": "1c0xc5sbpgp4nfs4rr1zrzqpxd4jl3cjjpkp43zifahal3gm0am7" + "commit": "46f32d4444d4cf6a8937e89538371c97eb0a65dd", + "sha256": "19v8gaj1msnn94kmxrrapsb1ldrwjqf7hkw9wm25mv6f9h0lxjs8" } }, { @@ -117895,6 +117936,24 @@ "sha256": "16dxjsr5nj20blww4xpd4jzgjprzzh1nwvb810ggdmp9paf4iy0g" } }, + { + "ename": "stillness-mode", + "commit": "2527dc2b23239afe460cbad78664729117506eab", + "sha256": "1pfsh47wprh0dphwr68n6ywcirs52ss217j3qlp9nfdl0m7z0ini", + "fetcher": "github", + "repo": "neeasade/stillness-mode.el", + "unstable": { + "version": [ + 20250126, + 2133 + ], + "deps": [ + "dash" + ], + "commit": "b7bdde04529126a0b4fba263efd7b4786fd24682", + "sha256": "0m8yslpvpgzaqj85wawqwzmvnsgdzwi1m9y6i1yndcka52pvk7kx" + } + }, { "ename": "stimmung-themes", "commit": "ded562018552f74bcf1a346858c0a93089a4359e", @@ -117937,15 +117996,15 @@ "repo": "beacoder/stock-tracker", "unstable": { "version": [ - 20250128, - 1643 + 20250206, + 814 ], "deps": [ "async", "dash" ], - "commit": "94b97ee1c1dad0e7048c980e214e4f52b89bb591", - "sha256": "0j7zhz22hfpfpwynr21fgk1wcndldi0kb109mh1zwm3fhavykc95" + "commit": "51963a654a1199ec23f0938c247b1411fee85c6f", + "sha256": "12aipdqhx2pfgas0c3m4i1z0p45vrrld4c6ahnx9qgp4nig9b2bh" }, "stable": { "version": [ @@ -120040,25 +120099,25 @@ "repo": "lucius-martius/tab-line-nerd-icons", "unstable": { "version": [ - 20241125, - 1048 + 20250208, + 1059 ], "deps": [ "nerd-icons" ], - "commit": "7a49880f3ae39a8709d6887b26ec84ba2b92360c", - "sha256": "0iwxiixdhc5j4gx6mqplav4jcik1kvc0dnai84vdxiii7222zfq7" + "commit": "902a7bef60c64b58da9c6af028a0cb89f70b7684", + "sha256": "1pc6i9hyy1pnzf873fqvdr0akcalni1ms5ddwdnwag3d0d5ay2lq" }, "stable": { "version": [ 0, - 1 + 2 ], "deps": [ "nerd-icons" ], - "commit": "7a49880f3ae39a8709d6887b26ec84ba2b92360c", - "sha256": "0iwxiixdhc5j4gx6mqplav4jcik1kvc0dnai84vdxiii7222zfq7" + "commit": "902a7bef60c64b58da9c6af028a0cb89f70b7684", + "sha256": "1pc6i9hyy1pnzf873fqvdr0akcalni1ms5ddwdnwag3d0d5ay2lq" } }, { @@ -120621,15 +120680,15 @@ "repo": "zevlg/telega.el", "unstable": { "version": [ - 20250124, - 1508 + 20250203, + 1232 ], "deps": [ "transient", "visual-fill-column" ], - "commit": "d724ded7b83b52af1b9ab1ea34ca208c5e71b7bd", - "sha256": "1q325gf99v82qhz0gp3dvsdcn4vj8bn8crnxmmhlz4339k1pllag" + "commit": "85ad1717de4a47ebeb293e836e5a89e901b55dbd", + "sha256": "099a9269fb9p4hj9v8lqgij9cnc2zr0ayzxws4bh3w82qz5hvi22" }, "stable": { "version": [ @@ -121490,15 +121549,15 @@ "repo": "johannes-mueller/test-cockpit.el", "unstable": { "version": [ - 20240604, - 1943 + 20250208, + 2126 ], "deps": [ "projectile", "toml" ], - "commit": "068d3a393cebdc871236b8d1e45e06f997e2b0d0", - "sha256": "1dhnvymy00f2h039v1cp4fq8fxhybswwsx4qnpvdjilf1lbcvxiw" + "commit": "56e52623ed302d307a2aa6b0ee9e828297cb20e6", + "sha256": "0wbnf4bh739za194709m51f98l5cwn1352021q6f3nv6km5y0if9" } }, { @@ -121962,21 +122021,21 @@ "repo": "facebook/fbthrift", "unstable": { "version": [ - 20250127, - 754 + 20250130, + 2231 ], - "commit": "889b195802c131ddd0bd2f36f83e10f86978997d", - "sha256": "0gzsglrbng6s9is6rfj3h4ykn64sa91g1m81pffp953hcjkch8qy" + "commit": "0b1692802fd3a95daad427b3aced684837fdb3bd", + "sha256": "1s7p8iqgn05j4xh67pdbajf57sb37g2fvj6n9xsqs3h5hlfh2zfp" }, "stable": { "version": [ 2025, - 1, - 27, + 2, + 3, 0 ], - "commit": "889b195802c131ddd0bd2f36f83e10f86978997d", - "sha256": "0gzsglrbng6s9is6rfj3h4ykn64sa91g1m81pffp953hcjkch8qy" + "commit": "0b1692802fd3a95daad427b3aced684837fdb3bd", + "sha256": "1s7p8iqgn05j4xh67pdbajf57sb37g2fvj6n9xsqs3h5hlfh2zfp" } }, { @@ -123242,25 +123301,25 @@ "repo": "martianh/tp.el", "unstable": { "version": [ - 20250103, - 1428 + 20250206, + 812 ], "deps": [ "transient" ], - "commit": "32f4e7492aa041afff8190d06edbf0343c4bf6a7", - "sha256": "1q8pw5lxjl1ahr24dy7shvn03fck8wsdkffgra7xwqsa5vsl1lib" + "commit": "cce2dfe0ec2b5c070cb13a7bdf95695eeb6e3caf", + "sha256": "1hv0j4dzwamhm2gp5123j415mq13347v5lsbxlrksha5nw9h7kds" }, "stable": { "version": [ 0, - 6 + 7 ], "deps": [ "transient" ], - "commit": "df6490d86f24fff22f5ea4f7d887fc60caed1163", - "sha256": "14vdn5syv7jghxvqlih9gvh82755r5gd8yxskq8bv6wkm4b0y0cs" + "commit": "cce2dfe0ec2b5c070cb13a7bdf95695eeb6e3caf", + "sha256": "1hv0j4dzwamhm2gp5123j415mq13347v5lsbxlrksha5nw9h7kds" } }, { @@ -123447,11 +123506,11 @@ "repo": "fosskers/transducers.el", "unstable": { "version": [ - 20250113, - 1054 + 20250205, + 1149 ], - "commit": "18f61af19d9187bebe4d4cbd95ed855618a81668", - "sha256": "00kb7fq1ljms0mwr1m0kq9dy7f6hah5g7x57f93fnhaf769bsc2j" + "commit": "7019f7e4d26afbb601f660ed959eb88257f23f6d", + "sha256": "13pz16w06rnjj939x2my0pvqqjcprywg35hcbnj1ggzry7q5673s" }, "stable": { "version": [ @@ -123508,28 +123567,28 @@ "repo": "magit/transient", "unstable": { "version": [ - 20250131, - 1332 + 20250205, + 2244 ], "deps": [ "compat", "seq" ], - "commit": "f6c249c7f68deec44ed63d18e35aa112b0b294be", - "sha256": "1fcaa503sxn97q3mh4mwpakz36yab5gskm89fj5fgx3wwfbkb2q7" + "commit": "32a7e256aab281bada5db8569e0871c8c3ad2115", + "sha256": "01704zjh94km5nhc60kcgy22hwb1g74llb5kdqjwsz7q1nrad8h7" }, "stable": { "version": [ 0, 8, - 3 + 4 ], "deps": [ "compat", "seq" ], - "commit": "000ff15942878aa1108abaa020da86ada675fea9", - "sha256": "137h1m67dyrnb9l3lm90xfwsl56ih8rc0vahw38fm6ny87sl64sd" + "commit": "e5cb1fd7e8d35e264313436f47972acae0819764", + "sha256": "01g6r5pmprkg75n23zr27nml7dg0ncsrwgbpfnjf0snhjwb4cbhx" } }, { @@ -123603,21 +123662,21 @@ }, { "ename": "transient-posframe", - "commit": "616910997097f08d49004809cac3d995dcfe4bdc", - "sha256": "1dgcv51ychr575ckykwbz9cvnh6q9li4j11gg0mkqdd0x3srxfsf", + "commit": "7bc2b8493e890e272c3e5a2a06b181fd32e16d24", + "sha256": "1dww5786ai3spkrjsq47k2yc02m61i476g7qaa4c4y8d2hkhk8kb", "fetcher": "github", - "repo": "yanghaoxie/transient-posframe", + "repo": "emacsorphanage/transient-posframe", "unstable": { "version": [ - 20210102, - 130 + 20241212, + 940 ], "deps": [ "posframe", "transient" ], - "commit": "5f0874ac3ce6f50968ed5e088d6538a07bdfd11f", - "sha256": "01h7v323xpra2npgc2inyjqjfaz3kkaqk2dlh5li2gzi9gvkzs7g" + "commit": "1eb4ed61ad9f0272a887e05f00708f85f2d9efc5", + "sha256": "0bmcnnp43gsdhdcil3ny4sr4a4110gidssc80r0d162qhvf6kil3" } }, { @@ -123984,26 +124043,26 @@ "repo": "emacs-tree-sitter/tree-sitter-langs", "unstable": { "version": [ - 20250127, - 444 + 20250206, + 19 ], "deps": [ "tree-sitter" ], - "commit": "0b91637e22182f2102903ca7203909f1a0d16d3d", - "sha256": "1fv91sd9amy2q176q78kmlmjkfs14v67plgv6g0nnjxa1dhjmz7h" + "commit": "2ff446b4b813543b7a90015808d38f362f039b10", + "sha256": "0dnm1iph0ysa797npc9flinyh7vc55lqgv7k5k2gsn3bibm85blc" }, "stable": { "version": [ 0, 12, - 249 + 255 ], "deps": [ "tree-sitter" ], - "commit": "0b91637e22182f2102903ca7203909f1a0d16d3d", - "sha256": "1fv91sd9amy2q176q78kmlmjkfs14v67plgv6g0nnjxa1dhjmz7h" + "commit": "2ff446b4b813543b7a90015808d38f362f039b10", + "sha256": "0dnm1iph0ysa797npc9flinyh7vc55lqgv7k5k2gsn3bibm85blc" } }, { @@ -125135,14 +125194,14 @@ "repo": "deadblackclover/twtxt-el", "unstable": { "version": [ - 20250127, - 1521 + 20250208, + 1103 ], "deps": [ "request" ], - "commit": "61285bbce14b82a587737db1eefd3439dc83eb65", - "sha256": "0dsiyw7rggjy7w29wxlgsnbdz3ishk40is7jf6vmjwwfbr0z9ch4" + "commit": "401f8c8371855396a530dbe98ac7f0adf58fe40c", + "sha256": "0ci3zynrhpibxlvyzsbyjcg2mync0h3f6811wamz2b2m0q9fxb8x" } }, { @@ -126162,14 +126221,14 @@ "repo": "tbanel/uniline", "unstable": { "version": [ - 20250129, - 750 + 20250207, + 810 ], "deps": [ "hydra" ], - "commit": "3dd0f62e98a79f3d45670adc5369cb47812b09ff", - "sha256": "1fi12la3im819ig1fnhx8ckzdivm1f04apik17hd4aj56x427m73" + "commit": "a5781dc09035faf81e404578f8834d3ee11af0e5", + "sha256": "0r83nwf23kd4ash4pyy65x1pcmb53c464r891nwmfa52lg0br29h" } }, { @@ -127926,14 +127985,14 @@ "repo": "minad/vertico", "unstable": { "version": [ - 20250128, - 1729 + 20250203, + 1055 ], "deps": [ "compat" ], - "commit": "5679dfd6aa05fb38773cf5551aef1b657b73ac78", - "sha256": "1cqcxw5cjf0r7npdx69h78xn374j0r8r6bz4a2ybpk9bdzj2m9bm" + "commit": "e69ef62ffa4bc42dd42437881c251ecdcae0e0c5", + "sha256": "1s0m38nxrlgcmr4nd02p33hi6bf60jswmysvlv1q5vvpygq4j84z" }, "stable": { "version": [ @@ -128561,8 +128620,7 @@ }, { "ename": "vlf", - "commit": "9116b11eb513dd9e1dc9542d274dd60f183b24c4", - "sha256": "1ipkv5kmda0l39xwbf7ns9p0mx3kb781mxsm9vmbkhr5x577s2j8", + "error": "No recipe info", "fetcher": "github", "repo": "m00natic/vlfi", "unstable": { @@ -128974,8 +129032,8 @@ "repo": "d12frosted/vulpea", "unstable": { "version": [ - 20250123, - 1936 + 20250207, + 1910 ], "deps": [ "dash", @@ -128983,8 +129041,8 @@ "org-roam", "s" ], - "commit": "70b99251321e2c8b4dc04409e06a8a68875357e8", - "sha256": "07f726m2qbwn7yh1q0p3qj3r4vjrah82wc5dblxw8mfrsl7yc6l9" + "commit": "15d5451cd51a88cc4241391466ad4a6d5eb61951", + "sha256": "1npgw0akgj2liga8ii9xxfb9gv9zfvwj8zf8saih3bpaw4bginj7" }, "stable": { "version": [ @@ -132815,20 +132873,20 @@ "repo": "zkry/yaml.el", "unstable": { "version": [ - 20241129, - 2114 + 20250208, + 1534 ], - "commit": "cd3edfc02cb12514426c00e07160b87bd8340f4a", - "sha256": "1018s84pdvr8s4dg1g827w0ss78fbs5xj41vglnm5p9np29gfafz" + "commit": "09e46d563f1f3ff948852e08360c7d3c76e2acba", + "sha256": "131g2nv18fjcqgc9v17b0a7zyw2m6ydbhj6riahihd340bci2s6w" }, "stable": { "version": [ - 0, - 5, - 5 + 1, + 2, + 0 ], - "commit": "70c4fcead97e9bd6594e418c922ae769818f4245", - "sha256": "0qq9jr1ihk1b5wfvppyvb8c2pq2gma9wysggd22iln4nqz2mjc81" + "commit": "09e46d563f1f3ff948852e08360c7d3c76e2acba", + "sha256": "131g2nv18fjcqgc9v17b0a7zyw2m6ydbhj6riahihd340bci2s6w" } }, { @@ -132941,11 +132999,11 @@ "repo": "mbj4668/yang-mode", "unstable": { "version": [ - 20190507, - 724 + 20250202, + 1003 ], - "commit": "4b4ab4d4a79d37d6c31c6ea7cccbc425e0b1eded", - "sha256": "0sqp8vwlymwl2dp6bh1gf8725j1fd9sqj4qfgva09rmkq8fdivfm" + "commit": "b7a4c1734a60f70d80d5752ae058232df0b18336", + "sha256": "17y5378w7i7sn3r8wp2dfllncmsbq53ah5nkjrjjcbrlk8k2qxqz" }, "stable": { "version": [ @@ -134887,14 +134945,14 @@ "repo": "fourier/ztree", "unstable": { "version": [ - 20210415, - 1947 + 20250209, + 109 ], "deps": [ "cl-lib" ], - "commit": "f05677f9696e573c8c607e8876fb4a0cccbc491f", - "sha256": "1kav7xiarm0dgvgxf49qqcy2jp388b51x3qb92dyd3i73n6bk09j" + "commit": "a13ea87e2845644211b8f5912b5cb3dfa8627630", + "sha256": "1ldd8nij22v6zi3d8idsv85c33vzb230r6lx0hmjhqy0lqn2dgq3" } }, { From 6aab9e66cb7aec84527be698330bb63406c650a9 Mon Sep 17 00:00:00 2001 From: Lin Jian Date: Mon, 10 Feb 2025 01:54:51 +0800 Subject: [PATCH 204/343] nongnu-packages: updated 2025-02-10 (from overlay) --- .../emacs/elisp-packages/nongnu-generated.nix | 211 +++++++++++++++--- 1 file changed, 180 insertions(+), 31 deletions(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix b/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix index 120bd656f5cc5..3e9ac5c7a8dca 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix @@ -830,6 +830,28 @@ }; } ) { }; + datetime = callPackage ( + { + elpaBuild, + extmap, + fetchurl, + lib, + }: + elpaBuild { + pname = "datetime"; + ename = "datetime"; + version = "0.10.2"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/datetime-0.10.2.tar"; + sha256 = "1mpsk5zrl7kja0pk6fw1qw2drq3laphmnnj8ppr0ahinyrqy05kw"; + }; + packageRequires = [ extmap ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/datetime.html"; + license = lib.licenses.free; + }; + } + ) { }; denote-refs = callPackage ( { denote, @@ -1613,6 +1635,27 @@ }; } ) { }; + extmap = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "extmap"; + ename = "extmap"; + version = "1.3"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/extmap-1.3.tar"; + sha256 = "0k4xh101wi3jby74a44mlqsqinsfsjdrv2k19aanp6xvl60smb04"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/extmap.html"; + license = lib.licenses.free; + }; + } + ) { }; flx = callPackage ( { cl-lib ? null, @@ -3008,6 +3051,112 @@ }; } ) { }; + llama = callPackage ( + { + compat, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "llama"; + ename = "llama"; + version = "0.6.0"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/llama-0.6.0.tar"; + sha256 = "14rfpi40rhn906s4glj565v1b1kd7fa668sq7b7hh83pq47iylyr"; + }; + packageRequires = [ compat ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/llama.html"; + license = lib.licenses.free; + }; + } + ) { }; + logview = callPackage ( + { + compat, + datetime, + elpaBuild, + extmap, + fetchurl, + lib, + }: + elpaBuild { + pname = "logview"; + ename = "logview"; + version = "0.19.1"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/logview-0.19.1.tar"; + sha256 = "0gg393ygrqyghmaa0ykml9dfkxj13bh5pw82hiahmngy5lrygb26"; + }; + packageRequires = [ + compat + datetime + extmap + ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/logview.html"; + license = lib.licenses.free; + }; + } + ) { }; + loopy = callPackage ( + { + compat, + elpaBuild, + fetchurl, + lib, + map, + seq, + stream, + }: + elpaBuild { + pname = "loopy"; + ename = "loopy"; + version = "0.14.0"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/loopy-0.14.0.tar"; + sha256 = "0kfa4rqmnc26nzwff4bd50rkpclmxpmw9r5hhnfasmm6k2m7fmpj"; + }; + packageRequires = [ + compat + map + seq + stream + ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/loopy.html"; + license = lib.licenses.free; + }; + } + ) { }; + loopy-dash = callPackage ( + { + dash, + elpaBuild, + fetchurl, + lib, + loopy, + }: + elpaBuild { + pname = "loopy-dash"; + ename = "loopy-dash"; + version = "0.13.0"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/loopy-dash-0.13.0.tar"; + sha256 = "1hylniv839x8cl4nbdl64s4h1cnmbwfl47138z32bgdmcv1kbxqi"; + }; + packageRequires = [ + dash + loopy + ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/loopy-dash.html"; + license = lib.licenses.free; + }; + } + ) { }; lorem-ipsum = callPackage ( { elpaBuild, @@ -3061,10 +3210,10 @@ elpaBuild { pname = "macrostep"; ename = "macrostep"; - version = "0.9.4"; + version = "0.9.5"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/macrostep-0.9.4.tar"; - sha256 = "01n3qhxfjd9vg93ddrhnm275v24ih5qczkphc232m0csswxghpdk"; + url = "https://elpa.nongnu.org/nongnu/macrostep-0.9.5.tar"; + sha256 = "16nl81hsbkiwwsy7gcg150xpf8k1899afcsnr1h25z2z6qz3bp9l"; }; packageRequires = [ cl-lib @@ -3079,10 +3228,10 @@ magit = callPackage ( { compat, - dash, elpaBuild, fetchurl, lib, + llama, magit-section, seq, transient, @@ -3091,14 +3240,14 @@ elpaBuild { pname = "magit"; ename = "magit"; - version = "4.2.0"; + version = "4.3.0"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/magit-4.2.0.tar"; - sha256 = "04nf4ff7a11z65mcw6qnkxwk9srpi248f1k0li947i4264gl3prd"; + url = "https://elpa.nongnu.org/nongnu/magit-4.3.0.tar"; + sha256 = "0s9i6pn7j36yvd6nhrnkj7amrgywv02bxhxyg2ac56gsf9bwgqas"; }; packageRequires = [ compat - dash + llama magit-section seq transient @@ -3113,23 +3262,23 @@ magit-section = callPackage ( { compat, - dash, elpaBuild, fetchurl, lib, + llama, seq, }: elpaBuild { pname = "magit-section"; ename = "magit-section"; - version = "4.2.0"; + version = "4.3.0"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/magit-section-4.2.0.tar"; - sha256 = "05wlc327x45vfsphwz9bf1hl8w46ychqkp6j7wsngjzwzsifxmb4"; + url = "https://elpa.nongnu.org/nongnu/magit-section-4.3.0.tar"; + sha256 = "0f6axq5iqfwlbzllzvqd6yk3p8l7ny624qlmnidrynij53rycy0n"; }; packageRequires = [ compat - dash + llama seq ]; meta = { @@ -3171,10 +3320,10 @@ elpaBuild { pname = "mastodon"; ename = "mastodon"; - version = "1.1.8"; + version = "1.1.9"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/mastodon-1.1.8.tar"; - sha256 = "06jy1n7ikz4xdpw4rkma596pqgkxcmh7qfkz93584rjfqav88anl"; + url = "https://elpa.nongnu.org/nongnu/mastodon-1.1.9.tar"; + sha256 = "01csrqkbjch7cxvmsp8lp3ipaijsqbr230nmk0ss2q19rkmh4sc9"; }; packageRequires = [ persist @@ -3289,10 +3438,10 @@ elpaBuild { pname = "moe-theme"; ename = "moe-theme"; - version = "1.0.2"; + version = "1.1.0"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/moe-theme-1.0.2.tar"; - sha256 = "13c4rj0c9fi4nipzsrmvgb8ddvk3dckijga07yxp71x5ba6mrp2n"; + url = "https://elpa.nongnu.org/nongnu/moe-theme-1.1.0.tar"; + sha256 = "103xs821rvq3dq886jy53rc3lycv7xzyr69x1a4yn4lbyf5q4bp6"; }; packageRequires = [ ]; meta = { @@ -4073,10 +4222,10 @@ elpaBuild { pname = "racket-mode"; ename = "racket-mode"; - version = "1.0.20250125.153651"; + version = "1.0.20250205.162816"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/racket-mode-1.0.20250125.153651.tar"; - sha256 = "0sr2m99mnkjh2byxmy3pgn3gbzyrj64xjkcgwrjd5g4hyci7pdvq"; + url = "https://elpa.nongnu.org/nongnu/racket-mode-1.0.20250205.162816.tar"; + sha256 = "0mzm7qd89z6y5ivc7qfsahmlhamxr9rpxzm9arbx2hbnqlhj1il5"; }; packageRequires = [ ]; meta = { @@ -4475,10 +4624,10 @@ elpaBuild { pname = "solarized-theme"; ename = "solarized-theme"; - version = "2.0.1"; + version = "2.0.4"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/solarized-theme-2.0.1.tar"; - sha256 = "1lk1g8v2chjrbbxplw3pd7yn3syjgywxkbdc7dbd76x168qz54qx"; + url = "https://elpa.nongnu.org/nongnu/solarized-theme-2.0.4.tar"; + sha256 = "03vrgs29ifpvsxd4278fx7rmpd0d5ilwl8v1qgrz9gk6bnzphb9f"; }; packageRequires = [ ]; meta = { @@ -4887,10 +5036,10 @@ elpaBuild { pname = "tp"; ename = "tp"; - version = "0.6"; + version = "0.7"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/tp-0.6.tar"; - sha256 = "1a4n6bhaxiiwy11ig09w7p1jxrsl5gfk7ikma9jzv2z54f2p97kz"; + url = "https://elpa.nongnu.org/nongnu/tp-0.7.tar"; + sha256 = "048z3g0gv7brsl546s530b6si2rjhy3mm8y0jdcp14fza4srpliv"; }; packageRequires = [ transient ]; meta = { @@ -5319,10 +5468,10 @@ elpaBuild { pname = "xah-fly-keys"; ename = "xah-fly-keys"; - version = "26.9.20250124153828"; + version = "26.9.20250205172500"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/xah-fly-keys-26.9.20250124153828.tar"; - sha256 = "1c10mlrwnchaf1rpchjglxbd6llh10v1cqg2980kwd7jx56zajm3"; + url = "https://elpa.nongnu.org/nongnu/xah-fly-keys-26.9.20250205172500.tar"; + sha256 = "1la0chy12vbm4wcmgc6iwbmbn9zaiz8xfpp1c11lp3dsv1w5gfj3"; }; packageRequires = [ ]; meta = { From 615d2b02a8a482c3a8c22ba94a270adee92156a9 Mon Sep 17 00:00:00 2001 From: Lin Jian Date: Mon, 10 Feb 2025 01:54:51 +0800 Subject: [PATCH 205/343] nongnu-devel-packages: updated 2025-02-10 (from overlay) --- .../elisp-packages/nongnu-devel-generated.nix | 313 +++++++++++++----- 1 file changed, 231 insertions(+), 82 deletions(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/nongnu-devel-generated.nix b/pkgs/applications/editors/emacs/elisp-packages/nongnu-devel-generated.nix index 5ba2340265845..a27a50dda1fc8 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/nongnu-devel-generated.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/nongnu-devel-generated.nix @@ -9,10 +9,10 @@ elpaBuild { pname = "adoc-mode"; ename = "adoc-mode"; - version = "0.8.0snapshot0.20240218.103518"; + version = "0.8.0snapshot0.20250206.83825"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/adoc-mode-0.8.0snapshot0.20240218.103518.tar"; - sha256 = "149cj68amidnb9pgg3xh6bpfaxbcqlv5wnacajp4pr4cn5byr0sy"; + url = "https://elpa.nongnu.org/nongnu-devel/adoc-mode-0.8.0snapshot0.20250206.83825.tar"; + sha256 = "0b9lbxk5q0hr7j86wpxrkbg626srkc9jhycqi7qb3yqsn1pr4khc"; }; packageRequires = [ ]; meta = { @@ -807,6 +807,28 @@ }; } ) { }; + datetime = callPackage ( + { + elpaBuild, + extmap, + fetchurl, + lib, + }: + elpaBuild { + pname = "datetime"; + ename = "datetime"; + version = "0.10.3snapshot0.20250203.204701"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/datetime-0.10.3snapshot0.20250203.204701.tar"; + sha256 = "0l9z5bqbxbn456rin27x4zfa5pjvqjr2vhzxpgssrndm7bprm614"; + }; + packageRequires = [ extmap ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/datetime.html"; + license = lib.licenses.free; + }; + } + ) { }; denote-refs = callPackage ( { denote, @@ -880,10 +902,10 @@ elpaBuild { pname = "diff-ansi"; ename = "diff-ansi"; - version = "0.2.0.20241208.51148"; + version = "0.2.0.20250208.231709"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/diff-ansi-0.2.0.20241208.51148.tar"; - sha256 = "08fvdzs2qmd4mbcz52bhmng2wz2pxn9x06w5sg9fjq744005p7dd"; + url = "https://elpa.nongnu.org/nongnu-devel/diff-ansi-0.2.0.20250208.231709.tar"; + sha256 = "0cpnac241jsz5zrwyhyrx6m9qk09bcc1c9xphh9ss0y04rkmdghn"; }; packageRequires = [ ]; meta = { @@ -902,10 +924,10 @@ elpaBuild { pname = "dirvish"; ename = "dirvish"; - version = "2.0.53.0.20250117.153934"; + version = "2.0.53.0.20250206.25042"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/dirvish-2.0.53.0.20250117.153934.tar"; - sha256 = "1k886i4l7qcrdxdhm0arc2fg796fa4gz75vkp4q5fnvvbirwlqvc"; + url = "https://elpa.nongnu.org/nongnu-devel/dirvish-2.0.53.0.20250206.25042.tar"; + sha256 = "0nvwss3ckcqnfmq8mk3zxrbvg5d71h4zxbf2x7hlgd79izmyqpkb"; }; packageRequires = [ transient ]; meta = { @@ -923,10 +945,10 @@ elpaBuild { pname = "doc-show-inline"; ename = "doc-show-inline"; - version = "0.1.0.20241208.50508"; + version = "0.1.0.20250209.60743"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/doc-show-inline-0.1.0.20241208.50508.tar"; - sha256 = "1k98b8d0bxiz7i4n4r46zxy14jszskfmvxavwriig59p2g5gx1yb"; + url = "https://elpa.nongnu.org/nongnu-devel/doc-show-inline-0.1.0.20250209.60743.tar"; + sha256 = "172shyhapbfllc2pv5wrbp58qxfp10gmz49ny5av4yf3ayqd6cm5"; }; packageRequires = [ ]; meta = { @@ -1030,10 +1052,10 @@ elpaBuild { pname = "eat"; ename = "eat"; - version = "0.9.4.0.20240314.193241"; + version = "0.9.4.0.20250206.4447"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/eat-0.9.4.0.20240314.193241.tar"; - sha256 = "1ry5mlg9wmdr4n5zjq1n45z0xhnrpgjyr6611xd9j43i6dnldb38"; + url = "https://elpa.nongnu.org/nongnu-devel/eat-0.9.4.0.20250206.4447.tar"; + sha256 = "1fhj3bi2hdgclgb4b74yqzhxw77k30nrnww4phgzkngyxwp11xcm"; }; packageRequires = [ compat ]; meta = { @@ -1595,6 +1617,27 @@ }; } ) { }; + extmap = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "extmap"; + ename = "extmap"; + version = "1.3.1snapshot0.20250203.193959"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/extmap-1.3.1snapshot0.20250203.193959.tar"; + sha256 = "16sfa2zv0g7dz1zflg848dh643c8vfrb93blqvnd1vmlmf3bsyqy"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/extmap.html"; + license = lib.licenses.free; + }; + } + ) { }; flx = callPackage ( { cl-lib ? null, @@ -1652,10 +1695,10 @@ elpaBuild { pname = "flycheck"; ename = "flycheck"; - version = "35.0snapshot0.20250109.71404"; + version = "35.0snapshot0.20250201.75945"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/flycheck-35.0snapshot0.20250109.71404.tar"; - sha256 = "1rm45wl7cpsr9h98xc2k1j628sdkpp9b9fy6bn9axnpxhl0kzsfi"; + url = "https://elpa.nongnu.org/nongnu-devel/flycheck-35.0snapshot0.20250201.75945.tar"; + sha256 = "1sd7ayqw1jv86yy84jvw708kzxmx1js754yx7l4ijp76dgb7pwsm"; }; packageRequires = [ ]; meta = { @@ -2306,10 +2349,10 @@ elpaBuild { pname = "gptel"; ename = "gptel"; - version = "0.9.7.0.20250131.323"; + version = "0.9.7.0.20250208.194452"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/gptel-0.9.7.0.20250131.323.tar"; - sha256 = "0s9k7p40dbmfirvhv1bzf0pd08f3j507gszrs99wdpx4ihikayfj"; + url = "https://elpa.nongnu.org/nongnu-devel/gptel-0.9.7.0.20250208.194452.tar"; + sha256 = "0j2czjinfzpp0ra3c1l9gkhhw65k9kgjbkgqkdf9a1f0szxsjlck"; }; packageRequires = [ compat @@ -2437,10 +2480,10 @@ elpaBuild { pname = "haskell-mode"; ename = "haskell-mode"; - version = "17.5.0.20250116.195415"; + version = "17.5.0.20250205.144004"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/haskell-mode-17.5.0.20250116.195415.tar"; - sha256 = "1fy2fk0is5f1a5k6fm70c3gmbc6nn50c2bfs8nk23105l5y6cdvk"; + url = "https://elpa.nongnu.org/nongnu-devel/haskell-mode-17.5.0.20250205.144004.tar"; + sha256 = "1p3dgr8zyv3ir34x9nbgbz67bpb491kd45haplvk8c32xddli8c3"; }; packageRequires = [ ]; meta = { @@ -2480,10 +2523,10 @@ elpaBuild { pname = "haskell-ts-mode"; ename = "haskell-ts-mode"; - version = "1.0.20250126.114656"; + version = "1.0.20250202.61612"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/haskell-ts-mode-1.0.20250126.114656.tar"; - sha256 = "07jscrfjw3wm6ra9pikr3n6md7j4qsgfnzi3lflja196pxg93z7j"; + url = "https://elpa.nongnu.org/nongnu-devel/haskell-ts-mode-1.0.20250202.61612.tar"; + sha256 = "1i3is0js2sjr61bd7w1jz05a9gl4aj5b0ivar5iq1l0kmnhq7w54"; }; packageRequires = [ ]; meta = { @@ -2503,10 +2546,10 @@ elpaBuild { pname = "helm"; ename = "helm"; - version = "4.0.0.20250130.110027"; + version = "4.0.0.20250208.103323"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/helm-4.0.0.20250130.110027.tar"; - sha256 = "1hqzi6a9lb11qqr5g1p5az1albjcl3cl3ihsffbkr0z6bqsqhxmq"; + url = "https://elpa.nongnu.org/nongnu-devel/helm-4.0.0.20250208.103323.tar"; + sha256 = "0gs5n6qfhq6b8mgqfmiaqaziw4p5r4w22m9fcj2dxvp3vm2nrk5m"; }; packageRequires = [ helm-core @@ -2528,10 +2571,10 @@ elpaBuild { pname = "helm-core"; ename = "helm-core"; - version = "4.0.0.20250130.110027"; + version = "4.0.0.20250208.103323"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/helm-core-4.0.0.20250130.110027.tar"; - sha256 = "0gim7bjf1xmx1jflxb56dwv9wfijmcq7adyiz1zqqvyk2r9s2hwa"; + url = "https://elpa.nongnu.org/nongnu-devel/helm-core-4.0.0.20250208.103323.tar"; + sha256 = "14h1kh1ng6dfhgg062civsh0r6gsnsaw48h5h1b726ypdd5lgh4c"; }; packageRequires = [ async ]; meta = { @@ -2992,6 +3035,112 @@ }; } ) { }; + llama = callPackage ( + { + compat, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "llama"; + ename = "llama"; + version = "0.6.0.0.20250201.130026"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/llama-0.6.0.0.20250201.130026.tar"; + sha256 = "09z94xb9hm4769fsw91aiw2lp1lv3siqa6gk3ik77591bzbax2l0"; + }; + packageRequires = [ compat ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/llama.html"; + license = lib.licenses.free; + }; + } + ) { }; + logview = callPackage ( + { + compat, + datetime, + elpaBuild, + extmap, + fetchurl, + lib, + }: + elpaBuild { + pname = "logview"; + ename = "logview"; + version = "0.19.2snapshot0.20250203.195605"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/logview-0.19.2snapshot0.20250203.195605.tar"; + sha256 = "16mr8ki4xg2yqday18x3a3fcbj8krcmwrj09xww43c8rhkixnk4k"; + }; + packageRequires = [ + compat + datetime + extmap + ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/logview.html"; + license = lib.licenses.free; + }; + } + ) { }; + loopy = callPackage ( + { + compat, + elpaBuild, + fetchurl, + lib, + map, + seq, + stream, + }: + elpaBuild { + pname = "loopy"; + ename = "loopy"; + version = "0.14.0.0.20250208.155652"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/loopy-0.14.0.0.20250208.155652.tar"; + sha256 = "0sg2kkggg8sb5dmydglka6g84ljlj393yv5vbz51ysjc74cfvcxz"; + }; + packageRequires = [ + compat + map + seq + stream + ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/loopy.html"; + license = lib.licenses.free; + }; + } + ) { }; + loopy-dash = callPackage ( + { + dash, + elpaBuild, + fetchurl, + lib, + loopy, + }: + elpaBuild { + pname = "loopy-dash"; + ename = "loopy-dash"; + version = "0.13.0.0.20250114.23438"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/loopy-dash-0.13.0.0.20250114.23438.tar"; + sha256 = "1gbhs3agzf5pg6x3c87ccwxwfppg27jh6zpjc12hv9fgj5pajir3"; + }; + packageRequires = [ + dash + loopy + ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/loopy-dash.html"; + license = lib.licenses.free; + }; + } + ) { }; lorem-ipsum = callPackage ( { elpaBuild, @@ -3045,10 +3194,10 @@ elpaBuild { pname = "macrostep"; ename = "macrostep"; - version = "0.9.4.0.20241228.221506"; + version = "0.9.5.0.20250202.220532"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/macrostep-0.9.4.0.20241228.221506.tar"; - sha256 = "0yza9ms8i3nq4fh42s475r0m77b2phq8sx41p6irywi0clc33m0y"; + url = "https://elpa.nongnu.org/nongnu-devel/macrostep-0.9.5.0.20250202.220532.tar"; + sha256 = "089kw24sl8dm1dk45r0gj2h2y0pxazwcp7z5z0pvmnln98mgy4i1"; }; packageRequires = [ cl-lib @@ -3063,10 +3212,10 @@ magit = callPackage ( { compat, - dash, elpaBuild, fetchurl, lib, + llama, magit-section, seq, transient, @@ -3075,14 +3224,14 @@ elpaBuild { pname = "magit"; ename = "magit"; - version = "4.2.0.0.20250130.203401"; + version = "4.3.0.0.20250204.133404"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/magit-4.2.0.0.20250130.203401.tar"; - sha256 = "08lmpmnm6fxlfyildvc5i7ds2y917k104hplxxygj9k36h3nsxpx"; + url = "https://elpa.nongnu.org/nongnu-devel/magit-4.3.0.0.20250204.133404.tar"; + sha256 = "1bj6sqb54lzdnk31lwxmgzgwgy5j55i29z8ad5m9sxjxxzlg700m"; }; packageRequires = [ compat - dash + llama magit-section seq transient @@ -3097,23 +3246,23 @@ magit-section = callPackage ( { compat, - dash, elpaBuild, fetchurl, lib, + llama, seq, }: elpaBuild { pname = "magit-section"; ename = "magit-section"; - version = "4.2.0.0.20250130.203401"; + version = "4.3.0.0.20250204.133404"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/magit-section-4.2.0.0.20250130.203401.tar"; - sha256 = "0d6mj4is9gq1acr62kcxn48i4qxrr1fxaihl2k4lvn400i3n7n1n"; + url = "https://elpa.nongnu.org/nongnu-devel/magit-section-4.3.0.0.20250204.133404.tar"; + sha256 = "1c7zmjpvqqgybmws7wr7bh1nhp26r3v3mr7a7yhdhaij1xwxjjj2"; }; packageRequires = [ compat - dash + llama seq ]; meta = { @@ -3155,10 +3304,10 @@ elpaBuild { pname = "mastodon"; ename = "mastodon"; - version = "1.1.8.0.20241223.104057"; + version = "1.1.9.0.20250204.190250"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/mastodon-1.1.8.0.20241223.104057.tar"; - sha256 = "13iyzv0gyad07215zvvs9q52ikqf97qn851qgjqqhq9k4p07a22q"; + url = "https://elpa.nongnu.org/nongnu-devel/mastodon-1.1.9.0.20250204.190250.tar"; + sha256 = "1gw9gihf6wsgzaj4waf10blj9gm1iipfmrxawr7idsv4i91crrky"; }; packageRequires = [ persist @@ -3231,10 +3380,10 @@ elpaBuild { pname = "meow"; ename = "meow"; - version = "1.5.0.0.20250129.180058"; + version = "1.5.0.0.20250201.191149"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/meow-1.5.0.0.20250129.180058.tar"; - sha256 = "1wz5bnwqmnd0mc9i3lfhlx756ndr99zzk3r2c3xhl1zq77ya5x9i"; + url = "https://elpa.nongnu.org/nongnu-devel/meow-1.5.0.0.20250201.191149.tar"; + sha256 = "0vvss5l1j1wa6brwlsskdgq11j4vr36i5cl2sfdzafiza4qbh56l"; }; packageRequires = [ ]; meta = { @@ -3273,10 +3422,10 @@ elpaBuild { pname = "moe-theme"; ename = "moe-theme"; - version = "1.0.2.0.20240716.85432"; + version = "1.1.0.0.20250203.180833"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/moe-theme-1.0.2.0.20240716.85432.tar"; - sha256 = "0xcqpdw7p6mphgrjl93cv25zj63r8bi1zi8jzd65k5s6sxlvz7bs"; + url = "https://elpa.nongnu.org/nongnu-devel/moe-theme-1.1.0.0.20250203.180833.tar"; + sha256 = "1vazqmwvn0cpzni1hyjilcdq2zynl4gijkrkhdgaqnskzqp437rm"; }; packageRequires = [ ]; meta = { @@ -3986,10 +4135,10 @@ elpaBuild { pname = "projectile"; ename = "projectile"; - version = "2.9.0snapshot0.20250131.82243"; + version = "2.9.0snapshot0.20250209.60525"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/projectile-2.9.0snapshot0.20250131.82243.tar"; - sha256 = "08wqqxacsaclqlprvb0y67qivrx3zlhkhp033rc1845xc25cca7j"; + url = "https://elpa.nongnu.org/nongnu-devel/projectile-2.9.0snapshot0.20250209.60525.tar"; + sha256 = "00x2xilxzgckv8i0bjq8zpwm6l7j8ac55hld7vf4iyzv100jhf9g"; }; packageRequires = [ ]; meta = { @@ -4050,10 +4199,10 @@ elpaBuild { pname = "racket-mode"; ename = "racket-mode"; - version = "1.0.20250125.153651"; + version = "1.0.20250205.162816"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/racket-mode-1.0.20250125.153651.tar"; - sha256 = "15idfhphnm7sqk03arvb6nqm0kc26c9plx6lc39y26pngbnphwy7"; + url = "https://elpa.nongnu.org/nongnu-devel/racket-mode-1.0.20250205.162816.tar"; + sha256 = "1cq7yl4g7s4gvzfqfkxnx0k507xws5d8iy1lnawwclw7gsc4y9hk"; }; packageRequires = [ ]; meta = { @@ -4393,10 +4542,10 @@ elpaBuild { pname = "slime"; ename = "slime"; - version = "2.31snapshot0.20250126.224330"; + version = "2.31snapshot0.20250203.182938"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/slime-2.31snapshot0.20250126.224330.tar"; - sha256 = "1x5q759n06f499ivzplb16wxrid5kjnwnf6yia8rbp9dp09ksada"; + url = "https://elpa.nongnu.org/nongnu-devel/slime-2.31snapshot0.20250203.182938.tar"; + sha256 = "179h8fk5hkdcbq4w9gdcqc8gs4pafl5kdy3818vsmvgvfy6rvzq6"; }; packageRequires = [ macrostep ]; meta = { @@ -4414,10 +4563,10 @@ elpaBuild { pname = "sly"; ename = "sly"; - version = "1.0.43.0.20240809.211904"; + version = "1.0.43.0.20250203.154027"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/sly-1.0.43.0.20240809.211904.tar"; - sha256 = "1np4rciwcijr6bv13s5vvl95wl28ad60snr6wdbjh7ya922x37rv"; + url = "https://elpa.nongnu.org/nongnu-devel/sly-1.0.43.0.20250203.154027.tar"; + sha256 = "1w1h6zh5r1b2q1m01jbw92x5mdnq7g97g282899crqzfbirj4xds"; }; packageRequires = [ ]; meta = { @@ -4457,10 +4606,10 @@ elpaBuild { pname = "solarized-theme"; ename = "solarized-theme"; - version = "2.0.1.0.20240725.161711"; + version = "2.0.4.0.20250204.123251"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/solarized-theme-2.0.1.0.20240725.161711.tar"; - sha256 = "1d3m6h00awq2az6vkal631k9l1jpqm2qxr1067rzd1q2qdlaf2ji"; + url = "https://elpa.nongnu.org/nongnu-devel/solarized-theme-2.0.4.0.20250204.123251.tar"; + sha256 = "1vhzxz5nlx59kmxscf1jxwkb3bsjp0h0yk2dr777inyi5dqpi8gl"; }; packageRequires = [ ]; meta = { @@ -4847,10 +4996,10 @@ elpaBuild { pname = "tp"; ename = "tp"; - version = "0.6.0.20250103.142809"; + version = "0.7.0.20250206.81229"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/tp-0.6.0.20250103.142809.tar"; - sha256 = "19mrjhi7qxwxp1shqqvkpmj49kari9g74wym3v2k80586kj2j0cm"; + url = "https://elpa.nongnu.org/nongnu-devel/tp-0.7.0.20250206.81229.tar"; + sha256 = "14zhky7jf0afmsxrhkyvgzqh4k2yf1p829j77ryw741swj75z3av"; }; packageRequires = [ transient ]; meta = { @@ -4868,10 +5017,10 @@ elpaBuild { pname = "treesit-fold"; ename = "treesit-fold"; - version = "0.1.0.0.20240630.204821"; + version = "0.1.0.0.20250118.220609"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/treesit-fold-0.1.0.0.20240630.204821.tar"; - sha256 = "1h99gh11xhmzs7ix94y609sijdchz692ixkxxsmnxbrniybpfcsv"; + url = "https://elpa.nongnu.org/nongnu-devel/treesit-fold-0.1.0.0.20250118.220609.tar"; + sha256 = "02fr515bjn6l9pn54gqx3v1vp88fh5i0l03gaqfwja0kmfvyf9k1"; }; packageRequires = [ ]; meta = { @@ -5081,10 +5230,10 @@ elpaBuild { pname = "vm"; ename = "vm"; - version = "8.3.0snapshot0.20250130.63839"; + version = "8.3.0snapshot0.20250208.60553"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/vm-8.3.0snapshot0.20250130.63839.tar"; - sha256 = "1irvc02mr9ik4ib565sn3dwhxmihrlj3dz7bhgi16126gaai19j7"; + url = "https://elpa.nongnu.org/nongnu-devel/vm-8.3.0snapshot0.20250208.60553.tar"; + sha256 = "0d2m9q8zwpd2i0zvcmkasp59ihsymmqyg8c0a1wp72akffxh3if1"; }; packageRequires = [ cl-lib @@ -5326,10 +5475,10 @@ elpaBuild { pname = "xah-fly-keys"; ename = "xah-fly-keys"; - version = "26.9.20250124153828.0.20250124.154020"; + version = "26.9.20250205172500.0.20250205.172824"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/xah-fly-keys-26.9.20250124153828.0.20250124.154020.tar"; - sha256 = "0mhpjml1zx8vha0grmaw9xx08sx5h5kh33sb1i0w00r4bpw56dzq"; + url = "https://elpa.nongnu.org/nongnu-devel/xah-fly-keys-26.9.20250205172500.0.20250205.172824.tar"; + sha256 = "0229g7p910515dysr0pv4cxgzk2nmcc4yx1f7vdz78qqppfv7qfa"; }; packageRequires = [ ]; meta = { From c84f2307832dcde0afc5a341facd0616cc4659de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 9 Feb 2025 13:09:21 -0800 Subject: [PATCH 206/343] selenium-manager: disable telemetry --- .../se/selenium-manager/disable-telemetry.patch | 13 +++++++++++++ pkgs/by-name/se/selenium-manager/package.nix | 8 +++++++- 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 pkgs/by-name/se/selenium-manager/disable-telemetry.patch diff --git a/pkgs/by-name/se/selenium-manager/disable-telemetry.patch b/pkgs/by-name/se/selenium-manager/disable-telemetry.patch new file mode 100644 index 0000000000000..0591c5b2d438a --- /dev/null +++ b/pkgs/by-name/se/selenium-manager/disable-telemetry.patch @@ -0,0 +1,13 @@ +diff --git a/rust/src/config.rs b/rust/src/config.rs +index f7cd4f32ec..ec454127be 100644 +--- a/rust/src/config.rs ++++ b/rust/src/config.rs +@@ -120,7 +120,7 @@ impl ManagerConfig { + avoid_browser_download: BooleanKey("avoid-browser-download", false).get_value(), + language_binding: StringKey(vec!["language-binding"], "").get_value(), + selenium_version: StringKey(vec!["selenium-version"], "").get_value(), +- avoid_stats: BooleanKey("avoid-stats", false).get_value(), ++ avoid_stats: BooleanKey("avoid-stats", true).get_value(), + skip_driver_in_path: BooleanKey("skip-driver-in-path", false).get_value(), + skip_browser_in_path: BooleanKey("skip-browser-in-path", false).get_value(), + } diff --git a/pkgs/by-name/se/selenium-manager/package.nix b/pkgs/by-name/se/selenium-manager/package.nix index 1b236e269b395..9b33ee7b7672e 100644 --- a/pkgs/by-name/se/selenium-manager/package.nix +++ b/pkgs/by-name/se/selenium-manager/package.nix @@ -16,7 +16,13 @@ rustPlatform.buildRustPackage rec { hash = "sha256-b5xwuZ4lcwLbGhJuEmHYrFXoaTW/M0ABdK3dvbpj8oM="; }; - sourceRoot = "${src.name}/rust"; + patches = [ + ./disable-telemetry.patch + ]; + + postPatch = '' + cd rust + ''; useFetchCargoVendor = true; cargoHash = "sha256-hXtF3qFzzM2TqpEP9JWdi7uU5TgFHF9lZO5bmZcEuDk="; From b86432cf5fe4736af60ca9d21afe83f5c55e6a8c Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 9 Feb 2025 22:09:40 +0100 Subject: [PATCH 207/343] bpftools: fix build --- .../include-asm-types-for-ppc64le.patch | 13 ---------- pkgs/by-name/bp/bpftools/package.nix | 24 ------------------- 2 files changed, 37 deletions(-) delete mode 100644 pkgs/by-name/bp/bpftools/include-asm-types-for-ppc64le.patch diff --git a/pkgs/by-name/bp/bpftools/include-asm-types-for-ppc64le.patch b/pkgs/by-name/bp/bpftools/include-asm-types-for-ppc64le.patch deleted file mode 100644 index 47c8f8077a5a7..0000000000000 --- a/pkgs/by-name/bp/bpftools/include-asm-types-for-ppc64le.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/tools/include/uapi/linux/types.h b/tools/include/uapi/linux/types.h -index 91fa51a9c31d..bfbd9b47277f 100644 ---- a/tools/include/uapi/linux/types.h -+++ b/tools/include/uapi/linux/types.h -@@ -2,7 +2,7 @@ - #ifndef _UAPI_LINUX_TYPES_H - #define _UAPI_LINUX_TYPES_H - --#include -+#include - - /* copied from linux:include/uapi/linux/types.h */ - #define __bitwise diff --git a/pkgs/by-name/bp/bpftools/package.nix b/pkgs/by-name/bp/bpftools/package.nix index 6c3badae44110..19841f7768621 100644 --- a/pkgs/by-name/bp/bpftools/package.nix +++ b/pkgs/by-name/bp/bpftools/package.nix @@ -23,30 +23,6 @@ stdenv.mkDerivation rec { separateDebugInfo = true; - patches = [ - # fix unknown type name '__vector128' on ppc64le - ./include-asm-types-for-ppc64le.patch - # fix build for riscv64 - (fetchpatch { - # libbpf: Add missing per-arch include path - # https://patchwork.kernel.org/project/linux-riscv/patch/20240927131355.350918-1-bjorn@kernel.org/ - url = "https://patchwork.kernel.org/project/linux-riscv/patch/20240927131355.350918-1-bjorn@kernel.org/raw/"; - hash = "sha256-edXY/ejHW5L7rGgY5B2GmVZxUgnLdBadNhBOSAgcL7M="; - }) - (fetchpatch { - # selftests: bpf: Add missing per-arch include path - # https://patchwork.kernel.org/project/linux-riscv/patch/20240927131355.350918-2-bjorn@kernel.org/ - url = "https://patchwork.kernel.org/project/linux-riscv/patch/20240927131355.350918-2-bjorn@kernel.org/raw/"; - hash = "sha256-7yNWE/L/qd3vcLtJYoSyGxB3ytySlr20R0D3t5ni2Fc="; - }) - (fetchpatch { - # tools: Override makefile ARCH variable if defined, but empty - # https://patchwork.kernel.org/project/linux-riscv/patch/20241127101748.165693-1-bjorn@kernel.org/ - url = "https://patchwork.kernel.org/project/linux-riscv/patch/20241127101748.165693-1-bjorn@kernel.org/raw/"; - hash = "sha256-y8N71Hm1XfX9g3S6PzW2m7Lxp6wQQMfQE9L0QNt8cYY="; - }) - ]; - depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ python3 From 37372eb227a7324a1b03900d8776b013076d87dd Mon Sep 17 00:00:00 2001 From: Julien Langlois Date: Thu, 6 Feb 2025 01:40:10 -0500 Subject: [PATCH 208/343] nixos/postgresql/citus: fix syscall filter and add test --- .../modules/services/databases/postgresql.nix | 14 +++- nixos/tests/postgresql/citus.nix | 73 +++++++++++++++++++ nixos/tests/postgresql/default.nix | 1 + 3 files changed, 84 insertions(+), 4 deletions(-) create mode 100644 nixos/tests/postgresql/citus.nix diff --git a/nixos/modules/services/databases/postgresql.nix b/nixos/modules/services/databases/postgresql.nix index 51d707c6594be..7963b4152fe6d 100644 --- a/nixos/modules/services/databases/postgresql.nix +++ b/nixos/modules/services/databases/postgresql.nix @@ -727,10 +727,16 @@ in RestrictRealtime = true; RestrictSUIDSGID = true; SystemCallArchitectures = "native"; - SystemCallFilter = [ - "@system-service" - "~@privileged @resources" - ] ++ lib.optionals (any extensionInstalled [ "plv8" ]) [ "@pkey" ]; + SystemCallFilter = + [ + "@system-service" + "~@privileged @resources" + ] + ++ lib.optionals (any extensionInstalled [ "plv8" ]) [ "@pkey" ] + ++ lib.optionals (any extensionInstalled [ "citus" ]) [ + "getpriority" + "setpriority" + ]; UMask = if groupAccessAvailable then "0027" else "0077"; } (mkIf (cfg.dataDir != "/var/lib/postgresql/${cfg.package.psqlSchema}") { diff --git a/nixos/tests/postgresql/citus.nix b/nixos/tests/postgresql/citus.nix new file mode 100644 index 0000000000000..6739b32d5642b --- /dev/null +++ b/nixos/tests/postgresql/citus.nix @@ -0,0 +1,73 @@ +{ + pkgs, + makeTest, + genTests, +}: + +let + inherit (pkgs) lib; + + test-sql = pkgs.writeText "postgresql-test" '' + CREATE EXTENSION citus; + + CREATE TABLE examples ( + id bigserial, + shard_key int, + PRIMARY KEY (id, shard_key) + ); + + SELECT create_distributed_table('examples', 'shard_key'); + + INSERT INTO examples (shard_key) SELECT shard % 10 FROM generate_series(1,1000) shard; + ''; + + makeTestFor = + package: + makeTest { + name = "citus-${package.name}"; + meta = with lib.maintainers; { + maintainers = [ typetetris ]; + }; + + nodes.machine = + { ... }: + { + services.postgresql = { + inherit package; + enable = true; + enableJIT = lib.hasInfix "-jit-" package.name; + extensions = + ps: with ps; [ + citus + ]; + settings = { + shared_preload_libraries = "citus"; + }; + }; + }; + + testScript = '' + def check_count(statement, lines): + return 'test $(sudo -u postgres psql postgres -tAc "{}") -eq {}'.format( + statement, lines + ) + + + machine.start() + machine.wait_for_unit("postgresql") + + with subtest("Postgresql with extension citus is available just after unit start"): + machine.succeed( + "sudo -u postgres psql -f ${test-sql}" + ) + + machine.succeed(check_count("SELECT count(*) FROM examples;", 1000)) + + machine.shutdown() + ''; + }; +in +genTests { + inherit makeTestFor; + filter = _: p: !p.pkgs.citus.meta.broken; +} diff --git a/nixos/tests/postgresql/default.nix b/nixos/tests/postgresql/default.nix index 91f7694208b19..474f54a172012 100644 --- a/nixos/tests/postgresql/default.nix +++ b/nixos/tests/postgresql/default.nix @@ -36,6 +36,7 @@ in # extensions anonymizer = importWithArgs ./anonymizer.nix; + citus = importWithArgs ./citus.nix; pgjwt = importWithArgs ./pgjwt.nix; pgvecto-rs = importWithArgs ./pgvecto-rs.nix; timescaledb = importWithArgs ./timescaledb.nix; From d2551f49bfa403f81ce6e9c3c1a1b3a74f65460c Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 9 Feb 2025 22:09:40 +0100 Subject: [PATCH 209/343] bpftools: fix build --- .../include-asm-types-for-ppc64le.patch | 13 ---------- pkgs/by-name/bp/bpftools/package.nix | 24 ------------------- 2 files changed, 37 deletions(-) delete mode 100644 pkgs/by-name/bp/bpftools/include-asm-types-for-ppc64le.patch diff --git a/pkgs/by-name/bp/bpftools/include-asm-types-for-ppc64le.patch b/pkgs/by-name/bp/bpftools/include-asm-types-for-ppc64le.patch deleted file mode 100644 index 47c8f8077a5a7..0000000000000 --- a/pkgs/by-name/bp/bpftools/include-asm-types-for-ppc64le.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/tools/include/uapi/linux/types.h b/tools/include/uapi/linux/types.h -index 91fa51a9c31d..bfbd9b47277f 100644 ---- a/tools/include/uapi/linux/types.h -+++ b/tools/include/uapi/linux/types.h -@@ -2,7 +2,7 @@ - #ifndef _UAPI_LINUX_TYPES_H - #define _UAPI_LINUX_TYPES_H - --#include -+#include - - /* copied from linux:include/uapi/linux/types.h */ - #define __bitwise diff --git a/pkgs/by-name/bp/bpftools/package.nix b/pkgs/by-name/bp/bpftools/package.nix index 6c3badae44110..19841f7768621 100644 --- a/pkgs/by-name/bp/bpftools/package.nix +++ b/pkgs/by-name/bp/bpftools/package.nix @@ -23,30 +23,6 @@ stdenv.mkDerivation rec { separateDebugInfo = true; - patches = [ - # fix unknown type name '__vector128' on ppc64le - ./include-asm-types-for-ppc64le.patch - # fix build for riscv64 - (fetchpatch { - # libbpf: Add missing per-arch include path - # https://patchwork.kernel.org/project/linux-riscv/patch/20240927131355.350918-1-bjorn@kernel.org/ - url = "https://patchwork.kernel.org/project/linux-riscv/patch/20240927131355.350918-1-bjorn@kernel.org/raw/"; - hash = "sha256-edXY/ejHW5L7rGgY5B2GmVZxUgnLdBadNhBOSAgcL7M="; - }) - (fetchpatch { - # selftests: bpf: Add missing per-arch include path - # https://patchwork.kernel.org/project/linux-riscv/patch/20240927131355.350918-2-bjorn@kernel.org/ - url = "https://patchwork.kernel.org/project/linux-riscv/patch/20240927131355.350918-2-bjorn@kernel.org/raw/"; - hash = "sha256-7yNWE/L/qd3vcLtJYoSyGxB3ytySlr20R0D3t5ni2Fc="; - }) - (fetchpatch { - # tools: Override makefile ARCH variable if defined, but empty - # https://patchwork.kernel.org/project/linux-riscv/patch/20241127101748.165693-1-bjorn@kernel.org/ - url = "https://patchwork.kernel.org/project/linux-riscv/patch/20241127101748.165693-1-bjorn@kernel.org/raw/"; - hash = "sha256-y8N71Hm1XfX9g3S6PzW2m7Lxp6wQQMfQE9L0QNt8cYY="; - }) - ]; - depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ python3 From fe5312cd441714a518c3585297ba0f1915e899b8 Mon Sep 17 00:00:00 2001 From: Lin Jian Date: Mon, 10 Feb 2025 12:44:59 +0800 Subject: [PATCH 210/343] emacsPackages.dap-mode: fix build https://hydra.nix-community.org/build/2991612 --- .../emacs/elisp-packages/melpa-packages.nix | 21 ++++++++++++------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix index 9cd779140cb12..0428b95f013e7 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix @@ -981,14 +981,19 @@ let cssh = ignoreCompilationError super.cssh; # elisp error - dap-mode = super.dap-mode.overrideAttrs (old: { - # empty file causing native-compiler-error-empty-byte - preBuild = - '' - rm --verbose dapui.el - '' - + old.preBuild or ""; - }); + dap-mode = super.dap-mode.overrideAttrs ( + finalAttrs: previousAttrs: { + # empty file causing native-compiler-error-empty-byte + preBuild = + if lib.versionOlder finalAttrs.version "20250131.1624" then + '' + rm --verbose dapui.el + '' + + previousAttrs.preBuild or "" + else + previousAttrs.preBuild or null; + } + ); db-pg = ignoreCompilationError super.db-pg; # elisp error From ffb911e9c23d6443bd1a9969b11599e89b283371 Mon Sep 17 00:00:00 2001 From: Lin Jian Date: Mon, 10 Feb 2025 13:12:50 +0800 Subject: [PATCH 211/343] emacsPackages.magit-delta: fix build https://hydra.nix-community.org/build/3134403 --- .../editors/emacs/elisp-packages/melpa-packages.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix index 0428b95f013e7..62f476dc5440d 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix @@ -447,7 +447,8 @@ let magit-circleci = buildWithGit super.magit-circleci; - magit-delta = buildWithGit super.magit-delta; + # https://github.com/dandavison/magit-delta/issues/30 + magit-delta = addPackageRequires (buildWithGit super.magit-delta) [ self.dash ]; orgit = buildWithGit super.orgit; From 88dd549f57bb0dc79c67ee11948904bfc48ca750 Mon Sep 17 00:00:00 2001 From: K900 Date: Mon, 10 Feb 2025 08:41:19 +0300 Subject: [PATCH 212/343] util-linux: don't build lastlog2 on Darwin It doesn't build, and it uses PAM, which doesn't work properly on Darwin to begin with. --- pkgs/by-name/ut/util-linux/package.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/by-name/ut/util-linux/package.nix b/pkgs/by-name/ut/util-linux/package.nix index 47975dc5c38d6..5917e2909be51 100644 --- a/pkgs/by-name/ut/util-linux/package.nix +++ b/pkgs/by-name/ut/util-linux/package.nix @@ -101,6 +101,10 @@ stdenv.mkDerivation rec { "--disable-nls" "--disable-ipcrm" "--disable-ipcs" + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + # Doesn't build on Darwin, also doesn't really make sense on Darwin + "--disable-liblastlog2" ]; makeFlags = [ From 3cb939f7350ffff9ef0e67eb99fde224a4d49912 Mon Sep 17 00:00:00 2001 From: K900 Date: Mon, 10 Feb 2025 08:42:15 +0300 Subject: [PATCH 213/343] util-linux: declare whether we have col See https://github.com/util-linux/util-linux/commit/8886d84e25a457702b45194d69a47313f76dc6bc --- pkgs/by-name/ut/util-linux/package.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/by-name/ut/util-linux/package.nix b/pkgs/by-name/ut/util-linux/package.nix index 5917e2909be51..076c9316c1586 100644 --- a/pkgs/by-name/ut/util-linux/package.nix +++ b/pkgs/by-name/ut/util-linux/package.nix @@ -168,6 +168,10 @@ stdenv.mkDerivation rec { rev-prefix = "v"; ignoredVersions = "(-rc).*"; }; + + # encode upstream assumption to be used in man-db + # https://github.com/util-linux/util-linux/commit/8886d84e25a457702b45194d69a47313f76dc6bc + hasCol = stdenv.hostPlatform.libc == "glibc"; }; meta = with lib; { From e1e171fde85913f7b3850b0bb7327b24bf48574b Mon Sep 17 00:00:00 2001 From: K900 Date: Mon, 10 Feb 2025 08:43:02 +0300 Subject: [PATCH 214/343] man-db: only build --with-col if we have col --- pkgs/by-name/ma/man-db/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/ma/man-db/package.nix b/pkgs/by-name/ma/man-db/package.nix index 29be3e9e87bf9..d8d645113287d 100644 --- a/pkgs/by-name/ma/man-db/package.nix +++ b/pkgs/by-name/ma/man-db/package.nix @@ -75,6 +75,8 @@ stdenv.mkDerivation rec { "--with-systemdtmpfilesdir=${placeholder "out"}/lib/tmpfiles.d" "--with-systemdsystemunitdir=${placeholder "out"}/lib/systemd/system" "--with-pager=less" + ] + ++ lib.optionals util-linuxMinimal.hasCol [ "--with-col=${util-linuxMinimal}/bin/col" ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ From 9f2a89f948f19c473c23d8ec358087a9e51f67d8 Mon Sep 17 00:00:00 2001 From: K900 Date: Mon, 10 Feb 2025 08:57:27 +0300 Subject: [PATCH 215/343] buildPerlPackage: export some things harder Those may be used by the later stages of the build. Co-authored-by: Tristan Ross --- pkgs/development/perl-modules/generic/builder.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/development/perl-modules/generic/builder.sh b/pkgs/development/perl-modules/generic/builder.sh index c95b5cbb7d544..97d0bbcce7ac4 100644 --- a/pkgs/development/perl-modules/generic/builder.sh +++ b/pkgs/development/perl-modules/generic/builder.sh @@ -23,7 +23,12 @@ preConfigure() { local flagsArray=() concatTo flagsArray makeMakerFlags - perl Makefile.PL AR=$AR FULL_AR=$AR CC=$CC LD=$CC CPPRUN="$CC -E" \ + # Perl expect these to be exported + export CPPRUN="$CC -E" + export FULL_AR=$AR + # Requires to be $CC since it tries adding "-Wl" + export LD=$CC + perl Makefile.PL AR="$AR" FULL_AR="$AR" CC="$CC" LD="$CC" CPPRUN="$CPPRUN" \ PREFIX=$out INSTALLDIRS=site "${flagsArray[@]}" \ PERL=$(type -P perl) FULLPERL=\"$fullperl/bin/perl\" } From a0bec4edc7512d89127f41114d5e6bbe5689e720 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Mon, 10 Feb 2025 08:55:23 +0100 Subject: [PATCH 216/343] spdlog: format --- pkgs/by-name/sp/spdlog/package.nix | 43 +++++++++++++++++------------- 1 file changed, 24 insertions(+), 19 deletions(-) diff --git a/pkgs/by-name/sp/spdlog/package.nix b/pkgs/by-name/sp/spdlog/package.nix index da33fbf603331..08e906ca66ef6 100644 --- a/pkgs/by-name/sp/spdlog/package.nix +++ b/pkgs/by-name/sp/spdlog/package.nix @@ -1,14 +1,15 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, fmt -, catch2_3 -, staticBuild ? stdenv.hostPlatform.isStatic +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + fmt, + catch2_3, + staticBuild ? stdenv.hostPlatform.isStatic, -# tests -, bear -, tiledb + # tests + bear, + tiledb, }: stdenv.mkDerivation rec { @@ -17,9 +18,9 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "gabime"; - repo = "spdlog"; - rev = "v${version}"; - hash = "sha256-4QZVCounDbtkP+58fejHGWjquWT3b03b9TNGs45dN7c="; + repo = "spdlog"; + rev = "v${version}"; + hash = "sha256-HCpnN28qWreg0NvL6Q9pfSSxOTHgV6glHt6P0FbH/Cw="; }; nativeBuildInputs = [ cmake ]; @@ -36,7 +37,11 @@ stdenv.mkDerivation rec { "-DSPDLOG_FMT_EXTERNAL=ON" ]; - outputs = [ "out" "doc" "dev" ] ; + outputs = [ + "out" + "doc" + "dev" + ]; postInstall = '' mkdir -p $out/share/doc/spdlog @@ -55,10 +60,10 @@ stdenv.mkDerivation rec { }; meta = with lib; { - description = "Very fast, header only, C++ logging library"; - homepage = "https://github.com/gabime/spdlog"; - license = licenses.mit; - maintainers = with maintainers; [ obadz ]; - platforms = platforms.all; + description = "Very fast, header only, C++ logging library"; + homepage = "https://github.com/gabime/spdlog"; + license = licenses.mit; + maintainers = with maintainers; [ obadz ]; + platforms = platforms.all; }; } From 9f60b06f5e7e27870c1bf75538ac9fdb8bebc31c Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Mon, 10 Feb 2025 08:57:17 +0100 Subject: [PATCH 217/343] spdlog: 1.15.0 -> 1.15.1 Diff: https://github.com/gabime/spdlog/compare/refs/tags/v1.15.0...v1.15.1 Changelog: https://github.com/gabime/spdlog/releases/tag/v1.15.1 --- pkgs/by-name/sp/spdlog/package.nix | 39 +++++++++++++++++------------- 1 file changed, 22 insertions(+), 17 deletions(-) diff --git a/pkgs/by-name/sp/spdlog/package.nix b/pkgs/by-name/sp/spdlog/package.nix index 08e906ca66ef6..8ed1455206c40 100644 --- a/pkgs/by-name/sp/spdlog/package.nix +++ b/pkgs/by-name/sp/spdlog/package.nix @@ -7,20 +7,21 @@ catch2_3, staticBuild ? stdenv.hostPlatform.isStatic, - # tests + # passthru bear, tiledb, + nix-update-script, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "spdlog"; version = "1.15.1"; src = fetchFromGitHub { owner = "gabime"; repo = "spdlog"; - rev = "v${version}"; - hash = "sha256-HCpnN28qWreg0NvL6Q9pfSSxOTHgV6glHt6P0FbH/Cw="; + tag = "v${finalAttrs.version}"; + hash = "sha256-4QZVCounDbtkP+58fejHGWjquWT3b03b9TNGs45dN7c="; }; nativeBuildInputs = [ cmake ]; @@ -29,12 +30,12 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ fmt ]; cmakeFlags = [ - "-DSPDLOG_BUILD_SHARED=${if staticBuild then "OFF" else "ON"}" - "-DSPDLOG_BUILD_STATIC=${if staticBuild then "ON" else "OFF"}" - "-DSPDLOG_BUILD_EXAMPLE=OFF" - "-DSPDLOG_BUILD_BENCH=OFF" - "-DSPDLOG_BUILD_TESTS=ON" - "-DSPDLOG_FMT_EXTERNAL=ON" + (lib.cmakeBool "SPDLOG_BUILD_SHARED" (!staticBuild)) + (lib.cmakeBool "SPDLOG_BUILD_STATIC" staticBuild) + (lib.cmakeBool "SPDLOG_BUILD_EXAMPLE" false) + (lib.cmakeBool "SPDLOG_BUILD_BENCH" false) + (lib.cmakeBool "SPDLOG_BUILD_TESTS" true) + (lib.cmakeBool "SPDLOG_FMT_EXTERNAL" true) ]; outputs = [ @@ -55,15 +56,19 @@ stdenv.mkDerivation rec { doCheck = true; - passthru.tests = { - inherit bear tiledb; + passthru = { + tests = { + inherit bear tiledb; + }; + updateScript = nix-update-script { }; }; - meta = with lib; { + meta = { description = "Very fast, header only, C++ logging library"; homepage = "https://github.com/gabime/spdlog"; - license = licenses.mit; - maintainers = with maintainers; [ obadz ]; - platforms = platforms.all; + changelog = "https://github.com/gabime/spdlog/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ obadz ]; + platforms = lib.platforms.all; }; -} +}) From 7055614287697179b024e94f7199b834cddab54f Mon Sep 17 00:00:00 2001 From: misilelaboratory Date: Mon, 10 Feb 2025 18:18:13 +0900 Subject: [PATCH 218/343] temurin-bin: minor updates Signed-off-by: misilelaboratory --- .../compilers/temurin-bin/sources.json | 612 +++++++++--------- 1 file changed, 306 insertions(+), 306 deletions(-) diff --git a/pkgs/development/compilers/temurin-bin/sources.json b/pkgs/development/compilers/temurin-bin/sources.json index 225c244e3cfc1..ab1757d9dc8db 100644 --- a/pkgs/development/compilers/temurin-bin/sources.json +++ b/pkgs/development/compilers/temurin-bin/sources.json @@ -6,52 +6,52 @@ "packageType": "jdk", "vmType": "hotspot", "x86_64": { - "build": "9", - "sha256": "0a431310ccccc36c85b1274b5d31e368fdc8cf62cb7c2ed98d7b59eb5a13dc82", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.25%2B9/OpenJDK11U-jdk_x64_alpine-linux_hotspot_11.0.25_9.tar.gz", - "version": "11.0.25" + "build": "4", + "sha256": "2e1f667395cdb1e872bd7320e3eda96c0f0978e29e574e75f9cdf61160e8974a", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.26%2B4/OpenJDK11U-jdk_x64_alpine-linux_hotspot_11.0.26_4.tar.gz", + "version": "11.0.26" } }, "openjdk17": { "packageType": "jdk", "vmType": "hotspot", "x86_64": { - "build": "11", - "sha256": "67632ee4563e9827b56f62ab6da95bce200d9e82092b211988c0d2113abc4071", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.13%2B11/OpenJDK17U-jdk_x64_alpine-linux_hotspot_17.0.13_11.tar.gz", - "version": "17.0.13" + "build": "7", + "sha256": "259c85e16f7bbfdfb3e0a2ec1c5d6e2063300d413422286583265a9d8a882358", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.14%2B7/OpenJDK17U-jdk_x64_alpine-linux_hotspot_17.0.14_7.tar.gz", + "version": "17.0.14" } }, "openjdk21": { "aarch64": { - "build": "11", - "sha256": "f22e32b869dd0e5e3f248646f62bffaa307b360299488ac8764e622923d7e747", - "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.5%2B11/OpenJDK21U-jdk_aarch64_alpine-linux_hotspot_21.0.5_11.tar.gz", - "version": "21.0.5" + "build": "7", + "sha256": "2798990401d9c47eaeddb7d5148f577770e4c1013b9223290a43765463204ae4", + "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.6%2B7/OpenJDK21U-jdk_aarch64_alpine-linux_hotspot_21.0.6_7.tar.gz", + "version": "21.0.6" }, "packageType": "jdk", "vmType": "hotspot", "x86_64": { - "build": "11", - "sha256": "8da7da49101d45f646272616f20e8b10d57472bbf5961d64ffb07d7ba93c6909", - "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.5%2B11/OpenJDK21U-jdk_x64_alpine-linux_hotspot_21.0.5_11.tar.gz", - "version": "21.0.5" + "build": "7", + "sha256": "6c66470a9143ad562570a34c1583d9fa50bf904f6f9ced642e9d800ce043a0f3", + "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.6%2B7/OpenJDK21U-jdk_x64_alpine-linux_hotspot_21.0.6_7.tar.gz", + "version": "21.0.6" } }, "openjdk23": { "aarch64": { - "build": "11", - "sha256": "ebdd6602d27bd7535bf06f21e8a0c3d563be7b790a90bef00cb6ac4123c66f86", - "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.1%2B11/OpenJDK23U-jdk_aarch64_alpine-linux_hotspot_23.0.1_11.tar.gz", - "version": "23.0.1" + "build": "7", + "sha256": "b55c5c881a2fed17ec5a59feaa33d9263703b399d1bfae3a5eaed3f140aa4570", + "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.2%2B7/OpenJDK23U-jdk_aarch64_alpine-linux_hotspot_23.0.2_7.tar.gz", + "version": "23.0.2" }, "packageType": "jdk", "vmType": "hotspot", "x86_64": { - "build": "11", - "sha256": "4c37a9e885c4e099b049c3ba9baa073de1525e28cd5ffca016c5c5bd7ed385a6", - "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.1%2B11/OpenJDK23U-jdk_x64_alpine-linux_hotspot_23.0.1_11.tar.gz", - "version": "23.0.1" + "build": "7", + "sha256": "2c05c6dfea23a83fdbfaf5b03cc3cfd8d998c8069e930e0e585a39d4a99f3d99", + "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.2%2B7/OpenJDK23U-jdk_x64_alpine-linux_hotspot_23.0.2_7.tar.gz", + "version": "23.0.2" } }, "openjdk8": { @@ -59,9 +59,9 @@ "vmType": "hotspot", "x86_64": { "build": "6", - "sha256": "86071bc98901cae80c62745a64bb4486212985fe5b66b5aec36ce92e8a036a9d", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u432-b06/OpenJDK8U-jdk_x64_alpine-linux_hotspot_8u432b06.tar.gz", - "version": "8.0.432" + "sha256": "9fcb96380b25c1d1caec65b7606c387716a7ae51caf359f5f3ff0dcca40f231f", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u442-b06/OpenJDK8U-jdk_x64_alpine-linux_hotspot_8u442b06.tar.gz", + "version": "8.0.442" } } }, @@ -70,52 +70,52 @@ "packageType": "jre", "vmType": "hotspot", "x86_64": { - "build": "9", - "sha256": "905e35f14228904d67a7a56f9f0b8ede58e9b15f9af3a3d54fb86f78c8e47a34", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.25%2B9/OpenJDK11U-jre_x64_alpine-linux_hotspot_11.0.25_9.tar.gz", - "version": "11.0.25" + "build": "4", + "sha256": "69031fc68d41189691dbeca73447ca543040d26995f61cef83fd7aed8fb4dbd2", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.26%2B4/OpenJDK11U-jre_x64_alpine-linux_hotspot_11.0.26_4.tar.gz", + "version": "11.0.26" } }, "openjdk17": { "packageType": "jre", "vmType": "hotspot", "x86_64": { - "build": "11", - "sha256": "7a2df4e2f86eca649af1e17d990ab8e354cb6dee389606025b9d05f75623c388", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.13%2B11/OpenJDK17U-jre_x64_alpine-linux_hotspot_17.0.13_11.tar.gz", - "version": "17.0.13" + "build": "7", + "sha256": "9dcc53a30676692e604571a6e0bd13ac0c1b15f4bc2b78d19f88bd316075f84a", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.14%2B7/OpenJDK17U-jre_x64_alpine-linux_hotspot_17.0.14_7.tar.gz", + "version": "17.0.14" } }, "openjdk21": { "aarch64": { - "build": "11", - "sha256": "12b988a3d934e3eb89c6a981a93f8e2adf0a62cc9030487dee76c0c29b93714d", - "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.5%2B11/OpenJDK21U-jre_aarch64_alpine-linux_hotspot_21.0.5_11.tar.gz", - "version": "21.0.5" + "build": "7", + "sha256": "bcd459e70cdddaa6ada0d855ce944c592814042f1e12d53aa08fa89eedcdf893", + "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.6%2B7/OpenJDK21U-jre_aarch64_alpine-linux_hotspot_21.0.6_7.tar.gz", + "version": "21.0.6" }, "packageType": "jre", "vmType": "hotspot", "x86_64": { - "build": "11", - "sha256": "2dfa33fb8e9474e6967c6cf17964abb5ddce9c17fa6a9f8d7aa221a0ae295df9", - "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.5%2B11/OpenJDK21U-jre_x64_alpine-linux_hotspot_21.0.5_11.tar.gz", - "version": "21.0.5" + "build": "7", + "sha256": "2330f38feb59ab7af0e2fffc12d5500005d35f7f53f49dd8a9f9aa1ae68aee5f", + "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.6%2B7/OpenJDK21U-jre_x64_alpine-linux_hotspot_21.0.6_7.tar.gz", + "version": "21.0.6" } }, "openjdk23": { "aarch64": { - "build": "11", - "sha256": "b56eaedc094cb9107be2d5be9ad34c3dd9492c45aa671d102b5829a488cfc744", - "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.1%2B11/OpenJDK23U-jre_aarch64_alpine-linux_hotspot_23.0.1_11.tar.gz", - "version": "23.0.1" + "build": "7", + "sha256": "248a2ffb3abcb0cee7841ce648af7af415c96ee88cba4f8bf676c0115d38de5e", + "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.2%2B7/OpenJDK23U-jre_aarch64_alpine-linux_hotspot_23.0.2_7.tar.gz", + "version": "23.0.2" }, "packageType": "jre", "vmType": "hotspot", "x86_64": { - "build": "11", - "sha256": "38a1b20b5ee8869b20e9f9aefdc91eedf245584d35287842a66540f0745dd3d0", - "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.1%2B11/OpenJDK23U-jre_x64_alpine-linux_hotspot_23.0.1_11.tar.gz", - "version": "23.0.1" + "build": "7", + "sha256": "4513750bd10cc6c38f0c19d335dac7dcc112bba64e52010f81ba29e7a71e2a76", + "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.2%2B7/OpenJDK23U-jre_x64_alpine-linux_hotspot_23.0.2_7.tar.gz", + "version": "23.0.2" } }, "openjdk8": { @@ -123,9 +123,9 @@ "vmType": "hotspot", "x86_64": { "build": "6", - "sha256": "7f7c265560dd5a42533bf282831d7d2f044a7ff7f4c310b40a0f9f8e19ff12e5", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u432-b06/OpenJDK8U-jre_x64_alpine-linux_hotspot_8u432b06.tar.gz", - "version": "8.0.432" + "sha256": "4fb0636534b0cd4534a3cdcbbe7cf2e937523d6376d9cef00cc6cfd5d19537e8", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u442-b06/OpenJDK8U-jre_x64_alpine-linux_hotspot_8u442b06.tar.gz", + "version": "8.0.442" } } } @@ -134,332 +134,332 @@ "jdk": { "openjdk11": { "aarch64": { - "build": "9", - "sha256": "f2087cc3abdd509b74facf8e43e81e36244d14c70dec080b8f3a662695417ca7", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.25%2B9/OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.25_9.tar.gz", - "version": "11.0.25" + "build": "4", + "sha256": "e7b3d37c347fe7af2a53711f16da8b9b164748ce4a84e47bb0739c3be7f1c421", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.26%2B4/OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.26_4.tar.gz", + "version": "11.0.26" }, "armv6l": { - "build": "9", - "sha256": "6bdd7da08c9f8fedded8da0411b6566c16cb9a904d164b68a0b7f11c8376673a", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.25%2B9/OpenJDK11U-jdk_arm_linux_hotspot_11.0.25_9.tar.gz", - "version": "11.0.25" + "build": "4", + "sha256": "79d574328f6960d40349996ef8c5949581f9e533dc76f134857c4125c78558ff", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.26%2B4/OpenJDK11U-jdk_arm_linux_hotspot_11.0.26_4.tar.gz", + "version": "11.0.26" }, "armv7l": { - "build": "9", - "sha256": "6bdd7da08c9f8fedded8da0411b6566c16cb9a904d164b68a0b7f11c8376673a", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.25%2B9/OpenJDK11U-jdk_arm_linux_hotspot_11.0.25_9.tar.gz", - "version": "11.0.25" + "build": "4", + "sha256": "79d574328f6960d40349996ef8c5949581f9e533dc76f134857c4125c78558ff", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.26%2B4/OpenJDK11U-jdk_arm_linux_hotspot_11.0.26_4.tar.gz", + "version": "11.0.26" }, "packageType": "jdk", "powerpc64le": { - "build": "9", - "sha256": "0014ffdae26d2b8f840b4842e3f9d4edc3576b4a961770708273d8ecc86ba5b6", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.25%2B9/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.25_9.tar.gz", - "version": "11.0.25" + "build": "4", + "sha256": "42c63651125a149cee2ba781300d75ffa67a25032f95038d50ee6d6177cb2e41", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.26%2B4/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.26_4.tar.gz", + "version": "11.0.26" }, "vmType": "hotspot", "x86_64": { - "build": "9", - "sha256": "191baa2e052627614022171400a917d28f0987dc54da48aaf07b06f552bb9884", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.25%2B9/OpenJDK11U-jdk_x64_linux_hotspot_11.0.25_9.tar.gz", - "version": "11.0.25" + "build": "4", + "sha256": "7def4c5807b38ef1a7bb30a86572a795ca604127cc8d1f5b370abf23618104e6", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.26%2B4/OpenJDK11U-jdk_x64_linux_hotspot_11.0.26_4.tar.gz", + "version": "11.0.26" } }, "openjdk17": { "aarch64": { - "build": "11", - "sha256": "0c17fa4f14c0d2cc9e9334f996fccdddc5da4459d768f3105c7ff0283c47bf62", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.13%2B11/OpenJDK17U-jdk_aarch64_linux_hotspot_17.0.13_11.tar.gz", - "version": "17.0.13" + "build": "7", + "sha256": "62efc3e83fc9bcd08db7c4f02977328cb3559a54519078d8337314cf025d19b7", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.14%2B7/OpenJDK17U-jdk_aarch64_linux_hotspot_17.0.14_7.tar.gz", + "version": "17.0.14" }, "armv6l": { - "build": "11", - "sha256": "e69d43be937e05dbccae4cc98f732ed86aa11993234bf5ad6e81c30475a78ce7", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.13%2B11/OpenJDK17U-jdk_arm_linux_hotspot_17.0.13_11.tar.gz", - "version": "17.0.13" + "build": "7", + "sha256": "f43986385403c0f08bd3512c9d11a51c49044a7c8a0a39cf4e2e3731ca0db229", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.14%2B7/OpenJDK17U-jdk_arm_linux_hotspot_17.0.14_7.tar.gz", + "version": "17.0.14" }, "armv7l": { - "build": "11", - "sha256": "e69d43be937e05dbccae4cc98f732ed86aa11993234bf5ad6e81c30475a78ce7", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.13%2B11/OpenJDK17U-jdk_arm_linux_hotspot_17.0.13_11.tar.gz", - "version": "17.0.13" + "build": "7", + "sha256": "f43986385403c0f08bd3512c9d11a51c49044a7c8a0a39cf4e2e3731ca0db229", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.14%2B7/OpenJDK17U-jdk_arm_linux_hotspot_17.0.14_7.tar.gz", + "version": "17.0.14" }, "packageType": "jdk", "powerpc64le": { - "build": "11", - "sha256": "d4e553c6fa7afdfe2577420c6e77a558db8113a3cef84e755384148f5610834e", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.13%2B11/OpenJDK17U-jdk_ppc64le_linux_hotspot_17.0.13_11.tar.gz", - "version": "17.0.13" + "build": "7", + "sha256": "f4cb9ee5906a44d110fa381310cd7181d95498d27087d449e7e9b74bddd9def2", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.14%2B7/OpenJDK17U-jdk_ppc64le_linux_hotspot_17.0.14_7.tar.gz", + "version": "17.0.14" }, "riscv64": { - "build": "11", - "sha256": "e7c82833a7381a05cae2be0e947c08e971bbae4f2e4142c6ec87bbd7530a5646", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.13%2B11/OpenJDK17U-jdk_riscv64_linux_hotspot_17.0.13_11.tar.gz", - "version": "17.0.13" + "build": "7", + "sha256": "d7ba818b1417b67f1f3cdcf7c5fac5e179998469dce7448349f24175eb9b2871", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.14%2B7/OpenJDK17U-jdk_riscv64_linux_hotspot_17.0.14_7.tar.gz", + "version": "17.0.14" }, "vmType": "hotspot", "x86_64": { - "build": "11", - "sha256": "8682892fc02965930b9022c066fa164dd6f458ef4a5dc262016aa28333b30f49", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.13%2B11/OpenJDK17U-jdk_x64_linux_hotspot_17.0.13_11.tar.gz", - "version": "17.0.13" + "build": "7", + "sha256": "a3af83983fb94dd7d11b13ba2dba0fb6819dc2caaf87e6937afd22ad4680ae9a", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.14%2B7/OpenJDK17U-jdk_x64_linux_hotspot_17.0.14_7.tar.gz", + "version": "17.0.14" } }, "openjdk21": { "aarch64": { - "build": "11", - "sha256": "6482639ed9fd22aa2e704cc366848b1b3e1586d2bf1213869c43e80bca58fe5c", - "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.5%2B11/OpenJDK21U-jdk_aarch64_linux_hotspot_21.0.5_11.tar.gz", - "version": "21.0.5" + "build": "7", + "sha256": "04fe1273f624187d927f1b466e8cdb630d70786db07bee7599bfa5153060afd3", + "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.6%2B7/OpenJDK21U-jdk_aarch64_linux_hotspot_21.0.6_7.tar.gz", + "version": "21.0.6" }, "packageType": "jdk", "powerpc64le": { - "build": "11", - "sha256": "3c6f4c358facfb6c19d90faf02bfe0fc7512d6b0e80ac18146bbd7e0d01deeef", - "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.5%2B11/OpenJDK21U-jdk_ppc64le_linux_hotspot_21.0.5_11.tar.gz", - "version": "21.0.5" + "build": "7", + "sha256": "163724b70b86d5a8461f85092165a9cc5a098ed900fee90d1b0c0be9607ae3d2", + "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.6%2B7/OpenJDK21U-jdk_ppc64le_linux_hotspot_21.0.6_7.tar.gz", + "version": "21.0.6" }, "riscv64": { - "build": "11", - "sha256": "2f1b3e401e36de803398dfb9818861f9f14ca8ae7db650ea0946ab048fefe3b9", - "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.5%2B11/OpenJDK21U-jdk_riscv64_linux_hotspot_21.0.5_11.tar.gz", - "version": "21.0.5" + "build": "7", + "sha256": "203796e4ba2689aa921b5e0cdc9e02984d88622f80fcb9acb05a118b05007be8", + "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.6%2B7/OpenJDK21U-jdk_riscv64_linux_hotspot_21.0.6_7.tar.gz", + "version": "21.0.6" }, "vmType": "hotspot", "x86_64": { - "build": "11", - "sha256": "3c654d98404c073b8a7e66bffb27f4ae3e7ede47d13284c132d40a83144bfd8c", - "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.5%2B11/OpenJDK21U-jdk_x64_linux_hotspot_21.0.5_11.tar.gz", - "version": "21.0.5" + "build": "7", + "sha256": "a2650fba422283fbed20d936ce5d2a52906a5414ec17b2f7676dddb87201dbae", + "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.6%2B7/OpenJDK21U-jdk_x64_linux_hotspot_21.0.6_7.tar.gz", + "version": "21.0.6" } }, "openjdk23": { "aarch64": { - "build": "11", - "sha256": "808e3843293e50515bf02ad2f956e543da65e32dac82ae7a266a147b3485c61a", - "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.1%2B11/OpenJDK23U-jdk_aarch64_linux_hotspot_23.0.1_11.tar.gz", - "version": "23.0.1" + "build": "7", + "sha256": "fb43ae1202402842559cb6223886ec1663b90ffbec48479abbcb92c92c9012eb", + "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.2%2B7/OpenJDK23U-jdk_aarch64_linux_hotspot_23.0.2_7.tar.gz", + "version": "23.0.2" }, "packageType": "jdk", "powerpc64le": { - "build": "11", - "sha256": "1885ab141fe7b8ed6beb77b814b1c1c99fd54713399bf917edb6a4020545adde", - "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.1%2B11/OpenJDK23U-jdk_ppc64le_linux_hotspot_23.0.1_11.tar.gz", - "version": "23.0.1" + "build": "7", + "sha256": "548fd82af4eb0802fe20b0b61a4664a69c7f03cd963540908f30dbf73636dafe", + "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.2%2B7/OpenJDK23U-jdk_ppc64le_linux_hotspot_23.0.2_7.tar.gz", + "version": "23.0.2" }, "riscv64": { - "build": "11", - "sha256": "80d7bab9f9614bdf934c6bc441031bd1fead3aea85f16770123bd8a6bcdc52b6", - "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.1%2B11/OpenJDK23U-jdk_riscv64_linux_hotspot_23.0.1_11.tar.gz", - "version": "23.0.1" + "build": "7", + "sha256": "1e102e1e6653f8810ef6c275b0d38ea7036abd4a8709f0f916b339f65e76bb56", + "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.2%2B7/OpenJDK23U-jdk_riscv64_linux_hotspot_23.0.2_7.tar.gz", + "version": "23.0.2" }, "vmType": "hotspot", "x86_64": { - "build": "11", - "sha256": "2400267e4e9c0f6ae880a4d763af6caf18c673714bdee5debf8388b0b5d52886", - "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.1%2B11/OpenJDK23U-jdk_x64_linux_hotspot_23.0.1_11.tar.gz", - "version": "23.0.1" + "build": "7", + "sha256": "870ac8c05c6fe563e7a3878a47d0234b83c050e83651d2c47e8b822ec74512dd", + "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.2%2B7/OpenJDK23U-jdk_x64_linux_hotspot_23.0.2_7.tar.gz", + "version": "23.0.2" } }, "openjdk8": { "aarch64": { "build": "6", - "sha256": "383caabc20428e9500f2e07965317ed4387a0e336104483e29a9e06eeffbf26b", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u432-b06/OpenJDK8U-jdk_aarch64_linux_hotspot_8u432b06.tar.gz", - "version": "8.0.432" + "sha256": "1d1662bd8ca7edc9281c723d9eebafea940e6a41464bdc43a83b564bc974c7e5", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u442-b06/OpenJDK8U-jdk_aarch64_linux_hotspot_8u442b06.tar.gz", + "version": "8.0.442" }, "armv6l": { "build": "6", - "sha256": "ff1ce3f6f1cf11987ab63f278b29cf1aae799652606c547f8a590e7acbd16b61", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u432-b06/OpenJDK8U-jdk_arm_linux_hotspot_8u432b06.tar.gz", - "version": "8.0.432" + "sha256": "c555750ee41799d30553bd9744c1ab9b8e6b2a2ea83195619a11ef30cc4154f4", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u442-b06/OpenJDK8U-jdk_arm_linux_hotspot_8u442b06.tar.gz", + "version": "8.0.442" }, "armv7l": { "build": "6", - "sha256": "ff1ce3f6f1cf11987ab63f278b29cf1aae799652606c547f8a590e7acbd16b61", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u432-b06/OpenJDK8U-jdk_arm_linux_hotspot_8u432b06.tar.gz", - "version": "8.0.432" + "sha256": "c555750ee41799d30553bd9744c1ab9b8e6b2a2ea83195619a11ef30cc4154f4", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u442-b06/OpenJDK8U-jdk_arm_linux_hotspot_8u442b06.tar.gz", + "version": "8.0.442" }, "packageType": "jdk", "powerpc64le": { "build": "6", - "sha256": "64fb17e83b79f9ad41dc18351a408bfe90324fd6360903ca5c0a740006c81be3", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u432-b06/OpenJDK8U-jdk_ppc64le_linux_hotspot_8u432b06.tar.gz", - "version": "8.0.432" + "sha256": "7eac77deb8fc6c6130f9445c9a68af0bcc40bf6736b5672ef5c3d737c025e84d", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u442-b06/OpenJDK8U-jdk_ppc64le_linux_hotspot_8u442b06.tar.gz", + "version": "8.0.442" }, "vmType": "hotspot", "x86_64": { "build": "6", - "sha256": "abaaa90deadf51bd28921453baf2992b3dff6171bb7142f5bdd14ef269f7b245", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u432-b06/OpenJDK8U-jdk_x64_linux_hotspot_8u432b06.tar.gz", - "version": "8.0.432" + "sha256": "5b0a0145e7790552a9c8767b4680074c4628ec276e5bb278b61d85cf90facafa", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u442-b06/OpenJDK8U-jdk_x64_linux_hotspot_8u442b06.tar.gz", + "version": "8.0.442" } } }, "jre": { "openjdk11": { "aarch64": { - "build": "9", - "sha256": "e37ba6636e31f3c9191ac7e3fd0ab7fb354a2f3b320d68bfb95efd1e053134c9", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.25%2B9/OpenJDK11U-jre_aarch64_linux_hotspot_11.0.25_9.tar.gz", - "version": "11.0.25" + "build": "4", + "sha256": "4ececb5c229763107e9e4acf3b7035db38cf18a98a47176fa5ed1be3f3d15518", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.26%2B4/OpenJDK11U-jre_aarch64_linux_hotspot_11.0.26_4.tar.gz", + "version": "11.0.26" }, "armv6l": { - "build": "9", - "sha256": "6b7b1297da762cf2b1eb4834073e6a45cda82a359efb17a89eba3fc6b59b4d26", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.25%2B9/OpenJDK11U-jre_arm_linux_hotspot_11.0.25_9.tar.gz", - "version": "11.0.25" + "build": "4", + "sha256": "e4a00a3ea318a63ba97236633f34c8a5477f6cdb643cf6883788840818110f5f", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.26%2B4/OpenJDK11U-jre_arm_linux_hotspot_11.0.26_4.tar.gz", + "version": "11.0.26" }, "armv7l": { - "build": "9", - "sha256": "6b7b1297da762cf2b1eb4834073e6a45cda82a359efb17a89eba3fc6b59b4d26", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.25%2B9/OpenJDK11U-jre_arm_linux_hotspot_11.0.25_9.tar.gz", - "version": "11.0.25" + "build": "4", + "sha256": "e4a00a3ea318a63ba97236633f34c8a5477f6cdb643cf6883788840818110f5f", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.26%2B4/OpenJDK11U-jre_arm_linux_hotspot_11.0.26_4.tar.gz", + "version": "11.0.26" }, "packageType": "jre", "powerpc64le": { - "build": "9", - "sha256": "7e7edaf34c29c304514d60f40f6c9ce58eb3e32b0dec20bb6ccd1cfbb4456698", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.25%2B9/OpenJDK11U-jre_ppc64le_linux_hotspot_11.0.25_9.tar.gz", - "version": "11.0.25" + "build": "4", + "sha256": "69b38f0dde128d8c606012335cd60f1f55afa09b4135582188943bee699ebf03", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.26%2B4/OpenJDK11U-jre_ppc64le_linux_hotspot_11.0.26_4.tar.gz", + "version": "11.0.26" }, "vmType": "hotspot", "x86_64": { - "build": "9", - "sha256": "84cd7101f39172a4db085fb52940595bb14dad6bc3afb5bf82ee497eceaf86d3", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.25%2B9/OpenJDK11U-jre_x64_linux_hotspot_11.0.25_9.tar.gz", - "version": "11.0.25" + "build": "4", + "sha256": "d26c566a7010d1303d3979b6f076e7911b49419a609c9e4d81f27262bf47f87c", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.26%2B4/OpenJDK11U-jre_x64_linux_hotspot_11.0.26_4.tar.gz", + "version": "11.0.26" } }, "openjdk17": { "aarch64": { - "build": "11", - "sha256": "97c4fb748eaa1292fb2f28fec90a3eba23e35974ef67f8b3aa304ad4db2ba162", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.13%2B11/OpenJDK17U-jre_aarch64_linux_hotspot_17.0.13_11.tar.gz", - "version": "17.0.13" + "build": "7", + "sha256": "bab3f352fc7144ac1435924f056872d16f4b32c8bcda58b9a77b636eb1c664f4", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.14%2B7/OpenJDK17U-jre_aarch64_linux_hotspot_17.0.14_7.tar.gz", + "version": "17.0.14" }, "armv6l": { - "build": "11", - "sha256": "f9c4008680db016c9cab26cc2739d4553898911522f6a78a611fafa1f5270c88", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.13%2B11/OpenJDK17U-jre_arm_linux_hotspot_17.0.13_11.tar.gz", - "version": "17.0.13" + "build": "7", + "sha256": "7ac439bce4d5ecddb250b31401b1c1a6da2762f51652eafedd53584a0d9e3130", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.14%2B7/OpenJDK17U-jre_arm_linux_hotspot_17.0.14_7.tar.gz", + "version": "17.0.14" }, "armv7l": { - "build": "11", - "sha256": "f9c4008680db016c9cab26cc2739d4553898911522f6a78a611fafa1f5270c88", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.13%2B11/OpenJDK17U-jre_arm_linux_hotspot_17.0.13_11.tar.gz", - "version": "17.0.13" + "build": "7", + "sha256": "7ac439bce4d5ecddb250b31401b1c1a6da2762f51652eafedd53584a0d9e3130", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.14%2B7/OpenJDK17U-jre_arm_linux_hotspot_17.0.14_7.tar.gz", + "version": "17.0.14" }, "packageType": "jre", "powerpc64le": { - "build": "11", - "sha256": "790f53fcc95cc76ed8f27d3146cf789fc354a2afb7148cffd197ca61a643212f", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.13%2B11/OpenJDK17U-jre_ppc64le_linux_hotspot_17.0.13_11.tar.gz", - "version": "17.0.13" + "build": "7", + "sha256": "2a730e9d34cce4d588739b626a034ed68c065a2db61048ee7886be48ec9fe460", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.14%2B7/OpenJDK17U-jre_ppc64le_linux_hotspot_17.0.14_7.tar.gz", + "version": "17.0.14" }, "riscv64": { - "build": "11", - "sha256": "f6f3e71e5452b764aad47e6ffa4f0b26fcfe69bd9eb07fbd468343f9dd5f17b5", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.13%2B11/OpenJDK17U-jre_riscv64_linux_hotspot_17.0.13_11.tar.gz", - "version": "17.0.13" + "build": "7", + "sha256": "2f77e44aa9fec9cf35b0b1fd492055e7fec0a3ea4d4338def6b42bd46d485e02", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.14%2B7/OpenJDK17U-jre_riscv64_linux_hotspot_17.0.14_7.tar.gz", + "version": "17.0.14" }, "vmType": "hotspot", "x86_64": { - "build": "11", - "sha256": "4086cc7cb2d9e7810141f255063caad10a8a018db5e6b47fa5394c506ab65bff", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.13%2B11/OpenJDK17U-jre_x64_linux_hotspot_17.0.13_11.tar.gz", - "version": "17.0.13" + "build": "7", + "sha256": "a4b0015872758aac6a5d17139e952a3951ee536ae6d9a99828823a80a71add56", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.14%2B7/OpenJDK17U-jre_x64_linux_hotspot_17.0.14_7.tar.gz", + "version": "17.0.14" } }, "openjdk21": { "aarch64": { - "build": "11", - "sha256": "e4d02c33aeaf8e1148c1c505e129a709c5bc1889e855d4fb4f001b1780db42b4", - "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.5%2B11/OpenJDK21U-jre_aarch64_linux_hotspot_21.0.5_11.tar.gz", - "version": "21.0.5" + "build": "7", + "sha256": "f1b78f2bd6d505d5e0539261737740ad11ade3233376b4ca52e6c72fbefd2bf6", + "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.6%2B7/OpenJDK21U-jre_aarch64_linux_hotspot_21.0.6_7.tar.gz", + "version": "21.0.6" }, "packageType": "jre", "powerpc64le": { - "build": "11", - "sha256": "ae9ad61578da420fa7aeb01d3f6909da8a74d54a31bb8ba090a263cfadf221cc", - "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.5%2B11/OpenJDK21U-jre_ppc64le_linux_hotspot_21.0.5_11.tar.gz", - "version": "21.0.5" + "build": "7", + "sha256": "381e31581af3858d4c471829c3da3263e83dfe8ac5d36b58403babb57f6e202c", + "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.6%2B7/OpenJDK21U-jre_ppc64le_linux_hotspot_21.0.6_7.tar.gz", + "version": "21.0.6" }, "riscv64": { - "build": "11", - "sha256": "c6fe71bb6ce61366242073e3904c4f51613252a885d54be81c65d3fadd2c5b7c", - "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.5%2B11/OpenJDK21U-jre_riscv64_linux_hotspot_21.0.5_11.tar.gz", - "version": "21.0.5" + "build": "7", + "sha256": "a8d219a4a97f9c53ba88cb8927910005d4f3d08a87ab1bdebff921ef41afa93d", + "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.6%2B7/OpenJDK21U-jre_riscv64_linux_hotspot_21.0.6_7.tar.gz", + "version": "21.0.6" }, "vmType": "hotspot", "x86_64": { - "build": "11", - "sha256": "553dda64b3b1c3c16f8afe402377ffebe64fb4a1721a46ed426a91fd18185e62", - "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.5%2B11/OpenJDK21U-jre_x64_linux_hotspot_21.0.5_11.tar.gz", - "version": "21.0.5" + "build": "7", + "sha256": "7fc9d6837da5fa1f12e0f41901fd70a73154914b8c8ecbbcad2d44176a989937", + "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.6%2B7/OpenJDK21U-jre_x64_linux_hotspot_21.0.6_7.tar.gz", + "version": "21.0.6" } }, "openjdk23": { "aarch64": { - "build": "11", - "sha256": "0b498a5b673cb50fe9cfd0a13bd39c7259b4fad4d930d614e1563aeb8bca7f0e", - "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.1%2B11/OpenJDK23U-jre_aarch64_linux_hotspot_23.0.1_11.tar.gz", - "version": "23.0.1" + "build": "7", + "sha256": "b2a8a287ebd2d2a1d5d32eb6b79768cf2b5e02f1b4d6d4791297feb8636b9e2f", + "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.2%2B7/OpenJDK23U-jre_aarch64_linux_hotspot_23.0.2_7.tar.gz", + "version": "23.0.2" }, "packageType": "jre", "powerpc64le": { - "build": "11", - "sha256": "ae5d49932f7d9b182c2d9ededa18bd4defc61873f1d717caa3d905bba870a683", - "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.1%2B11/OpenJDK23U-jre_ppc64le_linux_hotspot_23.0.1_11.tar.gz", - "version": "23.0.1" + "build": "7", + "sha256": "a21355923fdcdcc49fcf6359f2763f49f001bd4caeb970f7313f18aeaa61b588", + "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.2%2B7/OpenJDK23U-jre_ppc64le_linux_hotspot_23.0.2_7.tar.gz", + "version": "23.0.2" }, "riscv64": { - "build": "11", - "sha256": "cf65a926c2d7cbdbaa63242a8d20ce747335e7260eaaabd7bb52d51c099fda9a", - "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.1%2B11/OpenJDK23U-jre_riscv64_linux_hotspot_23.0.1_11.tar.gz", - "version": "23.0.1" + "build": "7", + "sha256": "c2c8f8add6af6518cfc565ec0a7410e031301b91f2d8bd594303d7f04680da4e", + "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.2%2B7/OpenJDK23U-jre_riscv64_linux_hotspot_23.0.2_7.tar.gz", + "version": "23.0.2" }, "vmType": "hotspot", "x86_64": { - "build": "11", - "sha256": "1233cbec40f05c76ad926b68521ae78c6ae4f454996ef549602be6987069fa77", - "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.1%2B11/OpenJDK23U-jre_x64_linux_hotspot_23.0.1_11.tar.gz", - "version": "23.0.1" + "build": "7", + "sha256": "1a16c654e67a72dadfa632969a457404ad1cc30c6375857fdcb393e0592ce3ba", + "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.2%2B7/OpenJDK23U-jre_x64_linux_hotspot_23.0.2_7.tar.gz", + "version": "23.0.2" } }, "openjdk8": { "aarch64": { "build": "6", - "sha256": "786522da4c761104dd8274c81edc90126a25acaafbbbc5da886b3fb51f33cba2", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u432-b06/OpenJDK8U-jre_aarch64_linux_hotspot_8u432b06.tar.gz", - "version": "8.0.432" + "sha256": "730ed649ee973b7408cf7107e90576b67e8ed4b3aebb9e3e8a1056151f373152", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u442-b06/OpenJDK8U-jre_aarch64_linux_hotspot_8u442b06.tar.gz", + "version": "8.0.442" }, "armv6l": { "build": "6", - "sha256": "49894dbe2f915dfad026cf7b4013118c0284e88359172499b1b25a4dac195ff1", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u432-b06/OpenJDK8U-jre_arm_linux_hotspot_8u432b06.tar.gz", - "version": "8.0.432" + "sha256": "055c47c5c1dfe8c9c135d87fed7a3745c17374618bc8d5acb9316d1b812c0e6d", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u442-b06/OpenJDK8U-jre_arm_linux_hotspot_8u442b06.tar.gz", + "version": "8.0.442" }, "armv7l": { "build": "6", - "sha256": "49894dbe2f915dfad026cf7b4013118c0284e88359172499b1b25a4dac195ff1", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u432-b06/OpenJDK8U-jre_arm_linux_hotspot_8u432b06.tar.gz", - "version": "8.0.432" + "sha256": "055c47c5c1dfe8c9c135d87fed7a3745c17374618bc8d5acb9316d1b812c0e6d", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u442-b06/OpenJDK8U-jre_arm_linux_hotspot_8u442b06.tar.gz", + "version": "8.0.442" }, "packageType": "jre", "powerpc64le": { "build": "6", - "sha256": "c573f33f9e5ba49a4838847d0d34efc9c1dc57a9ba71b926599530bbcda87f65", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u432-b06/OpenJDK8U-jre_ppc64le_linux_hotspot_8u432b06.tar.gz", - "version": "8.0.432" + "sha256": "812ebf110f1d1cfc26a135368850064f96689e7918aa6bbac1c8f210fad5752f", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u442-b06/OpenJDK8U-jre_ppc64le_linux_hotspot_8u442b06.tar.gz", + "version": "8.0.442" }, "vmType": "hotspot", "x86_64": { "build": "6", - "sha256": "bb8c8cc575b69e68e12a213674ec2e3848baff4f1955d2973d98e67666ab94d7", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u432-b06/OpenJDK8U-jre_x64_linux_hotspot_8u432b06.tar.gz", - "version": "8.0.432" + "sha256": "730fe33b1fc1f7da1e325d007b475d25a063850a167b548ea4bf689d4fcd867d", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u442-b06/OpenJDK8U-jre_x64_linux_hotspot_8u442b06.tar.gz", + "version": "8.0.442" } } } @@ -468,66 +468,66 @@ "jdk": { "openjdk11": { "aarch64": { - "build": "9", - "sha256": "658f73050ab168109862d4e25eefeedb587063cc01128a78ea4081e8ec62edcf", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.25%2B9/OpenJDK11U-jdk_aarch64_mac_hotspot_11.0.25_9.tar.gz", - "version": "11.0.25" + "build": "4", + "sha256": "c970e5917964da1b50c0029ba88a6fbe962783def4de6a8a2835af6a6859002c", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.26%2B4/OpenJDK11U-jdk_aarch64_mac_hotspot_11.0.26_4.tar.gz", + "version": "11.0.26" }, "packageType": "jdk", "vmType": "hotspot", "x86_64": { - "build": "9", - "sha256": "fa6f88ebd8c3d2b4f5146cd45e4ef875cb2d073b6e95b60de86a1ce0bfdb463a", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.25%2B9/OpenJDK11U-jdk_x64_mac_hotspot_11.0.25_9.tar.gz", - "version": "11.0.25" + "build": "4", + "sha256": "b0142c2c85da43bb3565321164e8129b1166de5d6a43c88e567a92c39128c003", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.26%2B4/OpenJDK11U-jdk_x64_mac_hotspot_11.0.26_4.tar.gz", + "version": "11.0.26" } }, "openjdk17": { "aarch64": { - "build": "11", - "sha256": "d8b2f77f755d06e81a540834c5be22ed86f3c8a51a20396606c074303f8f9e2d", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.13%2B11/OpenJDK17U-jdk_aarch64_mac_hotspot_17.0.13_11.tar.gz", - "version": "17.0.13" + "build": "7", + "sha256": "95bcc8052340394b87644d71a60fb26f31857f4090a7dfee57113e9e0f2dfacb", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.14%2B7/OpenJDK17U-jdk_aarch64_mac_hotspot_17.0.14_7.tar.gz", + "version": "17.0.14" }, "packageType": "jdk", "vmType": "hotspot", "x86_64": { - "build": "11", - "sha256": "840535070200a944a6b582d258ee84608bd25c9f2b5d1cdddb58dfadb019675a", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.13%2B11/OpenJDK17U-jdk_x64_mac_hotspot_17.0.13_11.tar.gz", - "version": "17.0.13" + "build": "7", + "sha256": "bc2e9225d156d27149fc7a91817e6b64f76132b2b81d1f44cb8c90d7497b6ea7", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.14%2B7/OpenJDK17U-jdk_x64_mac_hotspot_17.0.14_7.tar.gz", + "version": "17.0.14" } }, "openjdk21": { "aarch64": { - "build": "11", - "sha256": "dc6db7347907d23743d13af935d3c10e8b3490acdf542115f578838227da0dab", - "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.5%2B11/OpenJDK21U-jdk_aarch64_mac_hotspot_21.0.5_11.tar.gz", - "version": "21.0.5" + "build": "7", + "sha256": "4ef4083919126a3d93e603284b405c7493905497485a92b375f5d6c3e8f7e8f2", + "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.6%2B7/OpenJDK21U-jdk_aarch64_mac_hotspot_21.0.6_7.tar.gz", + "version": "21.0.6" }, "packageType": "jdk", "vmType": "hotspot", "x86_64": { - "build": "11", - "sha256": "b9b46f396ab5f3658fa5569af963896167c7f735cfec816359c04101fae38bdf", - "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.5%2B11/OpenJDK21U-jdk_x64_mac_hotspot_21.0.5_11.tar.gz", - "version": "21.0.5" + "build": "7", + "sha256": "7aacfc400078ad65b7c7de3ec75ff74bf5c2077d6740b350f85ae10be4f71e76", + "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.6%2B7/OpenJDK21U-jdk_x64_mac_hotspot_21.0.6_7.tar.gz", + "version": "21.0.6" } }, "openjdk23": { "aarch64": { - "build": "11", - "sha256": "9e69810a50c8183e01429243d0bb112e381a122c6e7be936b7c13c3cfe7b29a0", - "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.1%2B11/OpenJDK23U-jdk_aarch64_mac_hotspot_23.0.1_11.tar.gz", - "version": "23.0.1" + "build": "7", + "sha256": "749993e751f085c7ae713140066a90800075e4aeedfac50a5ed0c5457131c5a0", + "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.2%2B7/OpenJDK23U-jdk_aarch64_mac_hotspot_23.0.2_7.tar.gz", + "version": "23.0.2" }, "packageType": "jdk", "vmType": "hotspot", "x86_64": { - "build": "11", - "sha256": "055a5b9c27991ad955c8207a20b549ac3254d479aa8a4fc199b6b02d56b1875e", - "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.1%2B11/OpenJDK23U-jdk_x64_mac_hotspot_23.0.1_11.tar.gz", - "version": "23.0.1" + "build": "7", + "sha256": "97fca2e90668351f248f149d4e96e16875094eba6716a8dd1dcf163be9e19085", + "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.2%2B7/OpenJDK23U-jdk_x64_mac_hotspot_23.0.2_7.tar.gz", + "version": "23.0.2" } }, "openjdk8": { @@ -535,75 +535,75 @@ "vmType": "hotspot", "x86_64": { "build": "6", - "sha256": "e5cc78b704cf96f7a6c4ad677048f79331f38cd37fbef6c86dce75e1bfe28895", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u432-b06/OpenJDK8U-jdk_x64_mac_hotspot_8u432b06.tar.gz", - "version": "8.0.432" + "sha256": "2f70725e032fe55629a2659d53646b14c538b12cdcedc2d3c9fa342e1b401cf1", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u442-b06/OpenJDK8U-jdk_x64_mac_hotspot_8u442b06.tar.gz", + "version": "8.0.442" } } }, "jre": { "openjdk11": { "aarch64": { - "build": "9", - "sha256": "f1d602b478269c7def552d4a01c5ba3ac91cc34f5d66b5313da3aa0b72d670e7", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.25%2B9/OpenJDK11U-jre_aarch64_mac_hotspot_11.0.25_9.tar.gz", - "version": "11.0.25" + "build": "4", + "sha256": "ea341e15094e8e892a2d9ff1d4960d1fd05937385278912618905d4b9e7c88e8", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.26%2B4/OpenJDK11U-jre_aarch64_mac_hotspot_11.0.26_4.tar.gz", + "version": "11.0.26" }, "packageType": "jre", "vmType": "hotspot", "x86_64": { - "build": "9", - "sha256": "97e0e32b12460e92e3b4632492b3ccd648cf03a6023ca2ee7dc81f7cfa3bd275", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.25%2B9/OpenJDK11U-jre_x64_mac_hotspot_11.0.25_9.tar.gz", - "version": "11.0.25" + "build": "4", + "sha256": "6d184fbcfa659675f52a7d789d4db05b9c9873c18ad9975a7b3c31e20ee4c878", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.26%2B4/OpenJDK11U-jre_x64_mac_hotspot_11.0.26_4.tar.gz", + "version": "11.0.26" } }, "openjdk17": { "aarch64": { - "build": "11", - "sha256": "a886b8f2a50eca2e59b45ea59f5a2e8e9d27ff5b5b3b069443a70cda7f27c907", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.13%2B11/OpenJDK17U-jre_aarch64_mac_hotspot_17.0.13_11.tar.gz", - "version": "17.0.13" + "build": "7", + "sha256": "9fb89125d5807f42cec588824fde487be42273a89c55ccfc5f44efda64e03e2c", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.14%2B7/OpenJDK17U-jre_aarch64_mac_hotspot_17.0.14_7.tar.gz", + "version": "17.0.14" }, "packageType": "jre", "vmType": "hotspot", "x86_64": { - "build": "11", - "sha256": "bf9faf4540001a251e6bfb52b99c7ec5b1f36d3ebe94e104f61a30f173ba8c78", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.13%2B11/OpenJDK17U-jre_x64_mac_hotspot_17.0.13_11.tar.gz", - "version": "17.0.13" + "build": "7", + "sha256": "f2c7454f7aba076cd414887b31da92e4a50fda7a13d97f6e295c911af60de0b6", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.14%2B7/OpenJDK17U-jre_x64_mac_hotspot_17.0.14_7.tar.gz", + "version": "17.0.14" } }, "openjdk21": { "aarch64": { - "build": "11", - "sha256": "12249a1c5386957c93fc372260c483ae921b1ec6248a5136725eabd0abc07f93", - "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.5%2B11/OpenJDK21U-jre_aarch64_mac_hotspot_21.0.5_11.tar.gz", - "version": "21.0.5" + "build": "7", + "sha256": "9b792bbd408676483caaeb619439190abf1552fe11ab05b19c80d408e5f49c25", + "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.6%2B7/OpenJDK21U-jre_aarch64_mac_hotspot_21.0.6_7.tar.gz", + "version": "21.0.6" }, "packageType": "jre", "vmType": "hotspot", "x86_64": { - "build": "11", - "sha256": "0e0dcb571f7bf7786c111fe066932066d9eab080c9f86d8178da3e564324ee81", - "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.5%2B11/OpenJDK21U-jre_x64_mac_hotspot_21.0.5_11.tar.gz", - "version": "21.0.5" + "build": "7", + "sha256": "632f7cba1aa752ae4108eccf3abc8b7e51b75d262e11e0cb9077b847438e5549", + "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.6%2B7/OpenJDK21U-jre_x64_mac_hotspot_21.0.6_7.tar.gz", + "version": "21.0.6" } }, "openjdk23": { "aarch64": { - "build": "11", - "sha256": "e29029d35608f4e415e49c7990ebe0f42d0ecb7dc2d4d444e41adf3e3287f922", - "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.1%2B11/OpenJDK23U-jre_aarch64_mac_hotspot_23.0.1_11.tar.gz", - "version": "23.0.1" + "build": "7", + "sha256": "56b86d4f5745ba44894310c3417755e4b4aaa62d4a17a5cb4dab6200c14c56fe", + "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.2%2B7/OpenJDK23U-jre_aarch64_mac_hotspot_23.0.2_7.tar.gz", + "version": "23.0.2" }, "packageType": "jre", "vmType": "hotspot", "x86_64": { - "build": "11", - "sha256": "87e532fda02327e0f2766650223b6bd63a4407c4907f82790edb5862a5285116", - "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.1%2B11/OpenJDK23U-jre_x64_mac_hotspot_23.0.1_11.tar.gz", - "version": "23.0.1" + "build": "7", + "sha256": "2c5b81ce3234d6bef0ec352734aa2de19c0950020c55a1cbfc21ae5fda7690b8", + "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.2%2B7/OpenJDK23U-jre_x64_mac_hotspot_23.0.2_7.tar.gz", + "version": "23.0.2" } }, "openjdk8": { @@ -611,9 +611,9 @@ "vmType": "hotspot", "x86_64": { "build": "6", - "sha256": "55aac241ad7cb7c1903d4810ad705ffe2f2536a88b6a88efabb4942a9f09db33", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u432-b06/OpenJDK8U-jre_x64_mac_hotspot_8u432b06.tar.gz", - "version": "8.0.432" + "sha256": "e2658d0808fd2f4d5ad261a8954366a9b277eabd55a404452674b56abc325fec", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u442-b06/OpenJDK8U-jre_x64_mac_hotspot_8u442b06.tar.gz", + "version": "8.0.442" } } } From 15e556ff0b9686aabb723f1696a65a2445d8906f Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Mon, 10 Feb 2025 09:27:08 +0000 Subject: [PATCH 219/343] SDL2: 2.30.12 -> 2.32.0 Changes: https://github.com/libsdl-org/SDL/releases/tag/release-2.32.0 --- pkgs/development/libraries/SDL2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/SDL2/default.nix b/pkgs/development/libraries/SDL2/default.nix index 4d4b446af7426..d88431bca7dfb 100644 --- a/pkgs/development/libraries/SDL2/default.nix +++ b/pkgs/development/libraries/SDL2/default.nix @@ -70,13 +70,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "SDL2"; - version = "2.30.12"; + version = "2.32.0"; src = fetchFromGitHub { owner = "libsdl-org"; repo = "SDL"; rev = "release-${finalAttrs.version}"; - hash = "sha256-9f7V15p8Cso1TVxcd7bEFGO3C3oIhQikyLh4pWXLaiA="; + hash = "sha256-BdyMlttrDwQMoz+bO6bfU3bh0xKnT8yQF6nb6OGRbHw="; }; dontDisableStatic = if withStatic then 1 else 0; outputs = [ From c16ff506a27e2340e5946dcef4c3bb30a16e4572 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Mon, 10 Feb 2025 09:47:05 +0000 Subject: [PATCH 220/343] xorg.libX11: 1.8.10 -> 1.8.11 Changes: https://lists.x.org/archives/xorg-announce/2025-February/003582.html --- pkgs/servers/x11/xorg/default.nix | 6 +++--- pkgs/servers/x11/xorg/overrides.nix | 8 -------- pkgs/servers/x11/xorg/tarballs.list | 2 +- 3 files changed, 4 insertions(+), 12 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 83a61ee2529d8..d5abf4a41382c 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -1123,11 +1123,11 @@ self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! libX11 = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libpthreadstubs, libxcb, xtrans, testers }: stdenv.mkDerivation (finalAttrs: { pname = "libX11"; - version = "1.8.10"; + version = "1.8.11"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/lib/libX11-1.8.10.tar.xz"; - sha256 = "0lywvwsz92j7isglvw2227g3na4ghyspvsvblpf43ns7jfnksfrb"; + url = "mirror://xorg/individual/lib/libX11-1.8.11.tar.xz"; + sha256 = "120f716wl7ay33yshicl1l0w62b9jx16ik3qnyh4ajwj8clyhx1v"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 54d8bfedf011e..2dc81662f4257 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -149,14 +149,6 @@ self: super: libX11 = super.libX11.overrideAttrs (attrs: { outputs = [ "out" "dev" "man" ]; - patches = [ - # Fix spurious Xerror when running synchronized - # https://gitlab.freedesktop.org/xorg/lib/libx11/-/merge_requests/264 - (fetchpatch { - url = "https://gitlab.freedesktop.org/xorg/lib/libx11/-/commit/f3d6ebac35301d4ad068e307f0fbe6aa12ccbccb.patch"; - hash = "sha256-wQNMsbQ+h9VlNiWr+r34AxvViC8fq02ZhcARRnw7O9k="; - }) - ]; configureFlags = attrs.configureFlags or [] ++ malloc0ReturnsNullCrossFlag ++ lib.optional (stdenv.targetPlatform.useLLVM or false) "ac_cv_path_RAWCPP=cpp"; diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index 0c7378869811f..cdc5d789dff38 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -172,7 +172,7 @@ mirror://xorg/individual/lib/libICE-1.1.2.tar.xz mirror://xorg/individual/lib/libpciaccess-0.18.1.tar.xz mirror://xorg/individual/lib/libSM-1.2.5.tar.xz mirror://xorg/individual/lib/libWindowsWM-1.0.1.tar.bz2 -mirror://xorg/individual/lib/libX11-1.8.10.tar.xz +mirror://xorg/individual/lib/libX11-1.8.11.tar.xz mirror://xorg/individual/lib/libXau-1.0.12.tar.xz mirror://xorg/individual/lib/libXaw-1.0.16.tar.xz mirror://xorg/individual/lib/libxcb-1.17.0.tar.xz From b8c6b4d87bae81688e37fa85fca2a57cbadd93e5 Mon Sep 17 00:00:00 2001 From: K900 Date: Mon, 10 Feb 2025 13:37:48 +0300 Subject: [PATCH 221/343] python3Packages.django_{4,5}: backport patch fixing builds on bcachefs --- pkgs/development/python-modules/django/4.nix | 8 ++++++++ pkgs/development/python-modules/django/5.nix | 8 ++++++++ 2 files changed, 16 insertions(+) diff --git a/pkgs/development/python-modules/django/4.nix b/pkgs/development/python-modules/django/4.nix index 1c9ad471581b7..e7deafc632719 100644 --- a/pkgs/development/python-modules/django/4.nix +++ b/pkgs/development/python-modules/django/4.nix @@ -3,6 +3,7 @@ stdenv, buildPythonPackage, fetchFromGitHub, + fetchpatch, pythonAtLeast, pythonOlder, substituteAll, @@ -65,6 +66,13 @@ buildPythonPackage rec { # make sure the tests don't remove packages from our pythonpath # and disable failing tests ./django_4_tests.patch + + # fix filename length limit tests on bcachefs + # FIXME: remove if ever backported + (fetchpatch { + url = "https://github.com/django/django/commit/12f4f95405c7857cbf2f4bf4d0261154aac31676.patch"; + hash = "sha256-+K20/V8sh036Ox9U7CSPgfxue7f28Sdhr3MsB7erVOk="; + }) ] ++ lib.optionals withGdal [ (substituteAll { diff --git a/pkgs/development/python-modules/django/5.nix b/pkgs/development/python-modules/django/5.nix index ba1f376de165a..0a46ca3e1e7e4 100644 --- a/pkgs/development/python-modules/django/5.nix +++ b/pkgs/development/python-modules/django/5.nix @@ -3,6 +3,7 @@ stdenv, buildPythonPackage, fetchFromGitHub, + fetchpatch, pythonOlder, substituteAll, @@ -65,6 +66,13 @@ buildPythonPackage rec { ./django_5_tests_pythonpath.patch # disable test that excpects timezone issues ./django_5_disable_failing_tests.patch + + # fix filename length limit tests on bcachefs + # FIXME: remove in 5.2 + (fetchpatch { + url = "https://github.com/django/django/commit/12f4f95405c7857cbf2f4bf4d0261154aac31676.patch"; + hash = "sha256-+K20/V8sh036Ox9U7CSPgfxue7f28Sdhr3MsB7erVOk="; + }) ] ++ lib.optionals withGdal [ (substituteAll { From d56e20e7099fa4e88cccea64229356918a435d6d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 10 Feb 2025 12:32:32 +0000 Subject: [PATCH 222/343] lcms: 2.16 -> 2.17 --- pkgs/by-name/lc/lcms2/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/lc/lcms2/package.nix b/pkgs/by-name/lc/lcms2/package.nix index 17af27ccd36be..e5fe6136e7da9 100644 --- a/pkgs/by-name/lc/lcms2/package.nix +++ b/pkgs/by-name/lc/lcms2/package.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "lcms2"; - version = "2.16"; + version = "2.17"; src = fetchurl { url = "mirror://sourceforge/lcms/${pname}-${version}.tar.gz"; - hash = "sha256-2HPTSti5tM6gEGMfGmIo0gh0deTcXnY+uBrMI9nUWlE="; + hash = "sha256-0Rr1aeQqG6oWUNIK1h0S5Br0/q1Kp5ZKAfk7CLU6sHQ="; }; outputs = [ From fe08a6f87bc866fed6dc25edf7b762a7295bc21f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 10 Feb 2025 12:33:01 +0000 Subject: [PATCH 223/343] waf: 2.1.4 -> 2.1.5 --- pkgs/by-name/wa/waf/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/wa/waf/package.nix b/pkgs/by-name/wa/waf/package.nix index 77423091ed7a2..7a2e4298a0d8c 100644 --- a/pkgs/by-name/wa/waf/package.nix +++ b/pkgs/by-name/wa/waf/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "waf"; - version = "2.1.4"; + version = "2.1.5"; src = fetchFromGitLab { owner = "ita1024"; repo = "waf"; rev = "waf-${finalAttrs.version}"; - hash = "sha256-Dt8eo/rY6JRu6teTQM0y7bjMzQjOv3WSL6bcF9g0B8o="; + hash = "sha256-cZ8tt17m1KUGxYPJf+cHf9j8rzNCrGyY8rcZcSvebyY="; }; nativeBuildInputs = [ From 227ee089f6f50f0e021155874031d345590df582 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 10 Feb 2025 11:20:17 +0100 Subject: [PATCH 224/343] librsvg: fix cross MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Some things have changed with the switch to Meson: • The pixbuf stuff is only generated when build = host, even if an emulator would be available. • -Dtriplet needs to be passed when cross compiling. • This version of librsvg does not allow gobject-introspection to be enabled when cross compiling. Backport the fix for that. Fixes: c202e21f6445 ("librsvg: 2.58.3 → 2.59.2") --- .../development/libraries/librsvg/default.nix | 21 ++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/librsvg/default.nix b/pkgs/development/libraries/librsvg/default.nix index 4f6e93674408f..d78cac09cb41d 100644 --- a/pkgs/development/libraries/librsvg/default.nix +++ b/pkgs/development/libraries/librsvg/default.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchurl, + fetchpatch, pkg-config, meson, ninja, @@ -31,6 +32,7 @@ && stdenv.hostPlatform.emulatorAvailable buildPackages, buildPackages, gobject-introspection, + mesonEmulatorHook, _experimental-update-script-combinators, common-updater-scripts, jq, @@ -65,6 +67,14 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-7NKT+wzDOMFwFxu8e8++pnJdBByV8xOF3JNUCZM+RZc="; }; + patches = [ + (fetchpatch { + name = "cross-introspection.patch"; + url = "https://gitlab.gnome.org/GNOME/librsvg/-/commit/84f24b1f5767f807f8d0442bbf3f149a0defcf78.patch"; + hash = "sha256-FRyAYCCP3eu7YDUS6g7sKCdbq2nU8yQdbdVaQwLrlhE="; + }) + ]; + cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) src; name = "librsvg-deps-${finalAttrs.version}"; @@ -95,6 +105,9 @@ stdenv.mkDerivation (finalAttrs: { gobject-introspection gi-docgen vala # vala bindings require GObject introspection + ] + ++ lib.optionals (withIntrospection && !stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ + mesonEmulatorHook ]; buildInputs = @@ -119,6 +132,7 @@ stdenv.mkDerivation (finalAttrs: { ]; mesonFlags = [ + "-Dtriplet=${stdenv.hostPlatform.rust.rustcTarget}" (lib.mesonEnable "introspection" withIntrospection) (lib.mesonEnable "vala" withIntrospection) (lib.mesonBool "tests" finalAttrs.finalPackage.doCheck) @@ -156,17 +170,18 @@ stdenv.mkDerivation (finalAttrs: { export XDG_DATA_DIRS=${shared-mime-info}/share:$XDG_DATA_DIRS ''; - # Not generated when cross compiling. postInstall = let emulator = stdenv.hostPlatform.emulator buildPackages; in - lib.optionalString (stdenv.hostPlatform.emulatorAvailable buildPackages) '' + # Not generated when cross compiling. + lib.optionalString (lib.systems.equals stdenv.buildPlatform stdenv.hostPlatform) '' # Merge gdkpixbuf and librsvg loaders GDK_PIXBUF=$out/${gdk-pixbuf.binaryDir} cat ${lib.getLib gdk-pixbuf}/${gdk-pixbuf.binaryDir}/loaders.cache $GDK_PIXBUF/loaders.cache > $GDK_PIXBUF/loaders.cache.tmp mv $GDK_PIXBUF/loaders.cache.tmp $GDK_PIXBUF/loaders.cache - + '' + + lib.optionalString (stdenv.hostPlatform.emulatorAvailable buildPackages) '' installShellCompletion --cmd rsvg-convert \ --bash <(${emulator} $out/bin/rsvg-convert --completion bash) \ --fish <(${emulator} $out/bin/rsvg-convert --completion fish) \ From 70c7526514c3d3323c3262211aa7ab9e0e0edb07 Mon Sep 17 00:00:00 2001 From: Lin Jian Date: Mon, 10 Feb 2025 22:46:57 +0800 Subject: [PATCH 225/343] emacsPackages.magit-svn: fix build https://hydra.nix-community.org/build/3134861 --- .../elisp-packages/recipes-archive-melpa.json | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json b/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json index cd6e6924f0007..7eaeaeef87d1a 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json +++ b/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json @@ -76110,28 +76110,30 @@ "repo": "emacsorphanage/magit-svn", "unstable": { "version": [ - 20220314, - 1451 + 20250210, + 1141 ], "deps": [ + "dash", "magit", "transient" ], - "commit": "b8277081db90977247ae3900ea6afeb0ca644d36", - "sha256": "1ywwylxasgyk6gldypvbn6hlbmkp24rx6kcd0qvxsp39bbd0in50" + "commit": "ca637c648835eddbeb277cc8089d3ffd6f75ae13", + "sha256": "sha256-p+uDl+TUStmtbiPk64oRAbvni0LADklStClHgD5OgXQ=" }, "stable": { "version": [ 2, 2, - 3 + 4 ], "deps": [ + "dash", "magit", "transient" ], - "commit": "350493217afdb7637564e089f475909adecd9208", - "sha256": "1v1y4fir1plz4kj0cvkcd29wibli4dw7vp4fmbxq4df76d8iy8yd" + "commit": "ca637c648835eddbeb277cc8089d3ffd6f75ae13", + "sha256": "0x419qz80ir9ni94j3n08a5ygfq1265fpr13dsnxjjnlwjbq7sx7" } }, { From 3964fde0b0ca73637f4e9499de04faa84737a7b7 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 10 Feb 2025 16:07:05 +0100 Subject: [PATCH 226/343] librsvg: fix static --- pkgs/development/libraries/librsvg/default.nix | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/librsvg/default.nix b/pkgs/development/libraries/librsvg/default.nix index d78cac09cb41d..fcd46738c997b 100644 --- a/pkgs/development/libraries/librsvg/default.nix +++ b/pkgs/development/libraries/librsvg/default.nix @@ -27,6 +27,8 @@ vala, writeShellScript, shared-mime-info, + # Requires building a cdylib. + withPixbufLoader ? !stdenv.hostPlatform.isStatic, withIntrospection ? lib.meta.availableOn stdenv.hostPlatform gobject-introspection && stdenv.hostPlatform.emulatorAvailable buildPackages, @@ -134,12 +136,23 @@ stdenv.mkDerivation (finalAttrs: { mesonFlags = [ "-Dtriplet=${stdenv.hostPlatform.rust.rustcTarget}" (lib.mesonEnable "introspection" withIntrospection) + (lib.mesonEnable "pixbuf-loader" withPixbufLoader) (lib.mesonEnable "vala" withIntrospection) (lib.mesonBool "tests" finalAttrs.finalPackage.doCheck) ]; - # Probably broken MIME type detection. - doCheck = !stdenv.isDarwin; + doCheck = + # Probably broken MIME type detection. + !stdenv.isDarwin + && + # Could be made to work, but requires the C API test to be linked + # with a C++ linker because + # librsvg -> gdk-pixbuf -> libtiff -> lerc (C++). + # + # Doesn't make sense to pursue this upstream until gdk-pixbuf + # itself is fixed: + # https://gitlab.gnome.org/GNOME/gdk-pixbuf/-/merge_requests/181 + !stdenv.hostPlatform.isStatic; env = { PKG_CONFIG_GDK_PIXBUF_2_0_GDK_PIXBUF_QUERY_LOADERS = writeShellScript "gdk-pixbuf-loader-loaders-wrapped" '' From a56f556e08b104bb6bf0a4f37ce43d2afa346847 Mon Sep 17 00:00:00 2001 From: K900 Date: Mon, 10 Feb 2025 17:58:06 +0300 Subject: [PATCH 227/343] watchman: add update script to bulk update all the Facebook stuff --- pkgs/by-name/wa/watchman/package.nix | 2 +- pkgs/by-name/wa/watchman/update.sh | 22 ++++++++++++++++++++++ 2 files changed, 23 insertions(+), 1 deletion(-) create mode 100755 pkgs/by-name/wa/watchman/update.sh diff --git a/pkgs/by-name/wa/watchman/package.nix b/pkgs/by-name/wa/watchman/package.nix index 7e662f24b40e5..66d86f6b8e31e 100644 --- a/pkgs/by-name/wa/watchman/package.nix +++ b/pkgs/by-name/wa/watchman/package.nix @@ -103,7 +103,7 @@ stdenv.mkDerivation (finalAttrs: { remove-references-to -t ${folly.fmt.dev} $out/bin/* ''; - passthru.updateScript = nix-update-script { }; + passthru.updateScript = ./update.sh; meta = { description = "Watches files and takes action when they change"; diff --git a/pkgs/by-name/wa/watchman/update.sh b/pkgs/by-name/wa/watchman/update.sh new file mode 100755 index 0000000000000..33be4da4b0921 --- /dev/null +++ b/pkgs/by-name/wa/watchman/update.sh @@ -0,0 +1,22 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p nix-update cargo +# shellcheck shell=bash + +set -euf -o pipefail + +# toposorted manually, please keep in order +PACKAGES=( + "folly" + "fizz" + "mvfst" + "wangle" + "fbthrift" + "fb303" + "edencommon" +) + +for P in "${PACKAGES[@]}"; do + nix-update "$P" --commit +done + +nix-update watchman --commit --generate-lockfile --lockfile-metadata-path "watchman/cli" From 9f438130dd2ad5c550155d14937ba92f123ceb69 Mon Sep 17 00:00:00 2001 From: K900 Date: Mon, 10 Feb 2025 17:59:17 +0300 Subject: [PATCH 228/343] folly: 2025.01.06.00 -> 2025.02.03.00 Diff: https://github.com/facebook/folly/compare/refs/tags/v2025.01.06.00...v2025.02.03.00 --- pkgs/by-name/fo/folly/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fo/folly/package.nix b/pkgs/by-name/fo/folly/package.nix index 0ee9b228d6eaf..4e7022ba3fbb5 100644 --- a/pkgs/by-name/fo/folly/package.nix +++ b/pkgs/by-name/fo/folly/package.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "folly"; - version = "2025.01.06.00"; + version = "2025.02.03.00"; # split outputs to reduce downstream closure sizes outputs = [ @@ -52,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "facebook"; repo = "folly"; tag = "v${finalAttrs.version}"; - hash = "sha256-GxHOs6jfjiKQWWFs03O/sI92OvpPsf+Xilnawb8Nygs="; + hash = "sha256-OuMbxZ9sl9KPDHFae503R0AqzDYFdyuaGK1BospRtfs="; }; nativeBuildInputs = [ From 072c37534ba890c1191c598958cfb0a9bce19dd1 Mon Sep 17 00:00:00 2001 From: K900 Date: Mon, 10 Feb 2025 17:59:22 +0300 Subject: [PATCH 229/343] fizz: 2025.01.27.00 -> 2025.02.03.00 Diff: https://github.com/facebookincubator/fizz/compare/refs/tags/v2025.01.27.00...v2025.02.03.00 Changelog: https://github.com/facebookincubator/fizz/releases/tag/v2025.02.03.00 --- pkgs/by-name/fi/fizz/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fi/fizz/package.nix b/pkgs/by-name/fi/fizz/package.nix index 498061f63041d..6d9b9ee9ebce1 100644 --- a/pkgs/by-name/fi/fizz/package.nix +++ b/pkgs/by-name/fi/fizz/package.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "fizz"; - version = "2025.01.27.00"; + version = "2025.02.03.00"; outputs = [ "bin" @@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "facebookincubator"; repo = "fizz"; tag = "v${finalAttrs.version}"; - hash = "sha256-Gt1DaEcpto25dkT6QsGg3jNp8vvAuWJrzCqelknK+IU="; + hash = "sha256-czGCQNigLveQu0lvu1Dbamk6Upngr2i3njvLSNKSNj0="; }; patches = [ From 18da458f1c5ddf4a21745f5dbf0e81eaa7c7d2f1 Mon Sep 17 00:00:00 2001 From: K900 Date: Mon, 10 Feb 2025 17:59:26 +0300 Subject: [PATCH 230/343] mvfst: 2025.01.27.00 -> 2025.02.03.00 Diff: https://github.com/facebook/mvfst/compare/refs/tags/v2025.01.27.00...v2025.02.03.00 --- pkgs/by-name/mv/mvfst/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/mv/mvfst/package.nix b/pkgs/by-name/mv/mvfst/package.nix index 96a182cdf63db..b9f957d6e7259 100644 --- a/pkgs/by-name/mv/mvfst/package.nix +++ b/pkgs/by-name/mv/mvfst/package.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "mvfst"; - version = "2025.01.27.00"; + version = "2025.02.03.00"; outputs = [ "bin" @@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "facebook"; repo = "mvfst"; tag = "v${finalAttrs.version}"; - hash = "sha256-8qYybElhtZyx87aZnR6r5exrLewsInS1U2m+zVPXSyw="; + hash = "sha256-IsBydt1T33yedlaoyKl43fB7Dsuu4RPPiJuUtwZIUGg="; }; patches = [ From 023fa67b3f5bb1243333ff1e74ce265e8efab8bd Mon Sep 17 00:00:00 2001 From: K900 Date: Mon, 10 Feb 2025 17:59:29 +0300 Subject: [PATCH 231/343] wangle: 2025.01.27.00 -> 2025.02.03.00 Diff: https://github.com/facebook/wangle/compare/refs/tags/v2025.01.27.00...v2025.02.03.00 --- pkgs/by-name/wa/wangle/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/wa/wangle/package.nix b/pkgs/by-name/wa/wangle/package.nix index ed13b75dd2634..3ad368828ebf7 100644 --- a/pkgs/by-name/wa/wangle/package.nix +++ b/pkgs/by-name/wa/wangle/package.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "wangle"; - version = "2025.01.27.00"; + version = "2025.02.03.00"; outputs = [ "out" @@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "facebook"; repo = "wangle"; tag = "v${finalAttrs.version}"; - hash = "sha256-aZnDqMQ2Xh/v5zhyvR8ovHgISjTy8eGoGXg69Ee3Ejk="; + hash = "sha256-IlMdYOQH0iqxObyFM1F4cZqOgSbCs4cOFtcsPWG8cWk="; }; patches = [ From c916433300d7789ac5f5a7c24b2ed0a0b462c50a Mon Sep 17 00:00:00 2001 From: K900 Date: Mon, 10 Feb 2025 17:59:48 +0300 Subject: [PATCH 232/343] fbthrift: 2025.01.27.00 -> 2025.02.03.00 Diff: https://github.com/facebook/fbthrift/compare/refs/tags/v2025.01.27.00...v2025.02.03.00 --- pkgs/by-name/fb/fbthrift/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fb/fbthrift/package.nix b/pkgs/by-name/fb/fbthrift/package.nix index a070d5273b1ad..afef7eefb4e31 100644 --- a/pkgs/by-name/fb/fbthrift/package.nix +++ b/pkgs/by-name/fb/fbthrift/package.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "fbthrift"; - version = "2025.01.27.00"; + version = "2025.02.03.00"; outputs = [ # Trying to split this up further into `bin`, `out`, and `dev` @@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "facebook"; repo = "fbthrift"; tag = "v${finalAttrs.version}"; - hash = "sha256-HiPIpmRwlHSduwHV8EJSmhg7PYFDumx0TNo8uzJ9+j8="; + hash = "sha256-130BHYUFDo11T9bI7cQ7Y+lTnFSr3WNgJ7IA+3BE9+g="; }; patches = [ From c07476dd6f787538c09f99f0d35309cc7e545a2c Mon Sep 17 00:00:00 2001 From: K900 Date: Mon, 10 Feb 2025 17:59:52 +0300 Subject: [PATCH 233/343] fb303: 2025.01.27.00 -> 2025.02.03.00 Diff: https://github.com/facebook/fb303/compare/refs/tags/v2025.01.27.00...v2025.02.03.00 --- pkgs/by-name/fb/fb303/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fb/fb303/package.nix b/pkgs/by-name/fb/fb303/package.nix index ff773b58e27bc..78aa0be2c5354 100644 --- a/pkgs/by-name/fb/fb303/package.nix +++ b/pkgs/by-name/fb/fb303/package.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "fb303"; - version = "2025.01.27.00"; + version = "2025.02.03.00"; outputs = [ "out" @@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "facebook"; repo = "fb303"; tag = "v${finalAttrs.version}"; - hash = "sha256-xSE+3fJiwNJT3tzZWighX/Qe/sCXg18arMR2csUAPbs="; + hash = "sha256-ofQshSBWjL02Z9iQVJu86eet1ULANYzUUcOLBfKJip0="; }; patches = [ From 850984168b29f9e933fd5e9adfc497d140c2821a Mon Sep 17 00:00:00 2001 From: K900 Date: Mon, 10 Feb 2025 17:59:55 +0300 Subject: [PATCH 234/343] edencommon: 2025.01.06.00 -> 2025.02.03.00 Diff: https://github.com/facebookexperimental/edencommon/compare/refs/tags/v2025.01.06.00...v2025.02.03.00 --- pkgs/by-name/ed/edencommon/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ed/edencommon/package.nix b/pkgs/by-name/ed/edencommon/package.nix index 77cc3653952d1..c2664d663b85d 100644 --- a/pkgs/by-name/ed/edencommon/package.nix +++ b/pkgs/by-name/ed/edencommon/package.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "edencommon"; - version = "2025.01.06.00"; + version = "2025.02.03.00"; outputs = [ "out" @@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "facebookexperimental"; repo = "edencommon"; tag = "v${finalAttrs.version}"; - hash = "sha256-9JCyXFWglnIuDw5jSSqcnuMfQ2JXMdNwFVyyBccjoag="; + hash = "sha256-wY6HEIQZdyyglXADxq9zaCrRCneqQEBs+EqoY3mNY3E="; }; patches = From aaca3d7f4fffc2b36fc569e9ac3af293d76f8968 Mon Sep 17 00:00:00 2001 From: K900 Date: Mon, 10 Feb 2025 18:41:18 +0300 Subject: [PATCH 235/343] watchman: 2025.01.06.00 -> 2025.02.03.00 Diff: https://github.com/facebook/watchman/compare/refs/tags/v2025.01.06.00...v2025.02.03.00 --- pkgs/by-name/wa/watchman/Cargo.lock | 62 ++++++++++++++-------------- pkgs/by-name/wa/watchman/package.nix | 4 +- 2 files changed, 33 insertions(+), 33 deletions(-) diff --git a/pkgs/by-name/wa/watchman/Cargo.lock b/pkgs/by-name/wa/watchman/Cargo.lock index 8e5f4543a1fc3..720cbbfaa8658 100644 --- a/pkgs/by-name/wa/watchman/Cargo.lock +++ b/pkgs/by-name/wa/watchman/Cargo.lock @@ -85,9 +85,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.6.0" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" +checksum = "8f68f53c83ab957f72c32642f3868eec03eb974d1fb82e453128456482613d36" [[package]] name = "byteorder" @@ -97,9 +97,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.9.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "325918d6fe32f23b19878fe4b34794ae41fc19ddbe53b10571a4874d44ffd39b" +checksum = "f61dac84819c6588b558454b194026eb1f09c293b9036ae9b159e74e73ab6cf9" dependencies = [ "serde", ] @@ -273,7 +273,7 @@ checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" dependencies = [ "proc-macro2", "quote", - "syn 2.0.95", + "syn 2.0.98", ] [[package]] @@ -382,9 +382,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.22" +version = "0.4.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" +checksum = "04cbf5b083de1c7e0222a7a51dbfdba1cbe1c6ab0b15e29fff3f6c077fd9cd9f" [[package]] name = "maplit" @@ -409,9 +409,9 @@ dependencies = [ [[package]] name = "miniz_oxide" -version = "0.8.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ffbe83022cedc1d264172192511ae958937694cd57ce297164951b8b3568394" +checksum = "b8402cab7aefae129c6977bb0ff1b8fd9a04eb5b51efc50a70bea51cda0c7924" dependencies = [ "adler2", ] @@ -433,7 +433,7 @@ version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.8.0", "cfg-if", "cfg_aliases", "libc", @@ -460,9 +460,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.20.2" +version = "1.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775" +checksum = "945462a4b81e43c4e3ba96bd7b49d834c6f61198356aa858733bc4acf3cbe62e" [[package]] name = "os_pipe" @@ -535,9 +535,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.92" +version = "1.0.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0" +checksum = "60946a68e5f9d28b0dc1c21bb8a97ee7d018a8b322fa57838ba31cc878e22d99" dependencies = [ "unicode-ident", ] @@ -577,7 +577,7 @@ version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "03a862b389f93e68874fbf580b9de08dd02facb9a788ebadaf4a3fd33cf58834" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.8.0", ] [[package]] @@ -588,9 +588,9 @@ checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" [[package]] name = "ryu" -version = "1.0.18" +version = "1.0.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" +checksum = "6ea1a2d0a644769cc99faa24c3ad26b379b786fe7c36fd3c546254801650e6dd" [[package]] name = "scopeguard" @@ -636,14 +636,14 @@ checksum = "5a9bf7cf98d04a2b28aead066b7496853d4779c9cc183c440dbac457641e19a0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.95", + "syn 2.0.98", ] [[package]] name = "serde_json" -version = "1.0.134" +version = "1.0.138" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d00f4175c42ee48b15416f6193a959ba3a0d67fc699a0db9ad12df9f83991c7d" +checksum = "d434192e7da787e94a6ea7e9670b26a036d0ca41e0b7efb2676dd32bae872949" dependencies = [ "itoa", "memchr", @@ -738,9 +738,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.95" +version = "2.0.98" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46f71c0377baf4ef1cc3e3402ded576dccc315800fbc62dfc7fe04b009773b4a" +checksum = "36147f1a48ae0ec2b5b3bc5b537d267457555a10dc06f3dbc8cb11ba3006d3b1" dependencies = [ "proc-macro2", "quote", @@ -797,14 +797,14 @@ checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.95", + "syn 2.0.98", ] [[package]] name = "tokio" -version = "1.42.0" +version = "1.43.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cec9b21b0450273377fc97bd4c33a8acffc8c996c987a7c5b319a0083707551" +checksum = "3d61fa4ffa3de412bfea335c6ecff681de2b609ba3c77ef3e00e521813a9ed9e" dependencies = [ "backtrace", "bytes", @@ -821,13 +821,13 @@ dependencies = [ [[package]] name = "tokio-macros" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" +checksum = "6e06d43f1345a3bcd39f6a56dbb7dcab2ba47e68e8ac134855e7e2bdbaf8cab8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.95", + "syn 2.0.98", ] [[package]] @@ -867,9 +867,9 @@ dependencies = [ [[package]] name = "unicode-ident" -version = "1.0.14" +version = "1.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" +checksum = "a210d160f08b701c8721ba1c726c11662f877ea6b7094007e1ca9a1041945034" [[package]] name = "unicode-segmentation" @@ -1075,5 +1075,5 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.95", + "syn 2.0.98", ] diff --git a/pkgs/by-name/wa/watchman/package.nix b/pkgs/by-name/wa/watchman/package.nix index 66d86f6b8e31e..0e5309b269515 100644 --- a/pkgs/by-name/wa/watchman/package.nix +++ b/pkgs/by-name/wa/watchman/package.nix @@ -35,13 +35,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "watchman"; - version = "2025.01.06.00"; + version = "2025.02.03.00"; src = fetchFromGitHub { owner = "facebook"; repo = "watchman"; tag = "v${finalAttrs.version}"; - hash = "sha256-W37+xs+Fj2yL9KzR9CugfgbFl+g3f+2Dx+xL9MpQEQ4="; + hash = "sha256-fR5SOCRc77vtKUIRJvl7pgRjUPwakQCzGTvIF4Ye2/I="; }; patches = [ From bd09ba63125cd05054ff3c67477e2a4a4f887061 Mon Sep 17 00:00:00 2001 From: K900 Date: Mon, 10 Feb 2025 19:24:53 +0300 Subject: [PATCH 236/343] folly: 2025.02.03.00 -> 2025.02.10.00 Diff: https://github.com/facebook/folly/compare/refs/tags/v2025.02.03.00...v2025.02.10.00 --- pkgs/by-name/fo/folly/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/fo/folly/package.nix b/pkgs/by-name/fo/folly/package.nix index 4e7022ba3fbb5..6d9313acbe0a1 100644 --- a/pkgs/by-name/fo/folly/package.nix +++ b/pkgs/by-name/fo/folly/package.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "folly"; - version = "2025.02.03.00"; + version = "2025.02.10.00"; # split outputs to reduce downstream closure sizes outputs = [ From 62312139ec644601e9da9f9455e91f2273105e39 Mon Sep 17 00:00:00 2001 From: K900 Date: Mon, 10 Feb 2025 19:25:00 +0300 Subject: [PATCH 237/343] fizz: 2025.02.03.00 -> 2025.02.10.00 Diff: https://github.com/facebookincubator/fizz/compare/refs/tags/v2025.02.03.00...v2025.02.10.00 Changelog: https://github.com/facebookincubator/fizz/releases/tag/v2025.02.10.00 --- pkgs/by-name/fi/fizz/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/fi/fizz/package.nix b/pkgs/by-name/fi/fizz/package.nix index 6d9b9ee9ebce1..44edf61ea2215 100644 --- a/pkgs/by-name/fi/fizz/package.nix +++ b/pkgs/by-name/fi/fizz/package.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "fizz"; - version = "2025.02.03.00"; + version = "2025.02.10.00"; outputs = [ "bin" From d88b6f86de3e497ba3563c0ff4561095fc507bd2 Mon Sep 17 00:00:00 2001 From: K900 Date: Mon, 10 Feb 2025 19:25:04 +0300 Subject: [PATCH 238/343] mvfst: 2025.02.03.00 -> 2025.02.10.00 Diff: https://github.com/facebook/mvfst/compare/refs/tags/v2025.02.03.00...v2025.02.10.00 --- pkgs/by-name/mv/mvfst/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/mv/mvfst/package.nix b/pkgs/by-name/mv/mvfst/package.nix index b9f957d6e7259..edc2a6808b6f8 100644 --- a/pkgs/by-name/mv/mvfst/package.nix +++ b/pkgs/by-name/mv/mvfst/package.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "mvfst"; - version = "2025.02.03.00"; + version = "2025.02.10.00"; outputs = [ "bin" From 5a60362342d17e2464762010be25d02ae827b835 Mon Sep 17 00:00:00 2001 From: K900 Date: Mon, 10 Feb 2025 19:25:07 +0300 Subject: [PATCH 239/343] wangle: 2025.02.03.00 -> 2025.02.10.00 Diff: https://github.com/facebook/wangle/compare/refs/tags/v2025.02.03.00...v2025.02.10.00 --- pkgs/by-name/wa/wangle/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/wa/wangle/package.nix b/pkgs/by-name/wa/wangle/package.nix index 3ad368828ebf7..fbf0705e3cef3 100644 --- a/pkgs/by-name/wa/wangle/package.nix +++ b/pkgs/by-name/wa/wangle/package.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "wangle"; - version = "2025.02.03.00"; + version = "2025.02.10.00"; outputs = [ "out" From d63e9f2366780240313dc0cf7dc47db86b5cfe1e Mon Sep 17 00:00:00 2001 From: K900 Date: Mon, 10 Feb 2025 19:25:35 +0300 Subject: [PATCH 240/343] fbthrift: 2025.02.03.00 -> 2025.02.10.00 Diff: https://github.com/facebook/fbthrift/compare/refs/tags/v2025.02.03.00...v2025.02.10.00 --- pkgs/by-name/fb/fbthrift/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/fb/fbthrift/package.nix b/pkgs/by-name/fb/fbthrift/package.nix index afef7eefb4e31..c69aeb48bd97f 100644 --- a/pkgs/by-name/fb/fbthrift/package.nix +++ b/pkgs/by-name/fb/fbthrift/package.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "fbthrift"; - version = "2025.02.03.00"; + version = "2025.02.10.00"; outputs = [ # Trying to split this up further into `bin`, `out`, and `dev` From d0c70b4cfd8a43a8e96aadd62613d0487cd65496 Mon Sep 17 00:00:00 2001 From: K900 Date: Mon, 10 Feb 2025 19:25:39 +0300 Subject: [PATCH 241/343] fb303: 2025.02.03.00 -> 2025.02.10.00 Diff: https://github.com/facebook/fb303/compare/refs/tags/v2025.02.03.00...v2025.02.10.00 --- pkgs/by-name/fb/fb303/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/fb/fb303/package.nix b/pkgs/by-name/fb/fb303/package.nix index 78aa0be2c5354..82ece3cd56218 100644 --- a/pkgs/by-name/fb/fb303/package.nix +++ b/pkgs/by-name/fb/fb303/package.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "fb303"; - version = "2025.02.03.00"; + version = "2025.02.10.00"; outputs = [ "out" From 372ef2c340fc0d5bde082a351f73431c10b729c3 Mon Sep 17 00:00:00 2001 From: K900 Date: Mon, 10 Feb 2025 19:25:43 +0300 Subject: [PATCH 242/343] edencommon: 2025.02.03.00 -> 2025.02.10.00 Diff: https://github.com/facebookexperimental/edencommon/compare/refs/tags/v2025.02.03.00...v2025.02.10.00 --- pkgs/by-name/ed/edencommon/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ed/edencommon/package.nix b/pkgs/by-name/ed/edencommon/package.nix index c2664d663b85d..95e31de10e53d 100644 --- a/pkgs/by-name/ed/edencommon/package.nix +++ b/pkgs/by-name/ed/edencommon/package.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "edencommon"; - version = "2025.02.03.00"; + version = "2025.02.10.00"; outputs = [ "out" From 5dcdb291ebc1e49bce8ad146a401e3a891aca02c Mon Sep 17 00:00:00 2001 From: K900 Date: Mon, 10 Feb 2025 19:57:32 +0300 Subject: [PATCH 243/343] watchman: 2025.02.03.00 -> 2025.02.10.00 Diff: https://github.com/facebook/watchman/compare/refs/tags/v2025.02.03.00...v2025.02.10.00 --- pkgs/by-name/wa/watchman/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/wa/watchman/package.nix b/pkgs/by-name/wa/watchman/package.nix index 0e5309b269515..a46cc591d87fa 100644 --- a/pkgs/by-name/wa/watchman/package.nix +++ b/pkgs/by-name/wa/watchman/package.nix @@ -35,13 +35,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "watchman"; - version = "2025.02.03.00"; + version = "2025.02.10.00"; src = fetchFromGitHub { owner = "facebook"; repo = "watchman"; tag = "v${finalAttrs.version}"; - hash = "sha256-fR5SOCRc77vtKUIRJvl7pgRjUPwakQCzGTvIF4Ye2/I="; + hash = "sha256-X9cUiMrUeuuJT+0gJa9cL2mpeSEWS/DkTx7eQu8u7oY="; }; patches = [ From 2e43b87c62a2c2f179293ec3645a3688fc1e34a0 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sat, 8 Feb 2025 11:11:42 +0100 Subject: [PATCH 244/343] replaceVars: fail when exemption can't be found This also changes stdenv's substitute --replace-fail to error out when the replacement is the same as the search pattern, but can't be found. This should not cause any problems in existing code, from what I can tell from grepping nixpkgs. The exception for pattern==replacement was previously introduced all the way back in 5ff872aa24983cf3e1cf28bb990042846c1a97ee, but this was apparently only used to make the check for the warning "simpler". --- .../replace-vars/replace-vars-with.nix | 12 ++++------ pkgs/stdenv/generic/setup.sh | 18 ++++++-------- pkgs/test/replace-vars/default.nix | 24 +++++++++++++++++++ 3 files changed, 36 insertions(+), 18 deletions(-) diff --git a/pkgs/build-support/replace-vars/replace-vars-with.nix b/pkgs/build-support/replace-vars/replace-vars-with.nix index 14a1e6a8e1e3d..42be45b6dcf1d 100644 --- a/pkgs/build-support/replace-vars/replace-vars-with.nix +++ b/pkgs/build-support/replace-vars/replace-vars-with.nix @@ -58,13 +58,11 @@ let # We use `--replace-fail` instead of `--subst-var-by` so that if the thing isn't there, we fail. - subst-var-by = - name: value: - lib.optionals (value != null) [ - "--replace-fail" - (lib.escapeShellArg "@${name}@") - (lib.escapeShellArg value) - ]; + subst-var-by = name: value: [ + "--replace-fail" + (lib.escapeShellArg "@${name}@") + (lib.escapeShellArg (lib.defaultTo "@${name}@" value)) + ]; substitutions = lib.concatLists (lib.mapAttrsToList subst-var-by replacements); diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh index 4198f41aadde9..958fc54f277fb 100644 --- a/pkgs/stdenv/generic/setup.sh +++ b/pkgs/stdenv/generic/setup.sh @@ -1042,19 +1042,15 @@ substituteStream() { pattern="$2" replacement="$3" shift 3 - local savedvar - savedvar="${!var}" - eval "$var"'=${'"$var"'//"$pattern"/"$replacement"}' - if [ "$pattern" != "$replacement" ]; then - if [ "${!var}" == "$savedvar" ]; then - if [ "$replace_mode" == --replace-warn ]; then - printf "substituteStream() in derivation $name: WARNING: pattern %q doesn't match anything in %s\n" "$pattern" "$description" >&2 - elif [ "$replace_mode" == --replace-fail ]; then - printf "substituteStream() in derivation $name: ERROR: pattern %q doesn't match anything in %s\n" "$pattern" "$description" >&2 - return 1 - fi + if ! [[ "${!var}" == *"$pattern"* ]]; then + if [ "$replace_mode" == --replace-warn ]; then + printf "substituteStream() in derivation $name: WARNING: pattern %q doesn't match anything in %s\n" "$pattern" "$description" >&2 + elif [ "$replace_mode" == --replace-fail ]; then + printf "substituteStream() in derivation $name: ERROR: pattern %q doesn't match anything in %s\n" "$pattern" "$description" >&2 + return 1 fi fi + eval "$var"'=${'"$var"'//"$pattern"/"$replacement"}' ;; --subst-var) diff --git a/pkgs/test/replace-vars/default.nix b/pkgs/test/replace-vars/default.nix index 7d9200a2cf08f..e1cc2bf1c13d8 100644 --- a/pkgs/test/replace-vars/default.nix +++ b/pkgs/test/replace-vars/default.nix @@ -119,6 +119,30 @@ let grep -F "@c@" $failed/testBuildFailure.log ! grep -F "@b@" $failed/testBuildFailure.log + touch $out + ''; + + fails-in-check-phase-with-bad-exemption = + runCommand "replaceVars-fails" + { + failed = + let + src = builtins.toFile "source.txt" '' + @a@ + @b@ + ''; + in + testBuildFailure ( + callReplaceVars src { + a = "a"; + b = null; + c = null; + } + ); + } + '' + grep -e "ERROR: pattern @c@ doesn't match anything in file.*source.txt" $failed/testBuildFailure.log + touch $out ''; }; From 2439ae5b91e27d188175edf79bed4629f9e322d7 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 10 Feb 2025 20:48:30 +0100 Subject: [PATCH 245/343] libtiff: just disable lerc for static builds There isn't really another feasible option here. Maybe one day build systems will have figured out how to handle this, but it isn't going to be soon. --- pkgs/by-name/li/libtiff/package.nix | 30 +++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/pkgs/by-name/li/libtiff/package.nix b/pkgs/by-name/li/libtiff/package.nix index 49d39705ef799..7dea25c62d012 100644 --- a/pkgs/by-name/li/libtiff/package.nix +++ b/pkgs/by-name/li/libtiff/package.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchFromGitLab, - fetchpatch, nix-update-script, cmake, @@ -17,6 +16,17 @@ zlib, zstd, + # Because lerc is C++ and static libraries don't track dependencies, + # that every downstream dependent of libtiff has to link with a C++ + # compiler, or the C++ standard library won't be linked, resulting + # in undefined symbol errors. Without systematic support for this + # in build systems, fixing this would require modifying the build + # system of every libtiff user. Hopefully at some point build + # systems will figure this out, and then we can enable this. + # + # See https://github.com/mesonbuild/meson/issues/14234 + withLerc ? !stdenv.hostPlatform.isStatic, + # for passthru.tests libgeotiff, python3Packages, @@ -43,13 +53,6 @@ stdenv.mkDerivation (finalAttrs: { # libc++abi 11 has an `#include `, this picks up files name # `version` in the project's include paths ./rename-version.patch - - # https://gitlab.com/libtiff/libtiff/-/merge_requests/685 - (fetchpatch { - name = "static.patch"; - url = "https://gitlab.com/libtiff/libtiff/-/commit/e6f3d60187a699507d6c85c5c63a8f258d8b8ebc.patch"; - hash = "sha256-TZE7nyOPojxnR9/jiZbv2LgKS2Yz+Db9lbLgeefrQsc="; - }) ]; postPatch = '' @@ -80,10 +83,13 @@ stdenv.mkDerivation (finalAttrs: { sphinx ]; - buildInputs = [ - lerc - zstd - ]; + buildInputs = + [ + zstd + ] + ++ lib.optionals withLerc [ + lerc + ]; # TODO: opengl support (bogus configure detection) propagatedBuildInputs = [ From 6e5e934a358104bc9a3aa4e249c6c6ffd4ad6e8a Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 10 Feb 2025 20:49:52 +0100 Subject: [PATCH 246/343] gdk-pixbuf: drop static-lerc.patch This is no longer necessary since static libtiff no longer links with lerc. --- .../libraries/gdk-pixbuf/default.nix | 1 - .../libraries/gdk-pixbuf/static-lerc.patch | 79 ------------------- 2 files changed, 80 deletions(-) delete mode 100644 pkgs/development/libraries/gdk-pixbuf/static-lerc.patch diff --git a/pkgs/development/libraries/gdk-pixbuf/default.nix b/pkgs/development/libraries/gdk-pixbuf/default.nix index 8c1d6926bcb93..95a8e14497d9c 100644 --- a/pkgs/development/libraries/gdk-pixbuf/default.nix +++ b/pkgs/development/libraries/gdk-pixbuf/default.nix @@ -53,7 +53,6 @@ stdenv.mkDerivation (finalAttrs: { ./installed-tests-path.patch ./static-deps.patch - ./static-lerc.patch ]; # gdk-pixbuf-thumbnailer is not wrapped therefore strictDeps will work diff --git a/pkgs/development/libraries/gdk-pixbuf/static-lerc.patch b/pkgs/development/libraries/gdk-pixbuf/static-lerc.patch deleted file mode 100644 index 737844a078abe..0000000000000 --- a/pkgs/development/libraries/gdk-pixbuf/static-lerc.patch +++ /dev/null @@ -1,79 +0,0 @@ -From 3bca69d889fe545dda4ed9a8fab8ff3fe38ba487 Mon Sep 17 00:00:00 2001 -From: Alyssa Ross -Date: Wed, 5 Feb 2025 19:37:27 +0100 -Subject: [PATCH] build: fix linking with libtiff with lerc support - -Lerc is written in C++. When C and C++ objects are linked, a C++ -linker should be used to ensure C++-specific things are correctly -handled. See e.g. this comment in the Meson source for reference[1]. -One symptom of using a C linker to link with C++ objects is that -libstdc++ won't be linked when building static executables, causing -link failures. - -Unfortunately, Meson does not know whether dependencies found by -pkg-config are C++, and therefore require a C++ linker, so we have to -tell it ourselves to use a C++ linker. There's no way to check -whether libtiff is built with Lerc support, so we always use a C++ -linker if one is available and libtiff support is enabled. If a C++ -linker ends up being used to link only C objects, it shouldn't do any -harm. - -[1]: https://github.com/mesonbuild/meson/blob/9fd5281befe7881c9d1210c9e6865382bc0f2b08/mesonbuild/build.py#L1558-L1565 ---- -Link: https://gitlab.gnome.org/GNOME/gdk-pixbuf/-/merge_requests/181 - - gdk-pixbuf/meson.build | 6 ++++++ - meson.build | 6 ++++++ - 2 files changed, 12 insertions(+) - -diff --git a/gdk-pixbuf/meson.build b/gdk-pixbuf/meson.build -index 570625bfe..5cc11355f 100644 ---- a/gdk-pixbuf/meson.build -+++ b/gdk-pixbuf/meson.build -@@ -333,6 +333,11 @@ gdkpixbuf_bin = [ - [ 'gdk-pixbuf-query-loaders', [ 'queryloaders.c' ] ], - ] - -+bin_link_language = 'c' -+if loaders_cpp -+ bin_link_language = 'cpp' -+endif -+ - foreach bin: gdkpixbuf_bin - bin_name = bin[0] - bin_source = bin.get(1, bin_name + '.c') -@@ -342,6 +347,7 @@ foreach bin: gdkpixbuf_bin - dependencies: gdk_pixbuf_deps + [ gdkpixbuf_dep ], - include_directories: [ root_inc, gdk_pixbuf_inc ], - c_args: common_cflags + gdk_pixbuf_cflags, -+ link_language : bin_link_language, - install: true) - meson.override_find_program(bin_name, bin) - -diff --git a/meson.build b/meson.build -index f0d4812f4..31b3197fc 100644 ---- a/meson.build -+++ b/meson.build -@@ -345,6 +345,8 @@ endif - - # Don't check and build the tiff loader if native_windows_loaders is true - tiff_opt = get_option('tiff') -+tiff_dep = dependency('', required: false) -+loaders_cpp = false - if not tiff_opt.disabled() and not native_windows_loaders - # We currently don't have a fallback subproject, but this handles error - # reporting if tiff_opt is enabled. -@@ -353,6 +355,10 @@ if not tiff_opt.disabled() and not native_windows_loaders - if tiff_dep.found() - enabled_loaders += 'tiff' - loaders_deps += tiff_dep -+ -+ # If libtiff is built with LERC support, it should be linked with -+ # a C++ linker. -+ loaders_cpp = loaders_cpp or add_languages('cpp', required: false, native: false) - endif - endif - --- -GitLab - From 0298e5de03a7f98d4f31b97f0acf3dd231f209a2 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 10 Feb 2025 20:50:46 +0100 Subject: [PATCH 247/343] librsvg: run tests for static builds Static libtiff no longer links with LERC, so this works now. --- pkgs/development/libraries/librsvg/default.nix | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/pkgs/development/libraries/librsvg/default.nix b/pkgs/development/libraries/librsvg/default.nix index fcd46738c997b..11b9919ecdb68 100644 --- a/pkgs/development/libraries/librsvg/default.nix +++ b/pkgs/development/libraries/librsvg/default.nix @@ -141,18 +141,8 @@ stdenv.mkDerivation (finalAttrs: { (lib.mesonBool "tests" finalAttrs.finalPackage.doCheck) ]; - doCheck = - # Probably broken MIME type detection. - !stdenv.isDarwin - && - # Could be made to work, but requires the C API test to be linked - # with a C++ linker because - # librsvg -> gdk-pixbuf -> libtiff -> lerc (C++). - # - # Doesn't make sense to pursue this upstream until gdk-pixbuf - # itself is fixed: - # https://gitlab.gnome.org/GNOME/gdk-pixbuf/-/merge_requests/181 - !stdenv.hostPlatform.isStatic; + # Probably broken MIME type detection. + doCheck = !stdenv.isDarwin; env = { PKG_CONFIG_GDK_PIXBUF_2_0_GDK_PIXBUF_QUERY_LOADERS = writeShellScript "gdk-pixbuf-loader-loaders-wrapped" '' From b19d0f6d3d46970dc97012a7a2964aa73d647114 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sat, 25 Jan 2025 16:28:57 +0100 Subject: [PATCH 248/343] treewide: replace substituteAll with replaceVars --- .../scripts/incus/incus-container-image.nix | 3 +- .../incus/incus-virtual-machine-image.nix | 3 +- .../scripts/lxd/lxd-container-image.nix | 3 +- .../scripts/lxd/lxd-virtual-machine-image.nix | 3 +- nixos/modules/installer/cd-dvd/iso-image.nix | 6 +--- .../services/misc/taskserver/default.nix | 3 +- .../modules/system/boot/loader/grub/grub.nix | 6 ++-- .../applications/editors/emacs/make-emacs.nix | 1 - pkgs/applications/networking/dropbox/cli.nix | 7 +++-- .../applications/science/logic/z3/default.nix | 2 +- .../ar/arma3-unix-launcher/package.nix | 5 ++-- pkgs/by-name/br/brillo/package.nix | 7 +++-- .../bu/budgie-control-center/package.nix | 6 ++-- ...001-Do-not-download-sources-in-cmake.patch | 2 +- pkgs/by-name/cb/cbmc/package.nix | 7 ++--- pkgs/by-name/fb/fbmenugen/package.nix | 7 +++-- pkgs/by-name/fr/freenet/package.nix | 7 +++-- pkgs/by-name/in/iniparser/package.nix | 1 - pkgs/by-name/me/meson/package.nix | 5 ++-- pkgs/by-name/nu/nuget-to-json/package.nix | 26 +++++++++-------- pkgs/by-name/nu/nuget-to-nix/package.nix | 28 ++++++++++--------- pkgs/by-name/sp/speechd/package.nix | 12 ++++---- pkgs/by-name/us/usbutils/package.nix | 5 ++-- .../stylesheets/xslt/docbook-xsl/default.nix | 5 ++-- .../gnome/extensions/extensionOverrides.nix | 4 +-- .../gnome/extensions/gsconnect/default.nix | 7 +++-- .../extensions/taskwhisperer/default.nix | 6 ++-- .../lomiri/qml/lomiri-ui-toolkit/default.nix | 6 ++-- pkgs/desktops/mate/caja-dropbox/default.nix | 7 +++-- .../development/compilers/crystal/default.nix | 5 ++-- .../compilers/dotnet/sign-apphost.nix | 5 ++-- pkgs/development/compilers/dotnet/wrapper.nix | 11 ++++---- .../compilers/emscripten/default.nix | 5 ++-- pkgs/development/compilers/go/1.22.nix | 11 +++----- pkgs/development/compilers/go/1.23.nix | 11 +++----- pkgs/development/compilers/go/1.24.nix | 11 +++----- pkgs/development/compilers/ponyc/default.nix | 5 ++-- .../compilers/swift/compiler/default.nix | 8 ++---- .../compilers/swift/swift-driver/default.nix | 5 ++-- .../compilers/swift/swiftpm/default.nix | 8 ++---- pkgs/development/compilers/vala/default.nix | 5 ++-- pkgs/development/embedded/platformio/core.nix | 8 ++---- .../haskell-modules/configuration-nix.nix | 6 ++-- .../development/interpreters/acl2/default.nix | 5 ++-- .../interpreters/python/pypy/default.nix | 8 ++---- .../libraries/appstream/default.nix | 5 ++-- pkgs/development/libraries/gssdp/tools.nix | 5 ++-- .../libraries/gstreamer/bad/default.nix | 5 ++-- .../libraries/gstreamer/good/default.nix | 5 ++-- pkgs/development/libraries/gtk/2.x.nix | 5 ++-- pkgs/development/libraries/gtk/3.x.nix | 5 ++-- pkgs/development/libraries/gtk/4.x.nix | 5 ++-- .../libraries/libextractor/default.nix | 5 ++-- pkgs/development/libraries/libpeas/2.x.nix | 5 ++-- .../development/libraries/libpeas/default.nix | 5 ++-- .../libraries/libproxy/default.nix | 5 ++-- .../libraries/libqofono/default.nix | 5 ++-- .../development/libraries/libsbsms/common.nix | 5 ++-- .../development/libraries/libvirt/default.nix | 5 ++-- .../libraries/qgnomeplatform/default.nix | 5 ++-- .../libraries/qt-5/modules/qttools.nix | 8 ++---- .../science/math/or-tools/default.nix | 5 ++-- pkgs/development/libraries/wayqt/default.nix | 5 ++-- .../libraries/webkitgtk/default.nix | 5 ++-- pkgs/development/lisp-modules/nix-cl.nix | 5 ++-- pkgs/development/lua-modules/nfd/default.nix | 5 ++-- .../ocaml-modules/carton/default.nix | 5 ++-- .../ocaml-modules/menhir/default.nix | 5 ++-- .../ocaml-modules/plotkicadsch/default.nix | 5 ++-- .../php-packages/couchbase/default.nix | 5 ++-- .../python-modules/aiohttp/default.nix | 5 ++-- .../python-modules/anytree/default.nix | 5 ++-- .../python-modules/attrs/default.nix | 5 ++-- .../python-modules/bash-kernel/default.nix | 5 ++-- .../python-modules/bokeh/default.nix | 5 ++-- .../python-modules/cairocffi/default.nix | 5 ++-- .../python-modules/cmdstanpy/default.nix | 5 ++-- .../python-modules/debugpy/default.nix | 11 +++----- .../python-modules/deltachat2/default.nix | 5 ++-- pkgs/development/python-modules/django/3.nix | 18 ++++++------ pkgs/development/python-modules/django/4.nix | 8 ++---- pkgs/development/python-modules/django/5.nix | 8 ++---- .../python-modules/dot2tex/default.nix | 5 ++-- .../espeak-phonemizer/default.nix | 5 ++-- .../python-modules/flit-gettext/default.nix | 5 ++-- .../python-modules/gattlib/default.nix | 7 +++-- .../git-annex-adapter/default.nix | 5 ++-- .../python-modules/glymur/default.nix | 5 ++-- .../python-modules/gpuctypes/default.nix | 5 ++-- .../python-modules/graphviz/default.nix | 5 ++-- .../python-modules/hydra-core/default.nix | 5 ++-- .../python-modules/imageio-ffmpeg/default.nix | 5 ++-- .../python-modules/imageio/default.nix | 5 ++-- .../python-modules/img2pdf/default.nix | 5 ++-- .../python-modules/iniconfig/default.nix | 5 ++-- .../python-modules/isal/default.nix | 5 ++-- .../python-modules/k5test/default.nix | 5 ++-- .../kaldi-active-grammar/default.nix | 5 ++-- .../python-modules/kornia-rs/default.nix | 5 ++-- .../python-modules/libevdev/default.nix | 5 ++-- .../python-modules/libusb1/default.nix | 5 ++-- .../python-modules/mido/default.nix | 5 ++-- .../python-modules/mss/default.nix | 5 ++-- .../python-modules/netmap/default.nix | 5 ++-- .../python-modules/nextcord/default.nix | 5 ++-- .../python-modules/nocturne/default.nix | 5 ++-- .../python-modules/notify-py/default.nix | 8 ++---- .../python-modules/numba/default.nix | 5 ++-- .../python-modules/nvidia-ml-py/default.nix | 5 ++-- .../python-modules/objgraph/default.nix | 5 ++-- .../python-modules/ocrmypdf/default.nix | 5 ++-- .../python-modules/omegaconf/default.nix | 5 ++-- .../python-modules/openai-whisper/default.nix | 5 ++-- .../python-modules/opuslib/default.nix | 5 ++-- .../python-modules/ots-python/default.nix | 5 ++-- .../python-modules/pdfminer-six/default.nix | 5 ++-- .../python-modules/phonemizer/default.nix | 5 ++-- .../python-modules/pikepdf/default.nix | 5 ++-- .../development/python-modules/protobuf/4.nix | 5 ++-- .../python-modules/proton-client/default.nix | 5 ++-- .../protonvpn-nm-lib/default.nix | 5 ++-- .../python-modules/pulsectl/default.nix | 5 ++-- .../python-modules/pydot/default.nix | 5 ++-- .../python-modules/pygame-ce/default.nix | 5 ++-- .../python-modules/pygame/default.nix | 5 ++-- .../python-modules/pygraphviz/default.nix | 5 ++-- .../python-modules/pylama/default.nix | 5 ++-- .../python-modules/pylddwrap/default.nix | 5 ++-- .../python-modules/pyocr/default.nix | 22 ++++++++------- .../python-modules/pyogg/default.nix | 5 ++-- .../python-modules/pypandoc/default.nix | 5 ++-- .../python-modules/pyproj/default.nix | 5 ++-- .../python-modules/pysaml2/default.nix | 5 ++-- .../python-modules/pytesseract/default.nix | 5 ++-- .../python-modules/python-magic/default.nix | 5 ++-- .../python-modules/python-mapnik/default.nix | 5 ++-- .../python-matter-server/default.nix | 5 ++-- .../python-rapidjson/default.nix | 5 ++-- .../python-modules/python3-gnutls/default.nix | 5 ++-- .../python-modules/pythran/default.nix | 5 ++-- .../python-modules/pyturbojpeg/default.nix | 5 ++-- .../pyvirtualdisplay/default.nix | 5 ++-- .../python-modules/slixmpp/default.nix | 5 ++-- .../python-modules/sounddevice/default.nix | 5 ++-- .../python-modules/streamdeck/default.nix | 5 ++-- .../python-modules/termplotlib/default.nix | 5 ++-- .../python-modules/tinygrad/default.nix | 5 ++-- .../python-modules/tpm2-pytss/default.nix | 5 ++-- .../python-modules/vispy/default.nix | 5 ++-- .../python-modules/wallet-py3k/default.nix | 5 ++-- .../python-modules/wandb/default.nix | 5 ++-- .../python-modules/wavefile/default.nix | 5 ++-- .../python-modules/weasyprint/default.nix | 6 ++-- .../python-modules/wxpython/4.2.nix | 5 ++-- .../python-modules/xsdata/default.nix | 5 ++-- .../python-modules/youseedee/default.nix | 5 ++-- .../development/python-modules/yq/default.nix | 5 ++-- .../python-modules/zlib-ng/default.nix | 5 ++-- .../rocm-modules/5/rocprofiler/default.nix | 5 ++-- .../rocm-modules/6/rocprofiler/default.nix | 5 ++-- .../tcl-modules/by-name/ex/expect/package.nix | 5 ++-- .../build-managers/bazel/bazel_5/default.nix | 14 ++++------ .../build-managers/bazel/bazel_6/default.nix | 14 ++++------ .../build-managers/bazel/bazel_7/default.nix | 8 ++---- pkgs/development/tools/ocaml/merlin/4.x.nix | 1 - .../tools/ocaml/merlin/default.nix | 7 ++--- .../dwarf-therapist/wrapper.nix | 7 +++-- pkgs/games/dwarf-fortress/wrapper/default.nix | 7 ++--- pkgs/kde/plasma/kinfocenter/default.nix | 7 +++-- pkgs/kde/plasma/plasma-workspace/default.nix | 7 +++-- pkgs/os-specific/linux/udisks/2-default.nix | 11 ++------ pkgs/servers/home-assistant/default.nix | 5 ++-- pkgs/tools/inputmethods/ibus/default.nix | 11 ++++++-- pkgs/tools/misc/ckb-next/default.nix | 6 ++-- .../networking/networkmanager/default.nix | 9 +++--- 175 files changed, 444 insertions(+), 608 deletions(-) diff --git a/nixos/maintainers/scripts/incus/incus-container-image.nix b/nixos/maintainers/scripts/incus/incus-container-image.nix index 63b9353f7ee39..9faf6a5d87ad1 100644 --- a/nixos/maintainers/scripts/incus/incus-container-image.nix +++ b/nixos/maintainers/scripts/incus/incus-container-image.nix @@ -16,8 +16,7 @@ # copy the config for nixos-rebuild system.activationScripts.config = let - config = pkgs.substituteAll { - src = ./incus-container-image-inner.nix; + config = pkgs.replaceVars ./incus-container-image-inner.nix { stateVersion = lib.trivial.release; }; in diff --git a/nixos/maintainers/scripts/incus/incus-virtual-machine-image.nix b/nixos/maintainers/scripts/incus/incus-virtual-machine-image.nix index 0742e7d75ac99..db60160c9c777 100644 --- a/nixos/maintainers/scripts/incus/incus-virtual-machine-image.nix +++ b/nixos/maintainers/scripts/incus/incus-virtual-machine-image.nix @@ -16,8 +16,7 @@ # copy the config for nixos-rebuild system.activationScripts.config = let - config = pkgs.substituteAll { - src = ./incus-virtual-machine-image-inner.nix; + config = pkgs.replaceVars ./incus-virtual-machine-image-inner.nix { stateVersion = lib.trivial.release; }; in diff --git a/nixos/maintainers/scripts/lxd/lxd-container-image.nix b/nixos/maintainers/scripts/lxd/lxd-container-image.nix index 5913ed69a6dbd..0ccc6308b96bd 100644 --- a/nixos/maintainers/scripts/lxd/lxd-container-image.nix +++ b/nixos/maintainers/scripts/lxd/lxd-container-image.nix @@ -18,8 +18,7 @@ # copy the config for nixos-rebuild system.activationScripts.config = let - config = pkgs.substituteAll { - src = ./lxd-container-image-inner.nix; + config = pkgs.replaceVars ./lxd-container-image-inner.nix { stateVersion = lib.trivial.release; }; in diff --git a/nixos/maintainers/scripts/lxd/lxd-virtual-machine-image.nix b/nixos/maintainers/scripts/lxd/lxd-virtual-machine-image.nix index 1ccecc4c351d3..19582e2c0d5df 100644 --- a/nixos/maintainers/scripts/lxd/lxd-virtual-machine-image.nix +++ b/nixos/maintainers/scripts/lxd/lxd-virtual-machine-image.nix @@ -18,8 +18,7 @@ # copy the config for nixos-rebuild system.activationScripts.config = let - config = pkgs.substituteAll { - src = ./lxd-virtual-machine-image-inner.nix; + config = pkgs.replaceVars ./lxd-virtual-machine-image-inner.nix { stateVersion = lib.trivial.release; }; in diff --git a/nixos/modules/installer/cd-dvd/iso-image.nix b/nixos/modules/installer/cd-dvd/iso-image.nix index 5a700f070b624..665b968c9d1d3 100644 --- a/nixos/modules/installer/cd-dvd/iso-image.nix +++ b/nixos/modules/installer/cd-dvd/iso-image.nix @@ -832,11 +832,7 @@ in { source = config.isoImage.splashImage; target = "/isolinux/background.png"; } - { source = pkgs.substituteAll { - name = "isolinux.cfg"; - src = pkgs.writeText "isolinux.cfg-in" isolinuxCfg; - bootRoot = "/boot"; - }; + { source = isolinuxCfg; target = "/isolinux/isolinux.cfg"; } { source = "${pkgs.syslinux}/share/syslinux"; diff --git a/nixos/modules/services/misc/taskserver/default.nix b/nixos/modules/services/misc/taskserver/default.nix index 592514718940c..dc9033b5a23b6 100644 --- a/nixos/modules/services/misc/taskserver/default.nix +++ b/nixos/modules/services/misc/taskserver/default.nix @@ -142,8 +142,7 @@ let src = pkgs.runCommand "nixos-taskserver-src" { preferLocalBuild = true; } '' mkdir -p "$out" cat "${ - pkgs.substituteAll { - src = ./helper-tool.py; + pkgs.replaceVars ./helper-tool.py { inherit taskd certtool; inherit (cfg) dataDir diff --git a/nixos/modules/system/boot/loader/grub/grub.nix b/nixos/modules/system/boot/loader/grub/grub.nix index 81f94e8639d9d..72e8e4c0d081f 100644 --- a/nixos/modules/system/boot/loader/grub/grub.nix +++ b/nixos/modules/system/boot/loader/grub/grub.nix @@ -727,11 +727,13 @@ in system.build.installBootLoader = let - install-grub-pl = pkgs.substituteAll { - src = ./install-grub.pl; + install-grub-pl = pkgs.replaceVars ./install-grub.pl { utillinux = pkgs.util-linux; btrfsprogs = pkgs.btrfs-progs; inherit (config.system.nixos) distroName; + # targets of a replacement in code + bootPath = null; + bootRoot = null; }; perl = pkgs.perl.withPackages (p: with p; [ FileSlurp FileCopyRecursive diff --git a/pkgs/applications/editors/emacs/make-emacs.nix b/pkgs/applications/editors/emacs/make-emacs.nix index 6a7dbf488591e..c50c3a66bd60c 100644 --- a/pkgs/applications/editors/emacs/make-emacs.nix +++ b/pkgs/applications/editors/emacs/make-emacs.nix @@ -185,7 +185,6 @@ mkDerivation (finalAttrs: { ./native-comp-driver-options-30.patch ) { - backendPath = ( lib.concatStringsSep " " ( builtins.map (x: ''"-B${x}"'') ( diff --git a/pkgs/applications/networking/dropbox/cli.nix b/pkgs/applications/networking/dropbox/cli.nix index 31eda100eb973..aeb89f52a6da2 100644 --- a/pkgs/applications/networking/dropbox/cli.nix +++ b/pkgs/applications/networking/dropbox/cli.nix @@ -1,7 +1,7 @@ { lib, stdenv, - substituteAll, + replaceVars, autoreconfHook, pkg-config, fetchurl, @@ -34,9 +34,10 @@ stdenv.mkDerivation { strictDeps = true; patches = [ - (substituteAll { - src = ./fix-cli-paths.patch; + (replaceVars ./fix-cli-paths.patch { inherit dropboxd; + # patch context + DESKTOP_FILE_DIR = null; }) ]; diff --git a/pkgs/applications/science/logic/z3/default.nix b/pkgs/applications/science/logic/z3/default.nix index 1c874934adbd0..20be36ebda6c1 100644 --- a/pkgs/applications/science/logic/z3/default.nix +++ b/pkgs/applications/science/logic/z3/default.nix @@ -150,7 +150,7 @@ let }; # replace @dir@ in the path of the given list of patches - fixupPatches = dir: map (patch: replaceVars patch { dir = dir; }); + fixupPatches = dir: map (patch: replaceVars patch { inherit dir; }); in { z3_4_13 = common { diff --git a/pkgs/by-name/ar/arma3-unix-launcher/package.nix b/pkgs/by-name/ar/arma3-unix-launcher/package.nix index 6c15df4cd33ae..44c3fa908eab0 100644 --- a/pkgs/by-name/ar/arma3-unix-launcher/package.nix +++ b/pkgs/by-name/ar/arma3-unix-launcher/package.nix @@ -11,7 +11,7 @@ nlohmann_json, qt5, spdlog, - substituteAll, + replaceVars, buildDayZLauncher ? false, }: stdenv.mkDerivation (finalAttrs: { @@ -27,8 +27,7 @@ stdenv.mkDerivation (finalAttrs: { patches = [ # prevent CMake from trying to get libraries on the internet - (substituteAll { - src = ./dont_fetch_dependencies.patch; + (replaceVars ./dont_fetch_dependencies.patch { argparse_src = fetchFromGitHub { owner = "p-ranav"; repo = "argparse"; diff --git a/pkgs/by-name/br/brillo/package.nix b/pkgs/by-name/br/brillo/package.nix index fb4358628cdbf..3d642154c0283 100644 --- a/pkgs/by-name/br/brillo/package.nix +++ b/pkgs/by-name/br/brillo/package.nix @@ -4,7 +4,7 @@ fetchFromGitLab, go-md2man, coreutils, - substituteAll, + replaceVars, }: stdenv.mkDerivation rec { @@ -19,9 +19,10 @@ stdenv.mkDerivation rec { }; patches = [ - (substituteAll { - src = ./udev-rule.patch; + (replaceVars ./udev-rule.patch { inherit coreutils; + # patch context + group = null; }) ]; diff --git a/pkgs/by-name/bu/budgie-control-center/package.nix b/pkgs/by-name/bu/budgie-control-center/package.nix index 622d46eafa839..1e97c87364d88 100644 --- a/pkgs/by-name/bu/budgie-control-center/package.nix +++ b/pkgs/by-name/bu/budgie-control-center/package.nix @@ -2,7 +2,7 @@ lib, stdenv, fetchFromGitHub, - substituteAll, + replaceVars, accountsservice, adwaita-icon-theme, budgie-desktop, @@ -81,13 +81,11 @@ stdenv.mkDerivation (finalAttrs: { }; patches = [ - (substituteAll { - src = ./paths.patch; + (replaceVars ./paths.patch { budgie_desktop = budgie-desktop; gcm = gnome-color-manager; inherit cups - glibc libgnomekbd shadow ; diff --git a/pkgs/by-name/cb/cbmc/0001-Do-not-download-sources-in-cmake.patch b/pkgs/by-name/cb/cbmc/0001-Do-not-download-sources-in-cmake.patch index 324fd2adc04aa..18a22340b11a6 100644 --- a/pkgs/by-name/cb/cbmc/0001-Do-not-download-sources-in-cmake.patch +++ b/pkgs/by-name/cb/cbmc/0001-Do-not-download-sources-in-cmake.patch @@ -17,7 +17,7 @@ index 2c1289a..8128362 100644 download_project(PROJ cudd - URL https://sourceforge.net/projects/cudd-mirror/files/cudd-3.0.0.tar.gz/download - URL_MD5 4fdafe4924b81648b908881c81fe6c30 -+ SOURCE_DIR @cudd.src@ ++ SOURCE_DIR @cudd@ ) if(NOT EXISTS ${cudd_SOURCE_DIR}/Makefile) diff --git a/pkgs/by-name/cb/cbmc/package.nix b/pkgs/by-name/cb/cbmc/package.nix index fe86380d9b6fc..9f43b14131def 100644 --- a/pkgs/by-name/cb/cbmc/package.nix +++ b/pkgs/by-name/cb/cbmc/package.nix @@ -8,7 +8,7 @@ flex, makeWrapper, perl, - substituteAll, + replaceVars, cudd, nix-update-script, fetchpatch, @@ -47,9 +47,8 @@ stdenv.mkDerivation (finalAttrs: { ]; patches = [ - (substituteAll { - src = ./0001-Do-not-download-sources-in-cmake.patch; - inherit cudd; + (replaceVars ./0001-Do-not-download-sources-in-cmake.patch { + cudd = cudd.src; }) ./0002-Do-not-download-sources-in-cmake.patch # Fixes build with libc++ >= 19 due to the removal of std::char_traits. diff --git a/pkgs/by-name/fb/fbmenugen/package.nix b/pkgs/by-name/fb/fbmenugen/package.nix index 1b6d303f07dd7..018a5a2a16893 100644 --- a/pkgs/by-name/fb/fbmenugen/package.nix +++ b/pkgs/by-name/fb/fbmenugen/package.nix @@ -5,7 +5,7 @@ gnused, makeWrapper, perlPackages, - substituteAll, + replaceVars, xorg, wrapGAppsHook3, gitUpdater, @@ -23,10 +23,11 @@ perlPackages.buildPerlPackage rec { }; patches = [ - (substituteAll { - src = ./0001-Fix-paths.patch; + (replaceVars ./0001-Fix-paths.patch { xmessage = xorg.xmessage; inherit fluxbox gnused; + # replaced in postPatch + fbmenugen = null; }) ]; diff --git a/pkgs/by-name/fr/freenet/package.nix b/pkgs/by-name/fr/freenet/package.nix index 4046a270c3e7d..3d9bdb6dac8ab 100644 --- a/pkgs/by-name/fr/freenet/package.nix +++ b/pkgs/by-name/fr/freenet/package.nix @@ -8,7 +8,7 @@ gradle_8, bash, coreutils, - substituteAll, + replaceVars, nixosTests, writeText, }: @@ -50,14 +50,15 @@ stdenv.mkDerivation rec { jdk ]; - wrapper = substituteAll { - src = ./freenetWrapper; + wrapper = replaceVars ./freenetWrapper { inherit bash coreutils jre seednodes ; + # replaced in installPhase + CLASSPATH = null; }; mitmCache = gradle.fetchDeps { diff --git a/pkgs/by-name/in/iniparser/package.nix b/pkgs/by-name/in/iniparser/package.nix index ca36474af0d91..b04a3fbf48e70 100644 --- a/pkgs/by-name/in/iniparser/package.nix +++ b/pkgs/by-name/in/iniparser/package.nix @@ -27,7 +27,6 @@ stdenv.mkDerivation (finalAttrs: { (replaceVars ./remove-fetchcontent-usage.patch { # Do not let cmake's fetchContent download unity unitySrc = symlinkJoin { - name = "unity-with-iniparser-config"; paths = [ (fetchFromGitHub { owner = "throwtheswitch"; diff --git a/pkgs/by-name/me/meson/package.nix b/pkgs/by-name/me/meson/package.nix index 79d0e5b7eb545..581f844c8b6c6 100644 --- a/pkgs/by-name/me/meson/package.nix +++ b/pkgs/by-name/me/meson/package.nix @@ -12,7 +12,7 @@ ninja, pkg-config, python3, - substituteAll, + replaceVars, zlib, }: @@ -46,8 +46,7 @@ python3.pkgs.buildPythonApplication rec { # are not as predictable, therefore we need to keep them in the RPATH. # At the moment we are keeping the paths starting with /nix/store. # https://github.com/NixOS/nixpkgs/issues/31222#issuecomment-365811634 - (substituteAll { - src = ./001-fix-rpath.patch; + (replaceVars ./001-fix-rpath.patch { inherit (builtins) storeDir; }) diff --git a/pkgs/by-name/nu/nuget-to-json/package.nix b/pkgs/by-name/nu/nuget-to-json/package.nix index 6a2be30605760..7691a503dcb9b 100644 --- a/pkgs/by-name/nu/nuget-to-json/package.nix +++ b/pkgs/by-name/nu/nuget-to-json/package.nix @@ -1,7 +1,7 @@ { lib, runtimeShell, - substituteAll, + replaceVarsWith, nix, coreutils, jq, @@ -12,23 +12,25 @@ cacert, }: -substituteAll { +replaceVarsWith { name = "nuget-to-json"; dir = "bin"; src = ./nuget-to-json.sh; isExecutable = true; - inherit runtimeShell cacert; - binPath = lib.makeBinPath [ - nix - coreutils - jq - xmlstarlet - curl - gnugrep - gawk - ]; + replacements = { + inherit runtimeShell cacert; + binPath = lib.makeBinPath [ + nix + coreutils + jq + xmlstarlet + curl + gnugrep + gawk + ]; + }; meta = { description = "Convert a nuget packages directory to a lockfile for buildDotnetModule"; diff --git a/pkgs/by-name/nu/nuget-to-nix/package.nix b/pkgs/by-name/nu/nuget-to-nix/package.nix index dcd51fa81457a..118ca77cc3c6c 100644 --- a/pkgs/by-name/nu/nuget-to-nix/package.nix +++ b/pkgs/by-name/nu/nuget-to-nix/package.nix @@ -1,7 +1,7 @@ { lib, runtimeShell, - substituteAll, + replaceVarsWith, nix, coreutils, jq, @@ -13,24 +13,26 @@ cacert, }: -substituteAll { +replaceVarsWith { name = "nuget-to-nix"; dir = "bin"; src = ./nuget-to-nix.sh; isExecutable = true; - inherit runtimeShell cacert; - binPath = lib.makeBinPath [ - nix - coreutils - jq - xmlstarlet - curl - gnugrep - gawk - nuget-to-json - ]; + replacements = { + inherit runtimeShell cacert; + binPath = lib.makeBinPath [ + nix + coreutils + jq + xmlstarlet + curl + gnugrep + gawk + nuget-to-json + ]; + }; meta = { description = "Convert a nuget packages directory to a lockfile for buildDotnetModule"; diff --git a/pkgs/by-name/sp/speechd/package.nix b/pkgs/by-name/sp/speechd/package.nix index 58bee929bfab1..2947cf31bdb75 100644 --- a/pkgs/by-name/sp/speechd/package.nix +++ b/pkgs/by-name/sp/speechd/package.nix @@ -1,7 +1,7 @@ { stdenv, lib, - substituteAll, + replaceVars, pkg-config, fetchurl, python3Packages, @@ -47,16 +47,16 @@ stdenv.mkDerivation rec { patches = [ - (substituteAll { - src = ./fix-paths.patch; + (replaceVars ./fix-paths.patch { utillinux = util-linux; + # patch context + bindir = null; }) ] ++ lib.optionals (withEspeak && espeak.mbrolaSupport) [ # Replace FHS paths. - (substituteAll { - src = ./fix-mbrola-paths.patch; - inherit espeak mbrola; + (replaceVars ./fix-mbrola-paths.patch { + inherit mbrola; }) ]; diff --git a/pkgs/by-name/us/usbutils/package.nix b/pkgs/by-name/us/usbutils/package.nix index 72a557c931f0f..49a7d88925ea1 100644 --- a/pkgs/by-name/us/usbutils/package.nix +++ b/pkgs/by-name/us/usbutils/package.nix @@ -2,7 +2,7 @@ lib, stdenv, fetchurl, - substituteAll, + replaceVars, fetchpatch, meson, ninja, @@ -23,8 +23,7 @@ stdenv.mkDerivation rec { patches = [ - (substituteAll { - src = ./fix-paths.patch; + (replaceVars ./fix-paths.patch { inherit hwdata; }) ] diff --git a/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix b/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix index 8d839427a2fe7..49beba0de9556 100644 --- a/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix +++ b/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, - substituteAll, + replaceVars, fetchurl, fetchpatch, findXMLCatalogs, @@ -50,8 +50,7 @@ let }) # Add legacy sourceforge.net URIs to the catalog - (substituteAll { - src = ./catalog-legacy-uris.patch; + (replaceVars ./catalog-legacy-uris.patch { inherit legacySuffix suffix version; }) ] diff --git a/pkgs/desktops/gnome/extensions/extensionOverrides.nix b/pkgs/desktops/gnome/extensions/extensionOverrides.nix index b3f1929c3cef3..c4bd7f0880b42 100644 --- a/pkgs/desktops/gnome/extensions/extensionOverrides.nix +++ b/pkgs/desktops/gnome/extensions/extensionOverrides.nix @@ -21,7 +21,6 @@ , smartmontools , replaceVars , stdenvNoCC -, substituteAll , touchegg , util-linux , vte @@ -136,8 +135,7 @@ super: lib.trivial.pipe super [ }); in { patches = [ - (substituteAll { - src = ./extensionOverridesPatches/lunarcal_at_ailin.nemui.patch; + (replaceVars ./extensionOverridesPatches/lunarcal_at_ailin.nemui.patch { chinese_calendar_path = chinese-calendar; }) ]; diff --git a/pkgs/desktops/gnome/extensions/gsconnect/default.nix b/pkgs/desktops/gnome/extensions/gsconnect/default.nix index c4db5afa57716..3a029b6519f12 100644 --- a/pkgs/desktops/gnome/extensions/gsconnect/default.nix +++ b/pkgs/desktops/gnome/extensions/gsconnect/default.nix @@ -1,7 +1,7 @@ { stdenv , lib , fetchFromGitHub -, substituteAll +, replaceVars , openssl , gsound , meson @@ -35,9 +35,10 @@ stdenv.mkDerivation rec { patches = [ # Make typelibs available in the extension - (substituteAll { - src = ./fix-paths.patch; + (replaceVars ./fix-paths.patch { gapplication = "${glib.bin}/bin/gapplication"; + # Replaced in postPatch + typelibPath = null; }) # Allow installing installed tests to a separate output diff --git a/pkgs/desktops/gnome/extensions/taskwhisperer/default.nix b/pkgs/desktops/gnome/extensions/taskwhisperer/default.nix index fc37e6875820c..32b920fce9c09 100644 --- a/pkgs/desktops/gnome/extensions/taskwhisperer/default.nix +++ b/pkgs/desktops/gnome/extensions/taskwhisperer/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, - substituteAll, + replaceVars, fetchFromGitHub, taskwarrior2, gettext, @@ -37,10 +37,8 @@ stdenv.mkDerivation rec { ]; patches = [ - (substituteAll { - src = ./fix-paths.patch; + (replaceVars ./fix-paths.patch { task = "${taskwarrior2}/bin/task"; - shell = runtimeShell; }) ]; diff --git a/pkgs/desktops/lomiri/qml/lomiri-ui-toolkit/default.nix b/pkgs/desktops/lomiri/qml/lomiri-ui-toolkit/default.nix index 3ad337e3dd806..ca2dece93391c 100644 --- a/pkgs/desktops/lomiri/qml/lomiri-ui-toolkit/default.nix +++ b/pkgs/desktops/lomiri/qml/lomiri-ui-toolkit/default.nix @@ -3,7 +3,7 @@ lib, fetchFromGitLab, gitUpdater, - substituteAll, + replaceVars, testers, dbus-test-runner, dpkg, @@ -63,9 +63,7 @@ stdenv.mkDerivation (finalAttrs: { patches = [ ./2001-Mark-problematic-tests.patch - (substituteAll { - src = ./2002-Nixpkgs-versioned-QML-path.patch.in; - name = "2002-Nixpkgs-versioned-QML-path.patch"; + (replaceVars ./2002-Nixpkgs-versioned-QML-path.patch.in { qtVersion = lib.versions.major qtbase.version; }) ]; diff --git a/pkgs/desktops/mate/caja-dropbox/default.nix b/pkgs/desktops/mate/caja-dropbox/default.nix index 00ee318983763..9bce1b56f5316 100644 --- a/pkgs/desktops/mate/caja-dropbox/default.nix +++ b/pkgs/desktops/mate/caja-dropbox/default.nix @@ -2,7 +2,7 @@ lib, stdenv, fetchurl, - substituteAll, + replaceVars, pkg-config, gobject-introspection, gdk-pixbuf, @@ -26,9 +26,10 @@ stdenv.mkDerivation rec { }; patches = [ - (substituteAll { - src = ./fix-cli-paths.patch; + (replaceVars ./fix-cli-paths.patch { inherit dropboxd; + # patch context + DESKTOP_FILE_DIR = null; }) ]; diff --git a/pkgs/development/compilers/crystal/default.nix b/pkgs/development/compilers/crystal/default.nix index 52557ca4a64a6..f83ac656dcf81 100644 --- a/pkgs/development/compilers/crystal/default.nix +++ b/pkgs/development/compilers/crystal/default.nix @@ -4,7 +4,7 @@ , fetchurl , fetchpatch , lib -, substituteAll +, replaceVars # Dependencies , boehmgc , coreutils @@ -95,8 +95,7 @@ let }; patches = [ - (substituteAll { - src = ./tzdata.patch; + (replaceVars ./tzdata.patch { inherit tzdata; }) ] diff --git a/pkgs/development/compilers/dotnet/sign-apphost.nix b/pkgs/development/compilers/dotnet/sign-apphost.nix index 021d9ef61a90d..e69adc5f36603 100644 --- a/pkgs/development/compilers/dotnet/sign-apphost.nix +++ b/pkgs/development/compilers/dotnet/sign-apphost.nix @@ -1,12 +1,11 @@ { - substituteAll, + replaceVars, callPackage, }: let sigtool = callPackage ./sigtool.nix { }; in -substituteAll { - src = ./sign-apphost.proj; +replaceVars ./sign-apphost.proj { codesign = "${sigtool}/bin/codesign"; } diff --git a/pkgs/development/compilers/dotnet/wrapper.nix b/pkgs/development/compilers/dotnet/wrapper.nix index d268476c2c14f..2ac14b665fea6 100644 --- a/pkgs/development/compilers/dotnet/wrapper.nix +++ b/pkgs/development/compilers/dotnet/wrapper.nix @@ -15,7 +15,7 @@ darwin, icu, lndir, - substituteAll, + replaceVars, nugetPackageHook, xmlstarlet, }: @@ -42,10 +42,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { [ ./dotnet-setup-hook.sh ] - ++ lib.optional (type == "sdk") (substituteAll { - src = ./dotnet-sdk-setup-hook.sh; - inherit lndir xmlstarlet; - }); + ++ lib.optional (type == "sdk") ( + replaceVars ./dotnet-sdk-setup-hook.sh { + inherit lndir xmlstarlet; + } + ); propagatedSandboxProfile = toString unwrapped.__propagatedSandboxProfile; diff --git a/pkgs/development/compilers/emscripten/default.nix b/pkgs/development/compilers/emscripten/default.nix index 6a3e7738fc1d9..54386a3ca24e8 100644 --- a/pkgs/development/compilers/emscripten/default.nix +++ b/pkgs/development/compilers/emscripten/default.nix @@ -10,7 +10,7 @@ llvmPackages, symlinkJoin, makeWrapper, - substituteAll, + replaceVars, buildNpmPackage, emscripten, }: @@ -57,8 +57,7 @@ stdenv.mkDerivation rec { ]; patches = [ - (substituteAll { - src = ./0001-emulate-clang-sysroot-include-logic.patch; + (replaceVars ./0001-emulate-clang-sysroot-include-logic.patch { resourceDir = "${llvmEnv}/lib/clang/${lib.versions.major llvmPackages.llvm.version}/"; }) ]; diff --git a/pkgs/development/compilers/go/1.22.nix b/pkgs/development/compilers/go/1.22.nix index b64be8d90a710..471d398358a8d 100644 --- a/pkgs/development/compilers/go/1.22.nix +++ b/pkgs/development/compilers/go/1.22.nix @@ -3,7 +3,7 @@ stdenv, fetchurl, tzdata, - substituteAll, + replaceVars, iana-etc, xcbuild, mailcap, @@ -75,20 +75,17 @@ stdenv.mkDerivation (finalAttrs: { ''; patches = [ - (substituteAll { - src = ./iana-etc-1.17.patch; + (replaceVars ./iana-etc-1.17.patch { iana = iana-etc; }) # Patch the mimetype database location which is missing on NixOS. # but also allow static binaries built with NixOS to run outside nix - (substituteAll { - src = ./mailcap-1.17.patch; + (replaceVars ./mailcap-1.17.patch { inherit mailcap; }) # prepend the nix path to the zoneinfo files but also leave the original value for static binaries # that run outside a nix server - (substituteAll { - src = ./tzdata-1.19.patch; + (replaceVars ./tzdata-1.19.patch { inherit tzdata; }) ./remove-tools-1.11.patch diff --git a/pkgs/development/compilers/go/1.23.nix b/pkgs/development/compilers/go/1.23.nix index 514cf806be38c..dfeffaac77843 100644 --- a/pkgs/development/compilers/go/1.23.nix +++ b/pkgs/development/compilers/go/1.23.nix @@ -3,7 +3,7 @@ stdenv, fetchurl, tzdata, - substituteAll, + replaceVars, iana-etc, xcbuild, mailcap, @@ -75,20 +75,17 @@ stdenv.mkDerivation (finalAttrs: { ''; patches = [ - (substituteAll { - src = ./iana-etc-1.17.patch; + (replaceVars ./iana-etc-1.17.patch { iana = iana-etc; }) # Patch the mimetype database location which is missing on NixOS. # but also allow static binaries built with NixOS to run outside nix - (substituteAll { - src = ./mailcap-1.17.patch; + (replaceVars ./mailcap-1.17.patch { inherit mailcap; }) # prepend the nix path to the zoneinfo files but also leave the original value for static binaries # that run outside a nix server - (substituteAll { - src = ./tzdata-1.19.patch; + (replaceVars ./tzdata-1.19.patch { inherit tzdata; }) ./remove-tools-1.11.patch diff --git a/pkgs/development/compilers/go/1.24.nix b/pkgs/development/compilers/go/1.24.nix index 75a4cb6c84755..a563cbcd85a2c 100644 --- a/pkgs/development/compilers/go/1.24.nix +++ b/pkgs/development/compilers/go/1.24.nix @@ -3,7 +3,7 @@ stdenv, fetchurl, tzdata, - substituteAll, + replaceVars, iana-etc, xcbuild, mailcap, @@ -75,20 +75,17 @@ stdenv.mkDerivation (finalAttrs: { ''; patches = [ - (substituteAll { - src = ./iana-etc-1.17.patch; + (replaceVars ./iana-etc-1.17.patch { iana = iana-etc; }) # Patch the mimetype database location which is missing on NixOS. # but also allow static binaries built with NixOS to run outside nix - (substituteAll { - src = ./mailcap-1.17.patch; + (replaceVars ./mailcap-1.17.patch { inherit mailcap; }) # prepend the nix path to the zoneinfo files but also leave the original value for static binaries # that run outside a nix server - (substituteAll { - src = ./tzdata-1.19.patch; + (replaceVars ./tzdata-1.19.patch { inherit tzdata; }) ./remove-tools-1.11.patch diff --git a/pkgs/development/compilers/ponyc/default.nix b/pkgs/development/compilers/ponyc/default.nix index 005605e9095af..a78cd863dabda 100644 --- a/pkgs/development/compilers/ponyc/default.nix +++ b/pkgs/development/compilers/ponyc/default.nix @@ -13,7 +13,7 @@ python3, # Not really used for anything real, just at build time. git, - substituteAll, + replaceVars, which, z3, cctools, @@ -67,8 +67,7 @@ stdenv.mkDerivation (rec { ./disable-networking-tests.patch ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - (substituteAll { - src = ./fix-darwin-build.patch; + (replaceVars ./fix-darwin-build.patch { libSystem = darwin.Libsystem; }) ]; diff --git a/pkgs/development/compilers/swift/compiler/default.nix b/pkgs/development/compilers/swift/compiler/default.nix index 09a9e59eff3d1..8e21e0d0e1666 100644 --- a/pkgs/development/compilers/swift/compiler/default.nix +++ b/pkgs/development/compilers/swift/compiler/default.nix @@ -28,7 +28,7 @@ , glibc , libuuid # Darwin-specific -, substituteAll +, replaceVars , fixDarwinDylibNames , xcbuild , cctools # libtool @@ -300,12 +300,10 @@ in stdenv.mkDerivation { patch -p1 -d swift -i ${./patches/swift-linux-fix-libc-paths.patch} patch -p1 -d swift -i ${./patches/swift-linux-fix-linking.patch} patch -p1 -d swift -i ${./patches/swift-darwin-libcxx-flags.patch} - patch -p1 -d swift -i ${substituteAll { - src = ./patches/swift-darwin-plistbuddy-workaround.patch; + patch -p1 -d swift -i ${replaceVars ./patches/swift-darwin-plistbuddy-workaround.patch { inherit swiftArch; }} - patch -p1 -d swift -i ${substituteAll { - src = ./patches/swift-prevent-sdk-dirs-warning.patch; + patch -p1 -d swift -i ${replaceVars ./patches/swift-prevent-sdk-dirs-warning.patch { inherit (builtins) storeDir; }} diff --git a/pkgs/development/compilers/swift/swift-driver/default.nix b/pkgs/development/compilers/swift/swift-driver/default.nix index 52567304af316..1872e9f6a8759 100644 --- a/pkgs/development/compilers/swift/swift-driver/default.nix +++ b/pkgs/development/compilers/swift/swift-driver/default.nix @@ -10,7 +10,7 @@ XCTest, sqlite, ncurses, - substituteAll, + replaceVars, }: let sources = callPackage ../sources.nix { }; @@ -50,8 +50,7 @@ stdenv.mkDerivation { hash = "sha256-eVBaKN6uzj48ZnHtwGV0k5ChKjak1tDCyE+wTdyGq2c="; }) # Prevent a warning about SDK directories we don't have. - (substituteAll { - src = ./patches/prevent-sdk-dirs-warnings.patch; + (replaceVars ./patches/prevent-sdk-dirs-warnings.patch { inherit (builtins) storeDir; }) ]; diff --git a/pkgs/development/compilers/swift/swiftpm/default.nix b/pkgs/development/compilers/swift/swiftpm/default.nix index 53fd9fcb8ac99..48f8b49a8df4a 100644 --- a/pkgs/development/compilers/swift/swiftpm/default.nix +++ b/pkgs/development/compilers/swift/swiftpm/default.nix @@ -13,7 +13,7 @@ pkg-config, sqlite, ncurses, - substituteAll, + replaceVars, runCommandLocal, makeWrapper, DarwinTools, # sw_vers @@ -45,8 +45,7 @@ let ./patches/disable-xctest.patch ./patches/fix-clang-cxx.patch ./patches/nix-pkgconfig-vars.patch - (substituteAll { - src = ./patches/fix-stdlib-path.patch; + (replaceVars ./patches/fix-stdlib-path.patch { inherit (builtins) storeDir; swiftLib = swift.swift.lib; }) @@ -429,8 +428,7 @@ stdenv.mkDerivation ( # Prevent a warning about SDK directories we don't have. swiftpmMakeMutable swift-driver patch -p1 -d .build/checkouts/swift-driver -i ${ - substituteAll { - src = ../swift-driver/patches/prevent-sdk-dirs-warnings.patch; + replaceVars ../swift-driver/patches/prevent-sdk-dirs-warnings.patch { inherit (builtins) storeDir; } } diff --git a/pkgs/development/compilers/vala/default.nix b/pkgs/development/compilers/vala/default.nix index 0285a53554611..0c5c18277e2a8 100644 --- a/pkgs/development/compilers/vala/default.nix +++ b/pkgs/development/compilers/vala/default.nix @@ -15,7 +15,7 @@ libintl, libtool, expat, - substituteAll, + replaceVars, vala, gobject-introspection, }: @@ -45,8 +45,7 @@ let pname = "vala"; inherit version; - setupHook = substituteAll { - src = ./setup-hook.sh; + setupHook = replaceVars ./setup-hook.sh { apiVersion = lib.versions.majorMinor version; }; diff --git a/pkgs/development/embedded/platformio/core.nix b/pkgs/development/embedded/platformio/core.nix index e9071fa1ab24b..1e5cdce702c17 100644 --- a/pkgs/development/embedded/platformio/core.nix +++ b/pkgs/development/embedded/platformio/core.nix @@ -6,7 +6,7 @@ installShellFiles, git, spdx-license-list-data, - substituteAll, + replaceVars, }: with python3Packages; @@ -29,12 +29,10 @@ buildPythonApplication rec { ]; patches = [ - (substituteAll { - src = ./interpreter.patch; + (replaceVars ./interpreter.patch { interpreter = (python3Packages.python.withPackages (_: propagatedBuildInputs)).interpreter; }) - (substituteAll { - src = ./use-local-spdx-license-list.patch; + (replaceVars ./use-local-spdx-license-list.patch { spdx_license_list_data = spdx-license-list-data.json; }) ./missing-udev-rules-nixos.patch diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index c0ff75b808008..c098a042b3ab5 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -1325,9 +1325,11 @@ self: super: builtins.intersectAttrs super { # whatever graphviz is in PATH. graphviz = overrideCabal (drv: { patches = [ - (pkgs.substituteAll { - src = ./patches/graphviz-hardcode-graphviz-store-path.patch; + (pkgs.replaceVars ./patches/graphviz-hardcode-graphviz-store-path.patch { inherit (pkgs) graphviz; + # patch context + dot = null; + PATH = null; }) ] ++ (drv.patches or []); }) super.graphviz; diff --git a/pkgs/development/interpreters/acl2/default.nix b/pkgs/development/interpreters/acl2/default.nix index 6be3b9a865c58..3f6fbe6278987 100644 --- a/pkgs/development/interpreters/acl2/default.nix +++ b/pkgs/development/interpreters/acl2/default.nix @@ -6,7 +6,7 @@ fetchpatch, runCommandLocal, makeWrapper, - substituteAll, + replaceVars, sbcl, bash, which, @@ -52,8 +52,7 @@ stdenv.mkDerivation rec { libipasir = callPackage ./libipasirglucose4 { }; patches = [ - (substituteAll { - src = ./0001-Fix-some-paths-for-Nix-build.patch; + (replaceVars ./0001-Fix-some-paths-for-Nix-build.patch { libipasir = "${libipasir}/lib/${libipasir.libname}"; libssl = "${lib.getLib openssl}/lib/libssl${stdenv.hostPlatform.extensions.sharedLibrary}"; libcrypto = "${lib.getLib openssl}/lib/libcrypto${stdenv.hostPlatform.extensions.sharedLibrary}"; diff --git a/pkgs/development/interpreters/python/pypy/default.nix b/pkgs/development/interpreters/python/pypy/default.nix index 795bceede7681..f40efde427eeb 100644 --- a/pkgs/development/interpreters/python/pypy/default.nix +++ b/pkgs/development/interpreters/python/pypy/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, substituteAll, fetchurl +{ lib, stdenv, replaceVars, fetchurl , zlibSupport ? true, zlib , bzip2, pkg-config, libffi , sqlite, openssl, ncurses, python, expat, tcl, tk, tclPackages, libX11 @@ -76,8 +76,7 @@ in with passthru; stdenv.mkDerivation rec { patches = [ ./dont_fetch_vendored_deps.patch - (substituteAll { - src = ./tk_tcl_paths.patch; + (replaceVars ./tk_tcl_paths.patch { inherit tk tcl; tk_dev = tk.dev; tcl_dev = tcl; @@ -85,8 +84,7 @@ in with passthru; stdenv.mkDerivation rec { tcl_libprefix = tcl.libPrefix; }) - (substituteAll { - src = ./sqlite_paths.patch; + (replaceVars ./sqlite_paths.patch { inherit (sqlite) out dev; }) ]; diff --git a/pkgs/development/libraries/appstream/default.nix b/pkgs/development/libraries/appstream/default.nix index a0ea85c83543f..d4d0e26adb088 100644 --- a/pkgs/development/libraries/appstream/default.nix +++ b/pkgs/development/libraries/appstream/default.nix @@ -1,6 +1,6 @@ { lib , stdenv -, substituteAll +, replaceVars , fetchFromGitHub , meson , mesonEmulatorHook @@ -50,8 +50,7 @@ stdenv.mkDerivation (finalAttrs: { patches = [ # Fix hardcoded paths - (substituteAll { - src = ./fix-paths.patch; + (replaceVars ./fix-paths.patch { libstemmer_includedir = "${lib.getDev libstemmer}/include"; }) diff --git a/pkgs/development/libraries/gssdp/tools.nix b/pkgs/development/libraries/gssdp/tools.nix index 7708bb6991a27..37fa43f919906 100644 --- a/pkgs/development/libraries/gssdp/tools.nix +++ b/pkgs/development/libraries/gssdp/tools.nix @@ -1,7 +1,7 @@ { stdenv, lib, - substituteAll, + replaceVars, meson, ninja, pkg-config, @@ -18,8 +18,7 @@ stdenv.mkDerivation rec { patches = [ # Allow building tools separately from the library. # This is needed to break the depenency cycle. - (substituteAll { - src = ./standalone-tools.patch; + (replaceVars ./standalone-tools.patch { inherit version; }) ]; diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix index 3231bb6c649f6..7e756b976b21a 100644 --- a/pkgs/development/libraries/gstreamer/bad/default.nix +++ b/pkgs/development/libraries/gstreamer/bad/default.nix @@ -2,7 +2,7 @@ , stdenv , fetchurl , fetchpatch -, substituteAll +, replaceVars , meson , ninja , gettext @@ -127,8 +127,7 @@ stdenv.mkDerivation rec { patches = [ # Add fallback paths for nvidia userspace libraries - (substituteAll { - src = ./fix-paths.patch; + (replaceVars ./fix-paths.patch { inherit (addDriverRunpath) driverLink; }) # Add support for newer AJA SDK from next GStreamer release diff --git a/pkgs/development/libraries/gstreamer/good/default.nix b/pkgs/development/libraries/gstreamer/good/default.nix index f9da5f6ba128a..dd8abf8a8b996 100644 --- a/pkgs/development/libraries/gstreamer/good/default.nix +++ b/pkgs/development/libraries/gstreamer/good/default.nix @@ -1,6 +1,6 @@ { lib, stdenv , fetchurl -, substituteAll +, replaceVars , meson , nasm , ninja @@ -71,8 +71,7 @@ stdenv.mkDerivation rec { # Reenable dynamic loading of libsoup on Darwin and use a different approach to do it. ./souploader-darwin.diff # dlopen libsoup_3 with an absolute path - (substituteAll { - src = ./souploader.diff; + (replaceVars ./souploader.diff { nixLibSoup3Path = "${lib.getLib libsoup_3}/lib"; }) ]; diff --git a/pkgs/development/libraries/gtk/2.x.nix b/pkgs/development/libraries/gtk/2.x.nix index d1abe9b8e035a..87b638ad76a4c 100644 --- a/pkgs/development/libraries/gtk/2.x.nix +++ b/pkgs/development/libraries/gtk/2.x.nix @@ -22,7 +22,7 @@ pango, perl, pkg-config, - substituteAll, + replaceVars, testers, AppKit, Cocoa, @@ -32,8 +32,7 @@ }: let - gtkCleanImmodulesCache = substituteAll { - src = ./hooks/clean-immodules-cache.sh; + gtkCleanImmodulesCache = replaceVars ./hooks/clean-immodules-cache.sh { gtk_module_path = "gtk-2.0"; gtk_binary_version = "2.10.0"; }; diff --git a/pkgs/development/libraries/gtk/3.x.nix b/pkgs/development/libraries/gtk/3.x.nix index e995b48a1557f..4f7ff70764c51 100644 --- a/pkgs/development/libraries/gtk/3.x.nix +++ b/pkgs/development/libraries/gtk/3.x.nix @@ -1,6 +1,6 @@ { lib , stdenv -, substituteAll +, replaceVars , fetchurl , pkg-config , gettext @@ -53,8 +53,7 @@ let - gtkCleanImmodulesCache = substituteAll { - src = ./hooks/clean-immodules-cache.sh; + gtkCleanImmodulesCache = replaceVars ./hooks/clean-immodules-cache.sh { gtk_module_path = "gtk-3.0"; gtk_binary_version = "3.0.0"; }; diff --git a/pkgs/development/libraries/gtk/4.x.nix b/pkgs/development/libraries/gtk/4.x.nix index c89cbce621a1a..3c5cb9e863c1f 100644 --- a/pkgs/development/libraries/gtk/4.x.nix +++ b/pkgs/development/libraries/gtk/4.x.nix @@ -1,7 +1,7 @@ { lib , stdenv , buildPackages -, substituteAll +, replaceVars , fetchurl , pkg-config , docutils @@ -58,8 +58,7 @@ let - gtkCleanImmodulesCache = substituteAll { - src = ./hooks/clean-immodules-cache.sh; + gtkCleanImmodulesCache = replaceVars ./hooks/clean-immodules-cache.sh { gtk_module_path = "gtk-4.0"; gtk_binary_version = "4.0.0"; }; diff --git a/pkgs/development/libraries/libextractor/default.nix b/pkgs/development/libraries/libextractor/default.nix index b46d4d8d1975f..c8a5452398463 100644 --- a/pkgs/development/libraries/libextractor/default.nix +++ b/pkgs/development/libraries/libextractor/default.nix @@ -3,7 +3,7 @@ stdenv, fetchurl, fetchpatch2, - substituteAll, + replaceVars, libtool, gettext, zlib, @@ -60,8 +60,7 @@ stdenv.mkDerivation rec { ++ lib.optionals gstreamerSupport [ # Libraries cannot be wrapped so we need to hardcode the plug-in paths. - (substituteAll { - src = ./gst-hardcode-plugins.patch; + (replaceVars ./gst-hardcode-plugins.patch { load_gst_plugins = lib.concatMapStrings ( plugin: ''gst_registry_scan_path(gst_registry_get(), "${lib.getLib plugin}/lib/gstreamer-1.0");'' ) (gstPlugins gst_all_1); diff --git a/pkgs/development/libraries/libpeas/2.x.nix b/pkgs/development/libraries/libpeas/2.x.nix index 35f204a1d5b40..c318f57be718b 100644 --- a/pkgs/development/libraries/libpeas/2.x.nix +++ b/pkgs/development/libraries/libpeas/2.x.nix @@ -3,7 +3,7 @@ , buildPackages , fetchurl , pkgsCross -, substituteAll +, replaceVars , pkg-config , gi-docgen , gobject-introspection @@ -34,8 +34,7 @@ stdenv.mkDerivation rec { patches = [ # Make PyGObject’s gi library available. - (substituteAll { - src = ./fix-paths.patch; + (replaceVars ./fix-paths.patch { pythonPaths = lib.concatMapStringsSep ", " (pkg: "'${pkg}/${python3.sitePackages}'") [ python3.pkgs.pygobject3 ]; diff --git a/pkgs/development/libraries/libpeas/default.nix b/pkgs/development/libraries/libpeas/default.nix index df0398797df0d..2958f8f31b554 100644 --- a/pkgs/development/libraries/libpeas/default.nix +++ b/pkgs/development/libraries/libpeas/default.nix @@ -2,7 +2,7 @@ stdenv, lib, fetchurl, - substituteAll, + replaceVars, meson, ninja, pkg-config, @@ -34,8 +34,7 @@ stdenv.mkDerivation rec { patches = [ # Make PyGObject’s gi library available. - (substituteAll { - src = ./fix-paths.patch; + (replaceVars ./fix-paths.patch { pythonPaths = lib.concatMapStringsSep ", " (pkg: "'${pkg}/${python3.sitePackages}'") [ python3.pkgs.pygobject3 ]; diff --git a/pkgs/development/libraries/libproxy/default.nix b/pkgs/development/libraries/libproxy/default.nix index fe65c9d3bc1ed..ad0c8d343fb6d 100644 --- a/pkgs/development/libraries/libproxy/default.nix +++ b/pkgs/development/libraries/libproxy/default.nix @@ -15,7 +15,7 @@ ninja, pkg-config, stdenv, - substituteAll, + replaceVars, vala, }: @@ -46,8 +46,7 @@ stdenv.mkDerivation (finalAttrs: { # Hardcode path to Settings schemas for GNOME & related desktops. # Otherwise every app using libproxy would need to be wrapped individually. - (substituteAll { - src = ./hardcode-gsettings.patch; + (replaceVars ./hardcode-gsettings.patch { gds = glib.getSchemaPath gsettings-desktop-schemas; }) ]; diff --git a/pkgs/development/libraries/libqofono/default.nix b/pkgs/development/libraries/libqofono/default.nix index 04acf06397679..4b67650d35412 100644 --- a/pkgs/development/libraries/libqofono/default.nix +++ b/pkgs/development/libraries/libqofono/default.nix @@ -1,6 +1,6 @@ { lib, - substituteAll, + replaceVars, mkDerivation, fetchFromGitHub, gitUpdater, @@ -22,8 +22,7 @@ mkDerivation rec { }; patches = [ - (substituteAll { - src = ./0001-NixOS-provide-mobile-broadband-provider-info-path.patch; + (replaceVars ./0001-NixOS-provide-mobile-broadband-provider-info-path.patch { mobileBroadbandProviderInfo = mobile-broadband-provider-info; }) ./0001-NixOS-Skip-tests-they-re-shock-full-of-hardcoded-FHS.patch diff --git a/pkgs/development/libraries/libsbsms/common.nix b/pkgs/development/libraries/libsbsms/common.nix index 358710b795017..71c7114b296cc 100644 --- a/pkgs/development/libraries/libsbsms/common.nix +++ b/pkgs/development/libraries/libsbsms/common.nix @@ -2,7 +2,7 @@ lib, stdenv, fetchurl, - substituteAll, + replaceVars, pname, version, url, @@ -19,8 +19,7 @@ stdenv.mkDerivation rec { patches = [ # Fix buidling on platforms other than x86 - (substituteAll { - src = ./configure.patch; + (replaceVars ./configure.patch { msse = lib.optionalString stdenv.hostPlatform.isx86_64 "-msse"; }) ]; diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix index 4de3f7887bc83..00856f3ef29d3 100644 --- a/pkgs/development/libraries/libvirt/default.nix +++ b/pkgs/development/libraries/libvirt/default.nix @@ -32,7 +32,7 @@ , readline , rpcsvc-proto , stdenv -, substituteAll +, replaceVars , xhtml1 , json_c , writeScript @@ -127,8 +127,7 @@ stdenv.mkDerivation rec { patches = [ ./0001-meson-patch-in-an-install-prefix-for-building-on-nix.patch ] ++ lib.optionals enableZfs [ - (substituteAll { - src = ./0002-substitute-zfs-and-zpool-commands.patch; + (replaceVars ./0002-substitute-zfs-and-zpool-commands.patch { zfs = "${zfs}/bin/zfs"; zpool = "${zfs}/bin/zpool"; }) diff --git a/pkgs/development/libraries/qgnomeplatform/default.nix b/pkgs/development/libraries/qgnomeplatform/default.nix index 1872366217302..270a6593c740d 100644 --- a/pkgs/development/libraries/qgnomeplatform/default.nix +++ b/pkgs/development/libraries/qgnomeplatform/default.nix @@ -11,7 +11,7 @@ gtk3, qtbase, qtwayland, - substituteAll, + replaceVars, gsettings-desktop-schemas, useQt6 ? false, }: @@ -29,8 +29,7 @@ stdenv.mkDerivation rec { patches = [ # Hardcode GSettings schema path to avoid crashes from missing schemas - (substituteAll { - src = ./hardcode-gsettings.patch; + (replaceVars ./hardcode-gsettings.patch { gds_gsettings_path = glib.getSchemaPath gsettings-desktop-schemas; }) diff --git a/pkgs/development/libraries/qt-5/modules/qttools.nix b/pkgs/development/libraries/qt-5/modules/qttools.nix index 52be15d64e8a1..e4b95207fe929 100644 --- a/pkgs/development/libraries/qt-5/modules/qttools.nix +++ b/pkgs/development/libraries/qt-5/modules/qttools.nix @@ -4,7 +4,7 @@ lib, qtbase, qtdeclarative, - substituteAll, + replaceVars, llvmPackages, }: @@ -29,13 +29,11 @@ qtModule { patches = [ # fixQtBuiltinPaths overwrites builtin paths we should keep - (substituteAll { - src = ./qttools-QT_HOST_DATA-refs.patch; + (replaceVars ./qttools-QT_HOST_DATA-refs.patch { qtbaseDev = lib.getDev qtbase; }) - (substituteAll { - src = ./qttools-libclang-main-header.patch; + (replaceVars ./qttools-libclang-main-header.patch { libclangDev = lib.getDev llvmPackages.libclang; }) ]; diff --git a/pkgs/development/libraries/science/math/or-tools/default.nix b/pkgs/development/libraries/science/math/or-tools/default.nix index c460694da0fed..3c3fac71a1e43 100644 --- a/pkgs/development/libraries/science/math/or-tools/default.nix +++ b/pkgs/development/libraries/science/math/or-tools/default.nix @@ -7,7 +7,7 @@ eigen, ensureNewerSourcesForZipFilesHook, fetchFromGitHub, - substituteAll, + replaceVars, glpk, lib, pkg-config, @@ -40,8 +40,7 @@ stdenv.mkDerivation rec { }; patches = [ - (substituteAll { - src = ./offline.patch; + (replaceVars ./offline.patch { pybind11_protobuf = "../../pybind11_protobuf"; }) ]; diff --git a/pkgs/development/libraries/wayqt/default.nix b/pkgs/development/libraries/wayqt/default.nix index 86fa6cd203258..3bed9f6fc7bbe 100644 --- a/pkgs/development/libraries/wayqt/default.nix +++ b/pkgs/development/libraries/wayqt/default.nix @@ -2,7 +2,7 @@ stdenv, lib, fetchFromGitLab, - substituteAll, + replaceVars, meson, pkg-config, qttools, @@ -25,8 +25,7 @@ stdenv.mkDerivation (finalAttrs: { patches = [ # qmake get qtbase's path, but wayqt need qtwayland - (substituteAll { - src = ./fix-qtwayland-header-path.diff; + (replaceVars ./fix-qtwayland-header-path.diff { qtWaylandPath = "${qtwayland}/include"; }) ]; diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix index 1469dd6d6429b..e1609e6f2ed3e 100644 --- a/pkgs/development/libraries/webkitgtk/default.nix +++ b/pkgs/development/libraries/webkitgtk/default.nix @@ -65,7 +65,7 @@ libbacktrace, systemd, xdg-dbus-proxy, - substituteAll, + replaceVars, glib, unifdef, addDriverRunpath, @@ -103,8 +103,7 @@ clangStdenv.mkDerivation (finalAttrs: { }; patches = lib.optionals clangStdenv.hostPlatform.isLinux [ - (substituteAll { - src = ./fix-bubblewrap-paths.patch; + (replaceVars ./fix-bubblewrap-paths.patch { inherit (builtins) storeDir; inherit (addDriverRunpath) driverLink; }) diff --git a/pkgs/development/lisp-modules/nix-cl.nix b/pkgs/development/lisp-modules/nix-cl.nix index 773372d25afa3..1357dafe3df35 100644 --- a/pkgs/development/lisp-modules/nix-cl.nix +++ b/pkgs/development/lisp-modules/nix-cl.nix @@ -59,7 +59,7 @@ let ; inherit (pkgs) - substituteAll + replaceVars ; # Stolen from python-packages.nix @@ -209,8 +209,7 @@ let ; }; - buildScript = substituteAll { - src = ./builder.lisp; + buildScript = replaceVars ./builder.lisp { asdf = "${asdfFasl}/asdf.${faslExt}"; }; diff --git a/pkgs/development/lua-modules/nfd/default.nix b/pkgs/development/lua-modules/nfd/default.nix index 1b34c1bd18031..a9b7aaef9e77b 100644 --- a/pkgs/development/lua-modules/nfd/default.nix +++ b/pkgs/development/lua-modules/nfd/default.nix @@ -5,7 +5,7 @@ lua, pkg-config, lib, - substituteAll, + replaceVars, zenity, AppKit, }: @@ -24,8 +24,7 @@ buildLuarocksPackage { # use zenity because default gtk impl just crashes patches = [ - (substituteAll { - src = ./zenity.patch; + (replaceVars ./zenity.patch { inherit zenity; }) ]; diff --git a/pkgs/development/ocaml-modules/carton/default.nix b/pkgs/development/ocaml-modules/carton/default.nix index b1f35bea8fa55..ea9eb4f064628 100644 --- a/pkgs/development/ocaml-modules/carton/default.nix +++ b/pkgs/development/ocaml-modules/carton/default.nix @@ -27,7 +27,7 @@ cmdliner, hxd, getconf, - substituteAll, + replaceVars, }: buildDunePackage rec { @@ -42,8 +42,7 @@ buildDunePackage rec { }; patches = [ - (substituteAll { - src = ./carton-find-getconf.patch; + (replaceVars ./carton-find-getconf.patch { getconf = "${getconf}"; }) ]; diff --git a/pkgs/development/ocaml-modules/menhir/default.nix b/pkgs/development/ocaml-modules/menhir/default.nix index ae0f15843b30a..c465e0fc6d32b 100644 --- a/pkgs/development/ocaml-modules/menhir/default.nix +++ b/pkgs/development/ocaml-modules/menhir/default.nix @@ -1,6 +1,6 @@ { buildDunePackage, - substituteAll, + replaceVars, ocaml, menhirLib, menhirSdk, @@ -19,8 +19,7 @@ buildDunePackage rec { ]; patches = [ - (substituteAll { - src = ./menhir-suggest-menhirLib.patch; + (replaceVars ./menhir-suggest-menhirLib.patch { libdir = "${menhirLib}/lib/ocaml/${ocaml.version}/site-lib/menhirLib"; }) ]; diff --git a/pkgs/development/ocaml-modules/plotkicadsch/default.nix b/pkgs/development/ocaml-modules/plotkicadsch/default.nix index 69f67ae580a6d..3497dd0771a3a 100644 --- a/pkgs/development/ocaml-modules/plotkicadsch/default.nix +++ b/pkgs/development/ocaml-modules/plotkicadsch/default.nix @@ -1,7 +1,7 @@ { lib, buildDunePackage, - substituteAll, + replaceVars, base64, cmdliner, digestif, @@ -24,8 +24,7 @@ buildDunePackage rec { minimalOCamlVersion = "4.09"; patches = [ - (substituteAll { - src = ./fix-paths.patch; + (replaceVars ./fix-paths.patch { inherit coreutils imagemagick; }) ]; diff --git a/pkgs/development/php-packages/couchbase/default.nix b/pkgs/development/php-packages/couchbase/default.nix index 381ec3734243c..fb98e4846d83a 100644 --- a/pkgs/development/php-packages/couchbase/default.nix +++ b/pkgs/development/php-packages/couchbase/default.nix @@ -4,7 +4,7 @@ fetchFromGitHub, libcouchbase, zlib, - substituteAll, + replaceVars, php, }: let @@ -29,8 +29,7 @@ buildPecl { ]; patches = [ - (substituteAll { - src = ./libcouchbase.patch; + (replaceVars ./libcouchbase.patch { inherit libcouchbase; }) ]; diff --git a/pkgs/development/python-modules/aiohttp/default.nix b/pkgs/development/python-modules/aiohttp/default.nix index bf6a0326ff4ef..028cceefc3636 100644 --- a/pkgs/development/python-modules/aiohttp/default.nix +++ b/pkgs/development/python-modules/aiohttp/default.nix @@ -4,7 +4,7 @@ buildPythonPackage, fetchFromGitHub, fetchpatch2, - substituteAll, + replaceVars, isPy310, isPyPy, @@ -57,8 +57,7 @@ buildPythonPackage rec { }; patches = [ - (substituteAll { - src = ./unvendor-llhttp.patch; + (replaceVars ./unvendor-llhttp.patch { llhttpDev = lib.getDev llhttp; llhttpLib = lib.getLib llhttp; }) diff --git a/pkgs/development/python-modules/anytree/default.nix b/pkgs/development/python-modules/anytree/default.nix index 55f1b8d9ac132..9483bf12dadcf 100644 --- a/pkgs/development/python-modules/anytree/default.nix +++ b/pkgs/development/python-modules/anytree/default.nix @@ -8,7 +8,7 @@ pytest7CheckHook, pythonOlder, six, - substituteAll, + replaceVars, withGraphviz ? true, }: @@ -27,8 +27,7 @@ buildPythonPackage rec { }; patches = lib.optionals withGraphviz [ - (substituteAll { - src = ./graphviz.patch; + (replaceVars ./graphviz.patch { inherit graphviz; }) ]; diff --git a/pkgs/development/python-modules/attrs/default.nix b/pkgs/development/python-modules/attrs/default.nix index 5f14d0b149a65..f8824a6fef314 100644 --- a/pkgs/development/python-modules/attrs/default.nix +++ b/pkgs/development/python-modules/attrs/default.nix @@ -4,7 +4,7 @@ buildPythonPackage, fetchPypi, pythonOlder, - substituteAll, + replaceVars, hatchling, }: @@ -20,9 +20,8 @@ buildPythonPackage rec { }; patches = [ - (substituteAll { + (replaceVars ./remove-hatch-plugins.patch { # hatch-vcs and hatch-fancy-pypi-readme depend on pytest, which depends on attrs - src = ./remove-hatch-plugins.patch; inherit version; }) ]; diff --git a/pkgs/development/python-modules/bash-kernel/default.nix b/pkgs/development/python-modules/bash-kernel/default.nix index ff088a618e1d7..6e546b311d3f6 100644 --- a/pkgs/development/python-modules/bash-kernel/default.nix +++ b/pkgs/development/python-modules/bash-kernel/default.nix @@ -8,7 +8,7 @@ python, pexpect, bashInteractive, - substituteAll, + replaceVars, }: buildPythonPackage rec { @@ -23,8 +23,7 @@ buildPythonPackage rec { }; patches = [ - (substituteAll { - src = ./bash-path.patch; + (replaceVars ./bash-path.patch { bash = lib.getExe bashInteractive; }) ]; diff --git a/pkgs/development/python-modules/bokeh/default.nix b/pkgs/development/python-modules/bokeh/default.nix index 9ed21c339dee4..9f7ac29dd5ec3 100644 --- a/pkgs/development/python-modules/bokeh/default.nix +++ b/pkgs/development/python-modules/bokeh/default.nix @@ -4,7 +4,7 @@ fetchPypi, fetchFromGitHub, pythonOlder, - substituteAll, + replaceVars, colorama, contourpy, jinja2, @@ -64,8 +64,7 @@ buildPythonPackage rec { }; patches = [ - (substituteAll { - src = ./hardcode-nodejs-npmjs-paths.patch; + (replaceVars ./hardcode-nodejs-npmjs-paths.patch { node_bin = "${nodejs}/bin/node"; npm_bin = "${nodejs}/bin/npm"; }) diff --git a/pkgs/development/python-modules/cairocffi/default.nix b/pkgs/development/python-modules/cairocffi/default.nix index b871515bc42a1..0779eae1c92de 100644 --- a/pkgs/development/python-modules/cairocffi/default.nix +++ b/pkgs/development/python-modules/cairocffi/default.nix @@ -5,7 +5,7 @@ pythonOlder, fetchPypi, lib, - substituteAll, + replaceVars, pikepdf, pytestCheckHook, cairo, @@ -32,8 +32,7 @@ buildPythonPackage rec { patches = [ # OSError: dlopen() failed to load a library: gdk-pixbuf-2.0 / gdk-pixbuf-2.0-0 - (substituteAll { - src = ./dlopen-paths.patch; + (replaceVars ./dlopen-paths.patch { ext = stdenv.hostPlatform.extensions.sharedLibrary; cairo = cairo.out; glib = glib.out; diff --git a/pkgs/development/python-modules/cmdstanpy/default.nix b/pkgs/development/python-modules/cmdstanpy/default.nix index c03c2cf8403c4..439b1c255307c 100644 --- a/pkgs/development/python-modules/cmdstanpy/default.nix +++ b/pkgs/development/python-modules/cmdstanpy/default.nix @@ -2,7 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, - substituteAll, + replaceVars, cmdstan, setuptools, pandas, @@ -27,8 +27,7 @@ buildPythonPackage rec { }; patches = [ - (substituteAll { - src = ./use-nix-cmdstan-path.patch; + (replaceVars ./use-nix-cmdstan-path.patch { cmdstan = "${cmdstan}/opt/cmdstan"; }) ]; diff --git a/pkgs/development/python-modules/debugpy/default.nix b/pkgs/development/python-modules/debugpy/default.nix index d87103d4d0a1c..a2b42176966b4 100644 --- a/pkgs/development/python-modules/debugpy/default.nix +++ b/pkgs/development/python-modules/debugpy/default.nix @@ -5,7 +5,7 @@ pythonOlder, pythonAtLeast, fetchFromGitHub, - substituteAll, + replaceVars, gdb, lldb, pytestCheckHook, @@ -39,8 +39,7 @@ buildPythonPackage rec { patches = [ # Use nixpkgs version instead of versioneer - (substituteAll { - src = ./hardcode-version.patch; + (replaceVars ./hardcode-version.patch { inherit version; }) @@ -62,15 +61,13 @@ buildPythonPackage rec { ] ++ lib.optionals stdenv.hostPlatform.isLinux [ # Hard code GDB path (used to attach to process) - (substituteAll { - src = ./hardcode-gdb.patch; + (replaceVars ./hardcode-gdb.patch { inherit gdb; }) ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ # Hard code LLDB path (used to attach to process) - (substituteAll { - src = ./hardcode-lldb.patch; + (replaceVars ./hardcode-lldb.patch { inherit lldb; }) ]; diff --git a/pkgs/development/python-modules/deltachat2/default.nix b/pkgs/development/python-modules/deltachat2/default.nix index a2dcc68076f07..021e4f73fb10c 100644 --- a/pkgs/development/python-modules/deltachat2/default.nix +++ b/pkgs/development/python-modules/deltachat2/default.nix @@ -4,7 +4,7 @@ buildPythonPackage, deltachat-rpc-server, setuptools-scm, - substituteAll, + replaceVars, }: buildPythonPackage rec { @@ -20,8 +20,7 @@ buildPythonPackage rec { }; patches = [ - (substituteAll { - src = ./paths.patch; + (replaceVars ./paths.patch { deltachatrpcserver = lib.getExe deltachat-rpc-server; }) ]; diff --git a/pkgs/development/python-modules/django/3.nix b/pkgs/development/python-modules/django/3.nix index b4d478e3d8bd4..d8520e33e97cb 100644 --- a/pkgs/development/python-modules/django/3.nix +++ b/pkgs/development/python-modules/django/3.nix @@ -3,7 +3,7 @@ stdenv, buildPythonPackage, fetchPypi, - substituteAll, + replaceVars, geos_3_9, gdal, asgiref, @@ -28,17 +28,17 @@ buildPythonPackage rec { patches = [ - (substituteAll { - src = ./django_3_set_zoneinfo_dir.patch; + (replaceVars ./django_3_set_zoneinfo_dir.patch { zoneinfo = tzdata + "/share/zoneinfo"; }) ] - ++ lib.optional withGdal (substituteAll { - src = ./django_3_set_geos_gdal_lib.patch; - inherit geos_3_9; - inherit gdal; - extension = stdenv.hostPlatform.extensions.sharedLibrary; - }); + ++ lib.optional withGdal ( + replaceVars ./django_3_set_geos_gdal_lib.patch { + inherit geos_3_9; + inherit gdal; + extension = stdenv.hostPlatform.extensions.sharedLibrary; + } + ); propagatedBuildInputs = [ asgiref diff --git a/pkgs/development/python-modules/django/4.nix b/pkgs/development/python-modules/django/4.nix index e7deafc632719..b5183c00d9dd6 100644 --- a/pkgs/development/python-modules/django/4.nix +++ b/pkgs/development/python-modules/django/4.nix @@ -6,7 +6,7 @@ fetchpatch, pythonAtLeast, pythonOlder, - substituteAll, + replaceVars, # build setuptools, @@ -59,8 +59,7 @@ buildPythonPackage rec { patches = [ - (substituteAll { - src = ./django_4_set_zoneinfo_dir.patch; + (replaceVars ./django_4_set_zoneinfo_dir.patch { zoneinfo = tzdata + "/share/zoneinfo"; }) # make sure the tests don't remove packages from our pythonpath @@ -75,8 +74,7 @@ buildPythonPackage rec { }) ] ++ lib.optionals withGdal [ - (substituteAll { - src = ./django_4_set_geos_gdal_lib.patch; + (replaceVars ./django_4_set_geos_gdal_lib.patch { geos = geos; gdal = gdal; extension = stdenv.hostPlatform.extensions.sharedLibrary; diff --git a/pkgs/development/python-modules/django/5.nix b/pkgs/development/python-modules/django/5.nix index 0a46ca3e1e7e4..d04533cbf4a02 100644 --- a/pkgs/development/python-modules/django/5.nix +++ b/pkgs/development/python-modules/django/5.nix @@ -5,7 +5,7 @@ fetchFromGitHub, fetchpatch, pythonOlder, - substituteAll, + replaceVars, # build-system setuptools, @@ -58,8 +58,7 @@ buildPythonPackage rec { patches = [ - (substituteAll { - src = ./django_5_set_zoneinfo_dir.patch; + (replaceVars ./django_5_set_zoneinfo_dir.patch { zoneinfo = tzdata + "/share/zoneinfo"; }) # prevent tests from messing with our pythonpath @@ -75,8 +74,7 @@ buildPythonPackage rec { }) ] ++ lib.optionals withGdal [ - (substituteAll { - src = ./django_5_set_geos_gdal_lib.patch; + (replaceVars ./django_5_set_geos_gdal_lib.patch { geos = geos; gdal = gdal; extension = stdenv.hostPlatform.extensions.sharedLibrary; diff --git a/pkgs/development/python-modules/dot2tex/default.nix b/pkgs/development/python-modules/dot2tex/default.nix index acd9bbc34a1f9..fc593d8a58717 100644 --- a/pkgs/development/python-modules/dot2tex/default.nix +++ b/pkgs/development/python-modules/dot2tex/default.nix @@ -2,7 +2,7 @@ lib, buildPythonPackage, fetchPypi, - substituteAll, + replaceVars, pyparsing, graphviz, pytestCheckHook, @@ -20,8 +20,7 @@ buildPythonPackage rec { }; patches = [ - (substituteAll { - src = ./path.patch; + (replaceVars ./path.patch { inherit graphviz; }) ./test.patch # https://github.com/kjellmf/dot2tex/issues/5 diff --git a/pkgs/development/python-modules/espeak-phonemizer/default.nix b/pkgs/development/python-modules/espeak-phonemizer/default.nix index 4ecae59fbc584..6b7304a7c8952 100644 --- a/pkgs/development/python-modules/espeak-phonemizer/default.nix +++ b/pkgs/development/python-modules/espeak-phonemizer/default.nix @@ -2,7 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, - substituteAll, + replaceVars, espeak-ng, pytestCheckHook, }: @@ -20,8 +20,7 @@ buildPythonPackage rec { }; patches = [ - (substituteAll { - src = ./cdll.patch; + (replaceVars ./cdll.patch { libespeak_ng = "${lib.getLib espeak-ng}/lib/libespeak-ng.so"; }) ]; diff --git a/pkgs/development/python-modules/flit-gettext/default.nix b/pkgs/development/python-modules/flit-gettext/default.nix index 311861da7f711..cdf3dadf14ed1 100644 --- a/pkgs/development/python-modules/flit-gettext/default.nix +++ b/pkgs/development/python-modules/flit-gettext/default.nix @@ -2,7 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, - substituteAll, + replaceVars, # build-system flit-scm, @@ -30,8 +30,7 @@ buildPythonPackage rec { }; patches = [ - (substituteAll { - src = ./msgfmt-path.patch; + (replaceVars ./msgfmt-path.patch { msgfmt = lib.getExe' gettext "msgfmt"; }) ]; diff --git a/pkgs/development/python-modules/gattlib/default.nix b/pkgs/development/python-modules/gattlib/default.nix index bb961a993a136..a3f3a0d16e904 100644 --- a/pkgs/development/python-modules/gattlib/default.nix +++ b/pkgs/development/python-modules/gattlib/default.nix @@ -3,7 +3,9 @@ buildPythonPackage, fetchFromGitHub, fetchpatch, - substituteAll, + replaceVars, + + # build pkg-config, glibc, python, @@ -31,8 +33,7 @@ buildPythonPackage rec { url = "https://github.com/oscaracena/pygattlib/commit/73a73b71cfc139e1e0a08816fb976ff330c77ea5.patch"; hash = "sha256-/Y/CZNdN/jcxWroqRfdCH2rPUxZUbug668MIAow0scs="; }) - (substituteAll { - src = ./setup.patch; + (replaceVars ./setup.patch { boost_version = let pythonVersion = with lib.versions; "${major python.version}${minor python.version}"; diff --git a/pkgs/development/python-modules/git-annex-adapter/default.nix b/pkgs/development/python-modules/git-annex-adapter/default.nix index cd1dc62261f95..de88fb53556c9 100644 --- a/pkgs/development/python-modules/git-annex-adapter/default.nix +++ b/pkgs/development/python-modules/git-annex-adapter/default.nix @@ -10,7 +10,7 @@ pytestCheckHook, pythonOlder, setuptools, - substituteAll, + replaceVars, util-linux, }: @@ -42,8 +42,7 @@ buildPythonPackage rec { url = "https://github.com/alpernebbi/git-annex-adapter/commit/d0d8905965a3659ce95cbd8f8b1e8598f0faf76b.patch"; hash = "sha256-UcRTKzD3sbXGIuxj4JzZDnvjTYyWVkfeWgKiZ1rAlus="; }) - (substituteAll { - src = ./git-annex-path.patch; + (replaceVars ./git-annex-path.patch { gitAnnex = "${git-annex}/bin/git-annex"; }) ]; diff --git a/pkgs/development/python-modules/glymur/default.nix b/pkgs/development/python-modules/glymur/default.nix index d5fdb4fd0242d..ebc6d0134203e 100644 --- a/pkgs/development/python-modules/glymur/default.nix +++ b/pkgs/development/python-modules/glymur/default.nix @@ -13,7 +13,7 @@ pythonOlder, scikit-image, setuptools, - substituteAll, + replaceVars, }: buildPythonPackage rec { @@ -37,8 +37,7 @@ buildPythonPackage rec { url = "https://github.com/quintusdias/glymur/commit/89b159299035ebb05776c3b90278f410ca6dba64.patch"; hash = "sha256-C/Q5WZmW5YtN3U8fxKljfqwKHtFLfR2LQ69Tj8SuIWg="; }) - (substituteAll { - src = ./set-lib-paths.patch; + (replaceVars ./set-lib-paths.patch { openjp2_lib = "${lib.getLib openjpeg}/lib/libopenjp2${stdenv.hostPlatform.extensions.sharedLibrary}"; tiff_lib = "${lib.getLib libtiff}/lib/libtiff${stdenv.hostPlatform.extensions.sharedLibrary}"; }) diff --git a/pkgs/development/python-modules/gpuctypes/default.nix b/pkgs/development/python-modules/gpuctypes/default.nix index f8c8f1111160d..9b3bb75434f97 100644 --- a/pkgs/development/python-modules/gpuctypes/default.nix +++ b/pkgs/development/python-modules/gpuctypes/default.nix @@ -3,7 +3,7 @@ config, buildPythonPackage, fetchFromGitHub, - substituteAll, + replaceVars, addDriverRunpath, cudaSupport ? config.cudaSupport, rocmSupport ? config.rocmSupport, @@ -33,8 +33,7 @@ buildPythonPackage rec { }; patches = [ - (substituteAll { - src = ./0001-fix-dlopen-cuda.patch; + (replaceVars ./0001-fix-dlopen-cuda.patch { inherit (addDriverRunpath) driverLink; libnvrtc = if cudaSupport then diff --git a/pkgs/development/python-modules/graphviz/default.nix b/pkgs/development/python-modules/graphviz/default.nix index 99a78b6d76610..9af39497f2151 100644 --- a/pkgs/development/python-modules/graphviz/default.nix +++ b/pkgs/development/python-modules/graphviz/default.nix @@ -4,7 +4,7 @@ buildPythonPackage, pythonOlder, fetchFromGitHub, - substituteAll, + replaceVars, graphviz-nox, xdg-utils, makeFontsConf, @@ -32,8 +32,7 @@ buildPythonPackage rec { }; patches = [ - (substituteAll { - src = ./paths.patch; + (replaceVars ./paths.patch { graphviz = graphviz-nox; xdgutils = xdg-utils; }) diff --git a/pkgs/development/python-modules/hydra-core/default.nix b/pkgs/development/python-modules/hydra-core/default.nix index 0518e523d3d96..6264ff89d6c75 100644 --- a/pkgs/development/python-modules/hydra-core/default.nix +++ b/pkgs/development/python-modules/hydra-core/default.nix @@ -11,7 +11,7 @@ packaging, pytestCheckHook, pythonOlder, - substituteAll, + replaceVars, }: buildPythonPackage rec { @@ -29,8 +29,7 @@ buildPythonPackage rec { }; patches = [ - (substituteAll { - src = ./antlr4.patch; + (replaceVars ./antlr4.patch { antlr_jar = "${antlr4.out}/share/java/antlr-${antlr4.version}-complete.jar"; }) # https://github.com/facebookresearch/hydra/pull/2731 diff --git a/pkgs/development/python-modules/imageio-ffmpeg/default.nix b/pkgs/development/python-modules/imageio-ffmpeg/default.nix index c10d435da7bcb..a49ac3e344a04 100644 --- a/pkgs/development/python-modules/imageio-ffmpeg/default.nix +++ b/pkgs/development/python-modules/imageio-ffmpeg/default.nix @@ -2,7 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, - substituteAll, + replaceVars, ffmpeg, # build-system @@ -27,8 +27,7 @@ buildPythonPackage rec { }; patches = [ - (substituteAll { - src = ./ffmpeg-path.patch; + (replaceVars ./ffmpeg-path.patch { ffmpeg = lib.getExe ffmpeg; }) ]; diff --git a/pkgs/development/python-modules/imageio/default.nix b/pkgs/development/python-modules/imageio/default.nix index d19c5579e25a4..b0ec295e10a78 100644 --- a/pkgs/development/python-modules/imageio/default.nix +++ b/pkgs/development/python-modules/imageio/default.nix @@ -4,7 +4,7 @@ buildPythonPackage, fetchFromGitHub, isPyPy, - substituteAll, + replaceVars, # build-system setuptools, @@ -42,8 +42,7 @@ buildPythonPackage rec { }; patches = lib.optionals (!stdenv.hostPlatform.isDarwin) [ - (substituteAll { - src = ./libgl-path.patch; + (replaceVars ./libgl-path.patch { libgl = "${libGL.out}/lib/libGL${stdenv.hostPlatform.extensions.sharedLibrary}"; }) ]; diff --git a/pkgs/development/python-modules/img2pdf/default.nix b/pkgs/development/python-modules/img2pdf/default.nix index 4e49d01ad8b68..913e8a913acc6 100644 --- a/pkgs/development/python-modules/img2pdf/default.nix +++ b/pkgs/development/python-modules/img2pdf/default.nix @@ -3,7 +3,7 @@ buildPythonPackage, isPy27, fetchFromGitea, - substituteAll, + replaceVars, fetchpatch, colord, setuptools, @@ -38,8 +38,7 @@ buildPythonPackage rec { }; patches = [ - (substituteAll { - src = ./default-icc-profile.patch; + (replaceVars ./default-icc-profile.patch { srgbProfile = if stdenv.hostPlatform.isDarwin then "/System/Library/ColorSync/Profiles/sRGB Profile.icc" diff --git a/pkgs/development/python-modules/iniconfig/default.nix b/pkgs/development/python-modules/iniconfig/default.nix index fcf045c944114..206faab7ae1d0 100644 --- a/pkgs/development/python-modules/iniconfig/default.nix +++ b/pkgs/development/python-modules/iniconfig/default.nix @@ -1,7 +1,7 @@ { lib, buildPythonPackage, - substituteAll, + replaceVars, fetchPypi, hatchling, }: @@ -20,8 +20,7 @@ buildPythonPackage rec { patches = [ # Cannot use hatch-vcs, due to an inifinite recursion - (substituteAll { - src = ./version.patch; + (replaceVars ./version.patch { inherit version; }) ]; diff --git a/pkgs/development/python-modules/isal/default.nix b/pkgs/development/python-modules/isal/default.nix index 0594330edaf84..2626fe2e4ef5d 100644 --- a/pkgs/development/python-modules/isal/default.nix +++ b/pkgs/development/python-modules/isal/default.nix @@ -2,7 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, - substituteAll, + replaceVars, # build-system setuptools, @@ -29,8 +29,7 @@ buildPythonPackage rec { }; patches = [ - (substituteAll { - src = ./version.patch; + (replaceVars ./version.patch { inherit version; }) ]; diff --git a/pkgs/development/python-modules/k5test/default.nix b/pkgs/development/python-modules/k5test/default.nix index 208f24c2b2bf9..f1bfd4097c787 100644 --- a/pkgs/development/python-modules/k5test/default.nix +++ b/pkgs/development/python-modules/k5test/default.nix @@ -6,7 +6,7 @@ krb5-c, pythonOlder, setuptools, - substituteAll, + replaceVars, }: buildPythonPackage rec { @@ -22,8 +22,7 @@ buildPythonPackage rec { }; patches = [ - (substituteAll { - src = ./fix-paths.patch; + (replaceVars ./fix-paths.patch { inherit findutils; krb5 = krb5-c; # krb5-config is in dev output diff --git a/pkgs/development/python-modules/kaldi-active-grammar/default.nix b/pkgs/development/python-modules/kaldi-active-grammar/default.nix index 14795b0c1268d..c26bbabb60c70 100644 --- a/pkgs/development/python-modules/kaldi-active-grammar/default.nix +++ b/pkgs/development/python-modules/kaldi-active-grammar/default.nix @@ -10,7 +10,7 @@ numpy, cffi, openfst, - substituteAll, + replaceVars, callPackage, }: @@ -43,8 +43,7 @@ buildPythonPackage rec { # Uses the dependencies' binaries from $PATH instead of a specific directory ./0002-exec-path.patch # Makes it dynamically link to the correct Kaldi library - (substituteAll { - src = ./0003-ffi-path.patch; + (replaceVars ./0003-ffi-path.patch { kaldiFork = "${kaldi}/lib"; }) ]; diff --git a/pkgs/development/python-modules/kornia-rs/default.nix b/pkgs/development/python-modules/kornia-rs/default.nix index b5311998abf94..e4b7bbd2a17e7 100644 --- a/pkgs/development/python-modules/kornia-rs/default.nix +++ b/pkgs/development/python-modules/kornia-rs/default.nix @@ -6,7 +6,7 @@ rustPlatform, cmake, nasm, - substituteAll, + replaceVars, libiconv, }: @@ -36,8 +36,7 @@ buildPythonPackage rec { # The path dependency doesn't vendor the dependencies correctly, so get kornia-rs from crates instead. patches = [ - (substituteAll { - src = ./kornia-rs-from-crates.patch; + (replaceVars ./kornia-rs-from-crates.patch { inherit version; }) ]; diff --git a/pkgs/development/python-modules/libevdev/default.nix b/pkgs/development/python-modules/libevdev/default.nix index e7be644cdd5ae..1d511b3afae51 100644 --- a/pkgs/development/python-modules/libevdev/default.nix +++ b/pkgs/development/python-modules/libevdev/default.nix @@ -3,7 +3,7 @@ buildPythonPackage, isPy27, fetchPypi, - substituteAll, + replaceVars, pkgs, pytestCheckHook, }: @@ -20,8 +20,7 @@ buildPythonPackage rec { }; patches = [ - (substituteAll { - src = ./fix-paths.patch; + (replaceVars ./fix-paths.patch { libevdev = lib.getLib pkgs.libevdev; }) ]; diff --git a/pkgs/development/python-modules/libusb1/default.nix b/pkgs/development/python-modules/libusb1/default.nix index 34f6c1b7636f0..18a9603b06259 100644 --- a/pkgs/development/python-modules/libusb1/default.nix +++ b/pkgs/development/python-modules/libusb1/default.nix @@ -3,7 +3,7 @@ stdenv, buildPythonPackage, fetchFromGitHub, - substituteAll, + replaceVars, setuptools, libusb1, pytestCheckHook, @@ -22,8 +22,7 @@ buildPythonPackage rec { }; patches = [ - (substituteAll { - src = ./ctypes.patch; + (replaceVars ./ctypes.patch { libusb = "${lib.getLib libusb1}/lib/libusb-1.0${stdenv.hostPlatform.extensions.sharedLibrary}"; }) ]; diff --git a/pkgs/development/python-modules/mido/default.nix b/pkgs/development/python-modules/mido/default.nix index 34227c595d3f4..0a4547b1fd1fc 100644 --- a/pkgs/development/python-modules/mido/default.nix +++ b/pkgs/development/python-modules/mido/default.nix @@ -3,7 +3,7 @@ lib, buildPythonPackage, fetchPypi, - substituteAll, + replaceVars, # build-system setuptools, @@ -39,8 +39,7 @@ buildPythonPackage rec { }; patches = [ - (substituteAll { - src = ./libportmidi-cdll.patch; + (replaceVars ./libportmidi-cdll.patch { libportmidi = "${portmidi.out}/lib/libportmidi${stdenv.hostPlatform.extensions.sharedLibrary}"; }) ]; diff --git a/pkgs/development/python-modules/mss/default.nix b/pkgs/development/python-modules/mss/default.nix index f7b5a590b1bad..d7585caecb680 100644 --- a/pkgs/development/python-modules/mss/default.nix +++ b/pkgs/development/python-modules/mss/default.nix @@ -4,7 +4,7 @@ fetchPypi, pythonOlder, stdenv, - substituteAll, + replaceVars, # build-system hatchling, @@ -34,8 +34,7 @@ buildPythonPackage rec { }; patches = lib.optionals stdenv.hostPlatform.isLinux [ - (substituteAll { - src = ./linux-paths.patch; + (replaceVars ./linux-paths.patch { x11 = "${xorg.libX11}/lib/libX11.so"; xfixes = "${xorg.libXfixes}/lib/libXfixes.so"; xrandr = "${xorg.libXrandr}/lib/libXrandr.so"; diff --git a/pkgs/development/python-modules/netmap/default.nix b/pkgs/development/python-modules/netmap/default.nix index c863ae189dcb8..81d326f50e418 100644 --- a/pkgs/development/python-modules/netmap/default.nix +++ b/pkgs/development/python-modules/netmap/default.nix @@ -2,7 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, - substituteAll, + replaceVars, nmap, python, }: @@ -20,8 +20,7 @@ buildPythonPackage rec { }; patches = [ - (substituteAll { - src = ./nmap-path.patch; + (replaceVars ./nmap-path.patch { nmap = "${lib.getBin nmap}/bin/nmap"; }) ]; diff --git a/pkgs/development/python-modules/nextcord/default.nix b/pkgs/development/python-modules/nextcord/default.nix index 10aff1066fbc8..c5e0230278773 100644 --- a/pkgs/development/python-modules/nextcord/default.nix +++ b/pkgs/development/python-modules/nextcord/default.nix @@ -5,7 +5,7 @@ pythonAtLeast, pythonOlder, fetchFromGitHub, - substituteAll, + replaceVars, ffmpeg, libopus, aiohttp, @@ -34,8 +34,7 @@ buildPythonPackage rec { }; patches = [ - (substituteAll { - src = ./paths.patch; + (replaceVars ./paths.patch { ffmpeg = "${ffmpeg}/bin/ffmpeg"; libopus = "${libopus}/lib/libopus${stdenv.hostPlatform.extensions.sharedLibrary}"; }) diff --git a/pkgs/development/python-modules/nocturne/default.nix b/pkgs/development/python-modules/nocturne/default.nix index 0934e6fd2535d..2d105972419ef 100644 --- a/pkgs/development/python-modules/nocturne/default.nix +++ b/pkgs/development/python-modules/nocturne/default.nix @@ -9,7 +9,7 @@ pybind11, pyvirtualdisplay, sfml, - substituteAll, + replaceVars, }: buildPythonPackage rec { @@ -32,8 +32,7 @@ buildPythonPackage rec { ''; patches = [ - (substituteAll { - src = ./dependencies.patch; + (replaceVars ./dependencies.patch { gtest_src = gtest.src; }) ]; diff --git a/pkgs/development/python-modules/notify-py/default.nix b/pkgs/development/python-modules/notify-py/default.nix index 45893825139b7..16f48f3725e7c 100644 --- a/pkgs/development/python-modules/notify-py/default.nix +++ b/pkgs/development/python-modules/notify-py/default.nix @@ -4,7 +4,7 @@ buildPythonPackage, pythonOlder, fetchFromGitHub, - substituteAll, + replaceVars, alsa-utils, libnotify, which, @@ -33,16 +33,14 @@ buildPythonPackage rec { patches = lib.optionals stdenv.hostPlatform.isLinux [ # hardcode paths to aplay and notify-send - (substituteAll { - src = ./linux-paths.patch; + (replaceVars ./linux-paths.patch { aplay = "${alsa-utils}/bin/aplay"; notifysend = "${libnotify}/bin/notify-send"; }) ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ # hardcode path to which - (substituteAll { - src = ./darwin-paths.patch; + (replaceVars ./darwin-paths.patch { which = "${which}/bin/which"; }) ]; diff --git a/pkgs/development/python-modules/numba/default.nix b/pkgs/development/python-modules/numba/default.nix index fa72fbab6021a..16df1272c82be 100644 --- a/pkgs/development/python-modules/numba/default.nix +++ b/pkgs/development/python-modules/numba/default.nix @@ -11,7 +11,7 @@ numpy_1, llvmlite, libcxx, - substituteAll, + replaceVars, writers, numba, pytestCheckHook, @@ -96,8 +96,7 @@ buildPythonPackage rec { ]; patches = lib.optionals cudaSupport [ - (substituteAll { - src = ./cuda_path.patch; + (replaceVars ./cuda_path.patch { cuda_toolkit_path = cudatoolkit; cuda_toolkit_lib_path = lib.getLib cudatoolkit; }) diff --git a/pkgs/development/python-modules/nvidia-ml-py/default.nix b/pkgs/development/python-modules/nvidia-ml-py/default.nix index f5b4ea48a75d9..e48b8b7d43e25 100644 --- a/pkgs/development/python-modules/nvidia-ml-py/default.nix +++ b/pkgs/development/python-modules/nvidia-ml-py/default.nix @@ -2,7 +2,7 @@ lib, fetchPypi, buildPythonPackage, - substituteAll, + replaceVars, addDriverRunpath, setuptools, cudaPackages, @@ -22,8 +22,7 @@ buildPythonPackage rec { }; patches = [ - (substituteAll { - src = ./0001-locate-libnvidia-ml.so.1-on-NixOS.patch; + (replaceVars ./0001-locate-libnvidia-ml.so.1-on-NixOS.patch { inherit (addDriverRunpath) driverLink; }) ]; diff --git a/pkgs/development/python-modules/objgraph/default.nix b/pkgs/development/python-modules/objgraph/default.nix index de84c59b59b86..9f4cf86fa7616 100644 --- a/pkgs/development/python-modules/objgraph/default.nix +++ b/pkgs/development/python-modules/objgraph/default.nix @@ -7,7 +7,7 @@ isPyPy, python, pythonOlder, - substituteAll, + replaceVars, setuptools, }: @@ -24,8 +24,7 @@ buildPythonPackage rec { }; patches = [ - (substituteAll { - src = ./hardcode-graphviz-path.patch; + (replaceVars ./hardcode-graphviz-path.patch { graphviz = graphvizPkgs; }) ]; diff --git a/pkgs/development/python-modules/ocrmypdf/default.nix b/pkgs/development/python-modules/ocrmypdf/default.nix index 5d75f8a829fc6..dc87c6f4edfed 100644 --- a/pkgs/development/python-modules/ocrmypdf/default.nix +++ b/pkgs/development/python-modules/ocrmypdf/default.nix @@ -21,7 +21,7 @@ pythonOlder, rich, reportlab, - substituteAll, + replaceVars, tesseract, unpaper, installShellFiles, @@ -50,8 +50,7 @@ buildPythonPackage rec { patches = [ ./use-pillow-heif.patch - (substituteAll { - src = ./paths.patch; + (replaceVars ./paths.patch { gs = lib.getExe ghostscript_headless; jbig2 = lib.getExe jbig2enc; pngquant = lib.getExe pngquant; diff --git a/pkgs/development/python-modules/omegaconf/default.nix b/pkgs/development/python-modules/omegaconf/default.nix index e0f551cbc4a65..0c9e7ab833fe2 100644 --- a/pkgs/development/python-modules/omegaconf/default.nix +++ b/pkgs/development/python-modules/omegaconf/default.nix @@ -13,7 +13,7 @@ pythonAtLeast, pythonOlder, pyyaml, - substituteAll, + replaceVars, }: buildPythonPackage rec { @@ -31,8 +31,7 @@ buildPythonPackage rec { }; patches = [ - (substituteAll { - src = ./antlr4.patch; + (replaceVars ./antlr4.patch { antlr_jar = "${antlr4.out}/share/java/antlr-${antlr4.version}-complete.jar"; }) diff --git a/pkgs/development/python-modules/openai-whisper/default.nix b/pkgs/development/python-modules/openai-whisper/default.nix index 4c0327558971a..634f8677be2cb 100644 --- a/pkgs/development/python-modules/openai-whisper/default.nix +++ b/pkgs/development/python-modules/openai-whisper/default.nix @@ -3,7 +3,7 @@ stdenv, fetchFromGitHub, buildPythonPackage, - substituteAll, + replaceVars, # build-system setuptools, @@ -38,8 +38,7 @@ buildPythonPackage rec { }; patches = [ - (substituteAll { - src = ./ffmpeg-path.patch; + (replaceVars ./ffmpeg-path.patch { ffmpeg = ffmpeg-headless; }) ]; diff --git a/pkgs/development/python-modules/opuslib/default.nix b/pkgs/development/python-modules/opuslib/default.nix index 4f7c86d2a4816..b645a2d1b1d05 100644 --- a/pkgs/development/python-modules/opuslib/default.nix +++ b/pkgs/development/python-modules/opuslib/default.nix @@ -7,7 +7,7 @@ pytestCheckHook, lib, stdenv, - substituteAll, + replaceVars, setuptools, }: @@ -38,8 +38,7 @@ buildPythonPackage rec { url = "https://github.com/orion-labs/opuslib/commit/87a214fc98c1dcae38035e99fe8e279a160c4a52.patch"; hash = "sha256-UoOafyTFvWLY7ErtBhkXTZSgbMZFrg5DGxjbhqEI7wo="; }) - (substituteAll { - src = ./opuslib-paths.patch; + (replaceVars ./opuslib-paths.patch { opusLibPath = "${libopus}/lib/libopus${stdenv.hostPlatform.extensions.sharedLibrary}"; }) ]; diff --git a/pkgs/development/python-modules/ots-python/default.nix b/pkgs/development/python-modules/ots-python/default.nix index 9c0ae3625c21d..ca91bfeaaceea 100644 --- a/pkgs/development/python-modules/ots-python/default.nix +++ b/pkgs/development/python-modules/ots-python/default.nix @@ -2,7 +2,7 @@ lib, buildPythonPackage, fetchPypi, - substituteAll, + replaceVars, opentype-sanitizer, setuptools-scm, pytestCheckHook, @@ -23,8 +23,7 @@ buildPythonPackage rec { # Invoke ots-sanitize from the opentype-sanitizer package instead of # downloading precompiled binaries from the internet. # (nixpkgs-specific, not upstreamable) - (substituteAll { - src = ./0001-use-packaged-ots.patch; + (replaceVars ./0001-use-packaged-ots.patch { ots_sanitize = "${opentype-sanitizer}/bin/ots-sanitize"; }) ]; diff --git a/pkgs/development/python-modules/pdfminer-six/default.nix b/pkgs/development/python-modules/pdfminer-six/default.nix index be653431e2a53..0fd59cbd4aec5 100644 --- a/pkgs/development/python-modules/pdfminer-six/default.nix +++ b/pkgs/development/python-modules/pdfminer-six/default.nix @@ -8,7 +8,7 @@ pythonOlder, pytestCheckHook, setuptools, - substituteAll, + replaceVars, ocrmypdf, }: @@ -34,8 +34,7 @@ buildPythonPackage rec { excludes = [ "CHANGELOG.md" ]; hash = "sha256-fsSXvN92MVtNFpAst0ctvGrbxVvoe4Nyz4wMZqJ1aw8="; }) - (substituteAll { - src = ./disable-setuptools-git-versioning.patch; + (replaceVars ./disable-setuptools-git-versioning.patch { inherit version; }) ]; diff --git a/pkgs/development/python-modules/phonemizer/default.nix b/pkgs/development/python-modules/phonemizer/default.nix index 561088b606d89..9b4a69a678768 100644 --- a/pkgs/development/python-modules/phonemizer/default.nix +++ b/pkgs/development/python-modules/phonemizer/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, - substituteAll, + replaceVars, buildPythonPackage, fetchPypi, joblib, @@ -27,8 +27,7 @@ buildPythonPackage rec { }; patches = [ - (substituteAll { - src = ./backend-paths.patch; + (replaceVars ./backend-paths.patch { libespeak = "${lib.getLib espeak-ng}/lib/libespeak-ng${stdenv.hostPlatform.extensions.sharedLibrary}"; # FIXME package festival }) diff --git a/pkgs/development/python-modules/pikepdf/default.nix b/pkgs/development/python-modules/pikepdf/default.nix index da0ebb79b504d..f05ed913e313e 100644 --- a/pkgs/development/python-modules/pikepdf/default.nix +++ b/pkgs/development/python-modules/pikepdf/default.nix @@ -20,7 +20,7 @@ python-xmp-toolkit, qpdf, setuptools, - substituteAll, + replaceVars, }: buildPythonPackage rec { @@ -42,8 +42,7 @@ buildPythonPackage rec { }; patches = [ - (substituteAll { - src = ./paths.patch; + (replaceVars ./paths.patch { jbig2dec = lib.getExe' jbig2dec "jbig2dec"; mutool = lib.getExe' mupdf-headless "mutool"; }) diff --git a/pkgs/development/python-modules/protobuf/4.nix b/pkgs/development/python-modules/protobuf/4.nix index c4db1b86e164b..48af41c206ecd 100644 --- a/pkgs/development/python-modules/protobuf/4.nix +++ b/pkgs/development/python-modules/protobuf/4.nix @@ -9,7 +9,7 @@ protobuf, pytestCheckHook, pythonAtLeast, - substituteAll, + replaceVars, tzdata, }: @@ -31,8 +31,7 @@ buildPythonPackage { patches = lib.optionals (lib.versionAtLeast protobuf.version "22") [ # Replace the vendored abseil-cpp with nixpkgs' - (substituteAll { - src = ./use-nixpkgs-abseil-cpp.patch; + (replaceVars ./use-nixpkgs-abseil-cpp.patch { abseil_cpp_include_path = "${lib.getDev protobuf.abseil-cpp}/include"; }) ] diff --git a/pkgs/development/python-modules/proton-client/default.nix b/pkgs/development/python-modules/proton-client/default.nix index 4e178ce26c929..b7a4db2ae9b01 100644 --- a/pkgs/development/python-modules/proton-client/default.nix +++ b/pkgs/development/python-modules/proton-client/default.nix @@ -4,7 +4,7 @@ buildPythonPackage, fetchFromGitHub, pythonOlder, - substituteAll, + replaceVars, bcrypt, pyopenssl, python-gnupg, @@ -37,8 +37,7 @@ buildPythonPackage rec { patches = [ # Patches library by fixing the openssl path - (substituteAll { - src = ./0001-OpenSSL-path-fix.patch; + (replaceVars ./0001-OpenSSL-path-fix.patch { openssl = openssl.out; ext = stdenv.hostPlatform.extensions.sharedLibrary; }) diff --git a/pkgs/development/python-modules/protonvpn-nm-lib/default.nix b/pkgs/development/python-modules/protonvpn-nm-lib/default.nix index ff647a2582bdd..2b679015e6bd7 100644 --- a/pkgs/development/python-modules/protonvpn-nm-lib/default.nix +++ b/pkgs/development/python-modules/protonvpn-nm-lib/default.nix @@ -3,7 +3,7 @@ buildPythonPackage, fetchFromGitHub, pythonOlder, - substituteAll, + replaceVars, dbus-python, distro, jinja2, @@ -48,8 +48,7 @@ buildPythonPackage rec { ]; patches = [ - (substituteAll { - src = ./0001-Patching-GIRepository.patch; + (replaceVars ./0001-Patching-GIRepository.patch { networkmanager_path = "${networkmanager}/lib/girepository-1.0"; }) ]; diff --git a/pkgs/development/python-modules/pulsectl/default.nix b/pkgs/development/python-modules/pulsectl/default.nix index 485acd9f7880d..a4340c4a7fc8b 100644 --- a/pkgs/development/python-modules/pulsectl/default.nix +++ b/pkgs/development/python-modules/pulsectl/default.nix @@ -4,7 +4,7 @@ fetchPypi, libpulseaudio, glibc, - substituteAll, + replaceVars, stdenv, pulseaudio, unittestCheckHook, @@ -22,8 +22,7 @@ buildPythonPackage rec { patches = [ # substitute library paths for libpulse and librt - (substituteAll { - src = ./library-paths.patch; + (replaceVars ./library-paths.patch { libpulse = "${libpulseaudio.out}/lib/libpulse${stdenv.hostPlatform.extensions.sharedLibrary}"; librt = "${glibc.out}/lib/librt${stdenv.hostPlatform.extensions.sharedLibrary}"; }) diff --git a/pkgs/development/python-modules/pydot/default.nix b/pkgs/development/python-modules/pydot/default.nix index a8756cab87a1d..bdbabe92c7159 100644 --- a/pkgs/development/python-modules/pydot/default.nix +++ b/pkgs/development/python-modules/pydot/default.nix @@ -3,7 +3,7 @@ buildPythonPackage, fetchPypi, setuptools, - substituteAll, + replaceVars, graphviz, pytestCheckHook, chardet, @@ -37,8 +37,7 @@ buildPythonPackage rec { ]; patches = [ - (substituteAll { - src = ./hardcode-graphviz-path.patch; + (replaceVars ./hardcode-graphviz-path.patch { inherit graphviz; }) ]; diff --git a/pkgs/development/python-modules/pygame-ce/default.nix b/pkgs/development/python-modules/pygame-ce/default.nix index 470ece3833530..cd288f7184f9d 100644 --- a/pkgs/development/python-modules/pygame-ce/default.nix +++ b/pkgs/development/python-modules/pygame-ce/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, - substituteAll, + replaceVars, fetchFromGitHub, buildPythonPackage, pythonOlder, @@ -45,8 +45,7 @@ buildPythonPackage rec { }; patches = [ - (substituteAll { - src = ./fix-dependency-finding.patch; + (replaceVars ./fix-dependency-finding.patch { buildinputs_include = builtins.toJSON ( builtins.concatMap (dep: [ "${lib.getDev dep}/" diff --git a/pkgs/development/python-modules/pygame/default.nix b/pkgs/development/python-modules/pygame/default.nix index f4da6a9f001c5..c5c6ac9175eb9 100644 --- a/pkgs/development/python-modules/pygame/default.nix +++ b/pkgs/development/python-modules/pygame/default.nix @@ -3,7 +3,7 @@ stdenv, buildPythonPackage, fetchFromGitHub, - substituteAll, + replaceVars, fontconfig, python, @@ -44,8 +44,7 @@ buildPythonPackage rec { patches = [ # Patch pygame's dependency resolution to let it find build inputs - (substituteAll { - src = ./fix-dependency-finding.patch; + (replaceVars ./fix-dependency-finding.patch { buildinputs_include = builtins.toJSON ( builtins.concatMap (dep: [ "${lib.getDev dep}/" diff --git a/pkgs/development/python-modules/pygraphviz/default.nix b/pkgs/development/python-modules/pygraphviz/default.nix index f6cf8b1a15954..f0a218a7883c6 100644 --- a/pkgs/development/python-modules/pygraphviz/default.nix +++ b/pkgs/development/python-modules/pygraphviz/default.nix @@ -3,7 +3,7 @@ buildPythonPackage, pythonOlder, fetchFromGitHub, - substituteAll, + replaceVars, graphviz, coreutils, pkg-config, @@ -27,8 +27,7 @@ buildPythonPackage rec { patches = [ # pygraphviz depends on graphviz executables and wc being in PATH - (substituteAll { - src = ./path.patch; + (replaceVars ./path.patch { path = lib.makeBinPath [ graphviz coreutils diff --git a/pkgs/development/python-modules/pylama/default.nix b/pkgs/development/python-modules/pylama/default.nix index 112d9392d80d5..39b5657819adc 100644 --- a/pkgs/development/python-modules/pylama/default.nix +++ b/pkgs/development/python-modules/pylama/default.nix @@ -2,7 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, - substituteAll, + replaceVars, git, eradicate, mccabe, @@ -32,8 +32,7 @@ let }; patches = [ - (substituteAll { - src = ./paths.patch; + (replaceVars ./paths.patch { git = "${lib.getBin git}/bin/git"; }) ]; diff --git a/pkgs/development/python-modules/pylddwrap/default.nix b/pkgs/development/python-modules/pylddwrap/default.nix index b24700cee2c87..cb68291f27e68 100644 --- a/pkgs/development/python-modules/pylddwrap/default.nix +++ b/pkgs/development/python-modules/pylddwrap/default.nix @@ -6,7 +6,7 @@ icontract, pytestCheckHook, pythonOlder, - substituteAll, + replaceVars, typing-extensions, }: @@ -24,8 +24,7 @@ buildPythonPackage rec { }; patches = [ - (substituteAll { - src = ./replace_env_with_placeholder.patch; + (replaceVars ./replace_env_with_placeholder.patch { ldd_bin = "${stdenv.cc.bintools.libc_bin}/bin/ldd"; }) ]; diff --git a/pkgs/development/python-modules/pyocr/default.nix b/pkgs/development/python-modules/pyocr/default.nix index 7df733b680a0f..8305e308918e0 100644 --- a/pkgs/development/python-modules/pyocr/default.nix +++ b/pkgs/development/python-modules/pyocr/default.nix @@ -7,7 +7,7 @@ tesseract, cuneiform, isPy3k, - substituteAll, + replaceVars, pytestCheckHook, setuptools, setuptools-scm, @@ -33,15 +33,17 @@ buildPythonPackage rec { patches = [ ] - ++ (lib.optional withTesseractSupport (substituteAll { - src = ./paths-tesseract.patch; - inherit tesseract; - tesseractLibraryLocation = "${tesseract}/lib/libtesseract${stdenv.hostPlatform.extensions.sharedLibrary}"; - })) - ++ (lib.optional stdenv.hostPlatform.isLinux (substituteAll { - src = ./paths-cuneiform.patch; - inherit cuneiform; - })); + ++ (lib.optional withTesseractSupport ( + replaceVars ./paths-tesseract.patch { + inherit tesseract; + tesseractLibraryLocation = "${tesseract}/lib/libtesseract${stdenv.hostPlatform.extensions.sharedLibrary}"; + } + )) + ++ (lib.optional stdenv.hostPlatform.isLinux ( + replaceVars ./paths-cuneiform.patch { + inherit cuneiform; + } + )); propagatedBuildInputs = [ pillow ]; diff --git a/pkgs/development/python-modules/pyogg/default.nix b/pkgs/development/python-modules/pyogg/default.nix index 03d51fef67fa2..220777cd36098 100644 --- a/pkgs/development/python-modules/pyogg/default.nix +++ b/pkgs/development/python-modules/pyogg/default.nix @@ -8,7 +8,7 @@ libogg, libopus, opusfile, - substituteAll, + replaceVars, }: buildPythonPackage rec { @@ -45,8 +45,7 @@ buildPythonPackage rec { "--binary" ]; patches = [ - (substituteAll { - src = ./pyogg-paths.patch; + (replaceVars ./pyogg-paths.patch { flacLibPath = "${flac.out}/lib/libFLAC${stdenv.hostPlatform.extensions.sharedLibrary}"; oggLibPath = "${libogg}/lib/libogg${stdenv.hostPlatform.extensions.sharedLibrary}"; vorbisLibPath = "${libvorbis}/lib/libvorbis${stdenv.hostPlatform.extensions.sharedLibrary}"; diff --git a/pkgs/development/python-modules/pypandoc/default.nix b/pkgs/development/python-modules/pypandoc/default.nix index 0aad26e59cb6d..1027501131577 100644 --- a/pkgs/development/python-modules/pypandoc/default.nix +++ b/pkgs/development/python-modules/pypandoc/default.nix @@ -6,7 +6,7 @@ pandocfilters, poetry-core, pythonOlder, - substituteAll, + replaceVars, texliveSmall, }: @@ -25,8 +25,7 @@ buildPythonPackage rec { }; patches = [ - (substituteAll { - src = ./static-pandoc-path.patch; + (replaceVars ./static-pandoc-path.patch { pandoc = "${lib.getBin pandoc}/bin/pandoc"; pandocVersion = pandoc.version; }) diff --git a/pkgs/development/python-modules/pyproj/default.nix b/pkgs/development/python-modules/pyproj/default.nix index d419fbb769494..77f863139ed51 100644 --- a/pkgs/development/python-modules/pyproj/default.nix +++ b/pkgs/development/python-modules/pyproj/default.nix @@ -4,7 +4,7 @@ fetchFromGitHub, pytestCheckHook, pythonOlder, - substituteAll, + replaceVars, certifi, cython, @@ -31,8 +31,7 @@ buildPythonPackage rec { # force pyproj to use ${proj} patches = [ - (substituteAll { - src = ./001.proj.patch; + (replaceVars ./001.proj.patch { proj = proj; projdev = proj.dev; }) diff --git a/pkgs/development/python-modules/pysaml2/default.nix b/pkgs/development/python-modules/pysaml2/default.nix index 8fb26fb9f5f2b..dca55176f1623 100644 --- a/pkgs/development/python-modules/pysaml2/default.nix +++ b/pkgs/development/python-modules/pysaml2/default.nix @@ -17,7 +17,7 @@ requests, responses, setuptools, - substituteAll, + replaceVars, xmlschema, xmlsec, zope-interface, @@ -38,8 +38,7 @@ buildPythonPackage rec { }; patches = [ - (substituteAll { - src = ./hardcode-xmlsec1-path.patch; + (replaceVars ./hardcode-xmlsec1-path.patch { inherit xmlsec; }) ]; diff --git a/pkgs/development/python-modules/pytesseract/default.nix b/pkgs/development/python-modules/pytesseract/default.nix index e64c3e28a2b6e..502bb3dd2465d 100644 --- a/pkgs/development/python-modules/pytesseract/default.nix +++ b/pkgs/development/python-modules/pytesseract/default.nix @@ -5,7 +5,7 @@ packaging, pillow, tesseract, - substituteAll, + replaceVars, pytestCheckHook, setuptools, }: @@ -23,8 +23,7 @@ buildPythonPackage rec { }; patches = [ - (substituteAll { - src = ./tesseract-binary.patch; + (replaceVars ./tesseract-binary.patch { drv = tesseract; }) ]; diff --git a/pkgs/development/python-modules/python-magic/default.nix b/pkgs/development/python-modules/python-magic/default.nix index 942f4562d9dbb..c84659014b71f 100644 --- a/pkgs/development/python-modules/python-magic/default.nix +++ b/pkgs/development/python-modules/python-magic/default.nix @@ -4,7 +4,7 @@ buildPythonPackage, fetchFromGitHub, fetchpatch, - substituteAll, + replaceVars, file, pytestCheckHook, }: @@ -22,8 +22,7 @@ buildPythonPackage rec { }; patches = [ - (substituteAll { - src = ./libmagic-path.patch; + (replaceVars ./libmagic-path.patch { libmagic = "${file}/lib/libmagic${stdenv.hostPlatform.extensions.sharedLibrary}"; }) (fetchpatch { diff --git a/pkgs/development/python-modules/python-mapnik/default.nix b/pkgs/development/python-modules/python-mapnik/default.nix index 6e0b93a60907a..2ce7bff0593d9 100644 --- a/pkgs/development/python-modules/python-mapnik/default.nix +++ b/pkgs/development/python-modules/python-mapnik/default.nix @@ -2,7 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, - substituteAll, + replaceVars, isPyPy, python, setuptools, @@ -43,8 +43,7 @@ buildPythonPackage rec { patches = [ # python-mapnik seems to depend on having the mapnik src directory # structure available at build time. We just hardcode the paths. - (substituteAll { - src = ./find-libmapnik.patch; + (replaceVars ./find-libmapnik.patch { libmapnik = "${mapnik}/lib"; }) # Use `std::optional` rather than `boost::optional` diff --git a/pkgs/development/python-modules/python-matter-server/default.nix b/pkgs/development/python-modules/python-matter-server/default.nix index 9f860cdf7b544..90563f8b101f5 100644 --- a/pkgs/development/python-modules/python-matter-server/default.nix +++ b/pkgs/development/python-modules/python-matter-server/default.nix @@ -4,7 +4,7 @@ fetchFromGitHub, pythonOlder, stdenvNoCC, - substituteAll, + replaceVars, # build setuptools, @@ -69,8 +69,7 @@ buildPythonPackage rec { }; patches = [ - (substituteAll { - src = ./link-paa-root-certs.patch; + (replaceVars ./link-paa-root-certs.patch { paacerts = paaCerts; }) ]; diff --git a/pkgs/development/python-modules/python-rapidjson/default.nix b/pkgs/development/python-modules/python-rapidjson/default.nix index 32153ca9f8c35..2c686ca2d8d45 100644 --- a/pkgs/development/python-modules/python-rapidjson/default.nix +++ b/pkgs/development/python-modules/python-rapidjson/default.nix @@ -7,7 +7,7 @@ pytestCheckHook, pytz, setuptools, - substituteAll, + replaceVars, }: buildPythonPackage rec { @@ -25,8 +25,7 @@ buildPythonPackage rec { }; patches = [ - (substituteAll { - src = ./rapidjson-include-dir.patch; + (replaceVars ./rapidjson-include-dir.patch { rapidjson = lib.getDev rapidjson; }) ]; diff --git a/pkgs/development/python-modules/python3-gnutls/default.nix b/pkgs/development/python-modules/python3-gnutls/default.nix index 60bf464cb5108..88958200c0ec0 100644 --- a/pkgs/development/python-modules/python3-gnutls/default.nix +++ b/pkgs/development/python-modules/python3-gnutls/default.nix @@ -1,7 +1,7 @@ { lib, fetchFromGitHub, - substituteAll, + replaceVars, buildPythonPackage, isPy3k, gnutls, @@ -34,8 +34,7 @@ buildPythonPackage rec { ]; patches = [ - (substituteAll { - src = ./libgnutls-path.patch; + (replaceVars ./libgnutls-path.patch { gnutlslib = "${lib.getLib gnutls}/lib"; }) ]; diff --git a/pkgs/development/python-modules/pythran/default.nix b/pkgs/development/python-modules/pythran/default.nix index c8873f5d3eedd..9f041f3374cf5 100644 --- a/pkgs/development/python-modules/pythran/default.nix +++ b/pkgs/development/python-modules/pythran/default.nix @@ -4,7 +4,7 @@ buildPythonPackage, fetchFromGitHub, fetchpatch2, - substituteAll, + replaceVars, # build-system setuptools, @@ -37,8 +37,7 @@ buildPythonPackage rec { patches = [ # Hardcode path to mp library - (substituteAll { - src = ./0001-hardcode-path-to-libgomp.patch; + (replaceVars ./0001-hardcode-path-to-libgomp.patch { gomp = "${ if stdenv.cc.isClang then openmp else (lib.getLib stdenv.cc.cc) }/lib/libgomp${stdenv.hostPlatform.extensions.sharedLibrary}"; diff --git a/pkgs/development/python-modules/pyturbojpeg/default.nix b/pkgs/development/python-modules/pyturbojpeg/default.nix index d91e446e5d7a3..735f0a928c81f 100644 --- a/pkgs/development/python-modules/pyturbojpeg/default.nix +++ b/pkgs/development/python-modules/pyturbojpeg/default.nix @@ -7,7 +7,7 @@ setuptools, numpy, python, - substituteAll, + replaceVars, }: buildPythonPackage rec { @@ -23,8 +23,7 @@ buildPythonPackage rec { }; patches = [ - (substituteAll { - src = ./lib-path.patch; + (replaceVars ./lib-path.patch { libturbojpeg = "${lib.getLib libjpeg_turbo}/lib/libturbojpeg${stdenv.hostPlatform.extensions.sharedLibrary}"; }) ]; diff --git a/pkgs/development/python-modules/pyvirtualdisplay/default.nix b/pkgs/development/python-modules/pyvirtualdisplay/default.nix index ac2a3bf68f695..dca19a30340ce 100644 --- a/pkgs/development/python-modules/pyvirtualdisplay/default.nix +++ b/pkgs/development/python-modules/pyvirtualdisplay/default.nix @@ -3,7 +3,7 @@ stdenv, buildPythonPackage, fetchPypi, - substituteAll, + replaceVars, xorg, # build-system @@ -32,8 +32,7 @@ buildPythonPackage rec { }; patches = lib.optionals stdenv.hostPlatform.isLinux [ - (substituteAll { - src = ./paths.patch; + (replaceVars ./paths.patch { xauth = lib.getExe xorg.xauth; xdpyinfo = lib.getExe xorg.xdpyinfo; }) diff --git a/pkgs/development/python-modules/slixmpp/default.nix b/pkgs/development/python-modules/slixmpp/default.nix index 02070116ebdac..0d1cb77e17c27 100644 --- a/pkgs/development/python-modules/slixmpp/default.nix +++ b/pkgs/development/python-modules/slixmpp/default.nix @@ -8,7 +8,7 @@ pyasn1, pyasn1-modules, pytestCheckHook, - substituteAll, + replaceVars, pythonOlder, }: @@ -34,8 +34,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; patches = [ - (substituteAll { - src = ./hardcode-gnupg-path.patch; + (replaceVars ./hardcode-gnupg-path.patch { inherit gnupg; }) ]; diff --git a/pkgs/development/python-modules/sounddevice/default.nix b/pkgs/development/python-modules/sounddevice/default.nix index f90e2f7a30640..8784657600b9d 100644 --- a/pkgs/development/python-modules/sounddevice/default.nix +++ b/pkgs/development/python-modules/sounddevice/default.nix @@ -8,7 +8,7 @@ cffi, numpy, portaudio, - substituteAll, + replaceVars, }: buildPythonPackage rec { @@ -38,8 +38,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "sounddevice" ]; patches = [ - (substituteAll { - src = ./fix-portaudio-library-path.patch; + (replaceVars ./fix-portaudio-library-path.patch { portaudio = "${portaudio}/lib/libportaudio${stdenv.hostPlatform.extensions.sharedLibrary}"; }) ]; diff --git a/pkgs/development/python-modules/streamdeck/default.nix b/pkgs/development/python-modules/streamdeck/default.nix index e921659e22841..2d4009c57c7ee 100644 --- a/pkgs/development/python-modules/streamdeck/default.nix +++ b/pkgs/development/python-modules/streamdeck/default.nix @@ -3,7 +3,7 @@ stdenv, buildPythonPackage, fetchPypi, - substituteAll, + replaceVars, pkgs, }: @@ -19,8 +19,7 @@ buildPythonPackage rec { patches = [ # substitute libusb path - (substituteAll { - src = ./hardcode-libusb.patch; + (replaceVars ./hardcode-libusb.patch { libusb = "${pkgs.hidapi}/lib/libhidapi-libusb${stdenv.hostPlatform.extensions.sharedLibrary}"; }) ]; diff --git a/pkgs/development/python-modules/termplotlib/default.nix b/pkgs/development/python-modules/termplotlib/default.nix index c4112b3e16293..d690ad1aa5a96 100644 --- a/pkgs/development/python-modules/termplotlib/default.nix +++ b/pkgs/development/python-modules/termplotlib/default.nix @@ -1,6 +1,6 @@ { lib, - substituteAll, + replaceVars, buildPythonPackage, fetchFromGitHub, pytestCheckHook, @@ -33,8 +33,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ numpy ]; patches = [ - (substituteAll { - src = ./gnuplot-subprocess.patch; + (replaceVars ./gnuplot-subprocess.patch { gnuplot = "${gnuplot.out}/bin/gnuplot"; }) ]; diff --git a/pkgs/development/python-modules/tinygrad/default.nix b/pkgs/development/python-modules/tinygrad/default.nix index b7826c8c01f2b..e979b7991281f 100644 --- a/pkgs/development/python-modules/tinygrad/default.nix +++ b/pkgs/development/python-modules/tinygrad/default.nix @@ -3,7 +3,7 @@ config, buildPythonPackage, fetchFromGitHub, - substituteAll, + replaceVars, addDriverRunpath, cudaSupport ? config.cudaSupport, rocmSupport ? config.rocmSupport, @@ -56,8 +56,7 @@ buildPythonPackage rec { }; patches = [ - (substituteAll { - src = ./fix-dlopen-cuda.patch; + (replaceVars ./fix-dlopen-cuda.patch { inherit (addDriverRunpath) driverLink; libnvrtc = if cudaSupport then diff --git a/pkgs/development/python-modules/tpm2-pytss/default.nix b/pkgs/development/python-modules/tpm2-pytss/default.nix index 7ca0bb688a411..807f51dabe428 100644 --- a/pkgs/development/python-modules/tpm2-pytss/default.nix +++ b/pkgs/development/python-modules/tpm2-pytss/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, - substituteAll, + replaceVars, buildPythonPackage, fetchPypi, fetchpatch, @@ -53,8 +53,7 @@ buildPythonPackage rec { # when cross-compiling is turned on. # This patch changes the call to pycparser.preprocess_file to provide the name # of the cross-compiling cpp - (substituteAll { - src = ./cross.patch; + (replaceVars ./cross.patch { crossPrefix = stdenv.hostPlatform.config; }) ]; diff --git a/pkgs/development/python-modules/vispy/default.nix b/pkgs/development/python-modules/vispy/default.nix index eb3b16c0a3ea5..875c06b5fe714 100644 --- a/pkgs/development/python-modules/vispy/default.nix +++ b/pkgs/development/python-modules/vispy/default.nix @@ -2,7 +2,7 @@ lib, stdenv, buildPythonPackage, - substituteAll, + replaceVars, fetchPypi, cython, fontconfig, @@ -32,8 +32,7 @@ buildPythonPackage rec { }; patches = lib.optionals (!stdenv.hostPlatform.isDarwin) [ - (substituteAll { - src = ./library-paths.patch; + (replaceVars ./library-paths.patch { fontconfig = "${fontconfig.lib}/lib/libfontconfig${stdenv.hostPlatform.extensions.sharedLibrary}"; gl = "${libGL.out}/lib/libGL${stdenv.hostPlatform.extensions.sharedLibrary}"; }) diff --git a/pkgs/development/python-modules/wallet-py3k/default.nix b/pkgs/development/python-modules/wallet-py3k/default.nix index fb50398d5be4e..1237dafc33968 100644 --- a/pkgs/development/python-modules/wallet-py3k/default.nix +++ b/pkgs/development/python-modules/wallet-py3k/default.nix @@ -2,7 +2,7 @@ lib, buildPythonPackage, fetchPypi, - substituteAll, + replaceVars, openssl, setuptools, six, @@ -19,8 +19,7 @@ buildPythonPackage rec { }; patches = [ - (substituteAll { - src = ./openssl-path.patch; + (replaceVars ./openssl-path.patch { openssl = lib.getExe openssl; }) ]; diff --git a/pkgs/development/python-modules/wandb/default.nix b/pkgs/development/python-modules/wandb/default.nix index 9636de89d64ab..d724cc4afd6bb 100644 --- a/pkgs/development/python-modules/wandb/default.nix +++ b/pkgs/development/python-modules/wandb/default.nix @@ -13,7 +13,7 @@ ## wandb buildPythonPackage, - substituteAll, + replaceVars, # build-system hatchling, @@ -150,8 +150,7 @@ buildPythonPackage rec { patches = [ # Replace git paths - (substituteAll { - src = ./hardcode-git-path.patch; + (replaceVars ./hardcode-git-path.patch { git = lib.getExe git; }) ]; diff --git a/pkgs/development/python-modules/wavefile/default.nix b/pkgs/development/python-modules/wavefile/default.nix index 9711e2684038e..c36b099f26d0e 100644 --- a/pkgs/development/python-modules/wavefile/default.nix +++ b/pkgs/development/python-modules/wavefile/default.nix @@ -7,7 +7,7 @@ pyaudio, numpy, libsndfile, - substituteAll, + replaceVars, }: buildPythonPackage rec { @@ -40,8 +40,7 @@ buildPythonPackage rec { patches = [ # Fix check error # OSError: libsndfile.so.1: cannot open shared object file: No such file or directory - (substituteAll { - src = ./libsndfile.py.patch; + (replaceVars ./libsndfile.py.patch { libsndfile = "${lib.getLib libsndfile}/lib/libsndfile${stdenv.hostPlatform.extensions.sharedLibrary}"; }) ]; diff --git a/pkgs/development/python-modules/weasyprint/default.nix b/pkgs/development/python-modules/weasyprint/default.nix index e50d4f3d921a3..d9deb72e82663 100644 --- a/pkgs/development/python-modules/weasyprint/default.nix +++ b/pkgs/development/python-modules/weasyprint/default.nix @@ -18,7 +18,7 @@ pytest-cov-stub, pytestCheckHook, pythonOlder, - substituteAll, + replaceVars, tinycss2, tinyhtml5, }: @@ -37,13 +37,11 @@ buildPythonPackage rec { }; patches = [ - (substituteAll { - src = ./library-paths.patch; + (replaceVars ./library-paths.patch { fontconfig = "${fontconfig.lib}/lib/libfontconfig${stdenv.hostPlatform.extensions.sharedLibrary}"; pangoft2 = "${pango.out}/lib/libpangoft2-1.0${stdenv.hostPlatform.extensions.sharedLibrary}"; gobject = "${glib.out}/lib/libgobject-2.0${stdenv.hostPlatform.extensions.sharedLibrary}"; pango = "${pango.out}/lib/libpango-1.0${stdenv.hostPlatform.extensions.sharedLibrary}"; - pangocairo = "${pango.out}/lib/libpangocairo-1.0${stdenv.hostPlatform.extensions.sharedLibrary}"; harfbuzz = "${harfbuzz.out}/lib/libharfbuzz${stdenv.hostPlatform.extensions.sharedLibrary}"; harfbuzz_subset = "${harfbuzz.out}/lib/libharfbuzz-subset${stdenv.hostPlatform.extensions.sharedLibrary}"; }) diff --git a/pkgs/development/python-modules/wxpython/4.2.nix b/pkgs/development/python-modules/wxpython/4.2.nix index 8fd324dff01fb..6a5d3debaf40a 100644 --- a/pkgs/development/python-modules/wxpython/4.2.nix +++ b/pkgs/development/python-modules/wxpython/4.2.nix @@ -4,7 +4,7 @@ buildPythonPackage, setuptools, fetchPypi, - substituteAll, + replaceVars, # build autoPatchelfHook, @@ -52,8 +52,7 @@ buildPythonPackage rec { }; patches = [ - (substituteAll { - src = ./4.2-ctypes.patch; + (replaceVars ./4.2-ctypes.patch { libgdk = "${gtk3.out}/lib/libgdk-3.so"; libpangocairo = "${pango}/lib/libpangocairo-1.0.so"; libcairo = "${cairo}/lib/libcairo.so"; diff --git a/pkgs/development/python-modules/xsdata/default.nix b/pkgs/development/python-modules/xsdata/default.nix index 97d0d64a3b4b1..3d4f21b9d1cd6 100644 --- a/pkgs/development/python-modules/xsdata/default.nix +++ b/pkgs/development/python-modules/xsdata/default.nix @@ -3,7 +3,7 @@ buildPythonPackage, pythonOlder, fetchFromGitHub, - substituteAll, + replaceVars, ruff, click, click-default-group, @@ -32,8 +32,7 @@ buildPythonPackage rec { }; patches = [ - (substituteAll { - src = ./paths.patch; + (replaceVars ./paths.patch { ruff = lib.getExe ruff; }) ]; diff --git a/pkgs/development/python-modules/youseedee/default.nix b/pkgs/development/python-modules/youseedee/default.nix index e35be6b565684..6117e329d62a5 100644 --- a/pkgs/development/python-modules/youseedee/default.nix +++ b/pkgs/development/python-modules/youseedee/default.nix @@ -2,7 +2,7 @@ lib, buildPythonPackage, fetchPypi, - substituteAll, + replaceVars, setuptools, setuptools-scm, filelock, @@ -23,8 +23,7 @@ buildPythonPackage rec { patches = [ # Load data files from the unicode-character-database package instead of # downloading them from the internet. (nixpkgs-specific, not upstreamable) - (substituteAll { - src = ./0001-use-packaged-unicode-data.patch; + (replaceVars ./0001-use-packaged-unicode-data.patch { ucd_dir = "${unicode-character-database}/share/unicode"; }) ]; diff --git a/pkgs/development/python-modules/yq/default.nix b/pkgs/development/python-modules/yq/default.nix index dfc1ae08903ec..a0e3a27ac169b 100644 --- a/pkgs/development/python-modules/yq/default.nix +++ b/pkgs/development/python-modules/yq/default.nix @@ -7,7 +7,7 @@ pytestCheckHook, pyyaml, setuptools-scm, - substituteAll, + replaceVars, tomlkit, xmltodict, }: @@ -23,8 +23,7 @@ buildPythonPackage rec { }; patches = [ - (substituteAll { - src = ./jq-path.patch; + (replaceVars ./jq-path.patch { jq = "${lib.getBin jq}/bin/jq"; }) ]; diff --git a/pkgs/development/python-modules/zlib-ng/default.nix b/pkgs/development/python-modules/zlib-ng/default.nix index 77b3743c0137e..15380edc65fa9 100644 --- a/pkgs/development/python-modules/zlib-ng/default.nix +++ b/pkgs/development/python-modules/zlib-ng/default.nix @@ -2,7 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, - substituteAll, + replaceVars, # build-system cmake, @@ -29,8 +29,7 @@ buildPythonPackage rec { }; patches = [ - (substituteAll { - src = ./version.patch; + (replaceVars ./version.patch { inherit version; }) ]; diff --git a/pkgs/development/rocm-modules/5/rocprofiler/default.nix b/pkgs/development/rocm-modules/5/rocprofiler/default.nix index 10397e8b9e7a2..2948a7c036868 100644 --- a/pkgs/development/rocm-modules/5/rocprofiler/default.nix +++ b/pkgs/development/rocm-modules/5/rocprofiler/default.nix @@ -4,7 +4,7 @@ fetchFromGitHub, rocmUpdateScript, symlinkJoin, - substituteAll, + replaceVars, cmake, clang, clr, @@ -62,8 +62,7 @@ stdenv.mkDerivation (finalAttrs: { ./0000-dont-install-tests-hsaco.patch # Fix bad paths - (substituteAll { - src = ./0001-fix-shell-scripts.patch; + (replaceVars ./0001-fix-shell-scripts.patch { rocmtoolkit_merged = rocmtoolkit-merged; }) ]; diff --git a/pkgs/development/rocm-modules/6/rocprofiler/default.nix b/pkgs/development/rocm-modules/6/rocprofiler/default.nix index c3a0bf7112a62..a80c6e90f1323 100644 --- a/pkgs/development/rocm-modules/6/rocprofiler/default.nix +++ b/pkgs/development/rocm-modules/6/rocprofiler/default.nix @@ -4,7 +4,7 @@ fetchFromGitHub, rocmUpdateScript, symlinkJoin, - substituteAll, + replaceVars, cmake, clang, clr, @@ -62,8 +62,7 @@ stdenv.mkDerivation (finalAttrs: { ./0000-dont-install-tests-hsaco.patch # Fix bad paths - (substituteAll { - src = ./0001-fix-shell-scripts.patch; + (replaceVars ./0001-fix-shell-scripts.patch { rocmtoolkit_merged = rocmtoolkit-merged; }) diff --git a/pkgs/development/tcl-modules/by-name/ex/expect/package.nix b/pkgs/development/tcl-modules/by-name/ex/expect/package.nix index ae1c8ae21cc1b..f2d0c6d4bf634 100644 --- a/pkgs/development/tcl-modules/by-name/ex/expect/package.nix +++ b/pkgs/development/tcl-modules/by-name/ex/expect/package.nix @@ -7,7 +7,7 @@ makeWrapper, autoreconfHook, fetchpatch, - substituteAll, + replaceVars, }: tcl.mkTclDerivation rec { @@ -20,8 +20,7 @@ tcl.mkTclDerivation rec { }; patches = [ - (substituteAll { - src = ./fix-build-time-run-tcl.patch; + (replaceVars ./fix-build-time-run-tcl.patch { tcl = "${buildPackages.tcl}/bin/tclsh"; }) # The following patches fix compilation with clang 15+ diff --git a/pkgs/development/tools/build-managers/bazel/bazel_5/default.nix b/pkgs/development/tools/build-managers/bazel/bazel_5/default.nix index 5fd35f3cb9143..79c6726806ead 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel_5/default.nix +++ b/pkgs/development/tools/build-managers/bazel/bazel_5/default.nix @@ -38,7 +38,7 @@ # Also, don't clean up environment variables (so that NIX_ environment variables are passed to compilers). enableNixHacks ? false, file, - substituteAll, + replaceVars, writeTextFile, }: @@ -203,8 +203,7 @@ stdenv.mkDerivation rec { # This patch removes using the -fobjc-arc compiler option and makes the code # compile without automatic reference counting. Caveat: this leaks memory, but # we accept this fact because xcode_locator is only a short-lived process used during the build. - (substituteAll { - src = ./no-arc.patch; + (replaceVars ./no-arc.patch { multiBinPatch = if stdenv.hostPlatform.system == "aarch64-darwin" then "arm64" else "x86_64"; }) @@ -214,20 +213,17 @@ stdenv.mkDerivation rec { # This is non hermetic on non-nixos systems. On NixOS, bazel cannot find the required binaries. # So we are replacing this bazel paths by defaultShellPath, # improving hermeticity and making it work in nixos. - (substituteAll { - src = ../strict_action_env.patch; + (replaceVars ../strict_action_env.patch { strictActionEnvPatch = defaultShellPath; }) - (substituteAll { - src = ./actions_path.patch; + (replaceVars ./actions_path.patch { actionsPathPatch = defaultShellPath; }) # bazel reads its system bazelrc in /etc # override this path to a builtin one - (substituteAll { - src = ../bazel_rc.patch; + (replaceVars ../bazel_rc.patch { bazelSystemBazelRCPath = bazelRC; }) diff --git a/pkgs/development/tools/build-managers/bazel/bazel_6/default.nix b/pkgs/development/tools/build-managers/bazel/bazel_6/default.nix index 7d339dec2c96e..e941d53395c06 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel_6/default.nix +++ b/pkgs/development/tools/build-managers/bazel/bazel_6/default.nix @@ -16,7 +16,7 @@ # Also, don't clean up environment variables (so that NIX_ environment variables are passed to compilers). , enableNixHacks ? false , file -, substituteAll +, replaceVars , writeTextFile , writeShellApplication , makeBinaryWrapper @@ -239,8 +239,7 @@ stdenv.mkDerivation rec { # This patch removes using the -fobjc-arc compiler option and makes the code # compile without automatic reference counting. Caveat: this leaks memory, but # we accept this fact because xcode_locator is only a short-lived process used during the build. - (substituteAll { - src = ./no-arc.patch; + (replaceVars ./no-arc.patch { multiBinPatch = if stdenv.hostPlatform.system == "aarch64-darwin" then "arm64" else "x86_64"; }) @@ -250,20 +249,17 @@ stdenv.mkDerivation rec { # This is non hermetic on non-nixos systems. On NixOS, bazel cannot find the required binaries. # So we are replacing this bazel paths by defaultShellPath, # improving hermeticity and making it work in nixos. - (substituteAll { - src = ../strict_action_env.patch; + (replaceVars ../strict_action_env.patch { strictActionEnvPatch = defaultShellPath; }) - (substituteAll { - src = ./actions_path.patch; + (replaceVars ./actions_path.patch { actionsPathPatch = defaultShellPath; }) # bazel reads its system bazelrc in /etc # override this path to a builtin one - (substituteAll { - src = ../bazel_rc.patch; + (replaceVars ../bazel_rc.patch { bazelSystemBazelRCPath = bazelRC; }) ] ++ lib.optional enableNixHacks ./nix-hacks.patch; diff --git a/pkgs/development/tools/build-managers/bazel/bazel_7/default.nix b/pkgs/development/tools/build-managers/bazel/bazel_7/default.nix index cd9acfcfc723e..11da64513cbf3 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel_7/default.nix +++ b/pkgs/development/tools/build-managers/bazel/bazel_7/default.nix @@ -5,7 +5,7 @@ fetchurl, makeWrapper, writeTextFile, - substituteAll, + replaceVars, writeShellApplication, makeBinaryWrapper, autoPatchelfHook, @@ -377,15 +377,13 @@ stdenv.mkDerivation rec { # This is non hermetic on non-nixos systems. On NixOS, bazel cannot find the required binaries. # So we are replacing this bazel paths by defaultShellPath, # improving hermeticity and making it work in nixos. - (substituteAll { - src = ../strict_action_env.patch; + (replaceVars ../strict_action_env.patch { strictActionEnvPatch = defaultShellPath; }) # bazel reads its system bazelrc in /etc # override this path to a builtin one - (substituteAll { - src = ../bazel_rc.patch; + (replaceVars ../bazel_rc.patch { bazelSystemBazelRCPath = bazelRC; }) ] diff --git a/pkgs/development/tools/ocaml/merlin/4.x.nix b/pkgs/development/tools/ocaml/merlin/4.x.nix index 2a230cd8039ea..660fe6671625a 100644 --- a/pkgs/development/tools/ocaml/merlin/4.x.nix +++ b/pkgs/development/tools/ocaml/merlin/4.x.nix @@ -64,7 +64,6 @@ buildDunePackage { in [ (replaceVars (if old-patch then ./fix-paths.patch else ./fix-paths2.patch) { - dot-merlin-reader = "${dot-merlin-reader}/bin/dot-merlin-reader"; dune = "${dune_3}/bin/dune"; }) diff --git a/pkgs/development/tools/ocaml/merlin/default.nix b/pkgs/development/tools/ocaml/merlin/default.nix index 12aaeac1fddda..858520d5b891b 100644 --- a/pkgs/development/tools/ocaml/merlin/default.nix +++ b/pkgs/development/tools/ocaml/merlin/default.nix @@ -3,7 +3,7 @@ fetchurl, fetchpatch, buildDunePackage, - substituteAll, + replaceVars, dot-merlin-reader, dune_2, yojson, @@ -24,9 +24,8 @@ buildDunePackage rec { minimalOCamlVersion = "4.02.3"; patches = [ - (substituteAll { - src = ./fix-paths.patch; - dot_merlin_reader = "${dot-merlin-reader}/bin/dot-merlin-reader"; + (replaceVars ./fix-paths.patch { + dot-merlin-reader = "${dot-merlin-reader}/bin/dot-merlin-reader"; dune = "${dune_2}/bin/dune"; }) # https://github.com/ocaml/merlin/pull/1798 diff --git a/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix b/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix index 503dff90cd45a..d7c966ef5630e 100644 --- a/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix +++ b/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix @@ -1,4 +1,4 @@ -{ stdenv, dwarf-therapist, dwarf-fortress, substituteAll, coreutils, wrapQtAppsHook +{ stdenv, dwarf-therapist, dwarf-fortress, replaceVars, coreutils, wrapQtAppsHook }: let @@ -14,8 +14,7 @@ stdenv.mkDerivation { pname = "dwarf-therapist"; inherit (dwarf-therapist) version meta; - wrapper = substituteAll { - src = ./dwarf-therapist.in; + wrapper = replaceVars ./dwarf-therapist.in { stdenv_shell = "${stdenv.shell}"; rm = "${coreutils}/bin/rm"; ln = "${coreutils}/bin/ln"; @@ -23,6 +22,8 @@ stdenv.mkDerivation { mkdir = "${coreutils}/bin/mkdir"; dirname = "${coreutils}/bin/dirname"; therapist = "${dwarf-therapist}"; + # replaced in buildCommand + install = null; }; paths = [ dwarf-therapist ]; diff --git a/pkgs/games/dwarf-fortress/wrapper/default.nix b/pkgs/games/dwarf-fortress/wrapper/default.nix index b1a6555f6cb43..55f08c328558d 100644 --- a/pkgs/games/dwarf-fortress/wrapper/default.nix +++ b/pkgs/games/dwarf-fortress/wrapper/default.nix @@ -2,7 +2,7 @@ stdenv, lib, buildEnv, - substituteAll, + replaceVars, makeWrapper, runCommand, coreutils, @@ -185,11 +185,8 @@ lib.throwIf (enableTWBT' && !enableDFHack) "dwarf-fortress: TWBT requires DFHack pname = "dwarf-fortress"; version = dwarf-fortress.dfVersion; - dfInit = substituteAll { - name = "dwarf-fortress-init"; - src = ./dwarf-fortress-init.in; + dfInit = replaceVars ./dwarf-fortress-init.in { inherit env; - inherit (dwarf-fortress) exe; stdenv_shell = "${stdenv.shell}"; cp = "${coreutils}/bin/cp"; rm = "${coreutils}/bin/rm"; diff --git a/pkgs/kde/plasma/kinfocenter/default.nix b/pkgs/kde/plasma/kinfocenter/default.nix index 8911e77cf4522..ce85b92bfc121 100644 --- a/pkgs/kde/plasma/kinfocenter/default.nix +++ b/pkgs/kde/plasma/kinfocenter/default.nix @@ -10,7 +10,7 @@ pciutils, pulseaudio, qttools, - substituteAll, + replaceVars, systemsettings, util-linux, vulkan-tools, @@ -40,9 +40,10 @@ mkKdeDerivation { patches = [ # fwupdmgr is provided through NixOS' module - (substituteAll ( + (replaceVars ./0001-tool-paths.patch ( { - src = ./0001-tool-paths.patch; + # @QtBinariesDir@ only appears in the *removed* lines of the diff + QtBinariesDir = null; } // tools )) diff --git a/pkgs/kde/plasma/plasma-workspace/default.nix b/pkgs/kde/plasma/plasma-workspace/default.nix index 6225f7c3b77cf..6aa092b2a757a 100644 --- a/pkgs/kde/plasma/plasma-workspace/default.nix +++ b/pkgs/kde/plasma/plasma-workspace/default.nix @@ -1,7 +1,7 @@ { lib, mkKdeDerivation, - substituteAll, + replaceVars, dbus, fontconfig, xorg, @@ -22,8 +22,7 @@ mkKdeDerivation { pname = "plasma-workspace"; patches = [ - (substituteAll { - src = ./dependency-paths.patch; + (replaceVars ./dependency-paths.patch { dbusSend = lib.getExe' dbus "dbus-send"; fcMatch = lib.getExe' fontconfig "fc-match"; lsof = lib.getExe lsof; @@ -31,6 +30,8 @@ mkKdeDerivation { xmessage = lib.getExe xorg.xmessage; xrdb = lib.getExe xorg.xrdb; xsetroot = lib.getExe xorg.xsetroot; + # @QtBinariesDir@ only appears in the *removed* lines of the diff + QtBinariesDir = null; }) ]; diff --git a/pkgs/os-specific/linux/udisks/2-default.nix b/pkgs/os-specific/linux/udisks/2-default.nix index 9672e77615422..c3eac48f118fc 100644 --- a/pkgs/os-specific/linux/udisks/2-default.nix +++ b/pkgs/os-specific/linux/udisks/2-default.nix @@ -2,7 +2,7 @@ lib, stdenv, fetchFromGitHub, - substituteAll, + replaceVars, pkg-config, gnused, autoreconfHook, @@ -55,20 +55,15 @@ stdenv.mkDerivation rec { ] ++ lib.optional (stdenv.hostPlatform == stdenv.buildPlatform) "devdoc"; patches = [ - (substituteAll { - src = ./fix-paths.patch; - bash = "${bash}/bin/bash"; + (replaceVars ./fix-paths.patch { false = "${coreutils}/bin/false"; mdadm = "${mdadm}/bin/mdadm"; - mkswap = "${util-linux}/bin/mkswap"; sed = "${gnused}/bin/sed"; sh = "${bash}/bin/sh"; sleep = "${coreutils}/bin/sleep"; - swapon = "${util-linux}/bin/swapon"; true = "${coreutils}/bin/true"; }) - (substituteAll { - src = ./force-path.patch; + (replaceVars ./force-path.patch { path = lib.makeBinPath [ btrfs-progs coreutils diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 23f28b18597da..05c8a4f89acbb 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -5,7 +5,7 @@ fetchFromGitHub, fetchPypi, python313, - substituteAll, + replaceVars, ffmpeg-headless, inetutils, nixosTests, @@ -440,8 +440,7 @@ python.pkgs.buildPythonApplication rec { ./patches/static-follow-symlinks.patch # Patch path to ffmpeg binary - (substituteAll { - src = ./patches/ffmpeg-path.patch; + (replaceVars ./patches/ffmpeg-path.patch { ffmpeg = "${lib.getExe ffmpeg-headless}"; }) ]; diff --git a/pkgs/tools/inputmethods/ibus/default.nix b/pkgs/tools/inputmethods/ibus/default.nix index d3161f748743d..8e2f0bfbbc807 100644 --- a/pkgs/tools/inputmethods/ibus/default.nix +++ b/pkgs/tools/inputmethods/ibus/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, - substituteAll, + replaceVars, fetchFromGitHub, autoreconfHook, gettext, @@ -71,10 +71,15 @@ stdenv.mkDerivation rec { }; patches = [ - (substituteAll { - src = ./fix-paths.patch; + (replaceVars ./fix-paths.patch { pythonInterpreter = python3Runtime.interpreter; pythonSitePackages = python3.sitePackages; + # patch context + prefix = null; + datarootdir = null; + localedir = null; + # removed line only + PYTHON = null; }) ./build-without-dbus-launch.patch ]; diff --git a/pkgs/tools/misc/ckb-next/default.nix b/pkgs/tools/misc/ckb-next/default.nix index f33ada649a344..9f3daa919e0f6 100644 --- a/pkgs/tools/misc/ckb-next/default.nix +++ b/pkgs/tools/misc/ckb-next/default.nix @@ -2,7 +2,7 @@ lib, wrapQtAppsHook, fetchFromGitHub, - substituteAll, + replaceVars, udev, stdenv, pkg-config, @@ -57,9 +57,7 @@ stdenv.mkDerivation rec { patches = [ ./install-dirs.patch - (substituteAll { - name = "ckb-next-modprobe.patch"; - src = ./modprobe.patch; + (replaceVars ./modprobe.patch { inherit kmod; }) ]; diff --git a/pkgs/tools/networking/networkmanager/default.nix b/pkgs/tools/networking/networkmanager/default.nix index fa91b2c64dca6..bdb0cf2a76592 100644 --- a/pkgs/tools/networking/networkmanager/default.nix +++ b/pkgs/tools/networking/networkmanager/default.nix @@ -1,7 +1,7 @@ { lib , stdenv , fetchurl -, substituteAll +, replaceVars , gettext , pkg-config , dbus @@ -122,10 +122,11 @@ stdenv.mkDerivation rec { ]; patches = [ - (substituteAll { - src = ./fix-paths.patch; - inherit iputils openconnect ethtool gnused systemd; + (replaceVars ./fix-paths.patch { + inherit iputils openconnect ethtool gnused; inherit runtimeShell; + # patch context + OUTPUT = null; }) # Meson does not support using different directories during build and From 97c880aa78d4d6d37314069ad9287313b7b50e99 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sun, 9 Feb 2025 11:50:20 +0100 Subject: [PATCH 249/343] gjs: mark unsupported on static --- pkgs/by-name/gj/gjs/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/gj/gjs/package.nix b/pkgs/by-name/gj/gjs/package.nix index 55342995339dd..367396d89431e 100644 --- a/pkgs/by-name/gj/gjs/package.nix +++ b/pkgs/by-name/gj/gjs/package.nix @@ -166,6 +166,6 @@ stdenv.mkDerivation (finalAttrs: { license = licenses.lgpl2Plus; mainProgram = "gjs"; maintainers = teams.gnome.members; - platforms = platforms.unix; + inherit (gobject-introspection.meta) platforms badPlatforms; }; }) From 42eb935d1e81ed97ce0420647edf2b765be09ee5 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sun, 9 Feb 2025 11:50:30 +0100 Subject: [PATCH 250/343] glib-networking: mark unsupported on static --- pkgs/by-name/gl/glib-networking/package.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/by-name/gl/glib-networking/package.nix b/pkgs/by-name/gl/glib-networking/package.nix index dd5b234d3dbee..13bf9c1b5b82a 100644 --- a/pkgs/by-name/gl/glib-networking/package.nix +++ b/pkgs/by-name/gl/glib-networking/package.nix @@ -96,5 +96,9 @@ stdenv.mkDerivation rec { license = licenses.lgpl21Plus; maintainers = teams.gnome.members; platforms = platforms.unix; + badPlatforms = [ + # GIO shared modules are mandatory. + lib.systems.inspect.platformPatterns.isStatic + ]; }; } From 2e1dc0c979600d269690483fd53e73737c089490 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sun, 9 Feb 2025 11:48:54 +0100 Subject: [PATCH 251/343] dconf: mark unsupported on static --- pkgs/by-name/dc/dconf/package.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/by-name/dc/dconf/package.nix b/pkgs/by-name/dc/dconf/package.nix index e98add24382e2..0984e2d5eed31 100644 --- a/pkgs/by-name/dc/dconf/package.nix +++ b/pkgs/by-name/dc/dconf/package.nix @@ -97,6 +97,10 @@ stdenv.mkDerivation rec { homepage = "https://gitlab.gnome.org/GNOME/dconf"; license = licenses.lgpl21Plus; platforms = platforms.unix; + badPlatforms = [ + # Mandatory libdconfsettings shared library. + lib.systems.inspect.platformPatterns.isStatic + ]; maintainers = teams.gnome.members; mainProgram = "dconf"; }; From 160c79845e7ace59f2c6f3efc7f29f8684be341f Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sun, 9 Feb 2025 11:49:17 +0100 Subject: [PATCH 252/343] wrapGAppsNoGuiHook: only use dconf if available Better have as much as possible working than an eval failure. --- pkgs/build-support/setup-hooks/wrap-gapps-hook/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/build-support/setup-hooks/wrap-gapps-hook/default.nix b/pkgs/build-support/setup-hooks/wrap-gapps-hook/default.nix index df134ddd63ccc..0ff6305fe5ded 100644 --- a/pkgs/build-support/setup-hooks/wrap-gapps-hook/default.nix +++ b/pkgs/build-support/setup-hooks/wrap-gapps-hook/default.nix @@ -8,6 +8,7 @@ gtk3, librsvg, dconf, + withDconf ? !stdenv.targetPlatform.isDarwin && lib.meta.availableOn stdenv.targetPlatform dconf, callPackage, wrapGAppsHook3, targetPackages, @@ -41,7 +42,7 @@ makeSetupHook { # TODO: remove this, packages should depend on GTK explicitly. gtk3 ] - ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ + ++ lib.optionals withDconf [ # It is highly probable that a program will use GSettings, # at minimum through GTK file chooser dialogue. # Let’s add a GIO module for “dconf” GSettings backend From 87adf3ef9f29f096f9571ed806203c2806fdd638 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sun, 9 Feb 2025 11:51:22 +0100 Subject: [PATCH 253/343] ostree: fix static --- pkgs/by-name/os/ostree/package.nix | 32 ++++++++++++++++++++---------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/pkgs/by-name/os/ostree/package.nix b/pkgs/by-name/os/ostree/package.nix index bab231271d53d..b6d1f6edaa378 100644 --- a/pkgs/by-name/os/ostree/package.nix +++ b/pkgs/by-name/os/ostree/package.nix @@ -3,17 +3,13 @@ , fetchurl , pkg-config , gtk-doc -, gobject-introspection -, gjs , nixosTests , pkgsCross , curl , glib -, systemd , xz , e2fsprogs , libsoup_2_4 -, glib-networking , wrapGAppsNoGuiHook , gpgme , which @@ -33,10 +29,19 @@ , docbook-xsl-nons , docbook_xml_dtd_42 , python3 - - # Optional ComposeFS support +, buildPackages , withComposefs ? false , composefs +, withGjs ? lib.meta.availableOn stdenv.hostPlatform gjs +, gjs +, withGlibNetworking ? lib.meta.availableOn stdenv.hostPlatform glib-networking +, glib-networking +, withIntrospection ? + lib.meta.availableOn stdenv.hostPlatform gobject-introspection + && stdenv.hostPlatform.emulatorAvailable buildPackages +, gobject-introspection +, withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd +, systemd }: let @@ -60,8 +65,8 @@ in stdenv.mkDerivation rec { automake libtool pkg-config + glib gtk-doc - gobject-introspection which makeWrapper bison @@ -69,15 +74,15 @@ in stdenv.mkDerivation rec { docbook-xsl-nons docbook_xml_dtd_42 wrapGAppsNoGuiHook + ] ++ lib.optionals withIntrospection [ + gobject-introspection ]; buildInputs = [ curl glib - systemd e2fsprogs libsoup_2_4 - glib-networking gpgme fuse3 libselinux @@ -90,9 +95,14 @@ in stdenv.mkDerivation rec { # for installed tests testPython - gjs ] ++ lib.optionals withComposefs [ (lib.getDev composefs) + ] ++ lib.optionals withGjs [ + gjs + ] ++ lib.optionals withGlibNetworking [ + glib-networking + ] ++ lib.optionals withSystemd [ + systemd ]; enableParallelBuilding = true; @@ -125,7 +135,7 @@ in stdenv.mkDerivation rec { (placeholder "out") gobject-introspection ]; - in '' + in lib.optionalString withIntrospection '' for test in $installedTests/libexec/installed-tests/libostree/*.js; do wrapProgram "$test" --prefix GI_TYPELIB_PATH : "${typelibPath}" done From 8f6d2b14efe41b6bbed6be180d4487ace1c84bb5 Mon Sep 17 00:00:00 2001 From: Emily Date: Tue, 11 Feb 2025 00:37:39 +0000 Subject: [PATCH 254/343] apple-sdk_{11,12,13,14}: use Wayback Machine URLs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Apple like to remove old minor releases of the SDK when bumping to a new one. Our current 15.0 SDK is already gone. Since these are all the last minor version of their major version, they’re probably not at risk of imminent deletion, but given their general practices it makes sense to guard against, especially as we can’t be sure ahead of time what the last minor version will be. --- pkgs/by-name/ap/apple-sdk/metadata/versions.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ap/apple-sdk/metadata/versions.json b/pkgs/by-name/ap/apple-sdk/metadata/versions.json index 5a444c2c4eaa0..153b31d39afad 100644 --- a/pkgs/by-name/ap/apple-sdk/metadata/versions.json +++ b/pkgs/by-name/ap/apple-sdk/metadata/versions.json @@ -1,21 +1,21 @@ { "11": { - "url": "https://swcdn.apple.com/content/downloads/02/62/071-54303-A_EU2CL1YVT7/943i95dpeyi2ghlnj2mgyq3t202t5gf18b/CLTools_macOSNMOS_SDK.pkg", + "url": "https://web.archive.org/web/20250210235110/https://swcdn.apple.com/content/downloads/02/62/071-54303-A_EU2CL1YVT7/943i95dpeyi2ghlnj2mgyq3t202t5gf18b/CLTools_macOSNMOS_SDK.pkg", "version": "11.3", "hash": "sha256-/go8utcx3jprf6c8V/DUbXwsmNYSFchOAai1OaJs3Bg=" }, "12": { - "url": "https://swcdn.apple.com/content/downloads/24/42/002-83793-A_74JRE8GVAT/rlnkct919wgc5c0pjq986z5bb9h62uvni2/CLTools_macOSNMOS_SDK.pkg", + "url": "https://web.archive.org/web/20250210235341/https://swcdn.apple.com/content/downloads/24/42/002-83793-A_74JRE8GVAT/rlnkct919wgc5c0pjq986z5bb9h62uvni2/CLTools_macOSNMOS_SDK.pkg", "version": "12.3", "hash": "sha256-qG21ssNUmkqxPLTXALGP2N/RBHu8NMlI1dWvGlV+Wm8=" }, "13": { - "url": "https://swcdn.apple.com/content/downloads/15/62/032-84673-A_7A1TG1RF8Z/xpc8q44ggn2pkn82iwr0fi1zeb9cxi8ath/CLTools_macOSNMOS_SDK.pkg", + "url": "https://web.archive.org/web/20250210235949/https://swcdn.apple.com/content/downloads/15/62/032-84673-A_7A1TG1RF8Z/xpc8q44ggn2pkn82iwr0fi1zeb9cxi8ath/CLTools_macOSNMOS_SDK.pkg", "version": "13.3", "hash": "sha256-zZ4pbgoXunLGwdYDemxOfyH4CE5WGfMy2s5jN+0q4B4=" }, "14": { - "url": "https://swcdn.apple.com/content/downloads/14/48/052-59890-A_I0F5YGAY0Y/p9n40hio7892gou31o1v031ng6fnm9sb3c/CLTools_macOSNMOS_SDK.pkg", + "url": "https://web.archive.org/web/20250211001355/https://swcdn.apple.com/content/downloads/14/48/052-59890-A_I0F5YGAY0Y/p9n40hio7892gou31o1v031ng6fnm9sb3c/CLTools_macOSNMOS_SDK.pkg", "version": "14.4", "hash": "sha256-QozDiwY0Czc0g45vPD7G4v4Ra+3DujCJbSads3fJjjM=" }, From e8ad14c5a2c745eadfa5add729d11846ec96f3a3 Mon Sep 17 00:00:00 2001 From: Emily Date: Tue, 11 Feb 2025 00:51:10 +0000 Subject: [PATCH 255/343] apple-sdk_15: 15.0 -> 15.2 --- .../metadata/apple-oss-lockfile.json | 78 +++++++++---------- .../ap/apple-sdk/metadata/versions.json | 6 +- 2 files changed, 42 insertions(+), 42 deletions(-) diff --git a/pkgs/by-name/ap/apple-sdk/metadata/apple-oss-lockfile.json b/pkgs/by-name/ap/apple-sdk/metadata/apple-oss-lockfile.json index e68c2643ab7c6..5157b58ce3df4 100644 --- a/pkgs/by-name/ap/apple-sdk/metadata/apple-oss-lockfile.json +++ b/pkgs/by-name/ap/apple-sdk/metadata/apple-oss-lockfile.json @@ -711,14 +711,14 @@ "version": "10063.101.15" } }, - "15.0": { + "15.2": { "CarbonHeaders": { "hash": "sha256-nIPXnLr21yVnpBhx9K5q3l/nPARA6JL/dED08MeyhP8=", "version": "18.1" }, "CommonCrypto": { - "hash": "sha256-qwQEFoycAw+YLwqpZgJB1Ppg8mrWFnRPDj4I5f2Ggns=", - "version": "600032" + "hash": "sha256-+qAwL6+s7di9cX/qXtapLkjCFoDuZaSYltRJEG4qekM=", + "version": "600033.60.1" }, "IOAudioFamily": { "hash": "sha256-VSk3jvsITJugtL67Qt0m4qJ879i7Fj6B/NGBFVCwpiU=", @@ -761,12 +761,12 @@ "version": "598" }, "IOHIDFamily": { - "hash": "sha256-4hIztdbKpoC0VrRVwZkoCZuByyTGw02lrrcFDBAXyko=", - "version": "2102.0.6" + "hash": "sha256-utWAwmn9jss/6fc4flDHXeJR5ZBymO0ZFbDFIFVBnt4=", + "version": "2104.61.1" }, "IOKitUser": { - "hash": "sha256-ytMma1ft1fKjCvP0SKdwnVonPEixzthoCR7ML94/pLE=", - "version": "100140.0.6" + "hash": "sha256-vfz/kLZlVyoHKOlrNdNrf2HcUOB6bY+mpbCvEEg2sus=", + "version": "100140.60.14" }, "IONetworkingFamily": { "hash": "sha256-gZ7Dkk4Iu7AV9K2ioqSeJ1W7bTNxv77bmT18iv3ljLg=", @@ -777,16 +777,16 @@ "version": "93" }, "IOStorageFamily": { - "hash": "sha256-W9H3jzaXLvAb0cziHBpNo5Iom7c7H5bg4MxQIhIsefc=", - "version": "317" + "hash": "sha256-tjzvlJYVjSTG7oF3AhHgCASKax1fYjOBAxcsrKh/urY=", + "version": "317.40.2" }, "IOUSBFamily": { "hash": "sha256-Z0E3TfKP49toYo1Fo9kElRap8CZ+mVDHy5RIexgJTpA=", "version": "630.4.5" }, "Libc": { - "hash": "sha256-1t+e8DQUmsrmr1f6QUU4uUm/el3G7EOL+vUO28srPAM=", - "version": "1669.0.4" + "hash": "sha256-/J1Oawa+cMbcAlMlpr6ce32KQQp2lMGnfbRi/2Oc1cY=", + "version": "1669.60.4" }, "Libinfo": { "hash": "sha256-D7JMCakQVCQ9j2zUHQSGB8zZcHD6azwYY3bsJU0JfEE=", @@ -797,8 +797,8 @@ "version": "2026" }, "Libnotify": { - "hash": "sha256-qYox9iQUnU0AGVfPK2p61/2zlNAJmixCE5K7WojMQ3I=", - "version": "327.0.5" + "hash": "sha256-XwVB4sYXPLAHDuLv8mxAWlC1ia17V4cf73DEJDDm4ck=", + "version": "327.60.1" }, "Librpcsvc": { "hash": "sha256-UWYdCQ9QsBqwM01bWr+igINAHSdSluB/FrOclC5AjTI=", @@ -813,68 +813,68 @@ "version": "146" }, "Security": { - "hash": "sha256-ptS/IESkJmbcO3H+v6mmN2jvH2mfLXi+fMQfGCLSt7M=", - "version": "61439.1.1" + "hash": "sha256-sRpFQyMk3x4kRthXpqeAnfQ9dE5RMxiSFUiUKRCneck=", + "version": "61439.60.117" }, "architecture": { "hash": "sha256-PRNUrhzSOrwmxSPkKmV0LV7yEIik65sdkfKdBqcwFhU=", "version": "282" }, "configd": { - "hash": "sha256-Wks7d0Kere6YYPJar593ZSC5bbkyKcaTxrHK6Ah6u0c=", - "version": "1345" + "hash": "sha256-xRaEzq/OOMBi7lvi2bV2/ObN5JJJ5vcFy8DGHLItUWM=", + "version": "1351" }, "copyfile": { - "hash": "sha256-lIhl5sr1gewIHkh10hD+H/I7MVPzlHlONGRMOO7OZuA=", - "version": "213" + "hash": "sha256-Vz1fo4p2b6S8xfyDPu1FNgMkH1aX0tkpXCZkdzkRdq0=", + "version": "213.40.2" }, "dtrace": { - "hash": "sha256-S0gI+9eTcuZkh0FWmTmZ+AhZ4qoSdnUb5GTp1melk9A=", - "version": "409" + "hash": "sha256-iNEZyxK3DmEwO3gzrfvCaVZSEuuOMQm5IG/6FodPNdI=", + "version": "411" }, "dyld": { - "hash": "sha256-q0GN5+4mW8Yxer0XxhlLK7JRM4JDoxeSFDRzbZ738lw=", - "version": "1231.3" + "hash": "sha256-DDhV7X81nhd3oeJuICEvF8FU43yE/afQ/LYgDNtXswA=", + "version": "1241.17" }, "eap8021x": { "hash": "sha256-2FdEb76KBbCAl2iwly4c1Xstar53O8qgGdN/3WXO23U=", "version": "364" }, "hfs": { - "hash": "sha256-utmIFAW7Gdbbj71oZnHSaTUse9cIN3ZSfXyFTmuxnc4=", - "version": "672" + "hash": "sha256-isTLSBDxh12W10I5KY6O6SsygqnOvqJ0TfdWIKSK3pM=", + "version": "677.60.1" }, "launchd": { "hash": "sha256-8mW9bnuHmRXCx9py8Wy28C5b2QPICW0rlAps5njYa00=", "version": "842.1.4" }, "libclosure": { - "hash": "sha256-21OuQearKTN75OgHN+RPLR1VGdf3ZffPYpV51Kj6LYE=", - "version": "94" + "hash": "sha256-I0PKQFnoJVRMA7H3yT+inHS0454/FXHhQB6nwmHFvFs=", + "version": "95" }, "libdispatch": { - "hash": "sha256-q2oyaEdt8clVLjLwBjAAvLKodpuYThscK3VcQotCmIM=", - "version": "1502.0.1" + "hash": "sha256-f2ex/53OFeSR5A0nMapxC6AocqBSweecNtEhp4bWjhE=", + "version": "1504.60.7" }, "libmalloc": { - "hash": "sha256-tFaYSvebk4uIIPu/46eMp6QnwiO/SmShjUoFnJjnmsc=", - "version": "646.0.13" + "hash": "sha256-Rw/9s7yY3qPtKfDhP+p+0z+aaCsxgwvdUyRG2V1N6D8=", + "version": "657.60.21" }, "libplatform": { - "hash": "sha256-U3TRUGBxuspEPfzdsd+53Kh8E9GmceMhsxxXuQbcdcc=", - "version": "340" + "hash": "sha256-o/W1pQ9yGTE8HQlGcggM+XiJbEyqgc/s0uiY3+yBtnA=", + "version": "340.60.2" }, "libpthread": { "hash": "sha256-eYHDAt2wNk7hJZJxsC7Y9w4ASKdexidu613kPo7TAKs=", "version": "535" }, "mDNSResponder": { - "hash": "sha256-w+Pw/VsHl8hkDiS7EEEYKp9P2NVwu8NSVPSn2U15vHM=", - "version": "2559.1.1" + "hash": "sha256-mDyY/2S4EHbGh02J6VWZVxhNXXZmWGX+NjUjPfMZgZA=", + "version": "2559.60.39.0.1" }, "objc4": { - "hash": "sha256-Z9UAm/hjjO2K0c7ag/ws4e/Y2nKOWnObPgp4HUZe+W4=", - "version": "928.2" + "hash": "sha256-uBFS5extMQkXAXJfPtPlBYAQpz+zsRHQnEaLpDOcYGM=", + "version": "928.3" }, "ppp": { "hash": "sha256-8+QUA79sHf85yvGSPE9qCmGsrZDT3NZnbgZVroJw/Hg=", @@ -885,8 +885,8 @@ "version": "75" }, "xnu": { - "hash": "sha256-9cFPrWtTpCb02YrvKX1KWoExoH2VjPdOBU4dscmKL4A=", - "version": "11215.1.10" + "hash": "sha256-o8CxHvM2OXiAWJmnFe5ERQYnrNyJ+Bpdb9H0sjd6L10=", + "version": "11215.61.5" } } } diff --git a/pkgs/by-name/ap/apple-sdk/metadata/versions.json b/pkgs/by-name/ap/apple-sdk/metadata/versions.json index 153b31d39afad..b5f2dc7f5a19b 100644 --- a/pkgs/by-name/ap/apple-sdk/metadata/versions.json +++ b/pkgs/by-name/ap/apple-sdk/metadata/versions.json @@ -20,8 +20,8 @@ "hash": "sha256-QozDiwY0Czc0g45vPD7G4v4Ra+3DujCJbSads3fJjjM=" }, "15": { - "url": "https://swcdn.apple.com/content/downloads/33/46/042-32691-A_3MH7S3118O/3dblccqo9ws17dc5lk3hojfbt3s74q0ql6/CLTools_macOSNMOS_SDK.pkg", - "version": "15.0", - "hash": "sha256-JhaAPyfX46D+9sematdAYAORw40JP3xvleWRz7Hj/1s=" + "url": "https://web.archive.org/web/20250210234739/https://swcdn.apple.com/content/downloads/36/33/072-44426-A_G1AII30AST/ddbss9h6gse6a32rg6luosbrm6vgniu033/CLTools_macOSNMOS_SDK.pkg", + "version": "15.2", + "hash": "sha256-OP5Ah/JnSZ6sD42BD5vGDmikgFzjsfFBmz1hvQD1dOI=" } } From d5a73874afb7378343d7d1bf82af542d826518c2 Mon Sep 17 00:00:00 2001 From: Emily Date: Tue, 11 Feb 2025 01:11:27 +0000 Subject: [PATCH 256/343] darwin.AvailabilityVersions: 143.3 -> 143.6 --- pkgs/os-specific/darwin/apple-source-releases/versions.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/darwin/apple-source-releases/versions.json b/pkgs/os-specific/darwin/apple-source-releases/versions.json index 8a4a26ba956e6..fc8bbdb16aa61 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/versions.json +++ b/pkgs/os-specific/darwin/apple-source-releases/versions.json @@ -1,7 +1,7 @@ { "AvailabilityVersions": { - "hash": "sha256-CmFrmbk3XJXhGStc+prNoFTDJiFu4n2wVP3OvMfQwOU=", - "version": "143.3" + "hash": "sha256-PT54BPSRkQiIHrpxZCdjo6XvNuWxESabLndCBYjulfs=", + "version": "143.6" }, "Csu": { "hash": "sha256-l8RI8aiin7ovZuoDh54thDmd/b502w+dtjN5ZoISZBg=", From 072f8e0c4d366343ae3baf7eba9bedd2b90b2731 Mon Sep 17 00:00:00 2001 From: Emily Date: Tue, 11 Feb 2025 01:11:27 +0000 Subject: [PATCH 257/343] darwin.ICU: 74221 -> 74222.203 --- pkgs/os-specific/darwin/apple-source-releases/versions.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/darwin/apple-source-releases/versions.json b/pkgs/os-specific/darwin/apple-source-releases/versions.json index fc8bbdb16aa61..3c0fe6ea508f6 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/versions.json +++ b/pkgs/os-specific/darwin/apple-source-releases/versions.json @@ -8,8 +8,8 @@ "version": "88" }, "ICU": { - "hash": "sha256-CvpMLFNCEQ05t3nkzDyA9nsm3cmRgXG/QxbyiLpSpIs=", - "version": "74221" + "hash": "sha256-7ImBX4SlrFaLnHdQ4bm4F8q9IpHhQMaeVOO6pnnhyzQ=", + "version": "74222.203" }, "IOKitTools": { "hash": "sha256-Oknsvzn4nv77WU7f0WPS446iwR2BM2q4iw46r/qctAE=", From 596efc83794acb0fcf2204365ace8b84a112f298 Mon Sep 17 00:00:00 2001 From: Lin Jian Date: Tue, 11 Feb 2025 12:17:39 +0800 Subject: [PATCH 258/343] emacsPackages.cask: remove strictDeps It is true by default[1] now. [1]: https://github.com/NixOS/nixpkgs/pull/379256 --- .../emacs/elisp-packages/manual-packages/cask/package.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/cask/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/cask/package.nix index 1ec482d5d794f..a344978ebf331 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/cask/package.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/cask/package.nix @@ -45,8 +45,6 @@ melpaBuild (finalAttrs: { shut-up ]; - strictDeps = true; - # use melpaVersion so that it works for unstable releases too postPatch = '' lispdir=$out/share/emacs/site-lisp/elpa/cask-${finalAttrs.melpaVersion} \ From 6abb29dfed9e481f32c0ebaa0dd971208c84b870 Mon Sep 17 00:00:00 2001 From: Lin Jian Date: Tue, 11 Feb 2025 12:18:32 +0800 Subject: [PATCH 259/343] emacsPackages.notdeft: remove strictDeps It is true by default[1] now. [1]: https://github.com/NixOS/nixpkgs/pull/379256 --- .../emacs/elisp-packages/manual-packages/notdeft/package.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/notdeft/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/notdeft/package.nix index 055c09a05f610..1e9a634f447fe 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/notdeft/package.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/notdeft/package.nix @@ -42,8 +42,6 @@ melpaBuild { ${lib.optionalString withIvy ''"extras/notdeft-ivy.el"''}) ''; - strictDeps = true; - nativeBuildInputs = [ pkg-config ]; buildInputs = [ From 6a2d3a9b146c6bf471c616257e968e939ea61d2f Mon Sep 17 00:00:00 2001 From: Lin Jian Date: Tue, 11 Feb 2025 12:21:54 +0800 Subject: [PATCH 260/343] Revert "emacsPackages.dap-mode: fix build" This reverts commit fe5312cd441714a518c3585297ba0f1915e899b8. To make this fix reach users sooner, we revert it on the staging-next branch and reapply it to the master branch. --- .../emacs/elisp-packages/melpa-packages.nix | 21 +++++++------------ 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix index 62f476dc5440d..d3e294d70b162 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix @@ -982,19 +982,14 @@ let cssh = ignoreCompilationError super.cssh; # elisp error - dap-mode = super.dap-mode.overrideAttrs ( - finalAttrs: previousAttrs: { - # empty file causing native-compiler-error-empty-byte - preBuild = - if lib.versionOlder finalAttrs.version "20250131.1624" then - '' - rm --verbose dapui.el - '' - + previousAttrs.preBuild or "" - else - previousAttrs.preBuild or null; - } - ); + dap-mode = super.dap-mode.overrideAttrs (old: { + # empty file causing native-compiler-error-empty-byte + preBuild = + '' + rm --verbose dapui.el + '' + + old.preBuild or ""; + }); db-pg = ignoreCompilationError super.db-pg; # elisp error From 2339b13d54b58a9435848c9b641d7f60a4a5bb0a Mon Sep 17 00:00:00 2001 From: Nadia Holmquist Pedersen Date: Mon, 10 Feb 2025 18:10:46 +0100 Subject: [PATCH 261/343] qt6.qtbase: unconditionally enable Vulkan and libGL support --- .../libraries/qt-6/modules/qtbase/default.nix | 20 +++++++------------ 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/pkgs/development/libraries/qt-6/modules/qtbase/default.nix b/pkgs/development/libraries/qt-6/modules/qtbase/default.nix index e5ae77bd522c7..2fec3fff2a6c1 100644 --- a/pkgs/development/libraries/qt-6/modules/qtbase/default.nix +++ b/pkgs/development/libraries/qt-6/modules/qtbase/default.nix @@ -64,7 +64,9 @@ at-spi2-core, unixODBC, unixODBCDrivers, + libGL, # darwin + moltenvk, moveBuildTree, darwinVersionInputs, xcbuild, @@ -79,8 +81,6 @@ withLibinput ? false, libinput, # options - libGLSupported ? stdenv.hostPlatform.isLinux, - libGL, qttranslations ? null, fetchpatch, }: @@ -100,6 +100,9 @@ stdenv.mkDerivation rec { openssl sqlite zlib + libGL + vulkan-headers + vulkan-loader # Text rendering harfbuzz icu @@ -133,8 +136,6 @@ stdenv.mkDerivation rec { libselinux libsepol lttng-ust - vulkan-headers - vulkan-loader libthai libdrm libdatrie @@ -160,20 +161,13 @@ stdenv.mkDerivation rec { xorg.xcbutilcursor libepoxy ] - ++ lib.optionals libGLSupported [ - libGL - ] - ++ lib.optionals stdenv.hostPlatform.isMinGW [ - vulkan-headers - vulkan-loader - ] ++ lib.optional (cups != null && lib.meta.availableOn stdenv.hostPlatform cups) cups; buildInputs = lib.optionals (lib.meta.availableOn stdenv.hostPlatform at-spi2-core) [ at-spi2-core ] - ++ lib.optionals stdenv.hostPlatform.isDarwin darwinVersionInputs + ++ lib.optionals stdenv.hostPlatform.isDarwin (darwinVersionInputs ++ [ moltenvk ]) ++ lib.optional withGtk3 gtk3 ++ lib.optional withLibinput libinput ++ lib.optional (libmysqlclient != null && !stdenv.hostPlatform.isMinGW) libmysqlclient @@ -282,11 +276,11 @@ stdenv.mkDerivation rec { "-DQT_FEATURE_libproxy=ON" "-DQT_FEATURE_system_sqlite=ON" "-DQT_FEATURE_openssl_linked=ON" + "-DQT_FEATURE_vulkan=ON" ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ "-DQT_FEATURE_sctp=ON" "-DQT_FEATURE_journald=${if systemdSupport then "ON" else "OFF"}" - "-DQT_FEATURE_vulkan=ON" ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "-DQT_FEATURE_rpath=OFF" From 4a2271743367814d072f955bde2406925658cd8d Mon Sep 17 00:00:00 2001 From: K900 Date: Mon, 10 Feb 2025 22:18:52 +0300 Subject: [PATCH 262/343] libical: 3.0.18 -> 3.0.19 --- pkgs/by-name/li/libical/fix-cmake.patch | 30 +++++++++++++++++++++++++ pkgs/by-name/li/libical/package.nix | 20 +++++++---------- 2 files changed, 38 insertions(+), 12 deletions(-) create mode 100644 pkgs/by-name/li/libical/fix-cmake.patch diff --git a/pkgs/by-name/li/libical/fix-cmake.patch b/pkgs/by-name/li/libical/fix-cmake.patch new file mode 100644 index 0000000000000..f0e3d002feb76 --- /dev/null +++ b/pkgs/by-name/li/libical/fix-cmake.patch @@ -0,0 +1,30 @@ +diff --git a/src/test/libical-glib/CMakeLists.txt b/src/test/libical-glib/CMakeLists.txt +index 01a0894a1..d7d2af5bb 100644 +--- a/src/test/libical-glib/CMakeLists.txt ++++ b/src/test/libical-glib/CMakeLists.txt +@@ -36,19 +36,19 @@ list( + + if(PYTHON3) + set(GI_TYPELIB_PATH_STR "${PROJECT_BINARY_DIR}/src/libical-glib") +- if(DEFINED GI_TYPELIB_PATH) +- if($ENV{GI_TYPELIB_PATH}) ++ if(DEFINED ENV{GI_TYPELIB_PATH}) ++ if(NOT ENV{GI_TYPELIB_PATH} STREQUAL "") + set(GI_TYPELIB_PATH_STR "${GI_TYPELIB_PATH_STR}:$ENV{GI_TYPELIB_PATH}") + endif() + endif() + set(LIBRARY_PATH_STR "${LIBRARY_OUTPUT_PATH}") +- if(DEFINED LD_LIBRARY_PATH) +- if($ENV{LD_LIBRARY_PATH}) ++ if(DEFINED ENV{LD_LIBRARY_PATH}) ++ if(NOT ENV{LD_LIBRARY_PATH} STREQUAL "") + set(LIBRARY_PATH_STR "${LIBRARY_PATH_STR}:$ENV{LD_LIBRARY_PATH}") + endif() + endif() +- if(DEFINED DYLD_LIBRARY_PATH) +- if($ENV{DYLD_LIBRARY_PATH}) ++ if(DEFINED ENV{DYLD_LIBRARY_PATH}) ++ if(NOT ENV{DYLD_LIBRARY_PATH} STREQUAL "") + set(LIBRARY_PATH_STR "${LIBRARY_PATH_STR}:$ENV{DYLD_LIBRARY_PATH}") + endif() + endif() diff --git a/pkgs/by-name/li/libical/package.nix b/pkgs/by-name/li/libical/package.nix index ef92eddd10114..b3f5a63ab6f1e 100644 --- a/pkgs/by-name/li/libical/package.nix +++ b/pkgs/by-name/li/libical/package.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { pname = "libical"; - version = "3.0.18"; + version = "3.0.19"; outputs = [ "out" @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { owner = "libical"; repo = "libical"; rev = "v${version}"; - sha256 = "sha256-32FNnCybXO67Vtg1LM6miJUaK+r0mlfjxgLQg1LD8Es="; + sha256 = "sha256-ZJXxi1LOZyEpgdcmoK0pe5IA3+l9WY0zLu6Ttzy1QSc="; }; strictDeps = true; @@ -91,18 +91,14 @@ stdenv.mkDerivation rec { # Will appear in 3.1.0 # https://github.com/libical/libical/issues/350 ./respect-env-tzdir.patch - ]; - postPatch = '' - # Fix typo in test env setup - # https://github.com/libical/libical/commit/03c02ced21494413920744a400c638b0cb5d493f - substituteInPlace src/test/libical-glib/CMakeLists.txt \ - --replace-fail "''${CMAKE_BINARY_DIR}/src/libical-glib;\$ENV{GI_TYPELIB_PATH}" "''${CMAKE_BINARY_DIR}/src/libical-glib:\$ENV{GI_TYPELIB_PATH}" \ - --replace-fail "''${LIBRARY_OUTPUT_PATH};\$ENV{LD_LIBRARY_PATH}" "''${LIBRARY_OUTPUT_PATH}:\$ENV{LD_LIBRARY_PATH}" - ''; + # CMake setup fix for tests + # Submitted upstream: https://github.com/libical/libical/pull/885 + # FIXME: remove when merged + ./fix-cmake.patch + ]; - # Using install check so we do not have to manually set - # LD_LIBRARY_PATH and GI_TYPELIB_PATH variables + # Using install check so we do not have to manually set GI_TYPELIB_PATH # Musl does not support TZDIR. doInstallCheck = !stdenv.hostPlatform.isMusl; enableParallelChecking = false; From 21797f9368ca6fc0830560a32bd494dceb2c6253 Mon Sep 17 00:00:00 2001 From: Seth Flynn Date: Tue, 11 Feb 2025 06:57:44 +0000 Subject: [PATCH 263/343] maturin: 1.8.1 -> 1.8.2 Diff: https://github.com/PyO3/maturin/compare/v1.8.1...v1.8.2 Changelog: https://github.com/PyO3/maturin/releases/tag/v1.8.2 --- pkgs/by-name/ma/maturin/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ma/maturin/package.nix b/pkgs/by-name/ma/maturin/package.nix index 24f40f9870824..5f8ae3cdb2d33 100644 --- a/pkgs/by-name/ma/maturin/package.nix +++ b/pkgs/by-name/ma/maturin/package.nix @@ -13,17 +13,17 @@ rustPlatform.buildRustPackage rec { pname = "maturin"; - version = "1.8.1"; + version = "1.8.2"; src = fetchFromGitHub { owner = "PyO3"; repo = "maturin"; rev = "v${version}"; - hash = "sha256-Ix1UTVYJRPTii/LqJQto+und+BrSAIZeHlTA6biysm0="; + hash = "sha256-k4s0kh68kycc8MSVkD64X547mWmFW4UuToDIcZ87OSc="; }; useFetchCargoVendor = true; - cargoHash = "sha256-vgMzl3Kx1OqHSkVdykgwoMn+XNrjg93OmVgDc6I7AV0="; + cargoHash = "sha256-6aLWkphWLScUz6l0RJj9LmNad6aPxLz2iVxXVOXq7pg="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security From 61001472b462eba319151fbbc5e4fb7fc8ca4327 Mon Sep 17 00:00:00 2001 From: K900 Date: Tue, 11 Feb 2025 10:45:59 +0300 Subject: [PATCH 264/343] separateDebugInfo: fix cleanup, refactor a little - cleanup with --ignore-fail-on-non-empty - extract destDir and destFile variables - unnest all the subshells --- .../setup-hooks/separate-debug-info.sh | 28 +++++++++++-------- 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/pkgs/build-support/setup-hooks/separate-debug-info.sh b/pkgs/build-support/setup-hooks/separate-debug-info.sh index 9cec77b9b0cdd..4208aa481d0d0 100644 --- a/pkgs/build-support/setup-hooks/separate-debug-info.sh +++ b/pkgs/build-support/setup-hooks/separate-debug-info.sh @@ -33,21 +33,25 @@ _separateDebugInfo() { # Extract the debug info. echo "separating debug info from $i (build ID $id)" - mkdir -p "$dst/${id:0:2}" + + destDir=$dst/${id:0:2} + destFile=$dst/${id:0:2}/${id:2}.debug + + mkdir -p "$destDir" + + if [ -f "$destFile" ]; then + echo "separate-debug-info: warning: multiple files with build id $id found, overwriting" + fi # This may fail, e.g. if the binary is for a different # architecture than we're building for. (This happens with # firmware blobs in QEMU.) - ( - if [ -f "$dst/${id:0:2}/${id:2}.debug" ] - then - echo "separate-debug-info: warning: multiple files with build id $id found, overwriting" - fi - ( - $OBJCOPY --only-keep-debug "$i" "$dst/${id:0:2}/${id:2}.debug" && - # Also a create a symlink .debug. - ln -sfn ".build-id/${id:0:2}/${id:2}.debug" "$dst/../$(basename "$i")" - ) - ) || rmdir -p "$dst/${id:0:2}" + if $OBJCOPY --only-keep-debug "$i" "$destFile"; then + # If we succeeded, also a create a symlink .debug. + ln -sfn ".build-id/${id:0:2}/${id:2}.debug" "$dst/../$(basename "$i")" + else + # If we failed, try to clean up unnecessary directories + rmdir -p "$dst/${id:0:2}" --ignore-fail-on-non-empty + fi done < <(find "$prefix" -type f -print0 | sort -z) } From c3b1bffd9124d1ef3bc262b5f390c056cdfdebd8 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Tue, 11 Feb 2025 10:01:56 +0000 Subject: [PATCH 265/343] xorg.xkeyboardconfig: 2.43 -> 2.44 Changes: https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/-/blob/xkeyboard-config-2.44/ChangeLog.md --- pkgs/servers/x11/xorg/default.nix | 6 +++--- pkgs/servers/x11/xorg/tarballs.list | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 83a61ee2529d8..3fc2c5b4ae42e 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -3883,11 +3883,11 @@ self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xkeyboardconfig = callPackage ({ stdenv, pkg-config, fetchurl, testers }: stdenv.mkDerivation (finalAttrs: { pname = "xkeyboard-config"; - version = "2.43"; + version = "2.44"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.43.tar.xz"; - sha256 = "00bcs1yj57jbgw1zcilz6f4rgjaj2k6k87m8kpl4x0rar1ig6468"; + url = "mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.44.tar.xz"; + sha256 = "0aillh6pmx5ji5jbqviq007vvg69ahz5832rz941s0xvxqzc7ljl"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index 0c7378869811f..fc4c1026b084a 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -72,7 +72,7 @@ mirror://xorg/individual/app/xwininfo-1.1.6.tar.xz mirror://xorg/individual/app/xwud-1.0.7.tar.xz mirror://xorg/individual/data/xbitmaps-1.1.3.tar.xz mirror://xorg/individual/data/xcursor-themes-1.0.7.tar.xz -mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.43.tar.xz +mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.44.tar.xz mirror://xorg/individual/doc/xorg-docs-1.7.3.tar.xz mirror://xorg/individual/doc/xorg-sgml-doctools-1.12.1.tar.xz mirror://xorg/individual/driver/xf86-input-evdev-2.11.0.tar.xz From 757d2836919966eef06ed5c4af0647a6f2c297f4 Mon Sep 17 00:00:00 2001 From: Antoine du Hamel Date: Tue, 11 Feb 2025 11:45:25 +0100 Subject: [PATCH 266/343] nodejs_22: 22.13.1 -> 22.14.0 --- pkgs/development/web/nodejs/v22.nix | 21 ++------------------- 1 file changed, 2 insertions(+), 19 deletions(-) diff --git a/pkgs/development/web/nodejs/v22.nix b/pkgs/development/web/nodejs/v22.nix index 78a842c395ada..5c0c3f3d72793 100644 --- a/pkgs/development/web/nodejs/v22.nix +++ b/pkgs/development/web/nodejs/v22.nix @@ -8,8 +8,8 @@ let in buildNodejs { inherit enableNpm; - version = "22.13.1"; - sha256 = "cfce282119390f7e0c2220410924428e90dadcb2df1744c0c4a0e7baae387cc2"; + version = "22.14.0"; + sha256 = "c609946bf793b55c7954c26582760808d54c16185d79cb2fb88065e52de21914"; patches = [ ./configure-emulator.patch ./configure-armv6-vfpv2.patch @@ -18,22 +18,5 @@ buildNodejs { ./node-npm-build-npm-package-logic.patch ./use-correct-env-in-tests.patch ./bin-sh-node-run-v22.patch - - # FIXME: remove after a minor point release - (fetchpatch2 { - url = "https://github.com/nodejs/node/commit/49acdc8748fe9fe83bc1b444e24c456dff00ecc5.patch?full_index=1"; - hash = "sha256-iK7bj4KswTeQ9I3jJ22ZPTsvCU8xeGGXEOo43dxg3Mk="; - }) - (fetchpatch2 { - url = "https://github.com/nodejs/node/commit/d0ff34f4b690ad49c86b6df8fd424f39d183e1a6.patch?full_index=1"; - hash = "sha256-ezcCrg7UwK091pqYxXJn4ay9smQwsrYeMO/NBE7VaM8="; - }) - # test-icu-env is failing on ICU 74.2 - # FIXME: remove once https://github.com/nodejs/node/pull/56661 is included in a next release - (fetchpatch2 { - url = "https://github.com/nodejs/node/commit/a364ec1d1cbbd5a6d20ee54d4f8648dd7592ebcd.patch?full_index=1"; - hash = "sha256-EL1NgCBzz5O1spwHgocLm5mkORAiqGFst0N6pc3JvFg="; - revert = true; - }) ]; } From 74cc66d52afc8a11d47614bfa4575b85ffda4c6c Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Tue, 4 Feb 2025 14:52:04 +0100 Subject: [PATCH 267/343] libxmlb: fix static --- pkgs/by-name/li/libxmlb/package.nix | 49 ++++++++++++++++++----------- 1 file changed, 30 insertions(+), 19 deletions(-) diff --git a/pkgs/by-name/li/libxmlb/package.nix b/pkgs/by-name/li/libxmlb/package.nix index 79937718941cc..d814ee010450f 100644 --- a/pkgs/by-name/li/libxmlb/package.nix +++ b/pkgs/by-name/li/libxmlb/package.nix @@ -15,19 +15,26 @@ nixosTests, xz, zstd, + buildPackages, + withIntrospection ? + lib.meta.availableOn stdenv.hostPlatform gobject-introspection + && stdenv.hostPlatform.emulatorAvailable buildPackages, }: stdenv.mkDerivation rec { pname = "libxmlb"; version = "0.3.21"; - outputs = [ - "out" - "lib" - "dev" - "devdoc" - "installedTests" - ]; + outputs = + [ + "out" + "lib" + "dev" + "installedTests" + ] + ++ lib.optionals withIntrospection [ + "devdoc" + ]; src = fetchFromGitHub { owner = "hughsie"; @@ -40,17 +47,20 @@ stdenv.mkDerivation rec { ./installed-tests-path.patch ]; - nativeBuildInputs = [ - docbook_xml_dtd_43 - docbook-xsl-nons - gobject-introspection - gtk-doc - meson - ninja - pkg-config - python3 - shared-mime-info - ]; + nativeBuildInputs = + [ + docbook_xml_dtd_43 + docbook-xsl-nons + meson + ninja + pkg-config + python3 + shared-mime-info + ] + ++ lib.optionals withIntrospection [ + gobject-introspection + gtk-doc + ]; buildInputs = [ glib @@ -60,7 +70,8 @@ stdenv.mkDerivation rec { mesonFlags = [ "--libexecdir=${placeholder "out"}/libexec" - "-Dgtkdoc=true" + (lib.mesonBool "gtkdoc" withIntrospection) + (lib.mesonBool "introspection" withIntrospection) "-Dinstalled_test_prefix=${placeholder "installedTests"}" ]; From 2b1fe000cdadedff0af13492a361369b5d878bc4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 11 Feb 2025 13:00:10 +0000 Subject: [PATCH 268/343] zlib-ng: 2.2.3 -> 2.2.4 --- pkgs/by-name/zl/zlib-ng/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/zl/zlib-ng/package.nix b/pkgs/by-name/zl/zlib-ng/package.nix index 6b80713075de6..70935d20f5194 100644 --- a/pkgs/by-name/zl/zlib-ng/package.nix +++ b/pkgs/by-name/zl/zlib-ng/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "zlib-ng"; - version = "2.2.3"; + version = "2.2.4"; src = fetchFromGitHub { owner = "zlib-ng"; repo = "zlib-ng"; rev = version; - hash = "sha256-22JX7diwhPaAhqErUdFymeSMzEGQkOp7LdBFwCnx5oc="; + hash = "sha256-Khmrhp5qy4vvoQe4WgoogpjWrgcUB/q8zZeqIydthYg="; }; outputs = [ From db43d077d2e149e6fa99394405b8412387fdb421 Mon Sep 17 00:00:00 2001 From: misilelab Date: Tue, 11 Feb 2025 19:54:55 +0900 Subject: [PATCH 269/343] glance: 0.6.4 -> 0.7.1 Signed-off-by: misilelab --- pkgs/by-name/gl/glance/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/gl/glance/package.nix b/pkgs/by-name/gl/glance/package.nix index 2f9f14fbc1172..70690be2f87a4 100644 --- a/pkgs/by-name/gl/glance/package.nix +++ b/pkgs/by-name/gl/glance/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "glance"; - version = "0.6.4"; + version = "0.7.1"; src = fetchFromGitHub { owner = "glanceapp"; repo = "glance"; rev = "v${version}"; - hash = "sha256-L3IBCh4pDeaErxl89s/1yMHoU8dYtRcmqcIgFiyGq2U="; + hash = "sha256-Ef3Kf7rYmkWqOUpde7P46IRs1x/+jMW3lmN13hfTCNs="; }; - vendorHash = "sha256-6PDcUb2Rv+Shqb+wtsit8Yt9RSgN5tz+MeXrujZXDCo="; + vendorHash = "sha256-lURRHlZoxbuW1SXxrxy2BkMndcEllGFmVCB4pXBad8Q="; excludedPackages = [ "scripts/build-and-ship" ]; From c05c515eff3cb57822df6399e923d05b24c4ede7 Mon Sep 17 00:00:00 2001 From: Markus Theil Date: Fri, 10 Jan 2025 18:27:20 +0100 Subject: [PATCH 270/343] openssl_3_4: init at 3.4.1; openssl_3_3: remove Updates OpenSSL 3.x latest to 3.4.1 Security Fixes in 3.4.1: * Fixed RFC7250 handshakes with unauthenticated servers don't abort as expected. ([CVE-2024-12797]) * Fixed timing side-channel in ECDSA signature computation. ([CVE-2024-13176](https://www.openssl.org/news/vulnerabilities.html#CVE-2024-13176)) Release notes: https://github.com/openssl/openssl/blob/openssl-3.4.0/NEWS.md#openssl-34 Some significant changes: * Deprecation of TS_VERIFY_CTX_set_* functions and addition of replacement TS_VERIFY_CTX_set0_* functions with improved semantics * SHAKE-128 and SHAKE-256 implementations have no default digest length anymore. That means these algorithms cannot be used with EVP_DigestFinal/_ex() unless the xoflen param is set before. * An empty renegotiate extension will be used in TLS client hellos instead of the empty renegotiation SCSV, for all connections with a minimum TLS version > 1.0. * Deprecation of SSL_SESSION_get_time(), SSL_SESSION_set_time() and SSL_CTX_flush_sessions() functions in favor of their respective _ex functions which are Y2038-safe on platforms with Y2038-safe time_t Some new features: * Support for directly fetched composite signature algorithms such as RSA-SHA2-256 including new API functions * New options -not_before and -not_after for explicit setting start and end dates of certificates created with the req and x509 apps * Support for attribute certificates * Support for pkeyutl in combination with key encapsulation (e.q. PQC-KEMs): -encap/-decap Signed-off-by: Markus Theil --- .../{3.3 => 3.4}/use-etc-ssl-certs-darwin.patch | 0 .../openssl/{3.3 => 3.4}/use-etc-ssl-certs.patch | 0 pkgs/development/libraries/openssl/default.nix | 10 +++++----- pkgs/top-level/all-packages.nix | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) rename pkgs/development/libraries/openssl/{3.3 => 3.4}/use-etc-ssl-certs-darwin.patch (100%) rename pkgs/development/libraries/openssl/{3.3 => 3.4}/use-etc-ssl-certs.patch (100%) diff --git a/pkgs/development/libraries/openssl/3.3/use-etc-ssl-certs-darwin.patch b/pkgs/development/libraries/openssl/3.4/use-etc-ssl-certs-darwin.patch similarity index 100% rename from pkgs/development/libraries/openssl/3.3/use-etc-ssl-certs-darwin.patch rename to pkgs/development/libraries/openssl/3.4/use-etc-ssl-certs-darwin.patch diff --git a/pkgs/development/libraries/openssl/3.3/use-etc-ssl-certs.patch b/pkgs/development/libraries/openssl/3.4/use-etc-ssl-certs.patch similarity index 100% rename from pkgs/development/libraries/openssl/3.3/use-etc-ssl-certs.patch rename to pkgs/development/libraries/openssl/3.4/use-etc-ssl-certs.patch diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index f0cf68f8b6aa6..51e71d15368e1 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -366,9 +366,9 @@ in }; }; - openssl_3_3 = common { - version = "3.3.2"; - hash = "sha256-LopAsBl5r+i+C7+z3l3BxnCf7bRtbInBDaEUq1/D0oE="; + openssl_3_4 = common { + version = "3.4.1"; + hash = "sha256-1LIlJ6ZFrPdrU+REh6jbaHxu7WIdckaJHQJeOLqMllE="; patches = [ ./3.0/nix-ssl-cert-file.patch @@ -379,9 +379,9 @@ in ( if stdenv.hostPlatform.isDarwin then - ./3.3/use-etc-ssl-certs-darwin.patch + ./3.4/use-etc-ssl-certs-darwin.patch else - ./3.3/use-etc-ssl-certs.patch + ./3.4/use-etc-ssl-certs.patch ) ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 43d90812ebe1c..fd2b75bb5c47d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10196,7 +10196,7 @@ with pkgs; inherit (darwin.apple_sdk_11_0.frameworks) Security; }; - openssl = openssl_3_3; + openssl = openssl_3_4; openssl_legacy = openssl.override { conf = ../development/libraries/openssl/3.0/legacy.cnf; @@ -10205,7 +10205,7 @@ with pkgs; inherit (callPackages ../development/libraries/openssl { }) openssl_1_1 openssl_3 - openssl_3_3; + openssl_3_4; openwebrx = callPackage ../applications/radio/openwebrx { inherit (python3Packages) From 7a64edd4dfaf3583f7e5621fc4679a157f768444 Mon Sep 17 00:00:00 2001 From: Markus Theil Date: Fri, 10 Jan 2025 21:03:51 +0100 Subject: [PATCH 271/343] quictls: fix openssl patch paths for 3.4 Fix paths related to OpenSSL 3.4.x patches. Signed-off-by: Markus Theil --- pkgs/development/libraries/quictls/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/quictls/default.nix b/pkgs/development/libraries/quictls/default.nix index 63ddc6313d6a7..a36d230fcbbc6 100644 --- a/pkgs/development/libraries/quictls/default.nix +++ b/pkgs/development/libraries/quictls/default.nix @@ -32,8 +32,8 @@ stdenv.mkDerivation rec { ../openssl/3.0/openssl-disable-kernel-detection.patch (if stdenv.hostPlatform.isDarwin - then ../openssl/3.3/use-etc-ssl-certs-darwin.patch - else ../openssl/3.3/use-etc-ssl-certs.patch) + then ../openssl/3.4/use-etc-ssl-certs-darwin.patch + else ../openssl/3.4/use-etc-ssl-certs.patch) ]; postPatch = '' From 9a706eda06d4d5848af16359875df4fa1311cfb8 Mon Sep 17 00:00:00 2001 From: Markus Theil Date: Tue, 11 Feb 2025 16:02:03 +0100 Subject: [PATCH 272/343] openssl_3: 3.0.15 -> 3.0.16 Security Fixes in 3.0.16: * Fixed timing side-channel in ECDSA signature computation. (CVE-2024-13176) * Fixed possible OOB memory access with invalid low-level GF(2^m) elliptic curve parameters. (CVE-2024-9143) Signed-off-by: Markus Theil --- pkgs/development/libraries/openssl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index 51e71d15368e1..624904c170bb7 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -344,8 +344,8 @@ in }; openssl_3 = common { - version = "3.0.15"; - hash = "sha256-I8Zm0O3yDxQkmz2PA2isrumrWFsJ4d6CEHxm4fPslTM="; + version = "3.0.16"; + hash = "sha256-V+A8UP6rXTGxUq8rdk8QN5rs2O6S8WyYWYPOSpn374Y="; patches = [ ./3.0/nix-ssl-cert-file.patch From a0b46893d8fbe0438e6a6257ff0f7cedf4180cdc Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Tue, 11 Feb 2025 16:47:38 +0100 Subject: [PATCH 273/343] sqlite: fix Libs.private --- pkgs/development/libraries/sqlite/Libs.private.patch | 11 +++++++++++ pkgs/development/libraries/sqlite/default.nix | 7 +++++++ 2 files changed, 18 insertions(+) create mode 100644 pkgs/development/libraries/sqlite/Libs.private.patch diff --git a/pkgs/development/libraries/sqlite/Libs.private.patch b/pkgs/development/libraries/sqlite/Libs.private.patch new file mode 100644 index 0000000000000..e20d7ff18cc5e --- /dev/null +++ b/pkgs/development/libraries/sqlite/Libs.private.patch @@ -0,0 +1,11 @@ +diff --git a/sqlite3.pc.in b/sqlite3.pc.in +index a9f941b..3799671 100644 +--- a/sqlite3.pc.in ++++ b/sqlite3.pc.in +@@ -9,5 +9,5 @@ Name: SQLite + Description: SQL database engine + Version: @PACKAGE_VERSION@ + Libs: -L${libdir} -lsqlite3 +-Libs.private: @LDFLAGS_MATH@ @LDFLAGS_ZLIB@ @LDFLAGS_ICU@ ++Libs.private: @LIBS@ + Cflags: -I${includedir} diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix index 5522cab569ab9..670fad6e538d7 100644 --- a/pkgs/development/libraries/sqlite/default.nix +++ b/pkgs/development/libraries/sqlite/default.nix @@ -29,6 +29,13 @@ stdenv.mkDerivation rec { hash = "sha256-PcE3/NfGrLMmr2CmG5hE3RXTdzywXnqc4nbEH3E9dlo="; }; + patches = [ + # https://sqlite.org/forum/forumpost/3380558ea82c8a3e + # Can be removed with the next release. + # Test: pkgsStatic.gnupg + ./Libs.private.patch + ]; + outputs = [ "bin" "dev" "man" "doc" "out" ]; separateDebugInfo = stdenv.hostPlatform.isLinux; From b09f1cd54ab40647adce4d9d8b614ef39a4dd086 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Tue, 11 Feb 2025 17:43:04 +0100 Subject: [PATCH 274/343] openssl: fix hash This is the hash for the GitHub snapshot of the 3.4.1 tag, not the official tarball we're using. When the PR doing this update was updated after the tarballs came out, updating the hash was forgotten. I've checked the hashes of the other OpenSSL versions and they're fine. Fixes: c05c515eff3c ("openssl_3_4: init at 3.4.1; openssl_3_3: remove") --- pkgs/development/libraries/openssl/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index 624904c170bb7..3fb0961c6d381 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -368,7 +368,7 @@ in openssl_3_4 = common { version = "3.4.1"; - hash = "sha256-1LIlJ6ZFrPdrU+REh6jbaHxu7WIdckaJHQJeOLqMllE="; + hash = "sha256-ACotazC1i/S+pGxDvdljZar42qbEKHgqpP7uBtoZffM="; patches = [ ./3.0/nix-ssl-cert-file.patch From 2b5899382f6cb897c8a48409c12a886a7fd66ac4 Mon Sep 17 00:00:00 2001 From: Adam Dinwoodie Date: Fri, 3 Jan 2025 10:35:39 +0000 Subject: [PATCH 275/343] git: build documentation in build phase For build process clarity, build documentation during the build phase. Without this change, the docs are built during the install phase as that's when `make` realises they're not yet present. This also means that the main Git documentation is built before the contrib/subtree documentation, which is necessary for the subtree documentation to build successfully in Git v2.48.0-rc0 and -rc1 (and presumably therefore in v2.48.0 when it is released). --- pkgs/applications/version-management/git/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git/default.nix b/pkgs/applications/version-management/git/default.nix index 4dd0f9c7c888b..55862f97067a0 100644 --- a/pkgs/applications/version-management/git/default.nix +++ b/pkgs/applications/version-management/git/default.nix @@ -138,8 +138,13 @@ stdenv.mkDerivation (finalAttrs: { ]; - postBuild = '' - make -C contrib/subtree + postBuild = (lib.optionalString withManual '' + # Need to build the main Git documentation before building the + # contrib/subtree documentation, as the latter depends on the + # asciidoc.conf file created by the former. + make -C Documentation + '') + '' + make -C contrib/subtree all ${lib.optionalString withManual "doc"} '' + (lib.optionalString perlSupport '' make -C contrib/diff-highlight '') + (lib.optionalString osxkeychainSupport '' From 5a847c0878cf9cb19e49144a5d126aa35d6ef509 Mon Sep 17 00:00:00 2001 From: Adam Dinwoodie Date: Fri, 10 Jan 2025 21:13:57 +0000 Subject: [PATCH 276/343] git: 2.47.2 -> 2.48.1 This version change includes a change to the contents of the .git directory, which results in changes to hashes for any fetchgit invocations that set leaveDotGit to true. Per the fetchgit documentation and discussions in #372784, the contents of the .git directory are not stable, so anyone using that should either only be using it for temporary testing purposes, or should be removing the .git directory in fetchgit's postFetch phase, so before the hash is calculated. That means there's no need to do any other handling here to avoid compatibility problems, and can just update the relevant hashes in the fetchgit tests. There's still a chance this will break some other builds because of the change to the contents of the .git directory. If so, whoever's responsible for those other derivations should either stop using leaveDotGit, or should follow the documented advice to remove the .git directory in the postFetch phase. --- pkgs/applications/version-management/git/default.nix | 4 ++-- pkgs/build-support/fetchgit/tests.nix | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/version-management/git/default.nix b/pkgs/applications/version-management/git/default.nix index 55862f97067a0..a28d370cf85ec 100644 --- a/pkgs/applications/version-management/git/default.nix +++ b/pkgs/applications/version-management/git/default.nix @@ -30,7 +30,7 @@ assert sendEmailSupport -> perlSupport; assert svnSupport -> perlSupport; let - version = "2.47.2"; + version = "2.48.1"; svn = subversionClient.override { perlBindings = perlSupport; }; gitwebPerlLibs = with perlPackages; [ CGI HTMLParser CGIFast FCGI FCGIProcManager HTMLTagCloud ]; in @@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"; - hash = "sha256-sZJovmtvFVa0ep3YNCcuFn06dXQM3NKDzzgS7f/jkw8="; + hash = "sha256-HF1UX13B61HpXSxQ2Y/fiLGja6H6MOmuXVOFxgJPgq0="; }; outputs = [ "out" ] ++ lib.optional withManual "doc"; diff --git a/pkgs/build-support/fetchgit/tests.nix b/pkgs/build-support/fetchgit/tests.nix index f3fcd9a578de4..a9185a72693f4 100644 --- a/pkgs/build-support/fetchgit/tests.nix +++ b/pkgs/build-support/fetchgit/tests.nix @@ -33,7 +33,7 @@ name = "leave-git-nix-source"; url = "https://github.com/NixOS/nix"; rev = "9d9dbe6ed05854e03811c361a3380e09183f4f4a"; - sha256 = "sha256-zZxDxqaeWvuWuzwPizBLR7d59zP24+zqnWllNICenko="; + sha256 = "sha256-3YYVIeaeu6zO7bBkZxF+1d5VS0K2GHYEZwChB3tPJ4s="; leaveDotGit = true; }; @@ -49,7 +49,7 @@ name = "submodule-leave-git-source"; url = "https://github.com/pineapplehunter/nix-test-repo-with-submodule"; rev = "26473335b84ead88ee0a3b649b1c7fa4a91cfd4a"; - sha256 = "sha256-+uXIClcRJ4S1rdgx2Oyww+Jv4h1VXp8tfeh9lb07Fhk="; + sha256 = "sha256-0pwleO/m4Iws3BF9ewyWbYMcGfEJLS3BYzWfDSYtXs8="; leaveDotGit = true; fetchSubmodules = true; }; @@ -58,7 +58,7 @@ name = "submodule-deep-source"; url = "https://github.com/pineapplehunter/nix-test-repo-with-submodule"; rev = "26473335b84ead88ee0a3b649b1c7fa4a91cfd4a"; - sha256 = "sha256-LL7uhXQk3N3DcvBBxwjmfVx55tTXCGQ19T91tknopzw="; + sha256 = "sha256-eRHOwolRZDJS/5zk88e7SdoO7nKKtjDXMLVsyFPFgk8="; deepClone = true; fetchSubmodules = true; }; @@ -67,7 +67,7 @@ name = "submodule-leave-git-deep-source"; url = "https://github.com/pineapplehunter/nix-test-repo-with-submodule"; rev = "26473335b84ead88ee0a3b649b1c7fa4a91cfd4a"; - sha256 = "sha256-LL7uhXQk3N3DcvBBxwjmfVx55tTXCGQ19T91tknopzw="; + sha256 = "sha256-eRHOwolRZDJS/5zk88e7SdoO7nKKtjDXMLVsyFPFgk8="; deepClone = true; leaveDotGit = true; fetchSubmodules = true; From 49b67490f840e04446ecc967391688b74deafb9b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 20 Jan 2025 14:08:52 +0100 Subject: [PATCH 277/343] git: drop optional brackets --- .../version-management/git/default.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/version-management/git/default.nix b/pkgs/applications/version-management/git/default.nix index a28d370cf85ec..ded7316167c76 100644 --- a/pkgs/applications/version-management/git/default.nix +++ b/pkgs/applications/version-management/git/default.nix @@ -138,20 +138,20 @@ stdenv.mkDerivation (finalAttrs: { ]; - postBuild = (lib.optionalString withManual '' + postBuild = lib.optionalString withManual '' # Need to build the main Git documentation before building the # contrib/subtree documentation, as the latter depends on the # asciidoc.conf file created by the former. make -C Documentation - '') + '' + '' + '' make -C contrib/subtree all ${lib.optionalString withManual "doc"} - '' + (lib.optionalString perlSupport '' + '' + lib.optionalString perlSupport '' make -C contrib/diff-highlight - '') + (lib.optionalString osxkeychainSupport '' + '' + lib.optionalString osxkeychainSupport '' make -C contrib/credential/osxkeychain - '') + (lib.optionalString withLibsecret '' + '' + lib.optionalString withLibsecret '' make -C contrib/credential/libsecret - ''); + ''; ## Install @@ -161,15 +161,15 @@ stdenv.mkDerivation (finalAttrs: { installFlags = [ "NO_INSTALL_HARDLINKS=1" ]; - preInstall = (lib.optionalString osxkeychainSupport '' + preInstall = lib.optionalString osxkeychainSupport '' mkdir -p $out/bin ln -s $out/share/git/contrib/credential/osxkeychain/git-credential-osxkeychain $out/bin/ rm -f $PWD/contrib/credential/osxkeychain/git-credential-osxkeychain.o - '') + (lib.optionalString withLibsecret '' + '' + lib.optionalString withLibsecret '' mkdir -p $out/bin ln -s $out/share/git/contrib/credential/libsecret/git-credential-libsecret $out/bin/ rm -f $PWD/contrib/credential/libsecret/git-credential-libsecret.o - ''); + ''; postInstall = '' From 8904f5127f5b3a7d306f02d40de94da980d82769 Mon Sep 17 00:00:00 2001 From: techknowlogick Date: Tue, 11 Feb 2025 13:47:23 -0500 Subject: [PATCH 278/343] go_1_24: 1.24rc3 -> 1.24.0 --- pkgs/development/compilers/go/1.24.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/go/1.24.nix b/pkgs/development/compilers/go/1.24.nix index a563cbcd85a2c..4afafbdbc747f 100644 --- a/pkgs/development/compilers/go/1.24.nix +++ b/pkgs/development/compilers/go/1.24.nix @@ -49,11 +49,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "go"; - version = "1.24rc3"; + version = "1.24.0"; src = fetchurl { url = "https://go.dev/dl/go${finalAttrs.version}.src.tar.gz"; - hash = "sha256-LHEopY9iz9706vaOe5vxh/P/6i7AZ1SmTW7ja/6j1pE="; + hash = "sha256-0UEgYUrLKdEryrcr1onyV+tL6eC2+IqPt+Qaxl+FVuU="; }; strictDeps = true; From bea823e65c4b98254963933b51115a0035e94385 Mon Sep 17 00:00:00 2001 From: Emily Date: Tue, 11 Feb 2025 01:11:27 +0000 Subject: [PATCH 279/343] darwin.PowerManagement: 1740.0.7 -> 1740.60.27 --- .../darwin/apple-source-releases/PowerManagement/package.nix | 2 +- pkgs/os-specific/darwin/apple-source-releases/versions.json | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/darwin/apple-source-releases/PowerManagement/package.nix b/pkgs/os-specific/darwin/apple-source-releases/PowerManagement/package.nix index 91319a49644de..231d0ffb562fb 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/PowerManagement/package.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/PowerManagement/package.nix @@ -20,7 +20,7 @@ in mkAppleDerivation { releaseName = "PowerManagement"; - xcodeHash = "sha256-yonvCPa4lJZ9VOO5BIcd0fLsnr0n2v/SHrLTlAJq+q0="; + xcodeHash = "sha256-l6lm8aaiJg4H2BQVCjlFldpfhnmPAlsiMK7Cghzuh1E="; env.NIX_CFLAGS_COMPILE = "-I${privateHeaders}/include"; diff --git a/pkgs/os-specific/darwin/apple-source-releases/versions.json b/pkgs/os-specific/darwin/apple-source-releases/versions.json index 3c0fe6ea508f6..c8fdfff14d202 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/versions.json +++ b/pkgs/os-specific/darwin/apple-source-releases/versions.json @@ -16,8 +16,8 @@ "version": "125" }, "PowerManagement": { - "hash": "sha256-BBEh2+ldmT+8tFvKcTp+4A253hxbUrmY3j7omBXRYf0=", - "version": "1740.0.7" + "hash": "sha256-APkvbp0FhNrypQcDUuREUYOnNLOZGOKhsj5JLcDgvAU=", + "version": "1740.60.27" }, "adv_cmds": { "hash": "sha256-alJOcKeHmIh67ZmN7/YdIouCP/qzakkhimsuZaOkr+c=", From c7377d3a15c000f81e96ba9d109ebbe5077e922a Mon Sep 17 00:00:00 2001 From: Emily Date: Tue, 11 Feb 2025 01:11:27 +0000 Subject: [PATCH 280/343] darwin.copyfile: 213 -> 213.40.2 --- pkgs/os-specific/darwin/apple-source-releases/versions.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/darwin/apple-source-releases/versions.json b/pkgs/os-specific/darwin/apple-source-releases/versions.json index c8fdfff14d202..aba76661f6a2f 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/versions.json +++ b/pkgs/os-specific/darwin/apple-source-releases/versions.json @@ -32,8 +32,8 @@ "version": "136" }, "copyfile": { - "hash": "sha256-lIhl5sr1gewIHkh10hD+H/I7MVPzlHlONGRMOO7OZuA=", - "version": "213" + "hash": "sha256-Vz1fo4p2b6S8xfyDPu1FNgMkH1aX0tkpXCZkdzkRdq0=", + "version": "213.40.2" }, "developer_cmds": { "hash": "sha256-rgmmPHxlKPb84BHVs8oY99E8iGWbqEjS4B8H7+JK7NY=", From 51e7288bd3ac6c1969e4c6760f89ed9ffdb12c8c Mon Sep 17 00:00:00 2001 From: Emily Date: Tue, 11 Feb 2025 01:11:27 +0000 Subject: [PATCH 281/343] darwin.developer_cmds: 79 -> 83 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It seems like `unifdefall(1)` was omitted from this package previously; I’m not sure why. --- .../developer_cmds/meson.build.in | 12 ++++++++++++ .../apple-source-releases/developer_cmds/package.nix | 2 +- .../darwin/apple-source-releases/versions.json | 4 ++-- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/darwin/apple-source-releases/developer_cmds/meson.build.in b/pkgs/os-specific/darwin/apple-source-releases/developer_cmds/meson.build.in index 2c6b9ca720a04..ad9c49cd6d3c2 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/developer_cmds/meson.build.in +++ b/pkgs/os-specific/darwin/apple-source-releases/developer_cmds/meson.build.in @@ -78,3 +78,15 @@ executable( sources : [ 'unifdef/unifdef.c' ], ) install_man('unifdef/unifdef.1') + +install_data( + 'unifdef/unifdefall.sh', + install_dir : get_option('bindir'), + install_mode : 'r-xr-xr-x', + rename : 'unifdefall', +) +install_symlink( + 'unifdefall.1', + install_dir : get_option('mandir') / 'man1', + pointing_to : 'unifdef.1', +) diff --git a/pkgs/os-specific/darwin/apple-source-releases/developer_cmds/package.nix b/pkgs/os-specific/darwin/apple-source-releases/developer_cmds/package.nix index adb16f58652ca..4de6fb9938e6e 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/developer_cmds/package.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/developer_cmds/package.nix @@ -14,7 +14,7 @@ mkAppleDerivation { "man" ]; - xcodeHash = "sha256-oE1GJF/M4vXLTM7BBjezKqrMu9iTUlEKDBKgwyFqu3k="; + xcodeHash = "sha256-NurkF9AnPuaQ7Ev36PCknuTNV6z622yFi2bXZsow+xA="; postPatch = '' substituteInPlace rpcgen/rpc_main.c \ diff --git a/pkgs/os-specific/darwin/apple-source-releases/versions.json b/pkgs/os-specific/darwin/apple-source-releases/versions.json index aba76661f6a2f..df358bc6e9d2c 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/versions.json +++ b/pkgs/os-specific/darwin/apple-source-releases/versions.json @@ -36,8 +36,8 @@ "version": "213.40.2" }, "developer_cmds": { - "hash": "sha256-rgmmPHxlKPb84BHVs8oY99E8iGWbqEjS4B8H7+JK7NY=", - "version": "79" + "hash": "sha256-jgQUjN9zmqi0/7XpqzbRsJjZIYeMrxXT1Zf3qi7+o+8=", + "version": "83" }, "diskdev_cmds": { "hash": "sha256-TebggzBS/HwEP3W2w2p+XvPDxsQtdTbtKEn9wik653Q=", From 5e0bf4044651ac8d3ebf663667651e4a761a7ada Mon Sep 17 00:00:00 2001 From: Emily Date: Tue, 11 Feb 2025 01:11:27 +0000 Subject: [PATCH 282/343] darwin.diskdev_cmds: 735 -> 737.60.1 --- pkgs/os-specific/darwin/apple-source-releases/versions.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/darwin/apple-source-releases/versions.json b/pkgs/os-specific/darwin/apple-source-releases/versions.json index df358bc6e9d2c..121355d719125 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/versions.json +++ b/pkgs/os-specific/darwin/apple-source-releases/versions.json @@ -40,8 +40,8 @@ "version": "83" }, "diskdev_cmds": { - "hash": "sha256-TebggzBS/HwEP3W2w2p+XvPDxsQtdTbtKEn9wik653Q=", - "version": "735" + "hash": "sha256-v3TFHLUlumt/sHxkOTyxDA4iG8ci5ZmMn7HCb4+9Uo0=", + "version": "737.60.1" }, "doc_cmds": { "hash": "sha256-/Mf+RhaTU9O5i95gddZ2h9eDjLezwj3nP6FvryMF54E=", From f51133dded7ff55a3bf30dabe63531ae8f37d10d Mon Sep 17 00:00:00 2001 From: Emily Date: Tue, 11 Feb 2025 01:11:27 +0000 Subject: [PATCH 283/343] darwin.libffi: 35 -> 39 --- pkgs/os-specific/darwin/apple-source-releases/versions.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/darwin/apple-source-releases/versions.json b/pkgs/os-specific/darwin/apple-source-releases/versions.json index 121355d719125..871588a4d4772 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/versions.json +++ b/pkgs/os-specific/darwin/apple-source-releases/versions.json @@ -52,8 +52,8 @@ "version": "448.0.3" }, "libffi": { - "hash": "sha256-tQJdKCz2OIwVtorHQapq9Xs2e1Ac96lGEzIWUXmsasY=", - "version": "35" + "hash": "sha256-YjRMS3H3hIEfQm5MVSxGNTBtFc/9al7iQGDeZy6m/0U=", + "version": "39" }, "libiconv": { "hash": "sha256-4I70hci8SUQ5QERbImP3htjYCGXdZZ0a6RM7ggUnVa4=", From 1db08b9f1e751417352baf3a559d039aca7298cd Mon Sep 17 00:00:00 2001 From: Emily Date: Tue, 11 Feb 2025 01:11:27 +0000 Subject: [PATCH 284/343] darwin.libiconv: 107 -> 109 --- pkgs/os-specific/darwin/apple-source-releases/versions.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/darwin/apple-source-releases/versions.json b/pkgs/os-specific/darwin/apple-source-releases/versions.json index 871588a4d4772..fed5025dc2486 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/versions.json +++ b/pkgs/os-specific/darwin/apple-source-releases/versions.json @@ -56,8 +56,8 @@ "version": "39" }, "libiconv": { - "hash": "sha256-4I70hci8SUQ5QERbImP3htjYCGXdZZ0a6RM7ggUnVa4=", - "version": "107" + "hash": "sha256-eaUp0z7HqX0AW2C90gDVFeiJnmGRxPDuzyb1Jlm1pNc=", + "version": "109" }, "libpcap": { "hash": "sha256-x5mKK6LXGS3LBRUVNZwxA750a0NoRScTpoDUsumlg+s=", From dab00cce78f9f4d5a8d5b497b301d5169f455a72 Mon Sep 17 00:00:00 2001 From: Emily Date: Tue, 11 Feb 2025 01:11:27 +0000 Subject: [PATCH 285/343] darwin.libpcap: 135 -> 137 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This was unhappy about missing BPF `struct` stuff. I’m not sure why the private header thing was like that previously but it builds fine like this. --- .../apple-source-releases/libpcap/package.nix | 21 +------------------ .../apple-source-releases/versions.json | 4 ++-- 2 files changed, 3 insertions(+), 22 deletions(-) diff --git a/pkgs/os-specific/darwin/apple-source-releases/libpcap/package.nix b/pkgs/os-specific/darwin/apple-source-releases/libpcap/package.nix index 4ad2619face85..aba3fc53a4f7d 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/libpcap/package.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/libpcap/package.nix @@ -26,26 +26,7 @@ let unifdef -x 1 -DPRIVATE -o "$out/include/net/droptap.h" '${xnu}/bsd/net/droptap.h' unifdef -x 1 -DPRIVATE -o "$out/include/net/iptap.h" '${xnu}/bsd/net/iptap.h' unifdef -x 1 -DPRIVATE -o "$out/include/net/pktap.h" '${xnu}/bsd/net/pktap.h' - - cat < "$out/include/net/bpf.h" - #pragma once - #include_next - $(sed -n \ - -e '/^struct bpf_comp_stats\s*{/,/};/p' \ - -e '/^struct bpf_hdr_ext\s*{/,/};/p' \ - -e '/^#define BIOCGBATCHWRITE\s/p' \ - -e '/^#define BIOCGHDRCOMPSTATS\s/p' \ - -e '/^#define BIOCGIFATTACHCOUNT\s/p' \ - -e '/^#define BIOCGWRITEMAX\s/p' \ - -e '/^#define BIOCSBATCHWRITE\s/p' \ - -e '/^#define BIOCSEXTHDR\s/p' \ - -e '/^#define BIOCSHEADDROP\s/p' \ - -e '/^#define BIOCSPKTHDRV2\s/p' \ - -e '/^#define BIOCSTRUNCATE\s/p' \ - -e '/^#define BIOCSWANTPKTAP\s/p' \ - -e '/^#define BIOCSWRITEMAX\s/p' \ - '${xnu}/bsd/net/bpf.h') - EOF + unifdef -x 1 -DPRIVATE -o "$out/include/net/bpf.h" '${xnu}/bsd/net/bpf.h' cat < "$out/include/net/if.h" #pragma once diff --git a/pkgs/os-specific/darwin/apple-source-releases/versions.json b/pkgs/os-specific/darwin/apple-source-releases/versions.json index fed5025dc2486..907c5797a9290 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/versions.json +++ b/pkgs/os-specific/darwin/apple-source-releases/versions.json @@ -60,8 +60,8 @@ "version": "109" }, "libpcap": { - "hash": "sha256-x5mKK6LXGS3LBRUVNZwxA750a0NoRScTpoDUsumlg+s=", - "version": "135" + "hash": "sha256-RViIXv5zP2Bcive5qrcfb9vNWwhSe6fGCaToSgDYNxU=", + "version": "137" }, "libresolv": { "hash": "sha256-ndGcicbHizPazTCB0P3aioDOv7IJPmTOgLnioFHH2+o=", From b9dd1e6d908ec4b2882e06430201ae78aa7ac159 Mon Sep 17 00:00:00 2001 From: Emily Date: Tue, 11 Feb 2025 01:11:27 +0000 Subject: [PATCH 286/343] darwin.network_cmds: 696 -> 698.60.4 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Apple removed the `spray.x` source and replaced it with vendored `rpcgen(1)` output for some reason. Not sure it’s worth trying to undo that. --- .../network_cmds/meson.build.in | 18 +----------------- .../network_cmds/package.nix | 4 +--- .../darwin/apple-source-releases/versions.json | 4 ++-- 3 files changed, 4 insertions(+), 22 deletions(-) diff --git a/pkgs/os-specific/darwin/apple-source-releases/network_cmds/meson.build.in b/pkgs/os-specific/darwin/apple-source-releases/network_cmds/meson.build.in index 9e15c7c5c1544..d0d0d08e559e4 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/network_cmds/meson.build.in +++ b/pkgs/os-specific/darwin/apple-source-releases/network_cmds/meson.build.in @@ -19,21 +19,6 @@ add_global_arguments( ) -# Generators -rpcgen_bin = find_program('rpcgen') -rpcgen = generator( - rpcgen_bin, - arguments : [ '-c', '-o', '@OUTPUT@', '@INPUT@' ], - output : '@BASENAME@_xdr.c', -) - -rpcgen_header = generator( - rpcgen_bin, - arguments : [ '-h', '-o', '@OUTPUT@', '@INPUT@' ], - output : '@BASENAME@.h', -) - - # Dependencies cc = meson.get_compiler('c') @@ -340,8 +325,7 @@ executable( install : true, sources : [ 'spray.tproj/spray.c', - rpcgen_header.process('spray.tproj/spray.x'), - rpcgen.process('spray.tproj/spray.x'), + 'spray.tproj/spray_xdr.c', ], ) install_man('spray.tproj/spray.8') diff --git a/pkgs/os-specific/darwin/apple-source-releases/network_cmds/package.nix b/pkgs/os-specific/darwin/apple-source-releases/network_cmds/package.nix index 58defd296f18a..f6bb8f551c9bc 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/network_cmds/package.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/network_cmds/package.nix @@ -1,7 +1,6 @@ { lib, apple-sdk, - developer_cmds, fetchurl, libpcap, libresolv, @@ -405,7 +404,7 @@ mkAppleDerivation { "man" ]; - xcodeHash = "sha256-L5upfoE6uHsdFOzylTTH+UPftA96qdpnvgFcK5dmhgY="; + xcodeHash = "sha256-HkcIvKB4ektuk+3J/Sque8Pr5dMeNFZRlENuiu3KdsA="; patches = [ # Some private headers depend on corecrypto, which we can’t use. @@ -444,7 +443,6 @@ mkAppleDerivation { env.NIX_CFLAGS_COMPILE = "-I${privateHeaders}/include"; nativeBuildInputs = [ - developer_cmds pkg-config ]; diff --git a/pkgs/os-specific/darwin/apple-source-releases/versions.json b/pkgs/os-specific/darwin/apple-source-releases/versions.json index 907c5797a9290..4d8b142d29b0e 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/versions.json +++ b/pkgs/os-specific/darwin/apple-source-releases/versions.json @@ -80,8 +80,8 @@ "version": "44" }, "network_cmds": { - "hash": "sha256-8aW3dAA/dfZTayGLHqzRqnVLmwJzRpvVmXL4eJGz5OQ=", - "version": "696" + "hash": "sha256-aGBsxdYW21QjTILxcR8tHufQKvkvmai9MKOCxBNZvmI=", + "version": "698.60.4" }, "patch_cmds": { "hash": "sha256-foIoIMe+zgPISFmE10q4cwEUBhiah4nbD7UtjBumZYU=", From 100b5483295cf093358186b43080c4b0dc380591 Mon Sep 17 00:00:00 2001 From: Emily Date: Tue, 11 Feb 2025 01:11:27 +0000 Subject: [PATCH 287/343] darwin.system_cmds: 1012 -> 1012.60.2 --- .../darwin/apple-source-releases/system_cmds/package.nix | 4 ++++ pkgs/os-specific/darwin/apple-source-releases/versions.json | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/darwin/apple-source-releases/system_cmds/package.nix b/pkgs/os-specific/darwin/apple-source-releases/system_cmds/package.nix index f4d1b83f8c298..5e2b5ea0f834f 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/system_cmds/package.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/system_cmds/package.nix @@ -62,7 +62,11 @@ let install -D -t "$out/include/os" \ '${Libc}/os/assumes.h' \ + '${Libc}/os/variant_private.h' \ '${xnu}/libkern/os/base_private.h' + substituteInPlace "$out/include/os/variant_private.h" \ + --replace-fail ', bridgeos(4.0)' "" \ + --replace-fail ', bridgeos' "" touch "$out/include/os/feature_private.h" install -D -t "$out/include/sys" \ diff --git a/pkgs/os-specific/darwin/apple-source-releases/versions.json b/pkgs/os-specific/darwin/apple-source-releases/versions.json index 4d8b142d29b0e..9488fce386ed8 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/versions.json +++ b/pkgs/os-specific/darwin/apple-source-releases/versions.json @@ -100,8 +100,8 @@ "version": "319.0.1" }, "system_cmds": { - "hash": "sha256-SZfgMX0znyESzRNNzqyq/FAa9NQeI+5yiBS2xIvsP5g=", - "version": "1012" + "hash": "sha256-9nNJeVJo4XwGSHh+SJydhVt+I8+Rb5hCsPiFYKQ8/28=", + "version": "1012.60.2" }, "text_cmds": { "hash": "sha256-76dagwRcAf5fpoyH5FDR5kdCldv6Mgre6aFBzxaCRkg=", From a736ddeaec75f4a3f26d4d7b79bdb64f878d4074 Mon Sep 17 00:00:00 2001 From: Emily Date: Tue, 11 Feb 2025 01:11:27 +0000 Subject: [PATCH 288/343] darwin.top: 139 -> 139.40.2 --- pkgs/os-specific/darwin/apple-source-releases/top/package.nix | 2 +- pkgs/os-specific/darwin/apple-source-releases/versions.json | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/darwin/apple-source-releases/top/package.nix b/pkgs/os-specific/darwin/apple-source-releases/top/package.nix index 35737d5f748be..ee48e7c444a96 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/top/package.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/top/package.nix @@ -13,7 +13,7 @@ in mkAppleDerivation { releaseName = "top"; - xcodeHash = "sha256-b7Qv9ks9JmilY9GaEU3/iXoHBNyHRYr4IB0jVf0fYdo="; + xcodeHash = "sha256-YeBhEstvPh8IX8ArVc7U8IRU6vqPoOE6kBTqcqZonGc="; patches = [ # Upstream removed aarch64 support from the 137 source release, but the removal can be reverted. diff --git a/pkgs/os-specific/darwin/apple-source-releases/versions.json b/pkgs/os-specific/darwin/apple-source-releases/versions.json index 9488fce386ed8..2ffec99f7fb63 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/versions.json +++ b/pkgs/os-specific/darwin/apple-source-releases/versions.json @@ -108,7 +108,7 @@ "version": "190.0.1" }, "top": { - "hash": "sha256-jz7udjXO5INtMHTDDdTUYAc4Tpy8v9nW0401LAHiPpA=", - "version": "139" + "hash": "sha256-e+k/jE49BMZZ24ge9JCa2ct5f1og6ewWb6U5ZMWdIEc=", + "version": "139.40.2" } } From 4865ae3eef8833b28667b9d344b08b70f39a8985 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Wed, 12 Feb 2025 09:43:51 +0100 Subject: [PATCH 289/343] xfsprogs: fix build --- pkgs/by-name/xf/xfsprogs/package.nix | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/pkgs/by-name/xf/xfsprogs/package.nix b/pkgs/by-name/xf/xfsprogs/package.nix index 86cc97764b9f2..6ff404ce7f3a5 100644 --- a/pkgs/by-name/xf/xfsprogs/package.nix +++ b/pkgs/by-name/xf/xfsprogs/package.nix @@ -3,6 +3,7 @@ stdenv, buildPackages, fetchurl, + autoreconfHook, gettext, pkg-config, icu, @@ -22,6 +23,14 @@ stdenv.mkDerivation rec { hash = "sha256-CDJAckfbeRzHDe+W5+JUvW7fBD3ISoCmLzzNbj3/0yk="; }; + patches = [ + (fetchurl { + name = "icu76.patch"; + url = "https://lore.kernel.org/linux-xfs/20250212081649.3502717-1-hi@alyssa.is/raw"; + hash = "sha256-Z7BW0B+/5eHWXdHre++wRtdbU/P6XZqudYx6EK5msIU="; + }) + ]; + outputs = [ "bin" "dev" @@ -31,6 +40,7 @@ stdenv.mkDerivation rec { depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ + autoreconfHook gettext pkg-config libuuid # codegen tool uses libuuid @@ -61,6 +71,12 @@ stdenv.mkDerivation rec { patchShebangs ./install-sh ''; + # The default --force would replace xfsprogs' custom install-sh. + autoreconfFlags = [ + "--install" + "--verbose" + ]; + configureFlags = [ "--disable-lib64" "--with-systemd-unit-dir=${placeholder "out"}/lib/systemd/system" From d6fccd0e8cf9a1af188fadd0c13b687d71d892ed Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Wed, 12 Feb 2025 17:53:55 +0100 Subject: [PATCH 290/343] libcdr: fix build This hack hasn't been necessary since libcdr 0.0.9 or 0.1.0, and now breaks the build with ICU 76. --- pkgs/development/libraries/libcdr/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/libraries/libcdr/default.nix b/pkgs/development/libraries/libcdr/default.nix index f19b3d7b53df1..482d544225b99 100644 --- a/pkgs/development/libraries/libcdr/default.nix +++ b/pkgs/development/libraries/libcdr/default.nix @@ -15,8 +15,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; - CXXFLAGS="--std=gnu++0x"; # For c++11 constants in lcms2.h - enableParallelBuilding = true; meta = { From 693f05ba64979e8eab65639631d0e3635058be02 Mon Sep 17 00:00:00 2001 From: K900 Date: Wed, 12 Feb 2025 20:17:53 +0300 Subject: [PATCH 291/343] python312Packages.eventlet: skip test broken by openssl upgrade --- pkgs/development/python-modules/eventlet/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/eventlet/default.nix b/pkgs/development/python-modules/eventlet/default.nix index 1067637c4d84d..e49970321f690 100644 --- a/pkgs/development/python-modules/eventlet/default.nix +++ b/pkgs/development/python-modules/eventlet/default.nix @@ -65,6 +65,8 @@ buildPythonPackage rec { "test_hosts_no_network" # flaky test, depends on builder performance "test_server_connection_timeout_exception" + # broken with openssl 3.4 + "test_ssl_close" ]; pythonImportsCheck = [ "eventlet" ]; From be9121fbadcacf1734a8a6d58a5bdbd215f50aae Mon Sep 17 00:00:00 2001 From: Audrey Dutcher Date: Wed, 23 Oct 2024 17:01:52 -0700 Subject: [PATCH 292/343] libpsl-with-scripts: init psl-make-dafsa pulls in a runtime python3 dependency which seems to have given various build configurations no end of trouble. This solves the problem in the least subtle manner imaginable, by removing it for all platforms and re-adding it in a new package which currently has no dependants. Switch your dependency from libpsl to libpsl-with-scripts if you are impacted by this. --- .../li/libpsl-with-scripts/package.nix | 53 +++++++++++++++++++ pkgs/by-name/li/libpsl/package.nix | 17 +++--- 2 files changed, 59 insertions(+), 11 deletions(-) create mode 100644 pkgs/by-name/li/libpsl-with-scripts/package.nix diff --git a/pkgs/by-name/li/libpsl-with-scripts/package.nix b/pkgs/by-name/li/libpsl-with-scripts/package.nix new file mode 100644 index 0000000000000..cc31b95798f9c --- /dev/null +++ b/pkgs/by-name/li/libpsl-with-scripts/package.nix @@ -0,0 +1,53 @@ +{ + lib, + stdenv, + libpsl, + python3, + lzip, +}: + +stdenv.mkDerivation { + pname = "libpsl-with-scripts"; + inherit (libpsl) src version patches; + outputs = libpsl.outputs ++ [ "bin" ]; + + nativeBuildInputs = [ + lzip + ]; + + buildInputs = [ + python3 + ]; + + postPatch = '' + patchShebangs src/psl-make-dafsa + ''; + + dontConfigure = true; + dontBuild = true; + + installPhase = + let + linkOutput = oldOutput: newOutput: '' + cd ${oldOutput} + find . -type d -print0 | xargs -0 -I{} mkdir -p ${newOutput}/{} + find . \( -type f -o -type l \) -print0 | xargs -0 -I{} ln -s ${oldOutput}/{} ${newOutput}/{} + cd - + ''; + links = lib.concatMapStrings ( + output: linkOutput libpsl.${output} (builtins.placeholder output) + ) libpsl.outputs; + in + '' + runHook preInstall + + ${links} + + install -D src/psl-make-dafsa $bin/bin/psl-make-dafsa + install -D -m 555 src/psl-make-dafsa.1 $out/share/man/man1/psl-make-dafsa.1 + + runHook postInstall + ''; + + dontFixup = true; +} diff --git a/pkgs/by-name/li/libpsl/package.nix b/pkgs/by-name/li/libpsl/package.nix index 81dd87ded09ce..f919f8cb30ff0 100644 --- a/pkgs/by-name/li/libpsl/package.nix +++ b/pkgs/by-name/li/libpsl/package.nix @@ -12,7 +12,6 @@ libunistring, libxslt, pkg-config, - python3, buildPackages, publicsuffix-list, }: @@ -40,9 +39,7 @@ stdenv.mkDerivation rec { [ "out" "dev" - ] - # bin/psl-make-dafsa brings a large runtime closure through python3 - ++ lib.optional (!stdenv.hostPlatform.isStatic) "bin"; + ]; nativeBuildInputs = [ autoreconfHook @@ -58,18 +55,16 @@ stdenv.mkDerivation rec { libidn2 libunistring libxslt - ] ++ lib.optional ( - !stdenv.hostPlatform.isStatic - && !stdenv.hostPlatform.isWindows - && (stdenv.hostPlatform.isDarwin -> stdenv.buildPlatform == stdenv.hostPlatform) - ) python3; + ]; propagatedBuildInputs = [ publicsuffix-list ]; - postPatch = lib.optionalString (!stdenv.hostPlatform.isStatic) '' - patchShebangs src/psl-make-dafsa + # bin/psl-make-dafsa brings a large runtime closure through python3 + # use the libpsl-with-scripts package if you need this + postInstall = '' + rm $out/bin/psl-make-dafsa $out/share/man/man1/psl-make-dafsa* ''; preAutoreconf = '' From 5d3564ed4c4bb0fb84f251643e1b011b379be9f4 Mon Sep 17 00:00:00 2001 From: Audrey Dutcher Date: Tue, 3 Dec 2024 04:10:10 -0700 Subject: [PATCH 293/343] openbsd.sys: pin compiler to clang 18 Otherwise (clang 19), it fails to compile: > --- locore.o --- > /build/locore-e779a9.s:692:9: error: invalid number of bytes > .space (.Liretq_swapgs - XUsyscall_meltdown) - (. - Xsyscall_meltdown), 0xcc > ^ > *** [locore.o] Error code 1 > > make: stopped in /build/sys-openbsd-filtered-src/sys/arch/amd64/compile/GENERIC/obj > 1 error > > make: stopped in /build/sys-openbsd-filtered-src/sys/arch/amd64/compile/GENERIC/obj Eventually, OpenBSD will fix this upstream. For now they are stuck on clang 16. --- pkgs/os-specific/bsd/openbsd/pkgs/sys.nix | 108 ++++++++++++---------- 1 file changed, 57 insertions(+), 51 deletions(-) diff --git a/pkgs/os-specific/bsd/openbsd/pkgs/sys.nix b/pkgs/os-specific/bsd/openbsd/pkgs/sys.nix index 58f1a0be8430e..ec91e20fed50a 100644 --- a/pkgs/os-specific/bsd/openbsd/pkgs/sys.nix +++ b/pkgs/os-specific/bsd/openbsd/pkgs/sys.nix @@ -1,66 +1,72 @@ { + buildPackages, + stdenvNoLibc, + overrideCC, mkDerivation, boot-config, pkgsBuildTarget, baseConfig ? "GENERIC", }: -mkDerivation { - path = "sys/arch/amd64"; - pname = "sys"; - extraPaths = [ "sys" ]; - noLibc = true; +(mkDerivation.override { + stdenvNoLibc = overrideCC stdenvNoLibc buildPackages.llvmPackages_18.clangNoLibc; +}) + { + path = "sys/arch/amd64"; + pname = "sys"; + extraPaths = [ "sys" ]; + noLibc = true; - extraNativeBuildInputs = [ - boot-config - ]; + extraNativeBuildInputs = [ + boot-config + ]; - postPatch = - # The in-kernel debugger (DDB) requires compiler flags not supported by clang, disable it - '' - sed -E -i -e '/DDB/d' $BSDSRCDIR/sys/conf/GENERIC - sed -E -i -e '/pseudo-device\tdt/d' $BSDSRCDIR/sys/arch/amd64/conf/GENERIC - '' - + - # Clang flags compatibility + postPatch = + # The in-kernel debugger (DDB) requires compiler flags not supported by clang, disable it '' - find $BSDSRCDIR -name 'Makefile*' -exec sed -E -i -e 's/-fno-ret-protector/-fno-stack-protector/g' -e 's/-nopie/-no-pie/g' {} + - sed -E -i -e 's_^\tinstall.*$_\tinstall bsd ''${out}/bsd_' -e s/update-link// $BSDSRCDIR/sys/arch/*/conf/Makefile.* + sed -E -i -e '/DDB/d' $BSDSRCDIR/sys/conf/GENERIC + sed -E -i -e '/pseudo-device\tdt/d' $BSDSRCDIR/sys/arch/amd64/conf/GENERIC '' - + - # Remove randomness in build - '' - sed -E -i -e 's/^PAGE_SIZE=.*$/PAGE_SIZE=4096/g' -e '/^random_uniform/a echo 0; return 0;' $BSDSRCDIR/sys/conf/makegap.sh - sed -E -i -e 's/^v=.*$/v=0 u=nixpkgs h=nixpkgs t=`date -d @1`/g' $BSDSRCDIR/sys/conf/newvers.sh - ''; + + + # Clang flags compatibility + '' + find $BSDSRCDIR -name 'Makefile*' -exec sed -E -i -e 's/-fno-ret-protector/-fno-stack-protector/g' -e 's/-nopie/-no-pie/g' {} + + sed -E -i -e 's_^\tinstall.*$_\tinstall bsd ''${out}/bsd_' -e s/update-link// $BSDSRCDIR/sys/arch/*/conf/Makefile.* + '' + + + # Remove randomness in build + '' + sed -E -i -e 's/^PAGE_SIZE=.*$/PAGE_SIZE=4096/g' -e '/^random_uniform/a echo 0; return 0;' $BSDSRCDIR/sys/conf/makegap.sh + sed -E -i -e 's/^v=.*$/v=0 u=nixpkgs h=nixpkgs t=`date -d @1`/g' $BSDSRCDIR/sys/conf/newvers.sh + ''; - postConfigure = '' - export BSDOBJDIR=$TMP/obj - mkdir $BSDOBJDIR - make obj + postConfigure = '' + export BSDOBJDIR=$TMP/obj + mkdir $BSDOBJDIR + make obj - cd conf - config ${baseConfig} - cd - - ''; + cd conf + config ${baseConfig} + cd - + ''; - preBuild = - # A lot of files insist on calling unprefixed GNU `ld` and `objdump`. - # It's easier to add them to PATH than patch and substitute. - '' - mkdir $TMP/bin - export PATH=$TMP/bin:$PATH - ln -s ${pkgsBuildTarget.binutils}/bin/${pkgsBuildTarget.binutils.targetPrefix}objdump $TMP/bin/objdump - ln -s ${pkgsBuildTarget.binutils}/bin/${pkgsBuildTarget.binutils.targetPrefix}ld $TMP/bin/ld - '' - + - # The Makefile claims it needs includes, but it really doesn't. - # Tell it includes aren't real and can't hurt it. + preBuild = + # A lot of files insist on calling unprefixed GNU `ld` and `objdump`. + # It's easier to add them to PATH than patch and substitute. + '' + mkdir $TMP/bin + export PATH=$TMP/bin:$PATH + ln -s ${pkgsBuildTarget.binutils}/bin/${pkgsBuildTarget.binutils.targetPrefix}objdump $TMP/bin/objdump + ln -s ${pkgsBuildTarget.binutils}/bin/${pkgsBuildTarget.binutils.targetPrefix}ld $TMP/bin/ld '' - cd compile/${baseConfig}/obj - echo 'includes:' >>Makefile - ''; + + + # The Makefile claims it needs includes, but it really doesn't. + # Tell it includes aren't real and can't hurt it. + '' + cd compile/${baseConfig}/obj + echo 'includes:' >>Makefile + ''; - # stand is in a separate package - env.SKIPDIR = "stand"; - env.NIX_CFLAGS_COMPILE = "-Wno-unused-command-line-argument -Wno-visibility"; -} + # stand is in a separate package + env.SKIPDIR = "stand"; + env.NIX_CFLAGS_COMPILE = "-Wno-unused-command-line-argument -Wno-visibility"; + } From c9a8d8a4152be9b265b7860a92101d93394e8ee2 Mon Sep 17 00:00:00 2001 From: Audrey Dutcher Date: Sat, 11 Jan 2025 21:43:47 -0700 Subject: [PATCH 294/343] boehmgc: hack in __data_start symbol OpenBSD's vendored lld includes patches to inject this extra symbol. We don't do that, so use a linker script. --- pkgs/by-name/bo/boehmgc/package.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/by-name/bo/boehmgc/package.nix b/pkgs/by-name/bo/boehmgc/package.nix index e950ad42f9a3a..dbd575ea4b6bb 100644 --- a/pkgs/by-name/bo/boehmgc/package.nix +++ b/pkgs/by-name/bo/boehmgc/package.nix @@ -54,6 +54,13 @@ stdenv.mkDerivation (finalAttrs: { "CFLAGS_EXTRA=-DNO_SOFT_VDB" ]; + # OpenBSD patches lld (!!!!) to inject this symbol into every linker invocation. + # We are obviously not doing that. + postConfigure = lib.optionalString stdenv.hostPlatform.isOpenBSD '' + echo >$TMP/openbsd.ldscript "__data_start = ADDR(.data);" + export NIX_LDFLAGS="$NIX_LDFLAGS -T $TMP/openbsd.ldscript" + ''; + # `gctest` fails under x86_64 emulation on aarch64-darwin # and also on aarch64-linux (qemu-user) doCheck = From a56794defceeb35c6e748523fe655722f9e4f533 Mon Sep 17 00:00:00 2001 From: Audrey Dutcher Date: Sat, 11 Jan 2025 21:44:00 -0700 Subject: [PATCH 295/343] nix: adjust boehmgc patch to work with OpenBSD The bundled patch for boehmgc requires various flavors of nonstandard pthread extensions, of which OpenBSD implements none of them. This adds a final fallback case. --- .../nix/patches/boehmgc-coroutine-sp-fallback.patch | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/package-management/nix/patches/boehmgc-coroutine-sp-fallback.patch b/pkgs/tools/package-management/nix/patches/boehmgc-coroutine-sp-fallback.patch index a53b7f1f52f49..2fef8185aea27 100644 --- a/pkgs/tools/package-management/nix/patches/boehmgc-coroutine-sp-fallback.patch +++ b/pkgs/tools/package-management/nix/patches/boehmgc-coroutine-sp-fallback.patch @@ -2,7 +2,7 @@ diff --git a/pthread_stop_world.c b/pthread_stop_world.c index 2b45489..0e6d8ef 100644 --- a/pthread_stop_world.c +++ b/pthread_stop_world.c -@@ -776,6 +776,8 @@ STATIC void GC_restart_handler(int sig) +@@ -776,6 +776,8 @@ /* world is stopped. Should not fail if it isn't. */ GC_INNER void GC_push_all_stacks(void) { @@ -11,22 +11,27 @@ index 2b45489..0e6d8ef 100644 GC_bool found_me = FALSE; size_t nthreads = 0; int i; -@@ -868,6 +870,40 @@ GC_INNER void GC_push_all_stacks(void) +@@ -868,6 +870,45 @@ hi = p->altstack + p->altstack_size; # endif /* FIXME: Need to scan the normal stack too, but how ? */ + } else { -+ #ifdef HAVE_PTHREAD_ATTR_GET_NP ++ #if defined(HAVE_PTHREAD_ATTR_GET_NP) + if (pthread_attr_init(&pattr) != 0) { + ABORT("GC_push_all_stacks: pthread_attr_init failed!"); + } + if (pthread_attr_get_np(p->id, &pattr) != 0) { + ABORT("GC_push_all_stacks: pthread_attr_get_np failed!"); + } -+ #else ++ #elif defined(HAVE_PTHREAD_GETATTR_NP) + if (pthread_getattr_np(p->id, &pattr)) { + ABORT("GC_push_all_stacks: pthread_getattr_np failed!"); + } ++ #else ++ /* assume default */ ++ if (pthread_attr_init(&pattr) != 0) { ++ ABORT("GC_push_all_stacks: pthread_attr_init failed!"); ++ } + #endif + if (pthread_attr_getstacksize(&pattr, &stack_limit)) { + ABORT("GC_push_all_stacks: pthread_attr_getstacksize failed!"); From a779dba38abfde33b798cd2ff7be450e2d0b72c2 Mon Sep 17 00:00:00 2001 From: Audrey Dutcher Date: Wed, 12 Feb 2025 15:44:44 -0700 Subject: [PATCH 296/343] jq: remove configuration slated for removal in 1.7 --- pkgs/by-name/jq/jq/package.nix | 9 --------- 1 file changed, 9 deletions(-) diff --git a/pkgs/by-name/jq/jq/package.nix b/pkgs/by-name/jq/jq/package.nix index 900ba869f3525..54f61868ea157 100644 --- a/pkgs/by-name/jq/jq/package.nix +++ b/pkgs/by-name/jq/jq/package.nix @@ -54,15 +54,6 @@ stdenv.mkDerivation rec { bison ]; - # Darwin requires _REENTRANT be defined to use functions like `lgamma_r`. - # Otherwise, configure will detect that they’re in libm, but the build will fail - # with clang 16+ due to calls to undeclared functions. - # This is fixed upstream and can be removed once jq is updated (to 1.7 or an unstable release). - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin (toString [ - "-D_REENTRANT=1" - "-D_DARWIN_C_SOURCE=1" - ]); - configureFlags = [ "--bindir=\${bin}/bin" From 226cb34a82799a2d6cf541a287bd9a8e44797612 Mon Sep 17 00:00:00 2001 From: Audrey Dutcher Date: Wed, 12 Feb 2025 15:53:25 -0700 Subject: [PATCH 297/343] jq: fix compilation on OpenBSD/clang19 --- pkgs/by-name/jq/jq/package.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/jq/jq/package.nix b/pkgs/by-name/jq/jq/package.nix index 54f61868ea157..3d8adb3e78297 100644 --- a/pkgs/by-name/jq/jq/package.nix +++ b/pkgs/by-name/jq/jq/package.nix @@ -63,7 +63,9 @@ stdenv.mkDerivation rec { ] ++ lib.optional (!onigurumaSupport) "--with-oniguruma=no" # jq is linked to libjq: - ++ lib.optional (!stdenv.hostPlatform.isDarwin) "LDFLAGS=-Wl,-rpath,\\\${libdir}"; + ++ lib.optional (!stdenv.hostPlatform.isDarwin) "LDFLAGS=-Wl,-rpath,\\\${libdir}" + # https://github.com/jqlang/jq/issues/3252 + ++ lib.optional stdenv.hostPlatform.isOpenBSD "CFLAGS=-D_BSD_SOURCE=1"; # jq binary includes the whole `configureFlags` in: # https://github.com/jqlang/jq/commit/583e4a27188a2db097dd043dd203b9c106bba100 From db8d1d37d56c0a5dff7c5861de48d6feaeefbcbe Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Wed, 12 Feb 2025 16:06:28 +0100 Subject: [PATCH 298/343] haskell.compiler: drop unnecessary Sphinx patch for GHC >= 9.8 The line the patch touches is actually inside conditional code and isn't executed with Sphinx 7, so we don't need to touch it. --- pkgs/development/compilers/ghc/common-hadrian.nix | 9 ++++----- pkgs/development/compilers/ghc/docs-sphinx-7-ghc98.patch | 8 -------- 2 files changed, 4 insertions(+), 13 deletions(-) delete mode 100644 pkgs/development/compilers/ghc/docs-sphinx-7-ghc98.patch diff --git a/pkgs/development/compilers/ghc/common-hadrian.nix b/pkgs/development/compilers/ghc/common-hadrian.nix index 7974cba0824c9..d9e10c96234ad 100644 --- a/pkgs/development/compilers/ghc/common-hadrian.nix +++ b/pkgs/development/compilers/ghc/common-hadrian.nix @@ -171,11 +171,10 @@ # 9.8 and 9.10 don't run into this problem for some reason || (lib.versionAtLeast version "9.8" && lib.versionOlder version "9.11"); in - [ - # Fix docs build with Sphinx >= 7 https://gitlab.haskell.org/ghc/ghc/-/issues/24129 - (if lib.versionAtLeast version "9.8" - then ./docs-sphinx-7-ghc98.patch - else ./docs-sphinx-7.patch ) + + # Fix docs build with Sphinx >= 7 https://gitlab.haskell.org/ghc/ghc/-/issues/24129 + lib.optionals (lib.versionOlder version "9.8") [ + ./docs-sphinx-7.patch ] ++ lib.optionals (lib.versionAtLeast version "9.6" && lib.versionOlder version "9.6.6") [ (fetchpatch { diff --git a/pkgs/development/compilers/ghc/docs-sphinx-7-ghc98.patch b/pkgs/development/compilers/ghc/docs-sphinx-7-ghc98.patch deleted file mode 100644 index 3fc1a0f21561d..0000000000000 --- a/pkgs/development/compilers/ghc/docs-sphinx-7-ghc98.patch +++ /dev/null @@ -1,8 +0,0 @@ -Fix build of docs after sphinx update. -https://github.com/sphinx-doc/sphinx/pull/11381 -https://gitlab.haskell.org/ghc/ghc/-/issues/24129 ---- a/docs/users_guide/rtd-theme/layout.html -+++ b/docs/users_guide/rtd-theme/layout.html -@@ -28 +28 @@ -- -+ From 58cab06b5e37c39857e74a75a7db567a3cfe7e53 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 13 Feb 2025 01:44:10 +0100 Subject: [PATCH 299/343] python314: 3.14.0a4 -> 3.14.0a5 https://docs.python.org/3.14/whatsnew/changelog.html#python-3-14-0-alpha-5 --- .../python/cpython/3.12/CVE-2024-12254.patch | 45 ------------------- .../interpreters/python/cpython/default.nix | 4 +- .../interpreters/python/default.nix | 4 +- 3 files changed, 3 insertions(+), 50 deletions(-) delete mode 100644 pkgs/development/interpreters/python/cpython/3.12/CVE-2024-12254.patch diff --git a/pkgs/development/interpreters/python/cpython/3.12/CVE-2024-12254.patch b/pkgs/development/interpreters/python/cpython/3.12/CVE-2024-12254.patch deleted file mode 100644 index 1a19a41d8d4ab..0000000000000 --- a/pkgs/development/interpreters/python/cpython/3.12/CVE-2024-12254.patch +++ /dev/null @@ -1,45 +0,0 @@ -From e991ac8f2037d78140e417cc9a9486223eb3e786 Mon Sep 17 00:00:00 2001 -From: "J. Nick Koston" -Date: Thu, 5 Dec 2024 22:33:03 -0600 -Subject: [PATCH] gh-127655: Ensure `_SelectorSocketTransport.writelines` - pauses the protocol if needed (#127656) - -Ensure `_SelectorSocketTransport.writelines` pauses the protocol if it reaches the high water mark as needed. - -Co-authored-by: Kumar Aditya - -diff --git a/Lib/asyncio/selector_events.py b/Lib/asyncio/selector_events.py -index f94bf10b4225e7..f1ab9b12d69a5d 100644 ---- a/Lib/asyncio/selector_events.py -+++ b/Lib/asyncio/selector_events.py -@@ -1175,6 +1175,7 @@ def writelines(self, list_of_data): - # If the entire buffer couldn't be written, register a write handler - if self._buffer: - self._loop._add_writer(self._sock_fd, self._write_ready) -+ self._maybe_pause_protocol() - - def can_write_eof(self): - return True -diff --git a/Lib/test/test_asyncio/test_selector_events.py b/Lib/test/test_asyncio/test_selector_events.py -index aaeda33dd0c677..efca30f37414f9 100644 ---- a/Lib/test/test_asyncio/test_selector_events.py -+++ b/Lib/test/test_asyncio/test_selector_events.py -@@ -805,6 +805,18 @@ def test_writelines_send_partial(self): - self.assertTrue(self.sock.send.called) - self.assertTrue(self.loop.writers) - -+ def test_writelines_pauses_protocol(self): -+ data = memoryview(b'data') -+ self.sock.send.return_value = 2 -+ self.sock.send.fileno.return_value = 7 -+ -+ transport = self.socket_transport() -+ transport._high_water = 1 -+ transport.writelines([data]) -+ self.assertTrue(self.protocol.pause_writing.called) -+ self.assertTrue(self.sock.send.called) -+ self.assertTrue(self.loop.writers) -+ - @unittest.skipUnless(selector_events._HAS_SENDMSG, 'no sendmsg') - def test_write_sendmsg_full(self): - data = memoryview(b'data') diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix index bb3bf0b41be37..ba9292e8dd38a 100644 --- a/pkgs/development/interpreters/python/cpython/default.nix +++ b/pkgs/development/interpreters/python/cpython/default.nix @@ -254,7 +254,7 @@ in with passthru; stdenv.mkDerivation (finalAttrs: { # (since it will do a futile invocation of gcc (!) to find # libuuid, slowing down program startup a lot). noldconfigPatch - ] ++ optionals (!isPy312 && !isPy313) [ + ] ++ optionals (pythonOlder "3.12") [ # https://www.cve.org/CVERecord?id=CVE-2025-0938 ./CVE-2025-0938.patch ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform && stdenv.hostPlatform.isFreeBSD) [ @@ -299,8 +299,6 @@ in with passthru; stdenv.mkDerivation (finalAttrs: { ] ++ optionals (pythonOlder "3.12") [ # https://github.com/python/cpython/issues/90656 ./loongarch-support.patch - ] ++ optionals isPy314 [ - ./3.12/CVE-2024-12254.patch ] ++ optionals (pythonAtLeast "3.11" && pythonOlder "3.13") [ # backport fix for https://github.com/python/cpython/issues/95855 ./platform-triplet-detection.patch diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index 7473409ef418a..eb86f77f00e69 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -100,9 +100,9 @@ in { major = "3"; minor = "14"; patch = "0"; - suffix = "a4"; + suffix = "a5"; }; - hash = "sha256-wk8HiBhzwdRgIoeVymyoyZEw4wx3PJFGPTDX6o/w5ws="; + hash = "sha256-dOg/Jt4eT7nu8bVkks/5JQiDS7cawT9cWAQ4zp8JNoI="; inherit passthruFun; }; # Minimal versions of Python (built without optional dependencies) From 7c8a24b91fe143751f2e01bc10a433f3105ef70f Mon Sep 17 00:00:00 2001 From: Audrey Dutcher Date: Thu, 21 Nov 2024 05:27:03 -0700 Subject: [PATCH 300/343] openbsd.{sys,stand}: patch to support nixbsd init --- .../pkgs/{stand.nix => stand/package.nix} | 2 + .../bsd/openbsd/pkgs/sys/initpath.patch | 166 ++++++++++++++++++ .../openbsd/pkgs/{sys.nix => sys/package.nix} | 2 + 3 files changed, 170 insertions(+) rename pkgs/os-specific/bsd/openbsd/pkgs/{stand.nix => stand/package.nix} (96%) create mode 100644 pkgs/os-specific/bsd/openbsd/pkgs/sys/initpath.patch rename pkgs/os-specific/bsd/openbsd/pkgs/{sys.nix => sys/package.nix} (98%) diff --git a/pkgs/os-specific/bsd/openbsd/pkgs/stand.nix b/pkgs/os-specific/bsd/openbsd/pkgs/stand/package.nix similarity index 96% rename from pkgs/os-specific/bsd/openbsd/pkgs/stand.nix rename to pkgs/os-specific/bsd/openbsd/pkgs/stand/package.nix index 4ded2fb4c3fef..0aa3e0efec650 100644 --- a/pkgs/os-specific/bsd/openbsd/pkgs/stand.nix +++ b/pkgs/os-specific/bsd/openbsd/pkgs/stand/package.nix @@ -8,6 +8,8 @@ mkDerivation { path = "sys/arch/amd64/stand"; extraPaths = [ "sys" ]; + patches = [ ../sys/initpath.patch ]; + # gcc compat postPatch = '' find $BSDSRCDIR -name Makefile -print0 | xargs -0 sed -E -i -e 's/-nopie/-no-pie/g' diff --git a/pkgs/os-specific/bsd/openbsd/pkgs/sys/initpath.patch b/pkgs/os-specific/bsd/openbsd/pkgs/sys/initpath.patch new file mode 100644 index 0000000000000..d09c1a821cb01 --- /dev/null +++ b/pkgs/os-specific/bsd/openbsd/pkgs/sys/initpath.patch @@ -0,0 +1,166 @@ +OpenBSD hardcodes the /sbin/init path which is super unhelpful for booting a +NixOS system. This patch adds a boot parameter that can be passed through the +bootloader and into the kernel specifying which init binary to use. This patch +will assuredly not be accepted upstream but is very relevant to nixpkgs. + +This patch applies for both sys and stand. + +diff --git a/sys/arch/amd64/amd64/machdep.c b/sys/arch/amd64/amd64/machdep.c +index f58e6c585c1..874f5a74d6d 100644 +--- a/sys/arch/amd64/amd64/machdep.c ++++ b/sys/arch/amd64/amd64/machdep.c +@@ -181,6 +181,7 @@ int physmem; + u_int64_t dumpmem_low; + u_int64_t dumpmem_high; + extern int boothowto; ++extern char initpath[MAXPATHLEN]; + int cpu_class; + + paddr_t dumpmem_paddr; +@@ -255,6 +256,7 @@ bios_memmap_t *bios_memmap; + u_int32_t bios_cksumlen; + bios_efiinfo_t *bios_efiinfo; + bios_ucode_t *bios_ucode; ++char *passed_init; + + #if NEFI > 0 + EFI_MEMORY_DESCRIPTOR *mmap; +@@ -1992,6 +1994,7 @@ getbootinfo(char *bootinfo, int bootinfo_size) + bios_ddb_t *bios_ddb; + bios_bootduid_t *bios_bootduid; + bios_bootsr_t *bios_bootsr; ++ char *init_param; + #undef BOOTINFO_DEBUG + #ifdef BOOTINFO_DEBUG + printf("bootargv:"); +@@ -2089,6 +2092,11 @@ getbootinfo(char *bootinfo, int bootinfo_size) + bios_ucode = (bios_ucode_t *)q->ba_arg; + break; + ++ case BOOTARG_INIT: ++ init_param = (char*)q->ba_arg; ++ memcpy(initpath, init_param, sizeof(initpath)); ++ break; ++ + default: + #ifdef BOOTINFO_DEBUG + printf(" unsupported arg (%d) %p", q->ba_type, +diff --git a/sys/arch/amd64/include/biosvar.h b/sys/arch/amd64/include/biosvar.h +index b0c71ea0350..93e81b1b051 100644 +--- a/sys/arch/amd64/include/biosvar.h ++++ b/sys/arch/amd64/include/biosvar.h +@@ -225,6 +225,8 @@ typedef struct _bios_ucode { + uint64_t uc_size; + } __packed bios_ucode_t; + ++#define BOOTARG_INIT 13 ++ + #if defined(_KERNEL) || defined (_STANDALONE) + + #ifdef _LOCORE +diff --git a/sys/arch/amd64/stand/efiboot/efiboot.c b/sys/arch/amd64/stand/efiboot/efiboot.c +index 95cf92d298d..ee77f6769fd 100644 +--- a/sys/arch/amd64/stand/efiboot/efiboot.c ++++ b/sys/arch/amd64/stand/efiboot/efiboot.c +@@ -965,6 +965,9 @@ efi_makebootargs(void) + #endif + + addbootarg(BOOTARG_EFIINFO, sizeof(bios_efiinfo), &bios_efiinfo); ++ if (cmd.init[0] != 0) { ++ addbootarg(BOOTARG_INIT, sizeof(cmd.init), &cmd.init); ++ } + } + + /* Vendor device path used to indicate the mmio UART on AMD SoCs. */ +diff --git a/sys/kern/init_main.c b/sys/kern/init_main.c +index b4816b2e9a0..db412097035 100644 +--- a/sys/kern/init_main.c ++++ b/sys/kern/init_main.c +@@ -103,6 +103,8 @@ extern void stoeplitz_init(void); + #include "vscsi.h" + #include "softraid.h" + ++#define DEBUG 1 ++ + const char copyright[] = + "Copyright (c) 1982, 1986, 1989, 1991, 1993\n" + "\tThe Regents of the University of California. All rights reserved.\n" +@@ -127,6 +129,7 @@ int db_active = 0; + int ncpus = 1; + int ncpusfound = 1; /* number of cpus we find */ + volatile int start_init_exec; /* semaphore for start_init() */ ++char initpath[MAXPATHLEN]; + + #if !defined(NO_PROPOLICE) + long __guard_local __attribute__((section(".openbsd.randomdata"))); +@@ -557,6 +560,7 @@ static char *initpaths[] = { + "/sbin/init", + "/sbin/oinit", + "/sbin/init.bak", ++ initpath, + NULL, + }; + +diff --git a/sys/stand/boot/boot.c b/sys/stand/boot/boot.c +index e090a0d0180..1a20b1ece47 100644 +--- a/sys/stand/boot/boot.c ++++ b/sys/stand/boot/boot.c +@@ -74,7 +74,7 @@ boot(dev_t bootdev) + devboot(bootdev, cmd.bootdev); + strlcpy(cmd.image, kernelfile, sizeof(cmd.image)); + cmd.boothowto = 0; +- cmd.conf = "/etc/boot.conf"; ++ cmd.conf = "/boot/nixos/default.conf"; + cmd.timeout = boottimeout; + + if (upgrade()) { +diff --git a/sys/stand/boot/cmd.h b/sys/stand/boot/cmd.h +index 5045f052b8b..327f3de8d84 100644 +--- a/sys/stand/boot/cmd.h ++++ b/sys/stand/boot/cmd.h +@@ -43,6 +43,7 @@ struct cmd_table { + struct cmd_state { + char bootdev[BOOTDEVLEN]; /* device */ + char image[MAXPATHLEN - 16]; /* image */ ++ char init[MAXPATHLEN]; + int boothowto; /* howto */ + char *conf; /* /etc/boot.conf normally */ + int timeout; +diff --git a/sys/stand/boot/vars.c b/sys/stand/boot/vars.c +index d1516776315..b12edcdaeac 100644 +--- a/sys/stand/boot/vars.c ++++ b/sys/stand/boot/vars.c +@@ -42,6 +42,7 @@ static int Xdevice(void); + static int Xdebug(void); + #endif + static int Xdb_console(void); ++static int Xinit(void); + static int Ximage(void); + static int Xhowto(void); + #ifdef BOOT_STTY +@@ -63,6 +64,7 @@ const struct cmd_table cmd_set[] = { + {"image", CMDT_VAR, Ximage}, + {"timeout",CMDT_VAR, Xtimeout}, + {"db_console", CMDT_VAR, Xdb_console}, ++ {"init", CMDT_VAR, Xinit}, + {NULL,0} + }; + +@@ -107,6 +109,17 @@ Xdb_console(void) + return (0); + } + ++int ++Xinit(void) ++{ ++ if (cmd.argc != 2) { ++ printf("%s\n", cmd.init); ++ } else { ++ strlcpy(cmd.init, cmd.argv[1], sizeof(cmd.init)); ++ } ++ return 0; ++} ++ + static int + Xtimeout(void) + { diff --git a/pkgs/os-specific/bsd/openbsd/pkgs/sys.nix b/pkgs/os-specific/bsd/openbsd/pkgs/sys/package.nix similarity index 98% rename from pkgs/os-specific/bsd/openbsd/pkgs/sys.nix rename to pkgs/os-specific/bsd/openbsd/pkgs/sys/package.nix index ec91e20fed50a..ba91ab9230b24 100644 --- a/pkgs/os-specific/bsd/openbsd/pkgs/sys.nix +++ b/pkgs/os-specific/bsd/openbsd/pkgs/sys/package.nix @@ -16,6 +16,8 @@ extraPaths = [ "sys" ]; noLibc = true; + patches = [ ./initpath.patch ]; + extraNativeBuildInputs = [ boot-config ]; From 38af9d3c373b5ff834f0f83aa3e02f2247e017f5 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Thu, 13 Feb 2025 12:26:12 +0100 Subject: [PATCH 301/343] libseccomp: fix out-of-bounds read Fixes the tests with musl, but we probably want this fix everywhere. --- pkgs/by-name/li/libseccomp/oob-read.patch | 37 +++++++++++++++++++++++ pkgs/by-name/li/libseccomp/package.nix | 6 +++- 2 files changed, 42 insertions(+), 1 deletion(-) create mode 100644 pkgs/by-name/li/libseccomp/oob-read.patch diff --git a/pkgs/by-name/li/libseccomp/oob-read.patch b/pkgs/by-name/li/libseccomp/oob-read.patch new file mode 100644 index 0000000000000..c769abdf7e91d --- /dev/null +++ b/pkgs/by-name/li/libseccomp/oob-read.patch @@ -0,0 +1,37 @@ +From 904e9dee373eca499e976dce131f0baee06db2d6 Mon Sep 17 00:00:00 2001 +From: Alyssa Ross +Date: Thu, 13 Feb 2025 12:05:17 +0100 +Subject: [PATCH] api: fix seccomp_export_bpf_mem out-of-bounds read + +*len is the length of the destination buffer, but program->blks is +probably not anywhere near that long. It's already been checked above +that BPF_PGM_SIZE(program) is less than or equal to *len, so that's +the correct value to use here to avoid either reading or writing too +much. + +I noticed this because tests/11-basic-basic_errors started failing on +musl after e797591 ("all: add seccomp_precompute() functionality"). + +Signed-off-by: Alyssa Ross +--- +Link: https://github.com/seccomp/libseccomp/pull/458 + + src/api.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/api.c b/src/api.c +index adccef3..65a277a 100644 +--- a/src/api.c ++++ b/src/api.c +@@ -786,7 +786,7 @@ API int seccomp_export_bpf_mem(const scmp_filter_ctx ctx, void *buf, + if (BPF_PGM_SIZE(program) > *len) + rc = _rc_filter(-ERANGE); + else +- memcpy(buf, program->blks, *len); ++ memcpy(buf, program->blks, BPF_PGM_SIZE(program)); + } + *len = BPF_PGM_SIZE(program); + +-- +2.47.0 + diff --git a/pkgs/by-name/li/libseccomp/package.nix b/pkgs/by-name/li/libseccomp/package.nix index a06233a88a644..edc8f5a17666a 100644 --- a/pkgs/by-name/li/libseccomp/package.nix +++ b/pkgs/by-name/li/libseccomp/package.nix @@ -19,6 +19,10 @@ stdenv.mkDerivation rec { hash = "sha256-g7YIUjLRWIw3ncm5yuR7s3QHzyYubnSZPGG6ctKnhNw="; }; + patches = [ + ./oob-read.patch + ]; + outputs = [ "out" "lib" @@ -30,7 +34,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ gperf ]; buildInputs = [ getopt ]; - patchPhase = '' + postPatch = '' patchShebangs . ''; From 74e976c4c6f2494bc62070fe90f64e58fb1971e6 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 13 Feb 2025 13:50:11 +0100 Subject: [PATCH 302/343] sqlite: backport patch to resolve regression in 3.48.0 Unblocks the test suite of nodejs and probably other packages. --- .../sqlite/3.48.0-fk-conflict-handling.patch | 16 ++++++++++++++++ pkgs/development/libraries/sqlite/default.nix | 5 +++++ 2 files changed, 21 insertions(+) create mode 100644 pkgs/development/libraries/sqlite/3.48.0-fk-conflict-handling.patch diff --git a/pkgs/development/libraries/sqlite/3.48.0-fk-conflict-handling.patch b/pkgs/development/libraries/sqlite/3.48.0-fk-conflict-handling.patch new file mode 100644 index 0000000000000..6e3f58a7212d6 --- /dev/null +++ b/pkgs/development/libraries/sqlite/3.48.0-fk-conflict-handling.patch @@ -0,0 +1,16 @@ +diff --git a/sqlite3.c b/sqlite3.c +index 80433f6..7c234f6 100644 +--- a/sqlite3.c ++++ b/sqlite3.c +@@ -231721,6 +231721,11 @@ static int sessionChangesetApply( + } + } + ++ { ++ int rc2 = sqlite3_exec(db, "PRAGMA defer_foreign_keys = 0", 0, 0, 0); ++ if( rc==SQLITE_OK ) rc = rc2; ++ } ++ + if( (flags & SQLITE_CHANGESETAPPLY_NOSAVEPOINT)==0 ){ + if( rc==SQLITE_OK ){ + rc = sqlite3_exec(db, "RELEASE changeset_apply", 0, 0, 0); diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix index 670fad6e538d7..6a1f0f622be43 100644 --- a/pkgs/development/libraries/sqlite/default.nix +++ b/pkgs/development/libraries/sqlite/default.nix @@ -34,6 +34,11 @@ stdenv.mkDerivation rec { # Can be removed with the next release. # Test: pkgsStatic.gnupg ./Libs.private.patch + + # https://sqlite.org/forum/forumpost/00f3aab3d3be9690 + # https://sqlite.org/src/info/d7c07581 + # TODO: Remove in 3.49.0 + ./3.48.0-fk-conflict-handling.patch ]; outputs = [ "bin" "dev" "man" "doc" "out" ]; From 7390bc405af2dbc15b6c24fd9057a7fee34b5596 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 13 Feb 2025 17:23:01 +0100 Subject: [PATCH 303/343] spidermonkey: pin icu75 --- pkgs/development/interpreters/spidermonkey/common.nix | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/pkgs/development/interpreters/spidermonkey/common.nix b/pkgs/development/interpreters/spidermonkey/common.nix index f4f0024107ba4..5b29173936374 100644 --- a/pkgs/development/interpreters/spidermonkey/common.nix +++ b/pkgs/development/interpreters/spidermonkey/common.nix @@ -14,20 +14,16 @@ perl, pkg-config, python3, - python39, python311, rust-cbindgen, rustPlatform, rustc, which, zip, - autoconf213, - yasm, xcbuild, # runtime - icu, - icu67, + icu75, nspr, readline, zlib, @@ -96,7 +92,7 @@ stdenv.mkDerivation (finalAttrs: rec { buildInputs = [ - icu + icu75 nspr readline zlib From 16507bece0d5638cf6d2b5f8d4639a1797c7b9f5 Mon Sep 17 00:00:00 2001 From: Lin Jian Date: Fri, 14 Feb 2025 16:01:07 +0800 Subject: [PATCH 304/343] emacsPackages.gams-ac: ignore compilation error https://hydra.nix-community.org/build/3081096 --- .../editors/emacs/elisp-packages/melpa-packages.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix index 62f476dc5440d..9c384a5d0812d 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix @@ -1150,6 +1150,8 @@ let fxrd-mode = ignoreCompilationError super.fxrd-mode; # elisp error + gams-ac = ignoreCompilationError super.gams-ac; # need gams in PATH during compilation + # missing optional dependencies gap-mode = addPackageRequires super.gap-mode [ self.company From 367c46b91724f3eda454b56263276d625b5c7d2a Mon Sep 17 00:00:00 2001 From: Lin Jian Date: Fri, 14 Feb 2025 16:01:33 +0800 Subject: [PATCH 305/343] emacsPackages.poly-gams: ignore compilation error https://hydra.nix-community.org/build/3101532 --- .../editors/emacs/elisp-packages/melpa-packages.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix index 9c384a5d0812d..2ed31090e106d 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix @@ -1494,6 +1494,8 @@ let # https://github.com/polymode/poly-R/issues/41 poly-R = addPackageRequires super.poly-R [ self.ess ]; + poly-gams = ignoreCompilationError super.poly-gams; # need gams in PATH during compilation + # missing optional dependencies: direx e2wm yaol, yaol not on any ELPA pophint = ignoreCompilationError super.pophint; From b5befb85475250e7849341cc2d10233415c2a528 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 14 Feb 2025 10:00:07 +0100 Subject: [PATCH 306/343] llvm_18: fix hash of glibc fix Closes #381739 As mentioned in this ticket, `fetchpatch2` doesn't seem stable without `?full_index=1`. --- pkgs/development/compilers/llvm/common/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/llvm/common/default.nix b/pkgs/development/compilers/llvm/common/default.nix index a40ffd4044b41..f37539b339dca 100644 --- a/pkgs/development/compilers/llvm/common/default.nix +++ b/pkgs/development/compilers/llvm/common/default.nix @@ -494,9 +494,9 @@ let (lib.versionAtLeast metadata.release_version "17" && lib.versionOlder metadata.release_version "19") [ # Fixes test-suite on glibc 2.40 (https://github.com/llvm/llvm-project/pull/100804) - (fetchpatch2 { + (fetchpatch { url = "https://github.com/llvm/llvm-project/commit/1e8df9e85a1ff213e5868bd822877695f27504ad.patch"; - hash = "sha256-EX+PYGicK73lsL/J0kSZ4S5y1/NHIclBddhsnV6NPPI="; + hash = "sha256-mvBlG2RxpZPFnPI7jvCMz+Fc8JuM15Ye3th1FVZMizE="; stripLen = 1; }) ] From b78528c39ce44b5ee66833a8d9e7a21943b877df Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 14 Feb 2025 13:44:56 +0100 Subject: [PATCH 307/343] python313Packages.scipy: disable failing test Upstream has acknowledged this test failures and is investigating a fix for the 1.15.2 release. --- .../python-modules/scipy/default.nix | 26 +++++++++++-------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/scipy/default.nix b/pkgs/development/python-modules/scipy/default.nix index e142afdba31fa..862fdf57be719 100644 --- a/pkgs/development/python-modules/scipy/default.nix +++ b/pkgs/development/python-modules/scipy/default.nix @@ -128,17 +128,21 @@ buildPythonPackage { pytest-xdist ]; - # The following tests are broken on aarch64-darwin with newer compilers and library versions. - # See https://github.com/scipy/scipy/issues/18308 - disabledTests = lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ - "test_a_b_neg_int_after_euler_hypergeometric_transformation" - "test_dst4_definition_ortho" - "test_load_mat4_le" - "hyp2f1_test_case47" - "hyp2f1_test_case3" - "test_uint64_max" - "test_large_m4" # https://github.com/scipy/scipy/issues/22466 - ]; + disabledTests = + [ + "test_cumulative_simpson_against_simpson_with_default_dx" + ] + ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ + # The following tests are broken on aarch64-darwin with newer compilers and library versions. + # See https://github.com/scipy/scipy/issues/18308 + "test_a_b_neg_int_after_euler_hypergeometric_transformation" + "test_dst4_definition_ortho" + "test_load_mat4_le" + "hyp2f1_test_case47" + "hyp2f1_test_case3" + "test_uint64_max" + "test_large_m4" # https://github.com/scipy/scipy/issues/22466 + ]; doCheck = !(stdenv.hostPlatform.isx86_64 && stdenv.hostPlatform.isDarwin); From dd9559503b3beab22eeaa9ee0cda670b429a7778 Mon Sep 17 00:00:00 2001 From: K900 Date: Fri, 14 Feb 2025 23:30:49 +0300 Subject: [PATCH 308/343] kdePackages: Frameworks 6.10 -> 6.11 --- pkgs/kde/generated/sources/frameworks.json | 432 ++++++++++----------- 1 file changed, 216 insertions(+), 216 deletions(-) diff --git a/pkgs/kde/generated/sources/frameworks.json b/pkgs/kde/generated/sources/frameworks.json index 40280e6404f7f..f7d897c97d657 100644 --- a/pkgs/kde/generated/sources/frameworks.json +++ b/pkgs/kde/generated/sources/frameworks.json @@ -1,362 +1,362 @@ { "attica": { - "version": "6.10.0", - "url": "mirror://kde/stable/frameworks/6.10/attica-6.10.0.tar.xz", - "hash": "sha256-82wurLytjAgDbp91JRRL7J98XYbxFQ1J+duePcFKv0U=" + "version": "6.11.0", + "url": "mirror://kde/stable/frameworks/6.11/attica-6.11.0.tar.xz", + "hash": "sha256-57fAPXZWpZcOAtYcP40nYLLD2kbT9kZL/CVKczsmP7M=" }, "baloo": { - "version": "6.10.0", - "url": "mirror://kde/stable/frameworks/6.10/baloo-6.10.0.tar.xz", - "hash": "sha256-VIAZdA2UYtEK2GL8+AG+8WY2UxXa9zIJrYbLduASryo=" + "version": "6.11.0", + "url": "mirror://kde/stable/frameworks/6.11/baloo-6.11.0.tar.xz", + "hash": "sha256-u4fUBTSgDMNj0p49fQ83qdzdDYMdsaV7v4uOOVUHVgo=" }, "bluez-qt": { - "version": "6.10.0", - "url": "mirror://kde/stable/frameworks/6.10/bluez-qt-6.10.0.tar.xz", - "hash": "sha256-YqR7dwViXW66gtJk9fpCgg//r8je9lyc0AZAtHN8gi0=" + "version": "6.11.0", + "url": "mirror://kde/stable/frameworks/6.11/bluez-qt-6.11.0.tar.xz", + "hash": "sha256-k4ELpwp8rAQ7InsjrGqQfFL6L4qpDOtKz+jW1Gt+ros=" }, "breeze-icons": { - "version": "6.10.0", - "url": "mirror://kde/stable/frameworks/6.10/breeze-icons-6.10.0.tar.xz", - "hash": "sha256-/kWOuVe+ZV6oAdQfHdPEz6gp57pgQLONadCfa2nDHio=" + "version": "6.11.0", + "url": "mirror://kde/stable/frameworks/6.11/breeze-icons-6.11.0.tar.xz", + "hash": "sha256-+c2ewbakERRny6Mafu1Q7l8DhG+x9cMrOr2/aId/ik4=" }, "extra-cmake-modules": { - "version": "6.10.0", - "url": "mirror://kde/stable/frameworks/6.10/extra-cmake-modules-6.10.0.tar.xz", - "hash": "sha256-UGmJoNQAkTQD5mnBkSI42wU81rON/3Sxfi5vh5x5zKA=" + "version": "6.11.0", + "url": "mirror://kde/stable/frameworks/6.11/extra-cmake-modules-6.11.0.tar.xz", + "hash": "sha256-af2rXw/t+3PRrM/1AS1RC0huHddccR6SWmkSo+cYFLA=" }, "frameworkintegration": { - "version": "6.10.0", - "url": "mirror://kde/stable/frameworks/6.10/frameworkintegration-6.10.0.tar.xz", - "hash": "sha256-Yfw1z/sIY1F/ogcrlkdr8QlJnVj7MmQGK0C+Uo3Tr4I=" + "version": "6.11.0", + "url": "mirror://kde/stable/frameworks/6.11/frameworkintegration-6.11.0.tar.xz", + "hash": "sha256-p0R6WHBAKERjhGpHngG32CHIm187hoPLs2f1aM6oH7I=" }, "kapidox": { - "version": "6.10.0", - "url": "mirror://kde/stable/frameworks/6.10/kapidox-6.10.0.tar.xz", - "hash": "sha256-4occRoet+KNo2yMd51JdN1EOonVGO9JxKJhsaZEpdMQ=" + "version": "6.11.0", + "url": "mirror://kde/stable/frameworks/6.11/kapidox-6.11.0.tar.xz", + "hash": "sha256-o/kGK+5XNMjkUG2AoVkbnRKJpwFx0Q9N6dqIdRbetLw=" }, "karchive": { - "version": "6.10.0", - "url": "mirror://kde/stable/frameworks/6.10/karchive-6.10.0.tar.xz", - "hash": "sha256-rFFgwZ3RELva3rqcU1XL/TtcG9AM49vcSghXdmmMikg=" + "version": "6.11.0", + "url": "mirror://kde/stable/frameworks/6.11/karchive-6.11.0.tar.xz", + "hash": "sha256-EvxKxTWR+x3YHWxSQ7kAptSAZlWSY/xm6y9Jlc6544A=" }, "kauth": { - "version": "6.10.0", - "url": "mirror://kde/stable/frameworks/6.10/kauth-6.10.0.tar.xz", - "hash": "sha256-viVgG5GxKaSOSXIxviUToeuMlweoLTg5VWFlbR3xCYg=" + "version": "6.11.0", + "url": "mirror://kde/stable/frameworks/6.11/kauth-6.11.0.tar.xz", + "hash": "sha256-R5Zg6r6XGYwx8iihgnG8c5sjSUPGjpU4PDYag1ExF5s=" }, "kbookmarks": { - "version": "6.10.0", - "url": "mirror://kde/stable/frameworks/6.10/kbookmarks-6.10.0.tar.xz", - "hash": "sha256-iR6xLSuaLDzfv9uiUFmcVE1xhs6NHvB/T8TM4dV6lFs=" + "version": "6.11.0", + "url": "mirror://kde/stable/frameworks/6.11/kbookmarks-6.11.0.tar.xz", + "hash": "sha256-tcZ3RTxwMUue7MABGnMQPwReq8lLxfLyI7WXl4DIAcc=" }, "kcalendarcore": { - "version": "6.10.0", - "url": "mirror://kde/stable/frameworks/6.10/kcalendarcore-6.10.0.tar.xz", - "hash": "sha256-mI8v1kg0GWc4TZXT0Su5Nqinc3qTHnLCtWFgULwwM2o=" + "version": "6.11.0", + "url": "mirror://kde/stable/frameworks/6.11/kcalendarcore-6.11.0.tar.xz", + "hash": "sha256-6iYTJNG4DvR4a4bPhr+jLDMqoDV7BbopmxP1S+aac4A=" }, "kcmutils": { - "version": "6.10.0", - "url": "mirror://kde/stable/frameworks/6.10/kcmutils-6.10.0.tar.xz", - "hash": "sha256-pLy0sE7koDqan9u5bCc2Ah2Usiwi+NXV0Ve5zpgusAE=" + "version": "6.11.0", + "url": "mirror://kde/stable/frameworks/6.11/kcmutils-6.11.0.tar.xz", + "hash": "sha256-ZNLFzYFlGJwtdBu1Q6q3K1vI21xUDKTojC+ND5PneZA=" }, "kcodecs": { - "version": "6.10.0", - "url": "mirror://kde/stable/frameworks/6.10/kcodecs-6.10.0.tar.xz", - "hash": "sha256-lhg/+7GFAs1ntvx4rChuIz70buDXE+4d8stME48hQaA=" + "version": "6.11.0", + "url": "mirror://kde/stable/frameworks/6.11/kcodecs-6.11.0.tar.xz", + "hash": "sha256-+93EN7qZadiWNbdfDvfkHJJcYcZNrB//AIwukTgTn+Q=" }, "kcolorscheme": { - "version": "6.10.0", - "url": "mirror://kde/stable/frameworks/6.10/kcolorscheme-6.10.0.tar.xz", - "hash": "sha256-8HDtWT8dQBCvWlbiR1Mr6WosfKm+/JIrCEwWIVr3m98=" + "version": "6.11.0", + "url": "mirror://kde/stable/frameworks/6.11/kcolorscheme-6.11.0.tar.xz", + "hash": "sha256-iye924MPAXP0SumqwFITV5kJuF+mlqKHGy7hHLI5vMg=" }, "kcompletion": { - "version": "6.10.0", - "url": "mirror://kde/stable/frameworks/6.10/kcompletion-6.10.0.tar.xz", - "hash": "sha256-tW6SW76IHIn86cgEQeFWWtGt/LFvHKxbsIooH7kzS8k=" + "version": "6.11.0", + "url": "mirror://kde/stable/frameworks/6.11/kcompletion-6.11.0.tar.xz", + "hash": "sha256-yBK2DeRTDeMAORbkX7qxIcX59XbiQwqyzfDj5MkEGFI=" }, "kconfig": { - "version": "6.10.0", - "url": "mirror://kde/stable/frameworks/6.10/kconfig-6.10.0.tar.xz", - "hash": "sha256-AO8sdb5ous+MMOO/ByNYuPbSvHjUYuexTAhoCMadjX8=" + "version": "6.11.0", + "url": "mirror://kde/stable/frameworks/6.11/kconfig-6.11.0.tar.xz", + "hash": "sha256-xxByqvJ3EpW1kfxi1PtlfO+zjfKfJA75xxIIVLQtD38=" }, "kconfigwidgets": { - "version": "6.10.0", - "url": "mirror://kde/stable/frameworks/6.10/kconfigwidgets-6.10.0.tar.xz", - "hash": "sha256-XLF7yvquPu/BRPsQFPFMuZmMnhO3FICNlAqyDZwPtRw=" + "version": "6.11.0", + "url": "mirror://kde/stable/frameworks/6.11/kconfigwidgets-6.11.0.tar.xz", + "hash": "sha256-KKG7ElFh/pqw2/qJlDNRLpKGab4xzhSfolGRokpQJCo=" }, "kcontacts": { - "version": "6.10.0", - "url": "mirror://kde/stable/frameworks/6.10/kcontacts-6.10.0.tar.xz", - "hash": "sha256-tiKtARklWE+4LPC/6nE/3dQQHEerbCPvtfuHjxpptG0=" + "version": "6.11.0", + "url": "mirror://kde/stable/frameworks/6.11/kcontacts-6.11.0.tar.xz", + "hash": "sha256-LwzSazK9utFLbl8+/5niOu3yQl6ssNTW9Eck3ObiZWI=" }, "kcoreaddons": { - "version": "6.10.0", - "url": "mirror://kde/stable/frameworks/6.10/kcoreaddons-6.10.0.tar.xz", - "hash": "sha256-ib8odHkV6YfKshx3OXsJccr/oSWLb1dVQ9c9QYgYSnI=" + "version": "6.11.0", + "url": "mirror://kde/stable/frameworks/6.11/kcoreaddons-6.11.0.tar.xz", + "hash": "sha256-/2kcbgkzST6j6MSgukH6Rs7XuTlObzXvne40nM/MOjk=" }, "kcrash": { - "version": "6.10.0", - "url": "mirror://kde/stable/frameworks/6.10/kcrash-6.10.0.tar.xz", - "hash": "sha256-wDKdpqwoqqyCTbI15XiZnkpIflztuzzsOmo56e6bXbQ=" + "version": "6.11.0", + "url": "mirror://kde/stable/frameworks/6.11/kcrash-6.11.0.tar.xz", + "hash": "sha256-uhPp9d0rQBJdXWHSm2EttjgzFdwPUQzB8OM7tsmwrok=" }, "kdav": { - "version": "6.10.0", - "url": "mirror://kde/stable/frameworks/6.10/kdav-6.10.0.tar.xz", - "hash": "sha256-Lo7/Pow1ABaIgHqX5JCm54Uaehof33LfVVmGO4YSkD0=" + "version": "6.11.0", + "url": "mirror://kde/stable/frameworks/6.11/kdav-6.11.0.tar.xz", + "hash": "sha256-nKVYbmcvVkOYjc1gS2oDD1mz1eePHPNyXy5PJXhSNA4=" }, "kdbusaddons": { - "version": "6.10.0", - "url": "mirror://kde/stable/frameworks/6.10/kdbusaddons-6.10.0.tar.xz", - "hash": "sha256-6Iv6pqEPgNn3shFigcRIUhOYTK7VVaxoVXu1PuiLuzI=" + "version": "6.11.0", + "url": "mirror://kde/stable/frameworks/6.11/kdbusaddons-6.11.0.tar.xz", + "hash": "sha256-YuDzsEh+8atyn8hby1SYyUSeC3T+gEl3lDQVi7ixKoc=" }, "kdeclarative": { - "version": "6.10.0", - "url": "mirror://kde/stable/frameworks/6.10/kdeclarative-6.10.0.tar.xz", - "hash": "sha256-256yteYVtISUnkGsWgXFzqE24jHRWj3iA5As7c39nnM=" + "version": "6.11.0", + "url": "mirror://kde/stable/frameworks/6.11/kdeclarative-6.11.0.tar.xz", + "hash": "sha256-augRNnvLyBkPil0u85qObHKHHEHsJuKksMODJKPoWWs=" }, "kded": { - "version": "6.10.0", - "url": "mirror://kde/stable/frameworks/6.10/kded-6.10.0.tar.xz", - "hash": "sha256-VgHZ2/3JUH/q8X9HdLt9EtOMfhlySui5h2OaFv8Oao4=" + "version": "6.11.0", + "url": "mirror://kde/stable/frameworks/6.11/kded-6.11.0.tar.xz", + "hash": "sha256-VcmSERQpmr2b3F5gHMxqdQ/y0zH8CDbXlnDMvFCOBqQ=" }, "kdesu": { - "version": "6.10.0", - "url": "mirror://kde/stable/frameworks/6.10/kdesu-6.10.0.tar.xz", - "hash": "sha256-WrmTq8qFy1eYu0N7lqKz2IB534YSjuMNZu4R9g5Rwi4=" + "version": "6.11.0", + "url": "mirror://kde/stable/frameworks/6.11/kdesu-6.11.0.tar.xz", + "hash": "sha256-qstJ0xPnnxBnlcTat96Zkeb+TnJMK0wZ3u/NFx9qO6c=" }, "kdnssd": { - "version": "6.10.0", - "url": "mirror://kde/stable/frameworks/6.10/kdnssd-6.10.0.tar.xz", - "hash": "sha256-/Y8IUB/EC5op/DcPf3hxCD8kiZIuG9ULxbD9eAF9qic=" + "version": "6.11.0", + "url": "mirror://kde/stable/frameworks/6.11/kdnssd-6.11.0.tar.xz", + "hash": "sha256-ads1S7Km+qwW7B63fm9xMI+OvZIFlnx121usk355m9k=" }, "kdoctools": { - "version": "6.10.0", - "url": "mirror://kde/stable/frameworks/6.10/kdoctools-6.10.0.tar.xz", - "hash": "sha256-A/qY4SEyNe5NSDnRbj7bIu5WhJuasD0UBjnPn6y2sDg=" + "version": "6.11.0", + "url": "mirror://kde/stable/frameworks/6.11/kdoctools-6.11.0.tar.xz", + "hash": "sha256-383GoCWPXMLlXSSPYWzHxiJOGwYUDetofkAbU3lZ/Ag=" }, "kfilemetadata": { - "version": "6.10.0", - "url": "mirror://kde/stable/frameworks/6.10/kfilemetadata-6.10.0.tar.xz", - "hash": "sha256-EAtIdwoWuOEt0+xAdb3TuDM+eWLS/HSSzQd9zAPjw1U=" + "version": "6.11.0", + "url": "mirror://kde/stable/frameworks/6.11/kfilemetadata-6.11.0.tar.xz", + "hash": "sha256-+RkJaer2b50naQzDuFo9GTle42V1gsmubJTEmhEzEsc=" }, "kglobalaccel": { - "version": "6.10.0", - "url": "mirror://kde/stable/frameworks/6.10/kglobalaccel-6.10.0.tar.xz", - "hash": "sha256-BbDsakTUPOepz9bNcMjQfcpcX2IWlor4Eo/ppe2bGSg=" + "version": "6.11.0", + "url": "mirror://kde/stable/frameworks/6.11/kglobalaccel-6.11.0.tar.xz", + "hash": "sha256-BVLk5cWKJEczr0nP3QyPwEpjgotsI0azaCAiLV47zvU=" }, "kguiaddons": { - "version": "6.10.0", - "url": "mirror://kde/stable/frameworks/6.10/kguiaddons-6.10.0.tar.xz", - "hash": "sha256-s74EB3MT5VnFqPZkkdXShs7+lHqvfIk3VEzoWvSFP/o=" + "version": "6.11.0", + "url": "mirror://kde/stable/frameworks/6.11/kguiaddons-6.11.0.tar.xz", + "hash": "sha256-7wkl9gmuW2LtaJRR3+mTdxnOTsJnFJUrVJbj4SjVzFw=" }, "kholidays": { - "version": "6.10.0", - "url": "mirror://kde/stable/frameworks/6.10/kholidays-6.10.0.tar.xz", - "hash": "sha256-eI7+ynpVJMWmaGI6uoMK1th1qicR8MrF8jKa3Sq0RY0=" + "version": "6.11.0", + "url": "mirror://kde/stable/frameworks/6.11/kholidays-6.11.0.tar.xz", + "hash": "sha256-zNv6ter8BDV0kA1m4AIjJvYEjn3NsJvFON7eqZiJxq8=" }, "ki18n": { - "version": "6.10.0", - "url": "mirror://kde/stable/frameworks/6.10/ki18n-6.10.0.tar.xz", - "hash": "sha256-L1nwk/jONAq0bFVrNcLq0rlt/rL/ACTFU6yMU+m4oRo=" + "version": "6.11.0", + "url": "mirror://kde/stable/frameworks/6.11/ki18n-6.11.0.tar.xz", + "hash": "sha256-ZYoFzsoYS6Mc5YpunFHudvKClFnFbbzTutOqFX6vEf4=" }, "kiconthemes": { - "version": "6.10.0", - "url": "mirror://kde/stable/frameworks/6.10/kiconthemes-6.10.0.tar.xz", - "hash": "sha256-FYB+eFGDwEiBCvAUGzpWAIXyu/APOiH+li6zemc/kxQ=" + "version": "6.11.0", + "url": "mirror://kde/stable/frameworks/6.11/kiconthemes-6.11.0.tar.xz", + "hash": "sha256-FnGrP9mx4HU6cGK6uA9UifOsdQ7LMLkduZpmiZiK+4c=" }, "kidletime": { - "version": "6.10.0", - "url": "mirror://kde/stable/frameworks/6.10/kidletime-6.10.0.tar.xz", - "hash": "sha256-+iX+hmrv1FNgIhQoIs6YVveoX/qVBwmAUn3psx6rCYg=" + "version": "6.11.0", + "url": "mirror://kde/stable/frameworks/6.11/kidletime-6.11.0.tar.xz", + "hash": "sha256-lu+wtTOjfdsuGIjf99RyLBnEfWYPdNGwpCLrlXGPSII=" }, "kimageformats": { - "version": "6.10.0", - "url": "mirror://kde/stable/frameworks/6.10/kimageformats-6.10.0.tar.xz", - "hash": "sha256-4W8y7mQ5MZmig5Qvb+e293s3RgNPkOQkRonCj6qx+dM=" + "version": "6.11.0", + "url": "mirror://kde/stable/frameworks/6.11/kimageformats-6.11.0.tar.xz", + "hash": "sha256-DEV4f5fQD8Alf33jJQ2E6VDeKjMsRedSgTj3z4QxVMw=" }, "kio": { - "version": "6.10.0", - "url": "mirror://kde/stable/frameworks/6.10/kio-6.10.0.tar.xz", - "hash": "sha256-frRUQ48Unn7VE8O71Sa2fj4+z+Mq58mGFouqWWALaZw=" + "version": "6.11.0", + "url": "mirror://kde/stable/frameworks/6.11/kio-6.11.0.tar.xz", + "hash": "sha256-/lEeQ6U4b5Y8mv75OiHA30Siwk/MQXd35NBWkQJHf/g=" }, "kirigami": { - "version": "6.10.0", - "url": "mirror://kde/stable/frameworks/6.10/kirigami-6.10.0.tar.xz", - "hash": "sha256-LiRf/Xnsofz7WR9D/znnwvUWDoaKNuIOu+LWbFUNqNQ=" + "version": "6.11.0", + "url": "mirror://kde/stable/frameworks/6.11/kirigami-6.11.0.tar.xz", + "hash": "sha256-IjkslbuDXxFiYlDwcoznNZDbY4gU5xgRSPz2ah9ELqY=" }, "kitemmodels": { - "version": "6.10.0", - "url": "mirror://kde/stable/frameworks/6.10/kitemmodels-6.10.0.tar.xz", - "hash": "sha256-g4WaSu5nv152ipMyVCImTLnoRwE/KBxcsC5jHDs7AAc=" + "version": "6.11.0", + "url": "mirror://kde/stable/frameworks/6.11/kitemmodels-6.11.0.tar.xz", + "hash": "sha256-OY3E48XERGE1CiCsI0BVuvwrGEKE3eqRVjE072L11qY=" }, "kitemviews": { - "version": "6.10.0", - "url": "mirror://kde/stable/frameworks/6.10/kitemviews-6.10.0.tar.xz", - "hash": "sha256-ixX/VxnqZenQxyLupkEuMS0F2dpJyHLK+dl9Mp1W120=" + "version": "6.11.0", + "url": "mirror://kde/stable/frameworks/6.11/kitemviews-6.11.0.tar.xz", + "hash": "sha256-42JTaOP4z2EnIYzD6Ef78BdqWXjIYiixGjIK2W/qLLw=" }, "kjobwidgets": { - "version": "6.10.0", - "url": "mirror://kde/stable/frameworks/6.10/kjobwidgets-6.10.0.tar.xz", - "hash": "sha256-7j/10hyEhJWdCvGXanwbqwH0NoQU3y67LLhUCzwoaRs=" + "version": "6.11.0", + "url": "mirror://kde/stable/frameworks/6.11/kjobwidgets-6.11.0.tar.xz", + "hash": "sha256-K7NC5VT47PhNchimVnYo3Mc8G5FNDFqtHIv3dTmG3dc=" }, "knewstuff": { - "version": "6.10.0", - "url": "mirror://kde/stable/frameworks/6.10/knewstuff-6.10.0.tar.xz", - "hash": "sha256-gctepU/gPSf4Ckgd3hinZ8oalSZ0A72HSDz92BmB5Oc=" + "version": "6.11.0", + "url": "mirror://kde/stable/frameworks/6.11/knewstuff-6.11.0.tar.xz", + "hash": "sha256-izgCtrZDCatnCa81DySNxi4+bVCw207LDJaKz7+yNSA=" }, "knotifications": { - "version": "6.10.0", - "url": "mirror://kde/stable/frameworks/6.10/knotifications-6.10.0.tar.xz", - "hash": "sha256-NreIHVBADze0866qTApqlD5Xg9NUQeKwys3G2tBq8qE=" + "version": "6.11.0", + "url": "mirror://kde/stable/frameworks/6.11/knotifications-6.11.0.tar.xz", + "hash": "sha256-ouCBXqblwpT902MWypeSpAb1wSPsAaHHOn5Uywvi6jE=" }, "knotifyconfig": { - "version": "6.10.0", - "url": "mirror://kde/stable/frameworks/6.10/knotifyconfig-6.10.0.tar.xz", - "hash": "sha256-8LpEeljt79gwKQXtiAMCkZkOJz7e2X0R0rfemGo10Fw=" + "version": "6.11.0", + "url": "mirror://kde/stable/frameworks/6.11/knotifyconfig-6.11.0.tar.xz", + "hash": "sha256-YSURFhdYFEqdPZnU8KnrdZMcP4r1lm4EWgiAI8odDG8=" }, "kpackage": { - "version": "6.10.0", - "url": "mirror://kde/stable/frameworks/6.10/kpackage-6.10.0.tar.xz", - "hash": "sha256-D0nBzbSeAcbc43KrvJgUzL10t/KxMMcxBnQ0XjSYzsE=" + "version": "6.11.0", + "url": "mirror://kde/stable/frameworks/6.11/kpackage-6.11.0.tar.xz", + "hash": "sha256-v8cE6hcI83FQqdFO3Lue7Y6/jVR1OTDaY0Ms2pVKHqc=" }, "kparts": { - "version": "6.10.0", - "url": "mirror://kde/stable/frameworks/6.10/kparts-6.10.0.tar.xz", - "hash": "sha256-o8Rg9jXzLiVAk9o9RtU/6aSnzKWYcUkEeYG0d8UKBgw=" + "version": "6.11.0", + "url": "mirror://kde/stable/frameworks/6.11/kparts-6.11.0.tar.xz", + "hash": "sha256-OZXzVWq6Q03nsT2uCZtRoKhq6t5guh4GWSg21AZpu2o=" }, "kpeople": { - "version": "6.10.0", - "url": "mirror://kde/stable/frameworks/6.10/kpeople-6.10.0.tar.xz", - "hash": "sha256-qZHFOdeWTf2UeIn9P5suElnYwNPcaTwUwb382NKZcfA=" + "version": "6.11.0", + "url": "mirror://kde/stable/frameworks/6.11/kpeople-6.11.0.tar.xz", + "hash": "sha256-P2evQ0QjWOe02aCoHYYTNwf/quD14FxIqh85DsR/+Ws=" }, "kplotting": { - "version": "6.10.0", - "url": "mirror://kde/stable/frameworks/6.10/kplotting-6.10.0.tar.xz", - "hash": "sha256-aUHZMBm/semXfPpZK6EQ+/nDt/JHr0DzNuBABx+SLT8=" + "version": "6.11.0", + "url": "mirror://kde/stable/frameworks/6.11/kplotting-6.11.0.tar.xz", + "hash": "sha256-zrkVzAJs0g/xDo/bPkkU6mH3Noai2f5qiDml6tFKmJI=" }, "kpty": { - "version": "6.10.0", - "url": "mirror://kde/stable/frameworks/6.10/kpty-6.10.0.tar.xz", - "hash": "sha256-H8zZLWfqwL/q2sO627QJ3Ncg7SJChO0FYWarV4fy1kc=" + "version": "6.11.0", + "url": "mirror://kde/stable/frameworks/6.11/kpty-6.11.0.tar.xz", + "hash": "sha256-8dmFvwoUBhp2THwBvLbPKEpZrYLeE+cs/RvSaIGe68I=" }, "kquickcharts": { - "version": "6.10.0", - "url": "mirror://kde/stable/frameworks/6.10/kquickcharts-6.10.0.tar.xz", - "hash": "sha256-ogNvex7nq7nCeMeCL8GHI9Zh2Fbanb+fAGzuvtcxWY8=" + "version": "6.11.0", + "url": "mirror://kde/stable/frameworks/6.11/kquickcharts-6.11.0.tar.xz", + "hash": "sha256-/8Naew3eUqza5QiSWlVbdgBsydS3jrAD6aMc1DnymT8=" }, "krunner": { - "version": "6.10.0", - "url": "mirror://kde/stable/frameworks/6.10/krunner-6.10.0.tar.xz", - "hash": "sha256-RZyXrVEMNWXUVHtRxNuvGbODTAr993v27k3/NGlX1is=" + "version": "6.11.0", + "url": "mirror://kde/stable/frameworks/6.11/krunner-6.11.0.tar.xz", + "hash": "sha256-IXnaZWN12IOep8LFAgh7UnxnFeEBhYKsj2NhLKUnqpA=" }, "kservice": { - "version": "6.10.0", - "url": "mirror://kde/stable/frameworks/6.10/kservice-6.10.0.tar.xz", - "hash": "sha256-BK1ThQln44gi+K8WUrEYmSzRv6OC4nGCeLtt4DoL27M=" + "version": "6.11.0", + "url": "mirror://kde/stable/frameworks/6.11/kservice-6.11.0.tar.xz", + "hash": "sha256-FhzSlld/+YArCIsGhm7Fq0wcGm/hn3a7UTTN+KarQAU=" }, "kstatusnotifieritem": { - "version": "6.10.0", - "url": "mirror://kde/stable/frameworks/6.10/kstatusnotifieritem-6.10.0.tar.xz", - "hash": "sha256-T6GYQ6c3tDZ00Zua0xRmxqpku+J3CQc8PiwzqgO/rCI=" + "version": "6.11.0", + "url": "mirror://kde/stable/frameworks/6.11/kstatusnotifieritem-6.11.0.tar.xz", + "hash": "sha256-JsksJbH3Apa96ecfuh9xl3jIXLVyJ/YEX2Bq+ZxIqL0=" }, "ksvg": { - "version": "6.10.0", - "url": "mirror://kde/stable/frameworks/6.10/ksvg-6.10.0.tar.xz", - "hash": "sha256-Fz4VH274NgFJ+DWx/HSU6Xoz+QVtKUqyE8nvnm2E0Mg=" + "version": "6.11.0", + "url": "mirror://kde/stable/frameworks/6.11/ksvg-6.11.0.tar.xz", + "hash": "sha256-BTCS42t23u/+GWKa4So3KxcvlHvuPMIDTGjnuk4dps8=" }, "ktexteditor": { - "version": "6.10.0", - "url": "mirror://kde/stable/frameworks/6.10/ktexteditor-6.10.0.tar.xz", - "hash": "sha256-P4DE/rhzfO+Dd14sefhgYMFq+J7otI4tcvlL3BoYC58=" + "version": "6.11.0", + "url": "mirror://kde/stable/frameworks/6.11/ktexteditor-6.11.0.tar.xz", + "hash": "sha256-gtM9zK2Y4vUU3k0XxOZlGX/dhYilWXk1j4iu6sb8RBk=" }, "ktexttemplate": { - "version": "6.10.0", - "url": "mirror://kde/stable/frameworks/6.10/ktexttemplate-6.10.0.tar.xz", - "hash": "sha256-PjkZCtuQ1PcWcuM9EXs1/oSo81qqkKZ4hGQBBEiUqj0=" + "version": "6.11.0", + "url": "mirror://kde/stable/frameworks/6.11/ktexttemplate-6.11.0.tar.xz", + "hash": "sha256-sPMMbkmhMs31hyKOC6Hh2XTMFV0jO1f/YX9dVef3uQU=" }, "ktextwidgets": { - "version": "6.10.0", - "url": "mirror://kde/stable/frameworks/6.10/ktextwidgets-6.10.0.tar.xz", - "hash": "sha256-TbZ75w2mjj/SwqnTNZ3PubEeuCo08riNPm7QjjWKsHM=" + "version": "6.11.0", + "url": "mirror://kde/stable/frameworks/6.11/ktextwidgets-6.11.0.tar.xz", + "hash": "sha256-DwQ7imBpjM24jj1pV7X1yXz+eT6i7qQh/EZ//98gBpc=" }, "kunitconversion": { - "version": "6.10.0", - "url": "mirror://kde/stable/frameworks/6.10/kunitconversion-6.10.0.tar.xz", - "hash": "sha256-I8WZBNSASd648d6KpW57DBCp/IKAjzajL09EZDOGnb8=" + "version": "6.11.0", + "url": "mirror://kde/stable/frameworks/6.11/kunitconversion-6.11.0.tar.xz", + "hash": "sha256-jSaoPRNxvXDEgoFwhoDGnmH6ykSWPeq1LQfJcjwn7kk=" }, "kuserfeedback": { - "version": "6.10.0", - "url": "mirror://kde/stable/frameworks/6.10/kuserfeedback-6.10.0.tar.xz", - "hash": "sha256-XdF9pxaampDIJ1dTbGZ9dI0ZCZhbl5ux4uUdqEoHNy8=" + "version": "6.11.0", + "url": "mirror://kde/stable/frameworks/6.11/kuserfeedback-6.11.0.tar.xz", + "hash": "sha256-rFFre4+c0IkWZPi1gNClpcSUz2tdv93Ye29iVlSLeRA=" }, "kwallet": { - "version": "6.10.0", - "url": "mirror://kde/stable/frameworks/6.10/kwallet-6.10.0.tar.xz", - "hash": "sha256-4Zk5EaFbQxjWSrzgrNwbX8WmEW3HWV7/ht3gOzXmvVA=" + "version": "6.11.0", + "url": "mirror://kde/stable/frameworks/6.11/kwallet-6.11.0.tar.xz", + "hash": "sha256-zpSwMkRu0eE4PmcxhbWkNy3uq3Hfi3pJCDobbq2CLgk=" }, "kwidgetsaddons": { - "version": "6.10.0", - "url": "mirror://kde/stable/frameworks/6.10/kwidgetsaddons-6.10.0.tar.xz", - "hash": "sha256-4PpJQ9eHQof9LCwlTx7yHt9+VztrGTVN9f3vjLvv504=" + "version": "6.11.0", + "url": "mirror://kde/stable/frameworks/6.11/kwidgetsaddons-6.11.0.tar.xz", + "hash": "sha256-HGTnNUgEhF2wzYOuZx37XSywgwhVGgtse4ozmqbctDY=" }, "kwindowsystem": { - "version": "6.10.0", - "url": "mirror://kde/stable/frameworks/6.10/kwindowsystem-6.10.0.tar.xz", - "hash": "sha256-BGt6oiR4ETI+SLYpiEuCSm/+xHXfIxYlbn/wud9neUQ=" + "version": "6.11.0", + "url": "mirror://kde/stable/frameworks/6.11/kwindowsystem-6.11.0.tar.xz", + "hash": "sha256-2HLoXQkV3Vzx4rr4n772LphV/zMX7MWTmIK8FyRijVo=" }, "kxmlgui": { - "version": "6.10.0", - "url": "mirror://kde/stable/frameworks/6.10/kxmlgui-6.10.0.tar.xz", - "hash": "sha256-Vh+nVWONoWyuIEtnD2L6twFWuRIbkxNhIjjKnJ6OEpI=" + "version": "6.11.0", + "url": "mirror://kde/stable/frameworks/6.11/kxmlgui-6.11.0.tar.xz", + "hash": "sha256-acOmpjY72+PMus524jxszsFz6w+cGVTvcxfZmNbttvw=" }, "modemmanager-qt": { - "version": "6.10.0", - "url": "mirror://kde/stable/frameworks/6.10/modemmanager-qt-6.10.0.tar.xz", - "hash": "sha256-ZAo/lkh/Podeg++BXxThB3BCrp7oMnaz1/f8OHXi7hU=" + "version": "6.11.0", + "url": "mirror://kde/stable/frameworks/6.11/modemmanager-qt-6.11.0.tar.xz", + "hash": "sha256-pjYyOQLFepq/GZFo6cM7NDLFOOJ2JR5rt851P//vX+4=" }, "networkmanager-qt": { - "version": "6.10.0", - "url": "mirror://kde/stable/frameworks/6.10/networkmanager-qt-6.10.0.tar.xz", - "hash": "sha256-L0N6trU0+33N5u1A69wsFoBTL3QrjjJupopHrlgXMZE=" + "version": "6.11.0", + "url": "mirror://kde/stable/frameworks/6.11/networkmanager-qt-6.11.0.tar.xz", + "hash": "sha256-5uFyMk5Ml4WRKZ4pga1q445dHj1422rIN1FgSvICtgw=" }, "prison": { - "version": "6.10.0", - "url": "mirror://kde/stable/frameworks/6.10/prison-6.10.0.tar.xz", - "hash": "sha256-tKDzleylDIGPjgZWsEZkeDRTsamnCaSkWori4nNgLHs=" + "version": "6.11.0", + "url": "mirror://kde/stable/frameworks/6.11/prison-6.11.0.tar.xz", + "hash": "sha256-fMjf8+8XKyTRDuUMCHbXnIdzC2+yO9Z4cI93cLnaTyA=" }, "purpose": { - "version": "6.10.0", - "url": "mirror://kde/stable/frameworks/6.10/purpose-6.10.0.tar.xz", - "hash": "sha256-Gd55Q993LBtc4ncQmaF1Nul+f/bFpUEcE0bCWyTlGlc=" + "version": "6.11.0", + "url": "mirror://kde/stable/frameworks/6.11/purpose-6.11.0.tar.xz", + "hash": "sha256-SOFy8Fhp4aLMGeDrYjCuEs/iPSNLQNbTuy9BHH9phOA=" }, "qqc2-desktop-style": { - "version": "6.10.0", - "url": "mirror://kde/stable/frameworks/6.10/qqc2-desktop-style-6.10.0.tar.xz", - "hash": "sha256-nhlUD4+n0Oah/7HDU6JOjH+OKzeoWUOTr3pNXZ4OjlE=" + "version": "6.11.0", + "url": "mirror://kde/stable/frameworks/6.11/qqc2-desktop-style-6.11.0.tar.xz", + "hash": "sha256-mWVCcWGWv6yKIoo2tGGMmS4ZN4J3nc9BONY444MGZSw=" }, "solid": { - "version": "6.10.0", - "url": "mirror://kde/stable/frameworks/6.10/solid-6.10.0.tar.xz", - "hash": "sha256-JIkugaMEf3U1GdvThLR2NcWiVD2O4L88KZsPz+8xjow=" + "version": "6.11.0", + "url": "mirror://kde/stable/frameworks/6.11/solid-6.11.0.tar.xz", + "hash": "sha256-zezHZluAGlCLmtCSmwJayT/ih75QNYnI2MOKUgwlCNc=" }, "sonnet": { - "version": "6.10.0", - "url": "mirror://kde/stable/frameworks/6.10/sonnet-6.10.0.tar.xz", - "hash": "sha256-mcC8pWNZT9EV8x8YrTJkdwBGKQxmld7Q0qo8Lt2w1Lc=" + "version": "6.11.0", + "url": "mirror://kde/stable/frameworks/6.11/sonnet-6.11.0.tar.xz", + "hash": "sha256-GUQd5i2dl/YeSNJuADVD51YHsrqPbk/rGflWKJryHWA=" }, "syndication": { - "version": "6.10.0", - "url": "mirror://kde/stable/frameworks/6.10/syndication-6.10.0.tar.xz", - "hash": "sha256-p0PFJegG5fB7W3snz+NIghALIStNhG5mHGGieuE5YzA=" + "version": "6.11.0", + "url": "mirror://kde/stable/frameworks/6.11/syndication-6.11.0.tar.xz", + "hash": "sha256-2InFU6UYkzkhfo0GtihZWro8hCt0aT56gXlgaxNinh0=" }, "syntax-highlighting": { - "version": "6.10.0", - "url": "mirror://kde/stable/frameworks/6.10/syntax-highlighting-6.10.0.tar.xz", - "hash": "sha256-tbXjQ/8nvFyVvgBR1WBt/LMpX4NYMOf8bayNKGOJFpk=" + "version": "6.11.0", + "url": "mirror://kde/stable/frameworks/6.11/syntax-highlighting-6.11.0.tar.xz", + "hash": "sha256-sj274ZUDCiknyq/F/fTKejcsRMqVAT1hFQN/5i4fy1E=" }, "threadweaver": { - "version": "6.10.0", - "url": "mirror://kde/stable/frameworks/6.10/threadweaver-6.10.0.tar.xz", - "hash": "sha256-E2pjajPM+po3Wi4e5QN2CgqRAAK5cr4O7yA1LrEGu4Q=" + "version": "6.11.0", + "url": "mirror://kde/stable/frameworks/6.11/threadweaver-6.11.0.tar.xz", + "hash": "sha256-xAjZ7zwT6ZBubvGhYt71v3RZ8JkZexeI6z2W30UF3Y8=" } } \ No newline at end of file From cbebd8b37d0a17330bbdb5c85db3bdda490995e4 Mon Sep 17 00:00:00 2001 From: K900 Date: Sat, 15 Feb 2025 07:15:57 +0300 Subject: [PATCH 309/343] xmlsec: 1.3.6 -> 1.3.7 --- pkgs/by-name/xm/xmlsec/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/xm/xmlsec/package.nix b/pkgs/by-name/xm/xmlsec/package.nix index fe39e71476603..6702290cc24a2 100644 --- a/pkgs/by-name/xm/xmlsec/package.nix +++ b/pkgs/by-name/xm/xmlsec/package.nix @@ -4,11 +4,11 @@ lib.fix (self: stdenv.mkDerivation rec { pname = "xmlsec"; - version = "1.3.6"; + version = "1.3.7"; src = fetchurl { url = "https://www.aleksey.com/xmlsec/download/xmlsec1-${version}.tar.gz"; - sha256 = "sha256-lStiatPzvhpFmGItq1L9qyqGBNCDfBsAWJ82N1Na+S8="; + sha256 = "sha256-2C6TtpuKogWmFrYpF6JpMiv2Oj6q+zd1AU5hdSsgE+o="; }; patches = [ From b4af5c72afd583278aa4a231e9a83739b1bb528a Mon Sep 17 00:00:00 2001 From: K900 Date: Sat, 15 Feb 2025 07:53:24 +0300 Subject: [PATCH 310/343] wavpack: 5.8.0 -> 5.8.1 Diff: https://github.com/dbry/WavPack/compare/5.8.0...5.8.1 Changelog: https://github.com/dbry/WavPack/releases/tag/5.8.1 --- pkgs/by-name/wa/wavpack/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/wa/wavpack/package.nix b/pkgs/by-name/wa/wavpack/package.nix index fb7dea59c9515..3dbe41e1d9497 100644 --- a/pkgs/by-name/wa/wavpack/package.nix +++ b/pkgs/by-name/wa/wavpack/package.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { pname = "wavpack"; - version = "5.8.0"; + version = "5.8.1"; enableParallelBuilding = true; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { owner = "dbry"; repo = "WavPack"; rev = version; - hash = "sha256-JT4WOlga3jyHMznEJmgc6EQIAVBZdlazmQphJC1+r4s="; + hash = "sha256-V9jRIuDpZYIBohJRouGr2TI32BZMXSNVfavqPl56YO0="; }; outputs = [ From 97bb59b0d61d02dff14041a97d19c3eaa2851633 Mon Sep 17 00:00:00 2001 From: Leona Maroni Date: Sun, 16 Feb 2025 11:02:14 +0100 Subject: [PATCH 311/343] dovecot: fix build after icu update --- pkgs/servers/mail/dovecot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/mail/dovecot/default.nix b/pkgs/servers/mail/dovecot/default.nix index 5b13c1aac03f3..7cc1226453b59 100644 --- a/pkgs/servers/mail/dovecot/default.nix +++ b/pkgs/servers/mail/dovecot/default.nix @@ -14,7 +14,7 @@ libcap, coreutils, clucene_core_2, - icu, + icu75, libexttextcat, openldap, libsodium, @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { zlib lz4 clucene_core_2 - icu + icu75 libexttextcat openldap libsodium From 924d1840da7717c6449b611bcc8cf17f79e72277 Mon Sep 17 00:00:00 2001 From: K900 Date: Sun, 16 Feb 2025 14:07:26 +0300 Subject: [PATCH 312/343] nodejs_18: fix build - pin ICU 75 - backport patch to fix tests on OpenSSL 3.4 --- pkgs/development/web/nodejs/openssl-3.4-v18.patch | 15 +++++++++++++++ pkgs/development/web/nodejs/v18.nix | 7 +++++++ 2 files changed, 22 insertions(+) create mode 100644 pkgs/development/web/nodejs/openssl-3.4-v18.patch diff --git a/pkgs/development/web/nodejs/openssl-3.4-v18.patch b/pkgs/development/web/nodejs/openssl-3.4-v18.patch new file mode 100644 index 0000000000000..a674a27e64c40 --- /dev/null +++ b/pkgs/development/web/nodejs/openssl-3.4-v18.patch @@ -0,0 +1,15 @@ +diff --git a/test/parallel/test-tls-psk-circuit.js b/test/parallel/test-tls-psk-circuit.js +index 2b49161df8..8071c6dd18 100644 +--- a/test/parallel/test-tls-psk-circuit.js ++++ b/test/parallel/test-tls-psk-circuit.js +@@ -66,7 +66,8 @@ const expectedHandshakeErr = common.hasOpenSSL32 ? + 'ERR_SSL_SSL/TLS_ALERT_HANDSHAKE_FAILURE' : 'ERR_SSL_SSLV3_ALERT_HANDSHAKE_FAILURE'; + test({ psk: USERS.UserB, identity: 'UserC' }, {}, expectedHandshakeErr); + // Recognized user but incorrect secret should fail handshake +-const expectedIllegalParameterErr = common.hasOpenSSL32 ? +- 'ERR_SSL_SSL/TLS_ALERT_ILLEGAL_PARAMETER' : 'ERR_SSL_SSLV3_ALERT_ILLEGAL_PARAMETER'; ++const expectedIllegalParameterErr = common.hasOpenSSL(3, 4) ? 'ERR_SSL_TLSV1_ALERT_DECRYPT_ERROR' : ++ common.hasOpenSSL(3, 2) ? ++ 'ERR_SSL_SSL/TLS_ALERT_ILLEGAL_PARAMETER' : 'ERR_SSL_SSLV3_ALERT_ILLEGAL_PARAMETER'; + test({ psk: USERS.UserA, identity: 'UserB' }, {}, expectedIllegalParameterErr); + test({ psk: USERS.UserB, identity: 'UserB' }); diff --git a/pkgs/development/web/nodejs/v18.nix b/pkgs/development/web/nodejs/v18.nix index 8bb6d54d1943e..7f1537584a618 100644 --- a/pkgs/development/web/nodejs/v18.nix +++ b/pkgs/development/web/nodejs/v18.nix @@ -4,6 +4,7 @@ openssl, python311, fetchpatch2, + icu75, enableNpm ? true, }: @@ -11,6 +12,7 @@ let buildNodejs = callPackage ./nodejs.nix { inherit openssl; python = python311; + icu = icu75; # does not build with newer }; gypPatches = callPackage ./gyp-patches.nix { } ++ [ @@ -75,5 +77,10 @@ buildNodejs { url = "https://github.com/nodejs/node/commit/f270462c09ddfd770291a7c8a2cd204b2c63d730.patch?full_index=1"; hash = "sha256-Err0i5g7WtXcnhykKgrS3ocX7/3oV9UrT0SNeRtMZNU="; }) + + # Fix tests on OpenSSL 3.4 + # Manual backport of https://github.com/nodejs/node/commit/7895b8eae9e4f2919028fe81e38790af07b4cc92 + # FIXME: remove after a minor point release + ./openssl-3.4-v18.patch ] ++ gypPatches; } From c20ae96f3ab04fdd2a60f4d245eee5a7c4cd8261 Mon Sep 17 00:00:00 2001 From: Leona Maroni Date: Sun, 16 Feb 2025 12:14:57 +0100 Subject: [PATCH 313/343] adr-tools: fix build `bash` doesn't appear in the wrapper anymore, but only `bashInteractive` --- pkgs/by-name/ad/adr-tools/package.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/by-name/ad/adr-tools/package.nix b/pkgs/by-name/ad/adr-tools/package.nix index 7092ce9353ea6..ac790896b397d 100644 --- a/pkgs/by-name/ad/adr-tools/package.nix +++ b/pkgs/by-name/ad/adr-tools/package.nix @@ -72,9 +72,6 @@ stdenv.mkDerivation rec { gnused ] } - # avoid having two bash dependencies in output - substituteInPlace $out/bin/adr --replace-fail "${lib.getExe bash}" "${lib.getExe bashInteractive}" - installShellCompletion --bash autocomplete/adr ''; From 94e8af4270464dffd655ff3de8b5f48b033e7e4a Mon Sep 17 00:00:00 2001 From: K900 Date: Sun, 16 Feb 2025 14:47:21 +0300 Subject: [PATCH 314/343] nodejs_20: backport patches to fix tests on OpenSSL 3.4 --- pkgs/development/web/nodejs/v20.nix | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/pkgs/development/web/nodejs/v20.nix b/pkgs/development/web/nodejs/v20.nix index d0679570f0486..66dbd357f028b 100644 --- a/pkgs/development/web/nodejs/v20.nix +++ b/pkgs/development/web/nodejs/v20.nix @@ -1,3 +1,4 @@ + { callPackage, fetchpatch2, @@ -50,5 +51,20 @@ buildNodejs { stripLen = 1; hash = "sha256-6y3aEqxNC4iTQEv1oewodJrhOHxjp5xZMq1P1QL94Rg="; }) + + # Backport fixes for OpenSSL 3.4 + # FIXME: remove when merged upstream + (fetchpatch2 { + url = "https://github.com/nodejs/node/commit/e799722f1a0bf43fe4d47e4824b9524363fe0d62.patch"; + hash = "sha256-nz95vmBx+zFPdOR9kg0HdgiAlqgTeXistOP/NLF3qW0="; + }) + (fetchpatch2 { + url = "https://github.com/nodejs/node/commit/e6a988dbdee47b3412094a90d35d6bd8207c750d.patch"; + hash = "sha256-UJ8alA54PrhHXK9u120HvBgm0scuEDBwCRuuVYVa/Ng="; + }) + (fetchpatch2 { + url = "https://github.com/nodejs/node/commit/7895b8eae9e4f2919028fe81e38790af07b4cc92.patch"; + hash = "sha256-S2PmFw/e0/DY71UJb2RYXu9Qft/rBFC50K0Ex7v/9QE="; + }) ] ++ gypPatches; } From 53c92507665ed563075b1ff9b74d33028cb69e75 Mon Sep 17 00:00:00 2001 From: Leona Maroni Date: Sun, 16 Feb 2025 12:37:41 +0100 Subject: [PATCH 315/343] oxipng: fix build on aarch64-linux build fails with error: linker `aarch64-linux-gnu-gcc` not found In my testing, it doesn't seem to be necessary to run aarch64 inside a qemu vm. --- pkgs/by-name/ox/oxipng/package.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ox/oxipng/package.nix b/pkgs/by-name/ox/oxipng/package.nix index b661fd5361108..461522b2f3f29 100644 --- a/pkgs/by-name/ox/oxipng/package.nix +++ b/pkgs/by-name/ox/oxipng/package.nix @@ -1,9 +1,7 @@ { lib, - stdenv, fetchFromGitHub, rustPlatform, - qemu, }: rustPlatform.buildRustPackage rec { @@ -21,8 +19,11 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-Z0otTCFwtGuSC1XBM3jcgGDFPZuMzQikZaYCnR+S6Us="; - # See https://github.com/shssoichiro/oxipng/blob/14b8b0e93a/.cargo/config.toml#L5 - nativeCheckInputs = [ qemu ]; + # don't require qemu for aarch64-linux tests + # error: linker `aarch64-linux-gnu-gcc` not found + postPatch = '' + rm .cargo/config.toml + ''; meta = { homepage = "https://github.com/shssoichiro/oxipng"; From f7f68bb1ec8041a54d51f526388f8fcbb40a9e45 Mon Sep 17 00:00:00 2001 From: K900 Date: Sun, 16 Feb 2025 15:02:18 +0300 Subject: [PATCH 316/343] git-revise: 0.7.0 -> 0.7.0-unstable-2025-01-28 Fixes tests with Git 2.48 --- pkgs/development/python-modules/git-revise/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/git-revise/default.nix b/pkgs/development/python-modules/git-revise/default.nix index 78fdc254baaab..8e796abdf3c72 100644 --- a/pkgs/development/python-modules/git-revise/default.nix +++ b/pkgs/development/python-modules/git-revise/default.nix @@ -10,15 +10,15 @@ buildPythonPackage rec { pname = "git-revise"; - version = "0.7.0"; + version = "0.7.0-unstable-2025-01-28"; format = "setuptools"; # Missing tests on PyPI src = fetchFromGitHub { owner = "mystor"; repo = pname; - rev = "v${version}"; - hash = "sha256-xV1Z9O5FO4Q/XEpNwnX31tbv8CrXY+wF1Ltpfq+ITRg="; + rev = "189c9fe150e5587def75c51709246c47c93e3b4d"; + hash = "sha256-bqhRV0WtWRUKkBG2tEvctxdoYRkcrpL4JZSHYzox8so="; }; disabled = pythonOlder "3.8"; From 725dac62b87e7a4bcd8e94dedf2499833dab7cf0 Mon Sep 17 00:00:00 2001 From: K900 Date: Sun, 16 Feb 2025 15:26:08 +0300 Subject: [PATCH 317/343] librsvg: skip tests on i686 --- pkgs/development/libraries/librsvg/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/librsvg/default.nix b/pkgs/development/libraries/librsvg/default.nix index 11b9919ecdb68..5a9d1a9a61216 100644 --- a/pkgs/development/libraries/librsvg/default.nix +++ b/pkgs/development/libraries/librsvg/default.nix @@ -141,8 +141,9 @@ stdenv.mkDerivation (finalAttrs: { (lib.mesonBool "tests" finalAttrs.finalPackage.doCheck) ]; - # Probably broken MIME type detection. - doCheck = !stdenv.isDarwin; + # Probably broken MIME type detection on Darwin. + # Tests fail with imprecise rendering on i686. + doCheck = !stdenv.isDarwin && !stdenv.hostPlatform.isi686; env = { PKG_CONFIG_GDK_PIXBUF_2_0_GDK_PIXBUF_QUERY_LOADERS = writeShellScript "gdk-pixbuf-loader-loaders-wrapped" '' From 5fef117961130de3338d1ef22ebb132ea1f86b62 Mon Sep 17 00:00:00 2001 From: K900 Date: Sun, 16 Feb 2025 16:38:01 +0300 Subject: [PATCH 318/343] home-assistant: relax aiozoneinfo dependency --- pkgs/servers/home-assistant/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index f9e8ba70c2374..1b68751b13e92 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -405,6 +405,7 @@ python.pkgs.buildPythonApplication rec { pythonRelaxDeps = [ "aiohttp" + "aiozoneinfo" "attrs" "bcrypt" "ciso8601" From daadcbdaacc352a2031d53eaf6f8f1eedc263bcb Mon Sep 17 00:00:00 2001 From: K900 Date: Sun, 16 Feb 2025 19:41:21 +0300 Subject: [PATCH 319/343] nixos/systemd-stage-1: explicitly add pkgs.runtimeShell dependency Because it's no longer pkgs.bash (which is interactive), and can be something else on other platforms anyway. --- nixos/modules/system/boot/systemd/initrd.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/nixos/modules/system/boot/systemd/initrd.nix b/nixos/modules/system/boot/systemd/initrd.nix index 332cfc2fbb13c..472c72fb3889c 100644 --- a/nixos/modules/system/boot/systemd/initrd.nix +++ b/nixos/modules/system/boot/systemd/initrd.nix @@ -538,7 +538,9 @@ in "${cfg.package.util-linux}/bin/umount" "${cfg.package.util-linux}/bin/sulogin" - # required for script services, and some tools like xfs still want the sh symlink + # required for services generated with writeShellScript and friends + pkgs.runtimeShell + # some tools like xfs still want the sh symlink "${pkgs.bash}/bin" # so NSS can look up usernames From eed6b13aafce28564c85f6eaa0f6b52eeafcc9bd Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Tue, 11 Feb 2025 19:58:25 +0100 Subject: [PATCH 320/343] appstream: fix static --- .../libraries/appstream/default.nix | 20 +++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/appstream/default.nix b/pkgs/development/libraries/appstream/default.nix index d4d0e26adb088..011dd75151bf4 100644 --- a/pkgs/development/libraries/appstream/default.nix +++ b/pkgs/development/libraries/appstream/default.nix @@ -1,7 +1,9 @@ { lib , stdenv +, buildPackages , replaceVars , fetchFromGitHub +, fetchpatch , meson , mesonEmulatorHook , appstream @@ -32,6 +34,9 @@ , systemd , nixosTests , testers +, withIntrospection ? + lib.meta.availableOn stdenv.hostPlatform gobject-introspection + && stdenv.hostPlatform.emulatorAvailable buildPackages , withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd }: @@ -56,6 +61,12 @@ stdenv.mkDerivation (finalAttrs: { # Allow installing installed tests to a separate output. ./installed-tests-path.patch + + (fetchpatch { + name = "static.patch"; + url = "https://github.com/ximion/appstream/commit/90675d8853188f65897d2453346cb0acd531b58f.patch"; + hash = "sha256-d3h5h7B/MP3Sun5YwYCqMHcw4PMMwg1YS/S9vsMzkQ4="; + }) ]; strictDeps = true; @@ -74,13 +85,16 @@ stdenv.mkDerivation (finalAttrs: { xmlto docbook-xsl-nons docbook_xml_dtd_45 - gobject-introspection + glib itstool - vala gperf ] ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ mesonEmulatorHook + ] ++ lib.optionals (!lib.systems.equals stdenv.buildPlatform stdenv.hostPlatform) [ appstream + ] ++ lib.optionals withIntrospection [ + gobject-introspection + vala ]; buildInputs = [ @@ -102,10 +116,12 @@ stdenv.mkDerivation (finalAttrs: { mesonFlags = [ "-Dapidocs=false" + "-Dc_args=-Wno-error=missing-include-dirs" "-Ddocs=false" "-Dvapi=true" "-Dinstalled_test_prefix=${placeholder "installedTests"}" "-Dcompose=true" + (lib.mesonBool "gir" withIntrospection) ] ++ lib.optionals (!withSystemd) [ "-Dsystemd=false" ]; From 8cc056c0b08f0e897febcdd61d59f06ccc0dbc58 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sun, 16 Feb 2025 18:13:53 +0100 Subject: [PATCH 321/343] ostree: backport static fix for pkg-config file --- pkgs/by-name/os/ostree/package.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/by-name/os/ostree/package.nix b/pkgs/by-name/os/ostree/package.nix index b6d1f6edaa378..f07e757d659d9 100644 --- a/pkgs/by-name/os/ostree/package.nix +++ b/pkgs/by-name/os/ostree/package.nix @@ -1,6 +1,7 @@ { stdenv , lib , fetchurl +, fetchpatch , pkg-config , gtk-doc , nixosTests @@ -59,6 +60,13 @@ in stdenv.mkDerivation rec { sha256 = "sha256-VOM4fe4f8WAxoGeayitg2pCrf0omwhGCIzPH8jAAq+4="; }; + patches = [ + (fetchpatch { + name = "static-pkg-config.patch"; + url = "https://github.com/ostreedev/ostree/pull/3382.patch"; + hash = "sha256-VCQLq4OqmojtB7WFHNNV82asgXPGq5tKoJun66eUntY="; + }) + ]; nativeBuildInputs = [ autoconf From 6416fc5865df4fc42534c46a8519955f296aa082 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sun, 16 Feb 2025 18:14:29 +0100 Subject: [PATCH 322/343] malcontent: tighten platforms malcontent is tied to polkit, so it'll always only work on a subset of the platforms that polkit does. Being exact about this in the metadata means that we can conditionally enable malcontent in dependent packages based on whether polkit is available. --- pkgs/development/libraries/malcontent/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/malcontent/default.nix b/pkgs/development/libraries/malcontent/default.nix index faa48dda2739b..3f5270ce75a4d 100644 --- a/pkgs/development/libraries/malcontent/default.nix +++ b/pkgs/development/libraries/malcontent/default.nix @@ -101,6 +101,6 @@ stdenv.mkDerivation rec { homepage = "https://gitlab.freedesktop.org/pwithnall/malcontent"; license = licenses.lgpl21Plus; maintainers = with maintainers; [ jtojnar ]; - platforms = platforms.unix; + inherit (polkit.meta) platforms badPlatforms; }; } From 750c376688ff0060e8c5daf2d577f7c8eeb4c44b Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sun, 16 Feb 2025 18:18:07 +0100 Subject: [PATCH 323/343] flatpak: fix static --- pkgs/by-name/fl/flatpak/package.nix | 150 +++++++++++++++++----------- 1 file changed, 91 insertions(+), 59 deletions(-) diff --git a/pkgs/by-name/fl/flatpak/package.nix b/pkgs/by-name/fl/flatpak/package.nix index 61f16695711dd..42620c2c4b7d6 100644 --- a/pkgs/by-name/fl/flatpak/package.nix +++ b/pkgs/by-name/fl/flatpak/package.nix @@ -5,6 +5,7 @@ appstream, bison, bubblewrap, + buildPackages, bzip2, coreutils, curl, @@ -13,6 +14,7 @@ docbook-xsl-nons, docbook_xml_dtd_45, fetchurl, + fetchpatch, fuse3, gdk-pixbuf, gettext, @@ -58,11 +60,23 @@ xorg, zstd, withAutoSideloading ? false, + withDconf ? lib.meta.availableOn stdenv.hostPlatform dconf, withDocbookDocs ? true, - withGtkDoc ? withDocbookDocs && stdenv.buildPlatform.canExecute stdenv.hostPlatform, + withGlibNetworking ? lib.meta.availableOn stdenv.hostPlatform glib-networking, + withGtkDoc ? + withDocbookDocs + && stdenv.buildPlatform.canExecute stdenv.hostPlatform + # https://github.com/mesonbuild/meson/pull/14257 + && !stdenv.hostPlatform.isStatic, + withIntrospection ? + lib.meta.availableOn stdenv.hostPlatform gobject-introspection + && stdenv.hostPlatform.emulatorAvailable buildPackages, + withMalcontent ? lib.meta.availableOn stdenv.hostPlatform malcontent, withMan ? withDocbookDocs, + withP11Kit ? lib.meta.availableOn stdenv.hostPlatform p11-kit, + withPolkit ? lib.meta.availableOn stdenv.hostPlatform polkit, withSELinuxModule ? false, - withSystemd ? true, + withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd, }: stdenv.mkDerivation (finalAttrs: { @@ -89,43 +103,53 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-ywrFZa3LYhJ8bRHtUO5wRNaoNvppw1Sy9LZAoiv6Syo="; }; - patches = [ - # Hardcode paths used by tests and change test runtime generation to use files from Nix store. - # https://github.com/flatpak/flatpak/issues/1460 - (replaceVars ./fix-test-paths.patch { - inherit - coreutils - gettext - gtk3 - socat - ; - dfu = desktop-file-utils; - hicolorIconTheme = hicolor-icon-theme; - smi = shared-mime-info; - }) - - # Hardcode paths used by Flatpak itself. - (replaceVars ./fix-paths.patch { - p11kit = lib.getExe p11-kit; - }) + patches = + [ + # Use flatpak from PATH to avoid references to `/nix/store` in `/desktop` files. + # Applications containing `DBusActivatable` entries should be able to find the flatpak binary. + # https://github.com/NixOS/nixpkgs/issues/138956 + ./binary-path.patch - # Use flatpak from PATH to avoid references to `/nix/store` in `/desktop` files. - # Applications containing `DBusActivatable` entries should be able to find the flatpak binary. - # https://github.com/NixOS/nixpkgs/issues/138956 - ./binary-path.patch + # Try mounting fonts and icons from NixOS locations if FHS locations don't exist. + # https://github.com/NixOS/nixpkgs/issues/119433 + ./fix-fonts-icons.patch - # Try mounting fonts and icons from NixOS locations if FHS locations don't exist. - # https://github.com/NixOS/nixpkgs/issues/119433 - ./fix-fonts-icons.patch + # Nix environment hacks should not leak into the apps. + # https://github.com/NixOS/nixpkgs/issues/53441 + ./unset-env-vars.patch - # Nix environment hacks should not leak into the apps. - # https://github.com/NixOS/nixpkgs/issues/53441 - ./unset-env-vars.patch + # The icon validator needs to access the gdk-pixbuf loaders in the Nix store + # and cannot bind FHS paths since those are not available on NixOS. + finalAttrs.passthru.icon-validator-patch - # The icon validator needs to access the gdk-pixbuf loaders in the Nix store - # and cannot bind FHS paths since those are not available on NixOS. - finalAttrs.passthru.icon-validator-patch - ]; + (fetchpatch { + name = "static.patch"; + url = "https://github.com/flatpak/flatpak/commit/114c22e814fc28243585915321b8e943471c377f.patch"; + hash = "sha256-3JLzG74myBTssXQau0Ei5rpthy93Va7xb2MHRnJ3kaI="; + }) + ] + ++ lib.optionals finalAttrs.doCheck [ + # Hardcode paths used by tests and change test runtime generation to use files from Nix store. + # https://github.com/flatpak/flatpak/issues/1460 + (replaceVars ./fix-test-paths.patch { + inherit + coreutils + gettext + gtk3 + socat + ; + dfu = desktop-file-utils; + hicolorIconTheme = hicolor-icon-theme; + smi = shared-mime-info; + }) + ] + ++ lib.optionals withP11Kit [ + # Hardcode p11-kit path used by Flatpak itself. + # If disabled, will have to be on PATH. + (replaceVars ./fix-paths.patch { + p11kit = lib.getExe p11-kit; + }) + ]; # Fixup shebangs in some scripts # @@ -146,7 +170,7 @@ stdenv.mkDerivation (finalAttrs: { [ (python3.pythonOnBuildForHost.withPackages (p: [ p.pyparsing ])) bison - gobject-introspection + glib meson ninja pkg-config @@ -155,6 +179,7 @@ stdenv.mkDerivation (finalAttrs: { wrapGAppsNoGuiHook ] ++ lib.optional withGtkDoc gtk-doc + ++ lib.optional withIntrospection gobject-introspection ++ lib.optional withMan libxslt ++ lib.optional withSELinuxModule bzip2 ++ lib.optionals withDocbookDocs [ @@ -163,29 +188,31 @@ stdenv.mkDerivation (finalAttrs: { xmlto ]; - buildInputs = [ - appstream - curl - dconf - fuse3 - gdk-pixbuf - glib-networking - gpgme - gsettings-desktop-schemas - json-glib - libarchive - libcap - librsvg # for flatpak-validate-icon - libseccomp - libxml2 - malcontent - polkit - python3 - wayland - wayland-protocols - xorg.libXau - zstd - ] ++ lib.optional withSystemd systemd; + buildInputs = + [ + appstream + curl + fuse3 + gdk-pixbuf + gpgme + gsettings-desktop-schemas + json-glib + libarchive + libcap + librsvg # for flatpak-validate-icon + libseccomp + libxml2 + python3 + wayland + wayland-protocols + xorg.libXau + zstd + ] + ++ lib.optional withDconf dconf + ++ lib.optional withGlibNetworking glib-networking + ++ lib.optional withMalcontent malcontent + ++ lib.optional withPolkit polkit + ++ lib.optional withSystemd systemd; # Required by flatpak.pc propagatedBuildInputs = [ @@ -197,10 +224,15 @@ stdenv.mkDerivation (finalAttrs: { (lib.mesonBool "auto_sideloading" withAutoSideloading) (lib.mesonBool "installed_tests" finalAttrs.finalPackage.doCheck) (lib.mesonBool "tests" finalAttrs.finalPackage.doCheck) + (lib.mesonEnable "dconf" withDconf) (lib.mesonEnable "docbook_docs" withDocbookDocs) + (lib.mesonEnable "gir" withIntrospection) (lib.mesonEnable "gtkdoc" withGtkDoc) + (lib.mesonEnable "malcontent" withMalcontent) (lib.mesonEnable "man" withMan) (lib.mesonEnable "selinux_module" withSELinuxModule) + (lib.mesonEnable "system_helper" withPolkit) + (lib.mesonEnable "systemd" withSystemd) (lib.mesonOption "dbus_config_dir" (placeholder "out" + "/share/dbus-1/system.d")) (lib.mesonOption "profile_dir" (placeholder "out" + "/etc/profile.d")) (lib.mesonOption "system_bubblewrap" (lib.getExe bubblewrap)) From 5a520c643e49276ff6fc0b3a34daacb9ba5813b3 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 17 Feb 2025 10:30:57 +0100 Subject: [PATCH 324/343] coreutils: disable VMULL on aarch64 musl Yikes. --- pkgs/tools/misc/coreutils/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix index 9e841d6338c97..f87f92363eeeb 100644 --- a/pkgs/tools/misc/coreutils/default.nix +++ b/pkgs/tools/misc/coreutils/default.nix @@ -154,6 +154,11 @@ stdenv.mkDerivation rec { # the shipped configure script doesn't enable nls, but using autoreconfHook # does so which breaks the build ++ optional stdenv.hostPlatform.isDarwin "--disable-nls" + # The VMULL-based CRC implementation produces incorrect results on musl. + # https://lists.gnu.org/archive/html/bug-coreutils/2025-02/msg00046.html + ++ optional ( + stdenv.hostPlatform.config == "aarch64-unknown-linux-musl" + ) "utils_cv_vmull_intrinsic_exists=no" ++ optionals (isCross && stdenv.hostPlatform.libc == "glibc") [ # TODO(19b98110126fde7cbb1127af7e3fe1568eacad3d): Needed for fstatfs() I # don't know why it is not properly detected cross building with glibc. From a74d7b0f66003fb1b177c9481d7c575bcf054efc Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Mon, 17 Feb 2025 21:05:30 +0100 Subject: [PATCH 325/343] haskellPackages.text-icu: disable test(s) broken by icu >= 76 Output changed from GMT+1 to MEZ in one case, I think we can safely ignore that. --- .../development/haskell-modules/configuration-common.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 25016b4930407..3f705c5c520e4 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1951,6 +1951,15 @@ self: super: { }; hspec-core_2_7_10 = doJailbreak (dontCheck super.hspec-core_2_7_10); + # Disable test cases that were broken by insignificant changes in icu 76 + # https://github.com/haskell/text-icu/issues/108 + text-icu = overrideCabal (drv: { + testFlags = drv.testFlags or [ ] ++ [ + "-t" + "!Test cases" + ]; + }) super.text-icu; + # waiting for aeson bump servant-swagger-ui-core = doJailbreak super.servant-swagger-ui-core; From be8612e15a2849936faf954d46da0d29e3f2c24e Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Tue, 18 Feb 2025 10:20:13 +0100 Subject: [PATCH 326/343] postgresql: fetch from GitHub instead of tarball This allows us to fetch newer releases a few days before they are officially released and the tarballs have been pushed. The regular release cycle is like this: - Sunday, the release notes are committed. - Monday, the version is "stamped", i.e. the version bump committed. - Thursday, the release is made. There are not going to be any changes from Monday on, so we can kick off our builds at that time already - they still need time to hit unstable anyway. --- pkgs/servers/sql/postgresql/13.nix | 3 ++- pkgs/servers/sql/postgresql/14.nix | 3 ++- pkgs/servers/sql/postgresql/15.nix | 3 ++- pkgs/servers/sql/postgresql/16.nix | 3 ++- pkgs/servers/sql/postgresql/17.nix | 3 ++- pkgs/servers/sql/postgresql/generic.nix | 25 ++++++++++++++----------- pkgs/servers/sql/postgresql/libpq.nix | 11 +++++++---- 7 files changed, 31 insertions(+), 20 deletions(-) diff --git a/pkgs/servers/sql/postgresql/13.nix b/pkgs/servers/sql/postgresql/13.nix index 72a8dd8bb3920..b2a1895923109 100644 --- a/pkgs/servers/sql/postgresql/13.nix +++ b/pkgs/servers/sql/postgresql/13.nix @@ -1,6 +1,7 @@ import ./generic.nix { version = "13.18"; - hash = "sha256-zuqSq+4qjBlAjSeLaN5qeLa9PbtPotZT+nynRdZmqrE="; + rev = "ref/tags/REL_13_18"; + hash = "sha256-Lw8rd6MAvKZ7/Y1a0ccauL7K6lHxsp5huK4QFun9wcc="; muslPatches = { disable-test-collate-icu-utf8 = { url = "https://git.alpinelinux.org/aports/plain/main/postgresql13/disable-test-collate.icu.utf8.patch?id=69faa146ec9fff3b981511068f17f9e629d4688b"; diff --git a/pkgs/servers/sql/postgresql/14.nix b/pkgs/servers/sql/postgresql/14.nix index e5011f5314caf..cf4141008ffc6 100644 --- a/pkgs/servers/sql/postgresql/14.nix +++ b/pkgs/servers/sql/postgresql/14.nix @@ -1,6 +1,7 @@ import ./generic.nix { version = "14.15"; - hash = "sha256-AuiR4xS06e4ky9eAKNq3xz+cG6PjCDW8vvcf4iBAH8U="; + rev = "ref/tags/REL_14_15"; + hash = "sha256-slb6UiJyIzDaNS782/ZDVztBw4B4qTY6OuEWI+HZ+Ds="; muslPatches = { disable-test-collate-icu-utf8 = { url = "https://git.alpinelinux.org/aports/plain/main/postgresql14/disable-test-collate.icu.utf8.patch?id=56999e6d0265ceff5c5239f85fdd33e146f06cb7"; diff --git a/pkgs/servers/sql/postgresql/15.nix b/pkgs/servers/sql/postgresql/15.nix index bf17a088f2bd6..3b654c8fee951 100644 --- a/pkgs/servers/sql/postgresql/15.nix +++ b/pkgs/servers/sql/postgresql/15.nix @@ -1,6 +1,7 @@ import ./generic.nix { version = "15.10"; - hash = "sha256-VavnONRB8OWGWLPsb4gJenE7XjtzE59iMNe1xMOJ5XM="; + rev = "ref/tags/REL_15_10"; + hash = "sha256-5RNcoqcmcYCCBK8bmz2Wruky1mzDh5SrDF3OOV31GMw="; muslPatches = { dont-use-locale-a = { url = "https://git.alpinelinux.org/aports/plain/main/postgresql15/dont-use-locale-a-on-musl.patch?id=f424e934e6d076c4ae065ce45e734aa283eecb9c"; diff --git a/pkgs/servers/sql/postgresql/16.nix b/pkgs/servers/sql/postgresql/16.nix index fd1957b89386c..4ce791d49b199 100644 --- a/pkgs/servers/sql/postgresql/16.nix +++ b/pkgs/servers/sql/postgresql/16.nix @@ -1,6 +1,7 @@ import ./generic.nix { version = "16.6"; - hash = "sha256-Izac2szUUnCsXcww+p2iBdW+M/pQXh8XoEGNLK7KR3s="; + rev = "ref/tags/REL_16_6"; + hash = "sha256-cw/bSR9ZI6HFtbSTQxvuB7ng7V6g5SZZ7B0oMCz4E7Q="; muslPatches = { dont-use-locale-a = { url = "https://git.alpinelinux.org/aports/plain/main/postgresql16/dont-use-locale-a-on-musl.patch?id=08a24be262339fd093e641860680944c3590238e"; diff --git a/pkgs/servers/sql/postgresql/17.nix b/pkgs/servers/sql/postgresql/17.nix index 34d2ddeccb277..e76114ee1aa62 100644 --- a/pkgs/servers/sql/postgresql/17.nix +++ b/pkgs/servers/sql/postgresql/17.nix @@ -1,6 +1,7 @@ import ./generic.nix { version = "17.2"; - hash = "sha256-gu8nwK83UWldf2Ti2WNYMAX7tqDD32PQ5LQiEdcCEWQ="; + rev = "ref/tags/REL_17_2"; + hash = "sha256-P7IwvMcOI6vW14PiB2R0NEzAEPeaKg0zaUKTw2GJ5DA="; muslPatches = { dont-use-locale-a = { url = "https://git.alpinelinux.org/aports/plain/main/postgresql17/dont-use-locale-a-on-musl.patch?id=d69ead2c87230118ae7f72cef7d761e761e1f37e"; diff --git a/pkgs/servers/sql/postgresql/generic.nix b/pkgs/servers/sql/postgresql/generic.nix index 00b9f0e15ce15..569eb87f8e972 100644 --- a/pkgs/servers/sql/postgresql/generic.nix +++ b/pkgs/servers/sql/postgresql/generic.nix @@ -4,6 +4,7 @@ let # utils { stdenv, + fetchFromGitHub, fetchpatch, fetchurl, lib, @@ -13,6 +14,7 @@ let # source specification hash, muslPatches ? { }, + rev, version, # runtime dependencies @@ -130,9 +132,12 @@ let inherit version; pname = pname + lib.optionalString jitSupport "-jit"; - src = fetchurl { - url = "mirror://postgresql/source/v${version}/${pname}-${version}.tar.bz2"; - inherit hash; + src = fetchFromGitHub { + owner = "postgres"; + repo = "postgres"; + # rev, not tag, on purpose: allows updating when new versions + # are "stamped" a few days before release (tag). + inherit hash rev; }; __structuredAttrs = true; @@ -215,22 +220,20 @@ let nativeBuildInputs = [ + bison + docbook-xsl-nons + docbook_xml_dtd_45 + flex libxml2 + libxslt makeWrapper + perl pkg-config removeReferencesTo ] ++ lib.optionals jitSupport [ llvmPackages.llvm.dev nukeReferences - ] - ++ lib.optionals (atLeast "17") [ - bison - flex - perl - docbook_xml_dtd_45 - docbook-xsl-nons - libxslt ]; enableParallelBuilding = true; diff --git a/pkgs/servers/sql/postgresql/libpq.nix b/pkgs/servers/sql/postgresql/libpq.nix index 0c064e45cf99d..62e7fc9df6c72 100644 --- a/pkgs/servers/sql/postgresql/libpq.nix +++ b/pkgs/servers/sql/postgresql/libpq.nix @@ -1,7 +1,7 @@ { # utils stdenv, - fetchurl, + fetchFromGitHub, lib, # runtime dependencies @@ -31,9 +31,12 @@ stdenv.mkDerivation (finalAttrs: { pname = "libpq"; version = "17.2"; - src = fetchurl { - url = "mirror://postgresql/source/v${finalAttrs.version}/postgresql-${finalAttrs.version}.tar.bz2"; - hash = "sha256-gu8nwK83UWldf2Ti2WNYMAX7tqDD32PQ5LQiEdcCEWQ="; + src = fetchFromGitHub { + owner = "postgres"; + repo = "postgres"; + # rev, not tag, on purpose: see generic.nix. + rev = "ref/tags/REL_17_2"; + hash = "sha256-P7IwvMcOI6vW14PiB2R0NEzAEPeaKg0zaUKTw2GJ5DA="; }; __structuredAttrs = true; From 8e25714eeec98b1cdacb32a4b0df438400ef6b21 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 15 Feb 2025 11:26:30 +0100 Subject: [PATCH 327/343] postgresql_13: 13.18 -> 13.20 ChangeLog: https://www.postgresql.org/about/news/postgresql-173-167-1511-1416-and-1319-released-3015/ https://www.postgresql.org/about/news/out-of-cycle-release-scheduled-for-february-20-2025-3016/ Co-authored-by: Wolfgang Walther --- pkgs/servers/sql/postgresql/13.nix | 7 ++++--- pkgs/servers/sql/postgresql/generic.nix | 5 ----- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/pkgs/servers/sql/postgresql/13.nix b/pkgs/servers/sql/postgresql/13.nix index b2a1895923109..8f1493c6c366d 100644 --- a/pkgs/servers/sql/postgresql/13.nix +++ b/pkgs/servers/sql/postgresql/13.nix @@ -1,7 +1,8 @@ import ./generic.nix { - version = "13.18"; - rev = "ref/tags/REL_13_18"; - hash = "sha256-Lw8rd6MAvKZ7/Y1a0ccauL7K6lHxsp5huK4QFun9wcc="; + version = "13.20"; + # "Stamp 13.20" + rev = "c8f198c3acb59ed858b5b9b88b4fbc55cece544e"; + hash = "sha256-GkDtzqwjMJipvr0wykM9Z5Tb0R7WgJA/PGPTVUXxf7Q="; muslPatches = { disable-test-collate-icu-utf8 = { url = "https://git.alpinelinux.org/aports/plain/main/postgresql13/disable-test-collate.icu.utf8.patch?id=69faa146ec9fff3b981511068f17f9e629d4688b"; diff --git a/pkgs/servers/sql/postgresql/generic.nix b/pkgs/servers/sql/postgresql/generic.nix index 569eb87f8e972..ca157411536e1 100644 --- a/pkgs/servers/sql/postgresql/generic.nix +++ b/pkgs/servers/sql/postgresql/generic.nix @@ -302,11 +302,6 @@ let ./patches/paths-for-split-outputs.patch ./patches/paths-with-postgresql-suffix.patch - (fetchpatch { - url = "https://github.com/postgres/postgres/commit/8108674f0e5639baebcf03b54b7ccf9e9a8662a2.patch"; - hash = "sha256-EQJkDR0eb7QWCjyMzXMn+Vbcwx3MMdC83oN7XSVJP0U="; - }) - (replaceVars ./patches/locale-binary-path.patch { locale = "${ if stdenv.hostPlatform.isDarwin then darwin.adv_cmds else lib.getBin stdenv.cc.libc From 903de708a8d4221119e6f2faa2bcab8ed7ff7615 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 15 Feb 2025 11:27:29 +0100 Subject: [PATCH 328/343] postgresql_14: 14.15 -> 14.17 ChangeLog: https://www.postgresql.org/about/news/postgresql-173-167-1511-1416-and-1319-released-3015/ https://www.postgresql.org/about/news/out-of-cycle-release-scheduled-for-february-20-2025-3016/ Co-authored-by: Wolfgang Walther --- pkgs/servers/sql/postgresql/14.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/sql/postgresql/14.nix b/pkgs/servers/sql/postgresql/14.nix index cf4141008ffc6..bee593a35fd27 100644 --- a/pkgs/servers/sql/postgresql/14.nix +++ b/pkgs/servers/sql/postgresql/14.nix @@ -1,7 +1,8 @@ import ./generic.nix { - version = "14.15"; - rev = "ref/tags/REL_14_15"; - hash = "sha256-slb6UiJyIzDaNS782/ZDVztBw4B4qTY6OuEWI+HZ+Ds="; + version = "14.17"; + # "Stamp 14.17" + rev = "e5cabe28006995d90cc9ebc613dad072c44c7f4a"; + hash = "sha256-BvmfxHHTcxRkWZoawvHanQeAuqHnQIh77RQjxPo5fuI="; muslPatches = { disable-test-collate-icu-utf8 = { url = "https://git.alpinelinux.org/aports/plain/main/postgresql14/disable-test-collate.icu.utf8.patch?id=56999e6d0265ceff5c5239f85fdd33e146f06cb7"; From e9a5ab86073f5ba26d5828b4cbd3e0841b30c2f5 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 15 Feb 2025 11:28:15 +0100 Subject: [PATCH 329/343] postgresql_15: 15.10 -> 15.12 ChangeLog: https://www.postgresql.org/about/news/postgresql-173-167-1511-1416-and-1319-released-3015/ https://www.postgresql.org/about/news/out-of-cycle-release-scheduled-for-february-20-2025-3016/ Co-authored-by: Wolfgang Walther --- pkgs/servers/sql/postgresql/15.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/sql/postgresql/15.nix b/pkgs/servers/sql/postgresql/15.nix index 3b654c8fee951..c9d7f2f22a2a0 100644 --- a/pkgs/servers/sql/postgresql/15.nix +++ b/pkgs/servers/sql/postgresql/15.nix @@ -1,7 +1,8 @@ import ./generic.nix { - version = "15.10"; - rev = "ref/tags/REL_15_10"; - hash = "sha256-5RNcoqcmcYCCBK8bmz2Wruky1mzDh5SrDF3OOV31GMw="; + version = "15.12"; + # "Stamp 15.12" + rev = "50d3d22baba63613d1f1406b2ed460dc9b03c3fc"; + hash = "sha256-6my9UzW05iYwTWR9y/VTZ1RQVNudavMFfUT9dpUQ15o="; muslPatches = { dont-use-locale-a = { url = "https://git.alpinelinux.org/aports/plain/main/postgresql15/dont-use-locale-a-on-musl.patch?id=f424e934e6d076c4ae065ce45e734aa283eecb9c"; From 172fa69cbdf07b2e4a9d2c84929c7d65cebe6156 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 15 Feb 2025 11:28:40 +0100 Subject: [PATCH 330/343] postgresql_16: 16.6 -> 16.8 ChangeLog: https://www.postgresql.org/about/news/postgresql-173-167-1511-1416-and-1319-released-3015/ https://www.postgresql.org/about/news/out-of-cycle-release-scheduled-for-february-20-2025-3016/ Co-authored-by: Wolfgang Walther --- pkgs/servers/sql/postgresql/16.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/sql/postgresql/16.nix b/pkgs/servers/sql/postgresql/16.nix index 4ce791d49b199..6213c4d1b25cc 100644 --- a/pkgs/servers/sql/postgresql/16.nix +++ b/pkgs/servers/sql/postgresql/16.nix @@ -1,7 +1,8 @@ import ./generic.nix { - version = "16.6"; - rev = "ref/tags/REL_16_6"; - hash = "sha256-cw/bSR9ZI6HFtbSTQxvuB7ng7V6g5SZZ7B0oMCz4E7Q="; + version = "16.8"; + # "Stamp 16.8" + rev = "71eb35c0b18de96537bd3876ec9bf8075bfd484f"; + hash = "sha256-nVUGBuvCDFXozTyEDAAQa+IR3expCdztH90J68FhAXQ="; muslPatches = { dont-use-locale-a = { url = "https://git.alpinelinux.org/aports/plain/main/postgresql16/dont-use-locale-a-on-musl.patch?id=08a24be262339fd093e641860680944c3590238e"; From 70d670e42c6519b1c35cd27f1a2d7697e4b124aa Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 15 Feb 2025 11:29:09 +0100 Subject: [PATCH 331/343] postgresql_17: 17.2 -> 17.4 ChangeLog: https://www.postgresql.org/about/news/postgresql-173-167-1511-1416-and-1319-released-3015/ https://www.postgresql.org/about/news/out-of-cycle-release-scheduled-for-february-20-2025-3016/ Co-authored-by: Wolfgang Walther --- pkgs/servers/sql/postgresql/17.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/sql/postgresql/17.nix b/pkgs/servers/sql/postgresql/17.nix index e76114ee1aa62..130ef4216ef8f 100644 --- a/pkgs/servers/sql/postgresql/17.nix +++ b/pkgs/servers/sql/postgresql/17.nix @@ -1,7 +1,8 @@ import ./generic.nix { - version = "17.2"; - rev = "ref/tags/REL_17_2"; - hash = "sha256-P7IwvMcOI6vW14PiB2R0NEzAEPeaKg0zaUKTw2GJ5DA="; + version = "17.4"; + # "Stamp 17.4" + rev = "f8554dee417ffc4540c94cf357f7bf7d4b6e5d80"; + hash = "sha256-TEpvX28chR3CXiOQsNY12t8WfM9ywoZVX1e/6mj9DqE="; muslPatches = { dont-use-locale-a = { url = "https://git.alpinelinux.org/aports/plain/main/postgresql17/dont-use-locale-a-on-musl.patch?id=d69ead2c87230118ae7f72cef7d761e761e1f37e"; From 7a8b7390d88ff3af49ac1749e93314b8d0ff4572 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 14 Feb 2025 12:44:21 +0000 Subject: [PATCH 332/343] libpq: 17.2 -> 17.4 ChangeLog: https://www.postgresql.org/about/news/postgresql-173-167-1511-1416-and-1319-released-3015/ https://www.postgresql.org/about/news/out-of-cycle-release-scheduled-for-february-20-2025-3016/ Co-authored-by: Maximilian Bosch Co-authored-by: Wolfgang Walther --- pkgs/servers/sql/postgresql/libpq.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/sql/postgresql/libpq.nix b/pkgs/servers/sql/postgresql/libpq.nix index 62e7fc9df6c72..16f361b1f2a23 100644 --- a/pkgs/servers/sql/postgresql/libpq.nix +++ b/pkgs/servers/sql/postgresql/libpq.nix @@ -29,14 +29,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "libpq"; - version = "17.2"; + version = "17.4"; src = fetchFromGitHub { owner = "postgres"; repo = "postgres"; # rev, not tag, on purpose: see generic.nix. - rev = "ref/tags/REL_17_2"; - hash = "sha256-P7IwvMcOI6vW14PiB2R0NEzAEPeaKg0zaUKTw2GJ5DA="; + rev = "f8554dee417ffc4540c94cf357f7bf7d4b6e5d80"; + hash = "sha256-TEpvX28chR3CXiOQsNY12t8WfM9ywoZVX1e/6mj9DqE="; }; __structuredAttrs = true; From 688232dcd4e8f97f4670729681dd69b051fd0457 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Tue, 18 Feb 2025 13:50:25 +0100 Subject: [PATCH 333/343] opencv: add missing hash for ipp support --- pkgs/development/libraries/opencv/4.x.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/opencv/4.x.nix b/pkgs/development/libraries/opencv/4.x.nix index f7b5fc367523f..aa1142c9070fc 100644 --- a/pkgs/development/libraries/opencv/4.x.nix +++ b/pkgs/development/libraries/opencv/4.x.nix @@ -141,7 +141,7 @@ let owner = "opencv"; repo = "opencv_3rdparty"; rev = "7f55c0c26be418d494615afca15218566775c725"; - hash = ""; + hash = "sha256-XbmS+FXUL8MAG7kawbDkb2XHG9R0DpPhiYhq/18eTnY="; } + "/ippicv"; files = let name = platform: "ippicv_2021.10.0_${platform}_20230919_general.tgz"; in if effectiveStdenv.hostPlatform.system == "x86_64-linux" then @@ -555,6 +555,7 @@ effectiveStdenv.mkDerivation { tests = { inherit (gst_all_1) gst-plugins-bad; + withIpp = opencv4.override { enableIpp = true; }; } // optionalAttrs (!effectiveStdenv.hostPlatform.isDarwin) { inherit qimgv; } // optionalAttrs (!enablePython) { pythonEnabled = pythonPackages.opencv4; } From 7d50d466710fe8e1cedca8b88c641833fe19d0fb Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Tue, 18 Feb 2025 15:12:31 +0100 Subject: [PATCH 334/343] opencv: do not add withIpp to passthru.tests on darwin --- pkgs/development/libraries/opencv/4.x.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/opencv/4.x.nix b/pkgs/development/libraries/opencv/4.x.nix index aa1142c9070fc..b876a8f1780dc 100644 --- a/pkgs/development/libraries/opencv/4.x.nix +++ b/pkgs/development/libraries/opencv/4.x.nix @@ -555,9 +555,11 @@ effectiveStdenv.mkDerivation { tests = { inherit (gst_all_1) gst-plugins-bad; + } + // optionalAttrs (!effectiveStdenv.hostPlatform.isDarwin) { + inherit qimgv; withIpp = opencv4.override { enableIpp = true; }; } - // optionalAttrs (!effectiveStdenv.hostPlatform.isDarwin) { inherit qimgv; } // optionalAttrs (!enablePython) { pythonEnabled = pythonPackages.opencv4; } // optionalAttrs (effectiveStdenv.buildPlatform != "x86_64-darwin") { opencv4-tests = callPackage ./tests.nix { From 9fdd4f3a28da9c5664d8666aa8f2ad185ab23bf6 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Fri, 10 Jan 2025 19:33:46 -0500 Subject: [PATCH 335/343] freshBootstrapTools.bootstrapTools: switch to llvm-readtapi After the LLVM update, it is no longer necessary to use tapi. The library can also be dropped because a vendored version is now used with ld64 instead of the full dylib. --- pkgs/stdenv/darwin/stdenv-bootstrap-tools.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/stdenv/darwin/stdenv-bootstrap-tools.nix b/pkgs/stdenv/darwin/stdenv-bootstrap-tools.nix index c678d2d20f2c9..1f50bcf5188ae 100644 --- a/pkgs/stdenv/darwin/stdenv-bootstrap-tools.nix +++ b/pkgs/stdenv/darwin/stdenv-bootstrap-tools.nix @@ -22,7 +22,6 @@ ld64, libffi, libiconv, - libtapi, libxml2, llvmPackages, ncurses, @@ -181,11 +180,10 @@ stdenv.mkDerivation (finalAttrs: { # Copy tools needed to build the SDK cp -d ${getBin jq}/bin/* $out/bin - cp -d ${getBin libtapi}/bin/* $out/bin + cp -d ${getBin llvmPackages.llvm}/bin/llvm-readtapi $out/bin cp -d ${getLib jq}/lib/lib*.dylib $out/lib cp -d ${getLib oniguruma}/lib/lib*.dylib $out/lib - cp -d ${getLib libtapi}/lib/libtapi*.dylib $out/lib # copy sigtool cp -d ${getBin darwin.sigtool}/bin/{codesign,sigtool} $out/bin From bd4cd0aee876c5006f6e36e5f13def9343bb804c Mon Sep 17 00:00:00 2001 From: Reno Dakota Date: Tue, 18 Feb 2025 20:35:43 +0100 Subject: [PATCH 336/343] freshBootstrapTools.bootstrapTools: fix by using bashNonInteractive https://hydra.nixos.org/build/289942887/nixlog/1/tail This gets it back after PR #379368 --- pkgs/stdenv/darwin/stdenv-bootstrap-tools.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/stdenv/darwin/stdenv-bootstrap-tools.nix b/pkgs/stdenv/darwin/stdenv-bootstrap-tools.nix index c678d2d20f2c9..1dde0a42e4ba3 100644 --- a/pkgs/stdenv/darwin/stdenv-bootstrap-tools.nix +++ b/pkgs/stdenv/darwin/stdenv-bootstrap-tools.nix @@ -1,7 +1,7 @@ { lib, stdenv, - bash, + bashNonInteractive, bzip2, coreutils, cpio, @@ -131,7 +131,7 @@ stdenv.mkDerivation (finalAttrs: { cp ${getBin coreutils_}/bin/* $out/bin (cd $out/bin && rm vdir dir sha*sum pinky factor pathchk runcon shuf who whoami shred users) - cp -d ${getBin bash}/bin/{ba,}sh $out/bin + cp -d ${getBin bashNonInteractive}/bin/{ba,}sh $out/bin cp -d ${getBin diffutils}/bin/* $out/bin cp ${getBin findutils}/bin/{find,xargs} $out/bin cp -d ${getBin gawk}/bin/{g,}awk $out/bin @@ -192,7 +192,7 @@ stdenv.mkDerivation (finalAttrs: { # tools needed to unpack bootstrap archive mkdir -p unpack/bin unpack/lib - cp -d ${getBin bash}/bin/{bash,sh} unpack/bin + cp -d ${getBin bashNonInteractive}/bin/{ba,}sh unpack/bin cp ${getBin coreutils_}/bin/mkdir unpack/bin cp ${getBin gnutar}/bin/tar unpack/bin cp ${getBin xz}/bin/xz unpack/bin From 964b5727cb21746ab91e70a4bfc6cf16e423b51d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luka=20Bla=C5=A1kovi=C4=87?= Date: Mon, 17 Feb 2025 10:40:59 +0000 Subject: [PATCH 337/343] python310/python311: fix failing tests with openssl >= 3.4 --- .../3.10/raise-OSError-for-ERR_LIB_SYS.patch | 28 +++++++++++++++++++ .../interpreters/python/cpython/default.nix | 9 ++++++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/development/interpreters/python/cpython/3.10/raise-OSError-for-ERR_LIB_SYS.patch diff --git a/pkgs/development/interpreters/python/cpython/3.10/raise-OSError-for-ERR_LIB_SYS.patch b/pkgs/development/interpreters/python/cpython/3.10/raise-OSError-for-ERR_LIB_SYS.patch new file mode 100644 index 0000000000000..dd1fe891bf25e --- /dev/null +++ b/pkgs/development/interpreters/python/cpython/3.10/raise-OSError-for-ERR_LIB_SYS.patch @@ -0,0 +1,28 @@ +diff --git a/Modules/_ssl.c b/Modules/_ssl.c +index e637830..80728d2 100644 +--- a/Modules/_ssl.c ++++ b/Modules/_ssl.c +@@ -656,6 +656,11 @@ PySSL_SetError(PySSLSocket *sslsock, int ret, const char *filename, int lineno) + errstr = "Some I/O error occurred"; + } + } else { ++ if (ERR_GET_LIB(e) == ERR_LIB_SYS) { ++ // A system error is being reported; reason is set to errno ++ errno = ERR_GET_REASON(e); ++ return PyErr_SetFromErrno(PyExc_OSError); ++ } + p = PY_SSL_ERROR_SYSCALL; + } + break; +@@ -681,6 +686,11 @@ PySSL_SetError(PySSLSocket *sslsock, int ret, const char *filename, int lineno) + errstr = "EOF occurred in violation of protocol"; + } + #endif ++ if (ERR_GET_LIB(e) == ERR_LIB_SYS) { ++ // A system error is being reported; reason is set to errno ++ errno = ERR_GET_REASON(e); ++ return PyErr_SetFromErrno(PyExc_OSError); ++ } + break; + } + default: diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix index d0fab0f83a667..8a052a55b7daa 100644 --- a/pkgs/development/interpreters/python/cpython/default.nix +++ b/pkgs/development/interpreters/python/cpython/default.nix @@ -299,6 +299,15 @@ in with passthru; stdenv.mkDerivation (finalAttrs: { ] ++ optionals (pythonOlder "3.12") [ # https://github.com/python/cpython/issues/90656 ./loongarch-support.patch + # fix failing tests with openssl >= 3.4 + # https://github.com/python/cpython/pull/127361 + ] ++ optionals (pythonAtLeast "3.10" && pythonOlder "3.11") [ + ./3.10/raise-OSError-for-ERR_LIB_SYS.patch + ] ++ optionals (pythonAtLeast "3.11" && pythonOlder "3.12") [ + (fetchpatch { + url = "https://github.com/python/cpython/commit/f4b31edf2d9d72878dab1f66a36913b5bcc848ec.patch"; + sha256 = "sha256-w7zZMp0yqyi4h5oG8sK4z9BwNEkqg4Ar+en3nlWcxh0="; + }) ] ++ optionals (pythonAtLeast "3.11" && pythonOlder "3.13") [ # backport fix for https://github.com/python/cpython/issues/95855 ./platform-triplet-detection.patch From 52b329edeff0b54b798e71051fcf0e06aa01a38e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 19 Feb 2025 09:20:13 +0100 Subject: [PATCH 338/343] python3Packages.m2crypto: 0.43.0 -> 0.44.0 https://gitlab.com/m2crypto/m2crypto/-/tags/0.44.0 Also pull a Debian patch to fix build: https://hydra.nixos.org/build/289647638/nixlog/3/tail --- pkgs/development/python-modules/m2crypto/default.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/m2crypto/default.nix b/pkgs/development/python-modules/m2crypto/default.nix index 4b1f3ca07aa24..1767050052fc4 100644 --- a/pkgs/development/python-modules/m2crypto/default.nix +++ b/pkgs/development/python-modules/m2crypto/default.nix @@ -3,6 +3,7 @@ stdenv, buildPythonPackage, fetchPypi, + fetchurl, openssl, pytestCheckHook, pythonOlder, @@ -12,15 +13,21 @@ buildPythonPackage rec { pname = "m2crypto"; - version = "0.43.0"; + version = "0.44.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-bCwce7DoqnaPfKgD2n28JmbUADsmvXrfcCM6/FnYzzM="; + hash = "sha256-OEu0y9F47g50AVMRt7H58sN342huA/oHCz7C9JRnHA8="; }; + patches = [ + (fetchurl { + url = "https://sources.debian.org/data/main/m/m2crypto/0.42.0-2.1/debian/patches/0004-swig-Workaround-for-reading-sys-select.h-ending-with.patch"; + hash = "sha256-/Bkuqu/Od+S56AUWo0ZzpZF7FGMxP766K2GJnfKXrOI="; + }) + ]; build-system = [ setuptools ]; From 42e7b59a9d157e1e0443a31051e02b5619ea0021 Mon Sep 17 00:00:00 2001 From: Kirill Radzikhovskyy Date: Wed, 19 Feb 2025 19:24:10 +1100 Subject: [PATCH 339/343] nodejs_20: nixfmt --- pkgs/development/web/nodejs/v20.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/web/nodejs/v20.nix b/pkgs/development/web/nodejs/v20.nix index 66dbd357f028b..dca76d89b8b4f 100644 --- a/pkgs/development/web/nodejs/v20.nix +++ b/pkgs/development/web/nodejs/v20.nix @@ -1,4 +1,3 @@ - { callPackage, fetchpatch2, From 3ec52358bca7edbfd6747a7f5f7b0b1f8b024477 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 19 Feb 2025 09:55:07 +0100 Subject: [PATCH 340/343] rubyPackages.charlock_holmes: 0.7.7 -> 0.7.9 Also the same inside schleuder gem-lock. https://github.com/brianmario/charlock_holmes/compare/v0.7.7...v0.7.9 In particular this fixes build, probably after icu upgrade: https://hydra.nixos.org/build/289930518/nixlog/3/tail --- pkgs/tools/security/schleuder/Gemfile.lock | 2 +- pkgs/tools/security/schleuder/gemset.nix | 4 ++-- pkgs/top-level/ruby-packages.nix | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/security/schleuder/Gemfile.lock b/pkgs/tools/security/schleuder/Gemfile.lock index 96970097b875c..5fa592457fe83 100644 --- a/pkgs/tools/security/schleuder/Gemfile.lock +++ b/pkgs/tools/security/schleuder/Gemfile.lock @@ -16,7 +16,7 @@ GEM tzinfo (~> 2.0) zeitwerk (~> 2.3) bcrypt (3.1.20) - charlock_holmes (0.7.7) + charlock_holmes (0.7.9) concurrent-ruby (1.3.1) daemons (1.4.1) eventmachine (1.2.7) diff --git a/pkgs/tools/security/schleuder/gemset.nix b/pkgs/tools/security/schleuder/gemset.nix index ec334c67ac5f9..025c6aa9e997f 100644 --- a/pkgs/tools/security/schleuder/gemset.nix +++ b/pkgs/tools/security/schleuder/gemset.nix @@ -56,10 +56,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0hybw8jw9ryvz5zrki3gc9r88jqy373m6v46ynxsdzv1ysiyr40p"; + sha256 = "1c1dws56r7p8y363dhyikg7205z59a3bn4amnv2y488rrq8qm7ml"; type = "gem"; }; - version = "0.7.7"; + version = "0.7.9"; }; concurrent-ruby = { groups = [ "default" ]; diff --git a/pkgs/top-level/ruby-packages.nix b/pkgs/top-level/ruby-packages.nix index 3bf08ddf5be8f..b321a80017f4f 100644 --- a/pkgs/top-level/ruby-packages.nix +++ b/pkgs/top-level/ruby-packages.nix @@ -322,10 +322,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0hybw8jw9ryvz5zrki3gc9r88jqy373m6v46ynxsdzv1ysiyr40p"; + sha256 = "1c1dws56r7p8y363dhyikg7205z59a3bn4amnv2y488rrq8qm7ml"; type = "gem"; }; - version = "0.7.7"; + version = "0.7.9"; }; childprocess = { dependecnies = ["logger"]; From dcd3f71dc763a695ba936ef1eec625a97f2e3539 Mon Sep 17 00:00:00 2001 From: Yureka Date: Wed, 19 Feb 2025 13:24:47 +0100 Subject: [PATCH 341/343] imv: pin icu to 7.5 --- pkgs/by-name/im/imv/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/im/imv/package.nix b/pkgs/by-name/im/imv/package.nix index 775c82585cc40..45005c77bebb6 100644 --- a/pkgs/by-name/im/imv/package.nix +++ b/pkgs/by-name/im/imv/package.nix @@ -9,7 +9,7 @@ meson, ninja, pkg-config, - icu, + icu75, pango, inih, withWindowSystem ? null, @@ -116,7 +116,7 @@ stdenv.mkDerivation rec { buildInputs = [ cmocka - icu + icu75 libxkbcommon pango inih From 7eed548611fd3d0ef92de774c1b31891c9525ff5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 19 Feb 2025 20:38:28 +0100 Subject: [PATCH 342/343] slop: pin back to icu74 https://hydra.nixos.org/build/289715936/nixlog/3/tail Hmm, no meta.maintainers, basically no changes upstream during the past few years. --- pkgs/by-name/sl/slop/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sl/slop/package.nix b/pkgs/by-name/sl/slop/package.nix index 3233dfe822bf1..7bf6fc1f07799 100644 --- a/pkgs/by-name/sl/slop/package.nix +++ b/pkgs/by-name/sl/slop/package.nix @@ -12,7 +12,7 @@ libX11, libXext, libXrender, - icu, + icu74, libSM, }: @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { libX11 libXext libXrender - icu + icu74 libSM ]; From 61da3c0b37262a0a12a282f3c5c548a3c1e42db3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 20 Feb 2025 10:34:21 +0100 Subject: [PATCH 343/343] ceph: disable more pyopenssl tests Honestly, I don't know. All so ugly. Hopefully we don't need much of pyopenssl here anyway. https://hydra.nixos.org/build/290186587/nixlog/7/tail --- pkgs/tools/filesystems/ceph/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/tools/filesystems/ceph/default.nix b/pkgs/tools/filesystems/ceph/default.nix index f11752d5e0948..8cc13b4a0b0eb 100644 --- a/pkgs/tools/filesystems/ceph/default.nix +++ b/pkgs/tools/filesystems/ceph/default.nix @@ -257,6 +257,9 @@ let disabledTests = old.disabledTests or [ ] ++ [ "test_export_md5_digest" ]; + disabledTestPaths = old.disabledTestPaths or [ ] ++ [ + "tests/test_ssl.py" + ]; propagatedBuildInputs = old.propagatedBuildInputs or [ ] ++ [ self.flaky ];