clojure: Pass function to mkDerivation, remove rec

See
https://nixos.org/manual/nixpkgs/stable/#mkderivation-recursive-attributes
This commit is contained in:
José Luis Lafuente
2023-05-29 14:23:16 +02:00
parent 4e37b4e55b
commit 83d32ac213
@@ -1,12 +1,12 @@
{ lib, stdenv, fetchurl, installShellFiles, jdk, rlwrap, makeWrapper, writeScript }:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
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";
url = "https://download.clojure.org/install/clojure-tools-${finalAttrs.version}.tar.gz";
sha256 = "sha256-X4uvzyS9FIrJvL5gqOe4CTye2OuODzhxmXcOOPDkDOY=";
};
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
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"
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
@@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
CLJ_CONFIG=$TMPDIR CLJ_CACHE=$TMPDIR/.clj_cache $out/bin/clojure \
-Spath \
-Sverbose \
-Scp $out/libexec/clojure-tools-${version}.jar
-Scp $out/libexec/clojure-tools-${finalAttrs.version}.jar
'';
passthru.updateScript = writeScript "update-clojure" ''
@@ -98,4 +98,4 @@ stdenv.mkDerivation rec {
maintainers = with maintainers; [ jlesquembre thiagokokada ];
platforms = platforms.unix;
};
}
})