Commit Graph

3032 Commits

Author SHA1 Message Date
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
R. RyanTM
170f42098d cvs_fast_export: 1.50 -> 1.51 2020-02-19 19:05:34 +00:00
worldofpeace
9f00427bdd meld: 3.20.1 -> 3.20.2 2020-02-18 07:14:40 -05:00
gnidorah
1462612de1 sourcehut: don't refer to rambox 2020-02-17 21:35:35 +03: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
Benjamin Hipple
201d464f12 pijul: fix build by migrating off legacy fetchCargo
Currently broken; see #79975 for details. Would also be fixed by #80153
eventually, but since we want to upgrade either way we might as well do so now.

https://hydra.nixos.org/job/nixpkgs/trunk/pijul.x86_64-linux
2020-02-16 09:36:17 -08: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
Dmitry Kalinkin
018fac1dc7
Merge pull request #76677 from eadwu/sourcehut/update-4
sourcehut/update-4
2020-02-15 06:07:26 -05: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
Mario Rodas
0565f10b24
Merge pull request #80073 from zowoq/gh
gitAndTools.gh: 0.5.4 -> 0.5.5
2020-02-13 21:48:54 -05:00
Michael Weiss
c1741fc12a
gitRepo: 2.1.1 -> 2.3 2020-02-14 01:06:36 +01: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
Florian Klink
0a87568b03 gitlab: 12.7.5 -> 12.7.6 2020-02-13 22:18:27 +01:00
Lancelot SIX
d6e780fd46
Merge pull request #79956 from r-ryantm/auto-update/mercurial
mercurial: 5.2.2 -> 5.3
2020-02-13 10:47:58 +01:00
R. RyanTM
523ea83cec mercurial: 5.2.2 -> 5.3 2020-02-13 00:01:08 +00: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
Frederik Rietdijk
424697d512 Merge master into staging-next 2020-02-12 09:55:31 +01:00
Michael Weiss
8ffa642baa
gitRepo: 2.0 -> 2.1.1 2020-02-11 18:32:29 +01:00
Frederik Rietdijk
1a6c3cb06b Merge staging into staging-next 2020-02-11 07:59:53 +01: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
R. RyanTM
9a4eb10862 yadm: 2.3.0 -> 2.4.0 2020-02-10 21:57:25 +00:00
Christian Lütke-Stetzkamp
df7ee19182 cvsq: init at 1.10 2020-02-10 20:58:06 +01:00
Frederik Rietdijk
079622ef2d
Merge pull request #79628 from NixOS/staging-next
Staging next
2020-02-10 17:53:25 +01:00
Michael Weiss
c213993880
gitRepo: 1.13.9.4 -> 2.0 2020-02-10 17:08:26 +01:00
Benjamin Hipple
2115a2037c fetchcargo: use flat tar.gz file for vendored src instead of recursive hash dir
This has several advantages:

1. It takes up less space on disk in-between builds in the nix store.
2. It uses less space in the binary cache for vendor derivation packages.
3. It uses less network traffic downloading from the binary cache.
4. It plays nicely with hashed mirrors like tarballs.nixos.org, which only
   substitute --flat hashes on single files (not recursive directory hashes).
5. It's consistent with how simple `fetchurl` src derivations work.
6. It provides a stronger abstraction between input src-package and output
   package, e.g., it's harder to accidentally depend on the src derivation at
   runtime by referencing something like `${src}/etc/index.html`. Likewise, in
   the store it's harder to get confused with something that is just there as a
   build-time dependency vs. a runtime dependency, since the build-time
   src dependencies are tarred up.

Disadvantages are:
1. It takes slightly longer to untar at the start of a build.

As currently implemented, this attaches the compacted vendor.tar.gz feature as a
rider on `verifyCargoDeps`, since both of them are relatively newly implemented
behavior that change the `cargoSha256`.

If this PR is accepted, I will push forward the remaining rust packages with a
series of treewide PRs to update the `cargoSha256`s.
2020-02-10 10:17:29 -05:00
Frederik Rietdijk
ec3edaf7b5 Merge master into staging-next 2020-02-10 12:55:47 +01:00
worldofpeace
9c22a82d2b
Merge pull request #78420 from evanjs/gitkraken-6.5.0
gitkraken: 6.4.1 -> 6.5.1
2020-02-09 21:30:09 -05:00
Michael Weiss
828e383f84
gitRepo: 1.13.9.3 -> 1.13.9.4 2020-02-09 19:13:13 +01:00
Benjamin Esham
35b403bf12 git: enable zsh completion
Git ships with a zsh completion script, but this script was previously
only available at $out/share/git/contrib/completion/git-completion.zsh,
which is not a path (or a filename) that would be discovered by a
typical zsh installation. This commit symlinks that file to
$out/share/zsh/site-functions/_git, which is a more standard location.

That zsh completion script is mostly a wrapper around the Bash
completion script, so this commit also patches the former so that it can
"find" the latter.
2020-02-09 09:22:20 +01:00
R. RyanTM
b2b755ece5 gitAndTools.git-machete: 2.12.6 -> 2.13.1 2020-02-08 09:20:18 +00:00
Mario Rodas
2fda7c1224
gitAndTools.delta: 0.0.15 -> 0.0.16
Changelog: https://github.com/dandavison/delta/releases/tag/0.0.16
2020-02-06 21:21:21 -05:00
Michael Weiss
5a0e91e78f
gitRepo: 1.13.9.2 -> 1.13.9.3 2020-02-06 21:49:21 +01:00
André-Patrick Bubel
3cd72fbd76
gogs: 0.11.86 -> 0.11.91, fixes CVE-2019-14544 2020-02-06 07:49:01 +01:00
Michael Weiss
14e53a0508
gitRepo: Rewrite the "urllib.request.urlopen" patch for Python 3
The old variant is still working but setting "cafile" is deprecated
since version 3.6 [0] and generates a warning:
DeprecationWarning: cafile, capath and cadefault are deprecated, use a custom context instead.

But without this patch "fetchRepoProject" still fails with
"error no host given" (see 337380ea1d).

[0]: https://docs.python.org/3.7/library/urllib.request.html#urllib.request.urlopen
2020-02-05 21:34:49 +01:00
Michael Weiss
7c558f7ac7
gitRepo: 1.13.9.1 -> 1.13.9.2 2020-02-05 21:01:38 +01:00
Michael Weiss
a95cfefa55
Merge pull request #79223 from primeos/pijul-fix
pijul: Fix the build (broke due to a more recent Rust version)
2020-02-04 14:52:58 +01:00
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