pyrox.dev
Merge staging-next into staging
authored by nixpkgs-ci[bot] and committed by GitHub 577ffd1b ba716a80
+2
-2
pkgs/by-name/li/libsidplayfp/package.nix
+2
-2
pkgs/by-name/li/libsidplayfp/package.nix
···
19
20
stdenv.mkDerivation (finalAttrs: {
21
pname = "libsidplayfp";
22
-
version = "2.13.1";
23
24
src = fetchFromGitHub {
25
owner = "libsidplayfp";
26
repo = "libsidplayfp";
27
rev = "v${finalAttrs.version}";
28
fetchSubmodules = true;
29
-
hash = "sha256-gUi7g+TZmF6XgacImVSNc69zpMckjCaqwfidIrrh38U=";
30
};
31
32
outputs = [ "out" ] ++ lib.optionals docSupport [ "doc" ];
···
19
20
stdenv.mkDerivation (finalAttrs: {
21
pname = "libsidplayfp";
22
+
version = "2.14.0";
23
24
src = fetchFromGitHub {
25
owner = "libsidplayfp";
26
repo = "libsidplayfp";
27
rev = "v${finalAttrs.version}";
28
fetchSubmodules = true;
29
+
hash = "sha256-q1cUv4gpzL3wfssP7pWtDfDzFO47+kzpGy4GYLzEM50=";
30
};
31
32
outputs = [ "out" ] ++ lib.optionals docSupport [ "doc" ];
+11
pkgs/by-name/mi/miniupnpc/package.nix
+11
pkgs/by-name/mi/miniupnpc/package.nix
···
2
lib,
3
stdenv,
4
fetchFromGitHub,
5
+
fetchpatch,
6
cmake,
7
versionCheckHook,
8
nixosTests,
···
20
};
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
+
];
33
34
nativeBuildInputs = [ cmake ];
35
+4
-1
pkgs/development/python-modules/exceptiongroup/default.nix
+4
-1
pkgs/development/python-modules/exceptiongroup/default.nix
···
6
pytestCheckHook,
7
pythonAtLeast,
8
pythonOlder,
9
+
typing-extensions,
10
}:
11
12
buildPythonPackage rec {
···
23
hash = "sha256-b3Z1NsYKp0CecUq8kaC/j3xR/ZZHDIw4MhUeadizz88=";
24
};
25
26
+
build-system = [ flit-scm ];
27
+
28
+
dependencies = lib.optionals (pythonOlder "3.13") [ typing-extensions ];
29
30
nativeCheckInputs = [ pytestCheckHook ];
31