Commit Graph

3826 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
ecf06378f7
Merge pull request #112855 from SuperSandro2000/fix-collection10 2021-02-12 21:16:00 +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]
53c1035b44
Merge staging-next into staging 2021-02-12 12:20:24 +00:00
github-actions[bot]
15db604744
Merge master into staging-next 2021-02-12 12:20:20 +00:00
Michael Weiss
b4f2376434
gitRepo: 2.12.1 -> 2.12.2 2021-02-12 12:38:33 +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
Maximilian Bosch
a6d8a4c65a
Merge pull request #112784 from r-ryantm/auto-update/diff-so-fancy
diff-so-fancy: 1.3.0 -> 1.4.0
2021-02-11 20:29:06 +01:00
Michael Weiss
c9858b6d88
gitRepo: 2.12 -> 2.12.1 2021-02-11 19:27:32 +01: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]
1d1ce08e2b
Merge staging-next into staging 2021-02-02 12:24:27 +00:00
Maximilian Bosch
0eac65888f
gitea: 1.13.1 -> 1.13.2
https://github.com/go-gitea/gitea/releases/tag/v1.13.2
2021-02-02 09:40:42 +01:00
github-actions[bot]
4c1eae9176
Merge staging-next into staging 2021-02-02 00:42:42 +00:00
github-actions[bot]
7044cd0c9d
Merge staging-next into staging 2021-02-01 18:31:04 +00:00
Albin Otterhäll
a10fade7e4 pijul: 1.0.0-alpha.37 -> 1.0.0-alpha.38 2021-02-01 18:01:54 +01: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
Mario Rodas
5be9ec41a3
Merge pull request #111192 from r-ryantm/auto-update/git-remote-gcrypt
git-remote-gcrypt: 1.3 -> 1.4
2021-01-30 15:36:45 -05:00
Mario Rodas
f72a44d6f5
Merge pull request #111210 from r-ryantm/auto-update/fossil
fossil: 2.13 -> 2.14
2021-01-30 15:35:44 -05:00
github-actions[bot]
e788d512e8
Merge staging-next into staging 2021-01-30 00:44:04 +00:00
R. RyanTM
ebe677c84f fossil: 2.13 -> 2.14 2021-01-29 22:04:15 +00:00
Jeff Slight
e2c0897eba
gitlab: 13.7.1 -> 13.7.4 (#108720) 2021-01-29 21:13:59 +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
github-actions[bot]
06efb52369
Merge staging-next into staging 2021-01-27 18:28:34 +00:00
Ben Siraphob
82454e9df8 treewide: remove implicit use of stdenv.lib 2021-01-27 20:04:57 +07: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
Sandro
3cd31450a1
Revert "nodePackages: regenerate with node2nix 1.9.0" 2021-01-25 11:31:27 +01:00
Sander van der Burg
40f27ff2be
Merge pull request #110545 from svanderburg/node2nix-update
nodePackages: regenerate with node2nix 1.9.0
2021-01-25 09:13:59 +01:00
dadada
dc8231950c gitea: add passthru.tests
Reference nixos tests to execute on package upgrades.
2021-01-24 08:50:59 +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
volth
bc0d605cf1 treewide: fix double quoted strings in meta.description
Signed-off-by: Ben Siraphob <bensiraphob@gmail.com>
2021-01-24 19:56:59 +07:00
Ryan Horiguchi
95f8678091
gitkraken: 7.4.1 -> 7.5.0 (#110561) 2021-01-24 01:11:22 +01:00
Sander van der Burg
3e385dc285 nodePackages: regenerate with node2nix 1.9.0 2021-01-22 22:42:58 +01:00
Drew Risinger
c7deb49058 gh: enable tests 2021-01-23 00:48:39 +10:00
Michael Weiss
62b5e51019
gitRepo: 2.11.1 -> 2.12 2021-01-22 12:34:36 +01:00
Sandro
d8d2ec148b
Merge pull request #110411 from a12l/update-pijul
pijul: 1.0.0-alpha.35 -> 1.0.0-alpha.37
2021-01-22 09:35:49 +01:00
Albin Otterhäll
62015c03b6 pijul: 1.0.0-alpha.35 -> 1.0.0-alpha.37 2021-01-22 00:25:49 +01: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
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