overlay test

Author: idrisr

default.nix

@@ -0,0 +1,19 @@
+{ pkgs, compiler ? "ghc948" }:
+let
+  hPkgs = pkgs.haskell.packages."${compiler}";
+  devTools = with pkgs; [ cabal2nix imagemagick zlib ];
+  haskDevTools = with hPkgs; [
+    cabal-install
+    fourmolu
+    ghc
+    ghcid
+    haskell-language-server
+    hlint
+    implicit-hie
+    retrie
+  ];
+  tools = devTools ++ haskDevTools;
+in pkgs.mkShell {
+  buildInputs = tools;
+  LD_LIBRARY_PATH = pkgs.lib.makeLibraryPath tools;
+}

devenv.nix

@@ -4,68 +4,29 @@
     flake-utils.url = "github:numtide/flake-utils";
   };
 
-  outputs = { nixpkgs, self, flake-utils }:
+  outputs = { self, nixpkgs, flake-utils }:
     # flake-utils.lib.eachDefaultSystem (system:
     let
-      compiler = "ghc948";
       system = flake-utils.lib.system.x86_64-linux;
-      hPkgs = pkgs.haskell.packages."${compiler}";
-      devTools = with pkgs; [
-        asciinema
-        asciinema-agg
-        cabal2nix
-        imagemagick
-        zlib
-      ];
+      pkgs = nixpkgs.legacyPackages.${system};
 
-      haskDevTools = with hPkgs; [
-        ghc
-        ghcid
-        fourmolu
-        hlint
-        haskell-language-server
-        implicit-hie
-        retrie
-        cabal-install
-      ];
-
-      tools = devTools ++ haskDevTools;
-
-      pkgs = import nixpkgs {
-        inherit system;
-        overlays = [ self.overlays.all ];
-      };
+      outputSet = pkgs:
+        with pkgs; rec {
+          awscost = callPackage ./packages/awscost.nix { };
+          booknote = callPackage ./packages/booknote.nix { inherit pdftc; };
+          epubthumb = callPackage ./packages/epubthumb.nix { };
+          mdtopdf = callPackage ./packages/mdtopdf.nix { };
+          newcover = haskell.packages.ghc948.callCabal2nix "" ./newcover { };
+          pdftc = callPackage ./packages/pdftc.nix { };
+          roamamer = callPackage ./packages/roamamer.nix { };
+          seder = callPackage ./packages/seder.nix { };
+          transcribe = callPackage ./packages/transcribe.nix { };
+        };
 
     in {
-      devShells.${system}.default = pkgs.mkShell {
-        buildInputs = tools;
-        LD_LIBRARY_PATH = pkgs.lib.makeLibraryPath tools;
-      };
-
-      packages.${system} = with pkgs; {
-        inherit awscost;
-        inherit booknote;
-        inherit epubthumb;
-        inherit mdtopdf;
-        inherit newcover;
-        inherit pdftc;
-        inherit roamamer;
-        inherit seder;
-        inherit transcribe;
-      };
-
-      overlays = {
-        all = final: prev: {
-          awscost = prev.callPackage ./packages/awscost.nix { };
-          booknote = prev.callPackage ./packages/booknote.nix { };
-          epubthumb = prev.callPackage ./packages/epubthumb.nix { };
-          mdtopdf = prev.callPackage ./packages/mdtopdf.nix { };
-          newcover = prev.haskell.packages.${compiler}.callPackage ./. { };
-          pdftc = prev.callPackage ./packages/pdftc.nix { };
-          roamamer = prev.callPackage ./packages/roamamer.nix { };
-          seder = prev.callPackage ./packages/seder.nix { };
-          transcribe = prev.callPackage ./packages/transcribe.nix { };
-        };
-      };
+      devShells.${system}.default = pkgs.callPackage ./devenv.nix { };
+      checks.${system} = outputSet pkgs;
+      packages.${system} = outputSet pkgs;
+      overlays = { all = final: prev: outputSet prev; };
     };
 }