From 663322b3481f7d9f9cec05a1fa455eb799104c4f Mon Sep 17 00:00:00 2001
From: Gabriel Arazas <foodogsquared@foodogsquared.one>
Date: Tue, 3 Dec 2024 11:49:50 +0800
Subject: [PATCH] modules: update to latest nixpkgs conventions

---
 modules/nixos/programs/blender.nix           | 2 +-
 modules/nixos/programs/retroarch.nix         | 4 +---
 modules/nixos/services/vouch-proxy.nix       | 2 +-
 modules/wrapper-manager/programs/blender.nix | 2 +-
 4 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/modules/nixos/programs/blender.nix b/modules/nixos/programs/blender.nix
index da8d658f..16351b54 100644
--- a/modules/nixos/programs/blender.nix
+++ b/modules/nixos/programs/blender.nix
@@ -38,7 +38,7 @@ in
 
     addons = lib.mkOption {
       type = with lib.types; listOf package;
-      description = lib.mdDoc ''
+      description = ''
         List of packages providing Blender system resources at
         {file}`/share/blender` or at {file}`/share/blender/$MAJORMINORVERSION`.
       '';
diff --git a/modules/nixos/programs/retroarch.nix b/modules/nixos/programs/retroarch.nix
index b87c85cb..a8d7992f 100644
--- a/modules/nixos/programs/retroarch.nix
+++ b/modules/nixos/programs/retroarch.nix
@@ -3,7 +3,7 @@
 let
   cfg = config.programs.retroarch;
 
-  finalPkg = cfg.package.override {
+  finalPkg = pkgs.wrapRetroArch {
     inherit (cfg) cores settings;
   };
 in
@@ -11,8 +11,6 @@ in
   options.programs.retroarch = {
     enable = lib.mkEnableOption "configuring Retroarch";
 
-    package = lib.mkPackageOption pkgs "retroarch" { };
-
     cores = lib.mkOption {
       type = with lib.types; listOf package;
       default = [ ];
diff --git a/modules/nixos/services/vouch-proxy.nix b/modules/nixos/services/vouch-proxy.nix
index 78328016..df1d32ca 100644
--- a/modules/nixos/services/vouch-proxy.nix
+++ b/modules/nixos/services/vouch-proxy.nix
@@ -135,7 +135,7 @@ in
 
     instances = lib.mkOption {
       type = with lib.types; attrsOf (submodule instanceType);
-      description = lib.mdDoc "Instances of Vouch proxy to be run.";
+      description = "Instances of Vouch proxy to be run.";
       default = { };
       example = lib.literalExpression ''
         {
diff --git a/modules/wrapper-manager/programs/blender.nix b/modules/wrapper-manager/programs/blender.nix
index 4e9deb6c..d533d75d 100644
--- a/modules/wrapper-manager/programs/blender.nix
+++ b/modules/wrapper-manager/programs/blender.nix
@@ -36,7 +36,7 @@ in
 
     addons = lib.mkOption {
       type = with lib.types; listOf package;
-      description = lib.mdDoc ''
+      description = ''
         List of packages providing Blender system resources at
         {file}`/share/blender` or at {file}`/share/blender/$MAJORMINORVERSION`.
       '';