From a31c6951411f488ab32b6e86b8b520a1a2345dcf Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 2 Feb 2025 16:35:46 +0000 Subject: [PATCH 01/18] yafc-ce: 2.6.0 -> 2.7.0 --- pkgs/by-name/ya/yafc-ce/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ya/yafc-ce/package.nix b/pkgs/by-name/ya/yafc-ce/package.nix index 2500ee6cb352..45305b2072d3 100644 --- a/pkgs/by-name/ya/yafc-ce/package.nix +++ b/pkgs/by-name/ya/yafc-ce/package.nix @@ -12,13 +12,13 @@ let in buildDotnetModule (finalAttrs: { pname = "yafc-ce"; - version = "2.6.0"; + version = "2.7.0"; src = fetchFromGitHub { owner = "shpaass"; repo = "yafc-ce"; rev = finalAttrs.version; - hash = "sha256-anQ49VWDIdze108idGLXXM74dfqAg9KqVthFozHQl0A="; + hash = "sha256-pBnAUrDnOabQq7D1YJ41aJq9MSPIHQ6K8ix5TLwkrZ0="; }; projectFile = [ "Yafc/Yafc.csproj" ]; 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 02/18] 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 000000000000..0591c5b2d438 --- /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 1b236e269b39..9b33ee7b7672 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 05f423eb0002ec86489dacc96b44e9616b284f20 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 9 Feb 2025 13:21:19 -0800 Subject: [PATCH 03/18] python313Packages.paho-mqtt: 1.6.1 -> 2.1.0 --- pkgs/top-level/python-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8f7554dd90ff..d3105799d860 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10040,7 +10040,7 @@ self: super: with self; { paho-mqtt_1 = callPackage ../development/python-modules/paho-mqtt/1.nix { }; paho-mqtt_2 = callPackage ../development/python-modules/paho-mqtt/default.nix { }; - paho-mqtt = paho-mqtt_1; + paho-mqtt = paho-mqtt_2; paintcompiler = callPackage ../development/python-modules/paintcompiler { }; From d7d9a5982f39aeeddfa41474829701b70c07687b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 9 Feb 2025 13:24:53 -0800 Subject: [PATCH 04/18] frigate: unpin paho-mqtt --- pkgs/by-name/fr/frigate/package.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/by-name/fr/frigate/package.nix b/pkgs/by-name/fr/frigate/package.nix index 590a483444a0..c9219a2e5a91 100644 --- a/pkgs/by-name/fr/frigate/package.nix +++ b/pkgs/by-name/fr/frigate/package.nix @@ -26,7 +26,6 @@ let python = python312.override { self = python; packageOverrides = self: super: { - paho-mqtt = super.paho-mqtt_2; }; }; From 369074d4bd2f601fc6ea1ea5eeaf1a1aeb147bca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 9 Feb 2025 13:25:36 -0800 Subject: [PATCH 05/18] python313Packages.weconnect-mqtt: unpin paho-mqtt --- pkgs/development/python-modules/weconnect-mqtt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/weconnect-mqtt/default.nix b/pkgs/development/python-modules/weconnect-mqtt/default.nix index 19a2cd2fb32b..2c7b5045cf83 100644 --- a/pkgs/development/python-modules/weconnect-mqtt/default.nix +++ b/pkgs/development/python-modules/weconnect-mqtt/default.nix @@ -2,7 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, - paho-mqtt_2, + paho-mqtt, pytest-cov-stub, pytestCheckHook, python-dateutil, @@ -39,7 +39,7 @@ buildPythonPackage rec { build-system = [ setuptools ]; dependencies = [ - paho-mqtt_2 + paho-mqtt python-dateutil weconnect ] ++ weconnect.optional-dependencies.Images; From f37ff3af3ea38672553f40070a433d82563d4345 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 9 Feb 2025 13:26:09 -0800 Subject: [PATCH 06/18] mqtt-exporter: unpin paho-mqtt --- pkgs/by-name/mq/mqtt-exporter/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/mq/mqtt-exporter/package.nix b/pkgs/by-name/mq/mqtt-exporter/package.nix index 01715b67d838..47464ffe1f9a 100644 --- a/pkgs/by-name/mq/mqtt-exporter/package.nix +++ b/pkgs/by-name/mq/mqtt-exporter/package.nix @@ -21,7 +21,7 @@ python3.pkgs.buildPythonApplication rec { build-system = with python3.pkgs; [ setuptools ]; dependencies = with python3.pkgs; [ - paho-mqtt_2 + paho-mqtt prometheus-client ]; From 430baeedba5ab4eaca3030a74941cf3b777ac4b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 9 Feb 2025 13:40:31 -0800 Subject: [PATCH 07/18] python313Packages.ha-mqtt-discoverable: mark broken with paho-mqtt v2 --- .../development/python-modules/ha-mqtt-discoverable/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/ha-mqtt-discoverable/default.nix b/pkgs/development/python-modules/ha-mqtt-discoverable/default.nix index 911a852655ae..4e2275dba2d1 100644 --- a/pkgs/development/python-modules/ha-mqtt-discoverable/default.nix +++ b/pkgs/development/python-modules/ha-mqtt-discoverable/default.nix @@ -43,6 +43,8 @@ buildPythonPackage rec { pythonImportsCheck = [ "ha_mqtt_discoverable" ]; meta = with lib; { + # https://github.com/unixorn/ha-mqtt-discoverable/pull/310 + broken = lib.versionAtLeast paho-mqtt.version "2"; description = "Python module to create MQTT entities that are automatically discovered by Home Assistant"; homepage = "https://github.com/unixorn/ha-mqtt-discoverable"; changelog = "https://github.com/unixorn/ha-mqtt-discoverable/releases/tag/v${version}"; From c45a2f9d7568acfe876ea32f88939120e15049b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 9 Feb 2025 13:42:00 -0800 Subject: [PATCH 08/18] ha-mqtt-discoverable-cli: pin paho-mqtt to v1 --- .../ha/ha-mqtt-discoverable-cli/package.nix | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ha/ha-mqtt-discoverable-cli/package.nix b/pkgs/by-name/ha/ha-mqtt-discoverable-cli/package.nix index dfa7b6f4cc2e..8007859bf840 100644 --- a/pkgs/by-name/ha/ha-mqtt-discoverable-cli/package.nix +++ b/pkgs/by-name/ha/ha-mqtt-discoverable-cli/package.nix @@ -4,7 +4,16 @@ python3, }: -python3.pkgs.buildPythonApplication rec { +let + python = python3.override { + self = python; + packageOverrides = self: super: { + # https://github.com/unixorn/ha-mqtt-discoverable/pull/310 + paho-mqtt = self.paho-mqtt_1; + }; + }; +in +python.pkgs.buildPythonApplication rec { pname = "ha-mqtt-discoverable-cli"; version = "0.16.4.1"; pyproject = true; @@ -18,9 +27,9 @@ python3.pkgs.buildPythonApplication rec { pythonRelaxDeps = [ "ha-mqtt-discoverable" ]; - build-system = with python3.pkgs; [ poetry-core ]; + build-system = with python.pkgs; [ poetry-core ]; - dependencies = with python3.pkgs; [ ha-mqtt-discoverable ]; + dependencies = with python.pkgs; [ ha-mqtt-discoverable ]; # Project has no real tests doCheck = false; From ab15130c1a8a76cea8fd5bf8ee4728d209bedbb2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 9 Feb 2025 13:58:13 -0800 Subject: [PATCH 09/18] python313Packages.azure-iot-device: mark broken with paho-mqtt v2 --- pkgs/development/python-modules/azure-iot-device/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/azure-iot-device/default.nix b/pkgs/development/python-modules/azure-iot-device/default.nix index cae7ceb73efc..08928f7bcba1 100644 --- a/pkgs/development/python-modules/azure-iot-device/default.nix +++ b/pkgs/development/python-modules/azure-iot-device/default.nix @@ -50,6 +50,8 @@ buildPythonPackage rec { ]; meta = with lib; { + # https://github.com/Azure/azure-iot-sdk-python/issues/1196 + broken = lib.versionAtLeast paho-mqtt.version "2"; description = "Microsoft Azure IoT Device Library for Python"; homepage = "https://github.com/Azure/azure-iot-sdk-python"; license = licenses.mit; From 8cd3dc02231177b62d137b103615b0d08e46f658 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 9 Feb 2025 14:00:04 -0800 Subject: [PATCH 10/18] Revert "python3Packages.amshan: 2.1.1 -> 2021.12.1" This reverts commit 96ab7ef710c74c081abb9a986e5524260ea1b391. --- pkgs/development/python-modules/amshan/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/amshan/default.nix b/pkgs/development/python-modules/amshan/default.nix index 5f0bc3fbbacf..82eaa056d876 100644 --- a/pkgs/development/python-modules/amshan/default.nix +++ b/pkgs/development/python-modules/amshan/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "amshan"; - version = "2021.12.1"; + version = "2.1.1"; pyproject = true; src = fetchFromGitHub { owner = "toreamun"; repo = "amshan"; - tag = version; - hash = "sha256-eL8YzQB6Vj4l3cYFgWve88vLojvcxMtr2xvTUKT+Ekk="; + rev = version; + hash = "sha256-aw0wTqb2s84STVUN55h6L926pXwaMSppBCfXZVb87w0="; }; build-system = [ From 24b53d053ecf1bd358328aca8b6d15be1b772734 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 9 Feb 2025 14:01:19 -0800 Subject: [PATCH 11/18] python313Packages.amshan: skip bulk update --- pkgs/development/python-modules/amshan/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/amshan/default.nix b/pkgs/development/python-modules/amshan/default.nix index 82eaa056d876..f019474e89b4 100644 --- a/pkgs/development/python-modules/amshan/default.nix +++ b/pkgs/development/python-modules/amshan/default.nix @@ -37,6 +37,9 @@ buildPythonPackage rec { pythonImportsCheck = [ "han" ]; + # 2021.12.1 is an older version + passthru.skipBulkUpdate = true; + meta = { description = "Decode smart power meter data stream of Cosem HDLC frames used by MBUS"; longDescription = '' From 19f7ed2c2c9ea4268ec2af4b3910ab568d786a5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 9 Feb 2025 14:04:24 -0800 Subject: [PATCH 12/18] python313Packages.meross-iot: mark broken with paho-mqtt v2 --- pkgs/development/python-modules/meross-iot/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/meross-iot/default.nix b/pkgs/development/python-modules/meross-iot/default.nix index 5f037426b477..02f953c0ac8a 100644 --- a/pkgs/development/python-modules/meross-iot/default.nix +++ b/pkgs/development/python-modules/meross-iot/default.nix @@ -41,6 +41,8 @@ buildPythonPackage rec { pythonImportsCheck = [ "meross_iot" ]; meta = with lib; { + # https://github.com/albertogeniola/MerossIot/pull/413 + broken = lib.versionAtLeast paho-mqtt.version "2"; description = "Python library to interact with Meross devices"; homepage = "https://github.com/albertogeniola/MerossIot"; changelog = "https://github.com/albertogeniola/MerossIot/releases/tag/${version}"; From 8d4f14e20d71aed5b733db065d16661f991e5497 Mon Sep 17 00:00:00 2001 From: Jost Alemann Date: Sun, 9 Feb 2025 23:37:11 +0100 Subject: [PATCH 13/18] zoxide: 0.9.6 -> 0.9.7 --- pkgs/by-name/zo/zoxide/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/zo/zoxide/package.nix b/pkgs/by-name/zo/zoxide/package.nix index 78ff39b89a46..140990537964 100644 --- a/pkgs/by-name/zo/zoxide/package.nix +++ b/pkgs/by-name/zo/zoxide/package.nix @@ -11,13 +11,13 @@ rustPlatform.buildRustPackage rec { pname = "zoxide"; - version = "0.9.6"; + version = "0.9.7"; src = fetchFromGitHub { owner = "ajeetdsouza"; repo = "zoxide"; tag = "v${version}"; - hash = "sha256-3XC5K4OlituoFMPN9yJkYi+tkH6M0KK5jVAGdr/GLd0="; + hash = "sha256-+QZpLMlHOZdbKLFYOUOIRZHvIsbMDdstj9oGzyEGVxk="; }; nativeBuildInputs = [ installShellFiles ]; @@ -30,7 +30,7 @@ rustPlatform.buildRustPackage rec { ''; useFetchCargoVendor = true; - cargoHash = "sha256-+Vip7MjVV23dZdD8GxmNFrfnsjmucohMDUZE9vbpG5w="; + cargoHash = "sha256-uqIL8KTrgWzzzyoPR9gctyh0Rf7WQpTGqXow2/xFvCU="; postInstall = '' installManPage man/man*/* From ad60461a744300f61aac738d41ff01b61572c5ab Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 10 Feb 2025 00:27:14 +0000 Subject: [PATCH 14/18] python312Packages.mkdocs-git-committers-plugin-2: 2.4.1 -> 2.5.0 --- .../mkdocs-git-committers-plugin-2/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/mkdocs-git-committers-plugin-2/default.nix b/pkgs/development/python-modules/mkdocs-git-committers-plugin-2/default.nix index 6ff5a1c51101..4405d028dc19 100644 --- a/pkgs/development/python-modules/mkdocs-git-committers-plugin-2/default.nix +++ b/pkgs/development/python-modules/mkdocs-git-committers-plugin-2/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "mkdocs-git-committers-plugin-2"; - version = "2.4.1"; + version = "2.5.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -24,8 +24,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "ojacques"; repo = "mkdocs-git-committers-plugin-2"; - rev = "refs/tags/${version}"; - hash = "sha256-hKt0K5gOkdUDwTlyMTwodl4gD1RD+s+CM+zEpngSnlc="; + tag = version; + hash = "sha256-PpXgY5RlOeb0mB46gcNVWkSGMZa4WPkCwDUXMxCUjsI="; }; build-system = [ @@ -45,7 +45,7 @@ buildPythonPackage rec { meta = { description = "MkDocs plugin for displaying a list of contributors on each page"; homepage = "https://github.com/ojacques/mkdocs-git-committers-plugin-2"; - changelog = "https://github.com/ojacques/mkdocs-git-committers-plugin-2/releases/tag/${version}"; + changelog = "https://github.com/ojacques/mkdocs-git-committers-plugin-2/releases/tag/${src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ mahtaran ]; }; From b120605deb471c4078fc9f9b502c092743bb14fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 9 Feb 2025 16:59:18 -0800 Subject: [PATCH 15/18] python313Packages.homeassistant-stubs: 2025.2.0 -> 2025.2.1 Diff: https://github.com/KapJI/homeassistant-stubs/compare/refs/tags/2025.2.0...2025.2.1 Changelog: https://github.com/KapJI/homeassistant-stubs/releases/tag/2025.2.1 --- pkgs/servers/home-assistant/stubs.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/home-assistant/stubs.nix b/pkgs/servers/home-assistant/stubs.nix index 66f7fb3eca5b..ee532d02e048 100644 --- a/pkgs/servers/home-assistant/stubs.nix +++ b/pkgs/servers/home-assistant/stubs.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "homeassistant-stubs"; - version = "2025.2.0"; + version = "2025.2.1"; pyproject = true; disabled = python.version != home-assistant.python.version; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "KapJI"; repo = "homeassistant-stubs"; rev = "refs/tags/${version}"; - hash = "sha256-u9RclA8vtsr34TKdocFgc3e/LjaRjP3fqQC0QjqsOs4="; + hash = "sha256-Lw+eItDQX77jKIE9/9S0C9khzR+HMHFPGvPpzRHwrZw="; }; build-system = [ From 6eba2ef25a17bd11bd3aeea237c77e05d8677c94 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 7 Feb 2025 23:49:04 +0000 Subject: [PATCH 16/18] jenkins: 2.479.3 -> 2.492.1 --- pkgs/by-name/je/jenkins/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/je/jenkins/package.nix b/pkgs/by-name/je/jenkins/package.nix index 28df57aae22a..13854ecb5bd4 100644 --- a/pkgs/by-name/je/jenkins/package.nix +++ b/pkgs/by-name/je/jenkins/package.nix @@ -18,11 +18,11 @@ stdenv.mkDerivation rec { pname = "jenkins"; - version = "2.479.3"; + version = "2.492.1"; src = fetchurl { url = "https://get.jenkins.io/war-stable/${version}/jenkins.war"; - hash = "sha256-MEyFkoYNWwPewnyWteiexY/HRPeBYcU/ejRKC/fOkgM="; + hash = "sha256-wFNPna+QJa5AVOwwUYsbifxdl7Mvr9tVa5s6YOn//8g="; }; nativeBuildInputs = [ makeWrapper ]; From d2551f49bfa403f81ce6e9c3c1a1b3a74f65460c Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 9 Feb 2025 22:09:40 +0100 Subject: [PATCH 17/18] 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 47c8f8077a5a..000000000000 --- 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 6c3badae4411..19841f776862 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 f780db4505588b541fd472cd1c7ed9cbd9c4b469 Mon Sep 17 00:00:00 2001 From: Daniel Olsen Date: Mon, 6 Jan 2025 04:19:32 +0100 Subject: [PATCH 18/18] ocamlPackages.magic: 0.7.3 -> 0.7.4, remove myself from maintainer --- pkgs/development/ocaml-modules/magic/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/ocaml-modules/magic/default.nix b/pkgs/development/ocaml-modules/magic/default.nix index a6bd0eb2a033..da5415453fc9 100644 --- a/pkgs/development/ocaml-modules/magic/default.nix +++ b/pkgs/development/ocaml-modules/magic/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "magic"; - version = "0.7.3"; + version = "0.7.4"; src = fetchFromGitHub { owner = "Chris00"; repo = "ocaml-magic"; - rev = "510c473d222a3d3d900b8ae1892d13e0d49d08be"; # no tags in repo - sha256 = "0qks3v51xvzxhidai414mbszxhcl8wg8g7zxd04qi260433g77yg"; + tag = "v${version}"; + sha256 = "sha256-rsBMx68UDqmVVsyeZCxIS97A/0JCBM/JOgh60ly1uSs="; }; createFindlibDestdir = true; @@ -32,6 +32,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/Chris00/ocaml-magic"; description = "Bindings for libmagic"; license = licenses.lgpl21Plus; - maintainers = with maintainers; [ dandellion ]; + maintainers = with maintainers; [ ]; }; }