From 9b950e5cc6268c05372ab585b43c08bc8bc10c42 Mon Sep 17 00:00:00 2001 From: oqyude Date: Tue, 5 Aug 2025 14:03:16 +0300 Subject: [PATCH] 123 --- modules/software/beets/default.nix | 3 +- modules/software/beets/other/default.nix | 43 +++++++++++++----------- 2 files changed, 25 insertions(+), 21 deletions(-) diff --git a/modules/software/beets/default.nix b/modules/software/beets/default.nix index 4a170cc..a9cfdc6 100755 --- a/modules/software/beets/default.nix +++ b/modules/software/beets/default.nix @@ -6,7 +6,8 @@ ... }: let - depsOverlay = import ./dependencies.nix { # ./dependencies-full.nix if broken + depsOverlay = import ./dependencies.nix { + # ./dependencies-full.nix if broken inherit (pkgs) fetchurl fetchgit fetchhg; inherit pkgs; }; diff --git a/modules/software/beets/other/default.nix b/modules/software/beets/other/default.nix index 1df0bb9..e427c06 100644 --- a/modules/software/beets/other/default.nix +++ b/modules/software/beets/other/default.nix @@ -6,32 +6,35 @@ ... }: let - depsOverlay = import ./dependencies.nix { # ./dependencies-full.nix if broken + depsOverlay = import ./dependencies.nix { + # ./dependencies-full.nix if broken inherit (pkgs) fetchurl fetchgit fetchhg; inherit pkgs; }; python3 = pkgs.python3.override { packageOverrides = depsOverlay; }; - beetsEnv = python3.withPackages (ps: with pkgs.python313Packages; [ - #pkgs.beets # Из nixpkgs (проверь версию!) или оверлея - beautifulsoup4 # Из nixpkgs - certifi # Из nixpkgs - requests # Из nixpkgs - pyyaml # Из nixpkgs - unidecode # Из nixpkgs - pylast # Из nixpkgs - jellyfish # Из nixpkgs, если есть, или оверлея - confuse - #httpcore - httpx - packaging - pycountry - typing-extensions - anyio - ps.python3-discogs-client - ps.beetcamp # Из оверлея - ]); + beetsEnv = python3.withPackages ( + ps: with pkgs.python313Packages; [ + #pkgs.beets # Из nixpkgs (проверь версию!) или оверлея + beautifulsoup4 # Из nixpkgs + certifi # Из nixpkgs + requests # Из nixpkgs + pyyaml # Из nixpkgs + unidecode # Из nixpkgs + pylast # Из nixpkgs + jellyfish # Из nixpkgs, если есть, или оверлея + confuse + #httpcore + httpx + packaging + pycountry + typing-extensions + anyio + ps.python3-discogs-client + ps.beetcamp # Из оверлея + ] + ); in { systemd.tmpfiles.rules = [