From f507397ee578004fd40dab9e09eca79172fa3fbb Mon Sep 17 00:00:00 2001 From: wxt <3264117476@qq.com> Date: Wed, 13 Nov 2024 12:43:31 +0800 Subject: [PATCH] rustus: move to by-name --- .../default.nix => by-name/ru/rustus/package.nix} | 10 +++++++--- pkgs/top-level/all-packages.nix | 4 ---- 2 files changed, 7 insertions(+), 7 deletions(-) rename pkgs/{servers/networking/rustus/default.nix => by-name/ru/rustus/package.nix} (91%) diff --git a/pkgs/servers/networking/rustus/default.nix b/pkgs/by-name/ru/rustus/package.nix similarity index 91% rename from pkgs/servers/networking/rustus/default.nix rename to pkgs/by-name/ru/rustus/package.nix index 3819a23781ef..269c7c71dae5 100644 --- a/pkgs/servers/networking/rustus/default.nix +++ b/pkgs/by-name/ru/rustus/package.nix @@ -5,7 +5,7 @@ , nix-update-script , pkg-config , openssl -, Security +, darwin, }: let @@ -22,7 +22,11 @@ rustPlatform.buildRustPackage { hash = "sha256-osxdqwNUONCScFarpQV48C7CR1DVR/mCttaglqiAKPo="; }; - cargoHash = "sha256-M0mJ+9VznzHDmdKAsT3YamyG/P0JF8oPeVHaX44NWM4="; + cargoPatch = [ + ./0001-update-time-rs.diff + ]; + + cargoHash = "sha256-10mJ+9VznzHDmdKAsT3YamyG/P0JF8oPeVHaX44NWM4="; env.OPENSSL_NO_VENDOR = 1; @@ -33,7 +37,7 @@ rustPlatform.buildRustPackage { buildInputs = [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Security + darwin.apple_sdk.frameworks.Security ]; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index edb57f800b8e..573f3cd5301f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11824,10 +11824,6 @@ with pkgs; eventstore = callPackage ../servers/nosql/eventstore { }; - rustus = callPackage ../servers/networking/rustus { - inherit (darwin.apple_sdk.frameworks) Security; - }; - fedigroups = callPackage ../servers/fedigroups { inherit (darwin.apple_sdk.frameworks) Security; };