🧠 redesign Use newer flake-utils

doc/api-reference.md

@@ -59,5 +59,5 @@ list of strings
 _*Default*_
 
 ```
-["aarch64-linux","aarch64-darwin","i686-linux","x86_64-darwin","x86_64-linux"]
+["aarch64-linux","aarch64-darwin","x86_64-darwin","x86_64-linux"]
 ```

examples/devos/default.nix

@@ -5,7 +5,6 @@ let
 
   ciSystems = [
     "aarch64-linux"
-    "i686-linux"
     "x86_64-linux"
   ];
 

flake.nix

@@ -24,7 +24,9 @@
     devshell.url = "github:numtide/devshell";
     devshell.inputs.nixpkgs.follows = "nixpkgs";
 
+    flake-utils.url = "github:numtide/flake-utils";
     flake-utils-plus.url = "github:gytis-ivaskevicius/flake-utils-plus/?ref=refs/pull/120/head";
+    flake-utils-plus.inputs.flake-utils.follows = "flake-utils";
 
     flake-compat = {
       url = "github:edolstra/flake-compat";
@@ -65,7 +67,6 @@
     mkFlake = let
       mkFlake' = import ./src/mkFlake {
         inherit (nixlib) lib;
-        inherit (flake-utils-plus.inputs) flake-utils;
         inherit
           collectors
           darwin
@@ -87,7 +88,7 @@
     # .. see: https://demo.hedgedoc.org/s/_W6Ve03GK#
 
     # Super Stupid Flakes (ssf) / System As an Input - Style:
-    supportedSystems = ["x86_64-linux" "aarch64-linux" "x86_64-darwin"];
+    supportedSystems = flake-utils-plus.lib.defaultSystems;
 
     # Pass this flake(self) as "digga"
     polyfillInputs = self.inputs // {digga = self;};

src/mkFlake/default.nix

@@ -6,7 +6,6 @@
   devshell,
   home-manager,
   flake-utils-plus,
-  flake-utils,
   internal-modules,
   tests,
 } @ injectedDeps: {

src/mkFlake/options.nix

@@ -2,7 +2,7 @@
 {
   lib,
   devshell,
-  flake-utils,
+  flake-utils-plus,
   self,
   inputs,
   ...
@@ -16,53 +16,45 @@ with lib;
     # #############
 
     /*
+     * Synopsis: maybeImport <path|string or obj>
      *
-     Synopsis: maybeImport <path|string or obj>
-     
-     Returns an imported path or string or the object otherwise.
-     
-     Use when you want to allow specifying an object directly or a path to it.
-     It saves the end user the additional import statement.
+     * Returns an imported path or string or the object otherwise.
      *
+     * Use when you want to allow specifying an object directly or a path to it.
+     * It saves the end user the additional import statement.
      */
     maybeImport = obj:
       if (builtins.isPath obj || builtins.isString obj)
       then import obj
       else obj;
 
     /*
+     * Synopsis: maybeImportDevshellToml <path|string or obj>
      *
-     Synopsis: maybeImportDevshellToml <path|string or obj>
-     
-     Returns an imported path or string if the filename ends in `toml` or the object or path otherwise.
-     
-     Use only for devshell modules, as an apply function.
+     * Returns an imported path or string if the filename ends in `toml` or the object or path otherwise.
      *
+     * Use only for devshell modules, as an apply function.
      */
     maybeImportDevshellToml = obj:
       if ((builtins.isPath obj || builtins.isString obj) && lib.hasSuffix ".toml" obj)
       then devshell.lib.importTOML obj
       else obj;
 
     /*
+     * Synopsis: pathToOr <type>
      *
-     Synopsis: pathToOr <type>
-     
-     Type resolver: types maybeImport's <obj>.
-     
-     Use in type declarations.
+     * Type resolver: types maybeImport's <obj>.
      *
+     * Use in type declarations.
      */
     pathToOr = elemType: with types; coercedTo path maybeImport elemType;
 
     /*
+     * Synopsis: coercedListOf <type>
      *
-     Synopsis: coercedListOf <type>
-     
-     Type resolver & list flattner: flattens a (evtl. arbitrarily nested) list of type <type>.
-     
-     Use in type declarations.
+     * Type resolver & list flattner: flattens a (evtl. arbitrarily nested) list of type <type>.
      *
+     * Use in type declarations.
      */
     coercedListOf = elemType:
       with types;
@@ -439,7 +431,7 @@ with lib;
       };
       supportedSystems = mkOption {
         type = listOf str;
-        default = flake-utils.lib.defaultSystems;
+        default = flake-utils-plus.lib.defaultSystems;
         description = ''
           The systems supported by this flake
         '';