Merge branch 'master' into closure-size

Beware that stdenv doesn't build. It seems something more will be needed
than just resolution of merge conflicts.

pkgs/shells/bash-completion/default.nix

@@ -12,6 +12,11 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
+  # nmcli is included in the network-manager package
+  postInstall = ''
+    rm $out/share/bash-completion/completions/nmcli
+  '';
+
   meta = {
     homepage = "http://bash-completion.alioth.debian.org/";
     description = "Programmable completion for the bash shell";

pkgs/shells/mksh/default.nix

@@ -2,14 +2,14 @@
 
 stdenv.mkDerivation rec {
   name = "mksh-${version}";
-  version = "52";
+  version = "52c";
 
   src = fetchurl {
     urls = [
       "http://www.mirbsd.org/MirOS/dist/mir/mksh/mksh-R${version}.tgz"
       "http://pub.allbsd.org/MirOS/dist/mir/mksh/mksh-R${version}.tgz"
     ];
-    sha256 = "13vnncwfx4zq3yi7llw3p6miw0px1bm5rrps3y1nlfn6sb6zbhj5";
+    sha256 = "19ivsic15903hv3ipzk0kvkaxardw7b99s8l5iw3y415lz71ld66";
   };
 
   buildInputs = [ groff ];

pkgs/shells/oh-my-zsh/default.nix

@@ -0,0 +1,74 @@
+# This script was inspired by the ArchLinux User Repository package:
+#
+#   https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=oh-my-zsh-git
+
+
+{ stdenv, fetchgit }:
+
+stdenv.mkDerivation rec {
+  name = "oh-my-zsh-git-${version}";
+  version = "2016-03-24";
+
+  src = fetchgit {
+    url = "https://github.com/robbyrussell/oh-my-zsh";
+    rev = "9280f2c874b1126ee9399c353d1e0184fd39b4e4";
+    sha256 = "1rldqfs5vkqxp3r7nn5q1837a363gml0d5pji0zkl7ia49f7bdnk";
+  };
+
+  phases = "installPhase";
+
+  installPhase = ''
+  outdir=$out/share/oh-my-zsh
+  template=templates/zshrc.zsh-template
+
+  mkdir -p $outdir
+  cp -r $src/* $outdir
+  cd $outdir
+
+  rm MIT-LICENSE.txt
+  rm -rf .git*
+
+  chmod -R +w templates
+
+  # Change the path to oh-my-zsh dir and disable auto-updating.
+  sed -i -e "2c\\ZSH=$outdir/" \
+         -e 's/\# \(DISABLE_AUTO_UPDATE="true"\)/\1/' \
+   $template
+
+  # Look for .zsh_variables, .zsh_aliases, and .zsh_funcs, and source
+  # them, if found.
+  cat >> $template <<- EOF
+
+  # Load the variables.
+  if [ -f ~/.zsh_variables ]; then
+      . ~/.zsh_variables
+  fi
+
+  # Load the functions.
+  if [ -f ~/.zsh_funcs ]; then
+    . ~/.zsh_funcs
+  fi
+
+  # Load the aliases.
+  if [ -f ~/.zsh_aliases ]; then
+      . ~/.zsh_aliases
+  fi
+  EOF
+  '';
+
+  meta = with stdenv.lib; {
+  description     = "A framework for managing your zsh configuration";
+  longDescription = ''
+  Oh My Zsh is a framework for managing your zsh configuration.
+
+  To copy the Oh My Zsh configuration file to your home directory, run
+  the following command:
+
+    $ cp -v $(nix-env -q --out-path oh-my-zsh-git | cut -d' ' -f3)/share/oh-my-zsh/templates/zshrc.zsh-template ~/.zshrc
+  '';
+  homepage        = "http://ohmyz.sh/";
+  license         = licenses.mit;
+  platforms       = platforms.all;
+  maintainers     = with maintainers; [ scolobb nequissimus ];
+  };
+}

pkgs/shells/zsh/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, ncurses, coreutils, pcre }:
+{ stdenv, fetchurl, ncurses, pcre }:
 
 let
 
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
     sha256 = "0dsr450v8nydvpk8ry276fvbznlrjgddgp7zvhcw4cv69i9lr4ps";
   };
 
-  buildInputs = [ ncurses coreutils pcre ];
+  buildInputs = [ ncurses pcre ];
 
   configureFlags = [
     "--enable-maildir-support"
@@ -37,8 +37,10 @@ stdenv.mkDerivation {
 
   # XXX: think/discuss about this, also with respect to nixos vs nix-on-X
   postInstall = ''
-    mkdir -p $out/share/
+    mkdir -p $out/share/info
     tar xf ${documentation} -C $out/share
+    ln -s $out/share/zsh-*/Doc/zsh.info* $out/share/info/
+
     mkdir -p $out/etc/
     cat > $out/etc/zprofile <<EOF
 if test -e /etc/NIXOS; then