From a4854954965a0597ba85e082f4e93452aefc2de4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 16 May 2025 18:52:18 +0000 Subject: [PATCH 1/3] libsidplayfp: 2.13.1 -> 2.14.0 --- pkgs/by-name/li/libsidplayfp/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/li/libsidplayfp/package.nix b/pkgs/by-name/li/libsidplayfp/package.nix index 6e26145bfbea..4d2c10f4a1cc 100644 --- a/pkgs/by-name/li/libsidplayfp/package.nix +++ b/pkgs/by-name/li/libsidplayfp/package.nix @@ -19,14 +19,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "libsidplayfp"; - version = "2.13.1"; + version = "2.14.0"; src = fetchFromGitHub { owner = "libsidplayfp"; repo = "libsidplayfp"; rev = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-gUi7g+TZmF6XgacImVSNc69zpMckjCaqwfidIrrh38U="; + hash = "sha256-q1cUv4gpzL3wfssP7pWtDfDzFO47+kzpGy4GYLzEM50="; }; outputs = [ "out" ] ++ lib.optionals docSupport [ "doc" ]; From dd1140d076d30c80206734474e095d44e379754d Mon Sep 17 00:00:00 2001 From: FliegendeWurst Date: Wed, 4 Jun 2025 09:48:04 +0200 Subject: [PATCH 2/3] miniupnpc: fix missing include --- pkgs/by-name/mi/miniupnpc/package.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pkgs/by-name/mi/miniupnpc/package.nix b/pkgs/by-name/mi/miniupnpc/package.nix index d49f0c77a468..8c4644f109e1 100644 --- a/pkgs/by-name/mi/miniupnpc/package.nix +++ b/pkgs/by-name/mi/miniupnpc/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + fetchpatch, cmake, versionCheckHook, nixosTests, @@ -20,6 +21,16 @@ stdenv.mkDerivation (finalAttrs: { sourceRoot = "${finalAttrs.src.name}/miniupnpc"; + patches = [ + # fix missing include + # remove on next release + (fetchpatch { + url = "https://github.com/miniupnp/miniupnp/commit/e263ab6f56c382e10fed31347ec68095d691a0e8.patch"; + hash = "sha256-PHqjruFOcsGT3rdFS/GD3wEvalCmoRY4BtIKFxCjKDw="; + stripLen = 1; + }) + ]; + nativeBuildInputs = [ cmake ]; cmakeFlags = [ From 6bf5fb2e4576e98323a0ec94e1c643093959ba92 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 3 Jun 2025 23:33:28 +0200 Subject: [PATCH 3/3] python3Packages.exceptiongroup: adjust dependencies for Python<=3.12 --- pkgs/development/python-modules/exceptiongroup/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/exceptiongroup/default.nix b/pkgs/development/python-modules/exceptiongroup/default.nix index e60b527cfd44..8fb63dd1d074 100644 --- a/pkgs/development/python-modules/exceptiongroup/default.nix +++ b/pkgs/development/python-modules/exceptiongroup/default.nix @@ -6,6 +6,7 @@ pytestCheckHook, pythonAtLeast, pythonOlder, + typing-extensions, }: buildPythonPackage rec { @@ -22,7 +23,9 @@ buildPythonPackage rec { hash = "sha256-b3Z1NsYKp0CecUq8kaC/j3xR/ZZHDIw4MhUeadizz88="; }; - nativeBuildInputs = [ flit-scm ]; + build-system = [ flit-scm ]; + + dependencies = lib.optionals (pythonOlder "3.13") [ typing-extensions ]; nativeCheckInputs = [ pytestCheckHook ];