From 27aa640418e12627a48202a4e7c5ed5d29ad2068 Mon Sep 17 00:00:00 2001 From: Danilo Reyes Date: Sat, 24 May 2025 14:32:49 -0600 Subject: [PATCH] properly overlayed qbittorrent-api --- flake.lock | 17 +++++++++++++++++ modules/servers/qbittorrent.nix | 7 ++++++- overlay.nix | 2 -- 3 files changed, 23 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 4c6599c..e2a0b55 100644 --- a/flake.lock +++ b/flake.lock @@ -939,6 +939,22 @@ "type": "github" } }, + "nixpkgs-unstable": { + "locked": { + "lastModified": 1748026106, + "narHash": "sha256-6m1Y3/4pVw1RWTsrkAK2VMYSzG4MMIj7sqUy7o8th1o=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "063f43f2dbdef86376cc29ad646c45c46e93234c", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs_2": { "locked": { "lastModified": 1747953325, @@ -1057,6 +1073,7 @@ "nix-gaming": "nix-gaming", "nixpkgs": "nixpkgs_2", "nixpkgs-small": "nixpkgs-small", + "nixpkgs-unstable": "nixpkgs-unstable", "nixtendo-switch": "nixtendo-switch", "nur": "nur", "sops-nix": "sops-nix", diff --git a/modules/servers/qbittorrent.nix b/modules/servers/qbittorrent.nix index a97dd2a..931aad0 100644 --- a/modules/servers/qbittorrent.nix +++ b/modules/servers/qbittorrent.nix @@ -2,9 +2,14 @@ lib, config, pkgs, + inputs, ... }: let + pkgsU = import inputs.nixpkgs-unstable { + system = "x86_64-linux"; + config.allowUnfree = true; + }; qbit_manage_env = pkgs.python3.withPackages ( ps: builtins.attrValues { @@ -13,13 +18,13 @@ let gitpython humanize pytimeparse2 - qbittorrent-api requests retrying ruamel-yaml schedule bencode-py ; + inherit (pkgsU.python3Packages) qbittorrent-api; } ); in diff --git a/overlay.nix b/overlay.nix index da9b88e..019e57e 100644 --- a/overlay.nix +++ b/overlay.nix @@ -5,7 +5,6 @@ }: let pkgs = mkpkgs inputs.nixpkgs; - pkgsU = mkpkgs inputs.nixpkgs-unstable; in _final: prev: { nautilus = prev.nautilus.overrideAttrs (old: { @@ -51,5 +50,4 @@ _final: prev: { withVencord = true; withOpenASAR = true; }; - inherit (pkgsU.python3.withPackages) qbittorrent-api; }