Commit Graph

1649 Commits

Author SHA1 Message Date
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