Commit graph

3688 commits

Author SHA1 Message Date
Alyssa Ross 3893d6c6d7 gitAndTools: move everything to the top level
The comment at the top of git-and-tools/default.nix said:

    /* All git-relates tools live here, in a separate attribute set so that users
     * can get a fast overview over what's available.

but unfortunately that hasn't actually held up in practice.

Git-related packages have continued to be added to the top level, or
into gitAndTools, or sometimes both, basically at random, so having
gitAndTools is just confusing.  In fact, until I looked as part of
working on getting rid of gitAndTools, one program (ydiff) was
packaged twice independently, once in gitAndTools and once at the top
level (I fixed this in 98c3490196).

So I think it's for the best if we move away from gitAndTools, and
just put all the packages it previously contained at the top level.
I've implemented this here by just making gitAndTools an alias for the
top level -- this saves having loads of lines in aliases.nix.  This
means that people can keep referring to gitAndTools in their
configuration, but it won't be allowed to be used within Nixpkgs, and
it won't be presented to new users by e.g. nix search.

The only other change here that I'm aware of is that
appendToName "minimal" is not longer called on the default git
package, because doing that would have necessitated having a private
gitBase variable like before.  I think it makes more sense not to do
that anyway, and reserve the "minimal" suffix only for gitMinimal.
2021-01-14 21:27:48 +00:00
Mario Rodas 88710b0751 git-lfs: 2.13.1 -> 2.13.2
https://github.com/git-lfs/git-lfs/releases/tag/v2.13.2
2021-01-13 21:00:00 -05:00
Sandro 0238b200e7
Merge pull request #109130 from yoctocell/gita-0.11.9 2021-01-13 08:44:12 +01:00
Florian Klink c0a6ee2511 gerrit: 3.2.3 -> 3.3.1
Fixes https://github.com/NixOS/nixpkgs/issues/109167
Addresses CVE-2020-8919
Addresses CVE-2020-8920
2021-01-12 23:08:43 -08:00
yoctocell 0714396196
gitAndTools.gita: 0.10.10 -> 0.11.9 2021-01-12 19:59:55 +01:00
zeripath 0e0900cba5
gitea: add sqlite_unlock_notify build tag
Fix #109004

When building Gitea with sqlite support the sqlite_unlock_notify tag must also be added otherwise there will be frequent error reports of database is locked.
2021-01-11 18:09:14 +00:00
Profpatsch 4a7f99d55d treewide: with stdenv.lib; in meta -> with lib;
Part of: https://github.com/NixOS/nixpkgs/issues/108938

meta = with stdenv.lib;

is a widely used pattern. We want to slowly remove
the `stdenv.lib` indirection and encourage people
to use `lib` directly. Thus let’s start with the meta
field.

This used a rewriting script to mostly automatically
replace all occurances of this pattern, and add the
`lib` argument to the package header if it doesn’t
exist yet.

The script in its current form is available at
https://cs.tvl.fyi/depot@2f807d7f141068d2d60676a89213eaa5353ca6e0/-/blob/users/Profpatsch/nixpkgs-rewriter/default.nix
2021-01-11 10:38:22 +01:00
github-actions[bot] fcbe48c797
Merge master into staging-next 2021-01-09 18:41:27 +00:00
Michael Weiss 288fb1f2ba
gitRepo: 2.11 -> 2.11.1 2021-01-09 17:49:35 +01:00
Kevin Cox f56a833916
Merge pull request #108668 from moritzschaefer/fix-sparkleshare-dependency
Add sh/bash dependency to fix 'missing sh in PATH' error
2021-01-09 07:40:53 -05:00
Moritz Schaefer b78ec60157 sparkleshare: add missing 'bash' dependency
Sparkleshare requires 'sh' to be in its PATH, or push-operations fail. Its PATH consists of a single entry, which is configured in the postInstall phase. The bash-derivative includes 'sh', and adding it to the dependencies resolves the issue.
2021-01-09 12:33:29 +01:00
github-actions[bot] f89e74dbcc
Merge master into staging-next 2021-01-08 18:37:56 +00:00
github-actions[bot] ecebf82121
Merge master into staging-next 2021-01-08 12:29:36 +00:00
Georges Dubus 78620e28d6 pijul: 1.0.0-alpha.24 -> 1.0.0-alpha.31 2021-01-08 12:43:09 +01:00
Sheena Artrip e1369c7775
tortoisehg: 5.2.1 -> 5.6 2021-01-07 17:48:31 -08:00
Jan Tojnar f19eb635b4
Merge branch 'master' into staging-next
b04fc593e7 seems to have accidentally changed mkDerivation function for dfilemanager and solarus-quest-editor so I have reverted that here.
2021-01-07 13:04:31 +01:00
Sandro fbe1d82c01
Merge pull request #108656 from xwvvvvwx/radicle-upstream-0.1.6
radicle-upstream: 0.1.5 -> 0.1.6
2021-01-07 12:32:05 +01:00
Michael Weiss e640da3120
gitRepo: 2.10 -> 2.11 2021-01-07 12:07:00 +01:00
David Terry c75a976845
radicle-upstream: 0.1.5 -> 0.1.6 2021-01-07 11:48:50 +01:00
Sandro Jäckel 694ff9691e
sourcehout: Disable setuptools check 2021-01-07 10:41:32 +01:00
Sandro 3f132c79ac
Merge pull request #108536 from SuperSandro2000/small-fixes 2021-01-07 10:38:49 +01:00
Sandro Jäckel ac391fdc0b
pythonPackages:google*: Noramlize names by replacing _ with - 2021-01-06 23:59:50 +01:00
Mario Rodas b3f079e40c
Merge pull request #107012 from DamienCassou/DamienCassou/git-when-merged
gitAndTools.git-when-merged: init at 1.2.0
2021-01-06 17:30:53 -05:00
Mario Rodas 9cd62d08d5 gitAndTools.lab: 0.17.2 -> 0.18.0
https://github.com/zaquestion/lab/releases/tag/v0.18.0
2021-01-05 22:25:32 -05:00
zowoq e791ab1241 gitAndTools.delta: 0.5.0 -> 0.5.1
https://github.com/dandavison/delta/releases/tag/0.5.1
2021-01-06 05:55:10 +10:00
zowoq fb2311d430 Merge staging-next into staging 2021-01-03 16:33:28 +10:00
Tim Steinbach 4c9414d31c hub: Add test 2021-01-02 15:43:01 -05:00
Tim Steinbach 0576111e8a hub: Replace git references
Hub fetches git from the environment by default.
This can lead to hub installations without git available, which makes little sense.
The change replaces the references with fully-qualified calls to git
2021-01-02 15:43:01 -05:00
Maximilian Bosch e7d1be840c
treewide: remove maintainership of ma27 from a few packages
Those are packages I don't use anymore for a longer time and I therefore
don't think that listing me as maintainer is a good idea. If those
should be removed now, I'd be fine with that.

SuperSandro2000 will take care of a few packages[1].

[1] https://github.com/NixOS/nixpkgs/pull/108126#pullrequestreview-560599381
2021-01-01 19:48:01 +01:00
Frederik Rietdijk 3f08495212
Merge pull request #108022 from siraben/cmake-native-build-inputs
[staging] treewide: cmake buildInputs to nativeBuildInputs, minor cleanups
2021-01-01 10:54:25 +01:00
github-actions[bot] 645e99f891
Merge staging-next into staging 2021-01-01 06:22:43 +00:00
Ben Siraphob b04fc593e7 treewide: cmake buildInputs to nativeBuildInputs, minor cleanups 2021-01-01 11:52:33 +07:00
Sandro eef90463b3
Merge pull request #107934 from SuperSandro2000/gitoxide-darwin
gitoxide: Fix build on darwin
2021-01-01 03:28:03 +01:00
Frederik Rietdijk f3b4ae8402 Merge staging-next into staging 2020-12-31 13:29:55 +01:00
zowoq 119e770ca3 gitAndTools.delta: 0.4.5 -> 0.5.0
https://github.com/dandavison/delta/releases/tag/0.5.0
2020-12-31 11:19:34 +10:00
Sandro Jäckel a69b5bf7ec
gitoxide: Fix build on darwin 2020-12-30 03:05:47 +01:00
github-actions[bot] 7e406bcad6
Merge staging-next into staging 2020-12-30 00:53:05 +00:00
syberant 9fc8e8ab4f gitoxide: 0.4.3 -> 0.6.0 2020-12-29 22:29:44 +01:00
Michael Weiss 61ae600daf
git: 2.29.2 -> 2.30.0 (#107828)
The removed patch was merged into Git 2.30:
3569e11d69

And the disabled test is new in Git 2.30.
2020-12-29 11:19:28 +01:00
Martin Weinelt d80f32edd1
Merge pull request #107835 from mweinelt/gitstatus
gitstatus: 1.4.3 -> 1.4.4
2020-12-29 02:22:25 +01:00
Sandro 86bee6a672
Merge pull request #107660 from IvarWithoutBones/ghr-0.13 2020-12-29 00:56:08 +01:00
Martin Weinelt 72c33c3b62 gitAndTools.gitstatus: clarify license is gpl3Only 2020-12-29 00:14:19 +01:00
Martin Weinelt 28136138a6 gitAndTools.gitstatus: 1.4.3 -> 1.4.4 2020-12-29 00:14:16 +01:00
Maximilian Bosch cd4a0ab71c
gitea: 1.13.0 -> 1.13.1
ChangeLog: https://github.com/go-gitea/gitea/releases/tag/v1.13.1
2020-12-28 21:21:46 +01:00
Aaron Andersen 8ff0302c7a
Merge pull request #107155 from aanderse/redmine
redmine: wrap rdm-mailhandler.rb for inbound e-mail capabilities
2020-12-28 10:06:46 -05:00
IvarWithoutBones 0c971e7bc5 gitAndTools.ghr: init at 0.13.0 2020-12-28 03:51:36 +01:00
Milan Pässler 44108c5d7c gitlab: take care of vendorSha256 in updater script 2020-12-27 00:39:20 +01:00
Milan Pässler 3157904d4a gitlab: remove unused deps.nix files
These were added again in https://github.com/NixOS/nixpkgs/pull/107558
because the update script still ran vgo2nix.
2020-12-27 00:39:20 +01:00
Jeff Slight e86efbc48b
gitlab: 13.6.1 -> 13.7.1 (#107558) 2020-12-26 22:06:22 +01:00
Maximilian Bosch f456a8c482
Merge pull request #107401 from yanganto/gitui-11
gitAndTools.gitui: 0.10.1 -> 0.11.0
2020-12-23 21:18:33 +01:00