commit 3893d6c6d76ca2b51ef3694a6c0f27dc8eb01ef5 · pyrox.dev/nixpkgs

+1 -1

nixos/modules/services/misc/gitea.nix

···

       453
       453
        
             description = "gitea";

     

       454
       454
        
             after = [ "network.target" ] ++ lib.optional usePostgresql "postgresql.service" ++ lib.optional useMysql "mysql.service";

     

       455
       455
        
             wantedBy = [ "multi-user.target" ];

     

       456
       456
       -
             path = [ gitea pkgs.gitAndTools.git ];

     

       456
       456
       +
             path = [ gitea pkgs.git ];

     

       457
       457
        
       

     

       458
       458
        
             preStart = let

     

       459
       459
        
               runConfig = "${cfg.stateDir}/custom/conf/app.ini";

+4 -4

nixos/modules/services/misc/gitlab.nix

···

       736
       736
        
             environment = gitlabEnv;

     

       737
       737
        
             path = with pkgs; [

     

       738
       738
        
               postgresqlPackage

     

       739
       739
       -
               gitAndTools.git

     

       739
       739
       +
               git

     

       740
       740
        
               ruby

     

       741
       741
        
               openssh

     

       742
       742
        
               nodejs

     
···

       764
       764
        
             path = with pkgs; [

     

       765
       765
        
               openssh

     

       766
       766
        
               procps  # See https://gitlab.com/gitlab-org/gitaly/issues/1562

     

       767
       767
       -
               gitAndTools.git

     

       767
       767
       +
               git

     

       768
       768
        
               cfg.packages.gitaly.rubyEnv

     

       769
       769
        
               cfg.packages.gitaly.rubyEnv.wrappedRuby

     

       770
       770
        
               gzip

     
···

       806
       806
        
             wantedBy = [ "multi-user.target" ];

     

       807
       807
        
             path = with pkgs; [

     

       808
       808
        
               exiftool

     

       809
       809
       -
               gitAndTools.git

     

       809
       809
       +
               git

     

       810
       810
        
               gnutar

     

       811
       811
        
               gzip

     

       812
       812
        
               openssh

     
···

       854
       854
        
             environment = gitlabEnv;

     

       855
       855
        
             path = with pkgs; [

     

       856
       856
        
               postgresqlPackage

     

       857
       857
       -
               gitAndTools.git

     

       857
       857
       +
               git

     

       858
       858
        
               openssh

     

       859
       859
        
               nodejs

     

       860
       860
        
               procps

+1 -1

nixos/modules/services/misc/gitolite.nix

···

       227
       227
        
           };

     

       228
       228
        
       

     

       229
       229
        
           environment.systemPackages = [ pkgs.gitolite pkgs.git ]

     

       230
       230
       -
               ++ optional cfg.enableGitAnnex pkgs.gitAndTools.git-annex;

     

       230
       230
       +
               ++ optional cfg.enableGitAnnex pkgs.git-annex;

     

       231
       231
        
         });

     

       232
       232
        
       }

+2 -2

nixos/modules/services/misc/redmine.nix

···

       230
       230
        
             production = {

     

       231
       231
        
               scm_subversion_command = "${pkgs.subversion}/bin/svn";

     

       232
       232
        
               scm_mercurial_command = "${pkgs.mercurial}/bin/hg";

     

       233
       233
       -
               scm_git_command = "${pkgs.gitAndTools.git}/bin/git";

     

       233
       233
       +
               scm_git_command = "${pkgs.git}/bin/git";

     

       234
       234
        
               scm_cvs_command = "${pkgs.cvs}/bin/cvs";

     

       235
       235
        
               scm_bazaar_command = "${pkgs.breezy}/bin/bzr";

     

       236
       236
        
               scm_darcs_command = "${pkgs.darcs}/bin/darcs";

     
···

       299
       299
        
               breezy

     

       300
       300
        
               cvs

     

       301
       301
        
               darcs

     

       302
       302
       -
               gitAndTools.git

     

       302
       302
       +
               git

     

       303
       303
        
               mercurial

     

       304
       304
        
               subversion

     

       305
       305
        
             ];

+2 -2

nixos/tests/git/hub.nix

···

       6
       6
        
       

     

       7
       7
        
         nodes.hub = { pkgs, ... }:

     

       8
       8
        
           {

     

       9
       9
       -
             environment.systemPackages = [ pkgs.gitAndTools.hub ];

     

       9
       9
       +
             environment.systemPackages = [ pkgs.hub ];

     

       10
       10
        
           };

     

       11
       11
        
       

     

       12
       12
        
         testScript =

     

       13
       13
        
           ''

     

       14
       14
       -
             assert "git version ${pkgs.git.version}\nhub version ${pkgs.gitAndTools.hub.version}\n" in hub.succeed("hub version")

     

       14
       14
       +
             assert "git version ${pkgs.git.version}\nhub version ${pkgs.hub.version}\n" in hub.succeed("hub version")

     

       15
       15
        
             assert "These GitHub commands are provided by hub" in hub.succeed("hub help")

     

       16
       16
        
           '';

     

       17
       17
        
       })

+2 -2

pkgs/applications/editors/spacevim/default.nix

