diff options
author | José Luis Lafuente <jl@lafuente.me> | 2019-12-09 10:44:34 +0100 |
---|---|---|
committer | Herwig Hochleitner <hhochleitner@gmail.com> | 2019-12-11 13:33:35 +0100 |
commit | 44fe29a624e6c07a6a49a436b31ab4f7e2f02369 (patch) | |
tree | 16b408a4a1d69b7f84c21615a408a7c41865df51 /pkgs/development/interpreters/clojure/default.nix | |
parent | 2891726da924137f416558c82df311284dd69292 (diff) | |
download | nixpkgs-44fe29a624e6c07a6a49a436b31ab4f7e2f02369.tar nixpkgs-44fe29a624e6c07a6a49a436b31ab4f7e2f02369.tar.gz nixpkgs-44fe29a624e6c07a6a49a436b31ab4f7e2f02369.tar.bz2 nixpkgs-44fe29a624e6c07a6a49a436b31ab4f7e2f02369.tar.lz nixpkgs-44fe29a624e6c07a6a49a436b31ab4f7e2f02369.tar.xz nixpkgs-44fe29a624e6c07a6a49a436b31ab4f7e2f02369.tar.zst nixpkgs-44fe29a624e6c07a6a49a436b31ab4f7e2f02369.zip |
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 https://github.com/clojure/brew-install/commit/a34969513fb8f95e541fa4f4b65296c005d76320 Update derivation to produce only one output. Multiple outputs was introduced by #35140, but I don't think is necessary anymore.
Diffstat (limited to 'pkgs/development/interpreters/clojure/default.nix')
-rw-r--r-- | pkgs/development/interpreters/clojure/default.nix | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/pkgs/development/interpreters/clojure/default.nix b/pkgs/development/interpreters/clojure/default.nix index 7b730fc3926..8187bf4af8e 100644 --- a/pkgs/development/interpreters/clojure/default.nix +++ b/pkgs/development/interpreters/clojure/default.nix @@ -2,30 +2,30 @@ stdenv.mkDerivation rec { pname = "clojure"; - version = "1.10.1.489"; + version = "1.10.1.492"; src = fetchurl { url = "https://download.clojure.org/install/clojure-tools-${version}.tar.gz"; - sha256 = "12ks7adh5cx99l5vydppkqknk5nvv9vsj2k0afcwwxd897m794kz"; + sha256 = "09mhy5xw9kdr10a1xpbn5v97qyyhngw5s1n1alrs45a4m3l11iky"; }; buildInputs = [ makeWrapper ]; - outputs = [ "out" "prefix" ]; - installPhase = let binPath = stdenv.lib.makeBinPath [ rlwrap jdk11 ]; - in '' - mkdir -p $prefix/libexec - cp clojure-tools-${version}.jar $prefix/libexec - cp example-deps.edn $prefix - - substituteInPlace clojure --replace PREFIX $prefix - - install -Dt $out/bin clj clojure - wrapProgram $out/bin/clj --prefix PATH : $out/bin:${binPath} - wrapProgram $out/bin/clojure --prefix PATH : $out/bin:${binPath} - ''; + in + '' + mkdir -p $out/libexec + cp clojure-tools-${version}.jar $out/libexec + cp example-deps.edn $out + cp deps.edn $out + + substituteInPlace clojure --replace PREFIX $out + + install -Dt $out/bin clj clojure + wrapProgram $out/bin/clj --prefix PATH : $out/bin:${binPath} + wrapProgram $out/bin/clojure --prefix PATH : $out/bin:${binPath} + ''; meta = with stdenv.lib; { description = "A Lisp dialect for the JVM"; |