From febbf089dd845640ec008ee743531d9874be1177 Mon Sep 17 00:00:00 2001 From: wxt <3264117476@qq.com> Date: Fri, 25 Oct 2024 20:31:31 +0800 Subject: [PATCH] doctave: move to by-name --- .../misc => by-name/do}/doctave/cargo-lock.patch | 0 .../doctave/default.nix => by-name/do/doctave/package.nix} | 4 ++-- pkgs/top-level/all-packages.nix | 4 ---- 3 files changed, 2 insertions(+), 6 deletions(-) rename pkgs/{applications/misc => by-name/do}/doctave/cargo-lock.patch (100%) rename pkgs/{applications/misc/doctave/default.nix => by-name/do/doctave/package.nix} (88%) diff --git a/pkgs/applications/misc/doctave/cargo-lock.patch b/pkgs/by-name/do/doctave/cargo-lock.patch similarity index 100% rename from pkgs/applications/misc/doctave/cargo-lock.patch rename to pkgs/by-name/do/doctave/cargo-lock.patch diff --git a/pkgs/applications/misc/doctave/default.nix b/pkgs/by-name/do/doctave/package.nix similarity index 88% rename from pkgs/applications/misc/doctave/default.nix rename to pkgs/by-name/do/doctave/package.nix index 8ddbe3a126e1..00f480ff7016 100644 --- a/pkgs/applications/misc/doctave/default.nix +++ b/pkgs/by-name/do/doctave/package.nix @@ -1,4 +1,4 @@ -{ lib, rustPlatform, fetchFromGitHub, stdenv, CoreServices }: +{ lib, rustPlatform, fetchFromGitHub, stdenv, darwin, }: rustPlatform.buildRustPackage rec { pname = "doctave"; @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-keLcNttdM9JUnn3qi/bWkcObIHl3MRACDHKPSZuScOc="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - CoreServices + darwin.apple_sdk.frameworks.CoreServices ]; meta = with lib; { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c35b950a6813..ba822752c480 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6982,10 +6982,6 @@ with pkgs; dockbarx = callPackage ../applications/misc/dockbarx { }; - doctave = callPackage ../applications/misc/doctave { - inherit (darwin.apple_sdk.frameworks) CoreServices; - }; - dog = callPackage ../tools/system/dog { }; dogdns = callPackage ../tools/networking/dogdns {