From 4d7cf180006e58456d32debfae77045c0102c503 Mon Sep 17 00:00:00 2001 From: Sarah Clark Date: Wed, 6 Nov 2024 12:15:33 -0800 Subject: [PATCH] heh: migrate to apple-sdk_11, move to by-name --- .../heh/default.nix => by-name/he/heh/package.nix} | 14 +++++--------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 5 insertions(+), 11 deletions(-) rename pkgs/{applications/editors/heh/default.nix => by-name/he/heh/package.nix} (79%) diff --git a/pkgs/applications/editors/heh/default.nix b/pkgs/by-name/he/heh/package.nix similarity index 79% rename from pkgs/applications/editors/heh/default.nix rename to pkgs/by-name/he/heh/package.nix index f89ee5a76a0a..0817f2173961 100644 --- a/pkgs/applications/editors/heh/default.nix +++ b/pkgs/by-name/he/heh/package.nix @@ -1,8 +1,8 @@ -{ lib -, stdenv -, rustPlatform -, fetchFromGitHub -, darwin +{ + lib, + stdenv, + rustPlatform, + fetchFromGitHub, }: rustPlatform.buildRustPackage rec { @@ -16,10 +16,6 @@ rustPlatform.buildRustPackage rec { hash = "sha256-eqWBTylvXqGhWdSGHdTM1ZURSD5pkUBoBOvBJ5zmJ7w="; }; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ - AppKit - ]); - cargoHash = "sha256-rLZgKLL28/ZrXzHVI6m4YeV2mk4E9W58HjTzRl2bMOw="; meta = with lib; { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a166b3ed1e52..16fa939f9162 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1770,8 +1770,6 @@ with pkgs; headset-charge-indicator = callPackage ../tools/audio/headset-charge-indicator { }; - heh = callPackage ../applications/editors/heh { }; - hexdiff = callPackage ../tools/misc/hexdiff { }; hexo-cli = callPackage ../development/tools/hexo-cli { };