From 6881ea13ec4d3da38f3fed20a97b9e2ddf88ddb2 Mon Sep 17 00:00:00 2001 From: Aliaksandr Date: Fri, 12 Dec 2025 07:45:09 +0200 Subject: [PATCH] git: move to by-name --- .../gi}/git/docbook2texi.patch | 0 .../gi}/git/git-send-email-honor-PATH.patch | 0 .../gi}/git/git-sh-i18n.patch | 0 .../gi}/git/installCheck-path.patch | 0 .../default.nix => by-name/gi/git/package.nix} | 15 +++++++++++++-- .../gi}/git/ssh-path.patch | 0 .../gi}/git/update.sh | 0 pkgs/top-level/all-packages.nix | 16 ---------------- 8 files changed, 13 insertions(+), 18 deletions(-) rename pkgs/{applications/version-management => by-name/gi}/git/docbook2texi.patch (100%) rename pkgs/{applications/version-management => by-name/gi}/git/git-send-email-honor-PATH.patch (100%) rename pkgs/{applications/version-management => by-name/gi}/git/git-sh-i18n.patch (100%) rename pkgs/{applications/version-management => by-name/gi}/git/installCheck-path.patch (100%) rename pkgs/{applications/version-management/git/default.nix => by-name/gi/git/package.nix} (98%) rename pkgs/{applications/version-management => by-name/gi}/git/ssh-path.patch (100%) rename pkgs/{applications/version-management => by-name/gi}/git/update.sh (100%) diff --git a/pkgs/applications/version-management/git/docbook2texi.patch b/pkgs/by-name/gi/git/docbook2texi.patch similarity index 100% rename from pkgs/applications/version-management/git/docbook2texi.patch rename to pkgs/by-name/gi/git/docbook2texi.patch diff --git a/pkgs/applications/version-management/git/git-send-email-honor-PATH.patch b/pkgs/by-name/gi/git/git-send-email-honor-PATH.patch similarity index 100% rename from pkgs/applications/version-management/git/git-send-email-honor-PATH.patch rename to pkgs/by-name/gi/git/git-send-email-honor-PATH.patch diff --git a/pkgs/applications/version-management/git/git-sh-i18n.patch b/pkgs/by-name/gi/git/git-sh-i18n.patch similarity index 100% rename from pkgs/applications/version-management/git/git-sh-i18n.patch rename to pkgs/by-name/gi/git/git-sh-i18n.patch diff --git a/pkgs/applications/version-management/git/installCheck-path.patch b/pkgs/by-name/gi/git/installCheck-path.patch similarity index 100% rename from pkgs/applications/version-management/git/installCheck-path.patch rename to pkgs/by-name/gi/git/installCheck-path.patch diff --git a/pkgs/applications/version-management/git/default.nix b/pkgs/by-name/gi/git/package.nix similarity index 98% rename from pkgs/applications/version-management/git/default.nix rename to pkgs/by-name/gi/git/package.nix index df59adec8f1e..2835e6270b10 100644 --- a/pkgs/applications/version-management/git/default.nix +++ b/pkgs/by-name/gi/git/package.nix @@ -31,8 +31,6 @@ libiconvReal, svnSupport ? false, subversionClient, - perlLibs, - smtpPerlLibs, perlSupport ? stdenv.buildPlatform == stdenv.hostPlatform, nlsSupport ? true, osxkeychainSupport ? stdenv.hostPlatform.isDarwin, @@ -70,6 +68,19 @@ let FCGIProcManager HTMLTagCloud ]; + perlLibs = with perlPackages; [ + LWP + URI + TermReadKey + ]; + smtpPerlLibs = with perlPackages; [ + libnet + NetSMTPSSL + IOSocketSSL + NetSSLeay + AuthenSASL + DigestHMAC + ]; in stdenv.mkDerivation (finalAttrs: { diff --git a/pkgs/applications/version-management/git/ssh-path.patch b/pkgs/by-name/gi/git/ssh-path.patch similarity index 100% rename from pkgs/applications/version-management/git/ssh-path.patch rename to pkgs/by-name/gi/git/ssh-path.patch diff --git a/pkgs/applications/version-management/git/update.sh b/pkgs/by-name/gi/git/update.sh similarity index 100% rename from pkgs/applications/version-management/git/update.sh rename to pkgs/by-name/gi/git/update.sh diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 538c13d721f1..a3e188f3815b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1150,22 +1150,6 @@ with pkgs; ### APPLICATIONS/VERSION-MANAGEMENT - git = callPackage ../applications/version-management/git { - perlLibs = [ - perlPackages.LWP - perlPackages.URI - perlPackages.TermReadKey - ]; - smtpPerlLibs = [ - perlPackages.libnet - perlPackages.NetSMTPSSL - perlPackages.IOSocketSSL - perlPackages.NetSSLeay - perlPackages.AuthenSASL - perlPackages.DigestHMAC - ]; - }; - # The full-featured Git. gitFull = git.override { svnSupport = stdenv.buildPlatform == stdenv.hostPlatform;