pyrox.dev
Merge master into staging-next
authored by nixpkgs-ci[bot] and committed by GitHub 143dd3d8 18b7b96b
+2
-2
pkgs/by-name/li/libsidplayfp/package.nix
+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
+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