Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[staging-next] Assorted fixes found while rebuilding my configs #278879

Merged
merged 5 commits into from
Jan 5, 2024
Merged

[staging-next] Assorted fixes found while rebuilding my configs #278879

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d64c76c
rdfind: 1.5.0 -> 1.6.0
K900 Jan 5, 2024
081d98d
gbenchmark: 1.8.0 -> 1.8.3
K900 Jan 5, 2024
dd4290f
gbenchmark: disable tests on i686
K900 Jan 5, 2024
f3f147c
tbb: pick GCC 13 build fixes
K900 Jan 5, 2024
2f4bf20
Revert "python3Packages.python-dbusmock: 0.29.1 -> 0.30.0"
K900 Jan 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions pkgs/development/libraries/gbenchmark/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@

stdenv.mkDerivation rec {
pname = "gbenchmark";
version = "1.8.0";
version = "1.8.3";

src = fetchFromGitHub {
owner = "google";
repo = "benchmark";
rev = "v${version}";
sha256 = "sha256-pUW9YVaujs/y00/SiPqDgK4wvVsaM7QUp/65k0t7Yr0=";
sha256 = "sha256-gztnxui9Fe/FTieMjdvfJjWHjkImtlsHn6fM1FruyME=";
};

nativeBuildInputs = [ cmake ];
Expand All @@ -29,7 +29,8 @@ stdenv.mkDerivation rec {
--replace '$'{prefix}/@CMAKE_INSTALL_INCLUDEDIR@ @CMAKE_INSTALL_FULL_INCLUDEDIR@
'';

doCheck = true;
# Tests fail on 32-bit due to not enough precision
doCheck = stdenv.is64bit;

passthru.tests = {
inherit prometheus-cpp;
Expand Down
10 changes: 10 additions & 0 deletions pkgs/development/libraries/tbb/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,16 @@ stdenv.mkDerivation rec {
url = "https://patch-diff.githubusercontent.com/raw/oneapi-src/oneTBB/pull/866.patch";
hash = "sha256-e44Yv84Hfl5xoxWWTnLJLSGeNA1RBbah4/L43gPLS+c=";
})

# Fix build with GCC 13
(fetchpatch {
url = "https://github.com/oneapi-src/oneTBB/commit/154cc73ca4d359621202399cc0c3c91058e56e79.patch";
hash = "sha256-BVQQXgBg8T19DGw2gmFkm3KKOuzzJJNOTf/iNIcnHag=";
})
(fetchpatch {
url = "https://github.com/oneapi-src/oneTBB/commit/e131071769ee3df51b56b053ba6bfa06ae9eff25.patch";
hash = "sha256-IfV/DDb0luxE1l6TofAbQIeJEVxCxZfZqcONGwQEndY=";
})
];

# Fix build with modern gcc
Expand Down
8 changes: 3 additions & 5 deletions pkgs/development/python-modules/python-dbusmock/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
, pygobject3
, bluez
, networkmanager
, setuptools
, setuptools-scm
, runCommand
}:
Expand All @@ -21,18 +20,17 @@ let
'';
in buildPythonPackage rec {
pname = "python-dbusmock";
version = "0.30.0";
pyproject = true;
version = "0.29.1";
format = "setuptools";

src = fetchFromGitHub {
owner = "martinpitt";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-jYlVbxeBXEmKiVvkFGdmChETCKUHllQG53VW4tTa0Tc=";
hash = "sha256-sfvVLPTSTXjwyB0a2NyDIONv01FXZ40nHZwwo3oqI90=";
};

nativeBuildInputs = [
setuptools
setuptools-scm
];

Expand Down
14 changes: 3 additions & 11 deletions pkgs/tools/filesystems/rdfind/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,14 @@
{ lib, stdenv, fetchpatch, fetchurl, nettle }:
{ lib, stdenv, fetchurl, nettle }:

stdenv.mkDerivation rec {
pname = "rdfind";
version = "1.5.0";
version = "1.6.0";

src = fetchurl {
url = "https://rdfind.pauldreik.se/${pname}-${version}.tar.gz";
sha256 = "103hfqzgr6izmj57fcy4jsa2nmb1ax43q4b5ij92pcgpaq9fsl21";
sha256 = "sha256-ekBujvGIalhpZVYEYY3Zj2cvEsamvkkm0FO+ZQcPMnk=";
};

patches = [
(fetchpatch {
name = "include-limits.patch";
url = "https://github.com/pauldreik/rdfind/commit/61877de88d782b63b17458a61fcc078391499b29.patch";
sha256 = "0igzm4833cn905pj84lgr88nd5gx35dnjl8kl8vrwk7bpyii6a8l";
})
];

buildInputs = [ nettle ];

meta = with lib; {
Expand Down