Merge pull request #408 from nix-community/remove-makeOutputs-example

Remove makeOutputs from examples

examples/_d2n-init-pkgs/flake.nix

@@ -10,34 +10,19 @@
 
     allPkgs =
       l.map
+      # nixpkgs could be imported manually here with overrides etc.
       (system: inp.dream2nix.inputs.nixpkgs.legacyPackages.${system})
       ["x86_64-linux" "aarch64-linux"];
-
-    initD2N = pkgs:
-      inp.dream2nix.lib.init {
-        inherit pkgs;
-        config.projectRoot = ./.;
-      };
-
-    makeOutputs = pkgs: let
-      outputs = (initD2N pkgs).dream2nix-interface.makeOutputs {
-        source = inp.src;
-        settings = [
-          {
-            builder = "build-rust-package";
-            translator = "cargo-lock";
-          }
-        ];
-      };
-    in rec {
-      packages.${pkgs.system} = outputs.packages;
-      # checks.${pkgs.system} = {
-      #   inherit (outputs.packages) linemd;
-      # };
-    };
-
-    allOutputs = l.map makeOutputs allPkgs;
-    outputs = l.foldl' l.recursiveUpdate {} allOutputs;
   in
-    outputs;
+    inp.dream2nix.lib.makeFlakeOutputs {
+      pkgs = allPkgs;
+      config.projectRoot = ./.;
+      source = inp.src;
+      settings = [
+        {
+          builder = "build-rust-package";
+          translator = "cargo-lock";
+        }
+      ];
+    };
 }

src/lib.nix

@@ -53,8 +53,7 @@
       if l.isList pkgsList
       then
         l.listToAttrs
-        (pkgs: l.nameValuePair (makePkgsKey pkgs) pkgs)
-        pkgsList
+        (map (pkgs: l.nameValuePair (makePkgsKey pkgs) pkgs) pkgsList)
       else {"${makePkgsKey pkgsList}" = pkgsList;}
     # only systems is specified
     else