Commit graph

1745 commits

Author SHA1 Message Date
R. RyanTM 4e58963af8 git-ignore: 1.0.0 -> 1.1.1 2021-01-18 21:24:20 +00:00
Sebastian Pipping b706315dfc git-big-picture: 0.10.1 -> 1.0.0 (fixes CVE-2021-3028)
Also propagates move of repository from https://github.com/esc/git-big-picture
to https://github.com/git-big-picture/git-big-picture .

Upstream change log at
https://github.com/git-big-picture/git-big-picture#changelog
2021-01-17 23:58:42 +01:00
Anderson Torres f0e757d98a
Merge pull request #108513 from languitar/patch-1
pass-git-helper: 1.1.0 -> 1.1.1
2021-01-16 16:27:01 -03:00
Ben Siraphob badf51221d treewide: stdenv.lib -> lib 2021-01-16 17:58:11 +07:00
Johannes Wienke 15bbb7deec pass-git-helper: 1.1.0 -> 1.1.1
Bump package and add new test requirements.
2021-01-15 12:15:27 +01:00
Alyssa Ross 3893d6c6d7 gitAndTools: move everything to the top level
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.
2021-01-14 21:27:48 +00:00
yoctocell 0714396196
gitAndTools.gita: 0.10.10 -> 0.11.9 2021-01-12 19:59:55 +01:00
Profpatsch 4a7f99d55d treewide: with stdenv.lib; in meta -> with lib;
Part of: https://github.com/NixOS/nixpkgs/issues/108938

meta = with stdenv.lib;

is a widely used pattern. We want to slowly remove
the `stdenv.lib` indirection and encourage people
to use `lib` directly. Thus let’s start with the meta
field.

This used a rewriting script to mostly automatically
replace all occurances of this pattern, and add the
`lib` argument to the package header if it doesn’t
exist yet.

The script in its current form is available at
https://cs.tvl.fyi/depot@2f807d7f141068d2d60676a89213eaa5353ca6e0/-/blob/users/Profpatsch/nixpkgs-rewriter/default.nix
2021-01-11 10:38:22 +01:00
Jan Tojnar f19eb635b4
Merge branch 'master' into staging-next
b04fc593e7 seems to have accidentally changed mkDerivation function for dfilemanager and solarus-quest-editor so I have reverted that here.
2021-01-07 13:04:31 +01:00
Sandro fbe1d82c01
Merge pull request #108656 from xwvvvvwx/radicle-upstream-0.1.6
radicle-upstream: 0.1.5 -> 0.1.6
2021-01-07 12:32:05 +01:00
David Terry c75a976845
radicle-upstream: 0.1.5 -> 0.1.6 2021-01-07 11:48:50 +01:00
Mario Rodas b3f079e40c
Merge pull request #107012 from DamienCassou/DamienCassou/git-when-merged
gitAndTools.git-when-merged: init at 1.2.0
2021-01-06 17:30:53 -05:00
Mario Rodas 9cd62d08d5 gitAndTools.lab: 0.17.2 -> 0.18.0
https://github.com/zaquestion/lab/releases/tag/v0.18.0
2021-01-05 22:25:32 -05:00
zowoq e791ab1241 gitAndTools.delta: 0.5.0 -> 0.5.1
https://github.com/dandavison/delta/releases/tag/0.5.1
2021-01-06 05:55:10 +10:00
zowoq fb2311d430 Merge staging-next into staging 2021-01-03 16:33:28 +10:00
Tim Steinbach 4c9414d31c hub: Add test 2021-01-02 15:43:01 -05:00
Tim Steinbach 0576111e8a hub: Replace git references
Hub fetches git from the environment by default.
This can lead to hub installations without git available, which makes little sense.
The change replaces the references with fully-qualified calls to git
2021-01-02 15:43:01 -05:00
Maximilian Bosch e7d1be840c
treewide: remove maintainership of ma27 from a few packages
Those are packages I don't use anymore for a longer time and I therefore
don't think that listing me as maintainer is a good idea. If those
should be removed now, I'd be fine with that.

SuperSandro2000 will take care of a few packages[1].

