mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-18 07:46:09 +01:00
Merge pull request #331221 from SFrijters/hurl-fix-rust-1.79
This commit is contained in:
commit
d1afcac512
1 changed files with 11 additions and 0 deletions
|
@ -1,6 +1,7 @@
|
||||||
{ lib
|
{ lib
|
||||||
, rustPlatform
|
, rustPlatform
|
||||||
, fetchFromGitHub
|
, fetchFromGitHub
|
||||||
|
, fetchpatch
|
||||||
, pkg-config
|
, pkg-config
|
||||||
, installShellFiles
|
, installShellFiles
|
||||||
, libxml2
|
, libxml2
|
||||||
|
@ -22,6 +23,16 @@ rustPlatform.buildRustPackage rec {
|
||||||
|
|
||||||
cargoHash = "sha256-dY00xcMnOCWhdRzC+3mTHSIqeYEPUDBJeYd/GiLM/38=";
|
cargoHash = "sha256-dY00xcMnOCWhdRzC+3mTHSIqeYEPUDBJeYd/GiLM/38=";
|
||||||
|
|
||||||
|
patches = [
|
||||||
|
# Fix for rust 1.79, see https://github.com/Orange-OpenSource/hurl/issues/3057
|
||||||
|
# We should be able to remove this at the next hurl version bump
|
||||||
|
(fetchpatch {
|
||||||
|
name = "hurl-fix-rust-1.79";
|
||||||
|
url = "https://github.com/Orange-OpenSource/hurl/commit/d51c275fc63d1ee5bbdc6fc70279ec8dae86a9c1.patch";
|
||||||
|
hash = "sha256-peA4Zq5J8ynL7trvydQ3ZqyHpJWrRmJeFeMKH9XT2n4=";
|
||||||
|
})
|
||||||
|
];
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
pkg-config
|
pkg-config
|
||||||
installShellFiles
|
installShellFiles
|
||||||
|
|
Loading…
Reference in a new issue