From 984d023601a2518b58f9ae1ca8ce517ecd2b2f19 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Tue, 15 Oct 2024 20:32:46 +0200 Subject: [PATCH 1/2] python3Packages.python-dbusmock: fix for musl Backports an upstream patch. --- .../python-modules/python-dbusmock/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/development/python-modules/python-dbusmock/default.nix b/pkgs/development/python-modules/python-dbusmock/default.nix index dd5e15eb66eb..256306aa646b 100644 --- a/pkgs/development/python-modules/python-dbusmock/default.nix +++ b/pkgs/development/python-modules/python-dbusmock/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, + fetchpatch, runCommand, # build-system @@ -40,6 +41,14 @@ buildPythonPackage rec { hash = "sha256-t8gMBebqVVij6R2KEOq3/j1ql4ZiVdE5236uqGUchE0="; }; + patches = [ + (fetchpatch { + name = "musl.patch"; + url = "https://github.com/martinpitt/python-dbusmock/commit/1a8d8722068ef7e5f061336047a72d1a0f253b98.patch"; + hash = "sha256-0j3UXsTMDh1+UolkmoLQXlwHXve81yKiGJ7gDWNZVPY="; + }) + ]; + build-system = [ setuptools setuptools-scm From 0c016abe52679d4adabf4bd4779e20fb5bfb90c1 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Wed, 16 Oct 2024 09:47:02 +0200 Subject: [PATCH 2/2] python3Packages.python-dbusmock: 0.32.1 -> 0.32.2 Backports an upstream patch to not require /etc/os-release at build time. --- .../python-modules/python-dbusmock/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-dbusmock/default.nix b/pkgs/development/python-modules/python-dbusmock/default.nix index 256306aa646b..d39f44084d50 100644 --- a/pkgs/development/python-modules/python-dbusmock/default.nix +++ b/pkgs/development/python-modules/python-dbusmock/default.nix @@ -31,14 +31,14 @@ let in buildPythonPackage rec { pname = "python-dbusmock"; - version = "0.32.1"; + version = "0.32.2"; pyproject = true; src = fetchFromGitHub { owner = "martinpitt"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-t8gMBebqVVij6R2KEOq3/j1ql4ZiVdE5236uqGUchE0="; + hash = "sha256-TOs6wAZDcSD1eP+Hbj78YXoAtKbReC5di5QSpQdwp8E="; }; patches = [ @@ -47,6 +47,11 @@ buildPythonPackage rec { url = "https://github.com/martinpitt/python-dbusmock/commit/1a8d8722068ef7e5f061336047a72d1a0f253b98.patch"; hash = "sha256-0j3UXsTMDh1+UolkmoLQXlwHXve81yKiGJ7gDWNZVPY="; }) + (fetchpatch { + name = "os-release.patch"; + url = "https://github.com/martinpitt/python-dbusmock/commit/4b99cff50e8c741f20aef4527b27ccdb2a4053d2.patch"; + hash = "sha256-Xcovv44JeuTvPAtXWJvWE+MxlyloClSJGKZz+C3P5bE="; + }) ]; build-system = [