Skip to content

Commit f23343f

Browse files
floklizeme-wana
authored andcommitted
harmonia: cherry-pick nix-community/harmonia#293
This cherry-picks nix-community/harmonia#293 into 0.7.3. We can't bump to Harmonia 0.7.5 in release-23.11 as it brings a libnixstore bump with backwards-incompatible changes (for a new Nix version that's not available in 23.11).
1 parent 4260242 commit f23343f

File tree

1 file changed

+11
-0
lines changed

1 file changed

+11
-0
lines changed

pkgs/tools/package-management/harmonia/default.nix

+11
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{ lib
22
, boost
33
, fetchFromGitHub
4+
, fetchpatch
45
, libsodium
56
, nix
67
, pkg-config
@@ -20,6 +21,16 @@ rustPlatform.buildRustPackage rec {
2021
hash = "sha256-XtnK54HvZMKZGSCrVD0FO5PQLMo3Vkj8ezUlsfqStq0=";
2122
};
2223

24+
patches = [
25+
# Cherry-pick of https://github.com/nix-community/harmonia/pull/293 into 0.7.3
26+
# We can't bump to 0.7.5 in release-23.11 as it brings a libnixstore bump
27+
# with backwards-incompatible changes (for a new Nix version).
28+
(fetchpatch {
29+
url = "https://github.com/nix-community/harmonia/pull/293/commits/3232511db91b7dce97172a8b018f0056585890f5.patch";
30+
hash = "sha256-BQ2eJkPTKnwa62dqy6qe7Jq+wJ2Ds5VhT5ST/xVlHiQ=";
31+
})
32+
];
33+
2334
cargoHash = "sha256-oQVHrfNPhslYk6APB/bhW+h+vk/gNTW/ZypoGGb5zPk=";
2435

2536
nativeBuildInputs = [

0 commit comments

Comments
 (0)