From e45c20f150c5d129f7c83ff471687adae9e382a6 Mon Sep 17 00:00:00 2001
From: Mark Nipper <nipsy@bitgnome.net>
Date: Wed, 8 Jan 2025 22:28:36 -0800
Subject: Revert master packages to unstable

---
 hosts/common/optional/ebooks.nix        | 2 +-
 hosts/common/optional/services/dhcp.nix | 6 +++---
 hosts/common/optional/services/xorg.nix | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'hosts/common/optional')

diff --git a/hosts/common/optional/ebooks.nix b/hosts/common/optional/ebooks.nix
index b2cbb2b..e25a76d 100644
--- a/hosts/common/optional/ebooks.nix
+++ b/hosts/common/optional/ebooks.nix
@@ -2,7 +2,7 @@
 {
   environment.systemPackages = with pkgs; [
     libgourou
-    master.calibre
+    calibre
   ];
 
   services.udisks2.enable = true;
diff --git a/hosts/common/optional/services/dhcp.nix b/hosts/common/optional/services/dhcp.nix
index cc21ef9..3eed193 100644
--- a/hosts/common/optional/services/dhcp.nix
+++ b/hosts/common/optional/services/dhcp.nix
@@ -9,8 +9,8 @@
 
     systemPackages = with pkgs; [
       ipxe
-      master.tftp-hpa
-      master.wol
+      tftp-hpa
+      wol
     ];
   };
 
@@ -123,7 +123,7 @@
         Restart = "always";
         RestartSec = 5;
         Type = "exec";
-        ExecStart = "${pkgs.master.tftp-hpa}/bin/in.tftpd -l -a 192.168.1.1:69 -P /run/tftpd.pid /etc/tftp";
+        ExecStart = "${pkgs.tftp-hpa}/bin/in.tftpd -l -a 192.168.1.1:69 -P /run/tftpd.pid /etc/tftp";
         TimeoutStopSec = 20;
         PIDFile = "/run/tftpd.pid";
       };
diff --git a/hosts/common/optional/services/xorg.nix b/hosts/common/optional/services/xorg.nix
index c9aaeaa..13d9144 100644
--- a/hosts/common/optional/services/xorg.nix
+++ b/hosts/common/optional/services/xorg.nix
@@ -7,7 +7,7 @@
     feh
     gcr
     geeqie
-    master.ghostty
+    ghostty
     gimp
     #gimp-with-plugins
     google-chrome
@@ -18,7 +18,7 @@
     mesa-demos
     mpv
     polkit_gnome
-    master.rdesktop
+    rdesktop
     read-edid
     st
     sxiv
-- 
cgit v1.2.3