about summary refs log tree commit diff
path: root/pkgs/top-level
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2014-01-03 14:48:21 +0100
committerEelco Dolstra <eelco.dolstra@logicblox.com>2014-01-03 14:48:21 +0100
commit8398b23e1033faab48e26ad346ccc5066b2988f0 (patch)
tree250fd84c37296f30b1ac01cdc06f36c7b034583f /pkgs/top-level
parentb96d3ca233d32b3a21e5d3227dcfef75fa4c7cb6 (diff)
downloadnixlib-8398b23e1033faab48e26ad346ccc5066b2988f0.tar
nixlib-8398b23e1033faab48e26ad346ccc5066b2988f0.tar.gz
nixlib-8398b23e1033faab48e26ad346ccc5066b2988f0.tar.bz2
nixlib-8398b23e1033faab48e26ad346ccc5066b2988f0.tar.lz
nixlib-8398b23e1033faab48e26ad346ccc5066b2988f0.tar.xz
nixlib-8398b23e1033faab48e26ad346ccc5066b2988f0.tar.zst
nixlib-8398b23e1033faab48e26ad346ccc5066b2988f0.zip
clojure: Update to 1.5.1
Also, merge the wrapper into the main package, and get rid of the
binary variant.
Diffstat (limited to 'pkgs/top-level')
-rw-r--r--pkgs/top-level/all-packages.nix8
-rw-r--r--pkgs/top-level/release-python.nix1
2 files changed, 0 insertions, 9 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bbf6fddc4dfd..495ff567f327 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3192,14 +3192,6 @@ let
 
   clojure = callPackage ../development/interpreters/clojure { };
 
-  clojureUnstable = callPackage ../development/interpreters/clojure { version = "1.5.0-RC1"; };
-
-  clojure_binary = callPackage ../development/interpreters/clojure/binary.nix { };
-
-  clojure_wrapper = callPackage ../development/interpreters/clojure/wrapper.nix {
-    #clojure = clojure_binary;
-  };
-
   clooj_standalone_binary = callPackage ../development/interpreters/clojure/clooj.nix { };
 
   clooj_wrapper = callPackage ../development/interpreters/clojure/clooj-wrapper.nix {
diff --git a/pkgs/top-level/release-python.nix b/pkgs/top-level/release-python.nix
index ceb40bddb875..cade7660baac 100644
--- a/pkgs/top-level/release-python.nix
+++ b/pkgs/top-level/release-python.nix
@@ -162,7 +162,6 @@ let
   clisp = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
   clisp_2_44_1 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
   clojure = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
-  clojure_wrapper = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
   clooj_wrapper = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
   clucene_core_2 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
   clutter = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };