Commit Graph

3270 Commits

Author SHA1 Message Date
Michael Weiss 9404c8ee74
gitRepo: 2.7 -> 2.8 2020-05-22 13:04:27 +02:00
Orivej Desh 16d7f7edae Merge branch 'master' into staging 2020-05-22 09:13:23 +00:00
Kimat Boven c270ecd5ee gitaly: use libgit2 from all-packages.nix 2020-05-22 10:39:24 +02:00
R. RyanTM 4e1b9efd73 gitkraken: 6.6.0 -> 7.0.0 2020-05-21 12:09:53 +00:00
Oleksii Filonenko c2d6a3c4cf gitAndTools.gitui: 0.2.5 -> 0.3.0 2020-05-20 15:28:22 +03:00
Seabass-Chan 92688a1ed7
bcompare - 4.3.2.24472 -> 4.3.4.24657 (#84521)
Co-authored-by: Milan Pässler <mil@nyantec.com>
2020-05-19 21:43:40 +02:00
Milan Pässler e32bf64da0 gitaly: revert a commit that broke config loading 2020-05-19 01:31:14 +02:00
Wout Mertens fd05023849
Merge pull request #86848 from primeos/git-add-doc-output
git: Add a doc output for the HTML and text files
2020-05-18 21:28:58 +02:00
Milan Pässler 755554808f gitlab: increase webpack memory limit 2020-05-18 18:35:08 +02:00
Milan Pässler f61370214c gitlab: 12.8.10 -> 12.10.6 2020-05-18 18:34:46 +02:00
Michael Weiss 9f2faa1f6f
git-doc: init 2020-05-18 16:53:13 +02:00
Michael Weiss 54918d6366
git: Add a doc output for the HTML and text files
This will install the HTML and text documentation into a separate output
so that users can install it without having to rebuild Git.
Previously only `doc/git/git-subtree.html` was installed (which is now
in $doc as well).
The current output sizes are as follows:
```
$ du -sh $(nix-build -A git)
47M     /nix/store/wyqgalp61kmavx06rams7z8jz177nd8y-git-2.26.2
$ du -sh $(nix-build -A git.doc)
14M     /nix/store/6zi22fl5xc3sg23d9shsviinvwk89wvq-git-2.26.2-doc
```

Fixes #86022 (at least partly since the output has to be installed).
2020-05-18 16:50:43 +02:00
Pavel Goran 64decd9de6 gitea: fix wiki template incompatibility with go 1.14
Related to #87115.
2020-05-18 16:44:47 +07:00
Mario Rodas c6c263e03e
Merge pull request #87683 from filalex77/gitui-0.2.3
gitAndTools.gitui: 0.2.2 -> 0.2.5
2020-05-16 19:48:10 -05:00
Jan Tojnar 044e733e8d
bcompare: do not use aliases 2020-05-16 23:14:53 +02:00
Oleksii Filonenko 70df85260b gitAndTools.gitui: 0.2.2 -> 0.2.5 2020-05-16 19:36:46 +00:00
Mario Rodas 415e3ec512
gitAndTools.git-absorb: 0.5.0 -> 0.6.0 2020-05-15 00:00:00 -05:00
Colin L Rice d6162dab50
go-modules: Update files to use vendorSha256 2020-05-14 07:22:21 +01:00
Jacek Galowicz 42c85f251d
Merge pull request #87613 from VirtusLab/git-machete-2.14.0
gitAndTools.git-machete: 2.13.6 -> 2.14.0
2020-05-13 10:56:35 +02:00
Mario Rodas 01b85fd5de
Merge pull request #87587 from filalex77/gitui-0.2.2
gitAndTools.gitui: 0.2.1 -> 0.2.2
2020-05-11 23:06:07 -05:00
zowoq 6618edf594 gitAndTools.gh: 0.7.0 -> 0.8.0
https://github.com/cli/cli/releases/tag/v0.8.0
2020-05-12 04:25:21 +10:00
Travis CI c2350ba8f6 gitAndTools.git-machete: 2.13.6 -> 2.14.0
###### 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-05-11 17:50:35 +00:00
Oleksii Filonenko f6f86bbbc6 gitAndTools.gitui: 0.2.1 -> 0.2.2 2020-05-11 08:53:29 +00:00
Ryan Mulligan b970793dbf
Merge pull request #86893 from r-ryantm/auto-update/gitkraken
gitkraken: 6.5.4 -> 6.6.0
2020-05-10 18:26:27 -07:00
R. RyanTM 6e9c5e8a9f gitAndTools.svn-all-fast-export: 1.0.17 -> 1.0.18 2020-05-10 12:41:00 +00:00
Mario Rodas 209432351e
git-lfs: 2.10.0 -> 2.11.0
Changelog: https://github.com/git-lfs/git-lfs/releases/tag/v2.11.0
2020-05-09 04:20:00 -05:00
Maximilian Bosch 54677515aa
gitea: 1.11.4 -> 1.11.5
https://github.com/go-gitea/gitea/releases/tag/v1.11.5

Also applying the patch which fixes the wiki-pages, closes #87115.
2020-05-10 03:02:44 +02:00
Alyssa Ross 24fcef1b9e cgit: 1.2.1 -> 1.2.3
cgit now supports lzip and zstd compression.
2020-05-09 22:00:50 +02:00
Jörg Thalheim 887295fd2d
treewide: remove the-kenny from maintainers
@the-kenny did a good job in the past and is set as maintainer in many package,
however since 2017-2018 he stopped contributing. To create less confusion
in pull requests when people try to request his feedback, I removed him as
maintainer from all packages.
2020-05-09 10:28:57 +01:00
Oleksii Filonenko fee8076083 gitAndTools.gitui: 0.2.0 -> 0.2.1 2020-05-08 08:08:44 +00:00
Michael Weiss ca5fa22a38
gitRepo: 2.6 -> 2.7 2020-05-06 13:27:03 +02:00
Frederik Rietdijk 9875bbae75 Merge master into staging-next 2020-05-05 19:51:09 +02:00
Mario Rodas 7f306cd78f
gitAndTools.git-subtrac: 0.01 -> 0.02 2020-05-05 04:20:00 -05:00
R. RyanTM 8244a7b682 gitkraken: 6.5.4 -> 6.6.0 2020-05-05 07:07:09 +00:00
Mario Rodas d43d8a213b
Merge pull request #86862 from r-ryantm/auto-update/git-trim
gitAndTools.git-trim: 0.3.1 -> 0.3.2
2020-05-04 20:18:11 -05:00
R. RyanTM 6e5b3c9aed gitAndTools.git-trim: 0.3.1 -> 0.3.2 2020-05-05 00:47:07 +00:00
Oleksii Filonenko 01cb649bce gitAndTools.git-workspace: 0.5.0 -> 0.6.0 2020-05-03 22:54:03 +03:00
Mario Rodas 06bed53569
git-lfs: fix manpage install 2020-05-02 11:24:15 -05:00
Frederik Rietdijk afb1041148 Merge master into staging-next 2020-05-02 09:39:00 +02:00
Oleksii Filonenko b503187046
gitAndTools.gitui: init at 0.2.0 2020-05-01 14:28:35 +00:00
Kim Lindberger 998ac52f0a
Merge pull request #86420 from flokli/gitlab-12.8.10
gitlab: 12.8.9 -> 12.8.10
2020-05-01 13:12:02 +02:00
Mario Rodas 7156ab6d85
git-lfs: add marsam to maintainers 2020-05-01 04:20:00 -05:00
Mario Rodas ae04f8efae
git-lfs: install man pages 2020-05-01 04:20:00 -05:00
Frederik Rietdijk 00bbfccecf Merge staging into staging-next 2020-05-01 09:28:45 +02:00
R. RyanTM ea18da4bc4 mercurial: 5.3 -> 5.3.1 2020-05-01 09:12:46 +02:00
Frederik Rietdijk 484ee79050 Merge staging-next into staging 2020-05-01 08:57:10 +02:00
Florian Klink fc64bca95b gitlab: update.py: use the /refs endpoint
It seems the atom feed now needs authentication. Use the /refs endpoint,
which is used for the switch branch/tag dropdown. It doesn't show all
records, but has some pagination, but works well enough for now.
2020-05-01 00:13:43 +02:00
Florian Klink fdd0d0de1f gitlab: 12.8.9 -> 12.8.10 2020-04-30 23:16:50 +02:00
Florian Klink 9eb6dc762f gitaly: 12.8.9 -> 12.8.10 2020-04-30 23:16:43 +02:00
Maximilian Bosch ee58c7a363
Merge pull request #82982 from cole-h/rust-cleanup
improve robustness of various Rust packages
2020-04-30 02:07:57 +02:00
zowoq b5dc07a4b4 treewide: use $out instead of $bin with buildGoPackage 2020-04-28 20:30:29 +10:00
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