diff --git a/flake.lock b/flake.lock index 6b25bbc..bba6cc1 100644 --- a/flake.lock +++ b/flake.lock @@ -89,22 +89,6 @@ "type": "indirect" } }, - "nixpkgs-4a3fc4cf7": { - "locked": { - "lastModified": 1716914467, - "narHash": "sha256-KkT6YM/yNQqirtYj/frn6RRakliB8RDvGqVGGaNhdcU=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "4a3fc4cf736b7d2d288d7a8bf775ac8d4c0920b4", - "type": "github" - }, - "original": { - "owner": "nixos", - "repo": "nixpkgs", - "rev": "4a3fc4cf736b7d2d288d7a8bf775ac8d4c0920b4", - "type": "github" - } - }, "nixpkgs-unstable": { "locked": { "lastModified": 1728888510, @@ -125,7 +109,6 @@ "dogetipbot-telegram": "dogetipbot-telegram", "ipmihddtemp": "ipmihddtemp", "nixpkgs": "nixpkgs", - "nixpkgs-4a3fc4cf7": "nixpkgs-4a3fc4cf7", "nixpkgs-unstable": "nixpkgs-unstable", "simple-nixos-mailserver": "simple-nixos-mailserver" } diff --git a/flake.nix b/flake.nix index 202075b..2a5a3c3 100644 --- a/flake.nix +++ b/flake.nix @@ -2,8 +2,6 @@ inputs = { nixpkgs.url = "flake:nixpkgs/nixos-24.05"; nixpkgs-unstable.url = "flake:nixpkgs/nixos-unstable"; - # transmission 4.0.5 downgrade to fix tracker bug - nixpkgs-4a3fc4cf7.url = "github:nixos/nixpkgs/4a3fc4cf736b7d2d288d7a8bf775ac8d4c0920b4"; simple-nixos-mailserver = { url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-24.05"; inputs = { @@ -21,7 +19,7 @@ }; }; - outputs = { self, nixpkgs, nixpkgs-unstable, nixpkgs-4a3fc4cf7, simple-nixos-mailserver, dogetipbot-telegram, ipmihddtemp }: { + outputs = { self, nixpkgs, nixpkgs-unstable, simple-nixos-mailserver, dogetipbot-telegram, ipmihddtemp }: { packages.x86_64-linux = (import ./pkgs nixpkgs.legacyPackages.x86_64-linux); @@ -45,16 +43,9 @@ ]; }; - nixosConfigurations.loutreos = nixpkgs.lib.nixosSystem rec { + nixosConfigurations.loutreos = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; - specialArgs = { - pkgs-unstable = import nixpkgs-unstable { - inherit system; - }; - pkgs-4a3fc4cf7 = import nixpkgs-4a3fc4cf7 { - inherit system; - }; - }; + specialArgs = { inherit nixpkgs-unstable; }; modules = [ nixpkgs-unstable.nixosModules.notDetected simple-nixos-mailserver.nixosModule diff --git a/overlays/transmission.nix b/overlays/transmission.nix new file mode 100644 index 0000000..3294870 --- /dev/null +++ b/overlays/transmission.nix @@ -0,0 +1,8 @@ +self: super: +{ + transmission = (super.transmission.overrideAttrs (oA: { + patches = []; + })).override { + openssl = super.openssl_legacy; + }; +} \ No newline at end of file diff --git a/systems/LoutreOS/configuration.nix b/systems/LoutreOS/configuration.nix index 3c1d316..f4edc52 100644 --- a/systems/LoutreOS/configuration.nix +++ b/systems/LoutreOS/configuration.nix @@ -214,6 +214,10 @@ "40-enp0s21u1".dhcpV4Config.RouteMetric = 1024; }; + nixpkgs.overlays = [ + (import ../../overlays/transmission.nix) + ]; + services.openssh = { enable = true; settings = { diff --git a/systems/LoutreOS/medias.nix b/systems/LoutreOS/medias.nix index e0c9566..080d54a 100644 --- a/systems/LoutreOS/medias.nix +++ b/systems/LoutreOS/medias.nix @@ -1,10 +1,10 @@ -{ config, lib, pkgs, pkgs-unstable, pkgs-4a3fc4cf7, ... }: +{ config, lib, pkgs, nixpkgs-unstable, ... }: { services = { transmission = { enable = true; - package = pkgs-4a3fc4cf7.transmission_4; + package = nixpkgs-unstable.legacyPackages.x86_64-linux.transmission_4; home = "/var/lib/transmission"; group = "medias"; settings = { @@ -20,17 +20,17 @@ radarr = { enable = true; - package = pkgs-unstable.radarr; + package = nixpkgs-unstable.legacyPackages.x86_64-linux.radarr; }; sonarr = { enable = true; - package = pkgs-unstable.sonarr; + package = nixpkgs-unstable.legacyPackages.x86_64-linux.sonarr; }; prowlarr.enable = true; jellyfin = { enable = true; - package = pkgs-unstable.jellyfin; + package = nixpkgs-unstable.legacyPackages.x86_64-linux.jellyfin; }; navidrome = {