public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into gcc-7

Browse Source 
A few thousand rebuilds.
Hydra: ?compare=1433915
This commit is contained in:
Vladimír Čunát
2018-02-17 10:27:21 +01:00
parent d74d79a712 327a84749e
commit 7a1462c04a
136 changed files with 3882 additions and 1954 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/development/interpreters/clojure/default.nix
View File

@@ -1,16 +1,16 @@
{ stdenv, fetchurl, jdk, makeWrapper }:
{ stdenv, fetchurl, jdk, rlwrap, makeWrapper }:
let version = "1.9.0.273"; in
let version = "1.9.0.326"; in
stdenv.mkDerivation {
name = "clojure-${version}";
src = fetchurl {
url = "https://download.clojure.org/install/clojure-tools-${version}.tar.gz";
sha256 = "0xmrq3xvr002jgq8m1j0y5ld0rcr49608g3gqxgyxzjqswacglb4";
sha256 = "0sf8gy39iz4jxj2wic1lbdwdwbj90k3awhr0kq76gr1z1dwbj6s9";
};
buildInputs = [ jdk makeWrapper ];
buildInputs = [ makeWrapper ];
installPhase = ''
pwd
@@ -20,6 +20,9 @@ stdenv.mkDerivation {
cp -f clojure-tools-${version}.jar $out/libexec
sed -i -e "s@PREFIX@$out@g" clojure
cp -f clj clojure $out/bin
for program in $out/bin/{clojure,clj}; do
wrapProgram $program --suffix PATH : $out/bin:${jdk.jre}/bin:${rlwrap}/bin
done
'';
meta = with stdenv.lib; {