mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-22 21:50:55 +00:00
Code Issues Wiki Activity
250800 commits 327 branches 124 tags 6.8 GiB
Commit graph

1202 commits

Author SHA1 Message Date
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
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