nym: move to by-name; nixfmt

NixOS · Oct 3, 2024 · e63e399 · e63e399
1 parent 77a6708
commit e63e399
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 26 deletions.
diff --git a/pkgs/applications/networking/nym/Cargo.lock → pkgs/by-name/ny/nym/Cargo.lock b/pkgs/applications/networking/nym/Cargo.lock → pkgs/by-name/ny/nym/Cargo.lock
diff --git a/pkgs/applications/networking/nym/default.nix → pkgs/by-name/ny/nym/package.nix b/pkgs/applications/networking/nym/default.nix → pkgs/by-name/ny/nym/package.nix
@@ -1,28 +1,24 @@
-{ stdenv
-, lib
-, rustPlatform
-, fetchFromGitHub
-, pkg-config
-, openssl
-, Security
-, CoreServices
-, nix-update-script
-, rustc
+{
+  stdenv,
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+  pkg-config,
+  openssl,
+  darwin,
+  nix-update-script,
+  rustc,
 }:
 
-let
-  version = "1.1.21";
-  hash = "sha256-VM0Pc5qyrsn9wV3mfvrAlCfm/rIf3cednZzFtJCT+no=";
-in
-rustPlatform.buildRustPackage {
+rustPlatform.buildRustPackage rec {
   pname = "nym";
-  inherit version;
+  version = "1.1.21";
 
   src = fetchFromGitHub {
     owner = "nymtech";
     repo = "nym";
     rev = "nym-binaries-v${version}";
-    inherit hash;
+    hash = "sha256-VM0Pc5qyrsn9wV3mfvrAlCfm/rIf3cednZzFtJCT+no=";
   };
 
   cargoLock = {
@@ -43,9 +39,18 @@ rustPlatform.buildRustPackage {
       --replace 'vergen(config).expect("failed to extract build metadata")' '()'
   '';
 
-  nativeBuildInputs = [ pkg-config ];
+  nativeBuildInputs = [
+    pkg-config
+  ];
 
-  buildInputs = [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security CoreServices ];
+  buildInputs =
+    [
+      openssl
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [
+      Security
+      CoreServices
+    ]);
 
   checkType = "debug";
 
@@ -71,14 +76,14 @@ rustPlatform.buildRustPackage {
     VERGEN_CARGO_PROFILE = "release";
   };
 
-  meta = with lib; {
+  meta = {
     description = "Mixnet providing IP-level privacy";
     longDescription = ''
       Nym routes IP packets through other participating nodes to hide their source and destination.
       In contrast with Tor, it prevents timing attacks at the cost of latency.
     '';
     homepage = "https://nymtech.net";
-    license = licenses.asl20;
-    platforms = platforms.all;
+    license = lib.licenses.asl20;
+    platforms = lib.platforms.all;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
@@ -10639,10 +10639,6 @@ with pkgs;
 
   nylon = callPackage ../tools/networking/nylon { };
 
-  nym = darwin.apple_sdk_11_0.callPackage ../applications/networking/nym {
-    inherit (darwin.apple_sdk.frameworks) Security CoreServices;
-  };
-
   oapi-codegen = callPackage ../tools/networking/oapi-codegen { };
 
   oath-toolkit = callPackage ../tools/security/oath-toolkit { };