From 900cd2c65a27f06e492875863d85a1abb3350ee7 Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Wed, 6 Nov 2024 11:33:43 -0800
Subject: [PATCH] git-nomad: migrate to new apple-sdk structure, move to
 by-name

---
 .../gi/git-nomad/package.nix}                     | 15 +++++++--------
 pkgs/top-level/all-packages.nix                   |  2 --
 2 files changed, 7 insertions(+), 10 deletions(-)
 rename pkgs/{applications/version-management/git-nomad/default.nix => by-name/gi/git-nomad/package.nix} (75%)

diff --git a/pkgs/applications/version-management/git-nomad/default.nix b/pkgs/by-name/gi/git-nomad/package.nix
similarity index 75%
rename from pkgs/applications/version-management/git-nomad/default.nix
rename to pkgs/by-name/gi/git-nomad/package.nix
index 566a032f9b20..659a342247c9 100644
--- a/pkgs/applications/version-management/git-nomad/default.nix
+++ b/pkgs/by-name/gi/git-nomad/package.nix
@@ -1,4 +1,9 @@
-{ lib, rustPlatform, fetchFromGitHub, stdenv, darwin, git }:
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+  git,
+}:
 
 rustPlatform.buildRustPackage rec {
   pname = "git-nomad";
@@ -13,13 +18,7 @@ rustPlatform.buildRustPackage rec {
 
   cargoHash = "sha256-7CZC29y9dLpyanolO+epKd0KwmRc1iGY+sPM9f/j5hk=";
 
-  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
-    darwin.apple_sdk.frameworks.SystemConfiguration
-  ];
-
-  nativeCheckInputs = [
-    git
-  ];
+  nativeCheckInputs = [ git ];
 
   meta = with lib; {
     description = "Synchronize work-in-progress git branches in a light weight fashion";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index dcb755b53f1a..9bcedb06eaba 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2249,8 +2249,6 @@ with pkgs;
 
   git-machete = python3Packages.callPackage ../applications/version-management/git-machete { };
 
-  git-nomad = callPackage ../applications/version-management/git-nomad { };
-
   git-octopus = callPackage ../applications/version-management/git-octopus { };
 
   git-open = callPackage ../applications/version-management/git-open { };