Merge pull request #211485 from figsoda/git-nomad

git-nomad: fix build
This commit is contained in:
Nick Cao 2023-01-19 13:51:28 +08:00 committed by GitHub
commit 62fbbdc0d0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 6 deletions

View File

@ -1,4 +1,4 @@
{ lib, stdenv, rustPlatform, fetchFromGitHub, SystemConfiguration }: { lib, rustPlatform, fetchFromGitHub, stdenv, darwin, git }:
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "git-nomad"; pname = "git-nomad";
@ -11,13 +11,20 @@ rustPlatform.buildRustPackage rec {
sha256 = "sha256-1PXAdXafkPOIVzaWjW/RlWHwYhMqPoj0Hj5JmOMUj8A="; sha256 = "sha256-1PXAdXafkPOIVzaWjW/RlWHwYhMqPoj0Hj5JmOMUj8A=";
}; };
buildInputs = lib.optionals stdenv.isDarwin [ SystemConfiguration ];
cargoHash = "sha256-ULcdJRla1JwI0y6ngW9xQXjNw2wO48HuAczsNIsJJK0="; cargoHash = "sha256-ULcdJRla1JwI0y6ngW9xQXjNw2wO48HuAczsNIsJJK0=";
buildInputs = lib.optionals stdenv.isDarwin [
darwin.apple_sdk.frameworks.SystemConfiguration
];
checkInputs = [
git
];
meta = with lib; { meta = with lib; {
description = "Synchronize work-in-progress git branches in a light weight fashion"; description = "Synchronize work-in-progress git branches in a light weight fashion";
homepage = "https://github.com/rraval/git-nomad"; homepage = "https://github.com/rraval/git-nomad";
changelog = "https://github.com/rraval/git-nomad/blob/v${version}/CHANGELOG.md";
license = licenses.mit; license = licenses.mit;
maintainers = with maintainers; [ rraval ]; maintainers = with maintainers; [ rraval ];
}; };

View File

@ -1769,9 +1769,7 @@ with pkgs;
git-machete = python3Packages.callPackage ../applications/version-management/git-machete { }; git-machete = python3Packages.callPackage ../applications/version-management/git-machete { };
git-nomad = callPackage ../applications/version-management/git-nomad { git-nomad = callPackage ../applications/version-management/git-nomad { };
inherit (darwin.apple_sdk.frameworks) SystemConfiguration;
};
git-octopus = callPackage ../applications/version-management/git-octopus { }; git-octopus = callPackage ../applications/version-management/git-octopus { };