dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

babashka,clj-kondo: Depend on graalvm-ce

Browse Source 
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.
This commit is contained in:
Griffin Smith 2020-11-03 19:47:16 -05:00 committed by Jonathan Ringer
parent 0aaf9d6143
commit 3341f6c1fc
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/interpreters/clojure/babashka.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, graalvm8, glibcLocales }: { stdenv, fetchurl, graalvm8-ce, glibcLocales }:
with stdenv.lib; with stdenv.lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
dontUnpack = true; dontUnpack = true;
LC_ALL = "en_US.UTF-8"; LC_ALL = "en_US.UTF-8";
nativeBuildInputs = [ graalvm8 glibcLocales ]; nativeBuildInputs = [ graalvm8-ce glibcLocales ];
buildPhase = '' buildPhase = ''
native-image \ native-image \
@ -78,7 +78,7 @@ stdenv.mkDerivation rec {
''; '';
homepage = "https://github.com/borkdude/babashka"; homepage = "https://github.com/borkdude/babashka";
license = licenses.epl10; license = licenses.epl10;
platforms = graalvm8.meta.platforms; platforms = graalvm8-ce.meta.platforms;
maintainers = with maintainers; [ bandresen bhougland DerGuteMoritz jlesquembre ]; maintainers = with maintainers; [ bandresen bhougland DerGuteMoritz jlesquembre ];
}; };
} }

6
pkgs/development/tools/clj-kondo/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, lib, graalvm8, fetchurl }: { stdenv, lib, graalvm8-ce, fetchurl }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "clj-kondo"; pname = "clj-kondo";
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
dontUnpack = true; dontUnpack = true;
buildInputs = [ graalvm8 ]; buildInputs = [ graalvm8-ce ];
buildPhase = '' buildPhase = ''
native-image \ native-image \
@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
description = "A linter for Clojure code that sparks joy"; description = "A linter for Clojure code that sparks joy";
homepage = "https://github.com/borkdude/clj-kondo"; homepage = "https://github.com/borkdude/clj-kondo";
license = licenses.epl10; license = licenses.epl10;
platforms = graalvm8.meta.platforms; platforms = graalvm8-ce.meta.platforms;
maintainers = with maintainers; [ jlesquembre bandresen ]; maintainers = with maintainers; [ jlesquembre bandresen ];
}; };
} }