3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

1995 commits

Author SHA1 Message Date
Jan Tojnar 4ff3577f25 Merge branch 'staging-next' into staging 2021-08-23 14:19:54 +02:00
R. RyanTM 36fa861a29 gitui: 0.16.2 -> 0.17 2021-08-22 19:24:02 +00:00
Sandro Jäckel 905174cb91
git-delete-merged-branches: 6.0.5 -> 6.3.0 2021-08-22 20:09:00 +02:00
github-actions[bot] 095df456c2
Merge staging-next into staging 2021-08-22 06:01:44 +00:00
R. RyanTM a2ce822382 git-filter-repo: 2.32.0 -> 2.33.0 2021-08-22 00:10:46 -04:00
Michael Weiss cfc0b37a05
git: 2.32.0 -> 2.33.0 2021-08-17 11:25:09 +02:00
Jan Tojnar 0aa35561e7 Merge branch 'master' into staging-next 2021-08-14 12:53:07 +02:00
Jörg Thalheim eaaea54a37 hub: fix aarch64-darwin build 2021-08-12 21:45:04 +02:00
github-actions[bot] 234c0d62da
Merge master into staging-next 2021-08-11 18:01:11 +00:00
Jan Tojnar 4e7e464ae8 Merge branch 'master' into staging-next
; Conflicts:
;	pkgs/tools/system/sg3_utils/default.nix
2021-08-11 16:22:42 +02:00
Martin Weinelt c20f28657f glab: 1.19.0 -> 1.20.0 2021-08-11 13:41:28 +02:00
Martin Weinelt 0f9339ef32
glab: expose version, enable tests 2021-08-11 13:40:24 +02:00
Martin Weinelt 75485563d5
Merge pull request #133394 from r-ryantm/auto-update/glab 2021-08-11 13:25:45 +02:00
Nikolay Korotkiy 6b9dc66a14 radicle-upstream: 0.2.3 → 0.2.9, enable on darwin 2021-08-11 13:38:12 +09:00
R. RyanTM 4f0e6e9879 glab: 1.18.1 -> 1.19.0 2021-08-10 15:14:36 +00:00
Pascal Bach 293026e7ca
Merge pull request #132991 from SuperSandro2000/gitstatus
Gitstatus
2021-08-09 23:24:59 +02:00
github-actions[bot] 610ef47b20
Merge master into staging-next 2021-08-08 18:01:03 +00:00
David Terry c1186b572f
maintainers: xwvvvvwx -> d-xo 2021-08-08 19:11:45 +02:00
R. RyanTM dbae6eea00 ghq: 1.1.7 -> 1.2.1 2021-08-08 12:09:59 +00:00
github-actions[bot] 825ed68c05
Merge master into staging-next 2021-08-08 06:01:18 +00:00
Artturi 709741c679
Merge pull request #117183 from r-ryantm/auto-update/git-hub
git-hub: 2.1.0 -> 2.1.1
2021-08-08 03:02:33 +03:00
Sandro Jäckel e4cbde6907
gitstatus: update libgit2 2021-08-06 17:23:08 +02:00
Sandro Jäckel f4cae7047e
gitstatus: add SuperSandro2000 maintainer 2021-08-06 17:22:55 +02:00
Sandro Jäckel 52cab6b895
gitstatus: move scripts to $out/share/gitstatus, fix a bug when loading from home-manager 2021-08-06 17:22:13 +02:00
Sandro Jäckel e3bb39daf7
gitstatus: format, cleanup 2021-08-06 17:21:32 +02:00
github-actions[bot] a4174a93f2
Merge master into staging-next 2021-08-05 12:01:26 +00:00
Sandro 04b5e62d8d
Merge pull request #132468 from Stunkymonkey/applications-phases1 2021-08-05 09:37:57 +02:00
github-actions[bot] 7fac04f59c
Merge master into staging-next 2021-08-05 00:01:21 +00:00
zowoq ea78c0ca73 gh: 1.13.1 -> 1.14.0
https://github.com/cli/cli/releases/tag/v1.14.0
2021-08-05 08:26:42 +10:00
Felix Buehler a1a2c3621a bfg-repo-cleaner: deprecate phases 2021-08-03 00:02:37 +02:00
Felix Buehler 21ba91610c git-annex-remote-rclone: remove phases 2021-08-03 00:02:22 +02:00
github-actions[bot] ae76abd3b9
Merge master into staging-next 2021-07-31 12:01:37 +00:00
R. RyanTM d542ab83c6 diff-so-fancy: 1.4.2 -> 1.4.3 2021-07-29 16:17:29 +00:00
github-actions[bot] 10f41ca1da
Merge staging-next into staging 2021-07-29 00:02:13 +00:00
Rick van Schijndel ced2371674 cgit: fix regression where cgi script was not installed anymore
Related to https://github.com/NixOS/nixpkgs/pull/131705.
2021-07-28 21:32:54 +02:00
github-actions[bot] 6e67353aa0
Merge staging-next into staging 2021-07-28 00:02:02 +00:00
Rick van Schijndel ec518eb21b cgit: support cross-compilation
asciidoc was in the incorrect location, and CC and AR must be set
explictly.
2021-07-27 19:11:55 +02:00
github-actions[bot] 30f43d1c49
Merge staging-next into staging 2021-07-25 00:02:12 +00:00
Sandro e30a598500
Merge pull request #131285 from gravndal/git-annex-remote-googledrive
git-annex-remote-googledrive: 1.3.0 -> 1.3.2
2021-07-24 19:15:29 +00:00
Mario Rodas 549f3a7d94
Merge pull request #129789 from r-ryantm/auto-update/git-chglog
git-chglog: 0.14.2 -> 0.15.0
2021-07-24 10:20:01 -05:00
Gaute Ravndal 18f1aed448 git-annex-remote-googledrive: 1.3.0 -> 1.3.2 2021-07-24 00:41:59 +02:00
Jacek Galowicz 3bbbf04229
Merge pull request #131141 from blitz/git-machete-update-script
git-machete: add test and update script
2021-07-23 18:53:39 +02:00
Ivan Malison 6ff64c2974
git-sync: Wrap both binaries (#130515)
Co-authored-by: Jörg Thalheim <joerg@thalheim.io>
2021-07-23 11:38:36 +02:00
Julian Stecklina 290599fbb1 git-machete: add a simple version test 2021-07-23 00:00:04 +02:00
Julian Stecklina 9c5e8eb8da git-machete: enable automatic updates via nix-update 2021-07-22 23:50:29 +02:00
Sandro 00eb7340e7
Merge pull request #130772 from VirtusLab/git-machete-3.3.0
gitAndTools.git-machete: 3.2.1 -> 3.3.0
2021-07-21 16:45:12 +02:00
zowoq 1249c9a174 gh: 1.12.1 -> 1.13.1
https://github.com/cli/cli/releases/tag/v1.13.0
https://github.com/cli/cli/releases/tag/v1.13.1
2021-07-21 11:51:46 +10:00
Git Machete Release Bot 0e11a1ba02 gitAndTools.git-machete: 3.2.1 -> 3.3.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/CONTRIBUTING.md).
2021-07-20 12:31:09 +00:00
Ivan Malison 0c98c6bbc4
git-sync: unstable-2015-10-24 -> unstable-2021-07-14 (#130306)
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2021-07-16 00:04:43 +02:00
edef 1630eccc5f
Merge pull request #128062 from deviant/git-shell-path
git: add shellPath passthru
2021-07-14 01:10:13 +00:00
Sandro 97bceacca5
Merge pull request #130129 from SuperSandro2000/delta
delta: 0.8.2 -> 0.8.3
2021-07-14 00:33:50 +02:00
Sandro bc947a686c
Merge pull request #130052 from DeeUnderscore/git-cola-no-double-wrap 2021-07-13 23:44:44 +02:00
Sandro Jäckel b3f974ee08
delta: 0.8.2 -> 0.8.3 2021-07-13 22:38:27 +02:00
R. RyanTM 9e18ae4302 git-vendor: 1.2.1 -> 1.2.2 2021-07-13 12:00:56 +02:00
D Anzorge e3e3baf498 git-cola: avoid double wrapping 2021-07-12 23:10:48 +02:00
R. RyanTM ad28b7f106 git-cola: 3.9 -> 3.10.1 2021-07-12 03:48:36 +00:00
R. RyanTM da1dde42fb gitui: 0.16.1 -> 0.16.2 2021-07-10 22:26:39 +00:00
R. RyanTM 615f760af5 git-chglog: 0.14.2 -> 0.15.0 2021-07-09 19:57:04 +00:00
Fabian Affolter 193c06f5f2 bit: 1.1.1 -> 1.1.2 2021-07-05 22:59:53 +02:00
zowoq c7e7f90108 gh: 1.12.0 -> 1.12.1
https://github.com/cli/cli/releases/tag/v1.12.1
2021-07-01 12:53:09 +10:00
Sandro 3adb7f66d2
Merge pull request #128660 from zowoq/delta
delta: 0.8.1 -> 0.8.2
2021-06-30 01:11:43 +02:00
zowoq 5edaead2dc delta: 0.8.1 -> 0.8.2
https://github.com/dandavison/delta/releases/tag/0.8.2
2021-06-30 06:12:32 +10:00
zowoq d7ea598b27 gh: 1.11.0 -> 1.12.0
https://github.com/cli/cli/releases/tag/v1.12.0
2021-06-30 06:09:55 +10:00
Robert Schütz d6234c2165 Merge branch 'master' into staging-next 2021-06-26 00:33:58 +02:00
zowoq cd50708ec8 delta: 0.8.0 -> 0.8.1
https://github.com/dandavison/delta/releases/tag/0.8.1
2021-06-25 21:45:25 +09:00
github-actions[bot] bae6b2055f
Merge master into staging-next 2021-06-25 12:06:04 +00:00
Sandro 959014ce29
Merge pull request #127816 from VirtusLab/git-machete-3.2.1
gitAndTools.git-machete: 3.2.0 -> 3.2.1
2021-06-25 11:12:10 +02:00
Robert Schütz c1dca92daf Merge branch 'master' into staging-next 2021-06-25 10:02:10 +02:00
V 56f5cd3343 git: add shellPath passthru
git features a restricted login shell for allowing Git-only SSH access.
2021-06-25 03:26:19 +02:00
Niklas Hambüchen d22a561225 git-branchless: init at 0.3.2 2021-06-24 13:27:19 +02:00
Git Machete Release Bot 9c9f7cc27b gitAndTools.git-machete: 3.2.0 -> 3.2.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-06-22 17:29:34 +00:00
Martin Weinelt eef9694ebc
Merge branch 'master' into staging-next 2021-06-22 00:58:31 +02:00
Maximilian Bosch 8e25802249
Merge pull request #127301 from r-ryantm/auto-update/gitstatus
gitstatus: 1.5.1 -> 1.5.2
2021-06-20 19:37:59 +02:00
github-actions[bot] 4ea74538ce
Merge master into staging-next 2021-06-18 18:04:25 +00:00
Sandro 13fcfce0af
Merge pull request #127228 from r-ryantm/auto-update/ghr
ghr: 0.13.0 -> 0.14.0
2021-06-18 17:10:42 +02:00
R. RyanTM 08aaf68511 gitstatus: 1.5.1 -> 1.5.2 2021-06-18 05:43:45 +00:00
R. RyanTM 3ac01fa851 ghr: 0.13.0 -> 0.14.0 2021-06-17 15:04:40 +00:00
github-actions[bot] b859981601
Merge master into staging-next 2021-06-17 12:05:01 +00:00
Sandro 7b229db9e4
Merge pull request #127119 from VirtusLab/git-machete-3.2.0 2021-06-17 13:38:31 +02:00
github-actions[bot] 538d5cc5d0
Merge staging-next into staging 2021-06-17 00:09:51 +00:00
github-actions[bot] 51bf815af0
Merge master into staging-next 2021-06-17 00:09:48 +00:00
Sandro eaef571d76
Merge pull request #125476 from LeSuisse/git-fix-pkgsStatic
git: fix pkgsStatic build
2021-06-17 01:10:00 +02:00
github-actions[bot] 8b9fa8d446
Merge staging-next into staging 2021-06-16 18:04:48 +00:00
github-actions[bot] 2d104c99a7
Merge master into staging-next 2021-06-16 18:04:45 +00:00
Jan Tojnar e3dfa79441
Merge branch 'staging-next' into staging
Regenerated pkgs/servers/x11/xorg/default.nix to resolve the conflict.
2021-06-16 19:59:05 +02:00
Git Machete Release Bot 8aebc1b904 gitAndTools.git-machete: 3.1.1 -> 3.2.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).
2021-06-16 17:56:47 +00:00
Thomas Gerbet fc1c4bab77 git: fix pkgsStatic build 2021-06-16 18:46:39 +02:00
Sandro 4d5f3b8d93
Merge pull request #127022 from r-ryantm/auto-update/glab
glab: 1.18.0 -> 1.18.1
2021-06-16 18:25:26 +02:00
github-actions[bot] f060a3768b
Merge master into staging-next 2021-06-16 06:04:41 +00:00
R. RyanTM 76ceead4ec lefthook: 0.7.5 -> 0.7.6 2021-06-15 20:01:41 -07:00
Jonathan Ringer d1d37feb6d
Merge branch 'master' into staging-next
Conflicts:
  pkgs/servers/x11/xorg/default.nix
2021-06-15 19:32:36 -07:00
R. RyanTM 29cf0172e0 glab: 1.18.0 -> 1.18.1 2021-06-16 01:39:44 +00:00
Jan Tojnar 91171e2955
Merge branch 'master' into staging-next
Regenerated pkgs/servers/x11/xorg/default.nix to resolve the conflict.
2021-06-15 11:19:41 +02:00
Maximilian Bosch d387353590
gitAndTools.diff-so-fancy: 1.4.1 -> 1.4.2
ChangeLog: https://github.com/so-fancy/diff-so-fancy/releases/tag/v1.4.2
2021-06-14 22:36:43 +02:00
Martin Weinelt 38b5368b7e
gitAndTools.gitstatus: 1.4.4 -> 1.5.1 2021-06-10 21:35:57 +02:00
Jan Tojnar ba733d435b
Merge branch 'staging-next' into staging 2021-06-10 14:07:45 +02:00
github-actions[bot] 51dce04dde
Merge master into staging-next 2021-06-10 12:05:05 +00:00
Mario Rodas 1027d970df
Merge pull request #126152 from r-ryantm/auto-update/git-filter-repo
git-filter-repo: 2.29.0 -> 2.32.0
2021-06-10 05:38:19 -05:00
github-actions[bot] cf8441dd85
Merge staging-next into staging 2021-06-09 18:14:53 +00:00
github-actions[bot] f242b07bc2
Merge master into staging-next 2021-06-09 18:14:51 +00:00
Ryan Mulligan 62c94205ab
Merge pull request #126318 from r-ryantm/auto-update/glab
glab: 1.17.0 -> 1.18.0
2021-06-09 06:00:19 -07:00
Martin Weinelt 3da00fa467
Merge branch 'master' into staging-next 2021-06-09 14:18:55 +02:00
R. RyanTM e9d48ab799 git-vendor: 1.2.0 -> 1.2.1 2021-06-09 14:15:52 +02:00
R. RyanTM a362b1e9ee glab: 1.17.0 -> 1.18.0 2021-06-09 07:03:20 +00:00
Michael Weiss 4ac67163c4
git: Drop POSIXPERM for the tests
Shared permissions are forbidden in the Nix build sandbox which is why
some of the tests fail. Dropping the POSIXPERM test prerequisite, that
is added unconditionally on Linux, should help us avoiding uninteresting
test failures after Git updates. The drawback is that this disables a
few additional tests (as of Git 2.32.0 approx. 71 out of more than 20k
subtests require POSIXPERM).
2021-06-08 20:36:34 +02:00
R. RyanTM 688a5b4c37 git-filter-repo: 2.29.0 -> 2.32.0 2021-06-08 03:48:25 +00:00
github-actions[bot] e218376e4a
Merge staging-next into staging 2021-06-07 06:37:31 +00:00
github-actions[bot] 33d7555871
Merge master into staging-next 2021-06-07 06:37:28 +00:00
R. RyanTM d4963ae435 gitui: 0.16.0 -> 0.16.1 2021-06-07 02:21:26 +00:00
Michael Weiss 752bfa0496
git: 2.31.1 -> 2.32.0 2021-06-06 16:35:32 +02:00
github-actions[bot] 51ecdeca84
Merge master into staging-next 2021-06-06 00:15:19 +00:00
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