Frederik Rietdijk
7a8d5dc8a6
Merge master into staging-next
2020-11-01 10:10:47 +01:00
Ryan Mulligan
893c94b4b2
Merge pull request #90322 from pasqui23/zplg2
...
zplugin: init at 2.3
2020-10-31 07:34:03 -07:00
Vladimír Čunát
dfd3ede68d
Merge branch 'master' into staging-next
2020-10-31 14:30:44 +01:00
Tim Steinbach
95b36ade44
oh-my-zsh: 2020-10-27 -> 2020-10-29
2020-10-30 09:34:22 -04:00
Martin Weinelt
9ecd40908d
zsh-powerlevel10k: pin gitstatus version
...
The required gitstatus version compatible with zsh-powerlevel10k has
been pinned, as even though it is written by the same author, gitstatus
has received updates which are not yet compatible with zsh-p10k.
Fixes : #101946
2020-10-28 17:15:42 +01:00
Ben Siraphob
db74029e3e
treewide: remove package names from prefix of descriptions
2020-10-27 09:15:07 -07:00
Tim Steinbach
1a50aad173
oh-my-zsh: 2020-10-18 -> 2020-10-27
2020-10-27 11:58:49 -04:00
Vladimír Čunát
89023c38fc
Recover the complicated situation after my bad merge
...
I made a mistake merge. Reverting it in c778945806
undid the state
on master, but now I realize it crippled the git merge mechanism.
As the merge contained a mix of commits from `master..staging-next`
and other commits from `staging-next..staging`, it got the
`staging-next` branch into a state that was difficult to recover.
I reconstructed the "desired" state of staging-next tree by:
- checking out the last commit of the problematic range: 4effe769e2
- `git rebase -i --preserve-merges a8a018ddc0` - dropping the mistaken
merge commit and its revert from that range (while keeping
reapplication from 4effe769e2
)
- merging the last unaffected staging-next commit (803ca85c20
)
- fortunately no other commits have been pushed to staging-next yet
- applying a diff on staging-next to get it into that state
2020-10-26 09:01:04 +01:00
Vladimír Čunát
c778945806
Revert "Merge #101508 : libraw: 0.20.0 -> 0.20.2"
...
I'm sorry; I didn't notice it contained staging commits.
This reverts commit 17f5305b6c
, reversing
changes made to a8a018ddc0
.
2020-10-25 09:41:51 +01:00
Jan Tojnar
d13fc932cd
Merge branch 'master' into staging-next
2020-10-22 21:20:14 +02:00
Sandro Jäckel
b7730213bd
zsh-powerlevel10k: 1.12.0 -> 1.13.0
2020-10-22 19:49:18 +02:00
zowoq
a55b2d659e
nushell: drop darwin workaround
2020-10-22 11:24:37 +10:00
Frederik Rietdijk
23890fc236
Merge staging-next into staging
2020-10-20 20:55:46 +02:00
Tim Steinbach
b615fa7b06
oh-my-zsh: 2020-10-15 -> 2020-10-18
2020-10-19 09:40:23 -04:00
Jan Tojnar
5c766c5c24
Merge branch 'staging-next' into staging
2020-10-18 21:21:03 +02:00
R. RyanTM
59e213b70e
bash-completion: 2.10 -> 2.11
2020-10-17 17:13:01 +00:00
Ben Siraphob
683a87dbeb
treewide: remove periods from end of package descriptions
2020-10-17 08:22:31 -07:00
Tim Steinbach
b4586ea432
Merge pull request #100662 from NeQuissimus/bash_50p18
...
bash: 5.0p17 -> 5.0p18
2020-10-16 16:01:51 -04:00
Tim Steinbach
a3cae625e4
oh-my-zsh: 2020-10-14 -> 2020-10-15
2020-10-16 09:29:36 -04:00
Tim Steinbach
3333139f4d
bash: 5.0p17 -> 5.0p18
2020-10-15 19:40:53 -04:00
Tim Steinbach
d63ddacf93
bash: Use nix-shell in update script
...
The script assumed that `wget` was available in the environment
along with common CA certificates.
Replaced the detection of GPG, which is not necessary anymore.
Added pulling the public key bash releases and patches are signed with,
without which we cannot verify signatures.
2020-10-15 19:34:49 -04:00
Tim Steinbach
1e6a9608aa
oh-my-zsh: 2020-10-13 -> 2020-10-14
2020-10-14 18:39:23 -04:00
Frederik Rietdijk
b3aed163d5
Merge pull request #99709 from NixOS/staging-next
...
Staging next
2020-10-14 21:10:31 +02:00
Yuki Okushi
8928358521
nushell 0.20.0 -> 0.21.0
2020-10-14 20:02:26 +09:00
Frederik Rietdijk
9e1943edc0
Merge master into staging-next
2020-10-13 19:34:34 +02:00
Tim Steinbach
aaff56eed1
oh-my-zsh: 2020-10-09 -> 2020-10-13
2020-10-13 09:55:07 -04:00
Vladimír Čunát
338b25697c
Merge branch 'master' into staging-next
...
Quite many rebuilds from master:
> Estimating rebuild amount by counting changed Hydra jobs.
> 3926 x86_64-darwin
> 4645 x86_64-linux
2020-10-10 11:32:10 +02:00
Raphael Borun Das Gupta
0b00bcec22
xonsh: 0.9.22 -> 0.9.23
2020-10-10 00:27:53 +02:00
Tim Steinbach
2216b87688
oh-my-zsh: 2020-10-08 -> 2020-10-09
2020-10-09 08:33:03 -04:00
Frederik Rietdijk
ec28e32c9e
Merge master into staging-next
2020-10-08 21:47:26 +02:00
Tim Steinbach
8ef2c0e07a
powershell: 7.0.1 -> 7.0.3
2020-10-08 15:08:12 -04:00
Tim Steinbach
cc3c70e5af
oh-my-zsh: 2020-10-05 -> 2020-10-08
2020-10-08 14:51:16 -04:00
Tim Steinbach
066397c0fe
oh-my-zsh: Format with nixfmt
2020-10-08 11:00:19 -04:00
Frederik Rietdijk
692d219a93
Merge staging-next into staging
2020-10-06 10:25:58 +02:00
Tim Steinbach
5a9c9b3583
oh-my-zsh: 2020-10-05 -> 2020-10-05
2020-10-06 09:42:45 -04:00
Jan Tojnar
d471c5d1f3
Merge branch 'staging-next' into staging
2020-09-24 23:09:00 +02:00
R. RyanTM
6d614fd28c
dash: 0.5.11.1 -> 0.5.11.2
2020-09-22 18:35:08 +00:00
Frederik Rietdijk
7bff759fac
Merge staging-next into staging
2020-09-22 18:31:56 +02:00
Tim Steinbach
d8b5fb33b5
oh-my-zsh: 2020-09-14 -> 2020-09-20
2020-09-20 19:24:37 -04:00
WORLDofPEACE
34aaac6d7c
Merge branch 'staging-next' into staging
2020-09-20 18:41:15 -04:00
Mario Rodas
0561fdef05
xonsh: 0.9.21 -> 0.9.22
...
https://github.com/xonsh/xonsh/releases/tag/0.9.22
2020-09-16 18:00:00 -05:00
Tim Steinbach
911c641ace
oh-my-zsh: 2020-09-12 -> 2020-09-14
2020-09-15 10:47:51 -04:00
Florian Klink
3bfdbea881
bash-completion: disable tests
...
Unfortunately, they're very flaky. Let's disable them for now.
2020-09-14 23:07:45 +02:00
Tim Steinbach
7699e31abb
oh-my-zsh: 2020-09-09 -> 2020-09-12
2020-09-14 08:42:05 -04:00
Tim Steinbach
edc18966fa
oh-my-zsh: 2020-09-04 -> 2020-09-09
2020-09-10 10:36:17 -04:00
Tim Steinbach
45de9a079f
oh-my-zsh: 2020-09-03 -> 2020-09-04
2020-09-08 08:52:43 -04:00
Cole Mickens
6668937f57
nushell: enable for aarch64
2020-09-05 14:13:42 -07:00
Maximilian Bosch
2c73dd64b0
Merge pull request #97208 from r-ryantm/auto-update/nushell
...
nushell: 0.18.1 -> 0.19.0
2020-09-05 13:04:55 +02:00
R. RyanTM
0a8c2f8cde
nushell: 0.18.1 -> 0.19.0
2020-09-05 08:46:57 +00:00
Mario Rodas
f87374dc69
Merge pull request #96988 from marsam/update-xonsh
...
xonsh: 0.9.20 -> 0.9.21
2020-09-04 22:02:30 -05:00