diff options
| author | Alyssa Ross <hi@alyssa.is> | 2021-01-15 10:30:44 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2021-01-15 10:30:44 +0000 |
| commit | e0794be8a0d11e90461e5a9c85012a36b93ec976 (patch) | |
| tree | efd9cbc55ea3322867bf601c4d536758a3dd5fcc /nixpkgs/pkgs/applications/networking/nym/default.nix | |
| parent | 3538874082ded7647b1ccec0343c7c1e882cfef3 (diff) | |
| parent | 1a57d96edd156958b12782e8c8b6a374142a7248 (diff) | |
| download | nixlib-e0794be8a0d11e90461e5a9c85012a36b93ec976.tar nixlib-e0794be8a0d11e90461e5a9c85012a36b93ec976.tar.gz nixlib-e0794be8a0d11e90461e5a9c85012a36b93ec976.tar.bz2 nixlib-e0794be8a0d11e90461e5a9c85012a36b93ec976.tar.lz nixlib-e0794be8a0d11e90461e5a9c85012a36b93ec976.tar.xz nixlib-e0794be8a0d11e90461e5a9c85012a36b93ec976.tar.zst nixlib-e0794be8a0d11e90461e5a9c85012a36b93ec976.zip | |
Merge commit '1a57d96edd156958b12782e8c8b6a374142a7248'
Diffstat (limited to 'nixpkgs/pkgs/applications/networking/nym/default.nix')
| -rw-r--r-- | nixpkgs/pkgs/applications/networking/nym/default.nix | 29 |
1 files changed, 12 insertions, 17 deletions
diff --git a/nixpkgs/pkgs/applications/networking/nym/default.nix b/nixpkgs/pkgs/applications/networking/nym/default.nix index 4dfe1dc54929..d85266f68d6e 100644 --- a/nixpkgs/pkgs/applications/networking/nym/default.nix +++ b/nixpkgs/pkgs/applications/networking/nym/default.nix @@ -9,16 +9,25 @@ rustPlatform.buildRustPackage rec { pname = "nym"; - version = "0.7.0"; + version = "0.8.1"; src = fetchFromGitHub { owner = "nymtech"; repo = "nym"; rev = "v${version}"; - sha256 = "05bxrpqwwf9spydac0q8sly65q8f1nk13i5fy3p5adr1phzxdnr8"; + sha256 = "0wzk9qzjyax73lfjbbag412vw1fgk2wmhhry5hdlvdbkim42m5bn"; }; - cargoSha256 = "0mh8cwia86bm68b0wcrmnsq1af5cp6kj1j81nwxb03awnqpxc34n"; + # fix outdated Cargo.lock + cargoPatches = [ (writeText "fix-nym-cargo-lock.patch" '' + --- a/Cargo.lock + +++ b/Cargo.lock + @@ -1826 +1826 @@ + -version = "0.8.0" + +version = "0.8.1" + '') ]; + + cargoSha256 = "0zr5nzmglmvn6xfqgvipbzy8nw5cl3nf7zjmghkqdwi6zj9p9272"; nativeBuildInputs = [ pkgconfig ]; @@ -26,20 +35,6 @@ rustPlatform.buildRustPackage rec { checkType = "debug"; - /* - 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"; - - passthru.updateScript = ./update.sh; meta = with lib; { |