Commit graph

1324 commits

Author SHA1 Message Date
Michael Weiss 666042141e
git: Fix the update.sh script and use HTTPS
The syntax is ${parameter:-word} (i.e. previously this used
"latestTag" instead of the actual value).
(Fixes a regression from #85278.)

Also: Even though getting the latest tag isn't really security critical
(as long as Git itself is secure against untrusted input), I'd prefer to
switch from the Git to the HTTPS protocol (for authentication of the
server and encryption + uses a standard port).
2020-04-21 14:30:11 +02:00
Vladimír Čunát e233a9d4dd
Merge #84442: staging-next branch 2020-04-18 23:11:00 +02:00
Maximilian Bosch 16c6b2de8d
gitAndTools.delta: 0.0.17 -> 0.0.18
https://github.com/dandavison/delta/releases/tag/0.0.18
2020-04-18 22:36:35 +02:00
Vladimír Čunát 9d77dc28d2
Merge #85263: git: 2.25.1 -> 2.26.1 (into staging-next) 2020-04-16 16:59:53 +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
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
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
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