Commit graph

3219 commits

Author SHA1 Message Date
Frederik Rietdijk
16f031e8e7
Merge pull request #86139 from NixOS/staging-next
Staging next
2020-04-27 19:35:17 +02:00
Mario Rodas
417974355f
Merge pull request #86091 from marsam/update-delta
gitAndTools.delta: 0.0.18 -> 0.1.1
2020-04-27 08:54:59 -05:00
Jörg Thalheim
eeeba2a793
Merge pull request #86121 from zowoq/more-go-fixes
buildGoPackage: use installShellFiles, {excluded,sub}Packages
2020-04-27 13:08:50 +01:00
zowoq
16b418177c git-lfs1: use subPackages 2020-04-27 21:06:12 +10:00
Martin Weinelt
b53cabcfed
gitstatus: unstable-2020-03-15 → unstable-2020-04-21 2020-04-27 12:37:24 +02:00
Jörg Thalheim
a90356e08a
Merge pull request #86035 from zowoq/go-fixes 2020-04-27 10:03:52 +01:00
Florian Klink
81c34ec54f gitaly: 12.8.8 -> 12.8.9 2020-04-27 10:31:36 +02:00
Florian Klink
b1f66bfcb2 gitlab-workhorse: 8.21.1 -> 8.21.2 2020-04-27 10:31:36 +02:00
Florian Klink
d1902923fa gitlab: 12.8.8 -> 12.8.9
See
https://about.gitlab.com/releases/2020/04/14/critical-security-release-gitlab-12-dot-9-dot-3-released/
for details.
2020-04-27 10:31:36 +02:00
Michael Fellinger
4c26ab4198 gitlab: update.py: invoke bundle lock manually
`bundix -l` doesn't work, as it treats bundler's warning about upgrading
the lockfile version as an error, so invoke `bundle lock` manually.
2020-04-27 10:31:36 +02:00
Florian Klink
412bb5e04d gitlab: support passing --rev to the update-all script
While it's already possible to invoke `update-data` with the `--rev`
argument, one still needs to run all later phases manually.

Fix this, by having `update-all` also accept a `--rev` argument, and
pass it down to `update-data`.

