Merge pull request #336112 from r-vdp/master

mycelium: 0.5.3 -> 0.5.4
This commit is contained in:
Nick Cao 2024-08-21 19:20:18 -04:00 committed by GitHub
commit 4236e166c5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 533 additions and 188 deletions

File diff suppressed because it is too large Load Diff

View File

@ -1,15 +1,18 @@
{ lib {
, rustPlatform lib,
, fetchFromGitHub rustPlatform,
, stdenv fetchFromGitHub,
, openssl stdenv,
, darwin openssl,
, nixosTests darwin,
nixosTests,
nix-update-script,
versionCheckHook,
}: }:
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "mycelium"; pname = "mycelium";
version = "0.5.3"; version = "0.5.4";
sourceRoot = "${src.name}/myceliumd"; sourceRoot = "${src.name}/myceliumd";
@ -17,7 +20,7 @@ rustPlatform.buildRustPackage rec {
owner = "threefoldtech"; owner = "threefoldtech";
repo = "mycelium"; repo = "mycelium";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-nyHHuwOHaIh8WCxaQb7QoTReV09ydhHLYwEVHQg2Hek="; hash = "sha256-sWpy6Q7Lh0AOzWKMsb/NQ6oFcxOKXB/To9+PFmcjSks=";
}; };
cargoLock = { cargoLock = {
@ -27,25 +30,37 @@ rustPlatform.buildRustPackage rec {
}; };
}; };
nativeBuildInputs = [ versionCheckHook ];
buildInputs = lib.optionals stdenv.isDarwin [ buildInputs = lib.optionals stdenv.isDarwin [
darwin.apple_sdk.frameworks.Security darwin.apple_sdk.frameworks.Security
darwin.apple_sdk.frameworks.SystemConfiguration darwin.apple_sdk.frameworks.SystemConfiguration
]; ];
doInstallCheck = true;
env = { env = {
OPENSSL_NO_VENDOR = 1; OPENSSL_NO_VENDOR = 1;
OPENSSL_LIB_DIR = "${lib.getLib openssl}/lib"; OPENSSL_LIB_DIR = "${lib.getLib openssl}/lib";
OPENSSL_DIR = "${lib.getDev openssl}"; OPENSSL_DIR = "${lib.getDev openssl}";
}; };
passthru.tests = { inherit (nixosTests) mycelium; }; passthru = {
updateScript = nix-update-script { };
tests = {
inherit (nixosTests) mycelium;
};
};
meta = with lib; { meta = with lib; {
description = "End-2-end encrypted IPv6 overlay network"; description = "End-2-end encrypted IPv6 overlay network";
homepage = "https://github.com/threefoldtech/mycelium"; homepage = "https://github.com/threefoldtech/mycelium";
changelog = "https://github.com/threefoldtech/mycelium/blob/${src.rev}/CHANGELOG.md"; changelog = "https://github.com/threefoldtech/mycelium/blob/${src.rev}/CHANGELOG.md";
license = licenses.asl20; license = licenses.asl20;
maintainers = with maintainers; [ flokli matthewcroughan ]; maintainers = with maintainers; [
flokli
matthewcroughan
rvdp
];
mainProgram = "mycelium"; mainProgram = "mycelium";
}; };
} }