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:59:21 +0100
committerEelco Dolstra <eelco.dolstra@logicblox.com>2014-01-06 14:36:13 +0100
commitcd5a9f4980fc9ad65b8a1c8f5eb4d46953e260a2 (patch)
tree99e37fd5e4a0708b3e9d33ddb85f65ba44b2d37d /pkgs/top-level
parent8398b23e1033faab48e26ad346ccc5066b2988f0 (diff)
downloadnixlib-cd5a9f4980fc9ad65b8a1c8f5eb4d46953e260a2.tar
nixlib-cd5a9f4980fc9ad65b8a1c8f5eb4d46953e260a2.tar.gz
nixlib-cd5a9f4980fc9ad65b8a1c8f5eb4d46953e260a2.tar.bz2
nixlib-cd5a9f4980fc9ad65b8a1c8f5eb4d46953e260a2.tar.lz
nixlib-cd5a9f4980fc9ad65b8a1c8f5eb4d46953e260a2.tar.xz
nixlib-cd5a9f4980fc9ad65b8a1c8f5eb4d46953e260a2.tar.zst
nixlib-cd5a9f4980fc9ad65b8a1c8f5eb4d46953e260a2.zip
clooj: Update to 0.4.4
Also, merge the wrapper into the main package.
Diffstat (limited to 'pkgs/top-level')
-rw-r--r--pkgs/top-level/all-packages.nix6
-rw-r--r--pkgs/top-level/release-python.nix1
2 files changed, 1 insertions, 6 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 495ff567f327..a203c5e4fc61 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3192,11 +3192,7 @@ let
 
   clojure = callPackage ../development/interpreters/clojure { };
 
-  clooj_standalone_binary = callPackage ../development/interpreters/clojure/clooj.nix { };
-
-  clooj_wrapper = callPackage ../development/interpreters/clojure/clooj-wrapper.nix {
-    clooj = clooj_standalone_binary;
-  };
+  clooj = callPackage ../development/interpreters/clojure/clooj.nix { };
 
   erlangR14B04 = callPackage ../development/interpreters/erlang/R14B04.nix { };
   erlangR15B03 = callPackage ../development/interpreters/erlang/R15B03.nix { };
diff --git a/pkgs/top-level/release-python.nix b/pkgs/top-level/release-python.nix
index cade7660baac..2f29267b5c87 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; };
-  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; };
   clutter_gtk = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };