diff options
| author | stuebinm | 2024-06-04 21:14:49 +0200 | 
|---|---|---|
| committer | stuebinm | 2024-06-04 21:14:49 +0200 | 
| commit | d27e67743931d352e5857b605d44657668fa9013 (patch) | |
| tree | bad8f97e5f47e791f7f6a3e0b94ef45b5ff0e131 /modules/mollysocket.nix | |
| parent | 9bf026e55b72af7aa14096440537fefddc56c212 (diff) | |
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)
Diffstat (limited to '')
| -rw-r--r-- | modules/mollysocket.nix | 10 | 
1 files changed, 6 insertions, 4 deletions
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`.        '';  | 
