commit ddd7db501d95ffb0807da4ef9ad2543bfdb045ef · pyrox.dev/nixpkgs

+1 -1

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

···

       174
       174
        
       

     

       175
       175
        
       - [Fider](https://fider.io/), an open platform to collect and prioritize feedback. Available as [services.fider](#opt-services.fider.enable).

     

       176
       176
        
       

     

       177
       177
       -
       - [PDS](https://github.com/bluesky-social/pds), Personal Data Server for [bsky](https://bsky.social/). Available as [services.pds](#opt-services.pds.enable).

     

       177
       177
       +
       - [PDS](https://github.com/bluesky-social/pds), Personal Data Server for [bsky](https://bsky.social/). Available as {option}`services.pds`.

     

       178
       178
        
       

     

       179
       179
        
       - [Anubis](https://github.com/TecharoHQ/anubis), a scraper defense software. Available as [services.anubis](#opt-services.anubis.defaultOptions).

     

       180
       180

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

···

       210
       210
        
       

     

       211
       211
        
       - `services.netbird.server` now uses dedicated packages split out due to relicensing of server components to AGPLv3 with version `0.53.0`,

     

       212
       212
        
       

     

       213
       213
       +
       - `services.pds` has been renamed to `services.bluesky-pds`.

     

       214
       214
       +
       

     

       213
       215
        
       - The new option [networking.ipips](#opt-networking.ipips) has been added to create IP within IP kind of tunnels (including 4in6, ip6ip6 and ipip).

     

       214
       216
        
         With the existing [networking.sits](#opt-networking.sits) option (6in4), it is now possible to create all combinations of IPv4 and IPv6 encapsulation.

     

       215
       217

+1 -1

nixos/modules/module-list.nix

···

       1537
       1537
        
         ./services/web-apps/audiobookshelf.nix

     

       1538
       1538
        
         ./services/web-apps/baikal.nix

     

       1539
       1539
        
         ./services/web-apps/bluemap.nix

     

       1540
       1540
       +
         ./services/web-apps/bluesky-pds.nix

     

       1540
       1541
        
         ./services/web-apps/bookstack.nix

     

       1541
       1542
        
         ./services/web-apps/c2fmzq-server.nix

     

       1542
       1543
        
         ./services/web-apps/calibre-web.nix

     
···

       1655
       1656
        
         ./services/web-apps/openwebrx.nix

     

       1656
       1657
        
         ./services/web-apps/outline.nix

     

       1657
       1658
        
         ./services/web-apps/part-db.nix

     

       1658
       1658
       -
         ./services/web-apps/pds.nix

     

       1659
       1659
        
         ./services/web-apps/peering-manager.nix

     

       1660
       1660
        
         ./services/web-apps/peertube-runner.nix

     

       1661
       1661
        
         ./services/web-apps/peertube.nix

+19 -8

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

···

       5
       5
        
         ...

     

       6
       6
        
       }:

     

       7
       7
        
       let

     

       8
       8
       -
         cfg = config.services.pds;

     

       8
       8
       +
         cfg = config.services.bluesky-pds;

     

       9
       9
        
       

     

       10
       10
        
         inherit (lib)

     

       11
       11
        
           getExe

     
···

       21
       21
        
       

     

       22
       22
        
         pdsadminWrapper =

     

       23
       23
        
           let

     

       24
       24
       -
             cfgSystemd = config.systemd.services.pds.serviceConfig;

     

       24
       24
       +
             cfgSystemd = config.systemd.services.bluesky-pds.serviceConfig;

     

       25
       25
        
           in

     

       26
       26
        
           pkgs.writeShellScriptBin "pdsadmin" ''

     

       27
       27
        
             DUMMY_PDS_ENV_FILE="$(mktemp)"

     
···

       29
       29
        
             env "PDS_ENV_FILE=$DUMMY_PDS_ENV_FILE"                                                   \

     

       30
       30
        
                 ${escapeShellArgs cfgSystemd.Environment}                                            \

     

       31
       31
        
                 ${concatMapStringsSep " " (envFile: "$(cat ${envFile})") cfgSystemd.EnvironmentFile} \

     

       32
       32
       -
                 ${getExe pkgs.pdsadmin} "$@"

     

       32
       32
       +
                 ${getExe pkgs.bluesky-pdsadmin} "$@"

     

       33
       33
        
           '';

     

       34
       34
        
       in

     

       35
       35
        
       # All defaults are from https://github.com/bluesky-social/pds/blob/8b9fc24cec5f30066b0d0b86d2b0ba3d66c2b532/installer.sh

     

       36
       36
        
       {

     

       37
       37
       -
         options.services.pds = {

     

       37
       37
       +
         imports = [

     

       38
       38
       +
           (lib.mkRenamedOptionModule [ "services" "pds" "enable" ] [ "services" "bluesky-pds" "enable" ])

     

       39
       39
       +
           (lib.mkRenamedOptionModule [ "services" "pds" "package" ] [ "services" "bluesky-pds" "package" ])

     

       40
       40
       +
           (lib.mkRenamedOptionModule [ "services" "pds" "settings" ] [ "services" "bluesky-pds" "settings" ])

     

       41
       41
       +
           (lib.mkRenamedOptionModule

     

       42
       42
       +
             [ "services" "pds" "environmentFiles" ]

     

       43
       43
       +
             [ "services" "bluesky-pds" "environmentFiles" ]

     

       44
       44
       +
           )

     

       45
       45
       +
           (lib.mkRenamedOptionModule [ "services" "pds" "pdsadmin" ] [ "services" "bluesky-pds" "pdsadmin" ])

     

       46
       46
       +
         ];

     

       47
       47
       +
       

     

       48
       48
       +
         options.services.bluesky-pds = {

     

       38
       49
        
           enable = mkEnableOption "pds";

     

       39
       50
        
       

     

       40
       40
       -
           package = mkPackageOption pkgs "pds" { };

     

       51
       51
       +
           package = mkPackageOption pkgs "bluesky-pds" { };

     

       41
       52
        
       

     

       42
       53
        
           settings = mkOption {

     

       43
       54
        
             type = types.submodule {

     
···

       154
       165
        
             enable = mkOption {

     

       155
       166
        
               type = types.bool;

     

       156
       167
        
               default = cfg.enable;

     

       157
       157
       -
               defaultText = literalExpression "config.services.pds.enable";

     

       168
       168
       +
               defaultText = literalExpression "config.services.bluesky-pds.enable";

     

       158
       169
        
               description = "Add pdsadmin script to PATH";

     

       159
       170
        
             };

     

       160
       171
        
           };

     
···

       165
       176
        
             systemPackages = [ pdsadminWrapper ];

     

       166
       177
        
           };

     

       167
       178
        
       

     

       168
       168
       -
           systemd.services.pds = {

     

       169
       169
       -
             description = "pds";

     

       179
       179
       +
           systemd.services.bluesky-pds = {

     

       180
       180
       +
             description = "bluesky pds";

     

       170
       181
        
       

     

       171
       182
        
             after = [ "network-online.target" ];

     

       172
       183
        
             wants = [ "network-online.target" ];