Commit graph

1782 commits

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