Commit graph

3138 commits

Author SHA1 Message Date
Michael Weiss eacc771f72
gitRepo: Switch to Python 3 2020-02-04 14:45:57 +01:00
Michael Weiss 7d4b5a2154
gitRepo: 1.13.8 -> 1.13.9.1 2020-02-04 14:45:57 +01:00
Michael Weiss 434ff94e73
pijul: Fix the build (broke due to a more recent Rust version)
This uses an upstream patch [0] to fix a compatibility error with a new
version of Rust. Fix #79150.

Unfortunately patching Rust dependencies in Nixpkgs turned out to be way
more hacky than I expected (maybe there is a nicer way?), but it should
be fine for now.

A new release might follow soonish [1] so that we can drop the patches.

References:
- https://nest.pijul.com/pijul_org/pijul/discussions/401
- https://nest.pijul.com/pijul_org/thrussh/discussions/31

[0]: https://nest.pijul.com/pijul_org/thrussh:master/patches/AsyuWkJg4jAwNaG3H1yv1kbECx5E3GQAtjzXWBDB8yEGMswyfKbxKvYmAGWCohTVaTipdvF8mHh63yU5PTr5F9py
[1]: https://discourse.pijul.org/t/is-this-project-still-active-yes-it-is/451
2020-02-04 14:05:02 +01:00
zowoq eb957383b7 gitAndTools.gh: init at 0.5.3 2020-02-04 13:53:56 +10:00
Mario Rodas 378be0a542
gitAndTools.git-interactive-rebase-tool: enable on darwin 2020-02-02 21:15:10 -05:00
Asad Saeeduddin e3968c67f0
gitAndTools.git-interactive-rebase-tool: remove patch
Removes patch to disable tests, instead runs them in single threaded
mode.

See discussion in MitMaro/git-interactive-rebase-tool#172
2020-02-02 21:14:41 -05:00
Martin Weinelt 47b14f340a
gitstatus: unstable-2019-12-18 -> unstable-2020-01-28
Also add myself as maintainer.
2020-02-02 21:38:40 +01:00
Maximilian Bosch 9f61b23c01
Merge pull request #79096 from misuzu/git-workspace-update
gitAndTools.git-workspace: 0.4.1 -> 0.5.0
2020-02-02 19:32:59 +01:00
misuzu cf4657092a gitAndTools.git-workspace: 0.4.1 -> 0.5.0 2020-02-02 18:45:53 +02:00
Maximilian Bosch 5de5d753ba
Merge pull request #79078 from masaeedu/git-interactive-rebase-tool
gitAndTools.git-interactive-rebase-tool: init
2020-02-02 10:23:50 +01:00
Asad Saeeduddin 4d67e30713
gitAndTools.git-interactive-rebase-tool: init 2020-02-02 10:09:28 +01:00
Maximilian Bosch e7131d6b86
Merge pull request #79019 from flokli/gitlab-12.7.5
gitlab: 12.7.4 -> 12.7.5
2020-02-02 09:17:01 +01:00
Linus Heckemann 5da9abd9c3
Merge pull request #78231 from r-ryantm/auto-update/mercurial
mercurial: 5.2.1 -> 5.2.2
2020-02-01 21:15:51 +01:00
Florian Klink 0142bd49cc gitlab: 12.7.4 -> 12.7.5
https://about.gitlab.com/releases/2020/01/31/gitlab-12-7-5-released/
2020-02-01 17:07:55 +01:00
Evan Stoll 7c9bd98e86 gitkraken: 6.4.1 -> 6.5.1
- use fetchzip to retrieve the tarball for GitKraken, as the deb now tries to change permissions and etc which nix will not like
- add at-spi2-core dependency
- remove dpkg dependency
- refactor expression to properly handle the GitKraken tarball (compared to the deb archive)
2020-01-31 14:25:57 -05:00
Florian Klink cb02372211 gitlab: 12.6.4 -> 12.7.4
- CVE-2020-7966
 - CVE-2020-8114
 - CVE-2020-7973
 - CVE-2020-6833
 - CVE-2020-7971
 - CVE-2020-7967
 - CVE-2020-7972
 - CVE-2020-7968
 - CVE-2020-7979
 - CVE-2020-7969
 - CVE-2020-7978
 - CVE-2020-7974
 - CVE-2020-7977
 - CVE-2020-7976
 - CVE-2019-16779
 - CVE-2019-18978
 - CVE-2019-16892
2020-01-31 12:34:57 +01:00
Florian Klink 968f7c2890 gitaly: 1.77.1 -> 1.83.0 2020-01-31 12:25:55 +01:00
Florian Klink d2e149584f gitlab-workhorse: 8.18.0 -> 8.20.0 2020-01-31 12:25:24 +01:00
Florian Klink 3f4d3dbc5f gitlab-shell: 10.3.0 -> 11.0.0 2020-01-31 12:25:11 +01:00
worldofpeace 183e706767
Merge pull request #77082 from misuzu/git-workspace-init
gitAndTools.git-workspace: init at 0.4.1
2020-01-30 04:08:05 -05:00
misuzu b81d1b1781 gitAndTools.git-workspace: init at 0.4.1 2020-01-30 10:33:51 +02:00
Frederik Rietdijk dce0ca29d9 Merge master into staging-next 2020-01-28 10:46:13 +01:00
Silvan Mosberger 80a2740991
Merge pull request #78265 from Synthetica9/https-homepages
treewide: fix redirected urls
2020-01-27 15:00:53 +01:00
Patrick Hilhorst 593e11fd94
treewide: fix redirected urls
According to https://repology.org/repository/nix_unstable/problems, we have a
lot of packages that have http links that redirect to https as their homepage.
This commit updates all these packages to use the https links as their
homepage.

The following script was used to make these updates:

