From d7c0e3eaf8967b844db1c23f19087c7bb9fd9798 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sun, 26 Apr 2015 21:15:25 -0700
Subject: tcl: Make generic and add 8.5

---
 pkgs/development/interpreters/tcl/8.5.nix     | 11 +++++++++
 pkgs/development/interpreters/tcl/8.6.nix     | 11 +++++++++
 pkgs/development/interpreters/tcl/default.nix | 33 ---------------------------
 pkgs/development/interpreters/tcl/generic.nix | 32 ++++++++++++++++++++++++++
 4 files changed, 54 insertions(+), 33 deletions(-)
 create mode 100644 pkgs/development/interpreters/tcl/8.5.nix
 create mode 100644 pkgs/development/interpreters/tcl/8.6.nix
 delete mode 100644 pkgs/development/interpreters/tcl/default.nix
 create mode 100644 pkgs/development/interpreters/tcl/generic.nix

(limited to 'pkgs/development/interpreters/tcl')

diff --git a/pkgs/development/interpreters/tcl/8.5.nix b/pkgs/development/interpreters/tcl/8.5.nix
new file mode 100644
index 000000000000..193ff4f93769
--- /dev/null
+++ b/pkgs/development/interpreters/tcl/8.5.nix
@@ -0,0 +1,11 @@
+{ callPackage, fetchurl, ... } @ args:
+
+callPackage ./generic.nix (args // rec {
+  release = "8.5";
+  version = "${release}.18";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/tcl/tcl${version}-src.tar.gz";
+    sha256 = "1jfkqp2fr0xh6xvaqx134hkfa5kh7agaqbxm6lhjbpvvc1xfaaq3";
+  };
+})
diff --git a/pkgs/development/interpreters/tcl/8.6.nix b/pkgs/development/interpreters/tcl/8.6.nix
new file mode 100644
index 000000000000..fd88c8e87166
--- /dev/null
+++ b/pkgs/development/interpreters/tcl/8.6.nix
@@ -0,0 +1,11 @@
+{ callPackage, fetchurl, ... } @ args:
+
+callPackage ./generic.nix (args // rec {
+  release = "8.6";
+  version = "${release}.4";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/tcl/tcl${version}-src.tar.gz";
+    sha256 = "13cwa4bc85ylf5gfj9vk182lvgy60qni3f7gbxghq78wk16djvly";
+  };
+})
diff --git a/pkgs/development/interpreters/tcl/default.nix b/pkgs/development/interpreters/tcl/default.nix
deleted file mode 100644
index aa3836399ba5..000000000000
--- a/pkgs/development/interpreters/tcl/default.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{ stdenv, fetchurl }:
-let
-  release = "8.6";
-in
-stdenv.mkDerivation rec {
-  name = "tcl-${version}";
-  version = "${release}.4";
-
-  src = fetchurl {
-    url = "mirror://sourceforge/tcl/tcl${version}-src.tar.gz";
-    sha256 = "13cwa4bc85ylf5gfj9vk182lvgy60qni3f7gbxghq78wk16djvly";
-  };
-
-  preConfigure = "cd unix";
-
-  postInstall = ''
-    make install-private-headers
-    ln -s $out/bin/tclsh${release} $out/bin/tclsh
-  '';
-  
-  meta = with stdenv.lib; {
-    description = "The Tcl scription language";
-    homepage = http://www.tcl.tk/;
-    license = licenses.tcltk;
-    platforms = platforms.all;
-  };
-  
-  passthru = rec {
-    inherit release version;
-    libPrefix = "tcl${release}";
-    libdir = "lib/${libPrefix}";
-  };
-}
diff --git a/pkgs/development/interpreters/tcl/generic.nix b/pkgs/development/interpreters/tcl/generic.nix
new file mode 100644
index 000000000000..8b5722c79c8d
--- /dev/null
+++ b/pkgs/development/interpreters/tcl/generic.nix
@@ -0,0 +1,32 @@
+{ stdenv, fetchurl
+
+# Version specific stuff
+, release, version, src
+, ...
+}:
+
+stdenv.mkDerivation rec {
+  name = "tcl-${version}";
+
+  inherit src;
+
+  preConfigure = "cd unix";
+
+  postInstall = ''
+    make install-private-headers
+    ln -s $out/bin/tclsh${release} $out/bin/tclsh
+  '';
+  
+  meta = with stdenv.lib; {
+    description = "The Tcl scription language";
+    homepage = http://www.tcl.tk/;
+    license = licenses.tcltk;
+    platforms = platforms.all;
+  };
+  
+  passthru = rec {
+    inherit release version;
+    libPrefix = "tcl${release}";
+    libdir = "lib/${libPrefix}";
+  };
+}
-- 
cgit 1.4.1