diff options
| -rw-r--r-- | pkgs/development/interpreters/lua-5/builder.sh | 6 | ||||
| -rw-r--r-- | pkgs/development/interpreters/lua-5/default.nix | 12 | ||||
| -rw-r--r-- | pkgs/shells/zsh/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
4 files changed, 12 insertions, 16 deletions
diff --git a/pkgs/development/interpreters/lua-5/builder.sh b/pkgs/development/interpreters/lua-5/builder.sh deleted file mode 100644 index 28cd2b9fa612d..0000000000000 --- a/pkgs/development/interpreters/lua-5/builder.sh +++ /dev/null @@ -1,6 +0,0 @@ -source $stdenv/setup - -buildFlags="all so sobin" -installFlags="soinstall INSTALL_ROOT=$out" - -genericBuild diff --git a/pkgs/development/interpreters/lua-5/default.nix b/pkgs/development/interpreters/lua-5/default.nix index 4659ca6a3a663..30ab031113642 100644 --- a/pkgs/development/interpreters/lua-5/default.nix +++ b/pkgs/development/interpreters/lua-5/default.nix @@ -1,10 +1,12 @@ -{stdenv, fetchurl}: +{stdenv, fetchurl, ncurses, readline}: stdenv.mkDerivation { - name = "lua-5.0.2"; + name = "lua-5.1.2"; src = fetchurl { - url = http://nix.cs.uu.nl/dist/tarballs/lua-5.0.2.tar.gz; - md5 = "dea74646b7e5c621fef7174df83c34b1"; + url = http://nix.cs.uu.nl/dist/tarballs/lua-5.1.2.tar.gz; + sha256 = "17ixifwgjva5592s2rn1ki56wa7hgw0z210r4bcx5lv8zv39iw2w"; }; - builder= ./builder.sh; + buildFlags = "linux"; # TODO: support for non-linux systems + installFlags = "install INSTALL_TOP=\${out}"; + buildInputs = [ ncurses readline ]; } diff --git a/pkgs/shells/zsh/default.nix b/pkgs/shells/zsh/default.nix index fc655445a39ae..666fe18eddab2 100644 --- a/pkgs/shells/zsh/default.nix +++ b/pkgs/shells/zsh/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation { name = "zsh-4.2.3"; src = fetchurl { - url = ftp://nephtys.lip6.fr/pub/unix/shells/zsh/zsh-4.2.3.tar.bz2; - md5 = "ae19a74ae7e84cf4dbd8e35f52c8ec74"; + url = ftp://nephtys.lip6.fr/pub/unix/shells/zsh/zsh-4.3.2.tar.bz2; + sha256 = "1lyzh68h69iarnmrrnd2gy9ssmns4w0abbr3hfz98lhik762f3na"; }; - configureFlags = "--with-tcsetpgrp"; + configureFlags = "--with-tcsetpgrp --enable-maildir-support --enable-multibyte"; - buildInputs = [ncurses coreutils ]; + buildInputs = [ncurses coreutils]; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 949bddfd22ac0..f813e8105bbd2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -920,7 +920,7 @@ rec { }; lua5 = import ../development/interpreters/lua-5 { - inherit fetchurl stdenv; + inherit fetchurl stdenv ncurses readline; }; octave = import ../development/interpreters/octave { |