Add master to pkgs and switch to master for jellyfin

3 files changed, 16 insertions, 2 deletions

diff --git a/flake.nix b/flake.nix
index 7f94a22..9920c96 100644
--- a/flake.nix
+++ b/flake.nix
@@ -20,6 +20,8 @@
 
     nixos-hardware.url = "github:nixos/nixos-hardware";
 
+    # per https://nixos-and-flakes.thiscute.world/nixos-with-flakes/downgrade-or-upgrade-packages
+    nixpkgs-master.url = "github:nixos/nixpkgs";
     nixpkgs-stable.url = "github:nixos/nixpkgs/release-24.05";
     nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
 
@@ -35,7 +37,7 @@
 
   };
 
-  outputs = { home-manager-stable, home-manager, nixos-hardware, nixpkgs-stable, nixpkgs, nvidia-patch, self, sops-nix, ... } @ inputs: let
+  outputs = { home-manager-stable, home-manager, nixos-hardware, nixpkgs-master, nixpkgs-stable, nixpkgs, nvidia-patch, self, sops-nix, ... } @ inputs: let
     inherit (self) outputs;
     systems = [
       #"aarch64-linux"
diff --git a/hosts/arrakis/services.nix b/hosts/arrakis/services.nix
index b295116..67db914 100644
--- a/hosts/arrakis/services.nix
+++ b/hosts/arrakis/services.nix
@@ -62,7 +62,10 @@
 
     iperf3.openFirewall = true;
 
-    jellyfin.enable = true;
+    jellyfin = {
+      enable = true;
+      package = pkgs.master.jellyfin;
+    };
 
     nfs = {
       server = {
diff --git a/overlays/default.nix b/overlays/default.nix
index c39804a..6770529 100644
--- a/overlays/default.nix
+++ b/overlays/default.nix
@@ -12,6 +12,15 @@
     # });
   };
 
+  # When applied, the master nixpkgs set (declared in the flake inputs) will
+  # be accessible through 'pkgs.master'
+  master-packages = final: _prev: {
+    master = import inputs.nixpkgs-master {
+      system = final.system;
+      config.allowUnfree = true;
+    };
+  };
+
   # When applied, the stable nixpkgs set (declared in the flake inputs) will
   # be accessible through 'pkgs.stable'
   stable-packages = final: _prev: {