colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gitAndTools: move everything to the top level

Browse Source 
The comment at the top of git-and-tools/default.nix said:

    /* All git-relates tools live here, in a separate attribute set so that users
     * can get a fast overview over what's available.

but unfortunately that hasn't actually held up in practice.

Git-related packages have continued to be added to the top level, or
into gitAndTools, or sometimes both, basically at random, so having
gitAndTools is just confusing.  In fact, until I looked as part of
working on getting rid of gitAndTools, one program (ydiff) was
packaged twice independently, once in gitAndTools and once at the top
level (I fixed this in 98c3490196).

So I think it's for the best if we move away from gitAndTools, and
just put all the packages it previously contained at the top level.
I've implemented this here by just making gitAndTools an alias for the
top level -- this saves having loads of lines in aliases.nix.  This
means that people can keep referring to gitAndTools in their
configuration, but it won't be allowed to be used within Nixpkgs, and
it won't be presented to new users by e.g. nix search.

The only other change here that I'm aware of is that
appendToName "minimal" is not longer called on the default git
package, because doing that would have necessitated having a private
gitBase variable like before.  I think it makes more sense not to do
that anyway, and reserve the "minimal" suffix only for gitMinimal.
This commit is contained in:
Alyssa Ross 2021-01-14 17:49:32 +00:00
parent 0f0c250967
commit 3893d6c6d7
15 changed files with 273 additions and 303 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/modules/services/misc/gitea.nix
View File

@ -453,7 +453,7 @@ in
description = "gitea"; description = "gitea";
after = [ "network.target" ] ++ lib.optional usePostgresql "postgresql.service" ++ lib.optional useMysql "mysql.service"; after = [ "network.target" ] ++ lib.optional usePostgresql "postgresql.service" ++ lib.optional useMysql "mysql.service";
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
path = [ gitea pkgs.gitAndTools.git ]; path = [ gitea pkgs.git ];
preStart = let preStart = let
runConfig = "${cfg.stateDir}/custom/conf/app.ini"; runConfig = "${cfg.stateDir}/custom/conf/app.ini";

8
nixos/modules/services/misc/gitlab.nix
View File

@ -736,7 +736,7 @@ in {
environment = gitlabEnv; environment = gitlabEnv;
path = with pkgs; [ path = with pkgs; [
postgresqlPackage postgresqlPackage
gitAndTools.git git
ruby ruby
openssh openssh
nodejs nodejs
@ -764,7 +764,7 @@ in {
path = with pkgs; [ path = with pkgs; [
openssh openssh
procps # See https://gitlab.com/gitlab-org/gitaly/issues/1562 procps # See https://gitlab.com/gitlab-org/gitaly/issues/1562
gitAndTools.git git
cfg.packages.gitaly.rubyEnv cfg.packages.gitaly.rubyEnv
cfg.packages.gitaly.rubyEnv.wrappedRuby cfg.packages.gitaly.rubyEnv.wrappedRuby
gzip gzip
@ -806,7 +806,7 @@ in {
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
path = with pkgs; [ path = with pkgs; [
exiftool exiftool
gitAndTools.git git
gnutar gnutar
gzip gzip
openssh openssh
@ -854,7 +854,7 @@ in {
environment = gitlabEnv; environment = gitlabEnv;
path = with pkgs; [ path = with pkgs; [
postgresqlPackage postgresqlPackage
gitAndTools.git git
openssh openssh
nodejs nodejs
procps procps

2
nixos/modules/services/misc/gitolite.nix
View File

@ -227,6 +227,6 @@ in
}; };
environment.systemPackages = [ pkgs.gitolite pkgs.git ] environment.systemPackages = [ pkgs.gitolite pkgs.git ]
++ optional cfg.enableGitAnnex pkgs.gitAndTools.git-annex; ++ optional cfg.enableGitAnnex pkgs.git-annex;
}); });
} }

4
nixos/modules/services/misc/redmine.nix
View File

@ -230,7 +230,7 @@ in
production = { production = {
scm_subversion_command = "${pkgs.subversion}/bin/svn"; scm_subversion_command = "${pkgs.subversion}/bin/svn";
scm_mercurial_command = "${pkgs.mercurial}/bin/hg"; 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_cvs_command = "${pkgs.cvs}/bin/cvs";
scm_bazaar_command = "${pkgs.breezy}/bin/bzr"; scm_bazaar_command = "${pkgs.breezy}/bin/bzr";
scm_darcs_command = "${pkgs.darcs}/bin/darcs"; scm_darcs_command = "${pkgs.darcs}/bin/darcs";
@ -299,7 +299,7 @@ in
breezy breezy
cvs cvs
darcs darcs
gitAndTools.git git
mercurial mercurial
subversion subversion
]; ];

4
nixos/tests/git/hub.nix
View File

@ -6,12 +6,12 @@ import ../make-test-python.nix ({ pkgs, ...} : {
nodes.hub = { pkgs, ... }: nodes.hub = { pkgs, ... }:
{ {
environment.systemPackages = [ pkgs.gitAndTools.hub ]; environment.systemPackages = [ pkgs.hub ];
}; };
testScript = 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") assert "These GitHub commands are provided by hub" in hub.succeed("hub help")
''; '';
}) })

4
pkgs/applications/editors/spacevim/default.nix
View File

@ -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 }: , lib, stdenv, runCommandNoCC, remarshal, formats, spacevim_config ? import ./init.nix }:
with stdenv; with stdenv;
let let
@ -39,7 +39,7 @@ in mkDerivation rec {
# trailing slash very important for SPACEVIMDIR # trailing slash very important for SPACEVIMDIR
makeWrapper "${vim-customized}/bin/vim" "$out/bin/spacevim" \ makeWrapper "${vim-customized}/bin/vim" "$out/bin/spacevim" \
--add-flags "-u $out/SpaceVim/vimrc" --set SPACEVIMDIR "${spacevimdir}/" \ --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; { meta = with lib; {

2
pkgs/applications/version-management/git-and-tools/bitbucket-server-cli/default.nix
View File

@ -9,7 +9,7 @@ bundlerEnv rec {
pname = "atlassian-stash"; pname = "atlassian-stash";
passthru.updateScript = bundlerUpdateScript "gitAndTools.bitbucket-server-cli"; passthru.updateScript = bundlerUpdateScript "bitbucket-server-cli";
meta = with lib; { meta = with lib; {
description = "A command line interface to interact with BitBucket Server (formerly Atlassian Stash)"; description = "A command line interface to interact with BitBucket Server (formerly Atlassian Stash)";

270
pkgs/applications/version-management/git-and-tools/default.nix
View File

@ -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

2
pkgs/applications/version-management/git-and-tools/git-fame/default.nix
View File

@ -7,7 +7,7 @@ bundlerEnv {
gemdir = ./.; gemdir = ./.;
passthru.updateScript = bundlerUpdateScript "gitAndTools.git-fame"; passthru.updateScript = bundlerUpdateScript "git-fame";
meta = with lib; { meta = with lib; {
description = '' description = ''

6
pkgs/development/tools/misc/hydra/common.nix
View File

@ -1,6 +1,6 @@
{ stdenv, nix, perlPackages, buildEnv, fetchFromGitHub { stdenv, nix, perlPackages, buildEnv, fetchFromGitHub
, makeWrapper, autoconf, automake, libtool, unzip, pkgconfig, sqlite, libpqxx , 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 , guile, perl, postgresql, nukeReferences, git, boehmgc, nlohmann_json
, docbook_xsl, openssh, gnused, coreutils, findutils, gzip, lzma, gnutar , docbook_xsl, openssh, gnused, coreutils, findutils, gzip, lzma, gnutar
, rpm, dpkg, cdrkit, pixz, lib, boost, autoreconfHook, src ? null, version ? null , rpm, dpkg, cdrkit, pixz, lib, boost, autoreconfHook, src ? null, version ? null
@ -80,7 +80,7 @@ in stdenv.mkDerivation rec {
buildInputs = buildInputs =
[ makeWrapper autoconf automake libtool unzip nukeReferences sqlite libpqxx [ 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 perlDeps perl nix
postgresql # for running the tests postgresql # for running the tests
nlohmann_json nlohmann_json
@ -89,7 +89,7 @@ in stdenv.mkDerivation rec {
hydraPath = lib.makeBinPath ( hydraPath = lib.makeBinPath (
[ sqlite subversion openssh nix coreutils findutils pixz [ 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 ] ); ] ++ lib.optionals stdenv.isLinux [ rpm dpkg cdrkit ] );
nativeBuildInputs = [ autoreconfHook pkgconfig ]; nativeBuildInputs = [ autoreconfHook pkgconfig ];

2
pkgs/shells/zsh/zsh-powerlevel10k/default.nix
View File

@ -6,7 +6,7 @@
let let
# match gitstatus version with given `gitstatus_version`: # match gitstatus version with given `gitstatus_version`:
# https://github.com/romkatv/powerlevel10k/blob/master/gitstatus/build.info # 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"; version = "1.3.1";
src = fetchFromGitHub { src = fetchFromGitHub {

4
pkgs/tools/misc/bat-extras/default.nix
View File

@ -13,7 +13,7 @@
, withEntr ? entr != null, entr ? null , withEntr ? entr != null, entr ? null
# batdiff # batdiff
, gitMinimal , gitMinimal
, withDelta ? gitAndTools?delta, gitAndTools ? null , withDelta ? delta != null, delta ? null
}: }:
let let
@ -133,7 +133,7 @@ let
stdenv.lib.optional cond dep; stdenv.lib.optional cond dep;
in 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 ]; batgrep = script "batgrep" [ less coreutils ripgrep ];
batman = script "batman" []; batman = script "batman" [];
batwatch = script "batwatch" ([ less coreutils ] ++ optionalDep withEntr entr); batwatch = script "batwatch" ([ less coreutils ] ++ optionalDep withEntr entr);

10
pkgs/top-level/aliases.nix
View File

@ -194,7 +194,15 @@ mapAliases ({
gdb-multitarget = gdb; # added 2017-11-13 gdb-multitarget = gdb; # added 2017-11-13
gdk_pixbuf = gdk-pixbuf; # added 2019-05-22 gdk_pixbuf = gdk-pixbuf; # added 2019-05-22
gettextWithExpat = gettext; # 2016-02-19 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 glib_networking = glib-networking; # added 2018-02-25
gmailieer = lieer; # added 2020-04-19 gmailieer = lieer; # added 2020-04-19
gnome-mpv = celluloid; # added 2019-08-22 gnome-mpv = celluloid; # added 2019-08-22

254
pkgs/top-level/all-packages.nix
View File

@ -1317,6 +1317,8 @@ in
pass = callPackage ../tools/security/pass { }; 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 { pass-nodmenu = callPackage ../tools/security/pass {
dmenuSupport = false; dmenuSupport = false;
pass = pass-nodmenu; pass = pass-nodmenu;
@ -1566,6 +1568,8 @@ in
bitbucket-cli = python2Packages.bitbucket-cli; 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 { }; blink = libsForQt5.callPackage ../applications/networking/instant-messengers/blink { };
blockbook = callPackage ../servers/blockbook { }; blockbook = callPackage ../servers/blockbook { };
@ -2855,7 +2859,7 @@ in
bettercap = callPackage ../tools/security/bettercap { }; 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 { }; bfs = callPackage ../tools/system/bfs { };
@ -2896,6 +2900,8 @@ in
inherit (pythonPackages) gyp; inherit (pythonPackages) gyp;
}; };
bump2version = python37Packages.callPackage ../applications/version-management/git-and-tools/bump2version { };
bumpver = callPackage ../applications/version-management/bumpver { }; bumpver = callPackage ../applications/version-management/bumpver { };
bup = callPackage ../tools/backup/bup { }; bup = callPackage ../tools/backup/bup { };
@ -3382,6 +3388,10 @@ in
deer = callPackage ../shells/zsh/zsh-deer { }; 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 { deno = callPackage ../development/web/deno {
inherit (darwin.apple_sdk.frameworks) Security CoreServices; inherit (darwin.apple_sdk.frameworks) Security CoreServices;
}; };
@ -3464,6 +3474,8 @@ in
diction = callPackage ../tools/text/diction { }; diction = callPackage ../tools/text/diction { };
diff-so-fancy = callPackage ../applications/version-management/git-and-tools/diff-so-fancy { };
diffoscope = callPackage ../tools/misc/diffoscope { diffoscope = callPackage ../tools/misc/diffoscope {
inherit (androidenv.androidPkgs_9_0) build-tools; inherit (androidenv.androidPkgs_9_0) build-tools;
jdk = jdk8; jdk = jdk8;
@ -4300,36 +4312,184 @@ in
ggobi = callPackage ../tools/graphics/ggobi { }; 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 { }; gibo = callPackage ../tools/misc/gibo { };
gifsicle = callPackage ../tools/graphics/gifsicle { }; gifsicle = callPackage ../tools/graphics/gifsicle { };
gifski = callPackage ../tools/graphics/gifski { }; 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 { git-backup = callPackage ../applications/version-management/git-backup {
inherit (darwin.apple_sdk.frameworks) Security; inherit (darwin.apple_sdk.frameworks) Security;
}; };
git-big-picture = callPackage ../applications/version-management/git-and-tools/git-big-picture { }; 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-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-lfs = lowPrio (callPackage ../applications/version-management/git-lfs { });
git-lfs1 = callPackage ../applications/version-management/git-lfs/1.nix { }; git-lfs1 = callPackage ../applications/version-management/git-lfs/1.nix { };
git-ftp = callPackage ../development/tools/git-ftp { }; 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-series = callPackage ../development/tools/git-series { };
git-sizer = callPackage ../applications/version-management/git-sizer { }; 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 { git-up = callPackage ../applications/version-management/git-up {
pythonPackages = python3Packages; 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 { }; gitfs = callPackage ../tools/filesystems/gitfs { };
gitin = callPackage ../applications/version-management/git-and-tools/gitin { };
gitinspector = callPackage ../applications/version-management/gitinspector { }; gitinspector = callPackage ../applications/version-management/gitinspector { };
gitkraken = callPackage ../applications/version-management/gitkraken { }; gitkraken = callPackage ../applications/version-management/gitkraken { };
@ -4358,6 +4518,13 @@ in
gitstats = callPackage ../applications/version-management/gitstats { }; 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 { }; gogs = callPackage ../applications/version-management/gogs { };
git-latexdiff = callPackage ../tools/typesetting/git-latexdiff { }; git-latexdiff = callPackage ../tools/typesetting/git-latexdiff { };
@ -4366,6 +4533,8 @@ in
gl2ps = callPackage ../development/libraries/gl2ps { }; gl2ps = callPackage ../development/libraries/gl2ps { };
glab = callPackage ../applications/version-management/git-and-tools/glab { };
glusterfs = callPackage ../tools/filesystems/glusterfs { }; glusterfs = callPackage ../tools/filesystems/glusterfs { };
glmark2 = callPackage ../tools/graphics/glmark2 { }; glmark2 = callPackage ../tools/graphics/glmark2 { };
@ -4581,6 +4750,8 @@ in
stdenv = overrideCC stdenv buildPackages.pkgsi686Linux.gcc6; stdenv = overrideCC stdenv buildPackages.pkgsi686Linux.gcc6;
} // (config.grub or {})); } // (config.grub or {}));
grv = callPackage ../applications/version-management/git-and-tools/grv { };
trustedGrub = pkgsi686Linux.callPackage ../tools/misc/grub/trusted.nix { }; trustedGrub = pkgsi686Linux.callPackage ../tools/misc/grub/trusted.nix { };
trustedGrub-for-HP = pkgsi686Linux.callPackage ../tools/misc/grub/trusted.nix { for_HP_laptop = true; }; trustedGrub-for-HP = pkgsi686Linux.callPackage ../tools/misc/grub/trusted.nix { for_HP_laptop = true; };
@ -4861,6 +5032,8 @@ in
httpx = callPackage ../tools/security/httpx { }; httpx = callPackage ../tools/security/httpx { };
hub = callPackage ../applications/version-management/git-and-tools/hub { };
hubicfuse = callPackage ../tools/filesystems/hubicfuse { }; hubicfuse = callPackage ../tools/filesystems/hubicfuse { };
humanfriendly = with python3Packages; toPythonApplication humanfriendly; humanfriendly = with python3Packages; toPythonApplication humanfriendly;
@ -5271,6 +5444,8 @@ in
k6 = callPackage ../development/tools/k6 { }; k6 = callPackage ../development/tools/k6 { };
lab = callPackage ../applications/version-management/git-and-tools/lab { };
lalezar-fonts = callPackage ../data/fonts/lalezar-fonts { }; lalezar-fonts = callPackage ../data/fonts/lalezar-fonts { };
ldc = callPackage ../development/compilers/ldc { }; ldc = callPackage ../development/compilers/ldc { };
@ -5279,7 +5454,11 @@ in
lbreakout2 = callPackage ../games/lbreakout2 { }; 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 { }; lego = callPackage ../tools/admin/lego { };
@ -6870,7 +7049,7 @@ in
pptpd = callPackage ../tools/networking/pptpd {}; pptpd = callPackage ../tools/networking/pptpd {};
pre-commit = gitAndTools.pre-commit; pre-commit = with python3Packages; toPythonApplication pre-commit;
pretty-simple = callPackage ../development/tools/pretty-simple { }; pretty-simple = callPackage ../development/tools/pretty-simple { };
@ -7012,6 +7191,8 @@ in
qdigidoc = libsForQt5.callPackage ../tools/security/qdigidoc { } ; qdigidoc = libsForQt5.callPackage ../tools/security/qdigidoc { } ;
qgit = qt5.callPackage ../applications/version-management/git-and-tools/qgit { };
qgrep = callPackage ../tools/text/qgrep { qgrep = callPackage ../tools/text/qgrep {
inherit (darwin.apple_sdk.frameworks) CoreServices CoreFoundation; inherit (darwin.apple_sdk.frameworks) CoreServices CoreFoundation;
}; };
@ -7224,6 +7405,8 @@ in
inherit (darwin) libiconv; inherit (darwin) libiconv;
}; };
rs-git-fsmonitor = callPackage ../applications/version-management/git-and-tools/rs-git-fsmonitor { };
rsnapshot = callPackage ../tools/backup/rsnapshot { }; rsnapshot = callPackage ../tools/backup/rsnapshot { };
rlwrap = callPackage ../tools/misc/rlwrap { }; rlwrap = callPackage ../tools/misc/rlwrap { };
@ -7354,6 +7537,8 @@ in
scdoc = callPackage ../tools/typesetting/scdoc { }; scdoc = callPackage ../tools/typesetting/scdoc { };
scmpuff = callPackage ../applications/version-management/git-and-tools/scmpuff { };
scream-receivers = callPackage ../misc/scream-receivers { scream-receivers = callPackage ../misc/scream-receivers {
pulseSupport = config.pulseaudio or false; pulseSupport = config.pulseaudio or false;
}; };
@ -7696,6 +7881,8 @@ in
sstp = callPackage ../tools/networking/sstp {}; sstp = callPackage ../tools/networking/sstp {};
stgit = callPackage ../applications/version-management/git-and-tools/stgit { };
strip-nondeterminism = perlPackages.strip-nondeterminism; strip-nondeterminism = perlPackages.strip-nondeterminism;
structure-synth = callPackage ../tools/graphics/structure-synth { }; structure-synth = callPackage ../tools/graphics/structure-synth { };
@ -7704,6 +7891,8 @@ in
subberthehut = callPackage ../tools/misc/subberthehut { }; subberthehut = callPackage ../tools/misc/subberthehut { };
subgit = callPackage ../applications/version-management/git-and-tools/subgit { };
subsurface = libsForQt514.callPackage ../applications/misc/subsurface { }; subsurface = libsForQt514.callPackage ../applications/misc/subsurface { };
sudo = callPackage ../tools/security/sudo { }; sudo = callPackage ../tools/security/sudo { };
@ -7793,8 +7982,14 @@ in
swec = callPackage ../tools/networking/swec { }; swec = callPackage ../tools/networking/swec { };
svn2git = callPackage ../applications/version-management/git-and-tools/svn2git {
git = gitSVN;
};
svnfs = callPackage ../tools/filesystems/svnfs { }; svnfs = callPackage ../tools/filesystems/svnfs { };
svn-all-fast-export = libsForQt5.callPackage ../applications/version-management/git-and-tools/svn-all-fast-export { };
svtplay-dl = callPackage ../tools/misc/svtplay-dl { }; svtplay-dl = callPackage ../tools/misc/svtplay-dl { };
sycl-info = callPackage ../development/libraries/sycl-info { }; sycl-info = callPackage ../development/libraries/sycl-info { };
@ -7926,6 +8121,8 @@ in
thefuck = python3Packages.callPackage ../tools/misc/thefuck { }; thefuck = python3Packages.callPackage ../tools/misc/thefuck { };
thicket = callPackage ../applications/version-management/git-and-tools/thicket { };
thin-provisioning-tools = callPackage ../tools/misc/thin-provisioning-tools { }; thin-provisioning-tools = callPackage ../tools/misc/thin-provisioning-tools { };
thinkpad-scripts = python3.pkgs.callPackage ../tools/misc/thinkpad-scripts { }; thinkpad-scripts = python3.pkgs.callPackage ../tools/misc/thinkpad-scripts { };
@ -8012,6 +8209,8 @@ in
inherit (darwin.apple_sdk.frameworks) Foundation; inherit (darwin.apple_sdk.frameworks) Foundation;
}; };
top-git = callPackage ../applications/version-management/git-and-tools/topgit { };
tor = callPackage ../tools/security/tor { }; tor = callPackage ../tools/security/tor { };
tor-arm = callPackage ../tools/security/tor/tor-arm.nix { }; tor-arm = callPackage ../tools/security/tor/tor-arm.nix { };
@ -8066,6 +8265,8 @@ in
tracefilesim = callPackage ../development/tools/analysis/garcosim/tracefilesim { }; tracefilesim = callPackage ../development/tools/analysis/garcosim/tracefilesim { };
transcrypt = callPackage ../applications/version-management/git-and-tools/transcrypt { };
transifex-client = python3.pkgs.callPackage ../tools/text/transifex-client { }; transifex-client = python3.pkgs.callPackage ../tools/text/transifex-client { };
translate-shell = callPackage ../applications/misc/translate-shell { }; translate-shell = callPackage ../applications/misc/translate-shell { };
@ -21248,6 +21449,8 @@ in
configureFlags = (lib.remove "-flibrary" drv.configureFlags or []) ++ ["-f-library"]; configureFlags = (lib.remove "-flibrary" drv.configureFlags or []) ++ ["-f-library"];
}); });
darcs-to-git = callPackage ../applications/version-management/git-and-tools/darcs-to-git { };
darktable = callPackage ../applications/graphics/darktable { darktable = callPackage ../applications/graphics/darktable {
lua = lua5_3; lua = lua5_3;
pugixml = pugixml.override { shared = true; }; pugixml = pugixml.override { shared = true; };
@ -22043,15 +22246,44 @@ in
gtk = gtk3; gtk = gtk3;
}; };
gitAndTools = recurseIntoAttrs (callPackage ../applications/version-management/git-and-tools {}); git = callPackage ../applications/version-management/git-and-tools/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
];
};
inherit (gitAndTools) git gitFull gitSVN git-cola git-doc svn2git git-radar git-secret git-secrets transcrypt git-crypt ghq; # The full-featured Git.
gitFull = git.override {
svnSupport = true;
guiSupport = true;
sendEmailSupport = true;
withLibsecret = !stdenv.isDarwin;
};
gitMinimal = git.override { # Git with SVN support, but without GUI.
gitSVN = lowPrio (appendToName "with-svn" (git.override {
svnSupport = true;
}));
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;
gitMinimal = appendToName "minimal" (git.override {
withManual = false; withManual = false;
pythonSupport = false; pythonSupport = false;
withpcre2 = false; withpcre2 = false;
}; });
gitRepo = callPackage ../applications/version-management/git-repo { }; gitRepo = callPackage ../applications/version-management/git-repo { };
@ -22059,7 +22291,7 @@ in
git-review = python3Packages.callPackage ../applications/version-management/git-review { }; git-review = python3Packages.callPackage ../applications/version-management/git-review { };
github-cli = gitAndTools.gh; github-cli = gh;
gitolite = callPackage ../applications/version-management/gitolite { }; gitolite = callPackage ../applications/version-management/gitolite { };
@ -22889,7 +23121,7 @@ in
lemonbar-xft = callPackage ../applications/window-managers/lemonbar/xft.nix { }; lemonbar-xft = callPackage ../applications/window-managers/lemonbar/xft.nix { };
legit = gitAndTools.legit; legit = callPackage ../applications/version-management/git-and-tools/legit { };
lens = callPackage ../applications/networking/cluster/lens { }; lens = callPackage ../applications/networking/cluster/lens { };
@ -24843,7 +25075,7 @@ in
tickrs = callPackage ../applications/misc/tickrs { }; tickrs = callPackage ../applications/misc/tickrs { };
tig = gitAndTools.tig; tig = callPackage ../applications/version-management/git-and-tools/tig { };
timbreid = callPackage ../applications/audio/pd-plugins/timbreid { timbreid = callPackage ../applications/audio/pd-plugins/timbreid {
fftw = fftwSinglePrec; fftw = fftwSinglePrec;
@ -25747,7 +25979,7 @@ in
yate = callPackage ../applications/misc/yate { }; yate = callPackage ../applications/misc/yate { };
inherit (gitAndTools) ydiff; ydiff = with python3.pkgs; toPythonApplication ydiff;
yed = callPackage ../applications/graphics/yed {}; yed = callPackage ../applications/graphics/yed {};

2
pkgs/top-level/python-packages.nix
View File

@ -2491,7 +2491,7 @@ in {
gipc = callPackage ../development/python-modules/gipc { }; gipc = callPackage ../development/python-modules/gipc { };
git-annex-adapter = git-annex-adapter =
callPackage ../development/python-modules/git-annex-adapter { inherit (pkgs.gitAndTools) git-annex; }; callPackage ../development/python-modules/git-annex-adapter { };
gitdb2 = throw "gitdb2 has been deprecated, use gitdb instead."; # added 2020-03-14 gitdb2 = throw "gitdb2 has been deprecated, use gitdb instead."; # added 2020-03-14