clojure: 1.10.1.489 -> 1.10.1.492

Install again default deps.edn. deps.edn was embedded in clojure jar,
but that change was reverted, see
a34969513f

Update derivation to produce only one output. Multiple outputs was
introduced by #35140, but I don't think is necessary anymore.
This commit is contained in:
José Luis Lafuente 2019-12-09 10:44:34 +01:00 committed by Herwig Hochleitner
parent 2891726da9
commit 44fe29a624

View File

@ -2,25 +2,25 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "clojure"; pname = "clojure";
version = "1.10.1.489"; version = "1.10.1.492";
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 = "12ks7adh5cx99l5vydppkqknk5nvv9vsj2k0afcwwxd897m794kz"; sha256 = "09mhy5xw9kdr10a1xpbn5v97qyyhngw5s1n1alrs45a4m3l11iky";
}; };
buildInputs = [ makeWrapper ]; buildInputs = [ makeWrapper ];
outputs = [ "out" "prefix" ];
installPhase = let installPhase = let
binPath = stdenv.lib.makeBinPath [ rlwrap jdk11 ]; binPath = stdenv.lib.makeBinPath [ rlwrap jdk11 ];
in '' in
mkdir -p $prefix/libexec ''
cp clojure-tools-${version}.jar $prefix/libexec mkdir -p $out/libexec
cp example-deps.edn $prefix cp clojure-tools-${version}.jar $out/libexec
cp example-deps.edn $out
cp deps.edn $out
substituteInPlace clojure --replace PREFIX $prefix substituteInPlace clojure --replace PREFIX $out
install -Dt $out/bin clj clojure install -Dt $out/bin clj clojure
wrapProgram $out/bin/clj --prefix PATH : $out/bin:${binPath} wrapProgram $out/bin/clj --prefix PATH : $out/bin:${binPath}