bluesky-pds: rename from pds (#434864)

nixos/doc/manual/release-notes/rl-2505.section.md

@@ -174,7 +174,7 @@ Alongside many enhancements to NixOS modules and general system improvements, th
 
 - [Fider](https://fider.io/), an open platform to collect and prioritize feedback. Available as [services.fider](#opt-services.fider.enable).
 
-- [PDS](https://github.com/bluesky-social/pds), Personal Data Server for [bsky](https://bsky.social/). Available as [services.pds](#opt-services.pds.enable).
+- [PDS](https://github.com/bluesky-social/pds), Personal Data Server for [bsky](https://bsky.social/). Available as {option}`services.pds`.
 
 - [Anubis](https://github.com/TecharoHQ/anubis), a scraper defense software. Available as [services.anubis](#opt-services.anubis.defaultOptions).
 

nixos/doc/manual/release-notes/rl-2511.section.md

@@ -210,6 +210,8 @@
 
 - `services.netbird.server` now uses dedicated packages split out due to relicensing of server components to AGPLv3 with version `0.53.0`,
 
+- `services.pds` has been renamed to `services.bluesky-pds`.
+
 - The new option [networking.ipips](#opt-networking.ipips) has been added to create IP within IP kind of tunnels (including 4in6, ip6ip6 and ipip).
   With the existing [networking.sits](#opt-networking.sits) option (6in4), it is now possible to create all combinations of IPv4 and IPv6 encapsulation.
 

nixos/modules/module-list.nix

@@ -1537,6 +1537,7 @@
   ./services/web-apps/audiobookshelf.nix
   ./services/web-apps/baikal.nix
   ./services/web-apps/bluemap.nix
+  ./services/web-apps/bluesky-pds.nix
   ./services/web-apps/bookstack.nix
   ./services/web-apps/c2fmzq-server.nix
   ./services/web-apps/calibre-web.nix
@@ -1655,7 +1656,6 @@
   ./services/web-apps/openwebrx.nix
   ./services/web-apps/outline.nix
   ./services/web-apps/part-db.nix
-  ./services/web-apps/pds.nix
   ./services/web-apps/peering-manager.nix
   ./services/web-apps/peertube-runner.nix
   ./services/web-apps/peertube.nix

nixos/modules/services/web-apps/bluesky-pds.nix

@@ -5,7 +5,7 @@
   ...
 }:
 let
-  cfg = config.services.pds;
+  cfg = config.services.bluesky-pds;
 
   inherit (lib)
     getExe
@@ -21,7 +21,7 @@ let
 
   pdsadminWrapper =
     let
-      cfgSystemd = config.systemd.services.pds.serviceConfig;
+      cfgSystemd = config.systemd.services.bluesky-pds.serviceConfig;
     in
     pkgs.writeShellScriptBin "pdsadmin" ''
       DUMMY_PDS_ENV_FILE="$(mktemp)"
@@ -29,15 +29,26 @@ let
       env "PDS_ENV_FILE=$DUMMY_PDS_ENV_FILE"                                                   \
           ${escapeShellArgs cfgSystemd.Environment}                                            \
           ${concatMapStringsSep " " (envFile: "$(cat ${envFile})") cfgSystemd.EnvironmentFile} \
-          ${getExe pkgs.pdsadmin} "$@"
+          ${getExe pkgs.bluesky-pdsadmin} "$@"
     '';
 in
 # All defaults are from https://github.com/bluesky-social/pds/blob/8b9fc24cec5f30066b0d0b86d2b0ba3d66c2b532/installer.sh
 {
-  options.services.pds = {
+  imports = [
+    (lib.mkRenamedOptionModule [ "services" "pds" "enable" ] [ "services" "bluesky-pds" "enable" ])
+    (lib.mkRenamedOptionModule [ "services" "pds" "package" ] [ "services" "bluesky-pds" "package" ])
+    (lib.mkRenamedOptionModule [ "services" "pds" "settings" ] [ "services" "bluesky-pds" "settings" ])
+    (lib.mkRenamedOptionModule
+      [ "services" "pds" "environmentFiles" ]
+      [ "services" "bluesky-pds" "environmentFiles" ]
+    )
+    (lib.mkRenamedOptionModule [ "services" "pds" "pdsadmin" ] [ "services" "bluesky-pds" "pdsadmin" ])
+  ];
+
+  options.services.bluesky-pds = {
     enable = mkEnableOption "pds";
 
-    package = mkPackageOption pkgs "pds" { };
+    package = mkPackageOption pkgs "bluesky-pds" { };
 
     settings = mkOption {
       type = types.submodule {
@@ -154,7 +165,7 @@ in
       enable = mkOption {
         type = types.bool;
         default = cfg.enable;
-        defaultText = literalExpression "config.services.pds.enable";
+        defaultText = literalExpression "config.services.bluesky-pds.enable";
         description = "Add pdsadmin script to PATH";
       };
     };
@@ -165,8 +176,8 @@ in
       systemPackages = [ pdsadminWrapper ];
     };
 
-    systemd.services.pds = {
-      description = "pds";
+    systemd.services.bluesky-pds = {
+      description = "bluesky pds";
 
       after = [ "network-online.target" ];
       wants = [ "network-online.target" ];

nixos/tests/all-tests.nix

@@ -276,6 +276,7 @@ in
   blint = runTest ./blint.nix;
   blockbook-frontend = runTest ./blockbook-frontend.nix;
   blocky = runTest ./blocky.nix;
+  bluesky-pds = runTest ./bluesky-pds.nix;
   bookstack = runTest ./bookstack.nix;
   boot = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./boot.nix { };
   bootspec = handleTestOn [ "x86_64-linux" ] ./bootspec.nix { };
@@ -1150,7 +1151,6 @@ in
   parsedmarc = handleTest ./parsedmarc { };
   password-option-override-ordering = runTest ./password-option-override-ordering.nix;
   pdns-recursor = runTest ./pdns-recursor.nix;
-  pds = runTest ./pds.nix;
   peerflix = runTest ./peerflix.nix;
   peering-manager = runTest ./web-apps/peering-manager.nix;
   peertube = handleTestOn [ "x86_64-linux" ] ./web-apps/peertube.nix { };

nixos/tests/bluesky-pds.nix

@@ -3,7 +3,7 @@
   name = "PDS";
 
   nodes.machine = {
-    services.pds = {
+    services.bluesky-pds = {
       enable = true;
       settings = {
         PDS_PORT = 3000;
@@ -18,7 +18,7 @@
   };
 
   testScript = ''
-    machine.wait_for_unit("pds.service")
+    machine.wait_for_unit("bluesky-pds.service")
     machine.wait_for_open_port(3000)
     machine.succeed("curl --fail http://localhost:3000")
   '';

pkgs/by-name/bl/bluesky-pdsadmin/package.nix

@@ -1,7 +1,7 @@
 {
   stdenvNoCC,
   bash,
-  pds,
+  bluesky-pds,
   makeBinaryWrapper,
   jq,
   curl,
@@ -11,7 +11,7 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "pdsadmin";
-  inherit (pds) version src;
+  inherit (bluesky-pds) version src;
 
   patches = [ ./pdsadmin-offline.patch ];
 
@@ -49,7 +49,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
 
   meta = {
     description = "Admin scripts for Bluesky Personal Data Server (PDS)";
-    inherit (pds.meta) homepage license;
+    inherit (bluesky-pds.meta) homepage license;
     maintainers = with lib.maintainers; [ t4ccer ];
     platforms = lib.platforms.unix;
     mainProgram = "pdsadmin";

pkgs/top-level/aliases.nix

@@ -1584,6 +1584,8 @@ mapAliases {
   pcsctools = pcsc-tools; # Added 2023-12-07
   pcsxr = throw "pcsxr was removed as it has been abandoned for over a decade; please use DuckStation, Mednafen, or the RetroArch PCSX ReARMed core"; # Added 2024-08-20
   pdf4tcl = tclPackages.pdf4tcl; # Added 2024-10-02
+  pds = lib.warnOnInstantiate "'pds' has been renamed to 'bluesky-pds'" bluesky-pds; # Added 2025-08-20
+  pdsadmin = lib.warnOnInstantiate "'pdsadmin' has been renamed to 'bluesky-pdsadmin'" bluesky-pdsadmin; # Added 2025-08-20
   peach = asouldocs; # Added 2022-08-28
   percona-server_innovation = lib.warnOnInstantiate "Percona upstream has decided to skip all Innovation releases of MySQL and only release LTS versions." percona-server; # Added 2024-10-13
   percona-server_lts = percona-server; # Added 2024-10-13