From 7f5b839524cad9211699c68ea02d11c1758a800b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 18 Nov 2009 09:39:59 +0000
Subject: * Removed selectVersion.  There's no good reason to write  
 `selectVersion ./foo "bar"' instead of `import ./foo/bar.nix'. * Replaced
 `with args' with formal function arguments in several   packages. * Renamed
 several files to `default.nix'.  As a general rule, version   numbers should
 only be included in the filename when there is a   reason to keep multiple
 versions of a package in Nixpkgs.   Otherwise, it just makes it harder to
 update the package.

svn path=/nixpkgs/trunk/; revision=18403
---
 pkgs/shells/zsh/4.3.4.nix   | 13 -------------
 pkgs/shells/zsh/4.3.5.nix   | 22 ----------------------
 pkgs/shells/zsh/4.3.9.nix   | 22 ----------------------
 pkgs/shells/zsh/cvs.nix     | 19 -------------------
 pkgs/shells/zsh/default.nix | 30 ++++++++++++++++++++++++++++++
 5 files changed, 30 insertions(+), 76 deletions(-)
 delete mode 100644 pkgs/shells/zsh/4.3.4.nix
 delete mode 100644 pkgs/shells/zsh/4.3.5.nix
 delete mode 100644 pkgs/shells/zsh/4.3.9.nix
 delete mode 100644 pkgs/shells/zsh/cvs.nix
 create mode 100644 pkgs/shells/zsh/default.nix

(limited to 'pkgs/shells/zsh')

diff --git a/pkgs/shells/zsh/4.3.4.nix b/pkgs/shells/zsh/4.3.4.nix
deleted file mode 100644
index ea9a82cf6839..000000000000
--- a/pkgs/shells/zsh/4.3.4.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-args: with args;
-stdenv.mkDerivation {
-  name = "zsh-4.3.4";
-
-  src = fetchurl {
-    url = mirror://sourceforge/zsh/zsh-4.3.4.tar.bz2;
-    sha256 = "1inypy60h7hir8hwidid85pbajrb5w09fl222p0h4fnsn0nf583g";
-  };
-
-  configureFlags = "--with-tcsetpgrp --enable-maildir-support --enable-multibyte";
-
-  buildInputs = [ncurses coreutils];
-}
diff --git a/pkgs/shells/zsh/4.3.5.nix b/pkgs/shells/zsh/4.3.5.nix
deleted file mode 100644
index c626db491075..000000000000
--- a/pkgs/shells/zsh/4.3.5.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-args: with args;
-let documentation = fetchurl {
-    url = mirror://sourceforge/zsh/zsh-4.3.5-doc.tar.bz2;
-    sha256 = "0jf35xibp8wfka7rdk9q8spkwprlhjx1sp7vp6img8wks12cvlkx";
-  };
-in
-stdenv.mkDerivation {
-  name = "zsh-${version}";
-
-  src = fetchurl {
-    url = mirror://sourceforge/zsh/zsh-4.3.5.tar.bz2;
-    sha256 = "0191j3liflkjrj39i2yrs3ab9jcx4zd93rirx3j17dymfgqlvrzb";
-  };
-  configureFlags = "--with-tcsetpgrp --enable-maildir-support --enable-multibyte";
-
-  postInstall = ''
-    ensureDir $out/share/
-    tar xf ${documentation} -C $out/share
-  '';
-
-  buildInputs = [ncurses coreutils];
-}
diff --git a/pkgs/shells/zsh/4.3.9.nix b/pkgs/shells/zsh/4.3.9.nix
deleted file mode 100644
index 6a1d0d14dee9..000000000000
--- a/pkgs/shells/zsh/4.3.9.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-args: with args;
-let documentation = fetchurl {
-    url = "mirror://sourceforge/zsh/zsh-${version}-doc.tar.bz2";
-    sha256 = "0rc19q5r8x2yln7synpqzxngm7g4g6idrpgc1i0jsawc48m7dbhm";
-  };
-in
-stdenv.mkDerivation {
-  name = "zsh-${version}";
-
-  src = fetchurl {
-    url = "mirror://sourceforge/zsh/zsh-${version}.tar.bz2";
-    sha256 = "1aw28c5w83vl2ckbvf6ljj00s36icyrnxcm1r6q63863dmn6vpcg";
-  };
-  configureFlags = "--with-tcsetpgrp --enable-maildir-support --enable-multibyte";
-
-  postInstall = ''
-    ensureDir $out/share/
-    tar xf ${documentation} -C $out/share
-  '';
-
-  buildInputs = [ncurses coreutils];
-}
diff --git a/pkgs/shells/zsh/cvs.nix b/pkgs/shells/zsh/cvs.nix
deleted file mode 100644
index db34f0666d50..000000000000
--- a/pkgs/shells/zsh/cvs.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-args: with args;
-# cvs does include docs
-# the cvs snapshot is updated occasionally. see bleedingEdgeRepos
-
-stdenv.mkDerivation {
-  name = "zsh-${version}";
-
-  src = sourceByName "zsh";
-  configureFlags = "--with-tcsetpgrp --enable-maildir-support --enable-multibyte";
-
-  preConfigure = "autoconf; autoheader";
-
-  postInstall = ''
-    ensureDir $out/share/
-    cp -R Doc $out/share
-  '';
-
-  buildInputs = [ncurses coreutils autoconf yodl ];
-}
diff --git a/pkgs/shells/zsh/default.nix b/pkgs/shells/zsh/default.nix
new file mode 100644
index 000000000000..eacda19a8de2
--- /dev/null
+++ b/pkgs/shells/zsh/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchurl, ncurses, coreutils }:
+
+let
+
+  version = "4.3.9";
+
+  documentation = fetchurl {
+    url = "mirror://sourceforge/zsh/zsh-${version}-doc.tar.bz2";
+    sha256 = "0rc19q5r8x2yln7synpqzxngm7g4g6idrpgc1i0jsawc48m7dbhm";
+  };
+  
+in
+
+stdenv.mkDerivation {
+  name = "zsh-${version}";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/zsh/zsh-${version}.tar.bz2";
+    sha256 = "1aw28c5w83vl2ckbvf6ljj00s36icyrnxcm1r6q63863dmn6vpcg";
+  };
+  
+  configureFlags = "--with-tcsetpgrp --enable-maildir-support --enable-multibyte";
+
+  postInstall = ''
+    ensureDir $out/share/
+    tar xf ${documentation} -C $out/share
+  '';
+
+  buildInputs = [ncurses coreutils];
+}
-- 
cgit 1.4.1