From 032fc5650376ee8f29309210d27a9959acf965cc Mon Sep 17 00:00:00 2001 From: nyanloutre Date: Sun, 20 Oct 2024 11:20:01 +0200 Subject: [PATCH] LoutreOS: downgrade transmission to 4.0.5 --- flake.lock | 17 +++++++++++++++++ flake.nix | 15 ++++++++++++--- overlays/transmission.nix | 8 -------- systems/LoutreOS/configuration.nix | 4 ---- systems/LoutreOS/medias.nix | 10 +++++----- 5 files changed, 34 insertions(+), 20 deletions(-) delete mode 100644 overlays/transmission.nix diff --git a/flake.lock b/flake.lock index 256ab04..8cb66c6 100644 --- a/flake.lock +++ b/flake.lock @@ -89,6 +89,22 @@ "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": 1727802920, @@ -109,6 +125,7 @@ "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 2a5a3c3..202075b 100644 --- a/flake.nix +++ b/flake.nix @@ -2,6 +2,8 @@ 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 = { @@ -19,7 +21,7 @@ }; }; - outputs = { self, nixpkgs, nixpkgs-unstable, simple-nixos-mailserver, dogetipbot-telegram, ipmihddtemp }: { + outputs = { self, nixpkgs, nixpkgs-unstable, nixpkgs-4a3fc4cf7, simple-nixos-mailserver, dogetipbot-telegram, ipmihddtemp }: { packages.x86_64-linux = (import ./pkgs nixpkgs.legacyPackages.x86_64-linux); @@ -43,9 +45,16 @@ ]; }; - nixosConfigurations.loutreos = nixpkgs.lib.nixosSystem { + nixosConfigurations.loutreos = nixpkgs.lib.nixosSystem rec { system = "x86_64-linux"; - specialArgs = { inherit nixpkgs-unstable; }; + specialArgs = { + pkgs-unstable = import nixpkgs-unstable { + inherit system; + }; + pkgs-4a3fc4cf7 = import nixpkgs-4a3fc4cf7 { + inherit system; + }; + }; modules = [ nixpkgs-unstable.nixosModules.notDetected simple-nixos-mailserver.nixosModule diff --git a/overlays/transmission.nix b/overlays/transmission.nix deleted file mode 100644 index 3294870..0000000 --- a/overlays/transmission.nix +++ /dev/null @@ -1,8 +0,0 @@ -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 f4edc52..3c1d316 100644 --- a/systems/LoutreOS/configuration.nix +++ b/systems/LoutreOS/configuration.nix @@ -214,10 +214,6 @@ "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 080d54a..e0c9566 100644 --- a/systems/LoutreOS/medias.nix +++ b/systems/LoutreOS/medias.nix @@ -1,10 +1,10 @@ -{ config, lib, pkgs, nixpkgs-unstable, ... }: +{ config, lib, pkgs, pkgs-unstable, pkgs-4a3fc4cf7, ... }: { services = { transmission = { enable = true; - package = nixpkgs-unstable.legacyPackages.x86_64-linux.transmission_4; + package = pkgs-4a3fc4cf7.transmission_4; home = "/var/lib/transmission"; group = "medias"; settings = { @@ -20,17 +20,17 @@ radarr = { enable = true; - package = nixpkgs-unstable.legacyPackages.x86_64-linux.radarr; + package = pkgs-unstable.radarr; }; sonarr = { enable = true; - package = nixpkgs-unstable.legacyPackages.x86_64-linux.sonarr; + package = pkgs-unstable.sonarr; }; prowlarr.enable = true; jellyfin = { enable = true; - package = nixpkgs-unstable.legacyPackages.x86_64-linux.jellyfin; + package = pkgs-unstable.jellyfin; }; navidrome = {