Merge pull request #429 from nix-community/flake-restructure

Restructure flake into flake-modules named by the flake output

Author: Mic92

nix/checks/effects.nix renamed to checks/effects.nix

@@ -6,7 +6,7 @@
       { pkgs, ... }:
       {
         environment.systemPackages = [
-          (pkgs.python3.pkgs.callPackage ../../nix/buildbot-effects.nix { })
+          (pkgs.python3.pkgs.callPackage ../packages/buildbot-effects.nix { })
         ];
       };
   };

checks/flake-module.nix

@@ -0,0 +1,33 @@
+{ self, ... }:
+{
+  perSystem =
+    {
+      self',
+      system,
+      pkgs,
+      lib,
+      ...
+    }:
+    {
+      checks =
+        let
+          # this gives us a reference to our flake but also all flake inputs
+          checkArgs = {
+            inherit self pkgs;
+          };
+          nixosMachines = lib.mapAttrs' (
+            name: config: lib.nameValuePair "nixos-${name}" config.config.system.build.toplevel
+          ) ((lib.filterAttrs (name: _: lib.hasSuffix system name)) self.nixosConfigurations);
+          packages = lib.mapAttrs' (n: lib.nameValuePair "package-${n}") self'.packages;
+          devShells = lib.mapAttrs' (n: lib.nameValuePair "devShell-${n}") self'.devShells;
+        in
+        nixosMachines
+        // packages
+        // devShells
+        // lib.mkIf (pkgs.stdenv.hostPlatform.isLinux) {
+          master = import ./master.nix checkArgs;
+          worker = import ./worker.nix checkArgs;
+          effects = import ./effects.nix checkArgs;
+        };
+    };
+}

nix/checks/lib.nix renamed to checks/lib.nix

@@ -0,0 +1,13 @@
+{
+  perSystem =
+    { pkgs, ... }:
+    {
+      devShells.default = pkgs.mkShell {
+        packages = [
+          pkgs.bashInteractive
+          pkgs.mypy
+          pkgs.ruff
+        ];
+      };
+    };
+}

nix/checks/master.nix renamed to checks/master.nix

@@ -0,0 +1,16 @@
+{ self, inputs, ... }:
+{
+  flake = {
+    nixosConfigurations =
+      let
+        examplesFor =
+          system:
+          import ../examples {
+            inherit system;
+            inherit (inputs) nixpkgs;
+            buildbot-nix = self;
+          };
+      in
+      examplesFor "x86_64-linux" // examplesFor "aarch64-linux";
+  };
+}

nix/checks/worker.nix renamed to checks/worker.nix

@@ -17,104 +17,27 @@
   };
 
   outputs =
-    inputs@{ self, flake-parts, ... }:
-    flake-parts.lib.mkFlake { inherit inputs; } (
-      {
-        lib,
-        config,
-        withSystem,
-        ...
-      }:
-      {
-        imports =
-          [
-            ./nix/checks/flake-module.nix
-          ]
-          ++ inputs.nixpkgs.lib.optional (inputs.treefmt-nix ? flakeModule) ./nix/treefmt/flake-module.nix
-          ++ inputs.nixpkgs.lib.optionals (inputs.hercules-ci-effects ? flakeModule) [
-            inputs.hercules-ci-effects.flakeModule
-            {
-              herculesCI = herculesCI: {
-                onPush.default.outputs.effects.deploy = withSystem config.defaultEffectSystem (
-                  { pkgs, hci-effects, ... }:
-                  hci-effects.runIf (herculesCI.config.repo.branch == "main") (
-                    hci-effects.mkEffect {
-                      effectScript = ''
-                        echo "${builtins.toJSON { inherit (herculesCI.config.repo) branch tag rev; }}"
-                        ${pkgs.hello}/bin/hello
-                      '';
-                    }
-                  )
-                );
-              };
-            }
-          ];
-        systems = [
-          "x86_64-linux"
-          "aarch64-linux"
-          "aarch64-darwin"
+    inputs@{ flake-parts, ... }:
+    flake-parts.lib.mkFlake { inherit inputs; } {
+      imports =
+        [
+          ./examples/flake-module.nix
+          ./devShells/flake-module.nix
+          ./nixosModules/flake-module.nix
+          ./checks/flake-module.nix
+          ./packages/flake-module.nix
+        ]
+        ++ inputs.nixpkgs.lib.optional (inputs.treefmt-nix ? flakeModule) ./formatter/flake-module.nix
+        ++ inputs.nixpkgs.lib.optionals (inputs.hercules-ci-effects ? flakeModule) [
+          inputs.hercules-ci-effects.flakeModule
+          ./herculesCI/flake-module.nix
         ];
 
-        flake = {
-          nixosModules.buildbot-master.imports = [
-            ./nix/master.nix
-          ];
+      systems = [
+        "x86_64-linux"
+        "aarch64-linux"
+        "aarch64-darwin"
+      ];
 
-          nixosModules.buildbot-worker.imports = [
-            ./nix/worker.nix
-          ];
-
-          nixosConfigurations =
-            let
-              examplesFor =
-                system:
-                import ./examples {
-                  inherit system;
-                  inherit (inputs) nixpkgs;
-                  buildbot-nix = self;
-                };
-            in
-            examplesFor "x86_64-linux" // examplesFor "aarch64-linux";
-
-          lib = import ./nix/lib.nix;
-        };
-        perSystem =
-          {
-            self',
-            pkgs,
-            system,
-            ...
-          }:
-          {
-            packages =
-              {
-                default = pkgs.mkShell {
-                  packages = [
-                    pkgs.bashInteractive
-                    pkgs.mypy
-                    pkgs.ruff
-                  ];
-                };
-                # useful for checking what buildbot version is used.
-                buildbot = pkgs.buildbot;
-                buildbot-nix = pkgs.python3.pkgs.callPackage ./nix/buildbot-nix.nix { };
-                buildbot-gitea = pkgs.python3.pkgs.callPackage ./nix/buildbot-gitea.nix {
-                  buildbot = pkgs.buildbot;
-                };
-              }
-              // lib.optionalAttrs pkgs.stdenv.isLinux {
-                buildbot-effects = pkgs.python3.pkgs.callPackage ./nix/buildbot-effects.nix { };
-              };
-            checks =
-              let
-                nixosMachines = lib.mapAttrs' (
-                  name: config: lib.nameValuePair "nixos-${name}" config.config.system.build.toplevel
-                ) ((lib.filterAttrs (name: _: lib.hasSuffix system name)) self.nixosConfigurations);
-                packages = lib.mapAttrs' (n: lib.nameValuePair "package-${n}") self'.packages;
-                devShells = lib.mapAttrs' (n: lib.nameValuePair "devShell-${n}") self'.devShells;
-              in
-              nixosMachines // packages // devShells;
-          };
-      }
-    );
+    };
 }

devShells/flake-module.nix

@@ -0,0 +1,20 @@
+{
+  config,
+  withSystem,
+  ...
+}:
+{
+  herculesCI = herculesCI: {
+    onPush.default.outputs.effects.deploy = withSystem config.defaultEffectSystem (
+      { pkgs, hci-effects, ... }:
+      hci-effects.runIf (herculesCI.config.repo.branch == "main") (
+        hci-effects.mkEffect {
+          effectScript = ''
+            echo "${builtins.toJSON { inherit (herculesCI.config.repo) branch tag rev; }}"
+            ${pkgs.hello}/bin/hello
+          '';
+        }
+      )
+    );
+  };
+}