pyrox.dev
Merge pull request #278879 from K900/rdfind-next
[staging-next] Assorted fixes found while rebuilding my configs
authored by Martin Weinelt and committed by GitHub 6bce2683 27cc4fe0
+4
-3
pkgs/development/libraries/gbenchmark/default.nix
+4
-3
pkgs/development/libraries/gbenchmark/default.nix
···
8
9
stdenv.mkDerivation rec {
10
pname = "gbenchmark";
11
-
version = "1.8.0";
12
13
src = fetchFromGitHub {
14
owner = "google";
15
repo = "benchmark";
16
rev = "v${version}";
17
-
sha256 = "sha256-pUW9YVaujs/y00/SiPqDgK4wvVsaM7QUp/65k0t7Yr0=";
18
};
19
20
nativeBuildInputs = [ cmake ];
···
29
--replace '$'{prefix}/@CMAKE_INSTALL_INCLUDEDIR@ @CMAKE_INSTALL_FULL_INCLUDEDIR@
30
'';
31
32
-
doCheck = true;
33
34
passthru.tests = {
35
inherit prometheus-cpp;
···
8
9
stdenv.mkDerivation rec {
10
pname = "gbenchmark";
11
+
version = "1.8.3";
12
13
src = fetchFromGitHub {
14
owner = "google";
15
repo = "benchmark";
16
rev = "v${version}";
17
+
sha256 = "sha256-gztnxui9Fe/FTieMjdvfJjWHjkImtlsHn6fM1FruyME=";
18
};
19
20
nativeBuildInputs = [ cmake ];
···
29
--replace '$'{prefix}/@CMAKE_INSTALL_INCLUDEDIR@ @CMAKE_INSTALL_FULL_INCLUDEDIR@
30
'';
31
32
+
# Tests fail on 32-bit due to not enough precision
33
+
doCheck = stdenv.is64bit;
34
35
passthru.tests = {
36
inherit prometheus-cpp;
+10
pkgs/development/libraries/tbb/default.nix
+10
pkgs/development/libraries/tbb/default.nix
···
34
url = "https://patch-diff.githubusercontent.com/raw/oneapi-src/oneTBB/pull/866.patch";
35
hash = "sha256-e44Yv84Hfl5xoxWWTnLJLSGeNA1RBbah4/L43gPLS+c=";
36
})
37
+
38
+
# Fix build with GCC 13
39
+
(fetchpatch {
40
+
url = "https://github.com/oneapi-src/oneTBB/commit/154cc73ca4d359621202399cc0c3c91058e56e79.patch";
41
+
hash = "sha256-BVQQXgBg8T19DGw2gmFkm3KKOuzzJJNOTf/iNIcnHag=";
42
+
})
43
+
(fetchpatch {
44
+
url = "https://github.com/oneapi-src/oneTBB/commit/e131071769ee3df51b56b053ba6bfa06ae9eff25.patch";
45
+
hash = "sha256-IfV/DDb0luxE1l6TofAbQIeJEVxCxZfZqcONGwQEndY=";
46
+
})
47
];
48
49
# Fix build with modern gcc
+3
-5
pkgs/development/python-modules/python-dbusmock/default.nix
+3
-5
pkgs/development/python-modules/python-dbusmock/default.nix
···
7
, pygobject3
8
, bluez
9
, networkmanager
10
-
, setuptools
11
, setuptools-scm
12
, runCommand
13
}:
···
21
'';
22
in buildPythonPackage rec {
23
pname = "python-dbusmock";
24
-
version = "0.30.0";
25
-
pyproject = true;
26
27
src = fetchFromGitHub {
28
owner = "martinpitt";
29
repo = pname;
30
rev = "refs/tags/${version}";
31
-
hash = "sha256-jYlVbxeBXEmKiVvkFGdmChETCKUHllQG53VW4tTa0Tc=";
32
};
33
34
nativeBuildInputs = [
35
-
setuptools
36
setuptools-scm
37
];
38
···
7
, pygobject3
8
, bluez
9
, networkmanager
10
, setuptools-scm
11
, runCommand
12
}:
···
20
'';
21
in buildPythonPackage rec {
22
pname = "python-dbusmock";
23
+
version = "0.29.1";
24
+
format = "setuptools";
25
26
src = fetchFromGitHub {
27
owner = "martinpitt";
28
repo = pname;
29
rev = "refs/tags/${version}";
30
+
hash = "sha256-sfvVLPTSTXjwyB0a2NyDIONv01FXZ40nHZwwo3oqI90=";
31
};
32
33
nativeBuildInputs = [
34
setuptools-scm
35
];
36
+3
-11
pkgs/tools/filesystems/rdfind/default.nix
+3
-11
pkgs/tools/filesystems/rdfind/default.nix
···
1
-
{ lib, stdenv, fetchpatch, fetchurl, nettle }:
2
3
stdenv.mkDerivation rec {
4
pname = "rdfind";
5
-
version = "1.5.0";
6
7
src = fetchurl {
8
url = "https://rdfind.pauldreik.se/${pname}-${version}.tar.gz";
9
-
sha256 = "103hfqzgr6izmj57fcy4jsa2nmb1ax43q4b5ij92pcgpaq9fsl21";
10
};
11
-
12
-
patches = [
13
-
(fetchpatch {
14
-
name = "include-limits.patch";
15
-
url = "https://github.com/pauldreik/rdfind/commit/61877de88d782b63b17458a61fcc078391499b29.patch";
16
-
sha256 = "0igzm4833cn905pj84lgr88nd5gx35dnjl8kl8vrwk7bpyii6a8l";
17
-
})
18
-
];
19
20
buildInputs = [ nettle ];
21
···
1
+
{ lib, stdenv, fetchurl, nettle }:
2
3
stdenv.mkDerivation rec {
4
pname = "rdfind";
5
+
version = "1.6.0";
6
7
src = fetchurl {
8
url = "https://rdfind.pauldreik.se/${pname}-${version}.tar.gz";
9
+
sha256 = "sha256-ekBujvGIalhpZVYEYY3Zj2cvEsamvkkm0FO+ZQcPMnk=";
10
};
11
12
buildInputs = [ nettle ];
13