From d27e67743931d352e5857b605d44657668fa9013 Mon Sep 17 00:00:00 2001
From: stuebinm
Date: Tue, 4 Jun 2024 21:14:49 +0200
Subject: all: jump to nixpkgs 24.05

this does a lot of things, most of which are maintenance:
 - sources update
 - adjust newly-renamed options
 - swap some packages that were removed / renamed
 - update nomsring to newer default ghc
 - remove the deprecated lib.mdDoc from modules/*.nix
 - disable the nixpkgs mollysocket module so my own keeps evaluating
 - bundle the package definition of hikari & wlroots 0.15, which nixpkgs
   has removed as unmaintained (in fairness, they are unmaintained)
---
 modules/bookwyrm.nix    | 20 ++++++++++----------
 modules/mollysocket.nix | 10 ++++++----
 2 files changed, 16 insertions(+), 14 deletions(-)

(limited to 'modules')

diff --git a/modules/bookwyrm.nix b/modules/bookwyrm.nix
index b57636d..5adc498 100644
--- a/modules/bookwyrm.nix
+++ b/modules/bookwyrm.nix
@@ -11,7 +11,7 @@ in
     settings = mkOption {
       default = {};
       type = types.attrsOf (types.oneOf [ types.bool types.str types.int ]);
-      description = mdDoc ''
+      description = ''
         Settings passed to bookwyrm via environment variables. See bookwyrm's
         [.env.example](https://github.com/bookwyrm-social/bookwyrm/blob/v0.7.2/.env.example)
         file for what is permissible here.
@@ -21,7 +21,7 @@ in
     package = mkOption {
       default = pkgs.bookwyrm.override { inherit (cfg) settings; };
       type = types.package;
-      description = mdDoc ''
+      description = ''
         The bookwyrm package to use. Note that this includes the settings .env file;
         if you set this directly, settings set via {option}`services.bookwyrm.settings`
         will be ignored.
@@ -31,7 +31,7 @@ in
     stateDir = mkOption {
       default = "/var/lib/bookwyrm";
       type = types.path;
-      description = mdDoc ''
+      description = ''
         Where bookwyrm keeps dynamic data (in practice, exclusively book covers?) when
         not configured to use an S3-compatible storage. This should be persistent storage,
         otherwise you will have missing book covers and no obvious way to re-download them
@@ -42,7 +42,7 @@ in
     bindAddress = mkOption {
       default = "0.0.0.0";
       type = types.str;
-      description = mdDoc ''
+      description = ''
         Address bookwyrm should bind to.
       '';
     };
@@ -50,7 +50,7 @@ in
     port = mkOption {
       default = 8000;
       type = types.port;
-      description = mdDoc ''
+      description = ''
         Port bookwyrm should listen on.
       '';
     };
@@ -58,7 +58,7 @@ in
     threads = mkOption {
       default = 8;
       type = types.int;
-      description = mdDoc ''
+      description = ''
         Number of threads that gunicorn should spawn.
       '';
     };
@@ -66,7 +66,7 @@ in
     setupNginx = mkOption {
       default = false;
       type = types.bool;
-      description = mdDoc ''
+      description = ''
         Whether to set up a simple nginx config to server bookwyrm's `static/` and `image`
         directories.
       '';
@@ -75,7 +75,7 @@ in
     nginxVirtualHost = mkOption {
       default = "default";
       type = types.str;
-      description = mdDoc ''
+      description = ''
         The name of the nginx virtual host to set up.
       '';
     };
@@ -83,7 +83,7 @@ in
     installWrapper = mkOption {
       default = true;
       type = types.bool;
-      description = mdDoc ''
+      description = ''
         Whether to install a wrapper script `bookworm-manage.py` into the system environmnt,
         which calls bookwyrm's `manage.py` script with the correct python path.
       '';
@@ -92,7 +92,7 @@ in
     environmentFile = mkOption {
       default = null;
       type = types.nullOr types.path;
-      description = mdDoc ''
+      description = ''
         An environment file containing config options which should not be set via Nix / not
         be contained in the nix store.
       '';
diff --git a/modules/mollysocket.nix b/modules/mollysocket.nix
index 5ca68c9..a318124 100644
--- a/modules/mollysocket.nix
+++ b/modules/mollysocket.nix
@@ -6,6 +6,8 @@ let
   configFile = configFormat.generate "mollysocket-config.toml" cfg.settings;
 in
 {
+  disabledModules = [ "services/misc/mollysocket.nix" ];
+
   options.services.mollysocket = with lib; {
     enable = mkEnableOption
       "mollysocket, which allows getting Signal notifications via UnifiedPush";
@@ -13,7 +15,7 @@ in
     settings = mkOption {
       default = {};
       type = with types; attrsOf (oneOf [ str int bool (listOf str) ]);
-      description = lib.mdDoc ''
+      description = ''
         Configuration options for mollysocket. See the upstream
         [Readme.md](https://github.com/mollyim/mollysocket/blob/main/README.md#configuration)
         file for what is permissable here.
@@ -28,7 +30,7 @@ in
     environmentFile = mkOption {
       default = null;
       type = with types; nullOr path;
-      description = lib.mdDoc ''
+      description = ''
         Configuration options set via environment Variables. Useful for e.g.
         keeping some values outside of Nix.
       '';
@@ -37,7 +39,7 @@ in
     stateDir = mkOption {
       default = "/var/lib/mollysocket";
       type = lib.types.path;
-      description = lib.mdDoc ''
+      description = ''
         Directory in which state is kept, unless a custom database location is
         set using {option}`services.mollysocket.settings.db`. This directory
         will be created automatically.
@@ -47,7 +49,7 @@ in
     installWrapper = mkOption {
       default = true;
       type = lib.types.bool;
-      description = lib.mdDoc ''
+      description = ''
         Whether to install a mollysocket executable wrapped to use the generated
         config into {option}`environment.systemPackages`.
       '';
-- 
cgit v1.2.3