From 4503a8f541ccfa9c0f6d4a5eb1d2297858527f46 Mon Sep 17 00:00:00 2001 From: Pim Kunis Date: Fri, 3 Jan 2025 21:35:28 +0100 Subject: [PATCH] Use Prowlarr from nixpkgs master branch --- flake.lock | 17 +++++++++++++++++ flake.nix | 1 + nixng-configurations/default.nix | 5 +++++ 3 files changed, 23 insertions(+) diff --git a/flake.lock b/flake.lock index e6e8498..7dbc1cd 100644 --- a/flake.lock +++ b/flake.lock @@ -803,6 +803,22 @@ "type": "github" } }, + "nixpkgs-master": { + "locked": { + "lastModified": 1735935963, + "narHash": "sha256-i6xTJb3sb4BeWypD/DjAmslDzGXZUGU1OFJliaKFuuc=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "20166d17f391d2e11311baaa74344381fa44e4a0", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "master", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs-radicale": { "locked": { "lastModified": 1735496163, @@ -1002,6 +1018,7 @@ "nixpkgs": "nixpkgs_3", "nixpkgs-bazarr": "nixpkgs-bazarr", "nixpkgs-jellyseerr": "nixpkgs-jellyseerr", + "nixpkgs-master": "nixpkgs-master", "nixpkgs-radicale": "nixpkgs-radicale", "servers": "servers", "treefmt-nix": "treefmt-nix_4" diff --git a/flake.nix b/flake.nix index 37db31c..c875d9f 100644 --- a/flake.nix +++ b/flake.nix @@ -3,6 +3,7 @@ inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; + nixpkgs-master.url = "github:nixos/nixpkgs/master"; flake-utils.url = "github:numtide/flake-utils"; treefmt-nix.url = "github:numtide/treefmt-nix"; blog.url = "git+https://git.kun.is/pim/blog"; diff --git a/nixng-configurations/default.nix b/nixng-configurations/default.nix index a40ccfe..cd02779 100644 --- a/nixng-configurations/default.nix +++ b/nixng-configurations/default.nix @@ -8,6 +8,7 @@ nixpkgs-jellyseerr, nixpkgs-bazarr, nixpkgs-radicale, + nixpkgs-master, ... }: flake-utils.lib.eachDefaultSystem (system: let @@ -39,6 +40,10 @@ in { { nixpkgs.overlays = [ (final: _prev: { + # From master branch + prowlarr = nixpkgs-master.legacyPackages.${system}.prowlarr; + + # From forks bazarr = nixpkgs-bazarr.legacyPackages.${system}.bazarr; jellyseerr = nixpkgs-jellyseerr.legacyPackages.${system}.jellyseerr; radicale = nixpkgs-radicale.legacyPackages.${system}.radicale;