From d0a6250668d0e794308bee853617bea77865d768 Mon Sep 17 00:00:00 2001 From: figsoda Date: Wed, 18 Jan 2023 19:18:49 -0500 Subject: [PATCH] git-nomad: fix build --- .../version-management/git-nomad/default.nix | 13 ++++++++++--- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/version-management/git-nomad/default.nix b/pkgs/applications/version-management/git-nomad/default.nix index 04ba2ca849a6..50d2b117ba55 100644 --- a/pkgs/applications/version-management/git-nomad/default.nix +++ b/pkgs/applications/version-management/git-nomad/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, rustPlatform, fetchFromGitHub, SystemConfiguration }: +{ lib, rustPlatform, fetchFromGitHub, stdenv, darwin, git }: rustPlatform.buildRustPackage rec { pname = "git-nomad"; @@ -11,13 +11,20 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-1PXAdXafkPOIVzaWjW/RlWHwYhMqPoj0Hj5JmOMUj8A="; }; - buildInputs = lib.optionals stdenv.isDarwin [ SystemConfiguration ]; - cargoHash = "sha256-ULcdJRla1JwI0y6ngW9xQXjNw2wO48HuAczsNIsJJK0="; + buildInputs = lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.SystemConfiguration + ]; + + checkInputs = [ + git + ]; + meta = with lib; { description = "Synchronize work-in-progress git branches in a light weight fashion"; homepage = "https://github.com/rraval/git-nomad"; + changelog = "https://github.com/rraval/git-nomad/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ rraval ]; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 354fa60ea1e9..a30f771fc17e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1769,9 +1769,7 @@ with pkgs; git-machete = python3Packages.callPackage ../applications/version-management/git-machete { }; - git-nomad = callPackage ../applications/version-management/git-nomad { - inherit (darwin.apple_sdk.frameworks) SystemConfiguration; - }; + git-nomad = callPackage ../applications/version-management/git-nomad { }; git-octopus = callPackage ../applications/version-management/git-octopus { };