From d777260d5810f8ce5e7351a9b4967c5dfbe86e31 Mon Sep 17 00:00:00 2001 From: 0x4A6F <0x4A6F@users.noreply.github.com> Date: Mon, 17 May 2021 18:16:40 +0200 Subject: [PATCH 1/3] routinator: 0.8.3 -> 0.9.0 (cherry picked from commit ffae5e3650d160c39d84b790bf46d26a2a264a7b) --- pkgs/servers/routinator/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/routinator/default.nix b/pkgs/servers/routinator/default.nix index c874a9309af..8412d0069c7 100644 --- a/pkgs/servers/routinator/default.nix +++ b/pkgs/servers/routinator/default.nix @@ -2,17 +2,17 @@ rustPlatform.buildRustPackage rec { pname = "routinator"; - version = "0.8.3"; + version = "0.9.0"; src = fetchFromGitHub { owner = "NLnetLabs"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-JwPAwhD+Pkx8Kx24m7z/RbEvDnI2YR8dnTgAV7TMsFE="; + rev = version; + sha256 = "sha256-8CBsLOAF0JnRMe7qLod6UDPGLMPwqDm0Z5BjB4KCkBc="; }; buildInputs = lib.optionals stdenv.isDarwin [ Security ]; - cargoSha256 = "sha256-NtugqvaickcEowxGwotGuh6jb2NTK95csJxtjezy90s="; + cargoSha256 = "sha256-S/RAt3tCIlaSqIHqP5C+QK9aQq+4CO/MW2toUo9kVKk="; meta = with lib; { description = "An RPKI Validator written in Rust"; From abed7897c8ce886d1dcc593b7fcea27e64ec57ea Mon Sep 17 00:00:00 2001 From: 0x4A6F <0x4A6F@users.noreply.github.com> Date: Thu, 23 Aug 2018 12:18:11 +0000 Subject: [PATCH 2/3] routinator: 0.9.0 -> 0.10.0 (cherry picked from commit adfe94641884918670fa21bf33d101c67614cc2e) --- pkgs/servers/routinator/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/routinator/default.nix b/pkgs/servers/routinator/default.nix index 8412d0069c7..1ee31232592 100644 --- a/pkgs/servers/routinator/default.nix +++ b/pkgs/servers/routinator/default.nix @@ -2,17 +2,17 @@ rustPlatform.buildRustPackage rec { pname = "routinator"; - version = "0.9.0"; + version = "0.10.0"; src = fetchFromGitHub { owner = "NLnetLabs"; repo = pname; - rev = version; - sha256 = "sha256-8CBsLOAF0JnRMe7qLod6UDPGLMPwqDm0Z5BjB4KCkBc="; + rev = "v${version}"; + sha256 = "171zmqqkgdpbspn70sgsypnyw7m6q2x8izwxrzbyi5xslsgd24i4"; }; buildInputs = lib.optionals stdenv.isDarwin [ Security ]; - cargoSha256 = "sha256-S/RAt3tCIlaSqIHqP5C+QK9aQq+4CO/MW2toUo9kVKk="; + cargoSha256 = "0r1m1zv3mkmmaalln3ny6m33dyjqzdyfbmkcav05kz12xjdd94fs"; meta = with lib; { description = "An RPKI Validator written in Rust"; From 13c798e8e7abb832de9376fc827bc0379d2002c3 Mon Sep 17 00:00:00 2001 From: 0x4A6F <0x4A6F@users.noreply.github.com> Date: Mon, 20 Sep 2021 13:37:05 +0200 Subject: [PATCH 3/3] routinator: 0.10.0 -> 0.10.1 (cherry picked from commit 01af935180289b3c3dde5add60b88392bcafeb4b) --- pkgs/servers/routinator/Cargo.toml.patch | 13 +++++++++++++ pkgs/servers/routinator/default.nix | 17 +++++++++++++---- 2 files changed, 26 insertions(+), 4 deletions(-) create mode 100644 pkgs/servers/routinator/Cargo.toml.patch diff --git a/pkgs/servers/routinator/Cargo.toml.patch b/pkgs/servers/routinator/Cargo.toml.patch new file mode 100644 index 00000000000..8bda0299bc8 --- /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 1ee31232592..4f85650b87f 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.10.0"; + version = "0.10.1"; src = fetchFromGitHub { owner = "NLnetLabs"; repo = pname; rev = "v${version}"; - sha256 = "171zmqqkgdpbspn70sgsypnyw7m6q2x8izwxrzbyi5xslsgd24i4"; + sha256 = "sha256-ThgTGtTZ0LGm9nHJoy0KhnBFWNvKRjk7hoNTVVTeL/Y="; }; + cargoPatches = [ + ./Cargo.toml.patch + ]; + cargoSha256 = "sha256-mcx+qUtTUxeYP0PeJp1eOQwsdS6PPUx/m7TfAyqFiIM="; + buildInputs = lib.optionals stdenv.isDarwin [ Security ]; - cargoSha256 = "0r1m1zv3mkmmaalln3ny6m33dyjqzdyfbmkcav05kz12xjdd94fs"; meta = with lib; { description = "An RPKI Validator written in Rust";