diff --git a/pkgs/applications/version-management/git-and-tools/gfold/default.nix b/pkgs/applications/version-management/git-and-tools/gfold/default.nix index ee280c6620c..d3b960208fc 100644 --- a/pkgs/applications/version-management/git-and-tools/gfold/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gfold/default.nix @@ -1,28 +1,43 @@ -{ lib, fetchFromGitHub, gitMinimal, makeWrapper, rustPlatform }: +{ fetchFromGitHub +, gitMinimal +, gfold +, lib +, libiconv +, makeWrapper +, rustPlatform +, Security +, stdenv +, testVersion +}: -rustPlatform.buildRustPackage rec { +let pname = "gfold"; - version = "3.0.0"; + version = "4.0.0"; +in +rustPlatform.buildRustPackage { + inherit pname version; src = fetchFromGitHub { owner = "nickgerace"; repo = pname; rev = version; - sha256 = "0ss6vfrc6h3jlh5qilh82psd3vdnfawf1wl4cf64mfm4hm9dda63"; + sha256 = "1yh5173qhi9bd41zss9k21nm0xnr2sa918kvlyr5xvzhq47rrwz5"; }; - cargoSha256 = "09ywwgxm8l1p0jypp65zpqryjnb2g4gririf1dmqb9148dsj29x2"; + cargoSha256 = "sha256-o2fMIlj+veTmhfqi7BVpxr3520SOwWLmVS2UU83EVjo="; - nativeBuildInputs = [ makeWrapper ]; + buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ]; - postInstall = '' - wrapProgram "$out/bin/gfold" --prefix PATH : "${gitMinimal}/bin" - ''; + passthru.tests.version = testVersion { + package = gfold; + command = "gfold --version"; + inherit version; + }; meta = with lib; { - inherit (src.meta) homepage; description = - "A tool to help keep track of your Git repositories, written in Rust"; + "CLI tool to help keep track of your Git repositories, written in Rust"; + homepage = "https://github.com/nickgerace/gfold"; license = licenses.asl20; maintainers = [ maintainers.shanesveller ]; platforms = platforms.unix; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index eb1ed2c4b0d..8c5d5ac7277 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6161,7 +6161,9 @@ with pkgs; gfbgraph = callPackage ../development/libraries/gfbgraph { }; - gfold = callPackage ../applications/version-management/git-and-tools/gfold { }; + gfold = callPackage ../applications/version-management/git-and-tools/gfold { + inherit (darwin.apple_sdk.frameworks) Security; + }; ggobi = callPackage ../tools/graphics/ggobi { };