Jan Tojnar
4b706490da
Merge branch 'staging-next' into staging
2020-04-16 10:10:38 +02:00
vasile luta
f57da8ef0a
tig: fix tig-completion's dependency on __git_complete
...
tig recently updated it's bash-completion making it depend on __git-complete from git.
Becase __git-complete is not automatically sourced tig bash completion fails.
Also this PR makes tig completion load on-demand.
2020-04-15 22:14:51 +02:00
James Ottaway
4848eef29d
git: Allow the update script to target non-latest versions
...
This came in handy when I wanted to bump a patch version while avoiding
a new minor version.
2020-04-15 17:05:34 +10:00
James Ottaway
fbd29dcbe7
git: 2.25.1 -> 2.26.1
...
This version addresses CVE-2020-5260.
See https://lore.kernel.org/lkml/xmqqy2qy7xn8.fsf@gitster.c.googlers.com/
2020-04-15 14:23:52 +10:00
Mario Rodas
1ad005458f
gitAndTools.git-trim: 0.2.4 -> 0.3.1
2020-04-14 18:42:36 +02:00
Matthew Bauer
e520d6af29
Merge pull request #84415 from matthewbauer/mb-cross-fixes-april2020
...
Cross compilation fixes [april 2020]
2020-04-13 16:48:38 -04:00
Matthieu Coudron
ed234c3708
gitAndTools.gitbatch: init at 2019-12-19
...
init an unstable version since the tagged release wouldn't work on my
machine (infinite loop).
Practical tool to fetch several repositories at the same time, see their
status etc.
Disabled for darwin because of CI error "SIGILL: illegal instruction".
2020-04-13 16:36:19 +02:00
zowoq
56480fe64c
gitAndTools.hub: remove Security
...
Not needed now that Security is propagated via go 0bba7474b3
2020-04-13 13:08:11 +10:00
Cole Helbling
3d1824896f
gitAndTools.git-ignore: improve robustness
2020-04-12 14:06:08 -07:00
Niklas Hambüchen
fd6ee37def
gitAndTools.git-bug: 0.6.0 -> 0.7.0
2020-04-11 18:04:02 +02:00
Michael Reilly
84cf00f980
treewide: Per RFC45, remove all unquoted URLs
2020-04-10 17:54:53 +01:00
Maximilian Bosch
a3eaf6c88b
gitAndTools.tig: 2.5.0 -> 2.5.1
...
https://github.com/jonas/tig/releases/tag/tig-2.5.1
2020-04-09 22:25:42 +02:00
Samuel Leathers
72cb7f81fd
Merge pull request #81442 from manveru/bundler-2.1.4
...
bundler: 1.17.3 -> 2.1.4
2020-04-08 12:44:54 -04:00
worldofpeace
36beb6efa4
Merge pull request #84185 from cpcloud/add-scmpuff
...
scmpuff: init at 0.3.0
2020-04-07 23:41:22 -04:00
Phillip Cloud
9c2ffc5834
scmpuff: init at 0.3.0
...
scmpuff is tool to make working with git easier by making it possible
to refer to filenames using numeric shortcuts
2020-04-07 23:41:06 -04:00
Alyssa Ross
fafac02e41
gitAndTools.git-cinnabar: init at 0.5.4
...
git-cinnabar calls into Mercurial as a library, so we make use the
same version of Python as Mercurial.
Support for Python 3 is an experimental feature in git-cinnabar, but
we unconditionally use it here because:
* Mercurial in Nixpkgs only supports Python 3.
* git-cinnabar touches a network, and for that purpose it's good to
use a version of Python that is going to get security updates.
2020-04-07 09:07:12 +00:00
Matthew Bauer
d0dbdfea4f
git: fix cross compilation
2020-04-06 16:36:14 -04:00
Michael Fellinger
f92600b406
update versions in Gemfile.lock
2020-04-06 15:02:13 +02:00
Frederik Rietdijk
92124ed660
Merge master into staging-next
2020-04-03 21:54:40 +02:00
zowoq
26a6d89cab
gitAndTools.gh: 0.6.3 -> 0.6.4
...
https://github.com/cli/cli/releases/tag/v0.6.4
2020-04-01 16:55:03 -07:00
zowoq
68a50aaaa5
gitAndTools.gh: 0.6.2 -> 0.6.3
...
https://github.com/cli/cli/releases/tag/v0.6.3
2020-04-01 08:37:03 +10:00
Jan Tojnar
3e0f4e202f
Merge branch 'master' into staging-next
2020-03-31 21:32:15 +02:00
Timo Kaufmann
24ead6996c
Merge pull request #75129 from ryneeverett/legit-init
...
legit: init at 1.2.0
2020-03-31 14:22:31 +00:00
R. RyanTM
6248fb23d2
gitAndTools.gita: 0.9.9 -> 0.10.5
2020-03-31 04:20:27 +00:00
zowoq
2ae5cf317f
Revert "gitAndTools.gh: fix build on darwin"
...
This reverts commit a51275f3b5
.
Not needed now that Security is propagated via go in 0bba7474b3
2020-03-29 09:43:11 +10:00
Frederik Rietdijk
a36be028f5
Merge staging-next into staging
2020-03-28 21:15:15 +01:00
Jörg Thalheim
f909e50287
gitAndTools.grv: fix build by using vendored libgit
2020-03-28 11:42:07 +00:00
Jörg Thalheim
d13c14b5e3
gitAndTools.grv: 0.3.1 -> 0.3.2
2020-03-28 11:42:07 +00:00
Daiderd Jordan
c4ecf64b3a
Merge pull request #81521 from thefloweringash/git-gui-darwin
...
git: use tcl/tk from nixpkgs on darwin
2020-03-28 11:51:05 +01:00
Jörg Thalheim
066db11215
Revert "Merge pull request #83099 from marsam/fix-buildGoModule-packages-darwin"
...
This reverts commit 4e6bf03504
, reversing
changes made to afd997aab6
.
Instead we propagate those frameworks from the compiler again
2020-03-27 07:33:21 +00:00
R. RyanTM
ab049eef08
gitAndTools.git-filter-repo: 2.25.0 -> 2.26.0
2020-03-24 09:12:58 +00:00
Travis CI
9280064b8b
gitAndTools.git-machete: 2.13.5 -> 2.13.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 @worldofpeace @tfc @jtraue
2020-03-22 17:54:44 +01:00
Mario Rodas
b149f2ee80
gitAndTools.ghq: fix build on darwin
2020-03-21 05:25:00 -05:00
Mario Rodas
02d54a88b6
gitAndTools.git-bug: fix build on darwin
2020-03-21 05:24:00 -05:00
Mario Rodas
3e92406ab0
gitAndTools.git-subtrac: fix build on darwin
2020-03-21 05:23:00 -05:00
Mario Rodas
b30c0c8d5f
gitAndTools.lab: fix build on darwin
2020-03-21 05:22:00 -05:00
Mario Rodas
b24059bc2f
gitAndTools.lefthook: fix build on darwin
2020-03-21 05:21:00 -05:00
Mario Rodas
a51275f3b5
gitAndTools.gh: fix build on darwin
2020-03-18 21:21:21 -05:00
zowoq
20f197d0b9
gitAndTools.gh: 0.6.1 -> 0.6.2
...
https://github.com/cli/cli/releases/tag/v0.6.2
2020-03-19 08:03:58 +10:00
Martin Weinelt
b1e788c028
gitstatus: unstable-2020-03-06 → unstable-2020-03-15
2020-03-16 13:12:09 +01:00
R. RyanTM
93144e0f4a
gitAndTools.stgit: 0.21 -> 0.22
2020-03-14 14:33:20 +01:00
R. RyanTM
96bfae7c5d
gitAndTools.lefthook: 0.6.3 -> 0.7.1
2020-03-14 07:29:00 +00:00
Mario Rodas
8e29a0ad79
Merge pull request #82466 from r-ryantm/auto-update/git-standup
...
gitAndTools.git-standup: 2.3.1 -> 2.3.2
2020-03-13 05:42:38 -05:00
R. RyanTM
913f4d312a
gitAndTools.git-standup: 2.3.1 -> 2.3.2
2020-03-13 04:51:35 +00:00
Mario Rodas
6881eb96a9
gitAndTools.hub: 2.14.1 -> 2.14.2
...
Changelog: https://github.com/github/hub/releases/tag/v2.14.2
2020-03-12 17:29:01 +01:00
Martin Weinelt
d8e27096f2
gitstatus: Fix build of the internally used libgit2 fork
...
In 6733ece
`-DUSE_HTTP_PARSER=system` was introduced, which does not seem
to work with this fork. So instead fallback to the `builtin`.
Also sync with upstream cmake flags.
2020-03-12 11:23:36 +01:00
Florian Klink
5ffc683fde
Merge pull request #81934 from mweinelt/pr/zsh-powerlevel10k/v1.3
...
zsh-powerlevel10k: v1.2.0 → v1.3.0
2020-03-11 17:17:38 -07:00
Benjamin Hipple
68a64b2afe
gitAndTools.git-dit: mark as broken
...
See inline comment; this does not build on Hydra and either requires custom
patching or a new release from upstream before it will build.
Note that we can still recompute the `cargoSha256` for #79975 ; the package
is broken in the identical way.
2020-03-12 01:16:56 +01:00
Mario Rodas
ca9b9ef51e
gitAndTools.git-trim: init at 0.2.4
2020-03-07 04:20:00 -05:00
Mario Rodas
77c58e6944
Merge pull request #81966 from edef1c/git-codereview
...
git-codereview: init at 2020-01-15
2020-03-08 20:07:50 -05:00
royneary
1cd54c9f36
gitAndTools.git-bug: 0.6.0 -> 0.7.0
...
Update to version 0.7.0. Includes switch to buildGoModule because Gopkg.toml
has been removed upstream.
2020-03-08 13:31:07 +01:00
edef
609650a3e8
git-codereview: init at 2020-01-15
2020-03-07 10:23:37 +00:00
Martin Weinelt
4307ef63ed
gitstatusd: unstable-2020-02-26 → unstable-2020-03-06
2020-03-07 01:02:29 +01:00
zowoq
4656fba5ab
gitAndTools.gh 0.6.0 -> 0.6.1
...
https://github.com/cli/cli/releases/tag/v0.6.1
2020-03-05 07:49:38 +10:00
David Wood
a54908f15e
delta: 0.0.16 -> 0.0.17
2020-03-04 13:47:27 +00:00
zowoq
85a8d13017
gitAndTools.gh: 0.5.7 -> 0.6.0
...
https://github.com/cli/cli/releases/tag/v0.6.0
2020-03-04 08:16:42 +10:00
Andrew Childs
bc4264a95f
git: use tcl/tk from nixpkgs on darwin
2020-03-02 22:29:47 +09:00
Andrew Childs
880ce71f67
Revert "git: Fix git-gui to work on Catalina"
...
This reverts commit 1b6ef1268f
.
2020-03-02 22:29:47 +09:00
Travis CI
166836eadc
gitAndTools.git-machete: 2.13.1 -> 2.13.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 @worldofpeace @tfc @jtraue
2020-03-02 11:54:21 +00:00
Jan Tojnar
bb701376cf
Merge branch 'master' into staging-next
2020-02-28 11:30:44 +01:00
Georges Dubus
d25ac92fe5
Merge pull request #80887 from cohei/update-ghq
...
ghq: 0.12.6 -> 1.1.0
2020-02-27 13:46:40 +01:00
Mario Rodas
afa6c6a7c1
Merge pull request #81089 from bhipple/u/rust-cargo-gitAndTools.git-interactive-rebase-tool
...
gitAndTools.git-interactive-rebase-tool: upgrade cargo fetcher and cargoSha256
2020-02-27 07:32:18 -05:00
Frederik Rietdijk
ef156f7a8b
Merge staging-next into staging
2020-02-27 10:15:34 +01:00
Martin Weinelt
7fa4d90d7b
gitstatusd: unstable-2020-01-28 → unstable-2020-02-26
...
Also updates the internally used libgit2 fork.
2020-02-26 22:24:32 +01:00
ryneeverett
e964450670
legit: init at 1.2.0
2020-02-26 20:11:31 +00:00
worldofpeace
0babf18003
Merge pull request #71378 from bb010g/git-my
...
git-my: init at 1.1.2
2020-02-26 15:54:16 +00:00
Mario Rodas
55beed9922
Merge pull request #81093 from bhipple/u/rust-cargo-gitAndTools.git-ignore
...
gitAndTools.git-ignore: upgrade cargo fetcher and cargoSha256
2020-02-26 03:53:16 -05:00
Mario Rodas
fdc118806b
Merge pull request #81092 from bhipple/u/rust-cargo-gitAndTools.git-codeowners
...
gitAndTools.git-codeowners: upgrade cargo fetcher and cargoSha256
2020-02-26 03:48:19 -05:00
Mario Rodas
d4cba71766
Merge pull request #81088 from bhipple/u/rust-cargo-gitAndTools.git-absorb
...
gitAndTools.git-absorb: upgrade cargo fetcher and cargoSha256
2020-02-26 03:43:18 -05:00
Mario Rodas
e3a556ca56
Merge pull request #81090 from bhipple/u/rust-cargo-gitAndTools.git-gone
...
gitAndTools.git-gone: upgrade cargo fetcher and cargoSha256
2020-02-26 03:43:06 -05:00
bb010g
ddb272bf1d
git-my: init at 1.1.2
2020-02-25 23:04:20 -08:00
bb010g
846097b7af
git-and-tools: strongly alphabetize
2020-02-25 23:04:20 -08:00
bb010g
a7cb757af4
git-and-tools: canonicalize hyphenated names
...
Old intercaps names are aliased.
darcs-to-git: rename from darcsToGit
git-fast-export: rename from gitFastExport
git-remote-gcrypt: rename from gitRemoteGcrypt
hub-unstable: rename from hubUnstable
top-git: rename from topGit
2020-02-25 23:04:20 -08:00
bb010g
925404027a
hub-unstable: remove
...
This has been here for 2 years; we can remove it.
Co-Authored-By: worldofpeace <worldofpeace@protonmail.ch>
2020-02-25 23:04:20 -08:00
Benjamin Hipple
c3f7554a34
gitAndTools.delta: upgrade cargo fetcher and cargoSha256
...
Infra upgrade as part of #79975 ; no functional change expected.
2020-02-25 23:24:48 -05:00
Benjamin Hipple
f2b14397d4
gitAndTools.git-ignore: upgrade cargo fetcher and cargoSha256
...
Infra upgrade as part of #79975 ; no functional change expected.
2020-02-25 23:20:29 -05:00
Benjamin Hipple
a717457135
gitAndTools.git-codeowners: upgrade cargo fetcher and cargoSha256
...
Infra upgrade as part of #79975 ; no functional change expected.
2020-02-25 23:15:04 -05:00
Benjamin Hipple
69ac30f87d
gitAndTools.git-gone: upgrade cargo fetcher and cargoSha256
...
Infra upgrade as part of #79975 ; no functional change expected.
2020-02-25 23:12:45 -05:00
Benjamin Hipple
71137f9182
gitAndTools.git-interactive-rebase-tool: upgrade cargo fetcher and cargoSha256
...
Infra upgrade as part of #79975 ; no functional change expected.
2020-02-25 23:05:14 -05:00
Benjamin Hipple
42850aabd1
gitAndTools.git-absorb: upgrade cargo fetcher and cargoSha256
...
Infra upgrade as part of #79975 ; no functional change expected.
2020-02-25 23:03:55 -05:00
Peter Hoeg
2ddfc45235
Merge pull request #77071 from peterhoeg/git_emacs_files
...
git: upstream no longer ships .el files for emacs
2020-02-23 21:16:55 +08:00
TANIGUCHI Kohei
b974f0595f
ghq: 0.12.6 -> 1.1.0
2020-02-23 21:24:48 +09:00
zowoq
3338225cd2
gitAndTools.gh: 0.5.6 -> 0.5.7
...
https://github.com/cli/cli/releases/tag/v0.5.7
2020-02-21 08:19:47 +10:00
zowoq
185aabefb0
gitAndTools.gh: 0.5.5 -> 0.5.6
...
https://github.com/cli/cli/releases/tag/v0.5.6
2020-02-20 09:36:08 -08:00
Tim Steinbach
b2a903a3e7
git: 2.25.0 -> 2.25.1
2020-02-20 08:22:22 -05:00
Daiderd Jordan
af1fffab5b
Merge pull request #79769 from virusdave/dnicponski/scratch/make_git_gui_work_on_modern_mac
...
git: Fix git-gui to work on Catalina
2020-02-19 20:25:41 +01:00
Frederik Rietdijk
ec1184f461
Merge master into staging-next
2020-02-17 15:12:28 +01:00
Mario Rodas
a05d11a95a
Merge pull request #77418 from marsam/init-gitAndTools.git-filter-repo
...
gitAndTools.git-filter-repo: init at 2.24.0
2020-02-16 18:26:46 -05:00
Frederik Rietdijk
0c7143462b
Merge master into staging
2020-02-16 08:50:59 +01:00
Benjamin Hipple
131a32a5af
rust: update docs on legacyCargoFetcher; remove unnecessary defaults
...
As mentioned in #79975 , the default on `legacyCargoFetcher` if left unspecified
is now `false`.
2020-02-15 22:07:47 -08:00
Jonathan Ringer
bbb4a1be3d
gitAndTools.ydiff: add python3.pkgs.ydiff tool
2020-02-15 08:54:42 -08:00
Jeff Labonte
ebf01d5614
gitAndTools.bump2version: init at 1.0.0
2020-02-14 16:46:15 -08:00
Mario Rodas
dafde55bf4
Merge pull request #80094 from r-ryantm/auto-update/svn-all-fast-export
...
gitAndTools.svn-all-fast-export: 1.0.16 -> 1.0.17
2020-02-14 08:28:52 -05:00
R. RyanTM
334e013a0a
gitAndTools.svn-all-fast-export: 1.0.16 -> 1.0.17
2020-02-14 07:09:30 +00:00
Benjamin Hipple
eb11feaa0b
treewide: change fetchCargoTarball default to opt-out
...
Changes the default fetcher in the Rust Platform to be the newer
`fetchCargoTarball`, and changes every application using the current default to
instead opt out.
This commit does not change any hashes or cause any rebuilds. Once integrated,
we will start deleting the opt-outs and recomputing hashes.
See #79975 for details.
2020-02-13 22:41:37 -08:00
zowoq
66f50128dc
gitAndTools.gh: 0.5.4 -> 0.5.5
...
https://github.com/cli/cli/releases/tag/v0.5.5
2020-02-14 09:46:21 +10:00
R. RyanTM
7b61246b95
gitAndTools.gh: 0.5.3 -> 0.5.4
2020-02-12 09:40:46 -08:00
Mario Rodas
72ce1ffa9d
Merge pull request #79912 from r-ryantm/auto-update/git-remote-gcrypt
...
gitAndTools.gitRemoteGcrypt: 1.2 -> 1.3
2020-02-12 06:18:19 -05:00
R. RyanTM
de6b81a89b
gitAndTools.gitRemoteGcrypt: 1.2 -> 1.3
2020-02-12 09:45:36 +00:00
Dave Nicponski
1b6ef1268f
git: Fix git-gui to work on Catalina
...
The existing post-install was not successfully patching the git-gui script,
and thus was invoking the packaged osx app which uses the system tk,
which is too old to work (and is no longer supported by Apple anyway).
2020-02-10 17:19:26 -05:00