Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 0aaf9d61432d
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 3341f6c1fc87
Choose a head ref
  • 1 commit
  • 2 files changed
  • 1 contributor

Commits on Nov 4, 2020

  1. 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.
    @glittershark
    glittershark authored and Jonathan Ringer committed Nov 4, 2020
    Copy the full SHA
    3341f6c View commit details
Showing with 6 additions and 6 deletions.
  1. +3 −3 pkgs/development/interpreters/clojure/babashka.nix
  2. +3 −3 pkgs/development/tools/clj-kondo/default.nix
6 changes: 3 additions & 3 deletions pkgs/development/interpreters/clojure/babashka.nix
View file
Original file line number Diff line number Diff line change
@@ -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 \
@@ -78,7 +78,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 ];
};
}
6 changes: 3 additions & 3 deletions pkgs/development/tools/clj-kondo/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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 \
@@ -45,7 +45,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 ];
};
}