From b6c0457b9556391ffd75cf6fb20f63069006fa5e Mon Sep 17 00:00:00 2001 From: Minijackson Date: Tue, 10 Dec 2024 14:45:19 +0100 Subject: [PATCH] recceiver: disable for Python 3.12+, switch to Python 3.11 for NixOS module --- nixos/modules/channel-finder/recceiver.nix | 4 ++-- pkgs/epnix/tools/channel-finder/recceiver/default.nix | 5 +++++ pkgs/tests/default.nix | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/nixos/modules/channel-finder/recceiver.nix b/nixos/modules/channel-finder/recceiver.nix index 470bbba5..4bb8d81f 100644 --- a/nixos/modules/channel-finder/recceiver.nix +++ b/nixos/modules/channel-finder/recceiver.nix @@ -7,8 +7,8 @@ }: let cfg = config.services.recceiver; - pkg = pkgs.python3Packages.recceiver; - python = pkgs.python3.withPackages ( + pkg = pkgs.python311Packages.recceiver; + python = pkgs.python311.withPackages ( ps: [ ps.recceiver ps.twisted diff --git a/pkgs/epnix/tools/channel-finder/recceiver/default.nix b/pkgs/epnix/tools/channel-finder/recceiver/default.nix index 2ae4ba6a..c2ab1389 100644 --- a/pkgs/epnix/tools/channel-finder/recceiver/default.nix +++ b/pkgs/epnix/tools/channel-finder/recceiver/default.nix @@ -1,6 +1,7 @@ { epnixLib, buildPythonPackage, + pythonAtLeast, fetchFromGitHub, python, setuptools-scm, @@ -13,6 +14,10 @@ buildPythonPackage rec { version = "1.6"; pyproject = true; + # Should be fixed by https://github.com/ChannelFinder/recsync/pull/88 + # but the patch doesn't apply cleanly + disabled = pythonAtLeast "3.12"; + src = fetchFromGitHub { owner = "ChannelFinder"; repo = "recsync"; diff --git a/pkgs/tests/default.nix b/pkgs/tests/default.nix index e7ad05d0..eca41e0e 100644 --- a/pkgs/tests/default.nix +++ b/pkgs/tests/default.nix @@ -6,6 +6,6 @@ {pkgs, ...}: { channelfinder-default-python = pkgs.python3Packages.channelfinder; mrf-driver-default-linux = pkgs.linuxPackages.mrf; - recceiver-default-python = pkgs.python3Packages.recceiver; + recceiver-default-python = pkgs.python311Packages.recceiver; aiaoca-default-python = pkgs.python3Packages.aioca; }