From 852d62bbd71b36865e1397bcc7df92341f02e1e7 Mon Sep 17 00:00:00 2001
From: Jakob Lechner <mail@jalr.de>
Date: Mon, 26 May 2025 15:47:22 +0200
Subject: [PATCH] Use stable package

---
 hosts/aluminium/services/esphome/default.nix | 2 +-
 hosts/magnesium/services/trilium.nix         | 2 +-
 modules/qbittorrent/default.nix              | 2 +-
 pkgs/myintercom-doorbell/module.nix          | 2 +-
 users/jalr/modules/fpv.nix                   | 2 +-
 users/jalr/modules/trilium.nix               | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/hosts/aluminium/services/esphome/default.nix b/hosts/aluminium/services/esphome/default.nix
index 144bb06..14d791a 100644
--- a/hosts/aluminium/services/esphome/default.nix
+++ b/hosts/aluminium/services/esphome/default.nix
@@ -20,7 +20,7 @@ in
     enable = true;
     address = "127.0.0.1";
     port = ports.esphome.tcp;
-    package = pkgs.master.esphome;
+    package = pkgs.esphome;
   };
 
   systemd.services.esphome = {
diff --git a/hosts/magnesium/services/trilium.nix b/hosts/magnesium/services/trilium.nix
index c61c5cf..9b7adbf 100644
--- a/hosts/magnesium/services/trilium.nix
+++ b/hosts/magnesium/services/trilium.nix
@@ -7,7 +7,7 @@ in
 {
   services.trilium-server = {
     enable = true;
-    package = pkgs.master.trilium-next-server;
+    package = pkgs.trilium-next-server;
     host = "127.0.0.1";
     port = ports.trilium.tcp;
     nginx = {
diff --git a/modules/qbittorrent/default.nix b/modules/qbittorrent/default.nix
index 9165d4d..1c20e70 100644
--- a/modules/qbittorrent/default.nix
+++ b/modules/qbittorrent/default.nix
@@ -59,7 +59,7 @@ in
 
         serviceConfig = {
           Restart = "always";
-          ExecStart = "${pkgs.master.qbittorrent-nox}/bin/qbittorrent-nox --profile=${cfg.configDir} --webui-port=${toString cfg.webuiPort}";
+          ExecStart = "${pkgs.qbittorrent-nox}/bin/qbittorrent-nox --profile=${cfg.configDir} --webui-port=${toString cfg.webuiPort}";
           User = "qbittorrent";
           Group = "qbittorrent";
 
diff --git a/pkgs/myintercom-doorbell/module.nix b/pkgs/myintercom-doorbell/module.nix
index 3dfefde..cddb862 100644
--- a/pkgs/myintercom-doorbell/module.nix
+++ b/pkgs/myintercom-doorbell/module.nix
@@ -141,7 +141,7 @@ in
         wantedBy = [ "multi-user.target" ];
         description = "Proxies the videostream of myintercom doorbell.";
         script = ''
-          sed "s:__PASSWORD__:$(cat "$PASSWORD_FILE"):" "${mediamtxConfig}" | ${pkgs.master.mediamtx}/bin/mediamtx /dev/stdin
+          sed "s:__PASSWORD__:$(cat "$PASSWORD_FILE"):" "${mediamtxConfig}" | ${pkgs.mediamtx}/bin/mediamtx /dev/stdin
         '';
         serviceConfig = {
           Type = "simple";
diff --git a/users/jalr/modules/fpv.nix b/users/jalr/modules/fpv.nix
index 9cc7d27..b51fb63 100644
--- a/users/jalr/modules/fpv.nix
+++ b/users/jalr/modules/fpv.nix
@@ -2,7 +2,7 @@
 
 lib.mkIf nixosConfig.jalr.gui.enable {
   home.packages = with pkgs; [
-    master.betaflight-configurator
+    betaflight-configurator
     fpvout
   ];
 }
diff --git a/users/jalr/modules/trilium.nix b/users/jalr/modules/trilium.nix
index b219820..91b6dfe 100644
--- a/users/jalr/modules/trilium.nix
+++ b/users/jalr/modules/trilium.nix
@@ -1,6 +1,6 @@
 { nixosConfig, lib, pkgs, ... }:
 lib.mkIf nixosConfig.jalr.gui.enable {
-  home.packages = with pkgs.master; [
+  home.packages = with pkgs; [
     trilium-next-desktop
   ];
 }