Merge pull request #234774 from jlesquembre/update-clj

clojure: Pass function to mkDerivation, remove rec

Changed files
+7 -7
pkgs
development
interpreters
clojure
+7 -7
pkgs/development/interpreters/clojure/default.nix
···
{ lib, stdenv, fetchurl, installShellFiles, jdk, rlwrap, makeWrapper, writeScript }:
-
stdenv.mkDerivation rec {
pname = "clojure";
-
version = "1.11.1.1273";
src = fetchurl {
# https://clojure.org/releases/tools
-
url = "https://download.clojure.org/install/clojure-tools-${version}.tar.gz";
-
sha256 = "sha256-X4uvzyS9FIrJvL5gqOe4CTye2OuODzhxmXcOOPDkDOY=";
};
nativeBuildInputs = [
···
install -Dm644 example-deps.edn "$clojure_lib_dir/example-deps.edn"
install -Dm644 tools.edn "$clojure_lib_dir/tools.edn"
install -Dm644 exec.jar "$clojure_lib_dir/libexec/exec.jar"
-
install -Dm644 clojure-tools-${version}.jar "$clojure_lib_dir/libexec/clojure-tools-${version}.jar"
echo "Installing clojure and clj into $bin_dir"
substituteInPlace clojure --replace PREFIX $out
···
CLJ_CONFIG=$TMPDIR CLJ_CACHE=$TMPDIR/.clj_cache $out/bin/clojure \
-Spath \
-Sverbose \
-
-Scp $out/libexec/clojure-tools-${version}.jar
'';
passthru.updateScript = writeScript "update-clojure" ''
···
maintainers = with maintainers; [ jlesquembre thiagokokada ];
platforms = platforms.unix;
};
-
}
···
{ lib, stdenv, fetchurl, installShellFiles, jdk, rlwrap, makeWrapper, writeScript }:
+
stdenv.mkDerivation (finalAttrs: {
pname = "clojure";
+
version = "1.11.1.1347";
src = fetchurl {
# https://clojure.org/releases/tools
+
url = "https://download.clojure.org/install/clojure-tools-${finalAttrs.version}.tar.gz";
+
hash = "sha256-1ebAPk64tJt/Cpt3pKfMTN50YABKPflqG055f4Quv+M=";
};
nativeBuildInputs = [
···
install -Dm644 example-deps.edn "$clojure_lib_dir/example-deps.edn"
install -Dm644 tools.edn "$clojure_lib_dir/tools.edn"
install -Dm644 exec.jar "$clojure_lib_dir/libexec/exec.jar"
+
install -Dm644 clojure-tools-${finalAttrs.version}.jar "$clojure_lib_dir/libexec/clojure-tools-${finalAttrs.version}.jar"
echo "Installing clojure and clj into $bin_dir"
substituteInPlace clojure --replace PREFIX $out
···
CLJ_CONFIG=$TMPDIR CLJ_CACHE=$TMPDIR/.clj_cache $out/bin/clojure \
-Spath \
-Sverbose \
+
-Scp $out/libexec/clojure-tools-${finalAttrs.version}.jar
'';
passthru.updateScript = writeScript "update-clojure" ''
···
maintainers = with maintainers; [ jlesquembre thiagokokada ];
platforms = platforms.unix;
};
+
})