Also, make the help text a bit more usable, by suggesting the usual
versioning scheme used these times.
2020-04-27 10:31:36 +02:00
Mario Rodas
b0698e430b
gitAndTools.delta: 0.0.18 -> 0.1.1 2020-04-26 18:17:00 -05:00
zowoq
e75465256b gitAndTools.hub: use installShellFiles 2020-04-27 08:48:42 +10:00
Frederik Rietdijk
bb10352242 Merge staging-next into staging 2020-04-25 07:53:37 +02:00
Benjamin Hipple
35ee9b6d94 aspell, tla: use pname 2020-04-24 20:16:12 -04:00
Benjamin Hipple
719df72a71
Merge pull request #85942 from kevinastock/master
Replace ftp with https for ftp.gnu.org
2020-04-24 20:14:51 -04:00
Kevin Stock
295475a378 aspell, tla: use HTTPS instead of FTP
ftp.gnu.org intends to disable the FTP protocol for downloads on this
server, and strongly recommends using https instead.
2020-04-24 17:43:35 -04:00
Maximilian Bosch
a3467dfa82
gitAndTools.diff-so-fancy: 1.2.7 -> 1.3.0
https://github.com/so-fancy/diff-so-fancy/releases/tag/v1.3.0
2020-04-24 21:39:08 +02:00
Frederik Rietdijk
cff0669a48 Merge master into staging-next 2020-04-23 08:11:16 +02:00
Frederik Rietdijk
6c13816249 Merge staging-next into staging 2020-04-22 17:20:43 +02:00
Frederik Rietdijk
8374a2a0ee Merge master into staging-next 2020-04-22 17:20:20 +02:00
Michael Weiss
7d2561cbdd git: 2.26.1 -> 2.26.2 (security, CVE-2020-11008)
See: https://raw.githubusercontent.com/git/git/master/Documentation/RelNotes/2.17.5.txt
2020-04-22 13:54:25 +02:00
Peter Hoeg
0bfd4557db thicket: specify the build type and pin to crystal 0.33 2020-04-22 17:30:23 +08:00
Frederik Rietdijk
23be4a8b4d Merge master into staging-next 2020-04-21 19:59:56 +02:00
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
Frederik Rietdijk
803b3d296c Merge staging-next into staging 2020-04-21 08:29:51 +02:00
R. RyanTM
9fe2f2565e gitAndTools.gitFull: 2.25.1 -> 2.25.2 2020-04-21 08:14:29 +02:00
Mario Rodas
4ef7161104
gitAndTools.git-gone: 0.3.0 -> 0.3.2 2020-04-20 04:20:00 -05:00
zowoq
f7b9c6c28b gitAndTools.gh: 0.6.4 -> 0.7.0
https://github.com/cli/cli/releases/tag/v0.7.0
2020-04-23 08:49:28 +10:00
Aaron Andersen
b3ae792630
Merge pull request #84823 from aanderse/redmine-master
redmine: 4.1.0 -> 4.1.1
2020-04-19 15:51:10 -04: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
d96487b9ca
Merge branch 'master' into staging-next
Hydra nixpkgs: ?compare=1582510
2020-04-18 07:42:26 +02:00
John Ericson
e3d50e5cb0 Merge branch 'master' of github.com:NixOS/nixpkgs into staging 2020-04-18 00:10:08 -04:00
John Ericson
33c2a76c5e Merge remote-tracking branch 'upstream/master' into staging 2020-04-17 18:40:51 -04:00
Edmund Wu
b4f8ce9e92
gitsrht: include minio 2020-04-16 16:49:37 -04:00
Edmund Wu
ae6a55cd44
srht: include html5lib
73600466cc
2020-04-16 16:48:32 -04:00
Edmund Wu
85b64d3006
buildsrht: fix build 2020-04-16 16:41:29 -04:00
Edmund Wu
578ebda358
srht: include prometheus_client
61c730191c
2020-04-16 16:41:29 -04:00
Edmund Wu
5b6e080603
scmsrht: 0.18.1 -> 0.19.11 2020-04-16 16:41:28 -04:00
Edmund Wu
2e171ac844
todosrht: 0.55.3 -> 0.57.14 2020-04-16 16:41:28 -04:00
Edmund Wu
2667f93c34
pastesrht: 0.9.2 -> 0.10.3 2020-04-16 16:41:28 -04:00
Edmund Wu
1f6d95badf
metasrht: 0.41.10 -> 0.42.13 2020-04-16 16:41:27 -04:00
Edmund Wu
e264904e4c
mansrht: 0.14.1 -> 0.14.7 2020-04-16 16:41:27 -04:00
Edmund Wu
188d031824
listssrht: 0.40.3 -> 0.41.8 2020-04-16 16:41:27 -04:00
Edmund Wu
f493868f9e
hgsrht: 0.21.1 -> 0.26.0 2020-04-16 16:41:26 -04:00
Edmund Wu
20466af068
gitsrht: 0.43.3 -> 0.50.3 2020-04-16 16:41:26 -04:00
Edmund Wu
0809ed89ea
dispatchsrht: 0.13.3 -> 0.14.1 2020-04-16 16:41:26 -04:00
Edmund Wu
924cd84a20
buildsrht: 0.52.5 -> 0.56.13 2020-04-16 16:41:25 -04:00
Edmund Wu
bc3020fbc7
srht: 0.57.2 -> 0.59.13 2020-04-16 16:41:25 -04: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
Michael Weiss
7c2fc1ce23
gitRepo: 2.5 -> 2.6 2020-04-16 14:37:22 +02:00
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
Benjamin Hipple
4d75b35fe4
Merge pull request #85056 from r-ryantm/auto-update/cvs-fast-export
cvs_fast_export: 1.51 -> 1.53
2020-04-12 14:09:25 -04:00
R. RyanTM
64634fb357 cvs_fast_export: 1.51 -> 1.53 2020-04-12 08:44:01 +00: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
R. RyanTM
96e2dc107f gerrit: 3.1.2 -> 3.1.4 2020-04-10 00:27:13 -07: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
Aaron Andersen
8eefb7ce14 redmine: 4.1.0 -> 4.1.1 2020-04-09 14:03:24 -04: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
Jan Tojnar
b7243c79c8
Merge pull request #84698 from jtojnar/gnome2-cleanups
gnome2 cleanups
2020-04-08 15:58:33 +02:00
Jan Tojnar
db46da2e32
monotoneViz: do not use aliases 2020-04-08 10:32:21 +02: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
Jonathan Ringer
5c171862b6 git-lfs: 2.8.0 -> 2.10.0 2020-04-02 16:11:45 +00: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
Maximilian Bosch
38f4e7c6ea
gitea: 1.11.3 -> 1.11.4
https://github.com/go-gitea/gitea/releases/tag/v1.11.4
2020-04-01 23:22:50 +02: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
774ddebd87
Merge pull request #83472 from Mic92/propragate-darwin-go
Propragate darwin go
2020-03-28 06:57:59 +00:00
Florian Klink
8ab04fd87b gitlab: 12.8.7 -> 12.8.8 2020-03-27 10:08:59 +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
zimbatm
d8f0c5407e
Merge pull request #82929 from zimbatm/nixos-gerrit
nixos gerrit module
2020-03-26 12:47:15 +01:00
zimbatm
d37a0dca13
nixos: add gerrit module
Co-authored-by: edef <edef@edef.eu>
Co-authored-by: Florian Klink <flokli@flokli.de>
2020-03-26 09:28:42 +01:00
Michael Weiss
e571880c55
gitRepo: 2.4.1 -> 2.5 2020-03-25 19:07:36 +01:00
Kim Lindberger
3a173c1d75
gitlab: 12.8.6 -> 12.8.7 (#82838)
https://about.gitlab.com/releases/2020/03/16/gitlab-12-8-7-released/
2020-03-24 18:45:39 +01:00
R. RyanTM
ab049eef08 gitAndTools.git-filter-repo: 2.25.0 -> 2.26.0 2020-03-24 09:12:58 +00:00
Jörg Thalheim
b4c2511eb8
gitea: fix strict deps build 2020-03-23 08:16:40 +00:00
Jörg Thalheim
be283a97e5
gogs: fix build with strict deps 2020-03-23 08:15:04 +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