[1] https://github.com/NixOS/nixpkgs/pull/108126#pullrequestreview-560599381
2021-01-01 19:48:01 +01:00
Frederik Rietdijk f3b4ae8402 Merge staging-next into staging 2020-12-31 13:29:55 +01:00
zowoq 119e770ca3 gitAndTools.delta: 0.4.5 -> 0.5.0
https://github.com/dandavison/delta/releases/tag/0.5.0
2020-12-31 11:19:34 +10:00
Michael Weiss 61ae600daf
git: 2.29.2 -> 2.30.0 (#107828)
The removed patch was merged into Git 2.30:
3569e11d69

And the disabled test is new in Git 2.30.
2020-12-29 11:19:28 +01:00
Martin Weinelt d80f32edd1
Merge pull request #107835 from mweinelt/gitstatus
gitstatus: 1.4.3 -> 1.4.4
2020-12-29 02:22:25 +01:00
Martin Weinelt 72c33c3b62 gitAndTools.gitstatus: clarify license is gpl3Only 2020-12-29 00:14:19 +01:00
Martin Weinelt 28136138a6 gitAndTools.gitstatus: 1.4.3 -> 1.4.4 2020-12-29 00:14:16 +01:00
IvarWithoutBones 0c971e7bc5 gitAndTools.ghr: init at 0.13.0 2020-12-28 03:51:36 +01:00
Maximilian Bosch f456a8c482
Merge pull request #107401 from yanganto/gitui-11
gitAndTools.gitui: 0.10.1 -> 0.11.0
2020-12-23 21:18:33 +01:00
zowoq 56139b3dfd gitAndTools.delta: 0.4.4 -> 0.4.5
https://github.com/dandavison/delta/releases/tag/0.4.5
2020-12-23 22:01:38 +10:00
Antonio Yang 044cd65ef0 gitui: 0.10.1 -> 0.11.0 2020-12-22 21:50:57 +08:00
Travis CI 5b5ee84a3b gitAndTools.git-machete: 2.15.7 -> 2.15.9
###### Motivation for this change
Update to latest upstream version

###### Things done
 * [ ]  Tested using sandboxing ([nix.useSandbox](http://nixos.org/nixos/manual/options.html#opt-nix.useSandbox) on NixOS, or option `sandbox` in [`nix.conf`](http://nixos.org/nix/manual/#sec-conf-file) on non-NixOS linux)
 * Built on platform(s)

   * [x]  NixOS
   * [ ]  macOS
   * [ ]  other Linux distributions
 * [ ]  Tested via one or more NixOS test(s) if existing and applicable for the change (look inside [nixos/tests](https://github.com/NixOS/nixpkgs/blob/master/nixos/tests))
 * [ ]  Tested compilation of all pkgs that depend on this change using `nix-shell -p nix-review --run "nix-review wip"`
 * [x]  Tested execution of all binary files (usually in `./result/bin/`)
 * [ ]  Determined the impact on package closure size (by running `nix path-info -S` before and after)
 * [ ]  Ensured that relevant documentation is up to date
 * [x]  Fits [CONTRIBUTING.md](https://github.com/NixOS/nixpkgs/blob/master/.github/CONTRIBUTING.md).

###### Notify maintainers
cc @blitz @Ma27 @tfc @worldofpeace
2020-12-19 22:56:37 +00:00
Damien Cassou ffcc723c73
gitAndTools.git-when-merged: init at 1.2.0 2020-12-16 17:28:00 +01:00
zowoq ee275b02c1 gitAndTools.gh: 1.3.1 -> 1.4.0
https://github.com/cli/cli/releases/tag/v1.4.0
2020-12-16 05:50:32 +10:00
David Terry 9062c1ecff
radicle-upstream: init at 0.1.5 2020-12-15 12:58:38 +01:00
github-actions[bot] 884a0b091b
Merge master into staging-next 2020-12-04 00:37:25 +00:00
zowoq fa1a819492 gitAndTools.gh: 1.3.0 -> 1.3.1
https://github.com/cli/cli/releases/tag/v1.3.1
2020-12-04 07:45:19 +10:00
github-actions[bot] 58274c4f8d
Merge master into staging-next 2020-12-03 00:36:28 +00:00
R. RyanTM a26d53abee git-secret: 0.3.2 -> 0.3.3 2020-12-02 05:56:09 +00:00
Andreas Rammhold c3452dae0e
Merge pull request #105498 from raboof/git-reproducible-docs
git: make manual reproducible
2020-12-01 10:30:05 +01:00
Arnout Engelen 91099b08ae
git: make manual reproducible
This makes the git HTML manual reproducible.

It also removes the `git.info` manual, since this one is
basically entirely broken anyway. This likely happened
when we migrated from asciidoc to asciidoctor in #102020.
I don't suggest going back to asciidoc: that would
re-introduce a python2 dependency and another
reproducibility issue with the HTML docs.

Co-Authored-By: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
2020-12-01 08:33:58 +01:00
Doron Behar 14b61ec8eb
Merge pull request #105044 from freezeboy/add-glab
gitAndTools.glab: init at 1.11.1
2020-11-28 18:15:47 +02:00
R. RyanTM 0acf2268f3 gitAndTools.gitstatus: 1.3.1 -> 1.4.3 2020-11-27 21:42:59 +00:00
freezeboy 2f2166f40d gitAndTools.glab: init at 1.11.1 2020-11-27 07:11:15 +01:00
Sandro 48feb84a9d
Merge pull request #101185 from SuperSandro2000/lab-xdg-open
gitAndTools.lab: wrap xdg-open to fix `lab mr browse`
2020-11-26 22:07:19 +01:00
Sandro 8585991bfb
Merge pull request #100758 from SuperSandro2000/git-delete-merged-branches 2020-11-26 03:52:46 +01:00
Henri Menke 6617122306 gitAndTools.pass-git-helper: 0.4 -> 1.1.0 2020-11-25 19:24:20 +01:00
zowoq 8d4af2e08c gitAndTools.gh: 1.2.1 -> 1.3.0
https://github.com/cli/cli/releases/tag/v1.3.0
2020-11-25 07:49:56 +10:00
Graham Christensen bc49a0815a
utillinux: rename to util-linux 2020-11-24 12:42:06 -05:00
Sandro d2d2345384
Merge pull request #104246 from colatkinson/strip-cgit
cgit: strip debug symbols from cgit.cgi
2020-11-23 14:02:29 +01:00
Colin Atkinson 3bc05c2602
cgit: strip debug symbols from cgit.cgi
The debug symbols result in an unneeded runtime dependency on GCC, and
properly stripping them shrinks the size of the closure significantly.
2020-11-19 00:49:00 -05:00
Frederik Rietdijk da12fc6838 Merge staging-next into staging 2020-11-18 15:36:56 +01:00
Oleksii Filonenko 512c3c0a05 maintainers: rename filalex77 -> Br1ght0ne 2020-11-17 13:09:31 +02:00
R. RyanTM acf82008ab git-cola: 3.5 -> 3.8 2020-11-15 05:44:05 +00:00
Andrew Childs d686ded08c
git: fix darwin build (#103774)
The install step for the darwin specific $out/etc/gitconfig file
assumed that $out/etc already existed. This assumption is no longer
true after f5e2ff1ed80dac74bfb0afa92f34641cce098a49 in #103421. This
change makes make sure the directory exists before adding to it.
2020-11-14 18:32:52 +01:00
Frederik Rietdijk 9fc4a4db5a Merge staging-next into staging 2020-11-13 20:59:08 +01:00
Jonas Chevalier a7cb88c3de
tree-wide: unify Bash completions outputs (#103421)
Use $out/share/bash-completion/completions to store the Bash completions
2020-11-12 21:22:18 +00:00
zowoq 1e53f7e10b gitAndTools.gh: 1.2.0 -> 1.2.1
https://github.com/cli/cli/releases/tag/v1.2.1
2020-11-11 15:08:15 -08:00
Andrew Childs 4e2a217211
gitui: fix darwin build (#103194)
Fixes:

  = note: ld: warning: passed two min versions (10.12.0, 10.12) for platform macOS. Using 10.12.
          ld: framework not found AppKit
          clang-7: error: linker command failed with exit code 1 (use -v to see invocation)
2020-11-10 10:13:52 -05:00
Frederik Rietdijk 99fb79ae84 Merge master into staging-next 2020-11-06 12:51:56 +01:00
Robert Hensing 349288d101
Merge pull request #100582 from ldenefle/git-chglog-0.9.1
gitAndTools.git-chglog: init at 0.9.1
2020-11-05 22:39:07 +01:00
Frederik Rietdijk 10c57af49c Merge staging-next into staging 2020-11-04 09:28:07 +01:00
Frederik Rietdijk 9e6d7d3c74 Merge master into staging-next 2020-11-04 09:27:42 +01:00
Maximilian Bosch 988e44c3e6
Merge pull request #102567 from VirtusLab/git-machete-2.15.7
gitAndTools.git-machete: 2.15.6 -> 2.15.7
2020-11-04 00:18:52 +01:00
Frederik Rietdijk 470f05cb5d Merge staging-next into staging 2020-11-03 12:06:41 +01:00
Frederik Rietdijk 237966224d Merge master into staging-next 2020-11-03 12:06:06 +01:00
Mario Rodas 76ff5a73c7 gitAndTools.git-absorb: 0.6.5 -> 0.6.6 2020-11-02 22:00:00 -05:00
Travis CI 6373a64873 gitAndTools.git-machete: 2.15.6 -> 2.15.7
###### Motivation for this change
Update to latest upstream version

###### Things done
 * [ ]  Tested using sandboxing ([nix.useSandbox](http://nixos.org/nixos/manual/options.html#opt-nix.useSandbox) on NixOS, or option `sandbox` in [`nix.conf`](http://nixos.org/nix/manual/#sec-conf-file) on non-NixOS linux)
 * Built on platform(s)

   * [x]  NixOS
   * [ ]  macOS
   * [ ]  other Linux distributions
 * [ ]  Tested via one or more NixOS test(s) if existing and applicable for the change (look inside [nixos/tests](https://github.com/NixOS/nixpkgs/blob/master/nixos/tests))
 * [ ]  Tested compilation of all pkgs that depend on this change using `nix-shell -p nix-review --run "nix-review wip"`
 * [x]  Tested execution of all binary files (usually in `./result/bin/`)
 * [ ]  Determined the impact on package closure size (by running `nix path-info -S` before and after)
 * [ ]  Ensured that relevant documentation is up to date
 * [x]  Fits [CONTRIBUTING.md](https://github.com/NixOS/nixpkgs/blob/master/.github/CONTRIBUTING.md).

###### Notify maintainers
cc @blitz @Ma27 @tfc @worldofpeace
2020-11-03 01:53:25 +00:00
Mario Rodas eb64ee0a46
Merge pull request #102295 from r-ryantm/auto-update/git-extras
gitAndTools.git-extras: 6.0.0 -> 6.1.0
2020-11-02 18:10:23 -05:00
Mario Rodas c1d13cde94
Merge pull request #102430 from r-ryantm/auto-update/git-filter-repo
gitAndTools.git-filter-repo: 2.28.0 -> 2.29.0
2020-11-02 04:53:13 -05:00
Pavol Rusnak 2c931312ce treewide: simplify rev/repo arguments in src
+ use fetchFromGithub where possible
2020-11-01 23:02:24 -08:00
R. RyanTM 73e3b14503 gitAndTools.git-filter-repo: 2.28.0 -> 2.29.0 2020-11-02 05:48:03 +00:00
Frederik Rietdijk 83dde6c52c Merge staging-next into staging 2020-11-01 10:11:12 +01:00
Frederik Rietdijk 7a8d5dc8a6 Merge master into staging-next 2020-11-01 10:10:47 +01:00
Mario Rodas 26d3fbf215
Merge pull request #102310 from r-ryantm/auto-update/git-gone
gitAndTools.git-gone: 0.3.6 -> 0.3.7
2020-10-31 23:00:45 -05:00
R. RyanTM 5535343769 gitAndTools.git-gone: 0.3.6 -> 0.3.7 2020-11-01 02:35:57 +00:00
R. RyanTM 0c77c15642 gitAndTools.git-trim: 0.4.0 -> 0.4.2 2020-11-01 01:10:34 +00:00
R. RyanTM 3408bddacf gitAndTools.git-extras: 6.0.0 -> 6.1.0 2020-11-01 00:15:25 +00:00
Vladimír Čunát dfd3ede68d
Merge branch 'master' into staging-next 2020-10-31 14:30:44 +01:00
Michael Weiss 6a1782986d
git: 2.29.1 -> 2.29.2 2020-10-30 13:55:20 +01:00
Sebastien Braun bbf96d898b
git: Use asciidoctor instead of asciidoc for manpages
Asciidoc is severely outdated and is replaced by asciidoctor.
Eliminating asciidoc gets rid of a python2 dependency, see
https://github.com/NixOS/nixpkgs/issues/101964
2020-10-30 10:48:33 +01:00
Andreas Rammhold db0fe5c3eb
Merge branch master into staging to fix eval error
This fixes the eval error of the small (and "big"?) NixOS test set that
was fixed in 1088f05 & eba8f542.
2020-10-28 03:03:27 +01:00
zowoq f2eb36b889 gitAndTools.gh: 1.1.0 -> 1.2.0
https://github.com/cli/cli/releases/tag/v1.2.0
2020-10-28 00:38:12 +10:00
Vladimír Čunát 89023c38fc
Recover the complicated situation after my bad merge
I made a mistake merge.  Reverting it in c778945806 undid the state
on master, but now I realize it crippled the git merge mechanism.
As the merge contained a mix of commits from `master..staging-next`
and other commits from `staging-next..staging`, it got the
`staging-next` branch into a state that was difficult to recover.

I reconstructed the "desired" state of staging-next tree by:
 - checking out the last commit of the problematic range: 4effe769e2
 - `git rebase -i --preserve-merges a8a018ddc0` - dropping the mistaken
   merge commit and its revert from that range (while keeping
   reapplication from 4effe769e2)
 - merging the last unaffected staging-next commit (803ca85c20)
 - fortunately no other commits have been pushed to staging-next yet
 - applying a diff on staging-next to get it into that state
2020-10-26 09:01:04 +01:00
Vladimír Čunát 336bc8283b
Re-Revert "Merge #101508: libraw: 0.20.0 -> 0.20.2"
This reverts commit c778945806.

I believe this is exactly what brings the staging branch into
the right shape after the last merge from master (through staging-next);
otherwise part of staging changes would be lost
(due to being already reachable from master but reverted).
2020-10-26 08:19:17 +01:00
Vladimír Čunát c778945806
Revert "Merge #101508: libraw: 0.20.0 -> 0.20.2"
I'm sorry; I didn't notice it contained staging commits.

This reverts commit 17f5305b6c, reversing
changes made to a8a018ddc0.
2020-10-25 09:41:51 +01:00
Michael Weiss de32261d9f
git: 2.29.0 -> 2.29.1 (#101488) 2020-10-23 20:55:30 +02:00
Jan Tojnar d13fc932cd
Merge branch 'master' into staging-next 2020-10-22 21:20:14 +02:00
Sandro Jäckel 0ec595f0eb
gitstatus: 1.3.0 -> 1.3.1 2020-10-22 15:51:11 +02:00
Frederik Rietdijk 23890fc236 Merge staging-next into staging 2020-10-20 20:55:46 +02:00
Anderson Torres 751d7c6c80
Merge pull request #100350 from vidbina/init-ghorg-v1.4.0
ghorg: init at 1.4.0
2020-10-20 14:44:39 -03:00
Sandro Jäckel 1ed7d0e629
gitAndTools.lab: wrap xdg-open to fix lab mr browse 2020-10-20 17:13:14 +02:00
Lucas Denefle cba7a74806 gitAndTools.git-chglog: init at 0.9.1 2020-10-20 15:26:35 +01:00
David Asabina abb7f225ec ghorg: init at 1.4.0 2020-10-20 12:13:01 +02:00
Tim Steinbach 6f2e9937af
git: 2.28.0 -> 2.29.0 2020-10-19 19:22:46 -04:00
Mario Rodas e725ae8704 gitAndTools.git-absorb: 0.6.4 -> 0.6.5 2020-10-19 04:20:00 +00:00
Sandro Jäckel 28bb32ff9e
git-delete-merged-branches: init at 6.0.5 2020-10-18 12:01:28 +02:00
Dmitry Bogatov c004bcab9c git-vanity-hash: init at 2020-02-26 2020-10-17 00:00:00 -04:00
Antonio Yang 866ce94402 gitui: 0.9.1 -> 0.10.1
- add python3 for nativeBuildInputs
- add xorg.libxcb for buildInputs

Co-authored-by: Jon <jonringer@users.noreply.github.com>
2020-10-15 14:18:11 +08:00
Frederik Rietdijk 9e1943edc0 Merge master into staging-next 2020-10-13 19:34:34 +02:00
Jan Tojnar aabcf2d8f5
Merge branch 'master' into staging-next 2020-10-11 00:27:21 +02:00
Vladimír Čunát 338b25697c
Merge branch 'master' into staging-next
Quite many rebuilds from master:
> Estimating rebuild amount by counting changed Hydra jobs.
>    3926 x86_64-darwin
>    4645 x86_64-linux
2020-10-10 11:32:10 +02:00
zowoq 311b360530 gitAndTools.delta: 0.4.3 -> 0.4.4
https://github.com/dandavison/delta/releases/tag/0.4.4
2020-10-11 09:30:37 +10:00
Mario Rodas 926a58ce63 gitAndTools.git-trim: 0.3.2 -> 0.4.0
https://github.com/foriequal0/git-trim/releases/tag/v0.4.0
2020-10-09 04:20:00 +00:00
Frederik Rietdijk ec28e32c9e Merge master into staging-next 2020-10-08 21:47:26 +02:00
Doron Behar f4b8c8f1df git-annex-metadata-gui: fix qt wrapping
Wrap application with wrapQtAppsHook and no double wrapping.
2020-10-08 18:57:24 +02:00
Frederik Rietdijk 692d219a93 Merge staging-next into staging 2020-10-06 10:25:58 +02:00
zowoq bedaefb851 gitAndTools.gh: 1.0.0 -> 1.1.0
https://github.com/cli/cli/releases/tag/v1.1.0
2020-10-06 23:21:11 +10:00
Jan Tojnar 32b4375f10
Merge branch 'staging-next' into staging 2020-09-29 00:12:29 +02:00
Jörg Thalheim a2960ac430
Merge pull request #97603 from zowoq/rust-test-threads 2020-09-25 06:19:23 +02:00
Jan Tojnar d471c5d1f3
Merge branch 'staging-next' into staging 2020-09-24 23:09:00 +02:00
Martin Weinelt 2be541ff7c
Merge pull request #96136 from bdesham/fix-gitstatus-on-zsh
gitstatus: fix zsh integration
2020-09-24 07:22:13 +02:00
zowoq 664170166e gitAndTools.git-interactive-rebase-tool: use cargoParallelTestThreads 2020-09-24 07:20:03 +10:00
R. RyanTM 9bf3bd946d gitAndTools.gitstatus: 1.2.2 -> 1.3.0 2020-09-23 06:14:49 +00:00
Frederik Rietdijk 7bff759fac Merge staging-next into staging 2020-09-22 18:31:56 +02:00
Mario Rodas fefb2ad107
Merge pull request #98348 from marsam/update-gitAndTools.git-imerge
gitAndTools.git-imerge: 1.1.0 -> 1.2.0
2020-09-21 07:07:03 -05:00
WORLDofPEACE 978e419abe Merge branch 'staging-next' into staging 2020-09-20 18:43:38 -04:00
WORLDofPEACE 34aaac6d7c Merge branch 'staging-next' into staging 2020-09-20 18:41:15 -04:00
Travis CI 358cfe9106 gitAndTools.git-machete: 2.15.5 -> 2.15.6
###### Motivation for this change
Update to latest upstream version

###### Things done
 * [ ]  Tested using sandboxing ([nix.useSandbox](http://nixos.org/nixos/manual/options.html#opt-nix.useSandbox) on NixOS, or option `sandbox` in [`nix.conf`](http://nixos.org/nix/manual/#sec-conf-file) on non-NixOS linux)
 * Built on platform(s)

   * [x]  NixOS
   * [ ]  macOS
   * [ ]  other Linux distributions
 * [ ]  Tested via one or more NixOS test(s) if existing and applicable for the change (look inside [nixos/tests](https://github.com/NixOS/nixpkgs/blob/master/nixos/tests))
 * [ ]  Tested compilation of all pkgs that depend on this change using `nix-shell -p nix-review --run "nix-review wip"`
 * [x]  Tested execution of all binary files (usually in `./result/bin/`)
 * [ ]  Determined the impact on package closure size (by running `nix path-info -S` before and after)
 * [ ]  Ensured that relevant documentation is up to date
 * [x]  Fits [CONTRIBUTING.md](https://github.com/NixOS/nixpkgs/blob/master/.github/CONTRIBUTING.md).

###### Notify maintainers
cc @blitz @Ma27 @tfc @worldofpeace
2020-09-20 18:32:57 +00:00
Mario Rodas e5869f999f gitAndTools.git-imerge: 1.1.0 -> 1.2.0
https://github.com/mhagger/git-imerge/releases/tag/v1.2.0
2020-09-20 09:10:00 -05:00
Jacek Galowicz 0c1807e3e2
Merge pull request #97981 from VirtusLab/git-machete-2.15.5
gitAndTools.git-machete: 2.15.4 -> 2.15.5
2020-09-18 10:06:55 +02:00
zowoq ec63faba64 gitAndTools.gh: 0.12.0 -> 1.0.0
https://github.com/cli/cli/releases/tag/v1.0.0
2020-09-17 17:41:04 +10:00
WORLDofPEACE 6b1c8e8036 Revert "git: enable zsh completion"
This reverts commit 35b403bf12.
2020-09-14 18:31:00 -04:00
Travis CI 6d0c57fb93 gitAndTools.git-machete: 2.15.4 -> 2.15.5
###### Motivation for this change
Update to latest upstream version

###### Things done
 * [ ]  Tested using sandboxing ([nix.useSandbox](http://nixos.org/nixos/manual/options.html#opt-nix.useSandbox) on NixOS, or option `sandbox` in [`nix.conf`](http://nixos.org/nix/manual/#sec-conf-file) on non-NixOS linux)
 * Built on platform(s)

   * [x]  NixOS
   * [ ]  macOS
   * [ ]  other Linux distributions
 * [ ]  Tested via one or more NixOS test(s) if existing and applicable for the change (look inside [nixos/tests](https://github.com/NixOS/nixpkgs/blob/master/nixos/tests))
 * [ ]  Tested compilation of all pkgs that depend on this change using `nix-shell -p nix-review --run "nix-review wip"`
 * [x]  Tested execution of all binary files (usually in `./result/bin/`)
 * [ ]  Determined the impact on package closure size (by running `nix path-info -S` before and after)
 * [ ]  Ensured that relevant documentation is up to date
 * [x]  Fits [CONTRIBUTING.md](https://github.com/NixOS/nixpkgs/blob/master/.github/CONTRIBUTING.md).

###### Notify maintainers
cc @blitz @Ma27 @tfc @worldofpeace
2020-09-14 15:56:26 +00:00
Norbert Melzer 4312e2460a lefthook: use go 1.14 to build
Due to some changes in `go` from 1.14 to 1.15 the lefthook tool
currently can't start external programs and errors each test it tries
to run, making it effectively useless.

This is a temporary fix to make `lefthook` usable again until the
upstream issue was fixed and a new release has been cut.

Upstream issue: https://github.com/Arkweid/lefthook/issues/151
2020-09-13 18:20:22 +02:00
Sandro 6623aac946
gitAndTools.rs-git-fsmonitor: init at 0.1.3 (#96574) 2020-09-10 13:09:33 +02:00
Mario Rodas 2649c85cb8
Merge pull request #97412 from marsam/update-git-subtrac
gitAndTools.git-subtrac: 0.03 -> 0.04
2020-09-08 05:10:15 -05:00
zowoq ec22086628 gitAndTools.gh: 0.11.1 -> 0.12.0
https://github.com/cli/cli/releases/tag/v0.12.0
2020-09-08 20:04:32 +10:00
zowoq e4cc68f766 gitAndTools.git-interactive-rebase-tool: disable check
disable until buildRustPackage supports setting test-threads in packages
2020-09-08 05:58:24 +10:00
Mario Rodas 22cf34bc25 gitAndTools.git-subtrac: 0.03 -> 0.04 2020-09-07 04:20:00 +00:00
zowoq d763fb2257 gitAndTools.delta: 0.4.1 -> 0.4.3
https://github.com/dandavison/delta/releases/tag/0.4.3
2020-09-05 07:34:20 +10:00
yoctocell 008f45f591 gitAndTools.gita: 0.10.9 -> 0.10.10 2020-09-02 14:44:14 -07:00
Travis CI b123d22237 gitAndTools.git-machete: 2.15.3 -> 2.15.4
###### Motivation for this change
Update to latest upstream version

###### Things done
 * [ ]  Tested using sandboxing ([nix.useSandbox](http://nixos.org/nixos/manual/options.html#opt-nix.useSandbox) on NixOS, or option `sandbox` in [`nix.conf`](http://nixos.org/nix/manual/#sec-conf-file) on non-NixOS linux)
 * Built on platform(s)

   * [x]  NixOS
   * [ ]  macOS
   * [ ]  other Linux distributions
 * [ ]  Tested via one or more NixOS test(s) if existing and applicable for the change (look inside [nixos/tests](https://github.com/NixOS/nixpkgs/blob/master/nixos/tests))
 * [ ]  Tested compilation of all pkgs that depend on this change using `nix-shell -p nix-review --run "nix-review wip"`
 * [x]  Tested execution of all binary files (usually in `./result/bin/`)
 * [ ]  Determined the impact on package closure size (by running `nix path-info -S` before and after)
 * [ ]  Ensured that relevant documentation is up to date
 * [x]  Fits [CONTRIBUTING.md](https://github.com/NixOS/nixpkgs/blob/master/.github/CONTRIBUTING.md).

###### Notify maintainers
cc @blitz @Ma27 @tfc @worldofpeace
2020-08-26 08:03:50 +00:00
Benjamin Esham c278c6fd55 gitstatus: fix zsh integration
At some point the upstream changed and gitstatus.prompt.zsh stopped
working. The issue was that this file expects to be able to run the
"install" script in the same directory.

- Install the "install" script and "build.info" file that
  gitstatus.prompt.zsh expects to be able to find when it runs.
- Patch the install script so that it defaults to not automatically
  installing gitstatus. This can still be overridden by setting
  GITSTATUS_AUTO_INSTALL=1, although I'm not sure why anyone would do
  this if they've already installed gitstatus with Nix.
- Add an install check phase that tests the zsh integration to prevent
  this derivation from breaking in the same way in the future. (This
  also ends up testing the binary itself.)

Fixes #96135.
2020-08-24 18:29:16 -04:00
Robert Scott b91ad42896 gitAndTools.git-fast-export: add installCheckPhase
this creates and converts a simple hg repository - should stop us
inadvertently breaking this package.
2020-08-23 14:08:03 +01:00
Robert Scott 6b1e2a51aa gitAndTools.git-fast-export: 190107 -> 200213, fix
fixing involves providing it with mercurial_4 (and implicitly python27 -
current released fast-export doesn't support py3 yet) and adding git to
the wrapped PATH. this shouldn't be a runtime-resolved dependency.
2020-08-23 12:13:14 +01:00
Jan Tojnar 2b6f959c3b gitAndTools.diff-so-fancy: Fix shebang patching and clean up
perl is a runtime dependency so it needs to be in buildInputs,
otherwise patchShebangs hook will not see it.
2020-08-21 12:31:29 -07:00
worldofpeace ab77cf8930
Merge pull request #93298 from alyssais/git-remote-hg
git-remote-hg: fix; refactor
2020-08-19 19:08:47 -04:00
Alyssa Ross 8c05e036ea
gitAndTools.git-remote-hg: use buildPythonApplication
This is much cleaner than constructing PYTHONPATH using interpolated
subshells.
2020-08-19 20:30:42 +00:00
Dmitry Bogatov a5985162e3 git: make nls support optional
Add option "nlsSupport" (true by default, maching upstream defaults) to
make nls support configurable. This change does not trigger rebuild.
2020-08-16 10:38:28 +00:00
zowoq 473536e3b5 buildRustPackage: remove platform.all from packages 2020-08-16 12:48:18 +10:00
zowoq a83a88db05 buildGoPackage: remove platform.all from packages 2020-08-15 19:34:47 -07:00
zowoq 42313b92bc buildGoModule: remove platform.all from packages 2020-08-15 19:34:47 -07:00
andys8 bb472d014c Adding alias for git tool "git brunch" 2020-08-15 17:08:02 -07:00
zowoq ad3dbcf02e gitAndTools.gh: enable checks 2020-08-15 11:18:59 +10:00
Timothy Stott ba7c0893d4
treewide: remove obsolete attribute goPackagePath in buildGoModule derivations (#95092)
The buildGoModule infrastructure does not make use of goPackagePath it is a residue from buildGoPackage.
2020-08-11 21:04:55 +00:00
zowoq cea7cd902e buildGoModule packages: set doCheck = false 2020-08-10 16:02:30 +10:00
zowoq 142da76d1d gitAndTools.delta: 0.4.0 -> 0.4.1
https://github.com/dandavison/delta/releases/tag/0.4.1
2020-08-09 08:06:23 +10:00
R. RyanTM 0ca9e6b2b5 ghq: 1.1.2 -> 1.1.5 2020-08-07 00:11:00 -07:00
Martin Weinelt 297bbd9e30
Merge pull request #92508 from mweinelt/powerlevel10k
zsh-powerlevel10k: 1.11.0 -> 1.12.0; gitAndTools.gitstatus: 1.1.3 -> 1.2.2
2020-08-05 13:20:55 +02:00
Frederik Rietdijk 26c481b435 Merge master into staging-next 2020-08-04 12:48:50 +02:00
zowoq fe8590a18f gitAndTools.delta: 0.3.0 -> 0.4.0
https://github.com/dandavison/delta/releases/tag/0.4.0
2020-08-04 11:27:59 +10:00
Frederik Rietdijk 50c060d13d Merge master into staging-next 2020-08-01 19:37:20 +02:00
Oleksii Filonenko 991aa1d155
Merge pull request #94407 from r-ryantm/auto-update/gitui
gitAndTools.gitui: 0.8.1 -> 0.9.1
2020-08-01 11:16:13 +03:00
R. RyanTM b735f8cba8 gitAndTools.gitui: 0.8.1 -> 0.9.1 2020-08-01 05:12:20 +00:00
Michael Weiss e9c36545a7
tig: Don't install the broken ZSH completion
There are some Nixpkgs specific issues that we could fix but due to
changes in Git it currently isn't possible to source git-completion.bash
from ZSH (at least not how tig-completion.bash expects it).
Upstream issue: https://github.com/jonas/tig/issues/940

For the meantime it seems best to simply not install it anymore so that
the fallback implementation from ZSH can be used (more inaccurate as the
git-log completion is reused but it is helpful to complete remotes,
branches, tags, etc. and doesn't emit an error to the console).
2020-07-31 20:57:35 +02:00
zowoq 3c5750d1cd buildGoModule packages: editorconfig fixes 2020-07-31 13:58:04 +10:00
Vladimír Čunát 60d89e5793
Merge branch 'master' into staging 2020-07-29 18:40:28 +02:00
zowoq 3007e7e48c gitAndTools.gh: 0.11.0 -> 0.11.1
https://github.com/cli/cli/releases/tag/v0.11.1
2020-07-29 09:03:54 +10:00
Mario Rodas c3f8d59463
Merge pull request #94086 from r-ryantm/auto-update/git-filter-repo
gitAndTools.git-filter-repo: 2.27.1 -> 2.28.0
2020-07-28 11:09:54 -05:00
R. RyanTM 01676580dc gitAndTools.git-filter-repo: 2.27.1 -> 2.28.0 2020-07-28 15:10:46 +00:00
leo60228 d42bcde652
git: 2.27.0 -> 2.28.0 (#94026) 2020-07-28 12:38:29 +02:00
Maximilian Bosch c80bf92d7c
gitAndTools.git-workspace: 0.6.0 -> 0.7.0
https://github.com/orf/git-workspace/releases/tag/v0.7.0
2020-07-26 11:32:41 +02:00
Travis CI 8c5f73ae69 gitAndTools.git-machete: 2.15.2 -> 2.15.3
###### Motivation for this change
Update to latest upstream version

###### Things done
 * [ ]  Tested using sandboxing ([nix.useSandbox](http://nixos.org/nixos/manual/options.html#opt-nix.useSandbox) on NixOS, or option `sandbox` in [`nix.conf`](http://nixos.org/nix/manual/#sec-conf-file) on non-NixOS linux)
 * Built on platform(s)

   * [x]  NixOS
   * [ ]  macOS
   * [ ]  other Linux distributions
 * [ ]  Tested via one or more NixOS test(s) if existing and applicable for the change (look inside [nixos/tests](https://github.com/NixOS/nixpkgs/blob/master/nixos/tests))
 * [ ]  Tested compilation of all pkgs that depend on this change using `nix-shell -p nix-review --run "nix-review wip"`
 * [x]  Tested execution of all binary files (usually in `./result/bin/`)
 * [ ]  Determined the impact on package closure size (by running `nix path-info -S` before and after)
 * [ ]  Ensured that relevant documentation is up to date
 * [x]  Fits [CONTRIBUTING.md](https://github.com/NixOS/nixpkgs/blob/master/.github/CONTRIBUTING.md).

###### Notify maintainers
cc @blitz @Ma27 @tfc @worldofpeace
2020-07-17 11:58:49 +00:00
Mario Rodas 4f5195c350
Merge pull request #93313 from r-ryantm/auto-update/gitui
gitAndTools.gitui: 0.5.0 -> 0.8.1
2020-07-16 21:44:02 -05:00
zowoq 2a45eea7e3 gitAndTools.gh: 0.10.1 -> 0.11.0
https://github.com/cli/cli/releases/tag/v0.11.0
2020-07-17 09:57:01 +10:00
R. RyanTM 2025e915bc gitAndTools.gitui: 0.5.0 -> 0.8.1 2020-07-16 23:53:40 +00:00
Alyssa Ross d9ca548d95
gitAndTools.git-remote-hg: 1.0.1 -> unstable-2020-06-12
This package needs to use the same Python as Mercurial, but the
released version doesn't support Python 3.
2020-07-16 19:22:18 +00:00
Claudio Bley 8aa6716621 gitAndTools.delta: 0.2.0 -> 0.3.0 2020-07-13 10:48:20 +02:00
Mario Rodas a9a8b65b9b
Merge pull request #92590 from r-ryantm/auto-update/stgit
gitAndTools.stgit: 0.22 -> 0.23
2020-07-07 20:47:27 -05:00
Mario Rodas ce6a518773
gitAndTools.stgit: install completions 2020-07-07 20:33:16 -05:00
R. RyanTM 53ae3eff51 gitAndTools.subgit: 3.3.9 -> 3.3.10 2020-07-07 09:51:15 -07:00
R. RyanTM b306720264 gitAndTools.stgit: 0.22 -> 0.23 2020-07-07 15:09:40 +00:00
Martin Weinelt c11adfeef9
gitAndTools.gitstatus: 1.1.3 -> 1.2.2 2020-07-06 23:32:26 +02:00
Maximilian Bosch ab005bf302
Merge pull request #92151 from r-ryantm/auto-update/git-extras
gitAndTools.git-extras: 5.1.0 -> 6.0.0
2020-07-03 12:17:06 +02:00
R. RyanTM 9b0f6a0ffc gitAndTools.git-extras: 5.1.0 -> 6.0.0 2020-07-03 09:33:30 +00:00
Travis CI a40b8a6869 gitAndTools.git-machete: 2.14.0 -> 2.15.2
###### Motivation for this change
Update to latest upstream version

###### Things done
 * [ ]  Tested using sandboxing ([nix.useSandbox](http://nixos.org/nixos/manual/options.html#opt-nix.useSandbox) on NixOS, or option `sandbox` in [`nix.conf`](http://nixos.org/nix/manual/#sec-conf-file) on non-NixOS linux)
 * Built on platform(s)

   * [x]  NixOS
   * [ ]  macOS
   * [ ]  other Linux distributions
 * [ ]  Tested via one or more NixOS test(s) if existing and applicable for the change (look inside [nixos/tests](https://github.com/NixOS/nixpkgs/blob/master/nixos/tests))
 * [ ]  Tested compilation of all pkgs that depend on this change using `nix-shell -p nix-review --run "nix-review wip"`
 * [x]  Tested execution of all binary files (usually in `./result/bin/`)
 * [ ]  Determined the impact on package closure size (by running `nix path-info -S` before and after)
 * [ ]  Ensured that relevant documentation is up to date
 * [x]  Fits [CONTRIBUTING.md](https://github.com/NixOS/nixpkgs/blob/master/.github/CONTRIBUTING.md).

###### Notify maintainers
cc @blitz @Ma27 @tfc @worldofpeace
2020-07-02 15:26:15 +00:00
zowoq 26c7b538cc gitAndTools.delta: add maintainer 2020-07-02 15:02:05 +10:00
zowoq 092cf65e99 gitAndTools.delta: 0.1.1 -> 0.2.0
https://github.com/dandavison/delta/releases/tag/0.2.0
2020-07-02 15:01:58 +10:00
Mario Rodas 79cd1cc2d7
Merge pull request #89085 from wigust/gita
Update gitAndTools.gita and add bash completion
2020-06-29 14:52:55 -05:00
Marco Hennings e5f0d13a49
gitAndTools.stgit: Fix broken package. (#84198)
The stgit package is installing using make, which leaves the application in a state where it can not properly find the installed package stgit.

---
File "/run/current-system/sw/bin/stg", line 35, in <module>
    from stgit.main import main
ImportError: No module named stgit.main
---

This is fixed by using buildPythonApplication instead of stdenv.mkDerivation.
2020-06-27 23:54:57 +02:00
R. RyanTM d8cab5ba0b ghq: 1.1.1 -> 1.1.2 2020-06-26 09:22:04 +00:00
zowoq b2c8af46fc gitAndTools.gh: 0.10.0 -> 0.10.1
https://github.com/cli/cli/releases/tag/v0.10.1
2020-06-25 09:18:44 +10:00
Sandro Jäckel 61d1967ab0
gitstatus: also install sh files 2020-10-03 08:15:56 +02:00
zowoq f18e7e0d07 gitAndTools.git-interactive-rebase-tool: add maintainer 2020-10-02 16:59:43 +10:00
Francesco Zanini 6efc71f17b python3Packages.git-remote-codecommit: init at 1.15.1 2020-09-29 06:17:25 -07:00
Mario Rodas 031b9c172f gitAndTools.git-absorb: 0.6.3 -> 0.6.4 2020-09-28 18:20:00 -05:00
Ryan Mulligan a61b4946d1
Merge pull request #90557 from r-ryantm/auto-update/git-open
gitAndTools.git-open: 2.0.0 -> 2.1.0
2020-06-16 05:59:15 -07:00
Mario Rodas f5ae175e1c
Merge pull request #90568 from marsam/update-git-gone
gitAndTools.git-gone: 0.3.2 -> 0.3.6
2020-06-16 05:33:14 -05:00
R. RyanTM acd91479ed gitAndTools.git-open: 2.0.0 -> 2.1.0 2020-06-16 01:05:26 +00:00
Mario Rodas b288c361de
gitAndTools.git-gone: 0.3.2 -> 0.3.6 2020-06-15 04:20:00 -05:00
Mario Rodas 573d41ddbe
gitAndTools.git-subtrac: 0.02 -> 0.03 2020-06-15 04:20:00 -05:00
R. RyanTM 18154b0a44 gitAndTools.git-filter-repo: 2.27.0 -> 2.27.1 2020-06-16 01:58:09 +00:00
Frederik Rietdijk 1523382160 Merge master into staging-next 2020-06-13 11:02:21 +02:00
volth 54c4223e55 treewide: central.maven.org -> repo1.maven.org 2020-06-12 14:26:08 +00:00
Frederik Rietdijk febc27b59a Merge master into staging-next 2020-06-12 08:57:26 +02:00
zowoq b479619da8 gitAndTools.gh: 0.9.0 -> 0.10.0
https://github.com/cli/cli/releases/tag/v0.10.0
2020-06-12 08:58:26 +10:00
Vladimír Čunát 13add13388
Merge branch 'master' into staging-next
... to resolve a trivial conflict in libpcap.
2020-06-10 20:00:44 +02:00
Vladimír Čunát a5f5d020c6
Merge branch 'staging-next' 2020-06-10 16:13:48 +02:00
Mario Rodas 531bedd2f8
Merge pull request #89938 from r-ryantm/auto-update/gitui
gitAndTools.gitui: 0.3.0 -> 0.5.0
2020-06-10 05:42:48 -05:00
Jan Tojnar acb53e0698
Merge branch 'staging-next' into staging 2020-06-10 04:10:57 +02:00
Jan Tojnar c637cbe992
Merge branch 'master' into staging-next 2020-06-10 04:10:34 +02:00
Mario Rodas 926e8631bc
Merge pull request #89969 from r-ryantm/auto-update/git-filter-repo
gitAndTools.git-filter-repo: 2.26.0 -> 2.27.0
2020-06-09 18:48:22 -05:00