From 605519e2ea16977ed2d1799596d74d2cfb788fe5 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Mon, 15 Jun 2026 01:17:52 +0200 Subject: [PATCH 1/2] python3Packages.unearth: unbreak with patch from upstream fixes https://hydra.nixos.org/build/329669767 --- pkgs/development/python-modules/unearth/default.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pkgs/development/python-modules/unearth/default.nix b/pkgs/development/python-modules/unearth/default.nix index 8ff4f4590a36..a2f6ab05c389 100644 --- a/pkgs/development/python-modules/unearth/default.nix +++ b/pkgs/development/python-modules/unearth/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchPypi, + fetchpatch, packaging, pdm-backend, httpx, @@ -23,6 +24,16 @@ buildPythonPackage rec { hash = "sha256-HlPX9S9G3V+HXnf/HFWxJHfiFaCS5LZsl2SnffSptSA="; }; + patches = [ + # https://github.com/frostming/unearth/pull/176 + (fetchpatch { + name = "fix-packaging-26.0-changes.patch"; + url = "https://github.com/frostming/unearth/commit/69ece0800edeefb1daf035bb0ee348e17a4393fd.patch"; + hash = "sha256-t/Ubv9qC1Fvh4JsnfVgOZO/O7ZpCGHugBUt9qAjnH8c="; + excludes = [ "pdm.lock" ]; + }) + ]; + build-system = [ pdm-backend ]; dependencies = [ From 84558b851369773dfcf96e166c0c02d1f68fac4b Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Mon, 15 Jun 2026 01:13:59 +0200 Subject: [PATCH 2/2] pdm: 2.26.6 -> 2.27.0 Changelog: https://github.com/pdm-project/pdm/releases/tag/2.27.0 --- pkgs/by-name/pd/pdm/package.nix | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/pd/pdm/package.nix b/pkgs/by-name/pd/pdm/package.nix index fd15fc336149..7e61971f5038 100644 --- a/pkgs/by-name/pd/pdm/package.nix +++ b/pkgs/by-name/pd/pdm/package.nix @@ -12,13 +12,6 @@ let python = python3.override { self = python; packageOverrides = _: super: { - resolvelib = super.resolvelib.overridePythonAttrs (old: rec { - version = "1.1.0"; - src = old.src.override { - tag = version; - hash = "sha256-UBdgFN+fvbjz+rp8+rog8FW2jwO/jCfUPV7UehJKiV8="; - }; - }); # pdm requires ...... -> ghostscript-with-X which is AGPL only matplotlib = super.matplotlib.override { enableTk = false; }; # pdm requires ...... -> jbig2dec which is AGPL only @@ -30,14 +23,14 @@ let in python.pkgs.buildPythonApplication rec { pname = "pdm"; - version = "2.26.6"; + version = "2.27.0"; pyproject = true; src = fetchFromGitHub { owner = "pdm-project"; repo = "pdm"; tag = version; - hash = "sha256-khgaI9ivwF6i2zlW57vQtBwQpk5mzYVCV4lMOio7ibw="; + hash = "sha256-Ju1UoyThWoPnU9HJzdgA9ry+G1pXOhXmPIoydTg7VXo="; }; pythonRelaxDeps = [ "hishel" ];