summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--nixos/modules/services/misc/gitea.nix2
-rw-r--r--nixos/modules/services/misc/gitlab.nix8
-rw-r--r--nixos/modules/services/misc/gitolite.nix2
-rw-r--r--nixos/modules/services/misc/redmine.nix4
-rw-r--r--nixos/tests/git/hub.nix4
-rw-r--r--pkgs/applications/editors/spacevim/default.nix4
-rw-r--r--pkgs/applications/version-management/git-and-tools/bitbucket-server-cli/default.nix2
-rw-r--r--pkgs/applications/version-management/git-and-tools/default.nix270
-rw-r--r--pkgs/applications/version-management/git-and-tools/git-fame/default.nix2
-rw-r--r--pkgs/development/tools/misc/hydra/common.nix6
-rw-r--r--pkgs/shells/zsh/zsh-powerlevel10k/default.nix2
-rw-r--r--pkgs/tools/misc/bat-extras/default.nix4
-rw-r--r--pkgs/top-level/aliases.nix10
-rw-r--r--pkgs/top-level/all-packages.nix254
-rw-r--r--pkgs/top-level/python-packages.nix2
15 files changed, 273 insertions, 303 deletions
diff --git a/nixos/modules/services/misc/gitea.nix b/nixos/modules/services/misc/gitea.nix
index ac702a05ee8b..7eb52fef43d5 100644
--- a/nixos/modules/services/misc/gitea.nix
+++ b/nixos/modules/services/misc/gitea.nix
@@ -453,7 +453,7 @@ in
description = "gitea";
after = [ "network.target" ] ++ lib.optional usePostgresql "postgresql.service" ++ lib.optional useMysql "mysql.service";
wantedBy = [ "multi-user.target" ];
- path = [ gitea pkgs.gitAndTools.git ];
+ path = [ gitea pkgs.git ];
preStart = let
runConfig = "${cfg.stateDir}/custom/conf/app.ini";
diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix
index 35a9dccdff28..de4d1bf1987a 100644
--- a/nixos/modules/services/misc/gitlab.nix
+++ b/nixos/modules/services/misc/gitlab.nix
@@ -736,7 +736,7 @@ in {
environment = gitlabEnv;
path = with pkgs; [
postgresqlPackage
- gitAndTools.git
+ git
ruby
openssh
nodejs
@@ -764,7 +764,7 @@ in {
path = with pkgs; [
openssh
procps # See https://gitlab.com/gitlab-org/gitaly/issues/1562
- gitAndTools.git
+ git
cfg.packages.gitaly.rubyEnv
cfg.packages.gitaly.rubyEnv.wrappedRuby
gzip
@@ -806,7 +806,7 @@ in {
wantedBy = [ "multi-user.target" ];
path = with pkgs; [
exiftool
- gitAndTools.git
+ git
gnutar
gzip
openssh
@@ -854,7 +854,7 @@ in {
environment = gitlabEnv;
path = with pkgs; [
postgresqlPackage
- gitAndTools.git
+ git
openssh
nodejs
procps
diff --git a/nixos/modules/services/misc/gitolite.nix b/nixos/modules/services/misc/gitolite.nix
index 59cbdac319c8..190ea9212d2a 100644
--- a/nixos/modules/services/misc/gitolite.nix
+++ b/nixos/modules/services/misc/gitolite.nix
@@ -227,6 +227,6 @@ in
};
environment.systemPackages = [ pkgs.gitolite pkgs.git ]
- ++ optional cfg.enableGitAnnex pkgs.gitAndTools.git-annex;
+ ++ optional cfg.enableGitAnnex pkgs.git-annex;
});
}
diff --git a/nixos/modules/services/misc/redmine.nix b/nixos/modules/services/misc/redmine.nix
index 1313bdaccc49..8b53eb471db6 100644
--- a/nixos/modules/services/misc/redmine.nix
+++ b/nixos/modules/services/misc/redmine.nix
@@ -230,7 +230,7 @@ in
production = {
scm_subversion_command = "${pkgs.subversion}/bin/svn";
scm_mercurial_command = "${pkgs.mercurial}/bin/hg";
- scm_git_command = "${pkgs.gitAndTools.git}/bin/git";
+ scm_git_command = "${pkgs.git}/bin/git";
scm_cvs_command = "${pkgs.cvs}/bin/cvs";
scm_bazaar_command = "${pkgs.breezy}/bin/bzr";
scm_darcs_command = "${pkgs.darcs}/bin/darcs";
@@ -299,7 +299,7 @@ in
breezy
cvs
darcs
- gitAndTools.git
+ git
mercurial
subversion
];
diff --git a/nixos/tests/git/hub.nix b/nixos/tests/git/hub.nix
index 51ec3d5b4129..4f3189861a00 100644
--- a/nixos/tests/git/hub.nix
+++ b/nixos/tests/git/hub.nix
@@ -6,12 +6,12 @@ import ../make-test-python.nix ({ pkgs, ...} : {
nodes.hub = { pkgs, ... }:
{
- environment.systemPackages = [ pkgs.gitAndTools.hub ];
+ environment.systemPackages = [ pkgs.hub ];
};
testScript =
''
- assert "git version ${pkgs.git.version}\nhub version ${pkgs.gitAndTools.hub.version}\n" in hub.succeed("hub version")
+ assert "git version ${pkgs.git.version}\nhub version ${pkgs.hub.version}\n" in hub.succeed("hub version")
assert "These GitHub commands are provided by hub" in hub.succeed("hub help")
'';
})
diff --git a/pkgs/applications/editors/spacevim/default.nix b/pkgs/applications/editors/spacevim/default.nix
index 02c6fd82d8c5..2193d0ea5bb0 100644
--- a/pkgs/applications/editors/spacevim/default.nix
+++ b/pkgs/applications/editors/spacevim/default.nix
@@ -1,4 +1,4 @@
-{ ripgrep, gitAndTools, fzf, makeWrapper, vim_configurable, vimPlugins, fetchFromGitHub, writeTextDir
+{ ripgrep, git, fzf, makeWrapper, vim_configurable, vimPlugins, fetchFromGitHub, writeTextDir
, lib, stdenv, runCommandNoCC, remarshal, formats, spacevim_config ? import ./init.nix }:
with stdenv;
let
@@ -39,7 +39,7 @@ in mkDerivation rec {
# trailing slash very important for SPACEVIMDIR
makeWrapper "${vim-customized}/bin/vim" "$out/bin/spacevim" \
--add-flags "-u $out/SpaceVim/vimrc" --set SPACEVIMDIR "${spacevimdir}/" \
- --prefix PATH : ${lib.makeBinPath [ fzf gitAndTools.git ripgrep]}
+ --prefix PATH : ${lib.makeBinPath [ fzf git ripgrep]}
'';
meta = with lib; {
diff --git a/pkgs/applications/version-management/git-and-tools/bitbucket-server-cli/default.nix b/pkgs/applications/version-management/git-and-tools/bitbucket-server-cli/default.nix
index 68edb8503bfc..695250a5cc47 100644
--- a/pkgs/applications/version-management/git-and-tools/bitbucket-server-cli/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/bitbucket-server-cli/default.nix
@@ -9,7 +9,7 @@ bundlerEnv rec {
pname = "atlassian-stash";
- passthru.updateScript = bundlerUpdateScript "gitAndTools.bitbucket-server-cli";
+ passthru.updateScript = bundlerUpdateScript "bitbucket-server-cli";
meta = with lib; {
description = "A command line interface to interact with BitBucket Server (formerly Atlassian Stash)";
diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix
deleted file mode 100644
index 2b0efdf69046..000000000000
--- a/pkgs/applications/version-management/git-and-tools/default.nix
+++ /dev/null
@@ -1,270 +0,0 @@
-/* All git-relates tools live here, in a separate attribute set so that users
- * can get a fast overview over what's available.
- */
-args @ {config, lib, pkgs}: with args; with pkgs;
-let
- gitBase = callPackage ./git {
- svnSupport = false; # for git-svn support
- guiSupport = false; # requires tcl/tk
- sendEmailSupport = false; # requires plenty of perl libraries
- perlLibs = [perlPackages.LWP perlPackages.URI perlPackages.TermReadKey];
- smtpPerlLibs = [
- perlPackages.libnet perlPackages.NetSMTPSSL
- perlPackages.IOSocketSSL perlPackages.NetSSLeay
- perlPackages.AuthenSASL perlPackages.DigestHMAC
- ];
- };
-
- self = rec {
- # Try to keep this generally alphabetized
-
- bfg-repo-cleaner = callPackage ./bfg-repo-cleaner { };
-
- bitbucket-server-cli = callPackage ./bitbucket-server-cli { };
-
- bump2version = pkgs.python37Packages.callPackage ./bump2version { };
-
- darcs-to-git = callPackage ./darcs-to-git { };
-
- delta = callPackage ./delta {
- inherit (darwin.apple_sdk.frameworks) Security;
- };
-
- diff-so-fancy = callPackage ./diff-so-fancy { };
-
- gh = callPackage ./gh { };
-
- ghorg = callPackage ./ghorg { };
-
- ghq = callPackage ./ghq { };
-
- ghr = callPackage ./ghr { };
-
- git = appendToName "minimal" gitBase;
-
- git-absorb = callPackage ./git-absorb {
- inherit (darwin.apple_sdk.frameworks) Security;
- };
-
- git-annex = pkgs.haskellPackages.git-annex;
-
- git-annex-metadata-gui = libsForQt5.callPackage ./git-annex-metadata-gui {
- inherit (python3Packages) buildPythonApplication pyqt5 git-annex-adapter;
- };
-
- git-annex-remote-b2 = callPackage ./git-annex-remote-b2 { };
-
- git-annex-remote-dbx = callPackage ./git-annex-remote-dbx {
- inherit (python3Packages)
- buildPythonApplication
- fetchPypi
- dropbox
- annexremote
- humanfriendly;
- };
-
- git-annex-remote-rclone = callPackage ./git-annex-remote-rclone { };
-
- git-annex-utils = callPackage ./git-annex-utils { };
-
- git-brunch = pkgs.haskellPackages.git-brunch;
-
- git-appraise = callPackage ./git-appraise {};
-
- git-bug = callPackage ./git-bug { };
-
- # support for bugzilla
- git-bz = callPackage ./git-bz { };
-
- git-chglog = callPackage ./git-chglog { };
-
- git-cinnabar = callPackage ./git-cinnabar { };
-
- git-codeowners = callPackage ./git-codeowners { };
-
- git-codereview = callPackage ./git-codereview { };
-
- git-cola = callPackage ./git-cola { };
-
- git-crypt = callPackage ./git-crypt { };
-
- git-delete-merged-branches = callPackage ./git-delete-merged-branches { };
-
- git-dit = callPackage ./git-dit {
- inherit (darwin.apple_sdk.frameworks) CoreFoundation Security;
- };
-
- git-doc = lib.addMetaAttrs {
- description = "Additional documentation for Git";
- longDescription = ''
- This package contains additional documentation (HTML and text files) that
- is referenced in the man pages of Git.
- '';
- } gitFull.doc;
-
- git-extras = callPackage ./git-extras { };
-
- git-fame = callPackage ./git-fame {};
-
- git-fast-export = callPackage ./fast-export { mercurial = mercurial_4; };
-
- git-filter-repo = callPackage ./git-filter-repo {
- pythonPackages = python3Packages;
- };
-
- git-gone = callPackage ./git-gone {
- inherit (darwin.apple_sdk.frameworks) Security;
- };
-
- git-hub = callPackage ./git-hub { };
-
- git-ignore = callPackage ./git-ignore { };
-
- git-imerge = python3Packages.callPackage ./git-imerge { };
-
- git-interactive-rebase-tool = callPackage ./git-interactive-rebase-tool {
- inherit (darwin.apple_sdk.frameworks) Security;
- };
-
- git-machete = python3Packages.callPackage ./git-machete { };
-
- git-my = callPackage ./git-my { };
-
- git-octopus = callPackage ./git-octopus { };
-
- git-open = callPackage ./git-open { };
-
- git-radar = callPackage ./git-radar { };
-
- git-recent = callPackage ./git-recent {
- util-linux = if stdenv.isLinux then util-linuxMinimal else util-linux;
- };
-
- git-remote-codecommit = python3Packages.callPackage ./git-remote-codecommit { };
-
- git-remote-gcrypt = callPackage ./git-remote-gcrypt { };
-
- git-remote-hg = callPackage ./git-remote-hg { };
-
- git-reparent = callPackage ./git-reparent { };
-
- git-secret = callPackage ./git-secret { };
-
- git-secrets = callPackage ./git-secrets { };
-
- git-standup = callPackage ./git-standup { };
-
- git-stree = callPackage ./git-stree { };
-
- git-subrepo = callPackage ./git-subrepo { };
-
- git-subset = callPackage ./git-subset {
- inherit (darwin.apple_sdk.frameworks) Security;
- };
-
- git-subtrac = callPackage ./git-subtrac { };
-
- git-sync = callPackage ./git-sync { };
-
- git-test = callPackage ./git-test { };
-
- git-trim = callPackage ./git-trim {
- inherit (darwin.apple_sdk.frameworks) Security;
- };
-
- git-when-merged = callPackage ./git-when-merged { };
-
- git-workspace = callPackage ./git-workspace {
- inherit (darwin.apple_sdk.frameworks) Security;
- };
-
- git2cl = callPackage ./git2cl { };
-
- # The full-featured Git.
- gitFull = gitBase.override {
- svnSupport = true;
- guiSupport = true;
- sendEmailSupport = true;
- withLibsecret = !stdenv.isDarwin;
- };
-
- # Git with SVN support, but without GUI.
- gitSVN = lowPrio (appendToName "with-svn" (gitBase.override {
- svnSupport = true;
- }));
-
- gita = python3Packages.callPackage ./gita {};
-
- gitbatch = callPackage ./gitbatch { };
-
- gitflow = callPackage ./gitflow { };
-
- gitin = callPackage ./gitin { };
-
- gitstatus = callPackage ./gitstatus { };
-
- gitui = callPackage ./gitui {
- inherit (darwin.apple_sdk.frameworks) Security AppKit;
- inherit (pkgs) openssl perl;
- };
-
- glab = callPackage ./glab { };
-
- grv = callPackage ./grv { };
-
- hub = callPackage ./hub { };
-
- lab = callPackage ./lab { };
-
- lefthook = callPackage ./lefthook {
- # Please use empty attrset once upstream bugs have been fixed
- # https://github.com/Arkweid/lefthook/issues/151
- buildGoModule = buildGo114Module;
- };
-
- legit = callPackage ./legit { };
-
- pass-git-helper = python3Packages.callPackage ./pass-git-helper { };
-
- pre-commit = pkgs.python3Packages.toPythonApplication pkgs.python3Packages.pre-commit;
-
- qgit = qt5.callPackage ./qgit { };
-
- rs-git-fsmonitor = callPackage ./rs-git-fsmonitor { };
-
- scmpuff = callPackage ./scmpuff { };
-
- stgit = callPackage ./stgit { };
-
- subgit = callPackage ./subgit { };
-
- svn-all-fast-export = libsForQt5.callPackage ./svn-all-fast-export { };
-
- svn2git = callPackage ./svn2git {
- git = gitSVN;
- };
-
- thicket = callPackage ./thicket { };
-
- tig = callPackage ./tig { };
-
- top-git = callPackage ./topgit { };
-
- transcrypt = callPackage ./transcrypt { };
-
- git-vanity-hash = callPackage ./git-vanity-hash { };
-
- ydiff = pkgs.python3.pkgs.toPythonApplication pkgs.python3.pkgs.ydiff;
-
-} // lib.optionalAttrs (config.allowAliases or true) (with self; {
- # aliases
- darcsToGit = darcs-to-git;
- gitAnnex = git-annex;
- gitBrunch = git-brunch;
- gitFastExport = git-fast-export;
- gitRemoteGcrypt = git-remote-gcrypt;
- svn_all_fast_export = svn-all-fast-export;
- topGit = top-git;
-});
-in
- self
diff --git a/pkgs/applications/version-management/git-and-tools/git-fame/default.nix b/pkgs/applications/version-management/git-and-tools/git-fame/default.nix
index 6084d496a565..216a1035c72b 100644
--- a/pkgs/applications/version-management/git-and-tools/git-fame/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-fame/default.nix
@@ -7,7 +7,7 @@ bundlerEnv {
gemdir = ./.;
- passthru.updateScript = bundlerUpdateScript "gitAndTools.git-fame";
+ passthru.updateScript = bundlerUpdateScript "git-fame";
meta = with lib; {
description = ''
diff --git a/pkgs/development/tools/misc/hydra/common.nix b/pkgs/development/tools/misc/hydra/common.nix
index 4af9fe045874..eb8ffb472852 100644
--- a/pkgs/development/tools/misc/hydra/common.nix
+++ b/pkgs/development/tools/misc/hydra/common.nix
@@ -1,6 +1,6 @@
{ stdenv, nix, perlPackages, buildEnv, fetchFromGitHub
, makeWrapper, autoconf, automake, libtool, unzip, pkgconfig, sqlite, libpqxx
-, gitAndTools, mercurial, darcs, subversion, breezy, openssl, bzip2, libxslt
+, top-git, mercurial, darcs, subversion, breezy, openssl, bzip2, libxslt
, guile, perl, postgresql, nukeReferences, git, boehmgc, nlohmann_json
, docbook_xsl, openssh, gnused, coreutils, findutils, gzip, lzma, gnutar
, rpm, dpkg, cdrkit, pixz, lib, boost, autoreconfHook, src ? null, version ? null
@@ -80,7 +80,7 @@ in stdenv.mkDerivation rec {
buildInputs =
[ makeWrapper autoconf automake libtool unzip nukeReferences sqlite libpqxx
- gitAndTools.top-git mercurial /*darcs*/ subversion breezy openssl bzip2 libxslt
+ top-git mercurial /*darcs*/ subversion breezy openssl bzip2 libxslt
perlDeps perl nix
postgresql # for running the tests
nlohmann_json
@@ -89,7 +89,7 @@ in stdenv.mkDerivation rec {
hydraPath = lib.makeBinPath (
[ sqlite subversion openssh nix coreutils findutils pixz
- gzip bzip2 lzma gnutar unzip git gitAndTools.top-git mercurial /*darcs*/ gnused breezy
+ gzip bzip2 lzma gnutar unzip git top-git mercurial /*darcs*/ gnused breezy
] ++ lib.optionals stdenv.isLinux [ rpm dpkg cdrkit ] );
nativeBuildInputs = [ autoreconfHook pkgconfig ];
diff --git a/pkgs/shells/zsh/zsh-powerlevel10k/default.nix b/pkgs/shells/zsh/zsh-powerlevel10k/default.nix
index 7e39e6779d19..0bba4bffdeff 100644
--- a/pkgs/shells/zsh/zsh-powerlevel10k/default.nix
+++ b/pkgs/shells/zsh/zsh-powerlevel10k/default.nix
@@ -6,7 +6,7 @@
let
# match gitstatus version with given `gitstatus_version`:
# https://github.com/romkatv/powerlevel10k/blob/master/gitstatus/build.info
- gitstatus = pkgs.gitAndTools.gitstatus.overrideAttrs (oldAtttrs: rec {
+ gitstatus = pkgs.gitstatus.overrideAttrs (oldAtttrs: rec {
version = "1.3.1";
src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/bat-extras/default.nix b/pkgs/tools/misc/bat-extras/default.nix
index a2ec5afd965a..c52cae4eac06 100644
--- a/pkgs/tools/misc/bat-extras/default.nix
+++ b/pkgs/tools/misc/bat-extras/default.nix
@@ -13,7 +13,7 @@
, withEntr ? entr != null, entr ? null
# batdiff
, gitMinimal
-, withDelta ? gitAndTools?delta, gitAndTools ? null
+, withDelta ? delta != null, delta ? null
}:
let
@@ -133,7 +133,7 @@ let
stdenv.lib.optional cond dep;
in
{
- batdiff = script "batdiff" ([ less coreutils gitMinimal ] ++ optionalDep withDelta gitAndTools.delta);
+ batdiff = script "batdiff" ([ less coreutils gitMinimal ] ++ optionalDep withDelta delta);
batgrep = script "batgrep" [ less coreutils ripgrep ];
batman = script "batman" [];
batwatch = script "batwatch" ([ less coreutils ] ++ optionalDep withEntr entr);
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index fa0149c5789a..d5374158a106 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -194,7 +194,15 @@ mapAliases ({
gdb-multitarget = gdb; # added 2017-11-13
gdk_pixbuf = gdk-pixbuf; # added 2019-05-22
gettextWithExpat = gettext; # 2016-02-19
- git-hub = gitAndTools.git-hub; # added 2016-04-29
+ gitAndTools = self // { # added 2021-01-14
+ darcsToGit = darcs-to-git;
+ gitAnnex = git-annex;
+ gitBrunch = git-brunch;
+ gitFastExport = git-fast-export;
+ gitRemoteGcrypt = git-remote-gcrypt;
+ svn_all_fast_export = svn-all-fast-export;
+ topGit = top-git;
+ };
glib_networking = glib-networking; # added 2018-02-25
gmailieer = lieer; # added 2020-04-19
gnome-mpv = celluloid; # added 2019-08-22
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bb1764fb9c74..001880bbb3ed 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1317,6 +1317,8 @@ in
pass = callPackage ../tools/security/pass { };
+ pass-git-helper = python3Packages.callPackage ../applications/version-management/git-and-tools/pass-git-helper { };
+
pass-nodmenu = callPackage ../tools/security/pass {
dmenuSupport = false;
pass = pass-nodmenu;
@@ -1566,6 +1568,8 @@ in
bitbucket-cli = python2Packages.bitbucket-cli;
+ bitbucket-server-cli = callPackage ../applications/version-management/git-and-tools/bitbucket-server-cli { };
+
blink = libsForQt5.callPackage ../applications/networking/instant-messengers/blink { };
blockbook = callPackage ../servers/blockbook { };
@@ -2855,7 +2859,7 @@ in
bettercap = callPackage ../tools/security/bettercap { };
- bfg-repo-cleaner = gitAndTools.bfg-repo-cleaner;
+ bfg-repo-cleaner = callPackage ../applications/version-management/git-and-tools/bfg-repo-cleaner { };
bfs = callPackage ../tools/system/bfs { };
@@ -2896,6 +2900,8 @@ in
inherit (pythonPackages) gyp;
};
+ bump2version = python37Packages.callPackage ../applications/version-management/git-and-tools/bump2version { };
+
bumpver = callPackage ../applications/version-management/bumpver { };
bup = callPackage ../tools/backup/bup { };
@@ -3382,6 +3388,10 @@ in
deer = callPackage ../shells/zsh/zsh-deer { };
+ delta = callPackage ../applications/version-management/git-and-tools/delta {
+ inherit (darwin.apple_sdk.frameworks) Security;
+ };
+
deno = callPackage ../development/web/deno {
inherit (darwin.apple_sdk.frameworks) Security CoreServices;
};
@@ -3464,6 +3474,8 @@ in
diction = callPackage ../tools/text/diction { };
+ diff-so-fancy = callPackage ../applications/version-management/git-and-tools/diff-so-fancy { };
+
diffoscope = callPackage ../tools/misc/diffoscope {
inherit (androidenv.androidPkgs_9_0) build-tools;
jdk = jdk8;
@@ -4300,36 +4312,184 @@ in
ggobi = callPackage ../tools/graphics/ggobi { };
+ gh = callPackage ../applications/version-management/git-and-tools/gh { };
+
+ ghorg = callPackage ../applications/version-management/git-and-tools/ghorg { };
+
+ ghq = callPackage ../applications/version-management/git-and-tools/ghq { };
+
+ ghr = callPackage ../applications/version-management/git-and-tools/ghr { };
+
gibo = callPackage ../tools/misc/gibo { };
gifsicle = callPackage ../tools/graphics/gifsicle { };
gifski = callPackage ../tools/graphics/gifski { };
+ git-absorb = callPackage ../applications/version-management/git-and-tools/git-absorb {
+ inherit (darwin.apple_sdk.frameworks) Security;
+ };
+
+ inherit (haskellPackages) git-annex;
+
+ git-annex-metadata-gui = libsForQt5.callPackage ../applications/version-management/git-and-tools/git-annex-metadata-gui {
+ inherit (python3Packages) buildPythonApplication pyqt5 git-annex-adapter;
+ };
+
+ git-annex-remote-b2 = callPackage ../applications/version-management/git-and-tools/git-annex-remote-b2 { };
+
+ git-annex-remote-dbx = callPackage ../applications/version-management/git-and-tools/git-annex-remote-dbx {
+ inherit (python3Packages)
+ buildPythonApplication
+ fetchPypi
+ dropbox
+ annexremote
+ humanfriendly;
+ };
+
+ git-annex-remote-rclone = callPackage ../applications/version-management/git-and-tools/git-annex-remote-rclone { };
+
+ git-annex-utils = callPackage ../applications/version-management/git-and-tools/git-annex-utils { };
+
+ git-appraise = callPackage ../applications/version-management/git-and-tools/git-appraise {};
+
git-backup = callPackage ../applications/version-management/git-backup {
inherit (darwin.apple_sdk.frameworks) Security;
};
git-big-picture = callPackage ../applications/version-management/git-and-tools/git-big-picture { };
+ inherit (haskellPackages) git-brunch;
+
+ git-bug = callPackage ../applications/version-management/git-and-tools/git-bug { };
+
+ # support for bugzilla
+ git-bz = callPackage ../applications/version-management/git-and-tools/git-bz { };
+
+ git-chglog = callPackage ../applications/version-management/git-and-tools/git-chglog { };
+
+ git-cinnabar = callPackage ../applications/version-management/git-and-tools/git-cinnabar { };
+
+ git-codeowners = callPackage ../applications/version-management/git-and-tools/git-codeowners { };
+
+ git-codereview = callPackage ../applications/version-management/git-and-tools/git-codereview { };
+
+ git-cola = callPackage ../applications/version-management/git-and-tools/git-cola { };
+
git-crecord = callPackage ../applications/version-management/git-crecord { };
+ git-crypt = callPackage ../applications/version-management/git-and-tools/git-crypt { };
+
+ git-delete-merged-branches = callPackage ../applications/version-management/git-and-tools/git-delete-merged-branches { };
+
+ git-dit = callPackage ../applications/version-management/git-and-tools/git-dit {
+ inherit (darwin.apple_sdk.frameworks) CoreFoundation Security;
+ };
+
+ git-extras = callPackage ../applications/version-management/git-and-tools/git-extras { };
+
+ git-fame = callPackage ../applications/version-management/git-and-tools/git-fame {};
+
+ git-fast-export = callPackage ../applications/version-management/git-and-tools/fast-export { mercurial = mercurial_4; };
+
+ git-filter-repo = callPackage ../applications/version-management/git-and-tools/git-filter-repo {
+ pythonPackages = python3Packages;
+ };
+
+ git-gone = callPackage ../applications/version-management/git-and-tools/git-gone {
+ inherit (darwin.apple_sdk.frameworks) Security;
+ };
+
+ git-hub = callPackage ../applications/version-management/git-and-tools/git-hub { };
+
+ git-ignore = callPackage ../applications/version-management/git-and-tools/git-ignore { };
+
+ git-imerge = python3Packages.callPackage ../applications/version-management/git-and-tools/git-imerge { };
+
+ git-interactive-rebase-tool = callPackage ../applications/version-management/git-and-tools/git-interactive-rebase-tool {
+ inherit (darwin.apple_sdk.frameworks) Security;
+ };
+
git-lfs = lowPrio (callPackage ../applications/version-management/git-lfs { });
git-lfs1 = callPackage ../applications/version-management/git-lfs/1.nix { };
git-ftp = callPackage ../development/tools/git-ftp { };
+ git-machete = python3Packages.callPackage ../applications/version-management/git-and-tools/git-machete { };
+
+ git-my = callPackage ../applications/version-management/git-and-tools/git-my { };
+
+ git-octopus = callPackage ../applications/version-management/git-and-tools/git-octopus { };
+
+ git-open = callPackage ../applications/version-management/git-and-tools/git-open { };
+
+ git-radar = callPackage ../applications/version-management/git-and-tools/git-radar { };
+
+ git-recent = callPackage ../applications/version-management/git-and-tools/git-recent {
+ util-linux = if stdenv.isLinux then util-linuxMinimal else util-linux;
+ };
+
+ git-remote-codecommit = python3Packages.callPackage ../applications/version-management/git-and-tools/git-remote-codecommit { };
+
+ git-remote-gcrypt = callPackage ../applications/version-management/git-and-tools/git-remote-gcrypt { };
+
+ git-remote-hg = callPackage ../applications/version-management/git-and-tools/git-remote-hg { };
+
+ git-reparent = callPackage ../applications/version-management/git-and-tools/git-reparent { };
+
+ git-secret = callPackage ../applications/version-management/git-and-tools/git-secret { };
+
+ git-secrets = callPackage ../applications/version-management/git-and-tools/git-secrets { };
+
git-series = callPackage ../development/tools/git-series { };
git-sizer = callPackage ../applications/version-management/git-sizer { };
+ git-standup = callPackage ../applications/version-management/git-and-tools/git-standup { };
+
+ git-stree = callPackage ../applications/version-management/git-and-tools/git-stree { };
+
+ git-subrepo = callPackage ../applications/version-management/git-and-tools/git-subrepo { };
+
+ git-subset = callPackage ../applications/version-management/git-and-tools/git-subset {
+ inherit (darwin.apple_sdk.frameworks) Security;
+ };
+
+ git-subtrac = callPackage ../applications/version-management/git-and-tools/git-subtrac { };
+
+ git-sync = callPackage ../applications/version-management/git-and-tools/git-sync { };
+
+ git-test = callPackage ../applications/version-management/git-and-tools/git-test { };
+
+ git-trim = callPackage ../applications/version-management/git-and-tools/git-trim {
+ inherit (darwin.apple_sdk.frameworks) Security;
+ };
+
git-up = callPackage ../applications/version-management/git-up {
pythonPackages = python3Packages;
};
+ git-vanity-hash = callPackage ../applications/version-management/git-and-tools/git-vanity-hash { };
+
+ git-when-merged = callPackage ../applications/version-management/git-and-tools/git-when-merged { };
+
+ git-workspace = callPackage ../applications/version-management/git-and-tools/git-workspace {
+ inherit (darwin.apple_sdk.frameworks) Security;
+ };
+
+ git2cl = callPackage ../applications/version-management/git-and-tools/git2cl { };
+
+ gita = python3Packages.callPackage ../applications/version-management/git-and-tools/gita { };
+
+ gitbatch = callPackage ../applications/version-management/git-and-tools/gitbatch { };
+
+ gitflow = callPackage ../applications/version-management/git-and-tools/gitflow { };
+
gitfs = callPackage ../tools/filesystems/gitfs { };
+ gitin = callPackage ../applications/version-management/git-and-tools/gitin { };
+
gitinspector = callPackage ../applications/version-management/gitinspector { };
gitkraken = callPackage ../applications/version-management/gitkraken { };
@@ -4358,6 +4518,13 @@ in
gitstats = callPackage ../applications/version-management/gitstats { };
+ gitstatus = callPackage ../applications/version-management/git-and-tools/gitstatus { };
+
+ gitui = callPackage ../applications/version-management/git-and-tools/gitui {
+ inherit (darwin.apple_sdk.frameworks) Security AppKit;
+ inherit (pkgs) openssl perl;
+ };
+
gogs = callPackage ../applications/version-management/gogs { };
git-latexdiff = callPackage ../tools/typesetting/git-latexdiff { };
@@ -4366,6 +4533,8 @@ in
gl2ps = callPackage ../development/libraries/gl2ps { };
+ glab = callPackage ../applications/version-management/git-and-tools/glab { };
+
glusterfs = callPackage ../tools/filesystems/glusterfs { };
glmark2 = callPackage ../tools/graphics/glmark2 { };
@@ -4581,6 +4750,8 @@ in
stdenv = overrideCC stdenv buildPackages.pkgsi686Linux.gcc6;
} // (config.grub or {}));
+ grv = callPackage ../applications/version-management/git-and-tools/grv { };
+
trustedGrub = pkgsi686Linux.callPackage ../tools/misc/grub/trusted.nix { };
trustedGrub-for-HP = pkgsi686Linux.callPackage ../tools/misc/grub/trusted.nix { for_HP_laptop = true; };
@@ -4861,6 +5032,8 @@ in
httpx = callPackage ../tools/security/httpx { };
+ hub = callPackage ../applications/version-management/git-and-tools/hub { };
+
hubicfuse = callPackage ../tools/filesystems/hubicfuse { };
humanfriendly = with python3Packages; toPythonApplication humanfriendly;
@@ -5271,6 +5444,8 @@ in
k6 = callPackage ../development/tools/k6 { };
+ lab = callPackage ../applications/version-management/git-and-tools/lab { };
+
lalezar-fonts = callPackage ../data/fonts/lalezar-fonts { };
ldc = callPackage ../development/compilers/ldc { };
@@ -5279,7 +5454,11 @@ in
lbreakout2 = callPackage ../games/lbreakout2 { };
- lefthook = gitAndTools.lefthook;
+ lefthook = callPackage ../applications/version-management/git-and-tools/lefthook {
+ # Please use empty attrset once upstream bugs have been fixed
+ # https://github.com/Arkweid/lefthook/issues/151
+ buildGoModule = buildGo114Module;
+ };
lego = callPackage ../tools/admin/lego { };
@@ -6870,7 +7049,7 @@ in
pptpd = callPackage ../tools/networking/pptpd {};
- pre-commit = gitAndTools.pre-commit;
+ pre-commit = with python3Packages; toPythonApplication pre-commit;
pretty-simple = callPackage ../development/tools/pretty-simple { };
@@ -7012,6 +7191,8 @@ in
qdigid