Commit Graph

1934 Commits

Author SHA1 Message Date
Maximilian Bosch
cd7a26eb8c
gitAndTools.tig: 2.5.3 -> 2.5.4
ChangeLog: https://github.com/jonas/tig/releases/tag/tig-2.5.4
2021-06-05 20:51:07 +02:00
github-actions[bot]
5b9da195a0
Merge master into staging-next 2021-06-04 01:45:17 +00:00
zowoq
2959ad27de gh: 1.10.3 -> 1.11.0
https://github.com/cli/cli/releases/tag/v1.11.0
2021-06-04 10:18:55 +10:00
github-actions[bot]
59de269a92
Merge master into staging-next 2021-05-30 12:49:08 +00:00
Antonio Yang
a8daff8b1a gitui: 0.15.0 -> 0.16.0 2021-05-30 12:41:00 +08:00
github-actions[bot]
4cfefea5b2
Merge master into staging-next 2021-05-29 01:43:58 +00:00
Mario Rodas
4052d0eceb gitAndTools.delta: 0.7.1 -> 0.8.0
https://github.com/dandavison/delta/releases/tag/0.8.0
2021-05-28 04:20:00 +00:00
github-actions[bot]
a743ebe846
Merge master into staging-next 2021-05-27 18:58:59 +00:00
Sandro
ee74a87392
Merge pull request #124591 from SuperSandro2000/diff-so-fancy
diff-so-fancy: 1.4.0 -> 1.4.1
2021-05-27 19:39:19 +02:00
Sandro Jäckel
15eb917faf
diff-so-fancy: 1.4.0 -> 1.4.1 2021-05-27 17:04:19 +02:00
github-actions[bot]
df4ebfc46c
Merge master into staging-next 2021-05-26 12:31:55 +00:00
Profpatsch
005702524a git-vendor: init at 1.2.0 2021-05-26 11:36:30 +02:00
github-actions[bot]
0615bb674f
Merge master into staging-next 2021-05-25 00:59:01 +00:00
Josh Holland
6ce887b083
stgit: enable tests and install documentation (#122370) 2021-05-25 02:01:03 +02:00
github-actions[bot]
d0c1f6a78f
Merge staging-next into staging 2021-05-22 12:27:12 +00:00
github-actions[bot]
563389a7fd
Merge master into staging-next 2021-05-22 12:27:09 +00:00
Sandro
efee454783
Merge pull request #123981 from r-ryantm/auto-update/lab
lab: 0.21.0 -> 0.22.0
2021-05-22 09:16:50 +02:00
R. RyanTM
04cb517e7d lab: 0.21.0 -> 0.22.0 2021-05-22 06:36:22 +00:00
github-actions[bot]
d5714df652
Merge staging-next into staging 2021-05-22 06:21:58 +00:00
github-actions[bot]
cc35c7fc85
Merge master into staging-next 2021-05-22 06:21:55 +00:00
R. RyanTM
4d46cb67ad gh: 1.10.2 -> 1.10.3 2021-05-22 15:56:25 +10:00
Arnout Engelen
17ccfe3f51
Merge pull request #123502 from Atemu/minimalIso-remove-ruby2.7
minimalIso: remove ruby2.7
2021-05-21 18:41:02 +02:00
github-actions[bot]
929b12e7b5
Merge master into staging-next 2021-05-21 12:28:43 +00:00
Michael Weiss
d3ad6d42ca
Merge pull request #123713 from Mindavi/git/cross-compilation
git: support cross-compilation by disabling perl support
2021-05-21 12:50:47 +02:00
Atemu
88c2c543bf Revert "git: Use asciidoctor instead of asciidoc for manpages"
This reverts commit bbf96d898b.

Removes dependency on ruby 2.7 and isn't much slower.

See https://github.com/NixOS/nixpkgs/pull/123502 for more info
2021-05-21 09:50:48 +02:00
Jonathan Ringer
14f3686af1
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts:
  pkgs/applications/terminal-emulators/alacritty/default.nix
  pkgs/servers/clickhouse/default.nix
2021-05-20 09:12:42 -07:00
R. RyanTM
2bab7f632d gh: 1.10.1 -> 1.10.2 2021-05-20 18:31:56 +10:00
Rick van Schijndel
7dda632e2b git: support cross-compilation by disabling perl support 2021-05-19 20:35:30 +02:00
Jonathan Ringer
c1f8a15dac
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts:
  nixos/doc/manual/release-notes/rl-2105.xml
  pkgs/tools/security/sequoia/default.nix
2021-05-19 10:39:54 -07:00
zowoq
3aaa5c80ab gh: 1.10.0 -> 1.10.1
https://github.com/cli/cli/releases/tag/v1.10.1
2021-05-19 22:30:28 +10:00
github-actions[bot]
7000ae2b9a
Merge master into staging-next 2021-05-19 00:55:36 +00:00
zowoq
255de2ca30 gh: 1.9.2 -> 1.10.0
https://github.com/cli/cli/releases/tag/v1.10.0
2021-05-19 08:30:29 +10:00
Jonathan Ringer
f7a112f6c4
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts:
  pkgs/applications/graphics/emulsion/default.nix
  pkgs/development/tools/misc/texlab/default.nix
  pkgs/development/tools/rust/bindgen/default.nix
  pkgs/development/tools/rust/cargo-udeps/default.nix
  pkgs/misc/emulators/ruffle/default.nix
  pkgs/tools/misc/code-minimap/default.nix
2021-05-18 08:57:16 -07:00
R. RyanTM
50fbc6b6b3 git-secret: 0.3.3 -> 0.4.0 2021-05-17 13:56:55 -07:00
R. RyanTM
f7d1b76d33 glab: 1.16.0 -> 1.17.0 2021-05-17 10:55:23 -07:00
github-actions[bot]
3ff6965554
Merge master into staging-next 2021-05-17 06:22:23 +00:00
Sandro
700942d2a5
Merge pull request #121119 from SuperSandro2000/remove-gnidorah
treewide: remove gnidorah
2021-05-17 02:42:24 +02:00
github-actions[bot]
6cdac75d25
Merge staging-next into staging 2021-05-16 18:32:44 +00:00
Anderson Torres
cf45c45605
Merge pull request #121588 from eduardosm/sip-rename
pythonPackages.sip: rename to sip_4, pythonPackages.sip_5: rename to sip
2021-05-16 13:31:55 -03:00
R. RyanTM
fd79304769 lefthook: 0.7.4 -> 0.7.5 2021-05-16 02:49:14 -04:00
github-actions[bot]
9911b1c75b
Merge staging-next into staging 2021-05-16 01:01:01 +00:00
Stéphan Kochen
f00d022ebf git-workspace: fix darwin build 2021-05-15 16:27:23 -07:00
Eduardo Sánchez Muñoz
08a26e4579 pythonPackages.sip: rename to sip_4
sip 4 is the old and unmaintained version
2021-05-10 20:41:38 +02:00
Jan Tojnar
594a885912
Merge branch 'staging-next' into staging 2021-05-10 09:45:47 +02:00
Léo Gaspard
45d1222d47 git: add link to related nixos test
It'd be better to have a git-only test, but in the meantime this is the
first available test I could find, and it's still better than nothing.
2021-05-08 21:40:56 +02:00
Daniël de Kok
85f96822a0 treewide: fix cargoSha256/cargoHash
Rust 1.50.0 incorporated a Cargo change (rust-lang/cargo#8937) in
which cargo vendor erroneously changed permissions of vendored
crates. This was fixed in Rust
1.51.0 (rust-lang/cargo#9131). Unfortunately, this means that all
cargoSha256/cargoHashes produced during the Rust 1.50.0 cycle are
potentially broken.

This change updates cargoSha256/cargoHash tree-wide.

Fixes #121994.
2021-05-08 00:36:37 -07:00
Josh Holland
9622f8cad8 gitAndTools.stgit: 1.0 -> 1.1 2021-05-07 18:06:15 +01:00
Mario Rodas
0d1d2c6510
Merge pull request #121363 from r-ryantm/auto-update/lefthook
lefthook: 0.7.3 -> 0.7.4
2021-05-05 22:27:56 -05:00
David Terry
3f64800076
radicle-upstream: 0.1.11 -> 0.2.3 2021-05-03 23:26:04 +02:00
Git Machete Release Bot
ed3439be2f gitAndTools.git-machete: 3.1.0 -> 3.1.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).
2021-05-01 15:46:24 +00:00
R. RyanTM
66a96f031a lefthook: 0.7.3 -> 0.7.4 2021-05-01 05:55:57 +00:00
Sandro Jäckel
ae02415ee8
treewide: remove gnidorah
due to github account removal/deletion and not other mean of contact.
2021-04-30 01:48:19 +02:00
R. RyanTM
d3e48342a3 gitui: 0.14.0 -> 0.15.0 2021-04-27 23:45:06 -04:00
Arnout Engelen
1be3d412c0
treewide: go: inherit platforms instead of using platforms.all
`buildGoModule` and `buildGoPackage` by default inherit the `platforms`
from go. That seems better than explicitly configuring `platforms.all`.

There are also many packages that specify 'linux + darwin' - this is
even suggested in the documentation. We might also want to update those,
but let's do the noncontroversial change first.
2021-04-26 08:59:56 +02:00
hdhog
793562da34
git-chglog: 0.9.1 -> 0.14.2 (#120097) 2021-04-24 09:16:07 +02:00
Norbert Melzer
65499c8a82
lefthook: 0.7.2 -> 0.7.3 (#120346)
Co-authored-by: Louis Bettens <lourkeur@users.noreply.github.com>
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2021-04-24 03:57:36 +02:00
R. RyanTM
a48b8974ee bit: 1.0.6 -> 1.1.1 2021-04-22 06:27:11 +00:00
Sandro
def594ee27
Merge pull request #119978 from SuperSandro2000/git-interactive-rebase-tool
git-interactive-rebase-tool: 2.0.0 -> 2.1.0
2021-04-21 05:10:17 +02:00
Sandro Jäckel
431db0eaad
git-interactive-rebase-tool: 2.0.0 -> 2.1.0 2021-04-21 03:12:11 +02:00
zowoq
00fe267003 gh: 1.9.1 -> 1.9.2
https://github.com/cli/cli/releases/tag/v1.9.2
2021-04-21 07:13:02 +10:00
zowoq
2f8a54eb09 gh: 1.9.0 -> 1.9.1
https://github.com/cli/cli/releases/tag/v1.9.1
2021-04-16 06:19:34 +10:00
zowoq
9c8cb61854 gh: 1.8.1 -> 1.9.0
https://github.com/cli/cli/releases/tag/v1.9.0
2021-04-15 10:22:29 +02:00
Alyssa Ross
715d5a73ae
git-cinnabar: 0.5.6 -> 0.5.7 2021-04-13 12:16:02 +00:00
Maximilian Bosch
d1572b7161
Merge pull request #119212 from jshholland/stgit-1.0
gitAndTools.stgit: 0.23 -> 1.0
2021-04-12 17:51:11 +02:00
Antonio Yang
e81d95ebcd gitui: 0.13.0 -> 0.14.0 2021-04-12 21:11:39 +08:00
Josh Holland
248a6da7f6 gitAndTools.stgit: 0.23 -> 1.0 2021-04-12 08:18:06 +01:00
github-actions[bot]
3bf92ca4db
Merge master into staging-next 2021-04-03 18:18:51 +00:00
Frederik Rietdijk
e5f9db3135 git-bz: stay with python2 2021-04-03 17:06:07 +02:00
github-actions[bot]
74200a7126
Merge master into staging-next 2021-04-03 00:14:57 +00:00
zowoq
941cb99cf2 gh: 1.8.0 -> 1.8.1
https://github.com/cli/cli/releases/tag/v1.8.1
2021-04-03 06:10:35 +10:00
github-actions[bot]
b3a0328b7f
Merge master into staging-next 2021-04-02 18:14:54 +00:00
Sandro
5a41d751ae
Merge pull request #104919 from gravndal/git-annex-remote-googledrive 2021-04-02 17:28:35 +02:00
Gaute Ravndal
e9f12cd9db git-annex-remote-googledrive: init at 1.3.0 2021-04-01 23:05:45 +02:00
github-actions[bot]
85e9b4acf4
Merge staging-next into staging 2021-04-01 12:06:32 +00:00
R. RyanTM
386b5cd123 bit: 1.0.5 -> 1.0.6 2021-04-01 05:33:55 +00:00
github-actions[bot]
cb1554f24c
Merge staging-next into staging 2021-03-31 00:12:32 +00:00
github-actions[bot]
4ba71fb819
Merge master into staging-next 2021-03-31 00:12:29 +00:00
zowoq
7248f89da2 gh: 1.7.0 -> 1.8.0
https://github.com/cli/cli/releases/tag/v1.8.0
2021-03-31 06:04:56 +10:00
github-actions[bot]
2d211c7a3a
Merge staging-next into staging 2021-03-30 06:05:44 +00:00
github-actions[bot]
ce7cdafed9
Merge master into staging-next 2021-03-30 06:05:42 +00:00
Mario Rodas
27a17ac2e4 gitAndTools.delta: 0.6.0 -> 0.7.1
https://github.com/dandavison/delta/releases/tag/0.7.1
2021-03-29 04:20:00 +00:00
github-actions[bot]
f311dede4c
Merge staging-next into staging 2021-03-29 00:15:53 +00:00
github-actions[bot]
d495e7527f
Merge master into staging-next 2021-03-29 00:15:48 +00:00
Thomas Gerbet
45cea67242 gitAndTools.git-bug: 0.7.1 -> 0.7.2
Fixes CVE-2021-28955.
2021-03-28 20:42:36 +02:00
github-actions[bot]
cbd2c726fb
Merge staging-next into staging 2021-03-28 12:06:24 +00:00
github-actions[bot]
25268aeaf7
Merge master into staging-next 2021-03-28 12:06:21 +00:00
Michael Weiss
1372aa414c
git: 2.31.0 -> 2.31.1 2021-03-27 13:44:34 +01:00
R. RyanTM
415788b8d3 git-extras: 6.1.0 -> 6.2.0 2021-03-27 11:09:44 +00:00
github-actions[bot]
8e2d0e45c0
Merge master into staging-next 2021-03-24 18:10:39 +00:00
Sandro
58b1c47c77
Merge pull request #117423 from fabaff/bit 2021-03-24 18:47:53 +01:00
Git Machete Release Bot
e485ab8ce5 gitAndTools.git-machete: 3.0.0 -> 3.1.0
###### 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-03-24 14:50:19 +00:00
Fabian Affolter
0432eccae8 bit: init at 1.05 2021-03-24 01:05:55 +01:00
R. RyanTM
e669ec230f git-hub: 2.1.0 -> 2.1.1 2021-03-22 08:20:31 +00:00
github-actions[bot]
8c03075f07
Merge staging-next into staging 2021-03-19 00:41:08 +00:00
R. RyanTM
b5e9c378d4 lab: 0.20.0 -> 0.21.0 2021-03-17 14:10:13 +00:00
Michael Weiss
571ddf1ba5
git: 2.30.2 -> 2.31.0 (#116471) 2021-03-15 22:45:09 +01:00
github-actions[bot]
611019db38
Merge staging-next into staging 2021-03-15 18:16:53 +00:00
Antonio Yang
674c39c08f gitui: 0.12.0 -> 0.13.0 2021-03-15 23:24:24 +08:00
github-actions[bot]
6f1d8a6a11
Merge staging-next into staging 2021-03-15 12:25:49 +00:00
R. RyanTM
5a3feadb55 ghorg: 1.5.0 -> 1.5.1 2021-03-15 03:24:32 -04:00
github-actions[bot]
2c7bf48e77
Merge staging-next into staging 2021-03-14 06:17:35 +00:00
R. RyanTM
d8a96e2f8f glab: 1.15.0 -> 1.16.0 2021-03-14 00:39:34 -05:00
Sandro
54395344a8
git: disable flaky test (#115847)
Co-authored-by: Michael Weiss <dev.primeos@gmail.com>
2021-03-11 10:22:05 +01:00
github-actions[bot]
ae64aaa5c0
Merge staging-next into staging 2021-03-10 00:39:15 +00:00
Michael Weiss
4990d3c5f8
git: 2.30.1 -> 2.30.2 (CVE-2021-21300)
Links for the security issue:
- https://lore.kernel.org/git/xmqqim6019yd.fsf@gitster.c.googlers.com/
- https://github.com/git/git/security/advisories/GHSA-8prw-h3cq-mghm
- https://github.blog/2021-03-09-git-clone-vulnerability-announced/

For some reason meta.changelog was using ${version} instead of
v${version} for the tag name. This is fixed now.
2021-03-09 20:16:18 +01:00
R. RyanTM
8833988d2c subgit: 3.3.10 -> 3.3.11 2021-03-09 18:52:10 +00:00
Maximilian Bosch
155a946c37
gitAndTools.tig: 2.5.2 -> 2.5.3
ChangeLog: https://github.com/jonas/tig/releases/tag/tig-2.5.3
2021-03-07 19:15:32 +01:00
Git Machete Release Bot
5396fa3fcb gitAndTools.git-machete: 2.16.1 -> 3.0.0
###### 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-03-06 14:23:51 +00:00
Antonio Yang
6244b0c175 gitui: 0.11.0 -> 0.12.0 2021-03-05 12:55:47 +01:00
zowoq
677af53363 gh: 1.6.2 -> 1.7.0
https://github.com/cli/cli/releases/tag/v1.7.0
2021-03-05 06:04:46 +10:00
Fabian Affolter
7c2369f9d0
Merge pull request #114656 from r-ryantm/auto-update/ghq
ghq: 1.1.6 -> 1.1.7
2021-02-28 19:50:44 +01:00
David Terry
9378695d38
radicle-upstream: 0.1.6 -> 0.1.11 2021-02-28 18:44:49 +01:00
R. RyanTM
2d8ef6c514 ghq: 1.1.6 -> 1.1.7 2021-02-28 12:54:28 +00:00
Frederik Rietdijk
c456a2512f Merge master into staging-next 2021-02-26 10:25:13 +01:00
Fabian Affolter
182d39612b
Merge pull request #114337 from r-ryantm/auto-update/ghq
ghq: 1.1.5 -> 1.1.6
2021-02-25 20:43:54 +01:00
R. RyanTM
d39556b88d ghq: 1.1.5 -> 1.1.6 2021-02-25 10:07:02 +00:00
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