feat: enrich julia example

tweag · Oct 29, 2023 · 7ffbf50 · 7ffbf50
1 parent 945f765
commit 7ffbf50
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 3 deletions.
diff --git a/examples/julia/minimal/default.nix b/examples/julia/minimal/default.nix
@@ -1,5 +1,16 @@
 {pkgs, ...}: {
   kernel.julia.minimal-example = {
     enable = true;
+    override = {
+      augmentedRegistry = pkgs.fetchFromGitHub {
+        owner = "CodeDownIO";
+        repo = "General";
+        rev = "840f93574326361e2614fc5a4c2413f07840215a";
+        sha256 = "sha256-UedaTpQwkuSZ/o4kLX/Jg8eDnL5IFI4XfYsJMRwBAKE=";
+      };
+    };
+    extraJuliaPackages = [
+      "Plots"
+    ];
   };
 }
diff --git a/modules/kernels/julia/default.nix b/modules/kernels/julia/default.nix
@@ -25,7 +25,7 @@
       displayName ? "Julia",
       requiredRuntimePackages ? [],
       runtimePackages ? [],
-      julia ? pkgs.julia,
+      julia,
       ijuliaRev ? "Vo51o",
       extraJuliaPackages ? [],
       override ? {},
@@ -35,7 +35,7 @@
 
       allRuntimePackages = requiredRuntimePackages ++ runtimePackages;
 
-      env = (self.inputs.nixpkgs-julia.legacyPackages.${system}.julia_19.withPackages.override override) ([
+      env = (julia.withPackages.override override) ([
           "IJulia"
         ]
         ++ extraJuliaPackages);
@@ -78,7 +78,7 @@
         };
         julia = lib.mkOption {
           type = types.package;
-          default = config.nixpkgs.julia;
+          default = config.nixpkgs.julia_19;
           description = lib.mdDoc ''
             Julia Version
           '';

diff --git a/modules/types/nixpkgs.nix b/modules/types/nixpkgs.nix
@@ -19,6 +19,8 @@ in
     default =
       if kernelName == "scala"
       then nixpkgsArg self.inputs.nixpkgs-stable
+      else if kernelName == "julia"
+      then nixpkgsArg self.inputs.nixpkgs-julia
       else nixpkgsArg self.inputs.nixpkgs;
     defaultText = lib.literalExpression "self.inputs.nixpkgs";
     example = lib.literalExpression "self.inputs.nixpkgs";