From 487201b5fcd5a663fed492ec75ed53eb3a7cf4eb Mon Sep 17 00:00:00 2001 From: Theodore Ni <3806110+tjni@users.noreply.github.com> Date: Sun, 10 Nov 2024 23:18:38 -0800 Subject: [PATCH] gfold: use new Darwin SDK pattern --- pkgs/applications/version-management/gfold/default.nix | 10 +--------- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/version-management/gfold/default.nix b/pkgs/applications/version-management/gfold/default.nix index 299ea9fb6ba4..76eb913dbaba 100644 --- a/pkgs/applications/version-management/gfold/default.nix +++ b/pkgs/applications/version-management/gfold/default.nix @@ -2,10 +2,7 @@ fetchFromGitHub, gfold, lib, - libiconv, rustPlatform, - Security, - stdenv, testers, }: @@ -20,16 +17,11 @@ rustPlatform.buildRustPackage { owner = "nickgerace"; repo = pname; rev = version; - sha256 = "sha256-7wTU+yVp/GO1H1MbgZKO0OwqSC2jbHO0lU8aa0tHLTY="; + hash = "sha256-7wTU+yVp/GO1H1MbgZKO0OwqSC2jbHO0lU8aa0tHLTY="; }; cargoHash = "sha256-idzw5dfCCvujvYr7DG0oOzQUIcbACtiIZLoA4MEClzY="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - libiconv - Security - ]; - passthru.tests.version = testers.testVersion { package = gfold; command = "gfold --version"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f20f20f5bd36..0ef11cd479ca 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1199,9 +1199,7 @@ with pkgs; forgejo-lts = callPackage ../by-name/fo/forgejo/lts.nix { }; - gfold = callPackage ../applications/version-management/gfold { - inherit (darwin.apple_sdk.frameworks) Security; - }; + gfold = callPackage ../applications/version-management/gfold { }; gita = python3Packages.callPackage ../applications/version-management/gita { };