nix

k0001 · Dec 11, 2023 · 551f8b9 · 551f8b9
1 parent f32011f
commit 551f8b9
Show file tree

Hide file tree

Showing 2 changed files with 76 additions and 86 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -1,54 +1,36 @@
 {
   description = "di";
   inputs = {
-    nixpkgs = {
-      url = "github:NixOS/nixpkgs/389cc28963163614765721eda940fd5299f18458";
-    };
-    flake-parts = { url = "github:hercules-ci/flake-parts"; };
-    hs_bsb-http-chunked = {
-      url =
-        "github:sjakobi/bsb-http-chunked/c0ecd72fe2beb1cf7de9340cc8b4a31045460532";
-      flake = false;
-    };
-    hs_streaming = {
-      url = "github:haskell-streaming/streaming/0.2.4.0";
-      flake = false;
-    };
+    flakety.url = "github:k0001/flakety";
+    nixpkgs.follows = "flakety/nixpkgs";
+    flake-parts.follows = "flakety/flake-parts";
   };
 
   outputs = inputs@{ ... }:
     inputs.flake-parts.lib.mkFlake { inherit inputs; } {
-      flake.overlays.default = final: prev:
-        let
-          hsLib = prev.haskell.lib;
-          hsClean = drv:
-            hsLib.overrideCabal drv
-            (old: { src = prev.lib.sources.cleanSource old.src; });
-        in {
-          haskell = prev.haskell // {
-            packageOverrides = prev.lib.composeExtensions
-              (prev.haskell.packageOverrides or (_: _: { })) (hself: hsuper: {
-                df1 = hsClean (hself.callPackage ./df1 { });
-                df1-html = hsClean (hself.callPackage ./df1-html { });
-                di = hsClean (hself.callPackage ./di { });
-                di-core = hsClean (hself.callPackage ./di-core { });
-                di-df1 = hsClean (hself.callPackage ./di-df1 { });
-                di-handle = hsClean (hself.callPackage ./di-handle { });
-                di-monad = hsClean (hself.callPackage ./di-monad { });
-
-                streaming =
-                  hself.callCabal2nix "streaming" inputs.hs_streaming { };
-
-                # hoogle stuff
-                bsb-http-chunked = hself.callCabal2nix "bsb-http-chunked"
-                  inputs.hs_bsb-http-chunked { };
-                warp = hsLib.dontCheck (hself.callHackage "warp" "3.3.25" { });
-                warp-tls =
-                  hsLib.dontCheck (hself.callHackage "warp-tls" "3.3.6" { });
-                recv = hself.callHackage "recv" "0.1.0" { };
-              });
-          };
-        };
+      flake.overlays.default = inputs.nixpkgs.lib.composeManyExtensions [
+        inputs.flakety.overlays.default
+        (final: prev:
+          let
+            hsLib = prev.haskell.lib;
+            hsClean = drv:
+              hsLib.overrideCabal drv
+              (old: { src = prev.lib.sources.cleanSource old.src; });
+          in {
+            haskell = prev.haskell // {
+              packageOverrides = prev.lib.composeExtensions
+                (prev.haskell.packageOverrides or (_: _: { })) (hself: hsuper: {
+                  df1 = hsClean (hself.callPackage ./df1 { });
+                  df1-html = hsClean (hself.callPackage ./df1-html { });
+                  di = hsClean (hself.callPackage ./di { });
+                  di-core = hsClean (hself.callPackage ./di-core { });
+                  di-df1 = hsClean (hself.callPackage ./di-df1 { });
+                  di-handle = hsClean (hself.callPackage ./di-handle { });
+                  di-monad = hsClean (hself.callPackage ./di-monad { });
+                });
+            };
+          })
+      ];
       systems = [ "x86_64-linux" ];
       perSystem = { config, pkgs, system, ... }: {
         _module.args.pkgs = import inputs.nixpkgs {
@@ -69,12 +51,12 @@
               config.devShells.ghc
             ];
           };
-          inherit (pkgs.haskell.packages.ghc962)
+          inherit (pkgs.haskell.packages.ghc98)
             df1 df1-html di di-core di-df1 di-handle di-monad;
         };
         devShells = {
           default = config.devShells.ghc;
-          ghc = pkgs.haskell.packages.ghc962.shellFor {
+          ghc = pkgs.haskell.packages.ghc98.shellFor {
             packages = p: [
               p.df1
               p.df1-html