From 771c32b52cf5d4972e800411e69bbd2dd5bc45c5 Mon Sep 17 00:00:00 2001
From: Pim Kunis <pim@kunis.nl>
Date: Sat, 11 Jan 2025 22:55:42 +0100
Subject: [PATCH] Use nixpkgs master branch for Bazarr and Radicale

---
 flake.lock                       | 34 --------------------------------
 flake.nix                        |  2 --
 nixng-configurations/default.nix | 11 ++---------
 3 files changed, 2 insertions(+), 45 deletions(-)

diff --git a/flake.lock b/flake.lock
index b391b3d..fae83b0 100644
--- a/flake.lock
+++ b/flake.lock
@@ -770,22 +770,6 @@
         "type": "github"
       }
     },
-    "nixpkgs-bazarr": {
-      "locked": {
-        "lastModified": 1735934023,
-        "narHash": "sha256-i28ekcGQ5UIngZUGlFdLe7/7ppC4lHu3roTuwfEnvnQ=",
-        "owner": "r-ryantm",
-        "repo": "nixpkgs",
-        "rev": "65ac365bbea82b7d4529b9f89fd9e61b67df43ae",
-        "type": "github"
-      },
-      "original": {
-        "owner": "r-ryantm",
-        "ref": "auto-update/bazarr",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "nixpkgs-master": {
       "locked": {
         "lastModified": 1735986103,
@@ -802,22 +786,6 @@
         "type": "github"
       }
     },
-    "nixpkgs-radicale": {
-      "locked": {
-        "lastModified": 1735496163,
-        "narHash": "sha256-oqUP98g0eqfzCDA/i88qRIBq4BIyxEk9um7dfNGiw+I=",
-        "owner": "erictapen",
-        "repo": "nixpkgs",
-        "rev": "e14050d0c94dc929543f7e4502fda8539d36536f",
-        "type": "github"
-      },
-      "original": {
-        "owner": "erictapen",
-        "ref": "radicale",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "nixpkgs-stable": {
       "locked": {
         "lastModified": 1720386169,
@@ -983,9 +951,7 @@
         "nixhelm": "nixhelm",
         "nixng": "nixng",
         "nixpkgs": "nixpkgs_3",
-        "nixpkgs-bazarr": "nixpkgs-bazarr",
         "nixpkgs-master": "nixpkgs-master",
-        "nixpkgs-radicale": "nixpkgs-radicale",
         "servers": "servers",
         "treefmt-nix": "treefmt-nix_4"
       }
diff --git a/flake.nix b/flake.nix
index ef37fa5..0a2c12d 100644
--- a/flake.nix
+++ b/flake.nix
@@ -7,8 +7,6 @@
     flake-utils.url = "github:numtide/flake-utils";
     treefmt-nix.url = "github:numtide/treefmt-nix";
     blog.url = "git+https://git.kun.is/pim/blog";
-    nixpkgs-bazarr.url = "github:r-ryantm/nixpkgs?ref=auto-update/bazarr";
-    nixpkgs-radicale.url = "github:erictapen/nixpkgs?ref=radicale";
 
     git-hooks = {
       url = "github:cachix/git-hooks.nix";
diff --git a/nixng-configurations/default.nix b/nixng-configurations/default.nix
index 9fa19e8..5fd8979 100644
--- a/nixng-configurations/default.nix
+++ b/nixng-configurations/default.nix
@@ -5,8 +5,6 @@
   nginx,
   blog,
   nixpkgs,
-  nixpkgs-bazarr,
-  nixpkgs-radicale,
   nixpkgs-master,
   ...
 }:
@@ -47,14 +45,9 @@ in {
         self.nixngModules.deluge
         {
           nixpkgs.overlays = [
-            (final: _prev: {
+            (_final: _prev: {
               # From master branch
-              prowlarr = nixpkgs-master.legacyPackages.${system}.prowlarr;
-              jellyseerr = nixpkgs-master.legacyPackages.${system}.jellyseerr;
-
-              # From forks
-              bazarr = nixpkgs-bazarr.legacyPackages.${system}.bazarr;
-              radicale = nixpkgs-radicale.legacyPackages.${system}.radicale;
+              inherit (nixpkgs-master.legacyPackages.${system}) prowlarr jellyseerr radicale bazarr;
             })
           ];
         }