```

curl https://repology.org/api/v1/repository/nix_unstable/problems \
    | jq '.[] | .problem' -r \
    | rg 'Homepage link "(.+)" is a permanent redirect to "(.+)" and should be updated' --replace 's@$1@$2@' \
    | sort | uniq > script.sed

find -name '*.nix' | xargs -P4 -- sed -f script.sed -i
```
2020-01-22 11:26:22 +01:00
Jon 0f3f0caf37
Merge pull request #78108 from filalex77/thicket-0.1.3
thicket: init at 0.1.3
2020-01-22 00:01:31 -08:00
R. RyanTM 8dbe996860 mercurial: 5.2.1 -> 5.2.2 2020-01-22 03:12:23 +00:00
Will Dietz 35363c3efa
gitAndTools.hub: 2.13.0 -> 2.14.1
https://github.com/github/hub/releases/tag/v2.14.1
https://github.com/github/hub/releases/tag/v2.14.0
2020-01-21 11:05:48 -06:00
Oleksii Filonenko 1e4c3f8dc8 thicket: init at 0.1.3 2020-01-20 15:52:26 +02:00
kolaente 8314e759a8
gitea: 1.10.2 -> 1.10.3 2020-01-18 09:56:41 +01:00
Frederik Rietdijk bcd8c6b8dc Merge master into staging-next 2020-01-17 17:08:16 +01:00
Łukasz Jan Niemier 3d6c99a153 gitFull: support git send-email on Darwin 2020-01-16 21:36:29 +00:00
Robin Gloster 7b26075b13
Merge pull request #77624 from mayflower/gitlab-ce-assets-building
gitlab: fix asset building for CE
2020-01-16 20:23:26 +01:00
R. RyanTM b467436ebb gitAndTools.git-subrepo: 0.4.0 -> 0.4.1 2020-01-15 12:57:58 +00:00
Frederik Rietdijk 2a88c3c302 Merge staging-next into staging 2020-01-15 09:23:28 +01:00
Florian Klink 8b44c1fe04
Merge pull request #77645 from flokli/gitlab-12.6.4
gitlab: 12.6.2 -> 12.6.4
2020-01-15 00:59:32 +01:00
Tim Steinbach a1d7308cf9
git: 2.24.1 -> 2.25.0 2020-01-13 19:22:51 -05:00
Florian Klink 57560cc028 gitlab: 12.6.2 -> 12.6.4 2020-01-13 21:49:34 +01:00
Florian Klink e1e61f31a3 gitaly: a4b6c71d4b7c1588587345e2dfe0c6bd7cc63a83 -> 1.77.1 2020-01-13 21:49:18 +01:00
Robin Gloster 6bf0ed8e02
gitlab: fix asset building for CE
We have to specify if we're building CE or EE otherwise at least some JS
building was broken, resulting in e.g. broken "boards" pages.
2020-01-13 15:57:11 +01:00
ryneeverett f5e446b30f gitstatus: patch in variable rather than regexing
Patching in the GITSTATUS_DAEMON variable seems like a more stable
solution than doing inline replacements.
2020-01-12 22:21:25 +00:00
ryneeverett be4efc8010 gitstatus: patch fewer characters
This is a followup to https://github.com/NixOS/nixpkgs/pull/76744.

The patch is still too aggressive because it captures additional local
variables declared in the same line. It should stop when it hits
whitespace.

See https://github.com/romkatv/gitstatus/pull/92.
2020-01-12 22:02:08 +00:00
Mario Rodas bc6c029e12
gitAndTools.git-filter-repo: init at 2.25.0 2020-01-09 04:20:00 -05:00
Mario Rodas f537f4a998
Merge pull request #77020 from r-ryantm/auto-update/cvs-fast-export
cvs_fast_export: 1.49 -> 1.50
2020-01-08 05:19:47 -05:00
Ryan Mulligan fdf4002d70
Merge pull request #77098 from r-ryantm/auto-update/git-machete
gitAndTools.git-machete: 2.12.5 -> 2.12.6
2020-01-06 19:00:10 -08:00
Martin Weinelt 68106d9317 git-and-tools.gitstatus: unstable-2019-05-06 -> unstable-2019-12-18
Also bumps the interally used version of libgit2.
2020-01-06 21:49:15 +01:00
Jason Felice de8700d42d mercurial_4: init at 4.9.1 2020-01-06 19:23:24 +01:00
R. RyanTM 9bc1b6f8b9 gitAndTools.git-machete: 2.12.5 -> 2.12.6 2020-01-06 08:06:10 -08:00
R. RyanTM 46736ce973 gerrit: 3.0.2 -> 3.1.2 2020-01-06 06:04:09 -08:00
R. RyanTM fa28442ad5 cvs_fast_export: 1.49 -> 1.50 2020-01-06 00:38:27 -08:00
royneary 8cc7acddda
gitAndTools.git-bug: 0.5.0 -> 0.6.0 2020-01-04 14:57:51 +01:00
Maximilian Bosch bef84a3d83
Merge pull request #76895 from Vskilet/gitea-update
gitea: 1.10.1 -> 1.10.2
2020-01-03 20:36:31 +01:00
Victor SENE 56ad7c630b
gitea: 1.10.1 -> 1.10.2 2020-01-03 19:27:06 +01:00
Florian Klink cd9cbb1108
Merge pull request #76193 from talyz/gitlab-12.6.0
gitlab: 12.5.5 -> 12.6.2
2020-01-03 18:39:24 +01:00
Florian Klink d075e33bf5 gitlab: 12.6.1 -> 12.6.2
- CVE-2019-20146
 - CVE-2019-20143
 - CVE-2019-20147
 - CVE-2019-20145
 - CVE-2019-20142
 - CVE-2019-20148
 - CVE-2020-5197
