From 719fb51e268fcb8a358e1acf413d1d7f6c8d0abb Mon Sep 17 00:00:00 2001 From: Griffin Smith Date: Tue, 3 Nov 2020 19:47:16 -0500 Subject: [PATCH] babashka,clj-kondo: Depend on graalvm-ce Now that we have community builds of graalvm landed in #99631, both clj-kondo and babashka can depend on those versions of graalvm rather than the one that requires building from source - this can be built in hydra, and generally is much easier to build and test. (cherry picked from commit 3341f6c1fc87099e906e6cc1f1a1437124cdf673) --- pkgs/development/interpreters/clojure/babashka.nix | 6 +++--- pkgs/development/tools/clj-kondo/default.nix | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/interpreters/clojure/babashka.nix b/pkgs/development/interpreters/clojure/babashka.nix index a1cab106f6d8..d4c3015ceaa2 100644 --- a/pkgs/development/interpreters/clojure/babashka.nix +++ b/pkgs/development/interpreters/clojure/babashka.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, graalvm8, glibcLocales }: +{ stdenv, fetchurl, graalvm8-ce, glibcLocales }: with stdenv.lib; stdenv.mkDerivation rec { @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { dontUnpack = true; LC_ALL = "en_US.UTF-8"; - nativeBuildInputs = [ graalvm8 glibcLocales ]; + nativeBuildInputs = [ graalvm8-ce glibcLocales ]; buildPhase = '' native-image \ @@ -79,7 +79,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://github.com/borkdude/babashka"; license = licenses.epl10; - platforms = graalvm8.meta.platforms; + platforms = graalvm8-ce.meta.platforms; maintainers = with maintainers; [ bandresen bhougland DerGuteMoritz jlesquembre ]; }; } diff --git a/pkgs/development/tools/clj-kondo/default.nix b/pkgs/development/tools/clj-kondo/default.nix index 8d9511350849..c24214f597d7 100644 --- a/pkgs/development/tools/clj-kondo/default.nix +++ b/pkgs/development/tools/clj-kondo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, graalvm8, fetchurl }: +{ stdenv, lib, graalvm8-ce, fetchurl }: stdenv.mkDerivation rec { pname = "clj-kondo"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { dontUnpack = true; - buildInputs = [ graalvm8 ]; + buildInputs = [ graalvm8-ce ]; buildPhase = '' native-image \ @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { description = "A linter for Clojure code that sparks joy."; homepage = "https://github.com/borkdude/clj-kondo"; license = licenses.epl10; - platforms = graalvm8.meta.platforms; + platforms = graalvm8-ce.meta.platforms; maintainers = with maintainers; [ jlesquembre bandresen ]; }; }