diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-07-22 11:00:00 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-07-22 11:00:00 +0200 |
| commit | 7f410ef923b5959147e3902f727bb91b08543f72 (patch) | |
| tree | 5081fe1dbc7731c179ac8ab945e9ae2d9caefcfd /pkgs/shells | |
| parent | f77abc8b7a8b4279258862a7b6d3810e73d4b092 (diff) | |
| parent | 7491fccfe65e204ecbc7addc7ccac7b6b69fe3c5 (diff) | |
Merge remote-tracking branch 'origin/master' into staging
Conflicts: pkgs/misc/vim-plugins/default.nix
Diffstat (limited to 'pkgs/shells')
| -rw-r--r-- | pkgs/shells/zsh/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/shells/zsh/default.nix b/pkgs/shells/zsh/default.nix index 704527d28c7b0..d187c50f25153 100644 --- a/pkgs/shells/zsh/default.nix +++ b/pkgs/shells/zsh/default.nix @@ -70,6 +70,6 @@ EOF license = "MIT-like"; homePage = "http://www.zsh.org/"; maintainers = with stdenv.lib.maintainers; [ chaoflow ]; - platforms = stdenv.lib.platforms.gnu; # arbitrary choice + platforms = stdenv.lib.platforms.unix; }; } |