diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-01-03 14:59:21 +0100 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-01-06 14:36:13 +0100 |
commit | cd5a9f4980fc9ad65b8a1c8f5eb4d46953e260a2 (patch) | |
tree | 99e37fd5e4a0708b3e9d33ddb85f65ba44b2d37d /pkgs | |
parent | 8398b23e1033faab48e26ad346ccc5066b2988f0 (diff) | |
download | nixpkgs-cd5a9f4980fc9ad65b8a1c8f5eb4d46953e260a2.tar nixpkgs-cd5a9f4980fc9ad65b8a1c8f5eb4d46953e260a2.tar.gz nixpkgs-cd5a9f4980fc9ad65b8a1c8f5eb4d46953e260a2.tar.bz2 nixpkgs-cd5a9f4980fc9ad65b8a1c8f5eb4d46953e260a2.tar.lz nixpkgs-cd5a9f4980fc9ad65b8a1c8f5eb4d46953e260a2.tar.xz nixpkgs-cd5a9f4980fc9ad65b8a1c8f5eb4d46953e260a2.tar.zst nixpkgs-cd5a9f4980fc9ad65b8a1c8f5eb4d46953e260a2.zip |
clooj: Update to 0.4.4
Also, merge the wrapper into the main package.
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/development/interpreters/clojure/clooj-wrapper.nix | 11 | ||||
-rw-r--r-- | pkgs/development/interpreters/clojure/clooj.nix | 21 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 6 | ||||
-rw-r--r-- | pkgs/top-level/release-python.nix | 1 |
4 files changed, 13 insertions, 26 deletions
diff --git a/pkgs/development/interpreters/clojure/clooj-wrapper.nix b/pkgs/development/interpreters/clojure/clooj-wrapper.nix deleted file mode 100644 index fd95b86451f..00000000000 --- a/pkgs/development/interpreters/clojure/clooj-wrapper.nix +++ /dev/null @@ -1,11 +0,0 @@ -{writeTextFile, jre, clooj}: - -writeTextFile { - name = "clooj-wrapper"; - executable = true; - destination = "/bin/clooj"; - text = '' - #!/bin/sh - exec ${jre}/bin/java -jar ${clooj}/lib/java/clooj.jar - ''; -} diff --git a/pkgs/development/interpreters/clojure/clooj.nix b/pkgs/development/interpreters/clojure/clooj.nix index 2ad6f751f2b..b39c1fd6209 100644 --- a/pkgs/development/interpreters/clojure/clooj.nix +++ b/pkgs/development/interpreters/clojure/clooj.nix @@ -1,24 +1,27 @@ -{stdenv, fetchurl}: +{ stdenv, fetchurl, jre, makeWrapper }: + +let version = "0.4.4"; in + +stdenv.mkDerivation { + name = "clooj-${version}"; -let jar = fetchurl { - url = https://github.com/downloads/arthuredelstein/clooj/clooj-0.1.36-STANDALONE.jar; - sha256 = "173c66c0aade3ae5d21622f629e60efa51a03ad83c087b02c25e806c5b7f838c"; + url = "http://www.mediafire.com/download/prkf64humftrmz3/clooj-${version}-standalone.jar"; + sha256 = "0hbc29bg2a86rm3sx9kvj7h7db9j0kbnrb706wsfiyk3zi3bavnd"; }; -in -stdenv.mkDerivation { - name = "clooj-0.1.32"; + buildInputs = [ makeWrapper ]; phases = "installPhase"; installPhase = '' mkdir -p $out/lib/java - ln -s ${jar} $out/lib/java/clooj.jar + ln -s $jar $out/lib/java/clooj.jar + makeWrapper ${jre}/bin/java $out/bin/clooj --add-flags "-jar $out/lib/java/clooj.jar" ''; meta = { - description = "clooj, a lightweight IDE for clojure"; + description = "A lightweight IDE for Clojure"; homepage = https://github.com/arthuredelstein/clooj; license = stdenv.lib.licenses.bsd3; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 495ff567f32..a203c5e4fc6 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 cade7660baa..2f29267b5c8 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; }; |