Jonathan Ringer
9dd8bffe92
Merge remote-tracking branch 'origin/master' into staging-next
...
Conflicts:
pkgs/development/python-modules/aiocron/default.nix
2021-12-07 00:11:07 -08:00
figsoda
ce55f68016
Merge pull request #149170 from r-ryantm/auto-update/git-cliff
...
git-cliff: 0.4.0 -> 0.4.2
2021-12-06 20:37:58 -05:00
R. Ryantm
bf2d01d5f1
git-cliff: 0.4.0 -> 0.4.2
2021-12-07 00:09:17 +00:00
github-actions[bot]
255d79d651
Merge master into staging-next
2021-12-07 00:01:37 +00:00
zowoq
1dfc147773
delta: 0.11.0 -> 0.11.1
...
https://github.com/dandavison/delta/releases/tag/0.11.1
2021-12-07 07:00:42 +10:00
Jonathan Ringer
5263fb820e
Merge remote-tracking branch 'origin/master' into staging-next
...
Conflicts:
pkgs/development/python-modules/django-rq/default.nix
pkgs/top-level/all-packages.nix
2021-12-05 22:02:00 -08:00
zowoq
0e3a33279a
delta: 0.10.3 -> 0.11.0
...
https://github.com/dandavison/delta/releases/tag/0.11.0
2021-12-06 11:35:03 +10:00
Jörg Thalheim
423aff986c
Merge remote-tracking branch 'upstream/master' into HEAD
2021-12-05 19:41:20 +01:00
Henri Menke
64fbdc2099
git-branchless: 0.3.7 -> 0.3.8
2021-12-05 14:08:35 +01:00
github-actions[bot]
3995cabfbe
Merge master into staging-next
2021-12-05 06:01:04 +00:00
figsoda
d09271ab35
glitter: 1.5.9 -> 1.5.10
2021-12-04 14:08:35 -05:00
github-actions[bot]
d4c54e7f61
Merge master into staging-next
2021-12-04 18:01:05 +00:00
Mario Rodas
6bd1daaf0f
Merge pull request #148526 from qowoz/delta
...
delta: 0.10.2 -> 0.10.3
2021-12-04 09:23:59 -05:00
github-actions[bot]
a3ef129c42
Merge master into staging-next
2021-12-04 12:01:10 +00:00
Guillaume Girol
c1641865d8
Merge pull request #148317 from figsoda/update-glitter
...
glitter: 1.5.7 -> 1.5.9
2021-12-04 09:21:40 +00:00
github-actions[bot]
67691cf506
Merge master into staging-next
2021-12-04 00:01:30 +00:00
Dmitry Bogatov
1938cc6e55
gitflow: embed path to coreutils into the wrapper
...
gitflow is shell script and does not work without common tools (e.g readlink)
in PATH or with busybox instead of coreutils.
Busybox version of readlink does not support "-e" option. Probably it can be
replaced with "-f", but I didn't check.
2021-12-03 23:56:56 +01:00
zowoq
25d6118dbd
delta: 0.10.2 -> 0.10.3
...
https://github.com/dandavison/delta/releases/tag/0.10.3
2021-12-04 08:41:16 +10:00
Jonathan Ringer
2e6fadac4e
Merge remote-tracking branch 'origin/staging-next' into staging
...
Conflicts:
pkgs/development/python-modules/django-rq/default.nix
2021-12-02 16:07:50 -08:00
github-actions[bot]
987163192b
Merge master into staging-next
2021-12-03 00:01:31 +00:00
figsoda
ee36beaf08
glitter: 1.5.8 -> 1.5.9
2021-12-02 17:42:38 -05:00
Mrinal Purohit
b0819012c4
gh: 2.2.0 -> 2.3.0
2021-12-03 07:30:07 +10:00
figsoda
8da44bcdd1
glitter: 1.5.7 -> 1.5.8
2021-12-02 13:58:42 -05:00
Alyssa Ross
f404068903
Merge remote-tracking branch 'nixpkgs/staging-next' into staging
...
Conflicts:
pkgs/servers/search/groonga/default.nix
2021-12-02 14:52:44 +00:00
github-actions[bot]
f6f101cca5
Merge master into staging-next
2021-12-01 12:01:26 +00:00
Mario Rodas
1e317031b6
Merge pull request #148090 from msfjarvis/hs/2021-12-01/git-quickfix-0.0.5
...
git-quickfix: 0.0.4 -> 0.0.5
2021-12-01 01:11:06 -05:00
github-actions[bot]
3bebe2a3f2
Merge master into staging-next
2021-12-01 06:01:17 +00:00
Mario Rodas
193388b14d
Merge pull request #147655 from marsam/update-git-filter-repo
...
git-filter-repo: remove duplicated expression
2021-12-01 00:25:08 -05:00
Harsh Shandilya
e6096f4e1e
git-quickfix: 0.0.4 -> 0.0.5
2021-12-01 08:34:00 +05:30
Jonathan Ringer
3bbe9a9459
Merge remote-tracking branch 'origin/staging-next' into staging
...
Conflicts:
pkgs/top-level/all-packages.nix
2021-11-29 10:15:20 -08:00
github-actions[bot]
be67219326
Merge master into staging-next
2021-11-29 06:01:16 +00:00
figsoda
8153160acf
glitter: 1.5.6 -> 1.5.7
2021-11-28 14:24:16 -05:00
github-actions[bot]
cfa04cbd2d
Merge staging-next into staging
2021-11-28 06:01:44 +00:00
github-actions[bot]
2534e1384b
Merge master into staging-next
2021-11-28 06:01:05 +00:00
zowoq
909df3fa25
delta: 0.10.1 -> 0.10.2
...
https://github.com/dandavison/delta/releases/tag/0.10.2
2021-11-28 08:08:14 +10:00
Mario Rodas
3b35310cdc
git-filter-repo: remove duplicated expression
2021-11-27 04:20:00 +00:00
github-actions[bot]
e9e3023425
Merge staging-next into staging
2021-11-26 06:01:36 +00:00
github-actions[bot]
618b03f562
Merge master into staging-next
2021-11-26 06:01:01 +00:00
zowoq
4ea35c4c20
delta: 0.10.0 -> 0.10.1
...
https://github.com/dandavison/delta/releases/tag/0.10.1
2021-11-26 09:28:31 +10:00
Michael Weiss
70183927c3
Merge pull request #147293 from primeos/git
...
git: 2.34.0 -> 2.34.1
2021-11-25 23:39:01 +01:00
github-actions[bot]
fa1a61b8a2
Merge master into staging-next
2021-11-25 06:01:06 +00:00
Bobby Rong
f5f9557cb4
Merge pull request #147313 from SuperSandro2000/delta
...
delta: add SuperSandro2000 as maintainer
2021-11-25 09:51:22 +08:00
github-actions[bot]
b244d0edca
Merge master into staging-next
2021-11-25 00:01:54 +00:00
Sandro
31b46dd7f9
delta: add SuperSandro2000 as maintainer
2021-11-25 00:28:48 +01:00
Sandro Jäckel
122b0e0602
delta: 0.9.2 -> 0.10.0
2021-11-24 23:45:17 +01:00
Michael Weiss
2d05c5dcf2
git: 2.34.0 -> 2.34.1
2021-11-24 21:03:54 +01:00
Jonathan Ringer
4b73049ccc
Merge remote-tracking branch 'origin/staging' into staging-next
...
Conflicts:
nixos/tests/custom-ca.nix
2021-11-22 21:33:23 -08:00
github-actions[bot]
9e1911e222
Merge master into staging-next
2021-11-22 12:01:27 +00:00
figsoda
b0221e0651
glitter: 1.5.5 -> 1.5.6
2021-11-21 19:35:21 -05:00
github-actions[bot]
e9cc89e77e
Merge staging-next into staging
2021-11-19 18:01:56 +00:00