3 files changed, 47 insertions, 2 deletions
diff --git a/pkgs/shells/es/default.nix b/pkgs/shells/es/default.nix
new file mode 100644
index 00000000000..236c5d1f00f
--- /dev/null
+++ b/pkgs/shells/es/default.nix
@@ -0,0 +1,45 @@
+{ stdenv, fetchgit, readline, yacc, autoconf, automake, libtool }:
+
+let
+  version = "git-2015-04-11";
+in
+stdenv.mkDerivation {
+
+  name = "es-${version}";
+
+  src = fetchgit {
+    url = "git://github.com/wryun/es-shell";
+    rev = "fdf29d5296ce3a0ef96d2b5952cff07878753975";
+    sha256 = "1hj0g8r59ry9l50h4gdal38nf8lvb3cgl6c9bx5aabkw5i778dfk";
+  };
+
+  buildInputs = [ readline yacc libtool autoconf automake ];
+
+  preConfigure =
+    ''
+      aclocal
+      autoconf
+      libtoolize -qi
+    '';
+
+  configureFlags="--with-readline --prefix=$(out) --bindir=$(out)/bin --mandir=$(out)/man";
+
+  preInstall = ''
+    mkdir -p $out/{bin,man}
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Es is an extensible shell";
+    longDescription =
+      ''
+        Es is an extensible shell. The language was derived
+        from the Plan 9 shell, rc, and was influenced by
+        functional programming languages, such as Scheme,
+        and the Tcl embeddable programming language.
+      '';
+    homepage = http://wryun.github.io/es-shell/;
+    license = licenses.publicDomain;
+    maintainers = [ maintainers.sjmackenzie ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/shells/mksh/default.nix b/pkgs/shells/mksh/default.nix
index da797005be4..ba510e8907a 100644
--- a/pkgs/shells/mksh/default.nix
+++ b/pkgs/shells/mksh/default.nix
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
       systems.
     '';
     homepage = "https://www.mirbsd.org/mksh.htm";
-    licenses = "custom";
+    license = "custom";
     maintainers = [ maintainers.AndersonTorres ];
     platforms = platforms.unix;
   };
diff --git a/pkgs/shells/zsh/default.nix b/pkgs/shells/zsh/default.nix
index 9887e8f1b6f..ada34030034 100644
--- a/pkgs/shells/zsh/default.nix
+++ b/pkgs/shells/zsh/default.nix
@@ -68,7 +68,7 @@ EOF
       a host of other features.
     '';
     license = "MIT-like";
-    homePage = "http://www.zsh.org/";
+    homepage = "http://www.zsh.org/";
     maintainers = with stdenv.lib.maintainers; [ chaoflow ];
     platforms = stdenv.lib.platforms.unix;
   };