Commit Graph

1718 Commits

Author SHA1 Message Date
Sandro
0e1eb8650f
Merge pull request #114139 from SuperSandro2000/lab
lab: 0.19.0 -> 0.20.0, add SuperSandro2000 as maintainer
2021-02-23 22:47:29 +01:00
Sandro Jäckel
3c1787c2cb
lab: 0.19.0 -> 0.20.0, add SuperSandro2000 as maintainer 2021-02-23 17:16:18 +01:00
zowoq
ddfcdc5d49 gh: 1.6.1 -> 1.6.2
https://github.com/cli/cli/releases/tag/v1.6.2
2021-02-23 21:20:30 +10:00
github-actions[bot]
cf22d5fee7
Merge master into staging-next 2021-02-21 12:19:43 +00:00
R. RyanTM
2f8425c867 git-cola: 3.8 -> 3.9 2021-02-20 21:40:00 +00:00
Jan Tojnar
8f50f1ce10
Merge branch 'staging-next' into staging
Resolved the following conflicts:

- kernel flags between 09176d28a0 and 2b28822d8d
- clojure-lsp between 3fa00685ce and e03c068af5
2021-02-19 17:15:31 +01:00
Ben Siraphob
e03c068af5 treewide: makeWrapper buildInputs to nativeBuildInputs 2021-02-19 20:09:16 +07:00
Sandro
4b694d5e3d
Merge pull request #113674 from SuperSandro2000/fix-collection16 2021-02-19 13:27:03 +01:00
zowoq
3dab057264 Merge staging-next into staging 2021-02-19 10:47:46 +10:00
Sandro Jäckel
3de228aefd
git: remove unused input 2021-02-18 22:25:20 +01:00
zowoq
a5948fe664 gh: 1.6.0 -> 1.6.1
https://github.com/cli/cli/releases/tag/v1.6.1
2021-02-19 07:19:00 +10:00
github-actions[bot]
683536ab2a
Merge master into staging-next 2021-02-18 00:40:58 +00:00
zowoq
a7251011a6 gh: 1.5.0 -> 1.6.0
https://github.com/cli/cli/releases/tag/v1.6.0
2021-02-18 08:05:06 +10:00
github-actions[bot]
063e642108
Merge staging-next into staging 2021-02-16 12:20:07 +00:00
github-actions[bot]
b31a0f36f8
Merge master into staging-next 2021-02-16 12:20:04 +00:00
R. RyanTM
8419085032
glab: 1.14.0 -> 1.15.0 (#113267) 2021-02-15 23:17:44 -08:00
github-actions[bot]
018f748b81
Merge staging-next into staging 2021-02-15 00:37:07 +00:00
github-actions[bot]
0630986bf7
Merge master into staging-next 2021-02-15 00:37:03 +00:00
Ryan Burns
910e396d82 git-hub: 1.1.0 -> 2.1.0
Package is python3-only as of v2.0.0
2021-02-14 14:09:44 -08:00
Andreas Schmid
b5a137b2a0
git: add osxkeychainSupport option (#112503)
in order to be able to disable osxkeychain credential helper if no
wanted / necessary. Keep it `true` by default such that current logic is
not affected.

Signed-off-by: Andreas Schmid <service@aaschmid.de>
2021-02-13 14:02:17 +01:00
github-actions[bot]
c4d734932d
Merge staging-next into staging 2021-02-13 00:36:15 +00:00
github-actions[bot]
1d62dc37db
Merge master into staging-next 2021-02-13 00:36:11 +00:00
Maximilian Bosch
6964689aff
gitAndTools.tig: 2.5.1 -> 2.5.2
ChangeLog: https://github.com/jonas/tig/releases/tag/tig-2.5.2
2021-02-12 22:23:44 +01:00
Sandro Jäckel
ac6988b577
git-extras: use fetchFromGitHub 2021-02-12 20:35:38 +01:00
Sandro Jäckel
d32b77bacc
git-delete-merged-branches: update license 2021-02-12 20:35:38 +01:00
Sandro Jäckel
f787a71451
tig: cleanup 2021-02-12 20:35:37 +01:00
github-actions[bot]
ae07bf1352
Merge staging-next into staging 2021-02-12 00:36:23 +00:00
github-actions[bot]
344456f66a
Merge master into staging-next 2021-02-12 00:36:19 +00:00
R. RyanTM
67ff7413eb diff-so-fancy: 1.3.0 -> 1.4.0 2021-02-11 15:00:28 +00:00
github-actions[bot]
8df773cc54
Merge staging-next into staging 2021-02-11 00:36:13 +00:00
github-actions[bot]
5f9df37683
Merge master into staging-next 2021-02-11 00:36:09 +00:00
Guillaume Girol
26f6af373e
Merge pull request #112329 from alyssais/git-cinnabar
git-cinnabar: 0.5.4 -> 0.5.6
2021-02-10 20:15:44 +00:00
Michael Weiss
8132d63bc5
git: 2.30.0 -> 2.30.1 (#112581) 2021-02-10 11:39:09 +01:00
github-actions[bot]
30dddce5e8
Merge master into staging-next 2021-02-09 06:16:02 +00:00
Alyssa Ross
6c4d3aa6f7
git-cinnabar: 0.5.4 -> 0.5.6
Also add missing installPhase hooks, and clarify license.
I'm assuming GPL-2.0-only, because it doesn't seem to be specified, and
the helper links with git, which is -only.
2021-02-07 21:35:46 +00:00
R. RyanTM
2d12b884ef thicket: 0.1.3 -> 0.1.4 2021-02-06 21:59:42 +00:00
github-actions[bot]
77db03ceac
Merge master into staging-next 2021-02-06 12:19:10 +00:00
R. RyanTM
c8e7fd0fb3 delta: 0.5.1 -> 0.6.0 2021-02-06 10:08:19 +00:00
github-actions[bot]
fadee272e0
Merge staging-next into staging 2021-02-06 00:35:48 +00:00
Sandro Jäckel
ba18acfe78
git-interactive-rebase-tool: Add SuperSandro2000 as maintainer 2021-02-05 21:21:06 +01:00
github-actions[bot]
bd1a0c9702
Merge staging-next into staging 2021-02-05 12:19:39 +00:00
Sandro
a618b4847d
Merge pull request #111647 from NixOS/girt-2.0.0
gitAndTools.git-interactive-rebase-tool: 1.2.1 -> 2.0.0
2021-02-05 11:57:14 +01:00
Sandro Jäckel
c4f417b6c2
gitAndTools.git-interactive-rebase-tool: 1.2.1 -> 2.0.0 2021-02-05 11:42:11 +01:00
Jan Tojnar
75153ede17
Merge branch 'staging-next' into staging 2021-02-02 19:46:31 +01:00
Sandro Jäckel
e08919c891
legit: Disable tests 2021-02-02 14:46:08 +01:00
github-actions[bot]
7044cd0c9d
Merge staging-next into staging 2021-02-01 18:31:04 +00:00
Jan Tojnar
54f4529aec
Merge pull request #111519 from siraben/xdg-utils-naming 2021-02-01 17:18:57 +01:00
Markus Kowalewski
147bc60225
qgit: fix license 2021-02-01 13:30:17 +01:00
Ben Siraphob
a6ac3eedbd treewide: xdg_utils -> xdg-utils 2021-02-01 15:05:09 +07:00
github-actions[bot]
f92395cf3c
Merge staging-next into staging 2021-01-31 06:19:43 +00:00
github-actions[bot]
81337921f5
Merge staging-next into staging 2021-01-31 00:46:33 +00:00
Sebastian Pipping
201b24adc5 git-big-picture: 1.0.0 -> 1.1.1
- Migrate from fetchFromGitHub to fetchPypi to ease SHA256 handling
- Drop tests (while not included with PyPI releases)
- Install a man page (as shipped by upstream)
- Move buildInputs to runtime only

Co-Authored-By: Silvan Mosberger <contact@infinisil.com>
2021-01-31 00:14:30 +01:00
R. RyanTM
347820365f git-remote-gcrypt: 1.3 -> 1.4 2021-01-29 19:02:06 +00:00
github-actions[bot]
4c82d7eb24
Merge staging-next into staging 2021-01-29 06:19:21 +00:00
R. RyanTM
1b2cd14dd7 glab: 1.13.1 -> 1.14.0 2021-01-29 03:02:05 +00:00
github-actions[bot]
798f7b136c
Merge staging-next into staging 2021-01-28 18:30:08 +00:00
Travis CI
a49a608632 gitAndTools.git-machete: 2.15.9 -> 2.16.1
###### 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
2021-01-28 15:03:41 +00:00
Thomas Tuegel
0e418a1a18
Merge pull request #108888 from ttuegel/feature--staging--qt-no-mkDerivation
Qt: Do not require mkDerivation
2021-01-26 16:24:41 -06:00
Thomas Tuegel
5590e365e4
qtbase: Check for wrapQtAppsHook in setupHook 2021-01-25 15:56:15 -06:00
zowoq
a7dda29d8a Revert "gh: enable tests"
This reverts commit c7deb49058.

Fails with sandboxing.
2021-01-26 07:26:59 +10:00
Pavol Rusnak
a6ce00c50c
treewide: remove stdenv where not needed 2021-01-25 18:31:47 +01:00
Mario Rodas
f90209acd1 gitAndTools.lab: 0.18.0 -> 0.19.0
https://github.com/zaquestion/lab/releases/tag/v0.19.0
2021-01-24 04:20:00 +00:00
Drew Risinger
c7deb49058 gh: enable tests 2021-01-23 00:48:39 +10:00
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
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
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
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
yoctocell
0714396196
gitAndTools.gita: 0.10.10 -> 0.11.9 2021-01-12 19:59:55 +01: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
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
David Terry
c75a976845
radicle-upstream: 0.1.5 -> 0.1.6 2021-01-07 11:48: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
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
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
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
IvarWithoutBones
0c971e7bc5 gitAndTools.ghr: init at 0.13.0 2020-12-28 03:51:36 +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