2020-01-02 23:09:53 +01:00
Frederik Rietdijk f08e3e38d4 Merge master into staging-next 2020-01-02 21:41:13 +01:00
Silvan Mosberger 59207c04b2
Merge pull request #76744 from bdesham/fix-gitstatus-patch
gitstatus: patch fewer lines
2020-01-01 03:06:57 +01:00
Benjamin Esham 054214057a gitstatus: patch fewer lines
The sed invocation was changing all lines matching "local daemon.*".
This changed the line it was supposed to, but two other lines that also
matched that pattern were being modified, which meant that the
"daemon_pid_var" and "daemon_pid" variables were not defined when they
should have been.
2019-12-31 10:29:08 -05:00
Peter Hoeg a15efd8f73 git: upstream no longer ships .el files for emacs 2019-12-31 12:54:25 +08:00
Robin Gloster 5f2b92e3ec
treewide: NIX_*_COMPILE -> string 2019-12-31 00:13:29 +01:00
Jonathan Ringer fca4359376 nbstripout: fix build 2019-12-30 16:46:55 +01:00
Frederik Rietdijk bfa5af85b7 Merge staging-next into staging 2019-12-30 16:25:56 +01:00
Edmund Wu 90cc8993aa
srht: 0.54.4 -> 0.57.2 2019-12-30 10:20:19 -05:00
Robin Gloster 2157dcd141
treewide: installFlags is a list 2019-12-30 13:22:43 +01:00
Merijn Broeren 133103d709
treewide: replace make/build/configure/patchFlags with nix lists 2019-12-30 12:58:11 +01:00
Jonathan Ringer 4c28daa093 gitless: use python3 2019-12-30 09:45:37 +01:00
Edmund Wu 5ff450e83f
todosrht: fix build 2019-12-29 20:06:24 -05:00
Edmund Wu d0c08d8d9b
scmsrht: fix build 2019-12-29 20:06:24 -05:00
Edmund Wu e313963c05
listssrht: drop unidiff 2019-12-29 20:06:23 -05:00
Edmund Wu 889e5ca654
gitsrht: fix build 2019-12-29 20:06:23 -05:00
Edmund Wu 1360a0303d
srht: drop flask_login 2019-12-29 20:06:23 -05:00
Edmund Wu 9401dcc360
buildsrht: fix build 2019-12-29 20:06:22 -05:00
Edmund Wu 7845e28125
scmsrht: 0.16.0 -> 0.18.1 2019-12-29 20:06:22 -05:00
Edmund Wu 0282a909f7
todosrht: 0.51.13 -> 0.55.3 2019-12-29 20:06:21 -05:00
Edmund Wu 9ec305a493
pastesrht: 0.7.3 -> 0.9.2 2019-12-29 20:06:21 -05:00
Edmund Wu 8ded6650a7
metasrht: 0.37.0 -> 0.41.10 2019-12-29 20:06:21 -05:00
Edmund Wu cce0d7ee57
mansrht: 0.13.5 -> 0.14.1 2019-12-29 20:06:20 -05:00
Edmund Wu ef17a5092c
listssrht: 0.38.3 -> 0.40.3 2019-12-29 20:06:20 -05:00
Edmund Wu 85ff8f9f94
hgsrht: 0.16.2 -> 0.21.1 2019-12-29 20:06:20 -05:00
Edmund Wu 0b6cb53f5f
gitsrht: 0.35.6 -> 0.43.3 2019-12-29 20:06:19 -05:00
Edmund Wu 72fb1992ef
dispatchsrht: 0.12.3 -> 0.13.3 2019-12-29 20:06:19 -05:00
Edmund Wu 0ba8b3b67b
buildsrht: 0.48.0 -> 0.52.5 2019-12-29 20:06:18 -05:00
talyz 0825e382c0 gitlab: 12.6.0 -> 12.6.1 2019-12-28 14:00:04 +01:00
Maximilian Bosch 9842c4b107
treewide: update which packages I'm currently maintaining
Idea shamelessly stolen from 4e60b0efae.

I realized that I don't really know anymore where I'm listed as maintainer and what
I'm actually (co)-maintaining which means that I can't proactively take
care of packages I officially maintain.

As I don't have the time, energy and motivation to take care of stuff I
was interested in 1 or 2 years ago (or packaged for someone else in the
past), I decided that I make this explicit by removing myself from several
packages and adding myself in some other stuff I'm now interested in.

