From 01063d6c057987d1256624c34c6d5a5f5fca2786 Mon Sep 17 00:00:00 2001 From: rasmus-kirk Date: Mon, 17 Mar 2025 21:15:01 +0100 Subject: [PATCH] Removed sonarr-nixpkgs input, not necessary anymore --- flake.lock | 17 ----------------- flake.nix | 9 +-------- nixarr/sonarr/default.nix | 3 +-- 3 files changed, 2 insertions(+), 27 deletions(-) diff --git a/flake.lock b/flake.lock index d7e108a..aa93096 100644 --- a/flake.lock +++ b/flake.lock @@ -16,26 +16,9 @@ "type": "github" } }, - "nixpkgs-sonarr": { - "locked": { - "lastModified": 1732219096, - "narHash": "sha256-gbvtOPW7K7v4EFo7Feo5s+SI7FMVrCOA5CgnuMhWO/Y=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "328abff1f7a707dc8da8e802f724f025521793ea", - "type": "github" - }, - "original": { - "owner": "nixos", - "repo": "nixpkgs", - "rev": "328abff1f7a707dc8da8e802f724f025521793ea", - "type": "github" - } - }, "root": { "inputs": { "nixpkgs": "nixpkgs", - "nixpkgs-sonarr": "nixpkgs-sonarr", "vpnconfinement": "vpnconfinement", "website-builder": "website-builder" } diff --git a/flake.nix b/flake.nix index 242df3d..6018ee5 100644 --- a/flake.nix +++ b/flake.nix @@ -3,7 +3,6 @@ inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable"; - nixpkgs-sonarr.url = "github:nixos/nixpkgs/328abff1f7a707dc8da8e802f724f025521793ea"; vpnconfinement.url = "github:Maroka-chan/VPN-Confinement"; @@ -13,7 +12,6 @@ outputs = { nixpkgs, - nixpkgs-sonarr, vpnconfinement, website-builder, self, @@ -34,12 +32,7 @@ pkgs = import nixpkgs {inherit system;}; }); in { - nixosModules = { - default = { - imports = [./nixarr vpnconfinement.nixosModules.default]; - config._module.args = {inherit nixpkgs-sonarr;}; - }; - }; + nixosModules.default.imports = [./nixarr vpnconfinement.nixosModules.default]; devShells = forAllSystems ({pkgs}: { default = pkgs.mkShell { diff --git a/nixarr/sonarr/default.nix b/nixarr/sonarr/default.nix index 76802a5..269ddfa 100644 --- a/nixarr/sonarr/default.nix +++ b/nixarr/sonarr/default.nix @@ -2,7 +2,6 @@ config, lib, pkgs, - nixpkgs-sonarr, ... }: with lib; let @@ -22,7 +21,7 @@ in { ''; }; - package = mkPackageOption nixpkgs-sonarr.legacyPackages."${pkgs.system}".pkgs "sonarr" {}; + package = mkPackageOption pkgs "sonarr" {}; stateDir = mkOption { type = types.path;