Merge #330

330: Fix: Haskell overlay r=blaggacao a=GTrunSec using `lib.composeExtensions` for packageOverrides is more idiomatic. Fixes: #325 (review) such as ``` python3 = pkgs.python3.override (old: { 5 │ │ packageOverrides = 4 │ │ │ pkgs.lib.composeExtensions 3 │ │ │ │ (old.packageOverrides or (_: _: { })) 2 │ │ │ │ packageOverrides; 1 │ }); ``` Co-authored-by: GTrunSec <[email protected]>
divnix · Jun 25, 2021 · 741e8fd · 741e8fd
2 parents e3b7c07 + f1117f2
commit 741e8fd
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 12 deletions.
diff --git a/flake.nix b/flake.nix
@@ -52,7 +52,6 @@
             nur.overlay
             agenix.overlay
             nvfetcher.overlay
-            (final: prev: { nvfetcher-bin = nvfetcher.defaultPackage.${final.system}; })
             ./pkgs/default.nix
           ];
         };

diff --git a/overlays/overrides.nix b/overlays/overrides.nix
@@ -14,15 +14,15 @@ channels: final: prev: {
     starship;
 
 
-  haskellPackages = prev.haskellPackages.override {
-    overrides = hfinal: hprev:
-      let version = prev.lib.replaceChars [ "." ] [ "" ] prev.ghc.version;
-      in
-      {
-        # same for haskell packages, matching ghc versions
-        inherit (channels.latest.haskell.packages."ghc${version}")
-          haskell-language-server;
-      };
-  };
-
+  haskellPackages = prev.haskellPackages.override
+    (old: {
+      overrides = prev.lib.composeExtensions (old.overrides or (_: _: { })) (hfinal: hprev:
+        let version = prev.lib.replaceChars [ "." ] [ "" ] prev.ghc.version;
+        in
+        {
+          # same for haskell packages, matching ghc versions
+          inherit (channels.latest.haskell.packages."ghc${version}")
+            haskell-language-server;
+        });
+    });
 }