From f526cf76a0d3284bf8937e9a9a6edbfefbbc3f8d Mon Sep 17 00:00:00 2001 From: isabel Date: Tue, 19 Aug 2025 00:17:41 +0100 Subject: [PATCH 1/4] bluesky-pds: rename from pds --- pkgs/by-name/{pd/pds => bl/bluesky-pds}/package.nix | 0 pkgs/top-level/aliases.nix | 1 + 2 files changed, 1 insertion(+) rename pkgs/by-name/{pd/pds => bl/bluesky-pds}/package.nix (100%) diff --git a/pkgs/by-name/pd/pds/package.nix b/pkgs/by-name/bl/bluesky-pds/package.nix similarity index 100% rename from pkgs/by-name/pd/pds/package.nix rename to pkgs/by-name/bl/bluesky-pds/package.nix diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index eb9c5f9ddad4..25cbbb290d7a 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1584,6 +1584,7 @@ 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 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 From ee8d2cfce56d1e5fedcac43b80999947b5a82a04 Mon Sep 17 00:00:00 2001 From: isabel Date: Tue, 19 Aug 2025 00:17:56 +0100 Subject: [PATCH 2/4] bluesky-pdsadmin: rename from pdsadmin --- .../{pd/pdsadmin => bl/bluesky-pdsadmin}/package.nix | 6 +++--- .../pdsadmin => bl/bluesky-pdsadmin}/pdsadmin-offline.patch | 0 pkgs/top-level/aliases.nix | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) rename pkgs/by-name/{pd/pdsadmin => bl/bluesky-pdsadmin}/package.nix (90%) rename pkgs/by-name/{pd/pdsadmin => bl/bluesky-pdsadmin}/pdsadmin-offline.patch (100%) diff --git a/pkgs/by-name/pd/pdsadmin/package.nix b/pkgs/by-name/bl/bluesky-pdsadmin/package.nix similarity index 90% rename from pkgs/by-name/pd/pdsadmin/package.nix rename to pkgs/by-name/bl/bluesky-pdsadmin/package.nix index 3e3e12164f0f..2af62adeed01 100644 --- a/pkgs/by-name/pd/pdsadmin/package.nix +++ b/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"; diff --git a/pkgs/by-name/pd/pdsadmin/pdsadmin-offline.patch b/pkgs/by-name/bl/bluesky-pdsadmin/pdsadmin-offline.patch similarity index 100% rename from pkgs/by-name/pd/pdsadmin/pdsadmin-offline.patch rename to pkgs/by-name/bl/bluesky-pdsadmin/pdsadmin-offline.patch diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 25cbbb290d7a..4997a770e2a1 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1585,6 +1585,7 @@ mapAliases { 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 From ddd7db501d95ffb0807da4ef9ad2543bfdb045ef Mon Sep 17 00:00:00 2001 From: isabel Date: Tue, 19 Aug 2025 00:15:31 +0100 Subject: [PATCH 3/4] nixos/bluesky-pds: rename from pds --- .../manual/release-notes/rl-2505.section.md | 2 +- .../manual/release-notes/rl-2511.section.md | 2 ++ nixos/modules/module-list.nix | 2 +- .../web-apps/{pds.nix => bluesky-pds.nix} | 27 +++++++++++++------ 4 files changed, 23 insertions(+), 10 deletions(-) rename nixos/modules/services/web-apps/{pds.nix => bluesky-pds.nix} (86%) diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md index 4ef84b41b94b..a123644d028f 100644 --- a/nixos/doc/manual/release-notes/rl-2505.section.md +++ b/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). diff --git a/nixos/doc/manual/release-notes/rl-2511.section.md b/nixos/doc/manual/release-notes/rl-2511.section.md index db028db407e9..9728c8761b22 100644 --- a/nixos/doc/manual/release-notes/rl-2511.section.md +++ b/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. diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 8754c3a0ad2c..8713082efb4c 100644 --- a/nixos/modules/module-list.nix +++ b/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 diff --git a/nixos/modules/services/web-apps/pds.nix b/nixos/modules/services/web-apps/bluesky-pds.nix similarity index 86% rename from nixos/modules/services/web-apps/pds.nix rename to nixos/modules/services/web-apps/bluesky-pds.nix index b17cd628c157..56611917f0c8 100644 --- a/nixos/modules/services/web-apps/pds.nix +++ b/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" ]; From 06ec782dbae9c2f5ae13fe3c0130fe60b03e1c9b Mon Sep 17 00:00:00 2001 From: isabel Date: Tue, 19 Aug 2025 00:16:09 +0100 Subject: [PATCH 4/4] nixosTests.bluesky-pds: rename from nixosTests.pds --- nixos/tests/all-tests.nix | 2 +- nixos/tests/{pds.nix => bluesky-pds.nix} | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) rename nixos/tests/{pds.nix => bluesky-pds.nix} (89%) diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index e8794f0cd502..2b16b4e8111c 100644 --- a/nixos/tests/all-tests.nix +++ b/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 { }; diff --git a/nixos/tests/pds.nix b/nixos/tests/bluesky-pds.nix similarity index 89% rename from nixos/tests/pds.nix rename to nixos/tests/bluesky-pds.nix index a07a2c1fcf72..b74c74955f54 100644 --- a/nixos/tests/pds.nix +++ b/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") '';