From f3f52741e62202a3e67d54a5f4dd3c76ef31f42e Mon Sep 17 00:00:00 2001 From: Ivan Petkov Date: Sun, 14 Jul 2024 08:49:24 -0700 Subject: [PATCH 1/2] tandoor-recipes: pin to python311 --- pkgs/applications/misc/tandoor-recipes/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/tandoor-recipes/default.nix b/pkgs/applications/misc/tandoor-recipes/default.nix index b2bda05d5496..d4e453897889 100644 --- a/pkgs/applications/misc/tandoor-recipes/default.nix +++ b/pkgs/applications/misc/tandoor-recipes/default.nix @@ -1,10 +1,11 @@ { callPackage , nixosTests -, python3 +, python311 , fetchFromGitHub }: let - python = python3.override { + # python-ldap-3.4.4 does not work with python3(12) + python = python311.override { packageOverrides = self: super: { validators = super.validators.overridePythonAttrs (_: rec { version = "0.20.0"; From 1f803e4edb952f78e777d623e34adeff77d61d18 Mon Sep 17 00:00:00 2001 From: Ivan Petkov Date: Sun, 14 Jul 2024 08:49:57 -0700 Subject: [PATCH 2/2] tandoor-recipes: pin lxml to 5.1.0 --- pkgs/applications/misc/tandoor-recipes/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/applications/misc/tandoor-recipes/default.nix b/pkgs/applications/misc/tandoor-recipes/default.nix index d4e453897889..7114cbb3cf76 100644 --- a/pkgs/applications/misc/tandoor-recipes/default.nix +++ b/pkgs/applications/misc/tandoor-recipes/default.nix @@ -29,6 +29,15 @@ let pytest-django ]; }); + + # python3.11-extruct-0.16.0 doesn't work with lxml-5.2.2 + lxml = super.lxml.overridePythonAttrs (oldAttrs: rec { + version = "5.1.0"; + src = oldAttrs.src.override { + rev = version; + hash = "sha256-eWLYzZWatYDmhuBTZynsdytlNFKKmtWQ1XIyzVD8sDY="; + }; + }); }; };