diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2024-02-29 18:01:30 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-02-29 18:01:30 +0000 |
| commit | c7d7e4a7a5768c3a67361a0af4c381be0d6bee17 (patch) | |
| tree | 24f4190ee72629b81719d6dfb41fef2992dc0019 /pkgs/applications/version-management | |
| parent | 7f1b4b772cb0d0ef96724d09d6f0213410bb477c (diff) | |
| parent | e894afb6c101fea0771b47d7827bef022e89ee1e (diff) | |
| download | nixlib-c7d7e4a7a5768c3a67361a0af4c381be0d6bee17.tar nixlib-c7d7e4a7a5768c3a67361a0af4c381be0d6bee17.tar.gz nixlib-c7d7e4a7a5768c3a67361a0af4c381be0d6bee17.tar.bz2 nixlib-c7d7e4a7a5768c3a67361a0af4c381be0d6bee17.tar.lz nixlib-c7d7e4a7a5768c3a67361a0af4c381be0d6bee17.tar.xz nixlib-c7d7e4a7a5768c3a67361a0af4c381be0d6bee17.tar.zst nixlib-c7d7e4a7a5768c3a67361a0af4c381be0d6bee17.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/applications/version-management')
| -rw-r--r-- | pkgs/applications/version-management/git-dive/default.nix | 10 | ||||
| -rw-r--r-- | pkgs/applications/version-management/git-mit/default.nix | 8 |
2 files changed, 12 insertions, 6 deletions
diff --git a/pkgs/applications/version-management/git-dive/default.nix b/pkgs/applications/version-management/git-dive/default.nix index 983d7b3dd672..c0209c38cfa9 100644 --- a/pkgs/applications/version-management/git-dive/default.nix +++ b/pkgs/applications/version-management/git-dive/default.nix @@ -2,8 +2,7 @@ , rustPlatform , fetchFromGitHub , pkg-config - # libgit2-sys doesn't support libgit2 1.6 yet -, libgit2_1_5 +, libgit2 , oniguruma , zlib , stdenv @@ -29,7 +28,7 @@ rustPlatform.buildRustPackage rec { ]; buildInputs = [ - libgit2_1_5 + libgit2 oniguruma zlib ] ++ lib.optionals stdenv.isDarwin [ @@ -54,7 +53,10 @@ rustPlatform.buildRustPackage rec { git config --global user.email nixbld@example.com ''; - RUSTONIG_SYSTEM_LIBONIG = true; + env = { + LIBGIT2_NO_VENDOR = 1; + RUSTONIG_SYSTEM_LIBONIG = true; + }; meta = with lib; { description = "Dive into a file's history to find root cause"; diff --git a/pkgs/applications/version-management/git-mit/default.nix b/pkgs/applications/version-management/git-mit/default.nix index d4dece40ebde..5e5732a01145 100644 --- a/pkgs/applications/version-management/git-mit/default.nix +++ b/pkgs/applications/version-management/git-mit/default.nix @@ -2,7 +2,7 @@ , rustPlatform , fetchFromGitHub , pkg-config -, libgit2_1_5 +, libgit2 , openssl , zlib , stdenv @@ -28,13 +28,17 @@ rustPlatform.buildRustPackage { nativeBuildInputs = [ pkg-config ]; buildInputs = [ - libgit2_1_5 + libgit2 openssl zlib ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.AppKit ]; + env = { + LIBGIT2_NO_VENDOR = 1; + }; + meta = with lib; { description = "Minimalist set of hooks to aid pairing and link commits to issues"; homepage = "https://github.com/PurpleBooth/git-mit"; |