1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-27 16:11:58 +00:00
Commit graph

232 commits

Author SHA1 Message Date
Frederik Rietdijk 419bc0a4cd Revert "Revert "Merge master into staging-next""
In 87a19e9048 I merged staging-next into master using the GitHub gui as intended.
In ac241fb7a5 I merged master into staging-next for the next staging cycle, however, I accidentally pushed it to master.
Thinking this may cause trouble, I reverted it in 0be87c7979. This was however wrong, as it "removed" master.

This reverts commit 0be87c7979.
2020-02-05 19:41:25 +01:00
Frederik Rietdijk 0be87c7979 Revert "Merge master into staging-next"
I merged master into staging-next but accidentally pushed it to master.
This should get us back to 87a19e9048.

This reverts commit ac241fb7a5, reversing
changes made to 76a439239e.
2020-02-05 19:18:35 +01:00
Tim Steinbach e9a21da6a1
oh-my-zsh: 2020-02-04 -> 2020-02-04 2020-02-05 08:31:36 -05:00
Tim Steinbach 3931b82775
oh-my-zsh: 2020-01-31 -> 2020-02-04 2020-02-04 09:44:47 -05:00
Martin Weinelt f40dcc6c52
zsh-powerlevel10k: 1.0 -> 1.1 2020-02-02 21:34:05 +01:00
Tim Steinbach d0f3e3e07f
oh-my-zsh: 2020-01-30 -> 2020-01-31 2020-02-01 09:18:52 -05:00
Tim Steinbach 79713f8a90
oh-my-zsh: 2020-01-04 -> 2020-01-30 2020-01-30 16:41:13 -05:00
Silvan Mosberger b785f2a98a
Merge pull request #65430 from pasqui23/zbd
zsh-bd:init at 2018-07-04
2020-01-21 16:11:56 +01:00
Pasquale 341097c8cf zsh-bd: init at 2018-07-04 2020-01-21 12:38:22 +01:00
Maximilian Bosch 70afd4e63b
zsh-you-should-use: 1.6.0 -> 1.7.0
https://github.com/MichaelAquilina/zsh-you-should-use/blob/1.7.0/CHANGELOG.md#170
2020-01-20 13:44:29 +01:00
Martin Weinelt 67b968a9ec
zsh-powerlevel10k: unstable-2019-12-19 -> 1.0 2020-01-16 20:18:29 +01:00
Will Dietz 2e63e9c433 zsh-autosuggestions: 0.6.3 -> 0.6.4 2020-01-11 12:51:27 -08:00
Martin Weinelt 6eb0aee387 zsh-powerlevel10k: init at unstable-2019-12-19 2020-01-06 21:49:15 +01:00
Tim Steinbach 7b9da94d49
oh-my-zsh: 2020-01-01 -> 2020-01-04 2020-01-05 16:17:40 -05:00
Frederik Rietdijk f08e3e38d4 Merge master into staging-next 2020-01-02 21:41:13 +01:00
Tim Steinbach 3ebcd9a338
oh-my-zsh: 2019-12-29 -> 2020-01-01 2020-01-01 16:12:27 -05:00
Robin Gloster 006242fd5a
treewide: fix types for mkDerivation params 2019-12-31 01:23:19 +01:00
Robin Gloster 2157dcd141
treewide: installFlags is a list 2019-12-30 13:22:43 +01:00
Tim Steinbach 124ec9c18e
oh-my-zsh: 2019-12-27 -> 2019-12-29 2019-12-28 23:19:54 -05:00
Tim Steinbach 8c01abd962
oh-my-zsh: 2019-12-22 -> 2019-12-27 2019-12-26 20:10:45 -05:00
Maximilian Bosch 9842c4b107
treewide: update which packages I'm currently maintaining
Idea shamelessly stolen from 4e60b0efae.

I realized that I don't really know anymore where I'm listed as maintainer and what
I'm actually (co)-maintaining which means that I can't proactively take
care of packages I officially maintain.

As I don't have the time, energy and motivation to take care of stuff I
was interested in 1 or 2 years ago (or packaged for someone else in the
past), I decided that I make this explicit by removing myself from several
packages and adding myself in some other stuff I'm now interested in.

