Commit graph

3856 commits

Author SHA1 Message Date
zowoq 59b83c43e0 treewide: add final newline 2021-01-22 07:18:04 +10:00
zowoq c06d37b803 gh: 1.4.0 -> 1.5.0
https://github.com/cli/cli/releases/tag/v1.5.0
2021-01-22 06:06:25 +10:00
R. RyanTM 8540ac06e9
ghorg: 1.4.0 -> 1.5.0 (#109824) 2021-01-21 10:07:01 -08:00
zowoq 8adc564f28 treewide: editorconfig fixes
- add final newline
- use spaces for indentation
2021-01-21 09:30:52 +10:00
Jonathan Ringer 9bb3fccb5b treewide: pkgs.pkgconfig -> pkgs.pkg-config, move pkgconfig to alias.nix
continuation of #109595

pkgconfig was aliased in 2018, however, it remained in
all-packages.nix due to its wide usage. This cleans
up the remaining references to pkgs.pkgsconfig and
moves the entry to aliases.nix.

python3Packages.pkgconfig remained unchanged because
it's the canonical name of the upstream package
on pypi.
2021-01-19 01:16:25 -08:00
Sandro 7aef69e156
Merge pull request #109835 from r-ryantm/auto-update/glab
glab: 1.11.1 -> 1.13.1
2021-01-18 23:56:24 +01:00
Sandro 3c1286c49b
Merge pull request #109834 from r-ryantm/auto-update/gitflow
gitflow: 1.12.2 -> 1.12.3
2021-01-18 23:23:21 +01:00
Sandro ae73cf38c3
Merge pull request #109833 from r-ryantm/auto-update/git-workspace
git-workspace: 0.7.0 -> 0.8.0
2021-01-18 23:23:04 +01:00
R. RyanTM 750a287640 glab: 1.11.1 -> 1.13.1 2021-01-18 22:00:55 +00:00
R. RyanTM c43ab02c67 gitflow: 1.12.2 -> 1.12.3 2021-01-18 21:56:44 +00:00
R. RyanTM 90344c1b40 git-workspace: 0.7.0 -> 0.8.0 2021-01-18 21:37:14 +00:00
R. RyanTM 4e58963af8 git-ignore: 1.0.0 -> 1.1.1 2021-01-18 21:24:20 +00:00
Sandro 4ae325df93
Merge pull request #109569 from hartwork/update-git-big-picture
git-big-picture: 0.10.1 -> 1.0.0 (fixes CVE-2021-3028)
2021-01-18 00:28:32 +01:00
Sebastian Pipping b706315dfc git-big-picture: 0.10.1 -> 1.0.0 (fixes CVE-2021-3028)
Also propagates move of repository from https://github.com/esc/git-big-picture
to https://github.com/git-big-picture/git-big-picture .

Upstream change log at
https://github.com/git-big-picture/git-big-picture#changelog
2021-01-17 23:58:42 +01:00
Albin Otterhäll 5b809848b4 pijul: 1.0.0-alpha.31 -> 1.0.0-alpha.35 2021-01-17 01:32:51 +01:00
Anderson Torres f0e757d98a
Merge pull request #108513 from languitar/patch-1
pass-git-helper: 1.1.0 -> 1.1.1
2021-01-16 16:27:01 -03:00
Ben Siraphob badf51221d treewide: stdenv.lib -> lib 2021-01-16 17:58:11 +07:00
Johannes Wienke 15bbb7deec pass-git-helper: 1.1.0 -> 1.1.1
Bump package and add new test requirements.
2021-01-15 12:15:27 +01:00
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
zowoq 56139b3dfd gitAndTools.delta: 0.4.4 -> 0.4.5
https://github.com/dandavison/delta/releases/tag/0.4.5
2020-12-23 22:01:38 +10:00
Jacek Galowicz 47df17d39d
Merge pull request #107230 from VirtusLab/git-machete-2.15.9
gitAndTools.git-machete: 2.15.7 -> 2.15.9
2020-12-22 15:34:26 +01:00
Antonio Yang 044cd65ef0 gitui: 0.10.1 -> 0.11.0 2020-12-22 21:50:57 +08:00
Vladyslav M e853b90763
pijul: 1.0.0-alpha.21 -> 1.0.0-alpha.24 2020-12-20 18:04:51 +02:00
Travis CI 5b5ee84a3b gitAndTools.git-machete: 2.15.7 -> 2.15.9
###### 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 @blitz @Ma27 @tfc @worldofpeace
2020-12-19 22:56:37 +00:00
Aaron Andersen 1288f41c6e redmine: wrap rdm-mailhandler.rb for inbound e-mail capabilities 2020-12-18 09:14:17 -05:00
R. RyanTM 141633de7e fossil: 2.12.1 -> 2.13 2020-12-17 07:52:24 +01:00
Damien Cassou ffcc723c73
gitAndTools.git-when-merged: init at 1.2.0 2020-12-16 17:28:00 +01:00
zowoq ee275b02c1 gitAndTools.gh: 1.3.1 -> 1.4.0
https://github.com/cli/cli/releases/tag/v1.4.0
2020-12-16 05:50:32 +10:00
Graham Christensen 9612cb9092
Merge pull request #84062 from abathur/fix/yadm_src_usage
yadm: install from build directory instead of $src
2020-12-15 10:39:20 -05:00
David Terry 9062c1ecff
radicle-upstream: init at 0.1.5 2020-12-15 12:58:38 +01:00
Vladyslav M e969834269
Merge pull request #106683 from dywedir/pijul
pijul: 1.0.0-alpha.17 -> 1.0.0-alpha.21
2020-12-14 21:15:58 +02:00
Ryan Mulligan 4b5c7cd10f
Merge pull request #106551 from kfollesdal/update-bumpver
bumpver: 2020.1107 -> 2020.1108
2020-12-14 05:45:57 -08:00
Mario Rodas fa9d40263e git-lfs: 2.12.1 -> 2.13.1
https://github.com/git-lfs/git-lfs/releases/tag/v2.13.1
2020-12-13 04:20:00 +00:00
kfollesdal 909e8748e9 bumpver: 2020.1107 -> 2020.1108 2020-12-12 18:51:25 +01:00
Vladyslav M 7bb1035037
pijul: 1.0.0-alpha.17 -> 1.0.0-alpha.21 2020-12-11 22:53:48 +02:00
freezeboy 8f94e6566a rabbitvcs: 0.17.1 -> 0.18
Also remove dependency to python2
2020-12-06 09:16:43 -08:00
Jan Tojnar 6ce08f74dc
Merge branch 'master' into staging-next 2020-12-06 03:28:13 +01:00
Vladyslav M 8de71d243b
pijul: 1.0.0-alpha.11 -> 1.0.0-alpha.17 2020-12-05 16:06:43 +02:00
github-actions[bot] 884a0b091b
Merge master into staging-next 2020-12-04 00:37:25 +00:00
zowoq fa1a819492 gitAndTools.gh: 1.3.0 -> 1.3.1
https://github.com/cli/cli/releases/tag/v1.3.1
2020-12-04 07:45:19 +10:00
github-actions[bot] 58274c4f8d
Merge master into staging-next 2020-12-03 00:36:28 +00:00
Sandro 0c4aeb53b9
Merge pull request #105655 from r-ryantm/auto-update/git-secret
git-secret: 0.3.2 -> 0.3.3
2020-12-02 19:30:30 +01:00
github-actions[bot] d3f5608624
Merge master into staging-next 2020-12-02 18:13:34 +00:00
Maximilian Bosch 9714dd3ef5
Merge pull request #105698 from aanderse/gitea
gitea: 1.12.6 -> 1.13.0
2020-12-02 15:51:46 +01:00
Sandro 4c0b3da940
Merge pull request #104761 from kfollesdal/init-pycalver 2020-12-02 15:41:32 +01:00
Aaron Andersen 16dd1c902c gitea: 1.12.6 -> 1.13.0 2020-12-02 08:57:26 -05:00
github-actions[bot] 89e8bf0f2a
Merge master into staging-next 2020-12-02 12:30:55 +00:00
Michael Weiss 7352db0f5d
gitRepo: 2.9 -> 2.10 2020-12-02 11:37:48 +01:00
R. RyanTM d14c0d0b6b gitkraken: 7.4.0 -> 7.4.1 2020-12-01 23:04:58 -08:00
R. RyanTM a26d53abee git-secret: 0.3.2 -> 0.3.3 2020-12-02 05:56:09 +00:00
kfollesdal 025b6d50f5 bumpver: init at 2020.1107 2020-12-01 19:24:17 +01:00
Frederik Rietdijk ff90abd5dd Merge staging-next into staging 2020-12-01 14:23:10 +01:00
Sandro eae8be1c9c
Merge pull request #105563 from r-ryantm/auto-update/sparkleshare
sparkleshare: 3.28 -> 3.38
2020-12-01 10:57:55 +01:00
Andreas Rammhold c3452dae0e
Merge pull request #105498 from raboof/git-reproducible-docs
git: make manual reproducible
2020-12-01 10:30:05 +01:00
R. RyanTM 17ed388517 sparkleshare: 3.28 -> 3.38 2020-12-01 09:22:54 +00:00
Arnout Engelen 91099b08ae
git: make manual reproducible
This makes the git HTML manual reproducible.

It also removes the `git.info` manual, since this one is
basically entirely broken anyway. This likely happened
when we migrated from asciidoc to asciidoctor in #102020.
I don't suggest going back to asciidoc: that would
re-introduce a python2 dependency and another
reproducibility issue with the HTML docs.

Co-Authored-By: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
2020-12-01 08:33:58 +01:00
Vladyslav M f107a46bac
pijul: 1.0.0-alpha.8 -> 1.0.0-alpha.11 2020-12-01 00:09:57 +02:00
Florian Klink a623bc0ba4
Merge pull request #104689 from petabyteboy/feature/gitlab-13-6-1
gitlab: 13.6.0 -> 13.6.1
2020-11-29 22:37:42 +01:00
StigP e2968a0442
Merge pull request #102061 from braunse/gogs-0-12-3
gogs: 0.11.91 -> 0.12.3
2020-11-29 10:01:47 +01:00
Doron Behar 14b61ec8eb
Merge pull request #105044 from freezeboy/add-glab
gitAndTools.glab: init at 1.11.1
2020-11-28 18:15:47 +02:00
Sebastien Braun 5c87a6b8ea gogs: 0.11.91 -> 0.12.3 2020-11-28 06:50:52 +01:00
Martin Weinelt 517303dd6f
Merge pull request #105179 from r-ryantm/auto-update/gitstatus
gitAndTools.gitstatus: 1.3.1 -> 1.4.3
2020-11-27 22:59:42 +01:00
R. RyanTM 0acf2268f3 gitAndTools.gitstatus: 1.3.1 -> 1.4.3 2020-11-27 21:42:59 +00:00
Sandro 3b68ae53d9
Merge pull request #99509 from ktor/bcompare-4.3.7.25118
bcompare: 4.3.5.24893 -> 4.3.7.25118
2020-11-27 20:47:08 +01:00
freezeboy 2f2166f40d gitAndTools.glab: init at 1.11.1 2020-11-27 07:11:15 +01:00
Vladyslav M 5868266543
Merge pull request #105073 from dywedir/pijul
pijul: 1.0.0-alpha.5 -> 1.0.0-alpha.8
2020-11-27 00:04:13 +02:00
Sandro 48feb84a9d
Merge pull request #101185 from SuperSandro2000/lab-xdg-open
gitAndTools.lab: wrap xdg-open to fix `lab mr browse`
2020-11-26 22:07:19 +01:00
Vladyslav M fe79e0abed
pijul: 1.0.0-alpha.5 -> 1.0.0-alpha.8 2020-11-26 22:12:00 +02:00
Milan Pässler 72ba4fce76 gitaly: build with system libgit2 2020-11-26 14:12:14 +01:00
Milan Pässler c1c2ff4a97 gitlab: 13.6.0 -> 13.6.1 2020-11-26 14:12:14 +01:00
Milan Pässler 844eddf330 gitlab-workhorse: use buildGoModule 2020-11-26 14:12:13 +01:00
Milan Pässler 2e4862d3ba gitlab-shell: use buildGoModule 2020-11-26 14:12:13 +01:00
Milan Pässler 0f344cc0db gitaly: use buildGoModule 2020-11-26 14:12:06 +01:00
Sandro 8585991bfb
Merge pull request #100758 from SuperSandro2000/git-delete-merged-branches 2020-11-26 03:52:46 +01:00
Henri Menke 6617122306 gitAndTools.pass-git-helper: 0.4 -> 1.1.0 2020-11-25 19:24:20 +01:00
zowoq 8d4af2e08c gitAndTools.gh: 1.2.1 -> 1.3.0
https://github.com/cli/cli/releases/tag/v1.3.0
2020-11-25 07:49:56 +10:00
Graham Christensen bc49a0815a
utillinux: rename to util-linux 2020-11-24 12:42:06 -05:00
Sandro 4c0e73053b
Merge pull request #103212 from victorluft/submergeupg 2020-11-23 15:01:07 +01:00
Sandro d2d2345384
Merge pull request #104246 from colatkinson/strip-cgit
cgit: strip debug symbols from cgit.cgi
2020-11-23 14:02:29 +01:00
Vladyslav M 8e245f583a
Merge pull request #104600 from dywedir/pijul
pijul: 1.0.0-alpha.3 -> 1.0.0-alpha.5
2020-11-22 18:44:36 +02:00
Vladyslav M 4b453515f1
pijul: 1.0.0-alpha.3 -> 1.0.0-alpha.5 2020-11-22 15:27:10 +02:00
Florian Klink 904f124247
Merge pull request #99116 from jslight90/gitlab-13.4.0
GitLab 13.0.14 -> 13.6.0
2020-11-22 12:00:03 +01:00
Milan Pässler 2429d5a307 gitlab: 13.5.1 -> 13.6.0
Changed ruby version to 2.7.x to match upstream.
Added a gem config for gitlab-pg_query as it tries to download a source
tarball during the build process.
Also removed a patch for gitaly that has become obsolete by upstream fix
[here](de04077c25).
2020-11-21 01:38:35 +01:00
Milan Pässler 4555a26b06 gitlab: 13.4.3 -> 13.5.1 2020-11-20 19:26:30 +01:00
Jeff Slight 2cf524c825 gitlab: add new line to end of data.json file 2020-11-20 19:26:30 +01:00
Jeff Slight c16a977386 gitlab: 13.0.14 -> 13.4.3
13.4.3
2020-11-20 19:26:30 +01:00
Jan Tojnar f6105d21e3
Merge branch 'master' into staging-next 2020-11-20 01:38:32 +01:00
Martin Weinelt 46769c7a77
Merge pull request #104307 from jonringer/fix-mercurial
mercurial: 5.4.2 -> 5.6, fix build
2020-11-19 23:43:04 +01:00
Jonathan Ringer 81d1cea1c0 mercurial: 5.4.2 -> 5.6 2020-11-19 11:29:46 -08:00
Jonathan Ringer 635485b85c mercurial: remove dulwich dependency 2020-11-19 11:25:52 -08:00
Frederik Rietdijk ea7b8978ef Merge master into staging-next 2020-11-19 20:08:15 +01:00
Ryan Mulligan 74eb38ffd5
Merge pull request #104124 from r-ryantm/auto-update/gitkraken
gitkraken: 7.3.2 -> 7.4.0
2020-11-19 09:49:07 -08:00
Colin Atkinson 3bc05c2602
cgit: strip debug symbols from cgit.cgi
The debug symbols result in an unneeded runtime dependency on GCC, and
properly stripping them shrinks the size of the closure significantly.
2020-11-19 00:49:00 -05:00
Victor Luft 2caa1782b5 sublime-merge: 2032 -> 2039 2020-11-18 11:58:31 -05:00
Frederik Rietdijk da12fc6838 Merge staging-next into staging 2020-11-18 15:36:56 +01:00
R. RyanTM 5544734b23 gitkraken: 7.3.2 -> 7.4.0 2020-11-18 03:46:26 +00:00
Oleksii Filonenko 512c3c0a05 maintainers: rename filalex77 -> Br1ght0ne 2020-11-17 13:09:31 +02:00
Vladyslav M 65e0474c7a
pijul: 1.0.0-alpha.1 -> 1.0.0-alpha.3 2020-11-16 21:49:15 +02:00
Maximilian Bosch a9a1423377
gitea: 1.12.5 -> 1.12.6
https://github.com/go-gitea/gitea/releases/tag/v1.12.6
2020-11-16 17:37:12 +01:00
Maximilian Bosch fdeba5ef32
Merge pull request #103873 from r-ryantm/auto-update/git-cola
git-cola: 3.5 -> 3.8
2020-11-16 13:30:47 +01:00
R. RyanTM acf82008ab git-cola: 3.5 -> 3.8 2020-11-15 05:44:05 +00:00
Vladyslav M a429039a1f
pijul: 1.0.0-alpha -> 1.0.0-alpha.1 2020-11-14 23:21:01 +02:00
Andrew Childs d686ded08c
git: fix darwin build (#103774)
The install step for the darwin specific $out/etc/gitconfig file
assumed that $out/etc already existed. This assumption is no longer
true after f5e2ff1ed80dac74bfb0afa92f34641cce098a49 in #103421. This
change makes make sure the directory exists before adding to it.
2020-11-14 18:32:52 +01:00
Frederik Rietdijk 9fc4a4db5a Merge staging-next into staging 2020-11-13 20:59:08 +01:00
Jonas Chevalier a7cb88c3de
tree-wide: unify Bash completions outputs (#103421)
Use $out/share/bash-completion/completions to store the Bash completions
2020-11-12 21:22:18 +00:00
zowoq 1e53f7e10b gitAndTools.gh: 1.2.0 -> 1.2.1
https://github.com/cli/cli/releases/tag/v1.2.1
2020-11-11 15:08:15 -08:00
Vladyslav M dd4ebbc91f
Merge pull request #102968 from dywedir/anu
pijul: 0.12.0 -> 1.0.0-alpha
2020-11-11 18:06:03 +02:00
Robert Hensing 3f7278f9e9
Merge pull request #101341 from SuperSandro2000/gitlab-triage
gitlab-triage: init at 1.13.0
2020-11-10 19:14:29 +01:00
Andrew Childs 4e2a217211
gitui: fix darwin build (#103194)
Fixes:

  = note: ld: warning: passed two min versions (10.12.0, 10.12) for platform macOS. Using 10.12.
          ld: framework not found AppKit
          clang-7: error: linker command failed with exit code 1 (use -v to see invocation)
2020-11-10 10:13:52 -05:00
Vladyslav M 2e1400173b
pijul: 0.12.0 -> 1.0.0-alpha 2020-11-09 21:05:03 +02:00
Victor Luft a1a4585729 sublime-merge-dev: 2033 -> 2037 2020-11-09 09:52:15 -05:00
Frederik Rietdijk 99fb79ae84 Merge master into staging-next 2020-11-06 12:51:56 +01:00
Robert Hensing 349288d101
Merge pull request #100582 from ldenefle/git-chglog-0.9.1
gitAndTools.git-chglog: init at 0.9.1
2020-11-05 22:39:07 +01:00
Frederik Rietdijk 10c57af49c Merge staging-next into staging 2020-11-04 09:28:07 +01:00
Frederik Rietdijk 9e6d7d3c74 Merge master into staging-next 2020-11-04 09:27:42 +01:00
Mario Rodas 422d223757 git-lfs: 2.12.0 -> 2.12.1
https://github.com/git-lfs/git-lfs/releases/tag/v2.12.1
2020-11-04 04:20:00 +00:00
Maximilian Bosch 988e44c3e6
Merge pull request #102567 from VirtusLab/git-machete-2.15.7
gitAndTools.git-machete: 2.15.6 -> 2.15.7
2020-11-04 00:18:52 +01:00
Frederik Rietdijk 470f05cb5d Merge staging-next into staging 2020-11-03 12:06:41 +01:00
Frederik Rietdijk 237966224d Merge master into staging-next 2020-11-03 12:06:06 +01:00
Mario Rodas 76ff5a73c7 gitAndTools.git-absorb: 0.6.5 -> 0.6.6 2020-11-02 22:00:00 -05:00
Travis CI 6373a64873 gitAndTools.git-machete: 2.15.6 -> 2.15.7
###### 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 @blitz @Ma27 @tfc @worldofpeace
2020-11-03 01:53:25 +00:00
Mario Rodas eb64ee0a46
Merge pull request #102295 from r-ryantm/auto-update/git-extras
gitAndTools.git-extras: 6.0.0 -> 6.1.0
2020-11-02 18:10:23 -05:00
Mario Rodas c1d13cde94
Merge pull request #102430 from r-ryantm/auto-update/git-filter-repo
gitAndTools.git-filter-repo: 2.28.0 -> 2.29.0
2020-11-02 04:53:13 -05:00
Pavol Rusnak 2c931312ce treewide: simplify rev/repo arguments in src
+ use fetchFromGithub where possible
2020-11-01 23:02:24 -08:00
R. RyanTM 73e3b14503 gitAndTools.git-filter-repo: 2.28.0 -> 2.29.0 2020-11-02 05:48:03 +00:00
Jonathan Ringer 9122b454f6 csv_fast_export: use python3 2020-11-01 10:54:30 -08:00
Frederik Rietdijk 83dde6c52c Merge staging-next into staging 2020-11-01 10:11:12 +01:00
Frederik Rietdijk 7a8d5dc8a6 Merge master into staging-next 2020-11-01 10:10:47 +01:00
Mario Rodas 26d3fbf215
Merge pull request #102310 from r-ryantm/auto-update/git-gone
gitAndTools.git-gone: 0.3.6 -> 0.3.7
2020-10-31 23:00:45 -05:00
Mario Rodas 76fdf69296
Merge pull request #102303 from r-ryantm/auto-update/git-trim
gitAndTools.git-trim: 0.4.0 -> 0.4.2
2020-10-31 22:11:55 -05:00
R. RyanTM 5535343769 gitAndTools.git-gone: 0.3.6 -> 0.3.7 2020-11-01 02:35:57 +00:00
R. RyanTM 0c77c15642 gitAndTools.git-trim: 0.4.0 -> 0.4.2 2020-11-01 01:10:34 +00:00
R. RyanTM 3408bddacf gitAndTools.git-extras: 6.0.0 -> 6.1.0 2020-11-01 00:15:25 +00:00
Vladimír Čunát dfd3ede68d
Merge branch 'master' into staging-next 2020-10-31 14:30:44 +01:00
Michael Weiss 6a1782986d
git: 2.29.1 -> 2.29.2 2020-10-30 13:55:20 +01:00
Sebastien Braun bbf96d898b
git: Use asciidoctor instead of asciidoc for manpages
Asciidoc is severely outdated and is replaced by asciidoctor.
Eliminating asciidoc gets rid of a python2 dependency, see
https://github.com/NixOS/nixpkgs/issues/101964
2020-10-30 10:48:33 +01:00
MetaDark ff4a1cf4d8 git-review: build with python3
Also updated source to the new repo and added myself as a maintainer
2020-10-29 16:01:12 -07:00
Andreas Rammhold db0fe5c3eb
Merge branch master into staging to fix eval error
This fixes the eval error of the small (and "big"?) NixOS test set that
was fixed in 1088f05 & eba8f542.
2020-10-28 03:03:27 +01:00
zowoq f2eb36b889 gitAndTools.gh: 1.1.0 -> 1.2.0
https://github.com/cli/cli/releases/tag/v1.2.0
2020-10-28 00:38:12 +10:00
Vladimír Čunát 89023c38fc
Recover the complicated situation after my bad merge
I made a mistake merge.  Reverting it in c778945806 undid the state
on master, but now I realize it crippled the git merge mechanism.
As the merge contained a mix of commits from `master..staging-next`
and other commits from `staging-next..staging`, it got the
`staging-next` branch into a state that was difficult to recover.

I reconstructed the "desired" state of staging-next tree by:
 - checking out the last commit of the problematic range: 4effe769e2
 - `git rebase -i --preserve-merges a8a018ddc0` - dropping the mistaken
   merge commit and its revert from that range (while keeping
   reapplication from 4effe769e2)
 - merging the last unaffected staging-next commit (803ca85c20)
 - fortunately no other commits have been pushed to staging-next yet
 - applying a diff on staging-next to get it into that state
2020-10-26 09:01:04 +01:00
Vladimír Čunát 336bc8283b
Re-Revert "Merge #101508: libraw: 0.20.0 -> 0.20.2"
This reverts commit c778945806.

I believe this is exactly what brings the staging branch into
the right shape after the last merge from master (through staging-next);
otherwise part of staging changes would be lost
(due to being already reachable from master but reverted).
2020-10-26 08:19:17 +01:00
Vladimír Čunát 2f6b00b15e
Merge branch 'staging-next' into staging 2020-10-25 09:47:04 +01:00
Vladimír Čunát c778945806
Revert "Merge #101508: libraw: 0.20.0 -> 0.20.2"
I'm sorry; I didn't notice it contained staging commits.

This reverts commit 17f5305b6c, reversing
changes made to a8a018ddc0.
2020-10-25 09:41:51 +01:00
Vladimír Čunát 17f5305b6c
Merge #101508: libraw: 0.20.0 -> 0.20.2 2020-10-25 09:28:53 +01:00
WORLDofPEACE 949f7f9227
Merge pull request #98316 from NixOS/gnome-3.38
GNOME 3.38
2020-10-23 20:02:38 -04:00
Jan Tojnar b2ff709179
meld: Fix build on Darwin
Meld’s post install script requires gtk-update-icon-cache program on PATH.
Because Meld is a Python app, it uses strictDeps so we need to explicitly
add the program to nativeBuildInputs.

For some reason, Linux version has the program available, though,
which hides the missing dependency. Perhaps it is propagated by something
but I do not know how to determine it.
2020-10-24 01:17:26 +02:00
Jan Tojnar 8317c630af
Merge branch 'staging-next' into staging 2020-10-24 01:10:37 +02:00
Jan Tojnar c252654584
Merge branch 'master' into staging-next 2020-10-24 01:10:07 +02:00
Michael Weiss de32261d9f
git: 2.29.0 -> 2.29.1 (#101488) 2020-10-23 20:55:30 +02:00
Danielle Lancashire b197c7fb48 p4: 2020.1.1991450 -> 2020.1.2007551
The download URL hasn't changed, but the sha256 and user facing download
version has. See [perforce downloads][p4-download].

[p4-download]: https://www.perforce.com/downloads/helix-command-line-client-p4
2020-10-23 16:24:13 +02:00
Sandro Jäckel 863ae4a768
gitlab-triage: init at 1.13.0 2020-10-23 09:37:39 +02:00