Pin graalvm to v22

jlesquembre · Oct 10, 2024 · 36f3342 · 36f3342
1 parent 7f60007
commit 36f3342
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 30 deletions.
diff --git a/extra-pkgs/babashka/0001-Update-build-options-for-graal-23.patch b/extra-pkgs/babashka/0001-Update-build-options-for-graal-23.patch
diff --git a/extra-pkgs/babashka/default.nix b/extra-pkgs/babashka/default.nix
@@ -79,8 +79,6 @@ let
       lockfile = ./deps-lock.json;
       enableLeiningen = true;
 
-      patches = [ ./0001-Update-build-options-for-graal-23.patch ];
-
       name = "babashka/babashka";
       main-ns = "babashka.main";
       jdkRunner = graalvm;

diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -11,6 +11,8 @@
       url = "github:jlesquembre/nix-fetcher-data";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+    # Needed until Babashka can be build with graalvm23
+    nixpkgs-2405.url = "github:NixOS/nixpkgs/d51c28603def282a24fa034bcb007e2bcb5b5dd0";
   };
 
   outputs = { self, nixpkgs, ... }@inputs:
@@ -131,6 +133,8 @@
 
           mkBabashka = final.callPackage ./extra-pkgs/babashka { };
           bbTasksFromFile = final.callPackage ./extra-pkgs/bbTasks { };
+          # TODO remove after babashka build with graalvm23 works
+          graalvmCEPackages = inputs.nixpkgs-2405.legacyPackages."${final.stdenv.system}".graalvmCEPackages;
         }
         // inputs.nix-fetcher-data.overlays.default final prev;