diff --git a/doc/server.nix b/doc/server.nix index c73bd1eb..3b5270cf 100644 --- a/doc/server.nix +++ b/doc/server.nix @@ -1,5 +1,5 @@ { - docs, + doc, http-server, writeShellApplication, }: @@ -17,6 +17,6 @@ writeShellApplication { "-o" ]; text = '' - http-server ${docs} "''${server_flags[@]}" + http-server ${doc} "''${server_flags[@]}" ''; } diff --git a/flake/deprecation/default.nix b/flake/deprecation/default.nix index ec2ee91f..0b4a05dc 100644 --- a/flake/deprecation/default.nix +++ b/flake/deprecation/default.nix @@ -20,4 +20,19 @@ flake = lib.mkIf (!lib.oldestSupportedReleaseIsAtLeast 2605) { homeManagerModules = builtins.warn "stylix: flake output `homeManagerModules` has been renamed to `homeModules`" self.homeModules; }; + + perSystem.stylix.aliases = [ + { + output = "apps"; + old = "docs"; + new = "doc"; + until = 2511; + } + { + output = "packages"; + old = "docs"; + new = "doc"; + until = 2511; + } + ]; } diff --git a/flake/dev-shell.nix b/flake/dev-shell.nix index 990dd481..d66479d2 100644 --- a/flake/dev-shell.nix +++ b/flake/dev-shell.nix @@ -35,7 +35,7 @@ # not the local flake worktree that has possibly been modified since # entering the devshell. build-and-run-docs = pkgs.writeShellScriptBin "serve-docs" '' - nix run .#docs + nix run .#doc ''; in { diff --git a/flake/packages.nix b/flake/packages.nix index 8fb6cb46..97e3fd20 100644 --- a/flake/packages.nix +++ b/flake/packages.nix @@ -9,7 +9,7 @@ checks = config.packages; # Make 'nix run .#docs' serve the docs - apps.docs.program = config.packages.serve-docs; + apps.doc.program = config.packages.serve-docs; packages = lib.mkMerge [ # Testbeds are virtual machines based on NixOS, therefore they are @@ -20,13 +20,13 @@ } )) { - docs = pkgs.callPackage ../doc { + doc = pkgs.callPackage ../doc { inherit inputs; inherit (inputs.nixpkgs.lib) nixosSystem; inherit (inputs.home-manager.lib) homeManagerConfiguration; }; serve-docs = pkgs.callPackage ../doc/server.nix { - inherit (config.packages) docs; + inherit (config.packages) doc; }; palette-generator = pkgs.callPackage ../palette-generator { }; }