Commit graph

1229 commits

Author SHA1 Message Date
Martin Weinelt 9bfd58b382
Merge pull request #105017 from mweinelt/zsh-powerlevel10k
zsh-powerlevel10k: 1.13.0 -> 1.14.3
2020-11-28 16:30:41 +01:00
Sandro abdea8e1f7
Merge pull request #105037 from r-ryantm/auto-update/nushell
nushell: 0.22.0 -> 0.23.0
2020-11-26 19:35:17 +01:00
R. RyanTM a77fa8d94c nushell: 0.22.0 -> 0.23.0 2020-11-26 14:09:58 +00:00
Martin Weinelt 63a60bf31a
zsh-powerlevel10k: 1.13.0 -> 1.14.3
Update gitstatus pin 1.2.0 -> 1.3.1.

https://github.com/romkatv/powerlevel10k/releases/tag/v1.14.0
https://github.com/romkatv/powerlevel10k/releases/tag/v1.14.1
https://github.com/romkatv/powerlevel10k/releases/tag/v1.14.2
https://github.com/romkatv/powerlevel10k/releases/tag/v1.14.3
2020-11-26 11:54:46 +01:00
Tim Steinbach 2e3c491a00
oh-my-zsh: 2020-11-22 → 2020-11-25 2020-11-25 19:22:07 +00:00
Graham Christensen bc49a0815a
utillinux: rename to util-linux 2020-11-24 12:42:06 -05:00
Martin Weinelt 9ac42658f9 dash: add patch to prevent code execution when noexec is set
Dashs noexec flag `-n` did not work as documented, which could result in
code being inadvertently executed.
2020-11-23 11:57:29 -08:00
Tim Steinbach e0e4c2281c
oh-my-zsh: 2020-11-20 → 2020-11-22 2020-11-23 10:55:11 -05:00
Mario Rodas 84a92c3ac4
Merge pull request #104252 from r-ryantm/auto-update/oil
oil: 0.8.3 -> 0.8.4
2020-11-23 07:53:30 -05:00
R. RyanTM 0f6a111e36 powershell: 7.0.3 -> 7.1.0 2020-11-22 08:14:42 +00:00
Tim Steinbach a57bf2dc18
oh-my-zsh: 2020-11-12 → 2020-11-20 2020-11-20 16:27:42 +00:00
R. RyanTM 75aeb18680 oil: 0.8.3 -> 0.8.4 2020-11-19 08:09:29 +00:00
Oleksii Filonenko 512c3c0a05 maintainers: rename filalex77 -> Br1ght0ne 2020-11-17 13:09:31 +02:00
Tim Steinbach 7a36556e64
oh-my-zsh: 2020-11-11 → 2020-11-12 2020-11-13 09:28:18 -05:00
Mario Rodas 2738176ecd
Merge pull request #103509 from r-ryantm/auto-update/pure-prompt
pure-prompt: 1.13.0 -> 1.15.0
2020-11-11 21:29:52 -05:00
R. RyanTM 7e0dc8e35e pure-prompt: 1.13.0 -> 1.15.0 2020-11-11 22:33:12 +00:00
Tim Steinbach d7688900b4
oh-my-zsh: 2020-11-10 → 2020-11-11 2020-11-11 15:43:11 -05:00
Tim Steinbach ef990c1905
oh-my-zsh: 2020-11-09 → 2020-11-10 2020-11-11 09:32:02 -05:00
Tim Steinbach e43b443121
oh-my-zsh: 2020-11-04 → 2020-11-09 2020-11-10 09:23:17 -05:00
Tim Steinbach 2e00fff047
oh-my-zsh: Fix update script
Pull commit date rather than author date to avoid going back in time
on commits that have been sitting for a while.
2020-11-10 09:22:46 -05:00
Frederik Rietdijk 20f001c01e Merge master into staging-next 2020-11-09 14:33:52 +01:00
Masanori Ogino 1c9efa61b4 mrsh: 2020-07-27 -> 2020-11-04
Reference: 0da902c0ee...1738e41b2a
Signed-off-by: Masanori Ogino <167209+omasanori@users.noreply.github.com>
2020-11-09 12:05:13 +00:00
Frederik Rietdijk 99fb79ae84 Merge master into staging-next 2020-11-06 12:51:56 +01:00
Mario Rodas a4afd835da nushell: 0.21.0 -> 0.22.0
http://www.nushell.sh/blog/2020/11/03/nushell_0_22.html
2020-11-06 04:20:00 +00:00
Tim Steinbach 0de5ab3f20
oh-my-zsh: 2020-10-29 → 2020-11-04 2020-11-05 12:42:01 +00:00
Tim Steinbach 9813539969
oh-my-zsh: Add test 2020-11-04 20:37:50 -05:00
Tim Steinbach 9907a2d48b
oh-my-zsh: Update script 2020-11-04 18:12:23 -05:00
Frederik Rietdijk 10c57af49c Merge staging-next into staging 2020-11-04 09:28:07 +01:00
Frederik Rietdijk 9e6d7d3c74 Merge master into staging-next 2020-11-04 09:27:42 +01:00
R. RyanTM dcdf8fa49c mksh: 59b -> 59c 2020-11-03 23:15:46 -08:00
R. RyanTM 4148fc489b oil: 0.8.1 -> 0.8.3 2020-11-03 21:58:00 -08:00
Mario Rodas e468d5bfaa
Merge pull request #102591 from r-ryantm/auto-update/liquidprompt
liquidprompt: 1.12.0 -> 1.12.1
2020-11-03 22:22:14 -05:00
Frederik Rietdijk 237966224d Merge master into staging-next 2020-11-03 12:06:06 +01:00
R. RyanTM c111555113 liquidprompt: 1.12.0 -> 1.12.1 2020-11-03 06:45:16 +00:00
Kevin Cox 22409c8006
Merge pull request #101910 from omasanori/mrsh/update-2020-07-27
mrsh: 2020-01-08 -> 2020-07-27 etc.
2020-11-02 15:42:05 -05:00
Masanori Ogino 955926a620 mrsh: 2020-01-08 -> 2020-07-27 etc.
- `doCheck` is enabled now.
- It marked as broken on Darwin due to [build failures][macos-issue].

[macos-issue]: https://github.com/NixOS/nixpkgs/pull/101910#issuecomment-719923175

Reference: ef21854fc9..0da902c0ee
Signed-off-by: Masanori Ogino <167209+omasanori@users.noreply.github.com>
2020-11-02 04:45:59 +09:00
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