chore: update elm kernel

tweag · Oct 2, 2023 · d4c39d6 · d4c39d6
1 parent 178bf4c
commit d4c39d6
Show file tree

Hide file tree

Showing 10 changed files with 92 additions and 2,135 deletions.
diff --git a/flake.nix b/flake.nix
@@ -156,7 +156,6 @@
             nixpkgs-stable.legacyPackages."${system}".poetry
             # pkgs.poetry
             self.packages."${system}".update-poetry-lock
-            docsLib.mkdocs
           ];
           shellHook = ''
             ${pre-commit.shellHook}

diff --git a/modules/kernel.nix b/modules/kernel.nix
@@ -54,7 +54,10 @@ in {
       '';
     };
 
-    nixpkgs = import ./types/nixpkgs.nix {inherit lib self system;};
+    nixpkgs = import ./types/nixpkgs.nix {
+      inherit lib self system;
+      overlays = import ./types/overlays.nix {inherit lib self config kernelName;};
+    };
 
     kernelArgs = lib.mkOption {
       type = types.lazyAttrsOf types.raw;

diff --git a/modules/kernels/bash/poetry.lock b/modules/kernels/bash/poetry.lock
diff --git a/modules/kernels/c/poetry.lock b/modules/kernels/c/poetry.lock
diff --git a/modules/kernels/elm/overrides.nix b/modules/kernels/elm/overrides.nix
@@ -1 +1,15 @@
-final: prev: {}
+pkgs: let
+  addNativeBuildInputs = prev: drvName: inputs: {
+    "${drvName}" = prev.${drvName}.overridePythonAttrs (old: {
+      nativeBuildInputs = (old.nativeBuildInputs or []) ++ inputs;
+    });
+  };
+
+  preOverlay = final: prev: {
+    arrow = prev.arrow.override {
+      preferWheel = true;
+    };
+  };
+
+  postOverlay = final: prev: {};
+in [preOverlay pkgs.poetry2nix.defaultPoetryOverrides postOverlay]
diff --git a/modules/kernels/elm/poetry.lock b/modules/kernels/elm/poetry.lock
diff --git a/modules/kernels/nix/poetry.lock b/modules/kernels/nix/poetry.lock
diff --git a/modules/kernels/postgres/poetry.lock b/modules/kernels/postgres/poetry.lock
diff --git a/modules/types/poetry.nix b/modules/types/poetry.nix
@@ -185,7 +185,9 @@ in {
           ;
 
         overrides =
-          if config.withDefaultOverrides == true
+          if kernelName == "elm"
+          then import config.overrides config.nixpkgs
+          else if config.withDefaultOverrides == true
           then config.nixpkgs.poetry2nix.overrides.withDefaults (import config.overrides)
           else config.overrides;
       })

diff --git a/poetry.lock b/poetry.lock