Commit graph

1324 commits

Author SHA1 Message Date
pacien
108fd69a8c fishPlugins.buildFishPlugin: rename checkFunctionPath parameter 2021-01-11 03:39:57 +01:00
pacien
648a3db934 fishPlugins.buildFishPlugin: use wrapFish 2021-01-11 00:47:56 +01:00
github-actions[bot]
fcbe48c797
Merge master into staging-next 2021-01-09 18:41:27 +00:00
Sandro
af1a049c93
Merge pull request #105605 from siraben/oksh-init
oksh: init at 6.8.1
2021-01-09 17:40:36 +01:00
github-actions[bot]
f89e74dbcc
Merge master into staging-next 2021-01-08 18:37:56 +00:00
Tim Steinbach
f621108dbc
oh-my-zsh: 2021-01-05 → 2021-01-07 2021-01-08 14:03:10 +00:00
Jan Tojnar
f19eb635b4
Merge branch 'master' into staging-next
b04fc593e7 seems to have accidentally changed mkDerivation function for dfilemanager and solarus-quest-editor so I have reverted that here.
2021-01-07 13:04:31 +01:00
Tim Steinbach
c034059bca
oh-my-zsh: 2021-01-04 → 2021-01-05 2021-01-06 14:28:39 -05:00
pacien
ae5c662182 wrapFish: add fish shell wrapper package
This adds a wrapper for fish which allows creating shells pre-initialised
with some completions, functions, and configuration scripts from given paths
or from fish plugin packages (`pkgs.fishPlugins.*`).

This is especially handy when one wants to try a plugin in an ephemeral shell.

GitHub: see https://github.com/NixOS/nixpkgs/pull/107834#discussion_r550612519
2021-01-05 17:20:39 +01:00
Michele Guerini Rocco
99bfa4bb60
Merge pull request #107834 from pacien/fishPlugins-init
fishPlugins: create scope and add some plugins
2021-01-05 16:48:22 +01:00
Tim Steinbach
02262c67ce
oh-my-zsh: 2021-01-02 → 2021-01-04 2021-01-05 10:30:29 -05:00
AndersonTorres
77f62f9820 tcsh: 6.22.02 -> 6.22.03 2021-01-05 08:55:24 -03:00
pacien
d94921db12 fish-foreign-env: move to fishPlugins.foreign-env
And relocate the installed fish functions to the `vendor_functions.d` so
that they're automatically loaded.
2021-01-04 18:53:59 +01:00
pacien
59c1b6d0e7 fishPlugins.pure: init at 3.4.2 2021-01-04 18:51:11 +01:00
pacien
3a987feae1 fishPlugins.fishtape: init at 2.1.3 2021-01-04 18:51:11 +01:00
pacien
c083b27791 fishPlugins: bootstrap fish plugin scope 2021-01-04 18:51:11 +01:00
github-actions[bot]
f0187a2cf3
Merge staging-next into staging 2021-01-04 12:26:43 +00:00
Doron Behar
cf0e54722d
Merge pull request #105301 from antifuchs/zsh-purity
zsh: Disable compiling in /usr/local/... as the site-function directory
2021-01-04 10:04:18 +02:00
Ben Siraphob
3ae5e6ce03 treewide: remove enableParallelBuilding = true if using cmake 2021-01-03 18:37:40 +07:00
zowoq
fb2311d430 Merge staging-next into staging 2021-01-03 16:33:28 +10:00
Tim Steinbach
88d2028549
oh-my-zsh: 2021-01-01 → 2021-01-02 2021-01-02 21:00:00 -05:00
Tim Steinbach
952b3f9651
oh-my-zsh: 2020-12-31 → 2021-01-01 2021-01-01 16:52:09 -05:00
github-actions[bot]
a6f7ba3752
Merge staging-next into staging 2020-12-31 18:42:44 +00:00
Tim Steinbach
d1adfb65f2
oh-my-zsh: 2020-12-30 → 2020-12-31 2020-12-31 11:57:33 -05:00
Frederik Rietdijk
f3b4ae8402 Merge staging-next into staging 2020-12-31 13:29:55 +01:00
Sandro
c5893c9b57
Merge pull request #108011 from veehaitch/any-nix-shell-v1.2.0
any-nix-shell: 1.1.0 -> 1.2.0
2020-12-31 05:37:20 +01:00
Tim Steinbach
f62c0b45f1
oh-my-zsh: 2020-12-28 → 2020-12-30 2020-12-30 21:19:14 -05:00
Vincent Haupert
3c4f8e89c1
any-nix-shell: 1.1.0 -> 1.2.0 2020-12-31 03:00:02 +01:00
github-actions[bot]
1db88b5c65
Merge staging-next into staging 2020-12-29 18:40:56 +00:00
Marc Seeger
1d83fc2aac bash-completion: fix build on darwin (#107768) 2020-12-29 09:34:54 -08:00
Tim Steinbach
e9d8aaa945
oh-my-zsh: 2020-12-27 → 2020-12-28 2020-12-29 10:11:57 -05:00
Tim Steinbach
9e88afeb10
oh-my-zsh: 2020-12-16 → 2020-12-27 2020-12-28 10:48:00 -05:00
Jörg Thalheim
db103e0f98
Merge pull request #105395 from r-burns/ion
ion: fix build on darwin
2020-12-28 06:29:57 +00:00
Bernardo Meurer
d39e298135
Merge pull request #107160 from NixOS/zsh-powerlevel10k
zsh-powerlevel10k: 0.14.3 -> 0.14.4
2020-12-22 22:31:35 +00:00
Luke Worth
7bc7073430
bash: 5.0 -> 5.1 2020-12-22 10:43:59 +11:00
Martin Weinelt
e44a5aacee
zsh-powerlevel10k: 0.14.3 -> 0.14.4 2020-12-18 18:13:01 +01:00
Tim Steinbach
528cdd3ec5
oh-my-zsh: 2020-12-14 → 2020-12-16 2020-12-17 09:02:46 -05:00
Mario Rodas
95f30fea56 nushell: 0.23.0 -> 0.24.1 2020-12-16 04:20:00 +00:00
Tim Steinbach
198003cb9f
oh-my-zsh: 2020-11-26 → 2020-12-14 2020-12-16 10:43:38 -05:00
Ollie Charles
1675b11cd4 Remove myself from maintainers sets
Unfortunately I can't reliably commit time to nixpkgs, so I would like to remove myself from being a formal maintainer for these packages.
2020-12-07 14:30:37 +00:00
Ben Siraphob
b13edbaac5 oksh: init at 6.8.1 2020-12-05 18:36:49 +07:00
R. RyanTM
6e36faa8cb oil: 0.8.4 -> 0.8.5 2020-12-03 01:48:49 +00:00
Ryan Burns
6906e20605 ion: fix build on darwin 2020-11-29 12:35:14 -08:00
Andreas Fuchs
58fa36d30c zsh: Disable compiling in /usr/local/... as the site fndir
With the default configure flags, zsh compiles in a reference to the
"site function" directory that's outside the store path. Under the
right (wrong) circumstances, other builds using zsh can be affected by
these functions.
2020-11-28 19:04:06 -05:00
Tim Steinbach
eb2a3a040c
oh-my-zsh: 2020-11-25 → 2020-11-26 2020-11-28 12:43:17 -05:00
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
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