Merge pull request #142265 from figsoda/routinator

routinator: remove patch
conduit-nginx
figsoda 2021-10-20 08:10:42 -04:00 committed by GitHub
commit e6f97fb788
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 19 deletions

View File

@ -1,13 +0,0 @@
diff --git a/Cargo.toml b/Cargo.toml
index 7f07b3b..7d7af0a 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -48,7 +48,7 @@ syslog = "5.0.0"
rustc_version = "0.4.0"
[features]
-default = [ "socks", "ui"]
+default = [ "socks" ]
extra-debug = ["rpki/extra-debug"]
socks = [ "reqwest/socks" ]
rta = []

View File

@ -1,7 +1,7 @@
{ lib
, stdenv
, fetchFromGitHub
, rustPlatform
, fetchFromGitHub
, stdenv
, Security
}:
@ -16,18 +16,19 @@ rustPlatform.buildRustPackage rec {
sha256 = "sha256-ThgTGtTZ0LGm9nHJoy0KhnBFWNvKRjk7hoNTVVTeL/Y=";
};
cargoPatches = [
./Cargo.toml.patch
];
cargoSha256 = "sha256-mcx+qUtTUxeYP0PeJp1eOQwsdS6PPUx/m7TfAyqFiIM=";
buildInputs = lib.optionals stdenv.isDarwin [ Security ];
cargoBuildFlags = [ "--no-default-features" "--features=socks" ];
cargoTestFlags = cargoBuildFlags;
meta = with lib; {
description = "An RPKI Validator written in Rust";
homepage = "https://github.com/NLnetLabs/routinator";
changelog = "https://github.com/NLnetLabs/routinator/blob/v${version}/Changelog.md";
license = licenses.bsd3;
maintainers = with maintainers; [ _0x4A6F ];
platforms = platforms.all;
};
}