treewide: replace git with gitMinimal (#370895)

NixOS · Jan 10, 2025 · fd862b3 · fd862b3
2 parents ebc587c + 756d00c
commit fd862b3
Show file tree

Hide file tree

Showing 43 changed files with 159 additions and 120 deletions.
diff --git a/pkgs/applications/audio/lpd8editor/default.nix b/pkgs/applications/audio/lpd8editor/default.nix
@@ -2,7 +2,7 @@
   lib,
   qt5,
   stdenv,
-  git,
+  gitMinimal,
   fetchFromGitHub,
   cmake,
   alsa-lib,
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     cmake
-    git
+    gitMinimal
     qt5.wrapQtAppsHook
   ];
 

diff --git a/pkgs/applications/blockchains/zcash/default.nix b/pkgs/applications/blockchains/zcash/default.nix
@@ -7,7 +7,7 @@
   cxx-rs,
   db62,
   fetchFromGitHub,
-  git,
+  gitMinimal,
   hexdump,
   lib,
   libevent,
@@ -48,7 +48,7 @@ rustPlatform.buildRustPackage.override { inherit stdenv; } rec {
     autoreconfHook
     cargo
     cxx-rs
-    git
+    gitMinimal
     hexdump
     makeWrapper
     pkg-config

diff --git a/pkgs/applications/editors/nano/default.nix b/pkgs/applications/editors/nano/default.nix
@@ -7,7 +7,7 @@
   texinfo,
   writeScript,
   common-updater-scripts,
-  git,
+  gitMinimal,
   nix,
   nixfmt-classic,
   coreutils,
@@ -74,7 +74,7 @@ stdenv.mkDerivation rec {
       PATH=${
         lib.makeBinPath [
           common-updater-scripts
-          git
+          gitMinimal
           nixfmt-classic
           nix
           coreutils

diff --git a/pkgs/applications/misc/visidata/default.nix b/pkgs/applications/misc/visidata/default.nix
@@ -40,7 +40,7 @@
   zstandard,
   zulip,
   # other
-  git,
+  gitMinimal,
   withPcap ? true,
   dpkt,
   dnslib,
@@ -121,7 +121,7 @@ buildPythonApplication rec {
     ++ lib.optional withXclip xclip;
 
   nativeCheckInputs = [
-    git
+    gitMinimal
   ];
 
   # check phase uses the output bin, which is not possible when cross-compiling

diff --git a/pkgs/applications/version-management/nbstripout/default.nix b/pkgs/applications/version-management/nbstripout/default.nix
@@ -3,7 +3,7 @@
   python3,
   fetchPypi,
   coreutils,
-  git,
+  gitMinimal,
   mercurial,
 }:
 
@@ -29,7 +29,7 @@ python3.pkgs.buildPythonApplication rec {
   nativeCheckInputs =
     [
       coreutils
-      git
+      gitMinimal
       mercurial
     ]
     ++ (with python3.pkgs; [

diff --git a/pkgs/build-support/make-hardcode-gsettings-patch/default.nix b/pkgs/build-support/make-hardcode-gsettings-patch/default.nix
@@ -1,6 +1,6 @@
 {
   runCommand,
-  git,
+  gitMinimal,
   coccinelle,
   python3,
 }:
@@ -60,7 +60,7 @@ runCommand "hardcode-gsettings.patch"
   {
     inherit src patches;
     nativeBuildInputs = [
-      git
+      gitMinimal
       coccinelle
       python3 # For patch script
     ];

diff --git a/pkgs/by-name/bi/biome/package.nix b/pkgs/by-name/bi/biome/package.nix
@@ -6,7 +6,7 @@
   libgit2,
   rust-jemalloc-sys,
   zlib,
-  git,
+  gitMinimal,
 }:
 rustPlatform.buildRustPackage rec {
   pname = "biome";
@@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec {
     zlib
   ];
 
-  nativeCheckInputs = [ git ];
+  nativeCheckInputs = [ gitMinimal ];
 
   cargoBuildFlags = [ "-p=biome_cli" ];
   cargoTestFlags =

diff --git a/pkgs/by-name/ca/cargo-generate/package.nix b/pkgs/by-name/ca/cargo-generate/package.nix
@@ -7,7 +7,7 @@
   openssl,
   stdenv,
   darwin,
-  git,
+  gitMinimal,
 }:
 
 rustPlatform.buildRustPackage rec {
@@ -34,7 +34,7 @@ rustPlatform.buildRustPackage rec {
       darwin.apple_sdk.frameworks.Security
     ];
 
-  nativeCheckInputs = [ git ];
+  nativeCheckInputs = [ gitMinimal ];
 
   # disable vendored libgit2 and openssl
   buildNoDefaultFeatures = true;

diff --git a/pkgs/by-name/ca/cargo-llvm-cov/package.nix b/pkgs/by-name/ca/cargo-llvm-cov/package.nix
@@ -20,7 +20,7 @@
   fetchFromGitHub,
   rustPlatform,
   llvmPackages_19,
-  git,
+  gitMinimal,
 }:
 
 let
@@ -70,7 +70,7 @@ rustPlatform.buildRustPackage {
   LLVM_PROFDATA = "${llvm}/bin/llvm-profdata";
 
   nativeCheckInputs = [
-    git
+    gitMinimal
   ];
 
   # `cargo-llvm-cov` tests rely on `git ls-files.

diff --git a/pkgs/by-name/da/databricks-cli/package.nix b/pkgs/by-name/da/databricks-cli/package.nix
@@ -2,7 +2,7 @@
   lib,
   buildGoModule,
   fetchFromGitHub,
-  git,
+  gitMinimal,
   python3,
 }:
 
@@ -37,7 +37,7 @@ buildGoModule rec {
     ]);
 
   nativeCheckInputs = [
-    git
+    gitMinimal
     (python3.withPackages (
       ps: with ps; [
         setuptools

diff --git a/pkgs/by-name/gi/git-aggregator/package.nix b/pkgs/by-name/gi/git-aggregator/package.nix
@@ -2,7 +2,7 @@
   lib,
   python3Packages,
   fetchFromGitHub,
-  git,
+  gitMinimal,
 }:
 
 python3Packages.buildPythonApplication rec {
@@ -23,13 +23,13 @@ python3Packages.buildPythonApplication rec {
   propagatedBuildInputs = with python3Packages; [
     argcomplete
     colorama
-    git
+    gitMinimal
     kaptan
     requests
   ];
 
   nativeCheckInputs = [
-    git
+    gitMinimal
   ];
 
   preCheck = ''

diff --git a/pkgs/by-name/gi/git-bug-migration/package.nix b/pkgs/by-name/gi/git-bug-migration/package.nix
@@ -2,7 +2,7 @@
   lib,
   buildGoModule,
   fetchFromGitHub,
-  git,
+  gitMinimal,
 }:
 buildGoModule rec {
   pname = "git-bug-migration";
@@ -17,7 +17,7 @@ buildGoModule rec {
 
   vendorHash = "sha256-Hid9OK91LNjLmDHam0ZlrVQopVOsqbZ+BH2rfQi5lS0=";
 
-  nativeCheckInputs = [ git ];
+  nativeCheckInputs = [ gitMinimal ];
 
   ldflags = [
     "-X main.GitExactTag=${version}"

diff --git a/pkgs/by-name/gi/git-dive/package.nix b/pkgs/by-name/gi/git-dive/package.nix
@@ -8,7 +8,7 @@
   zlib,
   stdenv,
   darwin,
-  git,
+  gitMinimal,
 }:
 
 rustPlatform.buildRustPackage rec {
@@ -39,7 +39,7 @@ rustPlatform.buildRustPackage rec {
     ];
 
   nativeCheckInputs = [
-    git
+    gitMinimal
   ];
 
   # don't use vendored libgit2

diff --git a/pkgs/by-name/gi/git-fast-export/package.nix b/pkgs/by-name/gi/git-fast-export/package.nix
@@ -2,7 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  git,
+  gitMinimal,
   mercurial,
   makeWrapper,
   nix-update-script,
@@ -27,7 +27,10 @@ stdenv.mkDerivation (finalAttrs: {
     })
   ];
 
-  nativeBuildInputs = [ makeWrapper ];
+  nativeBuildInputs = [
+    gitMinimal
+    makeWrapper
+  ];
   buildInputs = [
     mercurial.python
     mercurial
@@ -48,30 +51,36 @@ stdenv.mkDerivation (finalAttrs: {
 
     for script in $out/bin/*.sh; do
       wrapProgram $script \
-        --prefix PATH : "${git}/bin":"${mercurial.python}/bin":$libexec \
+        --prefix PATH : "${gitMinimal}/bin":"${mercurial.python}/bin":$libexec \
         --prefix PYTHONPATH : "${mercurial}/${mercurial.python.sitePackages}":$sitepackagesPath
     done
   '';
 
   doInstallCheck = true;
   # deliberately not adding git or hg into nativeInstallCheckInputs - package should
   # be able to work without them in runtime env
+
+  nativeCheckInputs = [
+    gitMinimal
+    mercurial
+  ];
+
   installCheckPhase = ''
     mkdir repo-hg
     pushd repo-hg
-    ${mercurial}/bin/hg init
+    hg init
     echo foo > bar
-    ${mercurial}/bin/hg add bar
-    ${mercurial}/bin/hg commit --message "baz"
+    hg add bar
+    hg commit --message "baz"
     popd
 
     mkdir repo-git
     pushd repo-git
-    ${git}/bin/git init
-    ${git}/bin/git config core.ignoreCase false  # for darwin
+    git init
+    git config core.ignoreCase false  # for darwin
     $out/bin/hg-fast-export.sh -r ../repo-hg/ --hg-hash
     for s in "foo" "bar" "baz" ; do
-      (${git}/bin/git show | grep $s > /dev/null) && echo $s found
+      (git show | grep $s > /dev/null) && echo $s found
     done
     popd
   '';
@@ -84,5 +93,6 @@ stdenv.mkDerivation (finalAttrs: {
     license = lib.licenses.gpl2;
     maintainers = [ lib.maintainers.koral ];
     platforms = lib.platforms.unix;
+    mainProgram = "hg-fast-export.sh";
   };
 })
diff --git a/pkgs/by-name/gi/github-runner/package.nix b/pkgs/by-name/gi/github-runner/package.nix
@@ -6,7 +6,7 @@
   dotnetCorePackages,
   fetchFromGitHub,
   fetchpatch,
-  git,
+  gitMinimal,
   glibc,
   glibcLocales,
   lib,
@@ -112,7 +112,7 @@ buildDotnetModule (finalAttrs: {
   nativeBuildInputs =
     [
       which
-      git
+      gitMinimal
       # needed for `uname`
       coreutils
     ]

diff --git a/pkgs/by-name/gi/gitstatus/package.nix b/pkgs/by-name/gi/gitstatus/package.nix
@@ -3,7 +3,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  git,
+  gitMinimal,
   zsh,
   zlib,
   runtimeShell,
@@ -77,7 +77,7 @@ stdenv.mkDerivation rec {
   # command ran successfully. This tests the binary itself and the zsh
   # integration.
   nativeInstallCheckInputs = [
-    git
+    gitMinimal
     zsh
   ];
   doInstallCheck = true;

diff --git a/pkgs/by-name/gl/glitter/package.nix b/pkgs/by-name/gl/glitter/package.nix
@@ -2,7 +2,7 @@
   lib,
   rustPlatform,
   fetchFromGitHub,
-  git,
+  gitMinimal,
 }:
 
 rustPlatform.buildRustPackage rec {
@@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec {
   cargoHash = "sha256-7JQcY3HCG3UQ0Mfz/+ZZ0axGEpQoH410FT72tjHW7EE=";
 
   nativeCheckInputs = [
-    git
+    gitMinimal
   ];
 
   # tests require it to be in a git repository

diff --git a/pkgs/by-name/gs/gst/package.nix b/pkgs/by-name/gs/gst/package.nix
@@ -2,7 +2,7 @@
   lib,
   buildGoModule,
   fetchFromGitHub,
-  git,
+  gitMinimal,
   ghq,
 }:
 
@@ -22,7 +22,7 @@ buildGoModule rec {
   doCheck = false;
 
   nativeBuildInputs = [
-    git
+    gitMinimal
     ghq
   ];