diff --git a/flake.lock b/flake.lock index 21bdf72..ab6eadc 100644 --- a/flake.lock +++ b/flake.lock @@ -6,11 +6,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1735508994, - "narHash": "sha256-SMMX3irZ4Y+0QEAq0mOYEnJIYRe3YnXHrkCSRvdxHxU=", + "lastModified": 1736683360, + "narHash": "sha256-Zz9aEPm5TCtoNt+FoWQaEjngEh8uXDpCH+N2DDpW4Tk=", "ref": "refs/heads/master", - "rev": "433c1ef4b5874e2c4782be7322604d17182035ab", - "revCount": 23, + "rev": "95b66d8c45b1fda87e63938fbdc0e31d5035f204", + "revCount": 24, "type": "git", "url": "https://git.kun.is/pim/blog" }, @@ -559,11 +559,11 @@ "nginx": { "flake": false, "locked": { - "lastModified": 1735301654, - "narHash": "sha256-PHcSyHYyPUwPAls0BgtnGu2e936vhxW2nt7bQxDyGAQ=", + "lastModified": 1736428764, + "narHash": "sha256-poKKXq1S4xjC9phulyZE34t8tdaaqwJ7IbmeyjUpsDU=", "owner": "nginx", "repo": "nginx", - "rev": "e3a9b6ad08a86e799a3d77da3f2fc507d3c9699e", + "rev": "57d54fd922e7ecbebb78598d13adc9df1a4b69c0", "type": "github" }, "original": { @@ -666,11 +666,11 @@ "poetry2nix": "poetry2nix" }, "locked": { - "lastModified": 1735953485, - "narHash": "sha256-t0DNGHwMAI6xqDpf3ba+VfHkpI7QHBB3uY/euSVCOdc=", + "lastModified": 1736990287, + "narHash": "sha256-f5DfFkMglyrCozBW/dU6WeZfHOueUm8Q1rv4r5yDOeE=", "owner": "farcaller", "repo": "nixhelm", - "rev": "1db94e2f5a8084b8cbaa12d64701ac432188e1cb", + "rev": "09b4f8373f142206456f9c15a3b638e3ce4feeb0", "type": "github" }, "original": { @@ -772,11 +772,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1735986103, - "narHash": "sha256-9de+/q2M04zItuD47uIfA7kPY/R2bgkPDM/G2HQ2UwQ=", + "lastModified": 1737014460, + "narHash": "sha256-u45ycukf/qnwb3EsOHf5KuO7GPxR1noxgkiL5Fra2V4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "fd152bc101e2a4498a06365c0c0ab031800dc030", + "rev": "d6a640c0d7d42202fdabc93bbfc01430af249e0c", "type": "github" }, "original": { @@ -786,22 +786,6 @@ "type": "github" } }, - "nixpkgs-prowlarr": { - "locked": { - "lastModified": 1736414454, - "narHash": "sha256-nhzwiWZeUdCqx4bYfBwtJcwBvWhRt1f1vTJGb3fMnrY=", - "owner": "r-ryantm", - "repo": "nixpkgs", - "rev": "b70e60ed75d38ddaab1fabdd1bb99a8d8ff55a63", - "type": "github" - }, - "original": { - "owner": "r-ryantm", - "ref": "auto-update/prowlarr", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs-stable": { "locked": { "lastModified": 1720386169, @@ -868,11 +852,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1735834308, - "narHash": "sha256-dklw3AXr3OGO4/XT1Tu3Xz9n/we8GctZZ75ZWVqAVhk=", + "lastModified": 1736883708, + "narHash": "sha256-uQ+NQ0/xYU0N1CnXsa2zghgNaOPxWpMJXSUJJ9W7140=", "owner": "nixos", "repo": "nixpkgs", - "rev": "6df24922a1400241dae323af55f30e4318a6ca65", + "rev": "eb62e6aa39ea67e0b8018ba8ea077efe65807dc8", "type": "github" }, "original": { @@ -968,7 +952,6 @@ "nixng": "nixng", "nixpkgs": "nixpkgs_3", "nixpkgs-master": "nixpkgs-master", - "nixpkgs-prowlarr": "nixpkgs-prowlarr", "servers": "servers", "treefmt-nix": "treefmt-nix_4" } @@ -1244,11 +1227,11 @@ "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1735905407, - "narHash": "sha256-1hKMRIT+QZNWX46e4gIovoQ7H8QRb7803ZH4qSKI45o=", + "lastModified": 1736154270, + "narHash": "sha256-p2r8xhQZ3TYIEKBoiEhllKWQqWNJNoT9v64Vmg4q8Zw=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "29806abab803e498df96d82dd6f34b32eb8dd2c8", + "rev": "13c913f5deb3a5c08bb810efd89dc8cb24dd968b", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 8fdfcb5..0a2c12d 100644 --- a/flake.nix +++ b/flake.nix @@ -7,7 +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-prowlarr.url = "github:r-ryantm/nixpkgs?ref=auto-update/prowlarr"; git-hooks = { url = "github:cachix/git-hooks.nix"; diff --git a/nixng-configurations/default.nix b/nixng-configurations/default.nix index e0f119d..5a9c943 100644 --- a/nixng-configurations/default.nix +++ b/nixng-configurations/default.nix @@ -6,7 +6,6 @@ blog, nixpkgs, nixpkgs-master, - nixpkgs-prowlarr, ... }: flake-utils.lib.eachDefaultSystem (system: let @@ -48,9 +47,7 @@ in { nixpkgs.overlays = [ (_final: _prev: { # From master branch - inherit (nixpkgs-master.legacyPackages.${system}) jellyseerr radicale bazarr; - # Other branches - inherit (nixpkgs-prowlarr.legacyPackages.${system}) prowlarr; + inherit (nixpkgs-master.legacyPackages.${system}) jellyseerr radicale bazarr prowlarr; }) ]; }