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
Mario Rodas
600d0c978a
xonsh: 0.9.23 -> 0.9.24
...
https://github.com/xonsh/xonsh/releases/tag/0.9.24
2020-10-16 04:20:00 +00: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
R. RyanTM
9f5aed0c22
antibody: 6.1.0 -> 6.1.1
2020-09-04 08:56:02 -07:00
Tim Steinbach
e385f98792
oh-my-zsh: 2020-09-02 -> 2020-09-03
2020-09-04 09:25:47 -04:00
John Ericson
bd3583fc71
Merge pull request #96970 from obsidiansystems/dash-cross
...
dash: Fix cross build
2020-09-03 14:10:15 -04:00
Mario Rodas
b03a6187b1
xonsh: 0.9.20 -> 0.9.21
...
https://github.com/xonsh/xonsh/releases/tag/0.9.21
2020-09-02 21:21:21 +00:00
John Ericson
a47d059689
dash: Fix cross build
2020-09-02 16:16:49 -04:00
Tim Steinbach
f9bf64f0c4
oh-my-zsh: 2020-08-31 -> 2020-09-02
2020-09-02 13:48:58 -04:00
Tim Steinbach
0a64ff8152
oh-my-zsh: 2020-08-28 -> 2020-08-31
2020-09-01 09:39:32 -04:00
Tim Steinbach
416987cfff
oh-my-zsh: Fix update script
2020-08-31 09:15:47 -04:00
Tim Steinbach
c23a404cb6
Remove fetchpatch
2020-08-31 09:08:49 -04:00
Tim Steinbach
63a726d847
Merge branch 'master' into ohmyzsh-cleanups
2020-08-31 08:57:43 -04:00
Tim Steinbach
1b0186928d
oh-my-zsh: 2020-08-24 -> 2020-08-28
2020-08-31 08:30:45 -04:00
Florian Klink
b07a1dc743
oh-my-zsh: apply patch to remove usages of perl
...
https://github.com/NixOS/nixpkgs/pull/91213 removed `perl` from $PATH.
This adds a patch to oh-my-zsh, using `sed` instead of `perl` to do the
regexp substitution.
2020-08-28 23:23:44 +02:00
Florian Klink
f1e667234d
oh-my-zsh: cleanup
...
- use fetchFromGitHub instead of fetchgit
- indent the `installPhase` properly
- remove unused `pathsToLink`
- don't hardcode `phases` to allow patching
- don't copy from $src, but . to allow patching
2020-08-28 12:28:16 +02:00
Mario Rodas
4d57351aed
xonsh: 0.9.19 -> 0.9.20
...
https://github.com/xonsh/xonsh/releases/tag/0.9.20
2020-08-26 04:20:00 +00:00
Ryan Mulligan
34d3a27604
Merge pull request #96276 from r-ryantm/auto-update/elvish
...
elvish: 0.14.0 -> 0.14.1
2020-08-25 10:08:34 -07:00
Tim Steinbach
692a12e6ee
oh-my-zsh: 2020-08-20 -> 2020-08-24
2020-08-25 09:12:16 -04:00
R. RyanTM
7ec800fda1
elvish: 0.14.0 -> 0.14.1
2020-08-25 12:42:02 +00:00
Daniël de Kok
7cbeb32381
rssh: remove
...
Upstream has not made any releases since 2012 and there are several
known CVEs.
The derivation has been marked broken in nixpkgs since March 2019.
2020-08-25 08:42:55 +02:00
Tim Steinbach
725a3da8ab
oh-my-zsh: 2020-08-18 -> 2020-08-20
2020-08-20 08:18:29 -04:00
Tim Steinbach
423361a664
oh-my-zsh: 2020-08-17 -> 2020-08-18
2020-08-19 08:50:43 -04:00
Tim Steinbach
1cdddfef4b
oh-my-zsh: 2020-08-06 -> 2020-08-17
2020-08-18 08:02:25 -04:00
zowoq
473536e3b5
buildRustPackage: remove platform.all from packages
2020-08-16 12:48:18 +10:00
Yuki Okushi
2026a9aee0
nushell: 0.17.0 -> 0.18.1
2020-08-15 07:25:05 +09:00
Mario Rodas
4cba5d3a51
Merge pull request #95268 from r-ryantm/auto-update/pure-prompt
...
pure-prompt: 1.12.0 -> 1.13.0
2020-08-12 19:15:32 -05:00
R. RyanTM
5178e81f47
pure-prompt: 1.12.0 -> 1.13.0
2020-08-12 17:50:50 +00:00
Timothy Stott
ba7c0893d4
treewide: remove obsolete attribute goPackagePath in buildGoModule derivations ( #95092 )
...
The buildGoModule infrastructure does not make use of goPackagePath it is a residue from buildGoPackage.
2020-08-11 21:04:55 +00:00
Mario Rodas
dc89d3dba7
xonsh: 0.9.18 -> 0.9.19
...
https://github.com/xonsh/xonsh/releases/tag/0.9.19
2020-08-10 04:20:00 +00:00
José Romildo Malaquias
d3a7373a7a
Merge pull request #94495 from romildo/upd.liquidprompt
...
liquidprompt: unstable-2018-05-21 -> 1.12.0
2020-08-10 10:50:15 -03:00
zowoq
cea7cd902e
buildGoModule packages: set doCheck = false
2020-08-10 16:02:30 +10:00
Robert Schütz
cb8a5e5b87
spaceship-prompt: install prompt_spaceship_setup ( #94604 )
...
just like in https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=spaceship-prompt-git
2020-08-08 10:30:52 +02:00
R. RyanTM
30469ea4c5
grml-zsh-config: 0.17.3 -> 0.17.4
2020-08-07 00:17:58 -07:00
Tim Steinbach
be42a66cd3
oh-my-zsh: 2020-07-30 -> 2020-08-06
2020-08-06 08:37:22 -04:00
Daniël de Kok
9bda6bfa6b
Merge pull request #94752 from herrwiese/for-master/zsh-nix-shell-v0.1.0
...
zsh-nix-shell: (unstable-)2019-12-20 -> 0.1.0
2020-08-06 12:04:14 +02:00
Andreas Wiese
f4dad5c17b
zsh-nix-shell: (unstable-)2019-12-20 -> 0.1.0
2020-08-05 13:38:15 +02:00
Martin Weinelt
297bbd9e30
Merge pull request #92508 from mweinelt/powerlevel10k
...
zsh-powerlevel10k: 1.11.0 -> 1.12.0; gitAndTools.gitstatus: 1.1.3 -> 1.2.2
2020-08-05 13:20:55 +02:00
José Romildo Malaquias
83e4fe3466
liquidprompt: unstable-2018-05-21 -> 1.12.0
2020-08-01 21:16:38 -03:00
Frederik Rietdijk
50c060d13d
Merge master into staging-next
2020-08-01 19:37:20 +02:00
Tim Steinbach
0645303fb8
oh-my-zsh: 2020-07-23 -> 2020-07-30
2020-07-31 09:06:33 -04:00
Matthew Bauer
d0677e6d45
treewide: add warning comment to “boot” packages
...
This adds a warning to the top of each “boot” package that reads:
Note: this package is used for bootstrapping fetchurl, and thus cannot
use fetchpatch! All mutable patches (generated by GitHub or cgit) that
are needed here should be included directly in Nixpkgs as files.
This makes it clear to maintainer that they may need to treat this
package a little differently than others. Importantly, we can’t use
fetchpatch here due to using <nix/fetchurl.nix>. To avoid having stale
hashes, we need to include patches that are subject to changing
overtime (for instance, gitweb’s patches contain a version number at
the bottom).
2020-07-31 08:56:53 +02:00
zowoq
3c5750d1cd
buildGoModule packages: editorconfig fixes
2020-07-31 13:58:04 +10:00
Daiderd Jordan
8ae686d1b2
Merge pull request #93585 from adrian-gierakowski/fix-dash-on-darwin
...
dash: fix compilation on darwin
2020-07-27 22:02:41 +02:00
Tim Steinbach
d5e90de846
oh-my-zsh: 2020-07-18 -> 2020-07-23
2020-07-23 13:43:01 -04:00
Serg Nesterov
491fe83921
nushell: 0.16.0 -> 0.17.0
2020-07-22 13:57:44 +03:00
Adrian Gierakowski
3020abe5b5
dash: fix compilation on darwin
...
it has been broken since: adbace3c21
2020-07-21 11:14:06 +01:00
Tim Steinbach
93fc9b99b6
oh-my-zsh: 2020-07-15 -> 2020-07-18
2020-07-20 08:53:45 -04:00
Vladyslav M
6eefefe1aa
elvish: 0.13.1 -> 0.14.0
2020-07-15 23:09:10 +03:00
Tim Steinbach
1ce3f1fadd
oh-my-zsh: 2020-07-14 -> 2020-07-15
2020-07-17 10:22:08 -04:00
Oleksii Filonenko
e2299f6ff3
Merge pull request #93206 from r-ryantm/auto-update/antibody
...
antibody: 6.0.1 -> 6.1.0
2020-07-16 10:52:59 +03:00
R. RyanTM
f16d6a7304
antibody: 6.0.1 -> 6.1.0
2020-07-16 01:11:42 +00:00
Tim Steinbach
40d449525a
oh-my-zsh: 2020-07-13 -> 2020-07-14
2020-07-15 09:17:21 -04:00