Merge pull request #142265 from figsoda/routinator

routinator: remove patch

authored by

figsoda and committed by
GitHub
e6f97fb7 1326545a

+7 -19
-13
pkgs/servers/routinator/Cargo.toml.patch
··· 1 - diff --git a/Cargo.toml b/Cargo.toml 2 - index 7f07b3b..7d7af0a 100644 3 - --- a/Cargo.toml 4 - +++ b/Cargo.toml 5 - @@ -48,7 +48,7 @@ syslog = "5.0.0" 6 - rustc_version = "0.4.0" 7 - 8 - [features] 9 - -default = [ "socks", "ui"] 10 - +default = [ "socks" ] 11 - extra-debug = ["rpki/extra-debug"] 12 - socks = [ "reqwest/socks" ] 13 - rta = []
+7 -6
pkgs/servers/routinator/default.nix
··· 1 1 { lib 2 - , stdenv 3 - , fetchFromGitHub 4 2 , rustPlatform 3 + , fetchFromGitHub 4 + , stdenv 5 5 , Security 6 6 }: 7 7 ··· 16 16 sha256 = "sha256-ThgTGtTZ0LGm9nHJoy0KhnBFWNvKRjk7hoNTVVTeL/Y="; 17 17 }; 18 18 19 - cargoPatches = [ 20 - ./Cargo.toml.patch 21 - ]; 22 19 cargoSha256 = "sha256-mcx+qUtTUxeYP0PeJp1eOQwsdS6PPUx/m7TfAyqFiIM="; 23 20 24 21 buildInputs = lib.optionals stdenv.isDarwin [ Security ]; 25 22 23 + cargoBuildFlags = [ "--no-default-features" "--features=socks" ]; 24 + 25 + cargoTestFlags = cargoBuildFlags; 26 + 26 27 meta = with lib; { 27 28 description = "An RPKI Validator written in Rust"; 28 29 homepage = "https://github.com/NLnetLabs/routinator"; 30 + changelog = "https://github.com/NLnetLabs/routinator/blob/v${version}/Changelog.md"; 29 31 license = licenses.bsd3; 30 32 maintainers = with maintainers; [ _0x4A6F ]; 31 - platforms = platforms.all; 32 33 }; 33 34 }