diff options
| author | Pol Dellaiera <pol.dellaiera@protonmail.com> | 2023-06-02 16:48:54 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-06-02 16:48:54 +0200 |
| commit | 8a8d80f144a3ecf64c9471fd71338b7fffca2ee5 (patch) | |
| tree | f99d70ebecf70c8b28f8fd99380da8f34b4a33e7 /pkgs | |
| parent | 37a6711c1aaca0d1fbb4840222afc0ac4ae6f79b (diff) | |
| parent | b3a01329703d36a316936be54f2035a3dc0b4a2f (diff) | |
Merge pull request #234774 from jlesquembre/update-clj
clojure: Pass function to mkDerivation, remove rec
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/interpreters/clojure/default.nix | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/development/interpreters/clojure/default.nix b/pkgs/development/interpreters/clojure/default.nix index 00ebc85623343..3f70c30dc8d32 100644 --- a/pkgs/development/interpreters/clojure/default.nix +++ b/pkgs/development/interpreters/clojure/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchurl, installShellFiles, jdk, rlwrap, makeWrapper, writeScript }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "clojure"; - version = "1.11.1.1273"; + version = "1.11.1.1347"; src = fetchurl { # https://clojure.org/releases/tools - url = "https://download.clojure.org/install/clojure-tools-${version}.tar.gz"; - sha256 = "sha256-X4uvzyS9FIrJvL5gqOe4CTye2OuODzhxmXcOOPDkDOY="; + url = "https://download.clojure.org/install/clojure-tools-${finalAttrs.version}.tar.gz"; + hash = "sha256-1ebAPk64tJt/Cpt3pKfMTN50YABKPflqG055f4Quv+M="; }; nativeBuildInputs = [ @@ -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; }; -} +}) |