clooj: Update to 0.4.4

Also, merge the wrapper into the main package.
This commit is contained in:
Eelco Dolstra 2014-01-03 14:59:21 +01:00
parent 8398b23e10
commit cd5a9f4980
4 changed files with 14 additions and 27 deletions

View file

@ -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
'';
}

View file

@ -1,24 +1,27 @@
{stdenv, fetchurl}:
{ stdenv, fetchurl, jre, makeWrapper }:
let
jar = fetchurl {
url = https://github.com/downloads/arthuredelstein/clooj/clooj-0.1.36-STANDALONE.jar;
sha256 = "173c66c0aade3ae5d21622f629e60efa51a03ad83c087b02c25e806c5b7f838c";
};
in
let version = "0.4.4"; in
stdenv.mkDerivation {
name = "clooj-0.1.32";
name = "clooj-${version}";
jar = fetchurl {
url = "http://www.mediafire.com/download/prkf64humftrmz3/clooj-${version}-standalone.jar";
sha256 = "0hbc29bg2a86rm3sx9kvj7h7db9j0kbnrb706wsfiyk3zi3bavnd";
};
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;
};

View file

@ -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 { };

View file

@ -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; };