From f1f0249dd222b915e6efa65042f92a6ec41f5056 Mon Sep 17 00:00:00 2001
From: Mark Nipper <nipsy@bitgnome.net>
Date: Tue, 17 Feb 2026 23:30:03 -0800
Subject: Bump yabridge to fixed version in master

---
 flake.nix                       | 20 ++++++++++----------
 hosts/caladan/default.nix       |  2 +-
 hosts/common/optional/sound.nix |  4 ++--
 overlays/default.nix            | 12 ++++++------
 4 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/flake.nix b/flake.nix
index c3b8b5f..021fb21 100644
--- a/flake.nix
+++ b/flake.nix
@@ -31,7 +31,7 @@
 
     # per https://nixos-and-flakes.thiscute.world/nixos-with-flakes/downgrade-or-upgrade-packages
     #nixpkgs-67e692392.url = "github:nixos/nixpkgs/67e69239226f37168d1adb8d29bd61150756a03e";
-    nixpkgs-pr490633.url = "github:M0streng0/nixpkgs/yabridge-disable-bitbridge";
+    #nixpkgs-pr490633.url = "github:M0streng0/nixpkgs/yabridge-disable-bitbridge";
     #nixpkgs-wine9_22.url = "github:nixos/nixpkgs/dea5930f0ed8c29d3758d5ade9898b4e99d80b74";
 
     nvidia-patch = {
@@ -52,7 +52,7 @@
     home-manager,
     nixos-hardware,
     nixpkgs-master,
-    nixpkgs-pr490633,
+    #nixpkgs-pr490633,
     nixpkgs-stable,
     #nixpkgs-wine9_22,
     nixpkgs,
@@ -96,14 +96,14 @@
       caladan = nixpkgs.lib.nixosSystem {
         specialArgs = { inherit inputs outputs; };
         modules = [
-          ({ config, pkgs, ... }:
-            let
-              overlay-yabridge-pr490633 = final: prev: {
-                yabridge = nixpkgs-pr490633.legacyPackages."x86_64-linux".yabridge;
-              };
-            in {
-              nixpkgs.overlays = [ overlay-yabridge-pr490633 ];
-          })
+          #({ config, pkgs, ... }:
+          #  let
+          #    overlay-yabridge-pr490633 = final: prev: {
+          #      yabridge = nixpkgs-pr490633.legacyPackages."x86_64-linux".yabridge;
+          #    };
+          #  in {
+          #    nixpkgs.overlays = [ overlay-yabridge-pr490633 ];
+          #})
           disko.nixosModules.disko
           ./hosts/caladan
           home-manager.nixosModules.home-manager {
diff --git a/hosts/caladan/default.nix b/hosts/caladan/default.nix
index f836a70..b48678f 100644
--- a/hosts/caladan/default.nix
+++ b/hosts/caladan/default.nix
@@ -139,7 +139,7 @@
       outputs.overlays.additions
       outputs.overlays.modifications
       outputs.overlays.master-packages
-      outputs.overlays.pr490633-packages
+      #outputs.overlays.pr490633-packages
       outputs.overlays.stable-packages
       #outputs.overlays.wine9_22-packages
     ];
diff --git a/hosts/common/optional/sound.nix b/hosts/common/optional/sound.nix
index e7410fc..2eb8642 100644
--- a/hosts/common/optional/sound.nix
+++ b/hosts/common/optional/sound.nix
@@ -41,8 +41,8 @@
       pkgs.wavpack
       pkgs.winetricks
       pkgs.wineWow64Packages.stagingFull
-      pkgs.yabridge
-      pkgs.yabridgectl
+      pkgs.master.yabridge
+      pkgs.master.yabridgectl
       pkgs.yoshimi
       pkgs.zam-plugins
       pkgs.zynaddsubfx
diff --git a/overlays/default.nix b/overlays/default.nix
index e620799..e3d0862 100644
--- a/overlays/default.nix
+++ b/overlays/default.nix
@@ -83,12 +83,12 @@
     };
   };
 
-  pr490633-packages = final: _prev: {
-    pr490633 = import inputs.nixpkgs-pr490633 {
-      inherit (final) system;
-      config.allowUnfree = true;
-    };
-  };
+  #pr490633-packages = final: _prev: {
+  #  pr490633 = import inputs.nixpkgs-pr490633 {
+  #    inherit (final) system;
+  #    config.allowUnfree = true;
+  #  };
+  #};
 
   # When applied, the stable nixpkgs set (declared in the flake inputs) will
   # be accessible through 'pkgs.stable'
-- 
cgit v1.2.3