Merge staging-next into staging

authored by nixpkgs-ci[bot] and committed by GitHub 577ffd1b ba716a80

+17 -3
+2 -2
pkgs/by-name/li/libsidplayfp/package.nix
··· 19 19 20 20 stdenv.mkDerivation (finalAttrs: { 21 21 pname = "libsidplayfp"; 22 - version = "2.13.1"; 22 + version = "2.14.0"; 23 23 24 24 src = fetchFromGitHub { 25 25 owner = "libsidplayfp"; 26 26 repo = "libsidplayfp"; 27 27 rev = "v${finalAttrs.version}"; 28 28 fetchSubmodules = true; 29 - hash = "sha256-gUi7g+TZmF6XgacImVSNc69zpMckjCaqwfidIrrh38U="; 29 + hash = "sha256-q1cUv4gpzL3wfssP7pWtDfDzFO47+kzpGy4GYLzEM50="; 30 30 }; 31 31 32 32 outputs = [ "out" ] ++ lib.optionals docSupport [ "doc" ];
+11
pkgs/by-name/mi/miniupnpc/package.nix
··· 2 2 lib, 3 3 stdenv, 4 4 fetchFromGitHub, 5 + fetchpatch, 5 6 cmake, 6 7 versionCheckHook, 7 8 nixosTests, ··· 19 20 }; 20 21 21 22 sourceRoot = "${finalAttrs.src.name}/miniupnpc"; 23 + 24 + patches = [ 25 + # fix missing include 26 + # remove on next release 27 + (fetchpatch { 28 + url = "https://github.com/miniupnp/miniupnp/commit/e263ab6f56c382e10fed31347ec68095d691a0e8.patch"; 29 + hash = "sha256-PHqjruFOcsGT3rdFS/GD3wEvalCmoRY4BtIKFxCjKDw="; 30 + stripLen = 1; 31 + }) 32 + ]; 22 33 23 34 nativeBuildInputs = [ cmake ]; 24 35
+4 -1
pkgs/development/python-modules/exceptiongroup/default.nix
··· 6 6 pytestCheckHook, 7 7 pythonAtLeast, 8 8 pythonOlder, 9 + typing-extensions, 9 10 }: 10 11 11 12 buildPythonPackage rec { ··· 22 23 hash = "sha256-b3Z1NsYKp0CecUq8kaC/j3xR/ZZHDIw4MhUeadizz88="; 23 24 }; 24 25 25 - nativeBuildInputs = [ flit-scm ]; 26 + build-system = [ flit-scm ]; 27 + 28 + dependencies = lib.optionals (pythonOlder "3.13") [ typing-extensions ]; 26 29 27 30 nativeCheckInputs = [ pytestCheckHook ]; 28 31