diff --git a/pkgs/applications/networking/nym/default.nix b/pkgs/applications/networking/nym/default.nix index b7bffcd694e..43fee635f45 100644 --- a/pkgs/applications/networking/nym/default.nix +++ b/pkgs/applications/networking/nym/default.nix @@ -10,26 +10,33 @@ rustPlatform.buildRustPackage rec { pname = "nym"; - version = "0.10.0"; + version = "0.11.0"; src = fetchFromGitHub { owner = "nymtech"; repo = "nym"; rev = "v${version}"; - sha256 = "sha256-7x+B+6T0cnEOjXevA5n1k/SY1Q2tcu0bbZ9gIGoljw0="; + sha256 = "sha256-bZXbteryXkOxft63zUMWdpBgbDSvrBHQY3f70/+mBtI="; }; - cargoSha256 = "0a7yja0ihjc66fqlshlaxpnpcpdy7h7gbv6120w2cr605qdnqvkx"; + cargoSha256 = "0xwa114fs4h6y2a3nrl2dp0rv0k336xy9y330g9yix4g34qmrynq"; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security libiconv ]; - patches = [ ./ignore-networking-tests.patch ]; checkType = "debug"; passthru.updateScript = ./update.sh; + checkFlags = [ + "--skip commands::upgrade::upgrade_tests" + "--skip allowed_hosts::tests::creating_a_new_host_store" + "--skip allowed_hosts::tests::getting_the_domain_root" + "--skip allowed_hosts::tests::requests_to_allowed_hosts" + "--skip allowed_hosts::tests::requests_to_unknown_hosts" + ]; + meta = with lib; { description = "A mixnet providing IP-level privacy"; longDescription = '' diff --git a/pkgs/applications/networking/nym/ignore-networking-tests.patch b/pkgs/applications/networking/nym/ignore-networking-tests.patch deleted file mode 100644 index e971557e7ce..00000000000 --- a/pkgs/applications/networking/nym/ignore-networking-tests.patch +++ /dev/null @@ -1,123 +0,0 @@ -diff --git a/service-providers/network-requester/src/allowed_hosts.rs b/service-providers/network-requester/src/allowed_hosts.rs -index 3026b4ee..fd156682 100644 ---- a/service-providers/network-requester/src/allowed_hosts.rs -+++ b/service-providers/network-requester/src/allowed_hosts.rs -@@ -306,6 +306,7 @@ mod tests { - } - - #[test] -+ #[ignore] - fn leaves_a_com_alone() { - let filter = setup(); - assert_eq!( -@@ -315,6 +316,7 @@ mod tests { - } - - #[test] -+ #[ignore] - fn trims_subdomains_from_com() { - let filter = setup(); - assert_eq!( -@@ -324,6 +326,7 @@ mod tests { - } - - #[test] -+ #[ignore] - fn works_for_non_com_roots() { - let filter = setup(); - assert_eq!( -@@ -333,6 +336,7 @@ mod tests { - } - - #[test] -+ #[ignore] - fn works_for_non_com_roots_with_subdomains() { - let filter = setup(); - assert_eq!( -@@ -342,12 +346,14 @@ mod tests { - } - - #[test] -+ #[ignore] - fn returns_none_on_garbage() { - let filter = setup(); - assert_eq!(None, filter.get_domain_root("::/&&%@")); - } - - #[test] -+ #[ignore] - fn returns_none_on_nonsense_domains() { - let filter = setup(); - assert_eq!(None, filter.get_domain_root("flappappa")); -@@ -368,6 +374,7 @@ mod tests { - } - - #[test] -+ #[ignore] - fn are_not_allowed() { - let host = "unknown.com"; - let mut filter = setup(); -@@ -375,6 +382,7 @@ mod tests { - } - - #[test] -+ #[ignore] - fn get_appended_once_to_the_unknown_hosts_list() { - let host = "unknown.com"; - let mut filter = setup(); -@@ -405,6 +413,7 @@ mod tests { - } - - #[test] -+ #[ignore] - fn are_allowed() { - let host = "nymtech.net"; - -@@ -413,6 +422,7 @@ mod tests { - } - - #[test] -+ #[ignore] - fn are_allowed_for_subdomains() { - let host = "foomp.nymtech.net"; - -@@ -421,6 +431,7 @@ mod tests { - } - - #[test] -+ #[ignore] - fn are_not_appended_to_file() { - let mut filter = setup(&["nymtech.net"]); - -@@ -436,6 +447,7 @@ mod tests { - } - - #[test] -+ #[ignore] - fn are_allowed_for_ipv4_addresses() { - let address_good = "1.1.1.1"; - let address_good_port = "1.1.1.1:1234"; -@@ -448,6 +460,7 @@ mod tests { - } - - #[test] -+ #[ignore] - fn are_allowed_for_ipv6_addresses() { - let ip_v6_full = "2001:0db8:85a3:0000:0000:8a2e:0370:7334"; - let ip_v6_full_rendered = "2001:0db8:85a3::8a2e:0370:7334"; -@@ -477,6 +490,7 @@ mod tests { - } - - #[test] -+ #[ignore] - fn are_allowed_for_ipv4_address_ranges() { - let range1 = "127.0.0.1/32"; - let range2 = "1.2.3.4/24"; -@@ -495,6 +509,7 @@ mod tests { - } - - #[test] -+ #[ignore] - fn are_allowed_for_ipv6_address_ranges() { - let range = "2620:0:2d0:200::7/32"; -