···

       1
       1
       -
       { ripgrep, gitAndTools, fzf, makeWrapper, vim_configurable, vimPlugins, fetchFromGitHub, writeTextDir

     

       1
       1
       +
       { ripgrep, git, fzf, makeWrapper, vim_configurable, vimPlugins, fetchFromGitHub, writeTextDir

     

       2
       2
        
       , lib, stdenv, runCommandNoCC, remarshal, formats, spacevim_config ? import ./init.nix }:

     

       3
       3
        
       with stdenv;

     

       4
       4
        
       let

     
···

       39
       39
        
           # trailing slash very important for SPACEVIMDIR

     

       40
       40
        
           makeWrapper "${vim-customized}/bin/vim" "$out/bin/spacevim" \

     

       41
       41
        
               --add-flags "-u $out/SpaceVim/vimrc" --set SPACEVIMDIR "${spacevimdir}/" \

     

       42
       42
       -
               --prefix PATH : ${lib.makeBinPath [ fzf gitAndTools.git ripgrep]}

     

       42
       42
       +
               --prefix PATH : ${lib.makeBinPath [ fzf git ripgrep]}

     

       43
       43
        
         '';

     

       44
       44
        
       

     

       45
       45
        
         meta = with lib; {

+1 -1

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

···

       9
       9
        
       

     

       10
       10
        
         pname = "atlassian-stash";

     

       11
       11
        
       

     

       12
       12
       -
         passthru.updateScript = bundlerUpdateScript "gitAndTools.bitbucket-server-cli";

     

       12
       12
       +
         passthru.updateScript = bundlerUpdateScript "bitbucket-server-cli";

     

       13
       13
        
       

     

       14
       14
        
         meta = with lib; {

     

       15
       15
        
           description = "A command line interface to interact with BitBucket Server (formerly Atlassian Stash)";

-270

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

···

       1
       1
       -
       /* All git-relates tools live here, in a separate attribute set so that users

     

       2
       2
       -
        * can get a fast overview over what's available.

     

       3
       3
       -
        */

     

       4
       4
       -
       args @ {config, lib, pkgs}: with args; with pkgs;

     

       5
       5
       -
       let

     

       6
       6
       -
         gitBase = callPackage ./git {

     

       7
       7
       -
           svnSupport = false;         # for git-svn support

     

       8
       8
       -
           guiSupport = false;         # requires tcl/tk

     

       9
       9
       -
           sendEmailSupport = false;   # requires plenty of perl libraries

     

       10
       10
       -
           perlLibs = [perlPackages.LWP perlPackages.URI perlPackages.TermReadKey];

     

       11
       11
       -
           smtpPerlLibs = [

     

       12
       12
       -
             perlPackages.libnet perlPackages.NetSMTPSSL

     

       13
       13
       -
             perlPackages.IOSocketSSL perlPackages.NetSSLeay

     

       14
       14
       -
             perlPackages.AuthenSASL perlPackages.DigestHMAC

     

       15
       15
       -
           ];

     

       16
       16
       -
         };

     

       17
       17
       -
       

     

       18
       18
       -
         self = rec {

     

       19
       19
       -
         # Try to keep this generally alphabetized

     

       20
       20
       -
       

     

       21
       21
       -
         bfg-repo-cleaner = callPackage ./bfg-repo-cleaner { };

     

       22
       22
       -
       

     

       23
       23
       -
         bitbucket-server-cli = callPackage ./bitbucket-server-cli { };

     

       24
       24
       -
       

     

       25
       25
       -
         bump2version = pkgs.python37Packages.callPackage ./bump2version { };

     

       26
       26
       -
       

     

       27
       27
       -
         darcs-to-git = callPackage ./darcs-to-git { };

     

       28
       28
       -
       

     

       29
       29
       -
         delta = callPackage ./delta {

     

       30
       30
       -
           inherit (darwin.apple_sdk.frameworks) Security;

     

       31
       31
       -
         };

     

       32
       32
       -
       

     

       33
       33
       -
         diff-so-fancy = callPackage ./diff-so-fancy { };

     

       34
       34
       -
       

     

       35
       35
       -
         gh = callPackage ./gh { };

     

       36
       36
       -
       

     

       37
       37
       -
         ghorg = callPackage ./ghorg { };

     

       38
       38
       -
       

     

       39
       39
       -
         ghq = callPackage ./ghq { };

     

       40
       40
       -
       

     

       41
       41
       -
         ghr = callPackage ./ghr { };

     

       42
       42
       -
       

     

       43
       43
       -
         git = appendToName "minimal" gitBase;

     

       44
       44
       -
       

     

       45
       45
       -
         git-absorb = callPackage ./git-absorb {

     

       46
       46
       -
           inherit (darwin.apple_sdk.frameworks) Security;

     

       47
       47
       -
         };

     

       48
       48
       -
       

     

       49
       49
       -
         git-annex = pkgs.haskellPackages.git-annex;

     

       50
       50
       -
       

     

       51
       51
       -
         git-annex-metadata-gui = libsForQt5.callPackage ./git-annex-metadata-gui {

     

       52
       52
       -
           inherit (python3Packages) buildPythonApplication pyqt5 git-annex-adapter;

     

       53
       53
       -
         };

     

       54
       54
       -
       

     

       55
       55
       -
         git-annex-remote-b2 = callPackage ./git-annex-remote-b2 { };

     

       56
       56
       -
       

     

       57
       57
       -
         git-annex-remote-dbx = callPackage ./git-annex-remote-dbx {

     

       58
       58
       -
           inherit (python3Packages)

     

       59
       59
       -
           buildPythonApplication

     

       60
       60
       -
           fetchPypi

     

       61
       61
       -
           dropbox

     

       62
       62
       -
           annexremote

     

       63
       63
       -
           humanfriendly;

     

       64
       64
       -
         };

     

       65
       65
       -
       

     

       66
       66
       -
         git-annex-remote-rclone = callPackage ./git-annex-remote-rclone { };

     

       67
       67
       -
       

     

       68
       68
       -
         git-annex-utils = callPackage ./git-annex-utils { };

     

       69
       69
       -
       

     

       70
       70
       -
         git-brunch = pkgs.haskellPackages.git-brunch;

     

       71
       71
       -
       

     

       72
       72
       -
         git-appraise = callPackage ./git-appraise {};

     

       73
       73
       -
       

     

       74
       74
       -
         git-bug = callPackage ./git-bug { };

     

       75
       75
       -
       

     

       76
       76
       -
         # support for bugzilla

     

       77
       77
       -
         git-bz = callPackage ./git-bz { };

     

       78
       78
       -
       

     

       79
       79
       -
         git-chglog = callPackage ./git-chglog { };

     

       80
       80
       -
       

     

       81
       81
       -
         git-cinnabar = callPackage ./git-cinnabar { };

     

       82
       82
       -
       

     

       83
       83
       -
         git-codeowners = callPackage ./git-codeowners { };

     

       84
       84
       -
       

     

       85
       85
       -
         git-codereview = callPackage ./git-codereview { };

     

       86
       86
       -
       

     

       87
       87
       -
         git-cola = callPackage ./git-cola { };

     

       88
       88
       -
       

     

       89
       89
       -
         git-crypt = callPackage ./git-crypt { };

     

       90
       90
       -
       

     

       91
       91
       -
         git-delete-merged-branches = callPackage ./git-delete-merged-branches { };

     

       92
       92
       -
       

     

       93
       93
       -
         git-dit = callPackage ./git-dit {

     

       94
       94
       -
           inherit (darwin.apple_sdk.frameworks) CoreFoundation Security;

     

       95
       95
       -
         };

     

       96
       96
       -
       

     

       97
       97
       -
         git-doc = lib.addMetaAttrs {

     

       98
       98
       -
           description = "Additional documentation for Git";

     

       99
       99
       -
           longDescription = ''

     

       100
       100
       -
             This package contains additional documentation (HTML and text files) that

     

       101
       101
       -
             is referenced in the man pages of Git.

     

       102
       102
       -
           '';

     

       103
       103
       -
         } gitFull.doc;

     

       104
       104
       -
       

     

       105
       105
       -
         git-extras = callPackage ./git-extras { };

     

       106
       106
       -
       

     

       107
       107
       -
         git-fame = callPackage ./git-fame {};

     

       108
       108
       -
       

     

       109
       109
       -
         git-fast-export = callPackage ./fast-export { mercurial = mercurial_4; };

     

       110
       110
       -
       

     

       111
       111
       -
         git-filter-repo = callPackage ./git-filter-repo {

     

       112
       112
       -
           pythonPackages = python3Packages;

     

       113
       113
       -
         };

     

       114
       114
       -
       

     

       115
       115
       -
         git-gone = callPackage ./git-gone {

     

       116
       116
       -
           inherit (darwin.apple_sdk.frameworks) Security;

     

       117
       117
       -
         };

     

       118
       118
       -
       

     

       119
       119
       -
         git-hub = callPackage ./git-hub { };

     

       120
       120
       -
       

     

       121
       121
       -
         git-ignore = callPackage ./git-ignore { };

     

       122
       122
       -
       

     

       123
       123
       -
         git-imerge = python3Packages.callPackage ./git-imerge { };

     

       124
       124
       -
       

     

       125
       125
       -
         git-interactive-rebase-tool = callPackage ./git-interactive-rebase-tool {

     

       126
       126
       -
           inherit (darwin.apple_sdk.frameworks) Security;

     

       127
       127
       -
         };

     

       128
       128
       -
       

     

       129
       129
       -
         git-machete = python3Packages.callPackage ./git-machete { };

     

       130
       130
       -
       

     

       131
       131
       -
         git-my = callPackage ./git-my { };

     

       132
       132
       -
       

     

       133
       133
       -
         git-octopus = callPackage ./git-octopus { };

     

       134
       134
       -
       

     

       135
       135
       -
         git-open = callPackage ./git-open { };

     

       136
       136
       -
       

     

       137
       137
       -
         git-radar = callPackage ./git-radar { };

     

       138
       138
       -
       

     

       139
       139
       -
         git-recent = callPackage ./git-recent {

     

       140
       140
       -
           util-linux = if stdenv.isLinux then util-linuxMinimal else util-linux;

     

       141
       141
       -
         };

     

       142
       142
       -
       

     

       143
       143
       -
         git-remote-codecommit = python3Packages.callPackage ./git-remote-codecommit { };

     

       144
       144
       -
       

     

       145
       145
       -
         git-remote-gcrypt = callPackage ./git-remote-gcrypt { };

     

       146
       146
       -
       

     

       147
       147
       -
         git-remote-hg = callPackage ./git-remote-hg { };

     

       148
       148
       -
       

     

       149
       149
       -
         git-reparent = callPackage ./git-reparent { };

     

       150
       150
       -
       

     

       151
       151
       -
         git-secret = callPackage ./git-secret { };

     

       152
       152
       -
       

     

       153
       153
       -
         git-secrets = callPackage ./git-secrets { };

     

       154
       154
       -
       

     

       155
       155
       -
         git-standup = callPackage ./git-standup { };

     

       156
       156
       -
       

     

       157
       157
       -
         git-stree = callPackage ./git-stree { };

     

       158
       158
       -
       

     

       159
       159
       -
         git-subrepo = callPackage ./git-subrepo { };

     

       160
       160
       -
       

     

       161
       161
       -
         git-subset = callPackage ./git-subset {

     

       162
       162
       -
           inherit (darwin.apple_sdk.frameworks) Security;

     

       163
       163
       -
         };

     

       164
       164
       -
       

     

       165
       165
       -
         git-subtrac = callPackage ./git-subtrac { };

     

       166
       166
       -
       

     

       167
       167
       -
         git-sync = callPackage ./git-sync { };

     

       168
       168
       -
       

     

       169
       169
       -
         git-test = callPackage ./git-test { };

     

       170
       170
       -
       

     

       171
       171
       -
         git-trim = callPackage ./git-trim {

     

       172
       172
       -
           inherit (darwin.apple_sdk.frameworks) Security;

     

       173
       173
       -
         };

     

       174
       174
       -
       

     

       175
       175
       -
         git-when-merged = callPackage ./git-when-merged { };

     

       176
       176
       -
       

     

       177
       177
       -
         git-workspace = callPackage ./git-workspace {

     

       178
       178
       -
           inherit (darwin.apple_sdk.frameworks) Security;

     

       179
       179
       -
         };

     

       180
       180
       -
       

     

       181
       181
       -
         git2cl = callPackage ./git2cl { };

     

       182
       182
       -
       

     

       183
       183
       -
         # The full-featured Git.

     

       184
       184
       -
         gitFull = gitBase.override {

     

       185
       185
       -
           svnSupport = true;

     

       186
       186
       -
           guiSupport = true;

     

       187
       187
       -
           sendEmailSupport = true;

     

       188
       188
       -
           withLibsecret = !stdenv.isDarwin;

     

       189
       189
       -
         };

     

       190
       190
       -
       

     

       191
       191
       -
         # Git with SVN support, but without GUI.

     

       192
       192
       -
         gitSVN = lowPrio (appendToName "with-svn" (gitBase.override {

     

       193
       193
       -
           svnSupport = true;

     

       194
       194
       -
         }));

     

       195
       195
       -
       

     

       196
       196
       -
         gita = python3Packages.callPackage ./gita {};

     

       197
       197
       -
       

     

       198
       198
       -
         gitbatch = callPackage ./gitbatch { };

     

       199
       199
       -
       

     

       200
       200
       -
         gitflow = callPackage ./gitflow { };

     

       201
       201
       -
       

     

       202
       202
       -
         gitin = callPackage ./gitin { };

     

       203
       203
       -
       

     

       204
       204
       -
         gitstatus = callPackage ./gitstatus { };

     

       205
       205
       -
       

     

       206
       206
       -
         gitui = callPackage ./gitui {

     

       207
       207
       -
           inherit (darwin.apple_sdk.frameworks) Security AppKit;

     

       208
       208
       -
           inherit (pkgs) openssl perl;

     

       209
       209
       -
         };

     

       210
       210
       -
       

     

       211
       211
       -
         glab = callPackage ./glab { };

     

       212
       212
       -
       

     

       213
       213
       -
         grv = callPackage ./grv { };

     

       214
       214
       -
       

     

       215
       215
       -
         hub = callPackage ./hub { };

     

       216
       216
       -
       

     

       217
       217
       -
         lab = callPackage ./lab { };

     

       218
       218
       -
       

     

       219
       219
       -
         lefthook = callPackage ./lefthook {

     

       220
       220
       -
           # Please use empty attrset once upstream bugs have been fixed

     

       221
       221
       -
           # https://github.com/Arkweid/lefthook/issues/151

     

       222
       222
       -
           buildGoModule = buildGo114Module;

     

       223
       223
       -
         };

     

       224
       224
       -
       

     

       225
       225
       -
         legit = callPackage ./legit { };

     

       226
       226
       -
       

     

       227
       227
       -
         pass-git-helper = python3Packages.callPackage ./pass-git-helper { };

     

       228
       228
       -
       

     

       229
       229
       -
         pre-commit = pkgs.python3Packages.toPythonApplication pkgs.python3Packages.pre-commit;

     

       230
       230
       -
       

     

       231
       231
       -
         qgit = qt5.callPackage ./qgit { };

     

       232
       232
       -
       

     

       233
       233
       -
         rs-git-fsmonitor = callPackage ./rs-git-fsmonitor { };

     

       234
       234
       -
       

     

       235
       235
       -
         scmpuff = callPackage ./scmpuff { };

     

       236
       236
       -
       

     

       237
       237
       -
         stgit = callPackage ./stgit { };

     

       238
       238
       -
       

     

       239
       239
       -
         subgit = callPackage ./subgit { };

     

       240
       240
       -
       

     

       241
       241
       -
         svn-all-fast-export = libsForQt5.callPackage ./svn-all-fast-export { };

     

       242
       242
       -
       

     

       243
       243
       -
         svn2git = callPackage ./svn2git {

     

       244
       244
       -
           git = gitSVN;

     

       245
       245
       -
         };

     

       246
       246
       -
       

     

       247
       247
       -
         thicket = callPackage ./thicket { };

     

       248
       248
       -
       

     

       249
       249
       -
         tig = callPackage ./tig { };

     

       250
       250
       -
       

     

       251
       251
       -
         top-git = callPackage ./topgit { };

     

       252
       252
       -
       

     

       253
       253
       -
         transcrypt = callPackage ./transcrypt { };

     

       254
       254
       -
       

     

       255
       255
       -
         git-vanity-hash = callPackage ./git-vanity-hash { };

     

       256
       256
       -
       

     

       257
       257
       -
         ydiff = pkgs.python3.pkgs.toPythonApplication pkgs.python3.pkgs.ydiff;

     

       258
       258
       -
       

     

       259
       259
       -
       } // lib.optionalAttrs (config.allowAliases or true) (with self; {

     

       260
       260
       -
         # aliases

     

       261
       261
       -
         darcsToGit = darcs-to-git;

     

       262
       262
       -
         gitAnnex = git-annex;

     

       263
       263
       -
         gitBrunch = git-brunch;

     

       264
       264
       -
         gitFastExport = git-fast-export;

     

       265
       265
       -
         gitRemoteGcrypt = git-remote-gcrypt;

     

       266
       266
       -
         svn_all_fast_export = svn-all-fast-export;

     

       267
       267
       -
         topGit = top-git;

     

       268
       268
       -
       });

     

       269
       269
       -
       in

     

       270
       270
       -
         self

+1 -1

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

···

       7
       7
        
       

     

       8
       8
        
         gemdir = ./.;

     

       9
       9
        
       

     

       10
       10
       -
         passthru.updateScript = bundlerUpdateScript "gitAndTools.git-fame";

     

       10
       10
       +
         passthru.updateScript = bundlerUpdateScript "git-fame";

     

       11
       11
        
       

     

       12
       12
        
         meta = with lib; {

     

       13
       13
        
           description = ''

+3 -3

pkgs/development/tools/misc/hydra/common.nix

···

       1
       1
        
       { stdenv, nix, perlPackages, buildEnv, fetchFromGitHub

     

       2
       2
        
       , makeWrapper, autoconf, automake, libtool, unzip, pkgconfig, sqlite, libpqxx

     

       3
       3
       -
       , gitAndTools, mercurial, darcs, subversion, breezy, openssl, bzip2, libxslt

     

       3
       3
       +
       , top-git, mercurial, darcs, subversion, breezy, openssl, bzip2, libxslt

     

       4
       4
        
       , guile, perl, postgresql, nukeReferences, git, boehmgc, nlohmann_json

     

       5
       5
        
       , docbook_xsl, openssh, gnused, coreutils, findutils, gzip, lzma, gnutar

     

       6
       6
        
       , rpm, dpkg, cdrkit, pixz, lib, boost, autoreconfHook, src ? null, version ? null

     
···

       80
       80
        
       

     

       81
       81
        
         buildInputs =

     

       82
       82
        
           [ makeWrapper autoconf automake libtool unzip nukeReferences sqlite libpqxx

     

       83
       83
       -
             gitAndTools.top-git mercurial /*darcs*/ subversion breezy openssl bzip2 libxslt

     

       83
       83
       +
             top-git mercurial /*darcs*/ subversion breezy openssl bzip2 libxslt

     

       84
       84
        
             perlDeps perl nix

     

       85
       85
        
             postgresql # for running the tests

     

       86
       86
        
             nlohmann_json

     
···

       89
       89
        
       

     

       90
       90
        
         hydraPath = lib.makeBinPath (

     

       91
       91
        
           [ sqlite subversion openssh nix coreutils findutils pixz

     

       92
       92
       -
             gzip bzip2 lzma gnutar unzip git gitAndTools.top-git mercurial /*darcs*/ gnused breezy

     

       92
       92
       +
             gzip bzip2 lzma gnutar unzip git top-git mercurial /*darcs*/ gnused breezy

     

       93
       93
        
           ] ++ lib.optionals stdenv.isLinux [ rpm dpkg cdrkit ] );

     

       94
       94
        
       

     

       95
       95
        
         nativeBuildInputs = [ autoreconfHook pkgconfig ];

+1 -1

pkgs/shells/zsh/zsh-powerlevel10k/default.nix

···

       6
       6
        
       let

     

       7
       7
        
         # match gitstatus version with given `gitstatus_version`:

     

       8
       8
        
         # https://github.com/romkatv/powerlevel10k/blob/master/gitstatus/build.info

     

       9
       9
       -
         gitstatus = pkgs.gitAndTools.gitstatus.overrideAttrs (oldAtttrs: rec {

     

       9
       9
       +
         gitstatus = pkgs.gitstatus.overrideAttrs (oldAtttrs: rec {

     

       10
       10
        
           version = "1.3.1";

     

       11
       11
        
       

     

       12
       12
        
           src = fetchFromGitHub {

+2 -2

pkgs/tools/misc/bat-extras/default.nix

···

       13
       13
        
       , withEntr ? entr != null, entr ? null

     

       14
       14
        
       # batdiff

     

       15
       15
        
       , gitMinimal

     

       16
       16
       -
       , withDelta ? gitAndTools?delta, gitAndTools ? null

     

       16
       16
       +
       , withDelta ? delta != null, delta ? null

     

       17
       17
        
       }:

     

       18
       18
        
       

     

       19
       19
        
       let

     
···

       133
       133
        
           stdenv.lib.optional cond dep;

     

       134
       134
        
       in

     

       135
       135
        
       {

     

       136
       136
       -
         batdiff = script "batdiff" ([ less coreutils gitMinimal ] ++ optionalDep withDelta gitAndTools.delta);

     

       136
       136
       +
         batdiff = script "batdiff" ([ less coreutils gitMinimal ] ++ optionalDep withDelta delta);

     

       137
       137
        
         batgrep = script "batgrep" [ less coreutils ripgrep ];

     

       138
       138
        
         batman = script "batman" [];

     

       139
       139
        
         batwatch = script "batwatch" ([ less coreutils ] ++ optionalDep withEntr entr);

+9 -1

pkgs/top-level/aliases.nix

···

       194
       194
        
         gdb-multitarget = gdb; # added 2017-11-13

     

       195
       195
        
         gdk_pixbuf = gdk-pixbuf; # added 2019-05-22

     

       196
       196
        
         gettextWithExpat = gettext; # 2016-02-19

     

       197
       197
       -
         git-hub = gitAndTools.git-hub; # added 2016-04-29

     

       197
       197
       +
         gitAndTools = self // { # added 2021-01-14

     

       198
       198
       +
           darcsToGit = darcs-to-git;

     

       199
       199
       +
           gitAnnex = git-annex;

     

       200
       200
       +
           gitBrunch = git-brunch;

     

       201
       201
       +
           gitFastExport = git-fast-export;

     

       202
       202
       +
           gitRemoteGcrypt = git-remote-gcrypt;

     

       203
       203
       +
           svn_all_fast_export = svn-all-fast-export;

     

       204
       204
       +
           topGit = top-git;

     

       205
       205
       +
         };

     

       198
       206
        
         glib_networking = glib-networking; # added 2018-02-25

     

       199
       207
        
         gmailieer = lieer; # added 2020-04-19

     

       200
       208
        
         gnome-mpv = celluloid; # added 2019-08-22

+243 -11

pkgs/top-level/all-packages.nix

···

       1317
       1317
        
       

     

       1318
       1318
        
         pass = callPackage ../tools/security/pass { };

     

       1319
       1319
        
       

     

       1320
       1320
       +
         pass-git-helper = python3Packages.callPackage ../applications/version-management/git-and-tools/pass-git-helper { };

     

       1321
       1321
       +
       

     

       1320
       1322
        
         pass-nodmenu = callPackage ../tools/security/pass {

     

       1321
       1323
        
           dmenuSupport = false;

     

       1322
       1324
        
           pass = pass-nodmenu;

     
···

       1565
       1567
        
         birdtray = libsForQt5.callPackage ../applications/misc/birdtray { };

     

       1566
       1568
        
       

     

       1567
       1569
        
         bitbucket-cli = python2Packages.bitbucket-cli;

     

       1570
       1570
       +
       

     

       1571
       1571
       +
         bitbucket-server-cli = callPackage ../applications/version-management/git-and-tools/bitbucket-server-cli { };

     

       1568
       1572
        
       

     

       1569
       1573
        
         blink = libsForQt5.callPackage ../applications/networking/instant-messengers/blink { };

     

       1570
       1574
        
       

     
···

       2855
       2859
        
       

     

       2856
       2860
        
         bettercap = callPackage ../tools/security/bettercap { };

     

       2857
       2861
        
       

     

       2858
       2858
       -
         bfg-repo-cleaner = gitAndTools.bfg-repo-cleaner;

     

       2862
       2862
       +
         bfg-repo-cleaner = callPackage ../applications/version-management/git-and-tools/bfg-repo-cleaner { };

     

       2859
       2863
        
       

     

       2860
       2864
        
         bfs = callPackage ../tools/system/bfs { };

     

       2861
       2865
        
       

     
···

       2895
       2899
        
         bud = callPackage ../tools/networking/bud {

     

       2896
       2900
        
           inherit (pythonPackages) gyp;

     

       2897
       2901
        
         };

     

       2902
       2902
       +
       

     

       2903
       2903
       +
         bump2version = python37Packages.callPackage ../applications/version-management/git-and-tools/bump2version { };

     

       2898
       2904
        
       

     

       2899
       2905
        
         bumpver = callPackage ../applications/version-management/bumpver { };

     

       2900
       2906
        
       

     
···

       3382
       3388
        
       

     

       3383
       3389
        
         deer = callPackage ../shells/zsh/zsh-deer { };

     

       3384
       3390
        
       

     

       3391
       3391
       +
         delta = callPackage ../applications/version-management/git-and-tools/delta {

     

       3392
       3392
       +
           inherit (darwin.apple_sdk.frameworks) Security;

     

       3393
       3393
       +
         };

     

       3394
       3394
       +
       

     

       3385
       3395
        
         deno = callPackage ../development/web/deno {

     

       3386
       3396
        
           inherit (darwin.apple_sdk.frameworks) Security CoreServices;

     

       3387
       3397
        
         };

     
···

       3464
       3474
        
       

     

       3465
       3475
        
         diction = callPackage ../tools/text/diction { };

     

       3466
       3476
        
       

     

       3477
       3477
       +
         diff-so-fancy = callPackage ../applications/version-management/git-and-tools/diff-so-fancy { };

     

       3478
       3478
       +
       

     

       3467
       3479
        
         diffoscope = callPackage ../tools/misc/diffoscope {

     

       3468
       3480
        
           inherit (androidenv.androidPkgs_9_0) build-tools;

     

       3469
       3481
        
           jdk = jdk8;

     
···

       4300
       4312
        
       

     

       4301
       4313
        
         ggobi = callPackage ../tools/graphics/ggobi { };

     

       4302
       4314
        
       

     

       4315
       4315
       +
         gh = callPackage ../applications/version-management/git-and-tools/gh { };

     

       4316
       4316
       +
       

     

       4317
       4317
       +
         ghorg = callPackage ../applications/version-management/git-and-tools/ghorg { };

     

       4318
       4318
       +
       

     

       4319
       4319
       +
         ghq = callPackage ../applications/version-management/git-and-tools/ghq { };

     

       4320
       4320
       +
       

     

       4321
       4321
       +
         ghr = callPackage ../applications/version-management/git-and-tools/ghr { };

     

       4322
       4322
       +
       

     

       4303
       4323
        
         gibo = callPackage ../tools/misc/gibo { };

     

       4304
       4324
        
       

     

       4305
       4325
        
         gifsicle = callPackage ../tools/graphics/gifsicle { };

     

       4306
       4326
        
       

     

       4307
       4327
        
         gifski = callPackage ../tools/graphics/gifski { };

     

       4308
       4328
        
       

     

       4329
       4329
       +
         git-absorb = callPackage ../applications/version-management/git-and-tools/git-absorb {

     

       4330
       4330
       +
           inherit (darwin.apple_sdk.frameworks) Security;

     

       4331
       4331
       +
         };

     

       4332
       4332
       +
       

     

       4333
       4333
       +
         inherit (haskellPackages) git-annex;

     

       4334
       4334
       +
       

     

       4335
       4335
       +
         git-annex-metadata-gui = libsForQt5.callPackage ../applications/version-management/git-and-tools/git-annex-metadata-gui {

     

       4336
       4336
       +
           inherit (python3Packages) buildPythonApplication pyqt5 git-annex-adapter;

     

       4337
       4337
       +
         };

     

       4338
       4338
       +
       

     

       4339
       4339
       +
         git-annex-remote-b2 = callPackage ../applications/version-management/git-and-tools/git-annex-remote-b2 { };

     

       4340
       4340
       +
       

     

       4341
       4341
       +
         git-annex-remote-dbx = callPackage ../applications/version-management/git-and-tools/git-annex-remote-dbx {

     

       4342
       4342
       +
           inherit (python3Packages)

     

       4343
       4343
       +
           buildPythonApplication

     

       4344
       4344
       +
           fetchPypi

     

       4345
       4345
       +
           dropbox

     

       4346
       4346
       +
           annexremote

     

       4347
       4347
       +
           humanfriendly;

     

       4348
       4348
       +
         };

     

       4349
       4349
       +
       

     

       4350
       4350
       +
         git-annex-remote-rclone = callPackage ../applications/version-management/git-and-tools/git-annex-remote-rclone { };

     

       4351
       4351
       +
       

     

       4352
       4352
       +
         git-annex-utils = callPackage ../applications/version-management/git-and-tools/git-annex-utils { };

     

       4353
       4353
       +
       

     

       4354
       4354
       +
         git-appraise = callPackage ../applications/version-management/git-and-tools/git-appraise {};

     

       4355
       4355
       +
       

     

       4309
       4356
        
         git-backup = callPackage ../applications/version-management/git-backup {

     

       4310
       4357
        
           inherit (darwin.apple_sdk.frameworks) Security;

     

       4311
       4358
        
         };

     

       4312
       4359
        
       

     

       4313
       4360
        
         git-big-picture = callPackage ../applications/version-management/git-and-tools/git-big-picture { };

     

       4314
       4361
        
       

     

       4362
       4362
       +
         inherit (haskellPackages) git-brunch;

     

       4363
       4363
       +
       

     

       4364
       4364
       +
         git-bug = callPackage ../applications/version-management/git-and-tools/git-bug { };

     

       4365
       4365
       +
       

     

       4366
       4366
       +
         # support for bugzilla

     

       4367
       4367
       +
         git-bz = callPackage ../applications/version-management/git-and-tools/git-bz { };

     

       4368
       4368
       +
       

     

       4369
       4369
       +
         git-chglog = callPackage ../applications/version-management/git-and-tools/git-chglog { };

     

       4370
       4370
       +
       

     

       4371
       4371
       +
         git-cinnabar = callPackage ../applications/version-management/git-and-tools/git-cinnabar { };

     

       4372
       4372
       +
       

     

       4373
       4373
       +
         git-codeowners = callPackage ../applications/version-management/git-and-tools/git-codeowners { };

     

       4374
       4374
       +
       

     

       4375
       4375
       +
         git-codereview = callPackage ../applications/version-management/git-and-tools/git-codereview { };

     

       4376
       4376
       +
       

     

       4377
       4377
       +
         git-cola = callPackage ../applications/version-management/git-and-tools/git-cola { };

     

       4378
       4378
       +
       

     

       4315
       4379
        
         git-crecord = callPackage ../applications/version-management/git-crecord { };

     

       4316
       4380
        
       

     

       4381
       4381
       +
         git-crypt = callPackage ../applications/version-management/git-and-tools/git-crypt { };

     

       4382
       4382
       +
       

     

       4383
       4383
       +
         git-delete-merged-branches = callPackage ../applications/version-management/git-and-tools/git-delete-merged-branches { };

     

       4384
       4384
       +
       

     

       4385
       4385
       +
         git-dit = callPackage ../applications/version-management/git-and-tools/git-dit {

     

       4386
       4386
       +
           inherit (darwin.apple_sdk.frameworks) CoreFoundation Security;

     

       4387
       4387
       +
         };

     

       4388
       4388
       +
       

     

       4389
       4389
       +
         git-extras = callPackage ../applications/version-management/git-and-tools/git-extras { };

     

       4390
       4390
       +
       

     

       4391
       4391
       +
         git-fame = callPackage ../applications/version-management/git-and-tools/git-fame {};

     

       4392
       4392
       +
       

     

       4393
       4393
       +
         git-fast-export = callPackage ../applications/version-management/git-and-tools/fast-export { mercurial = mercurial_4; };

     

       4394
       4394
       +
       

     

       4395
       4395
       +
         git-filter-repo = callPackage ../applications/version-management/git-and-tools/git-filter-repo {

     

       4396
       4396
       +
           pythonPackages = python3Packages;

     

       4397
       4397
       +
         };

     

       4398
       4398
       +
       

     

       4399
       4399
       +
         git-gone = callPackage ../applications/version-management/git-and-tools/git-gone {

     

       4400
       4400
       +
           inherit (darwin.apple_sdk.frameworks) Security;

     

       4401
       4401
       +
         };

     

       4402
       4402
       +
       

     

       4403
       4403
       +
         git-hub = callPackage ../applications/version-management/git-and-tools/git-hub { };

     

       4404
       4404
       +
       

     

       4405
       4405
       +
         git-ignore = callPackage ../applications/version-management/git-and-tools/git-ignore { };

     

       4406
       4406
       +
       

     

       4407
       4407
       +
         git-imerge = python3Packages.callPackage ../applications/version-management/git-and-tools/git-imerge { };

     

       4408
       4408
       +
       

     

       4409
       4409
       +
         git-interactive-rebase-tool = callPackage ../applications/version-management/git-and-tools/git-interactive-rebase-tool {

     

       4410
       4410
       +
           inherit (darwin.apple_sdk.frameworks) Security;

     

       4411
       4411
       +
         };

     

       4412
       4412
       +
       

     

       4317
       4413
        
         git-lfs = lowPrio (callPackage ../applications/version-management/git-lfs { });

     

       4318
       4414
        
       

     

       4319
       4415
        
         git-lfs1 = callPackage ../applications/version-management/git-lfs/1.nix { };

     

       4320
       4416
        
       

     

       4321
       4417
        
         git-ftp = callPackage ../development/tools/git-ftp { };

     

       4322
       4418
        
       

     

       4419
       4419
       +
         git-machete = python3Packages.callPackage ../applications/version-management/git-and-tools/git-machete { };

     

       4420
       4420
       +
       

     

       4421
       4421
       +
         git-my = callPackage ../applications/version-management/git-and-tools/git-my { };

     

       4422
       4422
       +
       

     

       4423
       4423
       +
         git-octopus = callPackage ../applications/version-management/git-and-tools/git-octopus { };

     

       4424
       4424
       +
       

     

       4425
       4425
       +
         git-open = callPackage ../applications/version-management/git-and-tools/git-open { };

     

       4426
       4426
       +
       

     

       4427
       4427
       +
         git-radar = callPackage ../applications/version-management/git-and-tools/git-radar { };

     

       4428
       4428
       +
       

     

       4429
       4429
       +
         git-recent = callPackage ../applications/version-management/git-and-tools/git-recent {

     

       4430
       4430
       +
           util-linux = if stdenv.isLinux then util-linuxMinimal else util-linux;

     

       4431
       4431
       +
         };

     

       4432
       4432
       +
       

     

       4433
       4433
       +
         git-remote-codecommit = python3Packages.callPackage ../applications/version-management/git-and-tools/git-remote-codecommit { };

     

       4434
       4434
       +
       

     

       4435
       4435
       +
         git-remote-gcrypt = callPackage ../applications/version-management/git-and-tools/git-remote-gcrypt { };

     

       4436
       4436
       +
       

     

       4437
       4437
       +
         git-remote-hg = callPackage ../applications/version-management/git-and-tools/git-remote-hg { };

     

       4438
       4438
       +
       

     

       4439
       4439
       +
         git-reparent = callPackage ../applications/version-management/git-and-tools/git-reparent { };

     

       4440
       4440
       +
       

     

       4441
       4441
       +
         git-secret = callPackage ../applications/version-management/git-and-tools/git-secret { };

     

       4442
       4442
       +
       

     

       4443
       4443
       +
         git-secrets = callPackage ../applications/version-management/git-and-tools/git-secrets { };

     

       4444
       4444
       +
       

     

       4323
       4445
        
         git-series = callPackage ../development/tools/git-series { };

     

       4324
       4446
        
       

     

       4325
       4447
        
         git-sizer = callPackage ../applications/version-management/git-sizer { };

     

       4326
       4448
        
       

     

       4449
       4449
       +
         git-standup = callPackage ../applications/version-management/git-and-tools/git-standup { };

     

       4450
       4450
       +
       

     

       4451
       4451
       +
         git-stree = callPackage ../applications/version-management/git-and-tools/git-stree { };

     

       4452
       4452
       +
       

     

       4453
       4453
       +
         git-subrepo = callPackage ../applications/version-management/git-and-tools/git-subrepo { };

     

       4454
       4454
       +
       

     

       4455
       4455
       +
         git-subset = callPackage ../applications/version-management/git-and-tools/git-subset {

     

       4456
       4456
       +
           inherit (darwin.apple_sdk.frameworks) Security;

     

       4457
       4457
       +
         };

     

       4458
       4458
       +
       

     

       4459
       4459
       +
         git-subtrac = callPackage ../applications/version-management/git-and-tools/git-subtrac { };

     

       4460
       4460
       +
       

     

       4461
       4461
       +
         git-sync = callPackage ../applications/version-management/git-and-tools/git-sync { };

     

       4462
       4462
       +
       

     

       4463
       4463
       +
         git-test = callPackage ../applications/version-management/git-and-tools/git-test { };

     

       4464
       4464
       +
       

     

       4465
       4465
       +
         git-trim = callPackage ../applications/version-management/git-and-tools/git-trim {

     

       4466
       4466
       +
           inherit (darwin.apple_sdk.frameworks) Security;

     

       4467
       4467
       +
         };

     

       4468
       4468
       +
       

     

       4327
       4469
        
         git-up = callPackage ../applications/version-management/git-up {

     

       4328
       4470
        
           pythonPackages = python3Packages;

     

       4329
       4471
        
         };

     

       4330
       4472
        
       

     

       4473
       4473
       +
         git-vanity-hash = callPackage ../applications/version-management/git-and-tools/git-vanity-hash { };

     

       4474
       4474
       +
       

     

       4475
       4475
       +
         git-when-merged = callPackage ../applications/version-management/git-and-tools/git-when-merged { };

     

       4476
       4476
       +
       

     

       4477
       4477
       +
         git-workspace = callPackage ../applications/version-management/git-and-tools/git-workspace {

     

       4478
       4478
       +
           inherit (darwin.apple_sdk.frameworks) Security;

     

       4479
       4479
       +
         };

     

       4480
       4480
       +
       

     

       4481
       4481
       +
         git2cl = callPackage ../applications/version-management/git-and-tools/git2cl { };

     

       4482
       4482
       +
       

     

       4483
       4483
       +
         gita = python3Packages.callPackage ../applications/version-management/git-and-tools/gita { };

     

       4484
       4484
       +
       

     

       4485
       4485
       +
         gitbatch = callPackage ../applications/version-management/git-and-tools/gitbatch { };

     

       4486
       4486
       +
       

     

       4487
       4487
       +
         gitflow = callPackage ../applications/version-management/git-and-tools/gitflow { };

     

       4488
       4488
       +
       

     

       4331
       4489
        
         gitfs = callPackage ../tools/filesystems/gitfs { };

     

       4490
       4490
       +
       

     

       4491
       4491
       +
         gitin = callPackage ../applications/version-management/git-and-tools/gitin { };

     

       4332
       4492
        
       

     

       4333
       4493
        
         gitinspector = callPackage ../applications/version-management/gitinspector { };

     

       4334
       4494
        
       

     
···

       4357
       4517
        
         };

     

       4358
       4518
        
       

     

       4359
       4519
        
         gitstats = callPackage ../applications/version-management/gitstats { };

     

       4520
       4520
       +
       

     

       4521
       4521
       +
         gitstatus = callPackage ../applications/version-management/git-and-tools/gitstatus { };

     

       4522
       4522
       +
       

     

       4523
       4523
       +
         gitui = callPackage ../applications/version-management/git-and-tools/gitui {

     

       4524
       4524
       +
           inherit (darwin.apple_sdk.frameworks) Security AppKit;

     

       4525
       4525
       +
           inherit (pkgs) openssl perl;

     

       4526
       4526
       +
         };

     

       4360
       4527
        
       

     

       4361
       4528
        
         gogs = callPackage ../applications/version-management/gogs { };

     

       4362
       4529
        
       

     
···

       4366
       4533
        
       

     

       4367
       4534
        
         gl2ps = callPackage ../development/libraries/gl2ps { };

     

       4368
       4535
        
       

     

       4536
       4536
       +
         glab = callPackage ../applications/version-management/git-and-tools/glab { };

     

       4537
       4537
       +
       

     

       4369
       4538
        
         glusterfs = callPackage ../tools/filesystems/glusterfs { };

     

       4370
       4539
        
       

     

       4371
       4540
        
         glmark2 = callPackage ../tools/graphics/glmark2 { };

     
···

       4580
       4749
        
         grub = pkgsi686Linux.callPackage ../tools/misc/grub ({

     

       4581
       4750
        
           stdenv = overrideCC stdenv buildPackages.pkgsi686Linux.gcc6;

     

       4582
       4751
        
         } // (config.grub or {}));

     

       4752
       4752
       +
       

     

       4753
       4753
       +
         grv = callPackage ../applications/version-management/git-and-tools/grv { };

     

       4583
       4754
        
       

     

       4584
       4755
        
         trustedGrub = pkgsi686Linux.callPackage ../tools/misc/grub/trusted.nix { };

     

       4585
       4756
        
       

     
···

       4861
       5032
        
       

     

       4862
       5033
        
         httpx = callPackage ../tools/security/httpx { };

     

       4863
       5034
        
       

     

       5035
       5035
       +
         hub = callPackage ../applications/version-management/git-and-tools/hub { };

     

       5036
       5036
       +
       

     

       4864
       5037
        
         hubicfuse = callPackage ../tools/filesystems/hubicfuse { };

     

       4865
       5038
        
       

     

       4866
       5039
        
         humanfriendly = with python3Packages; toPythonApplication humanfriendly;

     
···

       5271
       5444
        
       

     

       5272
       5445
        
         k6 = callPackage ../development/tools/k6 { };

     

       5273
       5446
        
       

     

       5447
       5447
       +
         lab = callPackage ../applications/version-management/git-and-tools/lab { };

     

       5448
       5448
       +
       

     

       5274
       5449
        
         lalezar-fonts = callPackage ../data/fonts/lalezar-fonts { };

     

       5275
       5450
        
       

     

       5276
       5451
        
         ldc = callPackage ../development/compilers/ldc { };

     
···

       5279
       5454
        
       

     

       5280
       5455
        
         lbreakout2 = callPackage ../games/lbreakout2 { };

     

       5281
       5456
        
       

     

       5282
       5282
       -
         lefthook = gitAndTools.lefthook;

     

       5457
       5457
       +
         lefthook = callPackage ../applications/version-management/git-and-tools/lefthook {

     

       5458
       5458
       +
           # Please use empty attrset once upstream bugs have been fixed

     

       5459
       5459
       +
           # https://github.com/Arkweid/lefthook/issues/151

     

       5460
       5460
       +
           buildGoModule = buildGo114Module;

     

       5461
       5461
       +
         };

     

       5283
       5462
        
       

     

       5284
       5463
        
         lego = callPackage ../tools/admin/lego { };

     

       5285
       5464
        
       

     
···

       6870
       7049
        
       

     

       6871
       7050
        
         pptpd = callPackage ../tools/networking/pptpd {};

     

       6872
       7051
        
       

     

       6873
       6873
       -
         pre-commit = gitAndTools.pre-commit;

     

       7052
       7052
       +
         pre-commit = with python3Packages; toPythonApplication pre-commit;

     

       6874
       7053
        
       

     

       6875
       7054
        
         pretty-simple = callPackage ../development/tools/pretty-simple { };

     

       6876
       7055
        
       

     
···

       7011
       7190
        
         qastools = libsForQt5.callPackage ../tools/audio/qastools { };

     

       7012
       7191
        
       

     

       7013
       7192
        
         qdigidoc = libsForQt5.callPackage ../tools/security/qdigidoc { } ;

     

       7193
       7193
       +
       

     

       7194
       7194
       +
         qgit = qt5.callPackage ../applications/version-management/git-and-tools/qgit { };

     

       7014
       7195
        
       

     

       7015
       7196
        
         qgrep = callPackage ../tools/text/qgrep {

     

       7016
       7197
        
           inherit (darwin.apple_sdk.frameworks) CoreServices CoreFoundation;

     
···

       7223
       7404
        
         rq = callPackage ../development/tools/rq {

     

       7224
       7405
        
           inherit (darwin) libiconv;

     

       7225
       7406
        
         };

     

       7407
       7407
       +
       

     

       7408
       7408
       +
         rs-git-fsmonitor = callPackage ../applications/version-management/git-and-tools/rs-git-fsmonitor { };

     

       7226
       7409
        
       

     

       7227
       7410
        
         rsnapshot = callPackage ../tools/backup/rsnapshot { };

     

       7228
       7411
        
       

     
···

       7354
       7537
        
       

     

       7355
       7538
        
         scdoc = callPackage ../tools/typesetting/scdoc { };

     

       7356
       7539
        
       

     

       7540
       7540
       +
         scmpuff = callPackage ../applications/version-management/git-and-tools/scmpuff { };

     

       7541
       7541
       +
       

     

       7357
       7542
        
         scream-receivers = callPackage ../misc/scream-receivers {

     

       7358
       7543
        
           pulseSupport = config.pulseaudio or false;

     

       7359
       7544
        
         };

     
···

       7696
       7881
        
       

     

       7697
       7882
        
         sstp = callPackage ../tools/networking/sstp {};

     

       7698
       7883
        
       

     

       7884
       7884
       +
         stgit = callPackage ../applications/version-management/git-and-tools/stgit { };

     

       7885
       7885
       +
       

     

       7699
       7886
        
         strip-nondeterminism = perlPackages.strip-nondeterminism;

     

       7700
       7887
        
       

     

       7701
       7888
        
         structure-synth = callPackage ../tools/graphics/structure-synth { };

     
···

       7703
       7890
        
         su-exec = callPackage ../tools/security/su-exec {};

     

       7704
       7891
        
       

     

       7705
       7892
        
         subberthehut = callPackage ../tools/misc/subberthehut { };

     

       7893
       7893
       +
       

     

       7894
       7894
       +
         subgit = callPackage ../applications/version-management/git-and-tools/subgit { };

     

       7706
       7895
        
       

     

       7707
       7896
        
         subsurface = libsForQt514.callPackage ../applications/misc/subsurface { };

     

       7708
       7897
        
       

     
···

       7793
       7982
        
       

     

       7794
       7983
        
         swec = callPackage ../tools/networking/swec { };

     

       7795
       7984
        
       

     

       7985
       7985
       +
         svn2git = callPackage ../applications/version-management/git-and-tools/svn2git {

     

       7986
       7986
       +
           git = gitSVN;

     

       7987
       7987
       +
         };

     

       7988
       7988
       +
       

     

       7796
       7989
        
         svnfs = callPackage ../tools/filesystems/svnfs { };

     

       7990
       7990
       +
       

     

       7991
       7991
       +
         svn-all-fast-export = libsForQt5.callPackage ../applications/version-management/git-and-tools/svn-all-fast-export { };

     

       7797
       7992
        
       

     

       7798
       7993
        
         svtplay-dl = callPackage ../tools/misc/svtplay-dl { };

     

       7799
       7994
        
       

     
···

       7926
       8121
        
       

     

       7927
       8122
        
         thefuck = python3Packages.callPackage ../tools/misc/thefuck { };

     

       7928
       8123
        
       

     

       8124
       8124
       +
         thicket = callPackage ../applications/version-management/git-and-tools/thicket { };

     

       8125
       8125
       +
       

     

       7929
       8126
        
         thin-provisioning-tools = callPackage ../tools/misc/thin-provisioning-tools {  };

     

       7930
       8127
        
       

     

       7931
       8128
        
         thinkpad-scripts = python3.pkgs.callPackage ../tools/misc/thinkpad-scripts { };

     
···

       8012
       8209
        
           inherit (darwin.apple_sdk.frameworks) Foundation;

     

       8013
       8210
        
         };

     

       8014
       8211
        
       

     

       8212
       8212
       +
         top-git = callPackage ../applications/version-management/git-and-tools/topgit { };

     

       8213
       8213
       +
       

     

       8015
       8214
        
         tor = callPackage ../tools/security/tor { };

     

       8016
       8215
        
       

     

       8017
       8216
        
         tor-arm = callPackage ../tools/security/tor/tor-arm.nix { };

     
···

       8065
       8264
        
         tracefilegen = callPackage ../development/tools/analysis/garcosim/tracefilegen { };

     

       8066
       8265
        
       

     

       8067
       8266
        
         tracefilesim = callPackage ../development/tools/analysis/garcosim/tracefilesim { };

     

       8267
       8267
       +
       

     

       8268
       8268
       +
         transcrypt = callPackage ../applications/version-management/git-and-tools/transcrypt { };

     

       8068
       8269
        
       

     

       8069
       8270
        
         transifex-client = python3.pkgs.callPackage ../tools/text/transifex-client { };

     

       8070
       8271
        
       

     
···

       21248
       21449
        
           configureFlags = (lib.remove "-flibrary" drv.configureFlags or []) ++ ["-f-library"];

     

       21249
       21450
        
         });

     

       21250
       21451
        
       

     

       21452
       21452
       +
         darcs-to-git = callPackage ../applications/version-management/git-and-tools/darcs-to-git { };

     

       21453
       21453
       +
       

     

       21251
       21454
        
         darktable = callPackage ../applications/graphics/darktable {

     

       21252
       21455
        
           lua = lua5_3;

     

       21253
       21456
        
           pugixml = pugixml.override { shared = true; };

     
···

       22043
       22246
        
           gtk = gtk3;

     

       22044
       22247
        
         };

     

       22045
       22248
        
       

     

       22046
       22046
       -
         gitAndTools = recurseIntoAttrs (callPackage ../applications/version-management/git-and-tools {});

     

       22249
       22249
       +
         git = callPackage ../applications/version-management/git-and-tools/git {

     

       22250
       22250
       +
           svnSupport = false;         # for git-svn support

     

       22251
       22251
       +
           guiSupport = false;         # requires tcl/tk

     

       22252
       22252
       +
           sendEmailSupport = false;   # requires plenty of perl libraries

     

       22253
       22253
       +
           perlLibs = [perlPackages.LWP perlPackages.URI perlPackages.TermReadKey];

     

       22254
       22254
       +
           smtpPerlLibs = [

     

       22255
       22255
       +
             perlPackages.libnet perlPackages.NetSMTPSSL

     

       22256
       22256
       +
             perlPackages.IOSocketSSL perlPackages.NetSSLeay

     

       22257
       22257
       +
             perlPackages.AuthenSASL perlPackages.DigestHMAC

     

       22258
       22258
       +
           ];

     

       22259
       22259
       +
         };

     

       22260
       22260
       +
       

     

       22261
       22261
       +
         # The full-featured Git.

     

       22262
       22262
       +
         gitFull = git.override {

     

       22263
       22263
       +
           svnSupport = true;

     

       22264
       22264
       +
           guiSupport = true;

     

       22265
       22265
       +
           sendEmailSupport = true;

     

       22266
       22266
       +
           withLibsecret = !stdenv.isDarwin;

     

       22267
       22267
       +
         };

     

       22268
       22268
       +
       

     

       22269
       22269
       +
         # Git with SVN support, but without GUI.

     

       22270
       22270
       +
         gitSVN = lowPrio (appendToName "with-svn" (git.override {

     

       22271
       22271
       +
           svnSupport = true;

     

       22272
       22272
       +
         }));

     

       22047
       22273
        
       

     

       22048
       22048
       -
         inherit (gitAndTools) git gitFull gitSVN git-cola git-doc svn2git git-radar git-secret git-secrets transcrypt git-crypt ghq;

     

       22274
       22274
       +
         git-doc = lib.addMetaAttrs {

     

       22275
       22275
       +
           description = "Additional documentation for Git";

     

       22276
       22276
       +
           longDescription = ''

     

       22277
       22277
       +
             This package contains additional documentation (HTML and text files) that

     

       22278
       22278
       +
             is referenced in the man pages of Git.

     

       22279
       22279
       +
           '';

     

       22280
       22280
       +
         } gitFull.doc;

     

       22049
       22281
        
       

     

       22050
       22050
       -
         gitMinimal = git.override {

     

       22282
       22282
       +
         gitMinimal = appendToName "minimal" (git.override {

     

       22051
       22283
        
           withManual = false;

     

       22052
       22284
        
           pythonSupport = false;

     

       22053
       22285
        
           withpcre2 = false;

     

       22054
       22054
       -
         };

     

       22286
       22286
       +
         });

     

       22055
       22287
        
       

     

       22056
       22288
        
         gitRepo = callPackage ../applications/version-management/git-repo { };

     

       22057
       22289
        
       

     
···

       22059
       22291
        
       

     

       22060
       22292
        
         git-review = python3Packages.callPackage ../applications/version-management/git-review { };

     

       22061
       22293
        
       

     

       22062
       22062
       -
         github-cli = gitAndTools.gh;

     

       22294
       22294
       +
         github-cli = gh;

     

       22063
       22295
        
       

     

       22064
       22296
        
         gitolite = callPackage ../applications/version-management/gitolite { };

     

       22065
       22297
        
       

     
···

       22889
       23121
        
       

     

       22890
       23122
        
         lemonbar-xft = callPackage ../applications/window-managers/lemonbar/xft.nix { };

     

       22891
       23123
        
       

     

       22892
       22892
       -
         legit = gitAndTools.legit;

     

       23124
       23124
       +
         legit = callPackage ../applications/version-management/git-and-tools/legit { };

     

       22893
       23125
        
       

     

       22894
       23126
        
         lens = callPackage ../applications/networking/cluster/lens { };

     

       22895
       23127
        
       

     
···

       24843
       25075
        
       

     

       24844
       25076
        
         tickrs = callPackage ../applications/misc/tickrs { };

     

       24845
       25077
        
       

     

       24846
       24846
       -
         tig = gitAndTools.tig;

     

       25078
       25078
       +
         tig = callPackage ../applications/version-management/git-and-tools/tig { };

     

       24847
       25079
        
       

     

       24848
       25080
        
         timbreid = callPackage ../applications/audio/pd-plugins/timbreid {

     

       24849
       25081
        
           fftw = fftwSinglePrec;

     
···

       25747
       25979
        
       

     

       25748
       25980
        
         yate = callPackage ../applications/misc/yate { };

     

       25749
       25981
        
       

     

       25750
       25750
       -
         inherit (gitAndTools) ydiff;

     

       25982
       25982
       +
         ydiff = with python3.pkgs; toPythonApplication ydiff;

     

       25751
       25983
        
       

     

       25752
       25984
        
         yed = callPackage ../applications/graphics/yed {};

     

       25753
       25985

+1 -1

pkgs/top-level/python-packages.nix

···

       2491
       2491
        
         gipc = callPackage ../development/python-modules/gipc { };

     

       2492
       2492
        
       

     

       2493
       2493
        
         git-annex-adapter =

     

       2494
       2494
       -
           callPackage ../development/python-modules/git-annex-adapter { inherit (pkgs.gitAndTools) git-annex; };

     

       2494
       2494
       +
           callPackage ../development/python-modules/git-annex-adapter { };

     

       2495
       2495
        
       

     

       2496
       2496
        
         gitdb2 = throw "gitdb2 has been deprecated, use gitdb instead."; # added 2020-03-14

     

       2497
       2497