Merge pull request #63942 from jlesquembre/clj

clojure: 1.10.0.442 -> 1.10.1.462
This commit is contained in:
worldofpeace 2019-07-09 09:29:18 -04:00 committed by GitHub
commit 08a76cff03
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 7 deletions

View File

@ -1,12 +1,12 @@
{ stdenv, fetchurl, jdk, rlwrap, makeWrapper }: { stdenv, fetchurl, jdk11, rlwrap, makeWrapper }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "clojure-${version}"; pname = "clojure";
version = "1.10.0.442"; version = "1.10.1.462";
src = fetchurl { src = fetchurl {
url = "https://download.clojure.org/install/clojure-tools-${version}.tar.gz"; url = "https://download.clojure.org/install/clojure-tools-${version}.tar.gz";
sha256 = "147pkid3pvw60gq8vansid3x6wwfy9pqdbla3wfd5qaxqbcrhclw"; sha256 = "0mi7fzqvkg2ihigxkkamc742m1iba0yzy8ivciavzmpcnw128sc6";
}; };
buildInputs = [ makeWrapper ]; buildInputs = [ makeWrapper ];
@ -14,11 +14,11 @@ stdenv.mkDerivation rec {
outputs = [ "out" "prefix" ]; outputs = [ "out" "prefix" ];
installPhase = let installPhase = let
binPath = stdenv.lib.makeBinPath [ rlwrap jdk ]; binPath = stdenv.lib.makeBinPath [ rlwrap jdk11 ];
in '' in ''
mkdir -p $prefix/libexec mkdir -p $prefix/libexec
cp clojure-tools-${version}.jar $prefix/libexec cp clojure-tools-${version}.jar $prefix/libexec
cp {,example-}deps.edn $prefix cp example-deps.edn $prefix
substituteInPlace clojure --replace PREFIX $prefix substituteInPlace clojure --replace PREFIX $prefix
@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
offers a software transactional memory system and reactive Agent offers a software transactional memory system and reactive Agent
system that ensure clean, correct, multithreaded designs. system that ensure clean, correct, multithreaded designs.
''; '';
maintainers = with maintainers; [ the-kenny ]; maintainers = with maintainers; [ jlesquembre ];
platforms = platforms.unix; platforms = platforms.unix;
}; };
} }