I've seen it several times now that people remove themselves from a
package without removing the package if it's unmaintained after that
which is why I figured that it's fine in my case as the affected pkgs
are rather low-prio and were pretty easy to maintain.
2019-12-26 15:27:47 +01:00
Tim Steinbach e865acf44c
oh-my-zsh: 2019-12-20 -> 2019-12-22 2019-12-22 20:11:22 -05:00
Tim Steinbach e093c7503f
oh-my-zsh: 2019-12-18 -> 2019-12-20 2019-12-20 11:36:44 -05:00
Tim Steinbach 52ed4751af
oh-my-zsh: 2019-12-07 -> 2019-12-18 2019-12-18 11:37:42 -05:00
Christian Kampka c98d54a3e9
zsh-history: Add tests 2019-12-14 10:58:38 +01:00
Tim Steinbach 60512b1823
oh-my-zsh: GitHub repo moved 2019-12-12 07:38:40 -05:00
Christian Kampka 1d2e21ad1f
zsh-history: 2019-10-07 -> 2019-12-10 2019-12-10 13:18:38 +01:00
Tim Steinbach 65543e5839
oh-my-zsh: 2019-12-07 -> 2019-12-07 2019-12-09 12:01:33 -05:00
Tim Steinbach bdf74811ce
oh-my-zsh: 2019-11-21 -> 2019-11-23 2019-11-25 09:14:39 -05:00
John Ericson d0d5136cce Merge remote-tracking branch 'upstream/master' into wrapper-pname-support 2019-11-24 17:25:07 +00:00
John Ericson 9b090ccbca treewide: Get rid of most parseDrvName without breaking compat
That is because this commit should be merged to both master and
release-19.09.
2019-11-24 17:22:28 +00:00
Tim Steinbach ab84418b10 oh-my-zsh: 2019-10-30 -> 2019-11-21 2019-11-21 19:55:38 -05:00
pasqui23 c20f765bb4 zsh-fast-syntax-highlighting: init at 1.54 (#65429) 2019-11-19 21:20:17 -05:00
R. RyanTM 96630a9e49 grml-zsh-config: 0.16.0 -> 0.16.1
(#72511)
2019-11-13 16:16:07 +01:00
Oleksii Filonenko dfb9a1e164
antibody: add filalex77 as a maintainer 2019-11-11 13:51:02 +02:00
Oleksii Filonenko 3f72f7bac2
antibody: 4.1.2 -> 4.2.0 2019-11-11 13:50:42 +02:00
R. RyanTM e834edcbdd zsh-history-substring-search: 1.0.1 -> 1.0.2 2019-11-04 11:08:40 +00:00
Maximilian Bosch 8a0fdf0011
Merge pull request #72195 from Ma27/package-fzf-zsh
fzf-zsh: init at unstable-2019-09-09
2019-10-31 23:32:02 +01:00
Tim Steinbach 8a75eaa6a0
oh-my-zsh: 2019-10-27 -> 2019-10-30 2019-10-31 10:42:54 -04:00
Maximilian Bosch bd4b70b075
fzf-zsh: init at unstable-2019-09-09
Simple `fzf` wrapper which provides a way nicer interface for ZSH's
<C-r> search. When using oh-my-zsh it can be enabled like this:

``` nix
{ pkgs, ... }: {
  programs.zsh = {
    enable = true;
    ohMyZsh = {
      enable = true;
      customPkgs = [ pkgs.fzf-zsh ];
      plugins = [ "fzf-zsh" ];
    };
  };
}
```
2019-10-28 21:55:34 +01:00
Tim Steinbach 4aaf2ad527
oh-my-zsh: 2019-10-25 -> 2019-10-27 2019-10-27 14:59:39 -04:00
Tim Steinbach 50208ab5b9
oh-my-zsh: 2019-10-24 -> 2019-10-25 2019-10-25 13:44:03 -04:00
Tim Steinbach 6373b7ac51
oh-my-zsh: 2019-10-22 -> 2019-10-24 2019-10-24 18:23:36 -04:00
Tim Steinbach ad55ac4a40
oh-my-zsh: 2019-10-20 -> 2019-10-22 2019-10-23 08:30:55 -04:00
Tim Steinbach ad5994f182
oh-my-zsh: 2019-10-19 -> 2019-10-20 2019-10-21 07:34:51 -04:00
Tim Steinbach 71ab7a57ff
oh-my-zsh: 2019-10-16 -> 2019-10-19 2019-10-19 20:53:48 -04:00
Maximilian Bosch 70783011e2
zsh-you-should-use: 1.4.0 -> 1.6.0
https://github.com/MichaelAquilina/zsh-you-should-use/blob/master/CHANGELOG.md#160
2019-10-19 21:36:06 +02:00
Tim Steinbach b54d23a3c0
oh-my-zsh: 2019-10-15 -> 2019-10-16 2019-10-18 12:33:12 -04:00
worldofpeace fce8b4837a
Merge pull request #67670 from kampka/zsh-history
zsh-history: init at unstable-2019-08-29
2019-10-16 01:57:23 +00:00
Tim Steinbach 2f6f6a3855
oh-my-zsh: 2019-10-10 -> 2019-10-15 2019-10-15 16:10:38 -04:00