summary refs log tree commit diff
path: root/pkgs/development/interpreters/clojure
diff options
context:
space:
mode:
authorJosé Luis Lafuente <jl@lafuente.me>2019-06-30 10:56:34 +0200
committerJosé Luis Lafuente <jl@lafuente.me>2019-07-09 09:19:22 +0200
commitbdf9dc59ff0724cd9a0418e579c25524d47b9394 (patch)
treea133d1a8b203edd8a7fa3ee680104b405e627068 /pkgs/development/interpreters/clojure
parent20b993ef2c9e818a636582ade9597f71a485209d (diff)
downloadnixpkgs-bdf9dc59ff0724cd9a0418e579c25524d47b9394.tar
nixpkgs-bdf9dc59ff0724cd9a0418e579c25524d47b9394.tar.gz
nixpkgs-bdf9dc59ff0724cd9a0418e579c25524d47b9394.tar.bz2
nixpkgs-bdf9dc59ff0724cd9a0418e579c25524d47b9394.tar.lz
nixpkgs-bdf9dc59ff0724cd9a0418e579c25524d47b9394.tar.xz
nixpkgs-bdf9dc59ff0724cd9a0418e579c25524d47b9394.tar.zst
nixpkgs-bdf9dc59ff0724cd9a0418e579c25524d47b9394.zip
clojure: 1.10.0.442 -> 1.10.1.462
Updates jdk dependency from 8 to 11. Clojure 1.10.0 added support for
jdk11, and was released with a new develper tool: REBL
(https://github.com/cognitect-labs/REBL-distro). REBL depends on javafx,
currently only supported on Nix by jdk11 (see #63574)
Diffstat (limited to 'pkgs/development/interpreters/clojure')
-rw-r--r--pkgs/development/interpreters/clojure/default.nix14
1 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/development/interpreters/clojure/default.nix b/pkgs/development/interpreters/clojure/default.nix
index 4fe1e182095..8df64de3acb 100644
--- a/pkgs/development/interpreters/clojure/default.nix
+++ b/pkgs/development/interpreters/clojure/default.nix
@@ -1,12 +1,12 @@
-{ stdenv, fetchurl, jdk, rlwrap, makeWrapper }:
+{ stdenv, fetchurl, jdk11, rlwrap, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "clojure-${version}";
-  version = "1.10.0.442";
+  pname = "clojure";
+  version = "1.10.1.462";
 
   src = fetchurl {
     url = "https://download.clojure.org/install/clojure-tools-${version}.tar.gz";
-    sha256 = "147pkid3pvw60gq8vansid3x6wwfy9pqdbla3wfd5qaxqbcrhclw";
+    sha256 = "0mi7fzqvkg2ihigxkkamc742m1iba0yzy8ivciavzmpcnw128sc6";
   };
 
   buildInputs = [ makeWrapper ];
@@ -14,11 +14,11 @@ stdenv.mkDerivation rec {
   outputs = [ "out" "prefix" ];
 
   installPhase = let
-    binPath = stdenv.lib.makeBinPath [ rlwrap jdk ];
+    binPath = stdenv.lib.makeBinPath [ rlwrap jdk11 ];
   in ''
     mkdir -p $prefix/libexec
     cp clojure-tools-${version}.jar $prefix/libexec
-    cp {,example-}deps.edn $prefix
+    cp example-deps.edn $prefix
 
     substituteInPlace clojure --replace PREFIX $prefix
 
@@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
       offers a software transactional memory system and reactive Agent
       system that ensure clean, correct, multithreaded designs.
     '';
-    maintainers = with maintainers; [ the-kenny ];
+    maintainers = with maintainers; [ jlesquembre ];
     platforms = platforms.unix;
   };
 }