refactor: remove flake-utils

Author: isabelroses

examples/complex/flake.nix

@@ -1,6 +1,5 @@
 {
   inputs = {
-    flake-utils.url = "github:numtide/flake-utils";
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
     nix-topology.url = "github:oddlama/nix-topology";
     nix-topology.inputs.nixpkgs.follows = "nixpkgs";
@@ -10,9 +9,23 @@
     self,
     nixpkgs,
     nix-topology,
-    flake-utils,
     ...
-  }:
+  }: let
+    inherit (nixpkgs) lib;
+
+    eachSystem = systems: fn:
+      lib.foldl' (
+        acc: system: lib.recursiveUpdate acc (lib.mapAttrs (_: value: {${system} = value;}) (fn system))
+      ) {}
+      systems;
+
+    systems = [
+      "aarch64-darwin"
+      "aarch64-linux"
+      "x86_64-darwin"
+      "x86_64-linux"
+    ];
+  in
     {
       nixosConfigurations.host1 = nixpkgs.lib.nixosSystem {
         system = "x86_64-linux";
@@ -174,7 +187,7 @@
         ];
       };
     }
-    // flake-utils.lib.eachDefaultSystem (system: rec {
+    // eachSystem systems (system: rec {
       pkgs = import nixpkgs {
         inherit system;
         overlays = [nix-topology.overlays.default];

examples/simple/flake.nix

@@ -1,6 +1,5 @@
 {
   inputs = {
-    flake-utils.url = "github:numtide/flake-utils";
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
     nix-topology.url = "github:oddlama/nix-topology";
     nix-topology.inputs.nixpkgs.follows = "nixpkgs";
@@ -10,9 +9,23 @@
     self,
     nixpkgs,
     nix-topology,
-    flake-utils,
     ...
-  }:
+  }: let
+    inherit (nixpkgs) lib;
+
+    eachSystem = systems: fn:
+      lib.foldl' (
+        acc: system: lib.recursiveUpdate acc (lib.mapAttrs (_: value: {${system} = value;}) (fn system))
+      ) {}
+      systems;
+
+    systems = [
+      "aarch64-darwin"
+      "aarch64-linux"
+      "x86_64-darwin"
+      "x86_64-linux"
+    ];
+  in
     {
       nixosConfigurations.host1 = nixpkgs.lib.nixosSystem {
         system = "x86_64-linux";
@@ -97,7 +110,7 @@
         ];
       };
     }
-    // flake-utils.lib.eachDefaultSystem (system: rec {
+    // eachSystem systems (system: rec {
       pkgs = import nixpkgs {
         inherit system;
         overlays = [nix-topology.overlays.default];

flake.lock

@@ -7,7 +7,6 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
-    flake-utils.url = "github:numtide/flake-utils";
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
 
     pre-commit-hooks = {
@@ -20,11 +19,25 @@
   outputs = {
     self,
     devshell,
-    flake-utils,
     nixpkgs,
     pre-commit-hooks,
     ...
-  } @ inputs:
+  } @ inputs: let
+    inherit (nixpkgs) lib;
+
+    eachSystem = systems: fn:
+      lib.foldl' (
+        acc: system: lib.recursiveUpdate acc (lib.mapAttrs (_: value: {${system} = value;}) (fn system))
+      ) {}
+      systems;
+
+    systems = [
+      "aarch64-darwin"
+      "aarch64-linux"
+      "x86_64-darwin"
+      "x86_64-linux"
+    ];
+  in
     {
       flakeModule = ./flake-module.nix;
 
@@ -36,7 +49,7 @@
       overlays.default = self.overlays.topology;
       overlays.topology = import ./pkgs/default.nix;
     }
-    // flake-utils.lib.eachDefaultSystem (system: rec {
+    // eachSystem systems (system: rec {
       pkgs = import nixpkgs {
         inherit system;
         overlays = [

flake.nix

@@ -39,7 +39,7 @@
 
   flakeForExample = path: let
     self = (import (path + "/flake.nix")).outputs {
-      inherit (flakeInputs) nixpkgs flake-utils;
+      inherit (flakeInputs) nixpkgs;
       inherit self;
       nix-topology = flakeOutputs // {outPath = ./..;};
     };