summary refs log tree commit diff
diff options
context:
space:
mode:
authorhyperfekt <git@hyperfekt.net>2020-06-07 20:32:28 +0200
committerehmry <ehmry@posteo.net>2020-06-08 10:05:00 +0530
commit5ac6f222fa76544576780fb1bc4a87735fb37190 (patch)
tree8e1935e85bb34101b36ad426faba70965d890a6a
parent0a8fb89fca5bb1fee4e015e52f003746fd4ec682 (diff)
downloadnixpkgs-5ac6f222fa76544576780fb1bc4a87735fb37190.tar
nixpkgs-5ac6f222fa76544576780fb1bc4a87735fb37190.tar.gz
nixpkgs-5ac6f222fa76544576780fb1bc4a87735fb37190.tar.bz2
nixpkgs-5ac6f222fa76544576780fb1bc4a87735fb37190.tar.lz
nixpkgs-5ac6f222fa76544576780fb1bc4a87735fb37190.tar.xz
nixpkgs-5ac6f222fa76544576780fb1bc4a87735fb37190.tar.zst
nixpkgs-5ac6f222fa76544576780fb1bc4a87735fb37190.zip
nym: 0.6.0 -> 0.7.0
-rw-r--r--pkgs/applications/networking/nym/default.nix22
1 files changed, 6 insertions, 16 deletions
diff --git a/pkgs/applications/networking/nym/default.nix b/pkgs/applications/networking/nym/default.nix
index 6bb86c016ba..4a4f5c54f6b 100644
--- a/pkgs/applications/networking/nym/default.nix
+++ b/pkgs/applications/networking/nym/default.nix
@@ -9,33 +9,23 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "nym";
-  version = "0.6.0";
+  version = "0.7.0";
 
   src = fetchFromGitHub {
     owner = "nymtech";
     repo = "nym";
     rev = "v${version}";
-    sha256 = "1q9i24mzys6a9kp9n0bnxr3iwzblabmc6iif3ah75gffyf0cipk4";
+    sha256 = "05bxrpqwwf9spydac0q8sly65q8f1nk13i5fy3p5adr1phzxdnr8";
   };
 
-  cargoSha256 = "0qas544bs4wyllvqf2r5mvqxs1nviwcvxa3rzq10dvjyjm1xyh3k";
+  cargoSha256 = "0mh8cwia86bm68b0wcrmnsq1af5cp6kj1j81nwxb03awnqpxc34n";
 
   nativeBuildInputs = [ pkgconfig ];
 
   buildInputs = [ openssl ];
 
-  /*
-  Nym's test presence::converting_mixnode_presence_into_topology_mixnode::it_returns_resolved_ip_on_resolvable_hostname tries to resolve nymtech.net.
-  Since there is no external DNS resolution available in the build sandbox, we point cargo and its children (that's what we remove the 'unsetenv' call for) to a hosts file in which we statically resolve nymtech.net.
-  */
-  preCheck = ''
-    export LD_PRELOAD=${libredirect.overrideAttrs (drv: {
-      postPatch = "sed -i -e /unsetenv/d libredirect.c";
-    })}/lib/libredirect.so
-    export NIX_REDIRECTS=/etc/hosts=${writeText "nym_resolve_test_hosts" "127.0.0.1 nymtech.net"}
-  '';
-
-  postCheck = "unset NIX_REDIRECTS LD_PRELOAD";
+  # tests disabled until a release with https://github.com/nymtech/nym/pull/260 is available
+  doCheck = false;
 
 
   passthru.updateScript = ./update.sh;
@@ -49,6 +39,6 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://nymtech.net";
     license = licenses.asl20;
     maintainers = [ maintainers.ehmry ];
-    platforms = with platforms; intersectLists (linux ++ darwin) (x86 ++ x86_64); # see https://github.com/nymtech/nym/issues/179 for architectures
+    platforms = with platforms; intersectLists (linux ++ darwin) (concatLists [ x86 x86_64 aarch64 arm ]);
   };
 }