summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Weinelt <mweinelt@users.noreply.github.com>2021-09-30 01:53:53 +0200
committerGitHub <noreply@github.com>2021-09-30 01:53:53 +0200
commited4615e0163566577c99f3adc31e8b125133bebb (patch)
tree44d44b547529e95dc57ee3ddfa1ea94cd5235a03
parentMerge pull request #139945 from NixOS/backport-139942-to-release-21.05 (diff)
parentroutinator: 0.10.0 -> 0.10.1 (diff)
downloadnixpkgs-ed4615e0163566577c99f3adc31e8b125133bebb.tar.gz
Merge pull request #139962 from risicle/ris-routinator-0.10.1-r21.05
[21.05] routinator: 0.8.3 -> 0.10.1
-rw-r--r--pkgs/servers/routinator/Cargo.toml.patch13
-rw-r--r--pkgs/servers/routinator/default.nix17
2 files changed, 26 insertions, 4 deletions
diff --git a/pkgs/servers/routinator/Cargo.toml.patch b/pkgs/servers/routinator/Cargo.toml.patch
new file mode 100644
index 000000000000..8bda0299bc88
--- /dev/null
+++ b/pkgs/servers/routinator/Cargo.toml.patch
@@ -0,0 +1,13 @@
+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 = []
diff --git a/pkgs/servers/routinator/default.nix b/pkgs/servers/routinator/default.nix
index c874a9309afe..4f85650b87f9 100644
--- a/pkgs/servers/routinator/default.nix
+++ b/pkgs/servers/routinator/default.nix
@@ -1,18 +1,27 @@
-{ stdenv, lib, fetchFromGitHub, rustPlatform, Security }:
+{ lib
+, stdenv
+, fetchFromGitHub
+, rustPlatform
+, Security
+}:
rustPlatform.buildRustPackage rec {
pname = "routinator";
- version = "0.8.3";
+ version = "0.10.1";
src = fetchFromGitHub {
owner = "NLnetLabs";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-JwPAwhD+Pkx8Kx24m7z/RbEvDnI2YR8dnTgAV7TMsFE=";
+ sha256 = "sha256-ThgTGtTZ0LGm9nHJoy0KhnBFWNvKRjk7hoNTVVTeL/Y=";
};
+ cargoPatches = [
+ ./Cargo.toml.patch
+ ];
+ cargoSha256 = "sha256-mcx+qUtTUxeYP0PeJp1eOQwsdS6PPUx/m7TfAyqFiIM=";
+
buildInputs = lib.optionals stdenv.isDarwin [ Security ];
- cargoSha256 = "sha256-NtugqvaickcEowxGwotGuh6jb2NTK95csJxtjezy90s=";
meta = with lib; {
description = "An RPKI Validator written in Rust";