Commit graph

2063 commits

Author SHA1 Message Date
Henri Menke
64fbdc2099
git-branchless: 0.3.7 -> 0.3.8 2021-12-05 14:08:35 +01:00
figsoda
d09271ab35 glitter: 1.5.9 -> 1.5.10 2021-12-04 14:08:35 -05: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
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
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
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
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
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]
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]
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
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
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
Jonathan Ringer
6ede9cd761
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts:
  pkgs/applications/audio/hybridreverb2/default.nix
2021-11-19 08:44:33 -08:00
Sandro
b95292072f
Merge pull request #144241 from Stunkymonkey/applications-github-1 2021-11-19 17:09:37 +01:00
github-actions[bot]
209ab42b96
Merge staging-next into staging 2021-11-17 06:02:04 +00:00
github-actions[bot]
f8cf67790e
Merge master into staging-next 2021-11-17 06:01:28 +00:00
figsoda
94e7e21452 lucky-commit: use buildNoDefaultFeatures 2021-11-16 08:34:11 -05:00
Michael Weiss
6e78c9331e
git: 2.33.1 -> 2.34.0 2021-11-15 23:00:11 +01:00
github-actions[bot]
faf5da6aed
Merge staging-next into staging 2021-11-15 12:01:44 +00:00
Vladimír Čunát
64065d76f4
Merge #144730: branch 'staging-next' 2021-11-15 11:52:15 +01:00
figsoda
df304eeb80 glitter: 1.5.4 -> 1.5.5 2021-11-14 17:39:32 -05:00
Alyssa Ross
4e1852096f
Merge remote-tracking branch 'nixpkgs/staging-next' into staging
Conflicts:
	pkgs/development/tools/parsing/flex/2.6.1.nix
2021-11-14 14:17:46 +00:00
github-actions[bot]
0ca0546665
Merge master into staging-next 2021-11-14 06:01:05 +00:00
figsoda
91137787da
Merge pull request #145837 from r-ryantm/auto-update/git-machete
git-machete: 3.4.1 -> 3.5.0
2021-11-13 23:16:32 -05:00
R. Ryantm
04bfd3c8e1 git-machete: 3.4.1 -> 3.5.0 2021-11-14 01:41:34 +00:00
figsoda
25ae74d855 glitter: 1.5.3 -> 1.5.4 2021-11-13 17:05:21 -05:00
github-actions[bot]
914defdc38
Merge staging-next into staging 2021-11-13 18:01:47 +00:00
github-actions[bot]
4db5f307b0
Merge master into staging-next 2021-11-13 18:01:11 +00:00
figsoda
e7200f5810 glitter: 1.5.2 -> 1.5.3 2021-11-13 10:55:13 -05:00
Alyssa Ross
26b89bcd16
Merge remote-tracking branch 'nixpkgs/staging-next' into staging 2021-11-13 15:30:01 +00:00
sternenseemann
1a1e32f023 Merge remote-tracking branch 'origin/master' into staging-next
Conflicts were caused by 2043dbb6fa
interacting with b2767b69dd.
2021-11-13 12:35:55 +01:00