diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2019-12-13 11:43:39 +0100 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-12-13 11:43:39 +0100 |
commit | dfdf1597a7cc13c40653722a771be12afaa64edb (patch) | |
tree | 4d7cd3f21ba89453f23ea1addb55e00574a638bf /pkgs/development/interpreters/clojure/default.nix | |
parent | d5d8b3514d64fcd4022186795f604ec3f360ae17 (diff) | |
parent | 418ad571c3ec856d49b65fa53ab99f185c2d9def (diff) | |
download | nixpkgs-dfdf1597a7cc13c40653722a771be12afaa64edb.tar nixpkgs-dfdf1597a7cc13c40653722a771be12afaa64edb.tar.gz nixpkgs-dfdf1597a7cc13c40653722a771be12afaa64edb.tar.bz2 nixpkgs-dfdf1597a7cc13c40653722a771be12afaa64edb.tar.lz nixpkgs-dfdf1597a7cc13c40653722a771be12afaa64edb.tar.xz nixpkgs-dfdf1597a7cc13c40653722a771be12afaa64edb.tar.zst nixpkgs-dfdf1597a7cc13c40653722a771be12afaa64edb.zip |
Merge master into staging-next
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"; |