update Nix flake

raehik · Nov 15, 2023 · 6d01f22 · 6d01f22
1 parent dc85656
commit 6d01f22
Show file tree

Hide file tree

Showing 2 changed files with 47 additions and 52 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -1,34 +1,46 @@
 {
   inputs = {
-    nixpkgs.url = "github:nixos/nixpkgs/haskell-updates";
+    nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
     flake-parts.url = "github:hercules-ci/flake-parts";
     haskell-flake.url = "github:srid/haskell-flake";
-    generic-data-functions = {
-      url = "github:raehik/generic-data-functions";
-      flake = false;
-    };
   };
-  outputs = inputs@{ self, nixpkgs, flake-parts, ... }:
-    flake-parts.lib.mkFlake { inherit inputs; } {
-      systems = nixpkgs.lib.systems.flakeExposed;
+  outputs = inputs:
+  let
+    # simple devshell for non-dev compilers: really just want `cabal repl`
+    nondevDevShell = compiler: {
+      mkShellArgs.name = "${compiler}-binrep";
+      hoogle = false;
+      tools = _: {
+        hlint = null;
+        haskell-language-server = null;
+        ghcid = null;
+      };
+    };
+  in
+    inputs.flake-parts.lib.mkFlake { inherit inputs; } {
+      systems = inputs.nixpkgs.lib.systems.flakeExposed;
       imports = [ inputs.haskell-flake.flakeModule ];
       perSystem = { self', pkgs, config, ... }: {
-        packages.default = self'.packages.binrep;
-        haskellProjects.ghc96 = import ./haskell-flake-ghc96.nix pkgs;
-        haskellProjects.default = {
-          #basePackages = config.haskellProjects.ghc96.outputs.finalPackages;
-          packages = {
-            #generic-data-functions.source = inputs.generic-data-functions;
-            #strongweak.source = "0.6.0";
-            #flatparse.source = "0.4.1.0";
-          };
-          devShell = {
-            tools = hp: {
-              ghcid = null; # broken on GHC 9.6? fsnotify
-              hlint = null; # broken on GHC 9.6?
-              haskell-language-server = null; # TAKES AGES TO BUILD FFS
+        packages.default  = self'.packages.ghc96-binrep;
+        devShells.default = self'.devShells.ghc96;
+        haskellProjects.ghc96 = {
+          # 2023-11-14: GHC 9.6 base package set is borked
+          # PR: https://github.com/NixOS/nixpkgs/pull/267477
+          basePackages = pkgs.haskell.packages.ghc96.override {
+            overrides = self: super: {
+              fgl = self.fgl_5_8_2_0;
+              th-desugar = self.th-desugar_1_16;
             };
           };
+          devShell.mkShellArgs.name = "ghc96-binrep";
+        };
+        haskellProjects.ghc94 = {
+          basePackages = pkgs.haskell.packages.ghc94;
+          devShell = nondevDevShell "ghc94";
+        };
+        haskellProjects.ghc92 = {
+          basePackages = pkgs.haskell.packages.ghc92;
+          devShell = nondevDevShell "ghc92";
         };
       };
     };