diff --git a/flake.nix b/flake.nix index 27e92ac..84e22ea 100644 --- a/flake.nix +++ b/flake.nix @@ -61,16 +61,13 @@ ]; perSystem = { config, inputs', lib, pkgs, self', system, ... }: - let - defaultPlatform = pkgs.stdenv.hostPlatform.system == "x86_64-linux"; - in { imports = [ ./dev/shell.nix ./terraform/shell.nix ]; treefmt = { - flakeCheck = defaultPlatform; + flakeCheck = system == "x86_64-linux"; imports = [ ./dev/treefmt.nix ]; }; @@ -79,18 +76,19 @@ darwinConfigurations = lib.mapAttrs' (name: config: lib.nameValuePair name config.config.system.build.toplevel) ((lib.filterAttrs (_: config: config.pkgs.system == system)) self.darwinConfigurations); devShells = lib.mapAttrs' (n: lib.nameValuePair "devShell-${n}") self'.devShells; nixosConfigurations = lib.mapAttrs' (name: config: lib.nameValuePair "nixos-${name}" config.config.system.build.toplevel) ((lib.filterAttrs (_: config: config.pkgs.system == system)) self.nixosConfigurations); - packages = lib.mapAttrs' (n: lib.nameValuePair "package-${n}") self'.packages; in - darwinConfigurations // devShells // { inherit (self') formatter; } // nixosConfigurations // packages - // pkgs.lib.optionalAttrs defaultPlatform { - nixosTests-buildbot = pkgs.nixosTests.buildbot; - nixosTests-buildbot-nix-master = inputs'.buildbot-nix.checks.master; - nixosTests-buildbot-nix-worker = inputs'.buildbot-nix.checks.worker; - nixosTests-hydra = pkgs.nixosTests.hydra.hydra_unstable; - }; + darwinConfigurations // devShells // { inherit (self') formatter; } // nixosConfigurations + // pkgs.lib.optionalAttrs (system == "x86_64-linux") + { + inherit (self'.packages) pages; + nixpkgs-update-supervisor-test = pkgs.callPackage ./hosts/build02/supervisor_test.nix { }; + nixosTests-buildbot = pkgs.nixosTests.buildbot; + nixosTests-buildbot-nix-master = inputs'.buildbot-nix.checks.master; + nixosTests-buildbot-nix-worker = inputs'.buildbot-nix.checks.worker; + nixosTests-hydra = pkgs.nixosTests.hydra.hydra_unstable; + }; - packages = pkgs.lib.optionalAttrs defaultPlatform { - nixpkgs-update-supervisor-test = pkgs.callPackage ./hosts/build02/supervisor_test.nix { }; + packages = { pages = pkgs.runCommand "pages" { buildInputs = [ config.devShells.mkdocs.nativeBuildInputs ];