diff options
| author | Nikolay Korotkiy <sikmir@disroot.org> | 2023-11-21 21:27:23 +0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-21 21:27:23 +0400 |
| commit | b6713d6ae51095fb973436b961234fcf5cf7ae49 (patch) | |
| tree | 97c2c2d149c64f83aa2cb92ee659e51f2da61d4f | |
| parent | ed5534ceb6bc94b7bcf00c16a3763f187973343e (diff) | |
| parent | ad4c77e4fdfe7aa6c910b5f264a77a08cd3a6dd6 (diff) | |
Merge pull request #267275 from evanrichter/gex-0.6.4
gex: 0.6.3. -> 0.6.4
| -rw-r--r-- | pkgs/applications/version-management/gex/default.nix | 17 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 15 insertions, 6 deletions
diff --git a/pkgs/applications/version-management/gex/default.nix b/pkgs/applications/version-management/gex/default.nix index bb190a272b06f..7d6af92b7e79c 100644 --- a/pkgs/applications/version-management/gex/default.nix +++ b/pkgs/applications/version-management/gex/default.nix @@ -1,28 +1,35 @@ { lib +, stdenv , rustPlatform , fetchFromGitHub , pkg-config -, libgit2_1_6 +, libgit2 +, Security }: rustPlatform.buildRustPackage rec { pname = "gex"; - version = "0.6.3"; + version = "0.6.4"; src = fetchFromGitHub { owner = "Piturnah"; repo = pname; rev = "v${version}"; - hash = "sha256-ADVF+Kb0DDiR3dS43uzhefFFEg1O8IC22i5fmziEp6I="; + hash = "sha256-Xer7a3UtFIv3idchI7DfZ5u6qgDW/XFWi5ihtcREXqo="; }; nativeBuildInputs = [ pkg-config ]; buildInputs = [ - libgit2_1_6 + libgit2 + ] ++ lib.optionals stdenv.isDarwin [ + Security ]; - cargoHash = "sha256-XBBZ56jvBtYI5J/sSc4ckk/KXzCHNgM9A4jGolGKh2E="; + # force the libgit2-sys crate to use the system libgit2 library + LIBGIT2_NO_VENDOR = 1; + + cargoHash = "sha256-HNz1wwn0eUhNR6ZLLPMse8LmAS4CzADx0ZR9gJgJQCg="; meta = with lib; { description = "Git Explorer: cross-platform git workflow improvement tool inspired by Magit"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 56c6c19f31c57..0962ec1f04f1b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2229,7 +2229,9 @@ with pkgs; diff-so-fancy = callPackage ../applications/version-management/diff-so-fancy { }; - gex = callPackage ../applications/version-management/gex { }; + gex = callPackage ../applications/version-management/gex { + inherit (darwin.apple_sdk.frameworks) Security; + }; gfold = callPackage ../applications/version-management/gfold { inherit (darwin.apple_sdk.frameworks) Security; |