Merge #40

40: flake: use fup for non-lib outputs r=blaggacao a=Pacman99 Should help simplify #39 this means we can now access `fup-repl` in diggas devshell too. Also we may as well offload some of the pkgs creation work to fup. Co-authored-by: Pacman99 <[email protected]>
divnix · Jun 1, 2021 · 5862c77 · 5862c77
2 parents eff501e + 01ff775
commit 5862c77
Showing 1 changed file with 19 additions and 20 deletions.
diff --git a/flake.nix b/flake.nix
@@ -65,29 +65,28 @@
 
     //
 
-    utils.lib.eachDefaultSystem (system:
-      let
-        pkgs = import nixpkgs { inherit system; };
-      in
-      {
-        checks = import ./tests {
-          pkgs = pkgs // {
-            input = nixpkgs;
+    utils.lib.systemFlake {
+      inherit self inputs;
+      channels.pkgs.input = nixpkgs;
+      outputsBuilder = channels:
+        let inherit (channels) pkgs; in
+        {
+          checks = import ./tests {
+            inherit pkgs;
+            lib = nixlib.lib // lib;
           };
-          lib = nixlib.lib // lib;
-        };
 
-        devShell = lib.pkgs-lib.shell { inherit pkgs; };
+          devShell = lib.pkgs-lib.shell { inherit pkgs; };
 
-        packages = {
-          mkFlakeDoc = pkgs.writeText "mkFlakeOptions.md"
-            (
-              pkgs.nixosOptionsDoc {
-                inherit (lib.mkFlake.evalArgs { args = { }; }) options;
-              }
-            ).optionsMDDoc;
+          packages = {
+            mkFlakeDoc = pkgs.writeText "mkFlakeOptions.md"
+              (
+                pkgs.nixosOptionsDoc {
+                  inherit (lib.mkFlake.evalArgs { args = { }; }) options;
+                }
+              ).optionsMDDoc;
+          };
         };
-      }
-    );
+    };
 
 }