I've seen it several times now that people remove themselves from a
package without removing the package if it's unmaintained after that
which is why I figured that it's fine in my case as the affected pkgs
are rather low-prio and were pretty easy to maintain.
2019-12-26 15:27:47 +01:00
markuskowa 09fcb16542
Merge pull request #76472 from r-ryantm/auto-update/yadm
yadm: 2.0.1 -> 2.3.0
2019-12-25 16:18:09 +01:00
Jörg Thalheim d5a81030ec
mercurial: 4.9.1 -> 5.2.1 + python3 🚀 (#76126)
mercurial: 4.9.1 -> 5.2.1 + python3  🚀
2019-12-25 09:37:44 +00:00
R. RyanTM 111046404a yadm: 2.0.1 -> 2.3.0 2019-12-24 15:57:36 -08:00
Mario Rodas 4cd7c0f7d8
Merge pull request #76271 from r-ryantm/auto-update/git-machete
gitAndTools.git-machete: 2.12.2 -> 2.12.5
2019-12-23 10:58:15 -05:00
Jörg Thalheim 75760562dd gitAndTools.git-hub: 1.0.3 -> 1.1.0 2019-12-23 15:13:04 +00:00
R. RyanTM e7ea379eb2 gitAndTools.git-machete: 2.12.2 -> 2.12.5 2019-12-23 06:48:48 -08:00
Mario Rodas c382675f3a
Merge pull request #76251 from r-ryantm/auto-update/git-extras
gitAndTools.git-extras: 5.0.0 -> 5.1.0
2019-12-23 08:36:00 -05:00
R. RyanTM 05bf7427b3 gitAndTools.git-extras: 5.0.0 -> 5.1.0 2019-12-23 03:54:27 -08:00
Jörg Thalheim 3e44c3461f
cvs_fast_export: 1.48 -> 1.49 (#76234)
cvs_fast_export: 1.48 -> 1.49
2019-12-23 09:44:26 +00:00
R. RyanTM 79115362fd cvs_fast_export: 1.48 -> 1.49 2019-12-23 00:44:31 -08:00
talyz ff28cfa6d3 gitlab: 12.5.5 -> 12.6.0 2019-12-23 00:39:33 +01:00
talyz a3c72e66a6 gitlab: update.py: Get go deps for gitlab-shell from the root dir
GitLab Shell now has the go.mod and go.sum files in the root of the
repo; the go subdirectory has been removed and all the code in it has
been moved up to the root.
2019-12-23 00:26:28 +01:00
talyz 445bc1494c gitaly: 1.72.1 -> a4b6c71d4b7c1588587345e2dfe0c6bd7cc63a83
For some reason this untagged commit is the one referred to in the
main repository; this might be a mistake, but we'll have to package it
for now to follow upstream.
2019-12-23 00:18:39 +01:00
talyz 2f614714ed gitlab-workhorse: 8.14.1 -> 8.18.0 2019-12-22 23:49:29 +01:00
talyz 6972aec884 gitlab-shell: 10.2.0 -> 10.3.0 2019-12-22 23:48:18 +01:00
Jörg Thalheim 7063f6f29a
tortoisehg: 5.0.2 -> 5.2.1
This version is not yet released. However given that python2 will soon
go end-of-life (without security updates), this seems like a good move.
The package was also lacking proper qt wrapping and unusable before.
2019-12-22 10:04:31 +00:00
Mario Rodas 1d9531fa6c
gitAndTools.git-gone: 0.2.0 -> 0.3.0 2019-12-22 00:00:00 -05:00
Aaron Andersen 5d9c7cda16 redmine: 4.0.5 -> 4.1.0 2019-12-21 10:21:54 -05:00
Jörg Thalheim 88a473fc12
mercurial: 4.9.1 -> 5.2.1
also switch to python3
2019-12-21 07:32:58 +00:00
Maximilian Bosch 85d4bfc94b
Merge pull request #76042 from evanjs/gitkraken-6.4.0
gitkraken: 6.3.1 -> 6.4.1
2019-12-20 23:17:42 +01:00
Evan Stoll 847fd1711d gitkraken: 6.4.0 -> 6.4.1 2019-12-20 07:10:26 -05:00
Florian Klink 1c15955340
Merge pull request #75834 from talyz/gitlab-12.5.5
gitlab: 12.5.4 -> 12.5.5
2019-12-19 21:15:23 +01:00
Evan Stoll 80d6b17035 gitkraken: 6.3.1 -> 6.4.0 2019-12-19 10:56:53 -05:00
Mario Rodas cc99d54c5f
gitAndTools.lab: 0.17.1 -> 0.17.2
Changelog: https://github.com/zaquestion/lab/releases/tag/v0.17.2
2019-12-18 13:36:00 -05:00
talyz 7d602d3d36 gitlab: 12.5.4 -> 12.5.5 2019-12-17 22:18:10 +01:00
Mario Rodas 6b3720b395
Merge pull request #75675 from marsam/update-git-gone
gitAndTools.git-gone: 0.1.2 -> 0.2.0
2019-12-15 15:21:19 -05:00
Mario Rodas fb112af09e
gitAndTools.git-gone: 0.1.2 -> 0.2.0 2019-12-14 20:20:20 -05:00
Jan Tojnar 429561978b
Merge branch 'master' into staging-next 2019-12-14 23:09:06 +01:00
Frederik Rietdijk dfdf1597a7 Merge master into staging-next 2019-12-13 11:43:39 +01:00
Mario Rodas 76c69056bd
gitAndTools.lab: 0.17.0 -> 0.17.1 2019-12-13 00:00:00 -05:00
Mario Rodas bc412904f1
gitAndTools.lab: 0.16.0 -> 0.17.0
Changelog: https://github.com/zaquestion/lab/releases/tag/v0.17.0
2019-12-11 18:18:18 -05:00
Florian Klink c1541a6028
Merge pull request #75508 from flokli/gitlab-12.5.4
gitlab: 12.5.3 -> 12.5.4
2019-12-11 19:06:42 +01:00
Florian Klink 5bf07d665f gitlab: 12.5.3 -> 12.5.4
https://about.gitlab.com/blog/2019/12/10/critical-security-release-gitlab-12-5-4-released/

Insufficient parameter sanitization for Maven package registry could lead to privilege escalation and remote code execution vulnerabilities under certain conditions. The issue is now mitigated in the latest release and is assigned CVE-2019-19628.

When transferring a public project to a private group, private code would be disclosed via the Group Search API provided by Elasticsearch integration. The issue is now mitigated in the latest release and is assigned CVE-2019-19629.

The Git dependency has been upgraded to 2.22.2 in order to apply security fixes detailed here.

CVE-2019-19604 was identified by the GitLab Security Research team. For more information on that issue, please visit the GitLab Security Research Advisory

closes #75506.
2019-12-11 15:16:36 +01:00
Wout Mertens 697b44b631
Merge pull request #75406 from andersk/gitk-completion
git: Install bash-completion symlink for gitk
2019-12-11 15:00:36 +01:00
worldofpeace 69d5fd868d diffuse: remove 2019-12-10 22:39:04 -05:00
edef 8fe0c8c351 git: 2.24.0 -> 2.24.1
CVE-2019-1348, CVE-2019-1349, CVE-2019-1350, CVE-2019-1351,
CVE-2019-1352, CVE-2019-1353, CVE-2019-1354, CVE-2019-1387,
CVE-2019-19604

Link: https://lore.kernel.org/git/xmqqr21cqcn9.fsf@gitster-ct.c.googlers.com/
2019-12-11 00:01:06 +00:00
Frederik Rietdijk f3618342ec Merge staging-next into staging 2019-12-10 19:01:27 +01:00
Tim Steinbach 68708349f1
git: Add git to update script
Otherwise the system's git will be used, which may not exist
or, as is the case with Ubuntu, not have the --sort flag for ls-remote.
2019-12-10 08:30:00 -05:00
Anders Kaseorg a16dbef1c1 git: Install bash-completion symlink for gitk
Since bash-completion rules are loaded dynamically, the completion
rules for `gitk <Tab>` waere not being loaded until the user first
typed `git <Tab>`.  Fix this by adding a symlink named `gitk`.

Signed-off-by: Anders Kaseorg <andersk@mit.edu>
2019-12-09 16:09:56 -08:00
Peter Simons fa9159b0de
Merge pull request #73861 from xfix/git-enable-some-of-broken-tests
git: enable some of broken tests
2019-12-06 20:21:49 +01:00
Frederik Rietdijk 51ef7c3e49 Merge master into staging-next 2019-12-05 09:14:08 +01:00
Milan Pässler a43003d633 gitlab: 12.5.2 -> 12.5.3 2019-12-04 11:30:40 +01:00
Jan Tojnar 30fae2883e
Merge branch 'master' into staging-next 2019-12-03 16:51:48 +01:00
Ryan Mulligan e81af522ad
Merge pull request #74695 from r-ryantm/auto-update/yadm
yadm: 1.12.0 -> 2.0.1
2019-12-02 07:55:15 -08:00
Jan Tojnar 55a72926e1
Merge branch 'staging-next' into staging 2019-11-30 19:45:46 +01:00
Jan Tojnar a69ad18da9
Merge branch 'master' into staging-next 2019-11-30 19:44:51 +01:00
Jonathan Ringer 05521bc61b sourcehut.listssrht: add pygit2 2019-11-30 09:31:58 -08:00
R. RyanTM 1e822c37f8 gitAndTools.subgit: 3.3.8 -> 3.3.9 (#74653) 2019-11-30 15:00:10 +01:00
Frederik Rietdijk 9f84415541 Merge staging-next into staging 2019-11-30 08:58:01 +01:00
Frederik Rietdijk d14baf7747 Merge master into staging-next 2019-11-30 08:57:28 +01:00
R. RyanTM 7bc842b204 yadm: 1.12.0 -> 2.0.1 2019-11-29 14:09:49 -08:00
R. RyanTM 90604ee2da
gitAndTools.tig: 2.4.1 -> 2.5.0 2019-11-29 11:15:30 -08:00
Bruno Bigras 9314dc43b3 gitolite: wrap gitolite-shell
git wasn't found when used with services.fcgiwrap
for http auth
2019-12-08 12:26:02 +01:00
kolaente c2682a0d28
gitea: 1.10.0 -> 1.10.1 2019-12-05 22:39:19 +01:00
Mario Rodas 691bebf68b gitAndTools.delta: 0.0.14 -> 0.0.15
Changelog: https://github.com/dandavison/delta/releases/tag/0.0.15
2019-12-05 14:24:16 +01:00
ilikeavocadoes 6c6abf444b yadm: add missing dependencies
* yadm: add missing dependencies (#73615)

* yadm: replace buildCommand with installPhase
This let the fixup phase compress man pages and patch shebangs
2019-11-29 14:12:32 +01:00
Konrad Borowski 6e6b6a7fd5 git: enable some of previously broken tests 2019-11-29 11:28:53 +01:00
Wout Mertens acfa5d8324
Merge pull request #74213 from ruuda/fix-git-perl-support
git: fix the "perlSupport = false" configuration
2019-11-28 21:13:05 +01:00
Florian Klink b5cbd81954 Revert "gitlab: fix updater shebang"
This reverts commit be6f3f69bf.

In fact, `yarn2nix-moretea.yarn2nix` should be available via `yarn2nix`
in nixpkgs master.
2019-11-28 16:15:07 +01:00
Jörg Thalheim 8c145dc0fb
git: build with python3
git-p4 seems to be python3 ready:

https://github.com/git/git/blob/master/git-p4.py#L32
2019-11-28 11:29:19 +00:00
Jörg Thalheim 7973b3cd5e
pythonPackages.bugseverywhere: removing, abandoned (#74441)
pythonPackages.bugseverywhere: removing, abandoned
2019-11-28 09:53:21 +00:00
Dima 611493595a pythonPackages.bugseverywhere: removing, abandoned
This package has been abandoned by upstream, with the last version
being from 2012. This is being removed due to python 3 incompatibility.
2019-11-28 08:47:52 +01:00
Jonathan Ringer 0c1c18ca44
Merge branch 'master' into staging-next 2019-11-27 22:57:50 -08:00
Florian Klink f1c7891c8d
Merge pull request #74278 from talyz/gitlab-12.5.0
gitlab: 12.4.3 -> 12.5.0
2019-11-28 00:52:31 +01:00
Florian Klink deb0049ca0 gitlab-workhorse: 8.14.0 -> 8.14.1 2019-11-28 00:18:03 +01:00
Florian Klink 02eae2c3aa gitaly: 1.72.0 -> 1.72.1 2019-11-28 00:17:50 +01:00
Florian Klink 00f4760cdc gitlab: 12.5.0 -> 12.5.2 2019-11-28 00:17:30 +01:00
Florian Klink be6f3f69bf gitlab: fix updater shebang 2019-11-28 00:17:17 +01:00
Ruud van Asseldonk 2163fc7f0a git: fix the "perlSupport = false" configuration
When perlSupport = false, we will set NO_PERL=1, and build Git without
Perl support. This is a build option that Git supports. However, Git's
test suite still requires a Perl to be available to run the tests, and
we did not provide one. The tests respect PERL_PATH, and if it is not
set, they default to /usr/bin/perl.

Before this commit, if we set "perlSupport = false", then no Perl would
be available to the package, and so the tests would default to
/usr/bin/perl. When building without a sandbox, that could still work,
even though there is no "perl" on the path, because the tests defaulted
to an absolute path.

You can reproduce this issue as follows:

    nix-build -E 'let pkgs = (import ./default.nix) {}; in pkgs.git.override { perlSupport = false; }'

I just ran into this when trying to build pkgs.git from an old version
of Nixpkgs that I was able to build just fine in the past, and today it
would not build any more, complaining when running the tests:

    make -C t/ all
    make[1]: Entering directory '/build/git-2.18.0/t'
    rm -f -r 'test-results'
    /nix/store/czx8vkrb9jdgjyz8qfksh10vrnqa723l-bash-4.4-p23/bin/bash: /usr/bin/perl: No such file or directory

In the past the sandbox was not enabled by default, so then it worked
for me. But now that it is enabled, my host's (not NixOS) /usr/bin/perl
is no longer accessible, and the build fails.

The solution is to explicitly set PERL_PATH when running the tests. This
*almost* works, except that there appears to be a bug in the test for
"git request-pull". That command is a Bash script that calls Perl at
some point, so it requires Perl, and therefore it cannot be supported
when NO_PERL=1. But that particular test does not check whether Git was
compiled with Perl support (other tests do include that check), and that
makes the test fail:

    t5150-request-pull.sh ..............................
    not ok 4 - pull request after push
    not ok 5 - request asks HEAD to be pulled
    not ok 6 - pull request format
    not ok 7 - request-pull ignores OPTIONS_KEEPDASHDASH poison
    not ok 9 - pull request with mismatched object
    not ok 10 - pull request with stale object
    Dubious, test returned 1 (wstat 256, 0x100)
    Failed 6/10 subtests

This output makes sense if you look at t5150-request-pull.sh. Test 1 and
2 are setup steps. Test 3 does call request-pull, but it expects the
command to fail, and it cannot distinguish between the command exiting
with a nonzero exit code, or failing to start it at all. So test 3
passes for the wrong reasons. Test 4 through 10 all call request-pull,
so they fail.

The quick workaround here is to disable the test. I will look into
upstreaming a patch that makes the test skip itself when Perl is
disabled.
2019-11-27 19:23:56 +01:00
Julian Stecklina 00ad233d3c gitAndTools.git-machete: 2.12.1 -> 2.12.2 2019-11-27 18:54:25 +02:00
talyz ce2aa10765 gitlab: 12.4.3 -> 12.5.0 2019-11-26 17:32:01 +01:00
R. RyanTM c74aee8d32 gource: 0.49 -> 0.51 2019-11-26 00:13:50 -08:00
Mario Rodas ebde7664eb gitAndTools.git-subtrac: init at 0.01 2019-11-25 18:05:03 -08:00
Frederik Rietdijk 06a054e6eb Merge master into staging-next 2019-11-25 21:51:57 +01:00
Florian Klink e0734891f8
Merge pull request #73857 from petabyteboy/feature/gitlab-12-4-3
gitlab: 12.4.2 -> 12.4.3
2019-11-25 20:41:26 +01:00
Mario Rodas 8fa885e8d4
Merge pull request #74049 from anderslundstedt/master
git-subrepo: enable on Darwin
2019-11-24 14:26:32 -05:00
John Ericson d0d5136cce Merge remote-tracking branch 'upstream/master' into wrapper-pname-support 2019-11-24 17:25:07 +00:00
John Ericson 9b090ccbca treewide: Get rid of most parseDrvName without breaking compat
That is because this commit should be merged to both master and
release-19.09.
2019-11-24 17:22:28 +00:00
Anders Lundstedt fb0699d6bd git-subrepo: enable on Darwin 2019-11-24 16:42:34 +01:00
worldofpeace 27421fc6f0
Merge pull request #73907 from blitz/git-machete
git-machete: init at 2.12.1
2019-11-24 13:22:25 +00:00
Julian Stecklina 54a15bb2ec git-machete: init at 2.12.1 2019-11-24 15:08:55 +02:00
Frederik Rietdijk 1d18c5a0fe Merge staging-next into staging 2019-11-24 10:13:31 +01:00
Milan Pässler 7e0127e1ca tree-wide: inherit yarn2nix from yarn2nix-moretea 2019-11-24 01:04:26 +01:00
Daiderd Jordan 7da9844fde
Merge pull request #73826 from LnL7/darwin-git
git: disable failing test on darwin
2019-11-22 21:27:49 +01:00
Daiderd Jordan 185e30c664
git: disable failing test on darwin
The tests for null patterns where changed in 25754125cef278c7e9492fbd6dc4a28319b01f18,
it's possible utf-8 normalisation is causing different behaviour here.

    not ok 54 - LC_ALL='C' git grep -P -f f -i 'Æ<NUL>[Ð]' a
    not ok 57 - LC_ALL='C' git grep -P -f f -i '[Æ]<NUL>Ð' a
    not ok 60 - LC_ALL='C' git grep -P -f f -i '[Æ]<NUL>ð' a
    not ok 63 - LC_ALL='C' git grep -P -f f -i 'Æ<NUL>Ð' a
    Dubious, test returned 1 (wstat 256, 0x100)
    Failed 4/145 subtests
            (less 48 skipped subtests: 93 okay)
2019-11-22 21:02:21 +01:00
Mario Rodas 31a9f6a341 pijul: fix build 2019-11-21 19:08:06 -08:00
Milan Pässler f53fe02ff0 gitlab: 12.4.2 -> 12.4.3 2019-11-21 09:35:56 +00:00
Frederik Rietdijk 10d0c68a9b Merge staging-next into staging 2019-11-20 10:02:21 +01:00
Frederik Rietdijk 65edeb8633 Merge master into staging-next 2019-11-20 10:01:49 +01:00
Frederik Rietdijk 5f8b0d7d99 Merge staging-next into staging 2019-11-19 14:53:29 +01:00
Michael Weiss f7b894e031
gitRepo: 1.13.7.1 -> 1.13.8 2019-11-19 11:08:58 +01:00
adisbladis dcfc821c6c
treewide: Stop using Qt 5.9 2019-11-18 20:10:43 +00:00
adisbladis c9d8624ccd
treewide: Get rid of libGLU_combined 2019-11-18 20:10:43 +00:00
kolaente 8d5a0e1ef1
gitea: 1.9.5 -> 1.10.0 2019-11-18 20:36:35 +01:00
Frederik Rietdijk be7125dde7 Merge master into staging-next 2019-11-16 11:45:07 +01:00
kolaente c5939e67cd
gitea: 1.9.5 -> 1.9.6 2019-11-14 20:09:55 +01:00
Frederik Rietdijk c6e31d0767 Merge master into staging-next 2019-11-14 13:31:39 +01:00
Renaud 9d0c1c1e84
Merge pull request #70210 from cko/git-extras
gitAndTools.git-extras: 4.7.0 -> 5.0.0
2019-11-12 20:30:44 +01:00
Christine Koppelt 6d9280ea0f gitAndTools.git-extras: 4.7.0 -> 5.0.0
For a list of changes and additions see: https://github.com/tj/git-extras/releases/tag/5.0.0
2019-11-12 19:14:34 +01:00
Frederik Rietdijk 73b88e17dd Merge staging-next into staging 2019-11-11 12:09:26 +01:00
Paweł Kruszewski a2a5c65529 bcompare: 4.3.1.24438 -> 4.3.2.24472
(#72614)
2019-11-09 16:15:25 +01:00
Evan Stoll 67a0fafc49 gitkraken: 6.3.0 -> 6.3.1 (#73048) 2019-11-08 15:29:46 +00:00
Florian Klink a2429cffa3
Merge pull request #72894 from talyz/gitlab-12.4.2
gitlab: 12.4.1 -> 12.4.2
2019-11-08 15:23:39 +01:00
Matthew Bauer 5ebd36403e
Merge pull request #70641 from maggesi/rename-z77z-into-maggesi
Rename z77z into maggesi
2019-11-07 17:18:20 -05:00
Mario Rodas 58975005b2
gitAndTools.hub: 2.12.8 -> 2.13.0
Changelog: https://github.com/github/hub/releases/tag/v2.13.0
2019-11-06 16:20:00 -05:00
Aaron Andersen c22e76e450
Merge pull request #71605 from aanderse/redmine-cleanup
redmine: drop 3.4.x package, 4.0.4 -> 4.0.5
2019-11-06 18:02:48 -05:00
Jan Tojnar 3f2a425da3
Merge branch 'staging-next' into staging 2019-11-06 18:10:57 +01:00
talyz a779d7751e gitlab: 12.4.1 -> 12.4.2 2019-11-06 10:56:20 +01:00
talyz 22302ce845 gitlab: Limit node memory consumption to 2048MB
Hydra fails to build the assets on i686 - it runs out of memory. If we
limit the max consumption to 2048MB the assets still build, and will
hopefully also build on hydra.
2019-11-06 10:56:20 +01:00
talyz a30facc96e gitlab: Don't build any gitlab component outside linux
For some reason hydra seems to have issues downloading the
gitlab-workhorse source on macOS. Since we don't build the rails app
for macOS, the other components seem a bit useless there, so we
limit them to linux for now.
2019-11-06 10:56:20 +01:00
Gabriel Ebner c89b97e023 git-sizer: 1.0.0 -> 1.3.0 2019-11-05 18:36:00 +01:00
Frederik Rietdijk c4e30cf98c Merge staging-next into staging 2019-11-05 14:18:08 +01:00
Tim Steinbach 0a9e548b2f
git: 2.23.0 -> 2.24.0 2019-11-04 09:35:15 -05:00
Robert Hensing 64a8f2e48d
Merge pull request #71301 from nathyong/p4v-openssl-patch
p4v: explicitly depend on openssl 1.0 series
2019-11-04 14:35:43 +01:00
Edmund Wu 8fea620113 sourcehut.gitsrht: build git-srht-shell 2019-11-04 01:46:59 -08:00
Edmund Wu 9051e284ce sourcehut.core: fix build 2019-11-04 01:46:59 -08:00
Edmund Wu 78bbf841ea scmsrht: 0.15.3 -> 0.16.0 2019-11-04 01:46:59 -08:00
Edmund Wu 09570b1b0c todosrht: 0.51.11 -> 0.51.13 2019-11-04 01:46:59 -08:00
Edmund Wu 0d487aef71 pastesrht: 0.7.1 -> 0.7.3 2019-11-04 01:46:59 -08:00
Edmund Wu eb9b2ac6a0 metasrht: 0.35.3 -> 0.37.0 2019-11-04 01:46:59 -08:00
Edmund Wu 2269781690 hgsrht: 0.16.0 -> 0.16.2 2019-11-04 01:46:59 -08:00
Edmund Wu 7967cb05ad gitsrht: 0.34.2 -> 0.35.6 2019-11-04 01:46:59 -08:00
Edmund Wu 257f5d6303 dispatchsrht: 0.11.1 -> 0.12.3 2019-11-04 01:46:59 -08:00
Edmund Wu 9bc8540d86 buildsrht: 0.47.9 -> 0.48.0 2019-11-04 01:46:59 -08:00
Edmund Wu 21529a91d9 srht: 0.54.3 -> 0.54.4 2019-11-04 01:46:59 -08:00
Alyssa Ross 4b63c915af
git: drop extraneous sysconfdir trailing slash
I noticed while strace-ing that Git was trying to open
/etc//gitconfig.  Not a big deal, but it is definitely more correct
without the trailing slash.
2019-11-03 21:26:56 +00:00
R. RyanTM 99f221538b gitAndTools.stgit: 0.20 -> 0.21 2019-11-03 10:04:16 +01:00
Maximilian Bosch 945a52c90d
Merge pull request #72382 from kolaente/update/gitea-1.9.5
gitea: 1.9.4 -> 1.9.5
2019-11-01 11:33:59 +01:00
kolaente 67d0e44dc7
gitea: 1.9.4 -> 1.9.5 2019-10-31 20:33:22 +01:00
talyz 2e8417b52a gitlab: 12.4.0 -> 12.4.1 2019-10-31 18:55:08 +01:00
Vincent Laporte 7e51c79f17 monotoneViz: refactor out of ocamlPackages 2019-10-30 18:05:20 +00:00
worldofpeace 9121c914fc
Merge pull request #54530 from MatrixAI/dvc
dvc: init at 0.24.3
2019-10-29 01:14:50 +00:00
talyz 5081a6cd56 gitlab: 12.3.5 -> 12.4.0
- gitlab-shell no longer requires ruby for anything else than the
  install script, so the bundlerEnv stuff could be dropped

- gitlab-shell and gitlab-workhorse now report their versions
  correctly
2019-10-28 14:56:37 +01:00
Pawel Kruszewski 7d43ee015a bcompare: 4.3.0.24364 -> 4.3.1.24438 2019-10-28 08:22:46 +01:00
Roger Qiu 3c3ac19c43
dvc: init at 0.24.3 2019-10-28 13:07:58 +11:00
Aaron Andersen 9ec808ae62 redmine: 4.0.4 -> 4.0.5 2019-10-26 10:40:31 -04:00
Aaron Andersen 50e5139893 redmine: drop 3.4.x package 2019-10-26 10:40:16 -04:00
Mario Rodas 9e5a30b43e git-backup: init at 0.2.0 2019-10-24 18:50:34 -07:00
Mario Rodas 04cbe1b85b gitAndTools.delta: 0.0.12 -> 0.0.14 2019-10-24 10:14:39 +02:00
Dmitry Kalinkin e98a2d752c
Merge pull request #71483 from eadwu/sourcehut/update-2
sourcehut: update 2
2019-10-23 17:39:18 -04:00
Michael Weiss 597881a9e1
gitRepo: 1.13.7 -> 1.13.7.1 2019-10-22 21:23:49 +02:00
R. RyanTM 2202b9f774 git-secret: 0.3.1 -> 0.3.2
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/git-secret/versions
2019-10-21 19:19:07 -07:00
Florian Klink 1125fb02cc
Merge pull request #71428 from talyz/gitlab-already-initialized-constant
gitlab: Get rid of most 'already initialized constant'-warnings
2019-10-21 20:52:54 +02:00
Edmund Wu ec6740ab8d
scmsrht: 0.14.2 -> 0.15.3 2019-10-20 21:51:06 -04:00
Edmund Wu e481e10632
pastesrht: 0.5.2 -> 0.7.1 2019-10-20 21:50:54 -04:00
Edmund Wu cc64ae180f
metasrht: 0.35.2 -> 0.35.3 2019-10-20 21:50:49 -04:00
Edmund Wu ea1d0ce7ff
listssrht: 0.38.1 -> 0.38.3 2019-10-20 21:50:35 -04:00
Edmund Wu 815a204aa1
hgsrht: 0.15.2 -> 0.16.0 2019-10-20 21:50:21 -04:00
Edmund Wu d1f0cbd4fe
gitsrht: 0.33.1 -> 0.34.2 2019-10-20 21:50:16 -04:00
Edmund Wu 690ffc9761
buildsrht: 0.47.8 -> 0.47.9 2019-10-20 21:49:55 -04:00
Edmund Wu 7ebc8ded84
srht: 0.54.2 -> 0.54.3 2019-10-20 21:49:40 -04:00
talyz ed4a09c6f3 gitlab: Get rid of most 'already initialized constant'-warnings
On start, unicorn, sidekiq and other parts running ruby code emits
quite a few warnings similar to

/var/gitlab/state/config/application.rb:202: warning: already initialized constant Gitlab::Application::LOOSE_EE_APP_ASSETS
/nix/store/ysb0lgbzxp7a9y4yl8d4f9wrrzy9kafc-gitlab-ee-12.3.5/share/gitlab/config/application.rb:202: warning: previous definition of LOOSE_EE_APP_ASSETS was here
/var/gitlab/state/lib/gitlab.rb:38: warning: already initialized constant Gitlab::COM_URL
/nix/store/ysb0lgbzxp7a9y4yl8d4f9wrrzy9kafc-gitlab-ee-12.3.5/share/gitlab/lib/gitlab.rb:38: warning: previous definition of COM_URL was here

This seems to be caused by the same ruby files being evaluated
multiple times due to the paths being different - sometimes they're
loaded using the direct path and sometimes through a symlink, due to
our split between config and package data. To fix this, we make sure
that the offending files in the state directory always reference the
store path, regardless of that being the real file or a symlink.
2019-10-19 19:30:28 +02:00
Evan Stoll 9deca47b33 gitkraken: 6.2.1 -> 6.3.0 (#71294)
* gitkraken: 6.2.1 -> 6.3.0

* gitkraken: run preInstall and postInstall hooks during installPhase

* gitkraken: move dpkg to nativeBuildInputs
2019-10-18 18:26:12 +02:00
Nathan Yong 1ced63da76 p4v: explicitly depend on openssl 1.0 series
The 2017.3 version of p4v is linked against `libssl.so.1.0.0`.  Since
the default openssl in NixOS 2019.09 has been changed to openssl 1.1,
the p4v package must now import the openssl_1_0_2 derivation.
2019-10-18 09:26:28 +11:00
Frank Doepper bf12dc1ce7 git-annex-utils: init at 0.04-3-g531bb33 2019-10-15 14:41:24 +02:00
Marco Maggesi 24d0bd37b5
Merge branch 'master' into rename-z77z-into-maggesi 2019-10-13 18:06:23 +02:00
Vladimír Čunát b5697c6954
Merge branch 'master' into staging-next
Hydra nixpkgs: ?compare=1548439
2019-10-13 13:31:33 +02:00
Gürkan Gür e810171ef6 gitAndTools.gita: 0.9.2 -> 0.9.9 2019-10-12 14:47:43 +02:00
Jan Tojnar 6c8aed6391
Merge branch 'master' into staging-next 2019-10-12 00:50:21 +02:00
Renaud 05ab1cc756
Merge pull request #70950 from ktor/bcompare-4.3.0.24364
bcompare: 4.2.10.23938 -> 4.3.0.24364
2019-10-11 23:46:58 +02:00
Marek Mahut ccc06a7e01
Merge pull request #70798 from r-ryantm/auto-update/subgit
gitAndTools.subgit: 3.3.7 -> 3.3.8
2019-10-11 22:08:47 +02:00
Pawel Kruszewski eaa72aa453 bcompare: 4.2.10.23938 -> 4.3.0.24364 2019-10-11 06:14:23 +02:00
Mario Rodas 79ec4bb3d3
Merge pull request #70791 from r-ryantm/auto-update/stgit
gitAndTools.stgit: 0.19 -> 0.20
2019-10-09 21:37:09 -05:00
Dmitry Kalinkin a7b3728c64
Merge pull request #70255 from eadwu/sourcehut/update-1
sourcehut.*: 2019.10.02
2019-10-09 12:50:58 -04:00
Michael Weiss bd16602cb9
gitRepo: 1.13.6 -> 1.13.7 2019-10-09 18:02:22 +02:00
Elis Hirwing 79852ae24a
Merge pull request #70777 from kolaente/update/gitea-1.9.4
gitea: 1.9.3 -> 1.9.4
2019-10-09 09:34:45 +02:00
Robin Gloster eadeca9ea7
Merge pull request #70216 from talyz/gitlab_12_3_2
gitlab: 12.1.6 -> 12.3.5, bundler: 1.17.2 -> 1.17.3
2019-10-09 00:27:04 +02:00