Merge pull request #272557 from ambroisie/update-tandoor-recipes
tandoor-recipes: 1.5.6 -> 1.5.10
This commit is contained in:
commit
e43bbcfaec
|
@ -12,7 +12,7 @@ let
|
||||||
DEBUG_TOOLBAR = "0";
|
DEBUG_TOOLBAR = "0";
|
||||||
MEDIA_ROOT = "/var/lib/tandoor-recipes";
|
MEDIA_ROOT = "/var/lib/tandoor-recipes";
|
||||||
} // optionalAttrs (config.time.timeZone != null) {
|
} // optionalAttrs (config.time.timeZone != null) {
|
||||||
TIMEZONE = config.time.timeZone;
|
TZ = config.time.timeZone;
|
||||||
} // (
|
} // (
|
||||||
lib.mapAttrs (_: toString) cfg.extraConfig
|
lib.mapAttrs (_: toString) cfg.extraConfig
|
||||||
);
|
);
|
||||||
|
|
|
@ -1,15 +1,15 @@
|
||||||
{ lib, fetchFromGitHub }:
|
{ lib, fetchFromGitHub }:
|
||||||
rec {
|
rec {
|
||||||
version = "1.5.6";
|
version = "1.5.10";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "TandoorRecipes";
|
owner = "TandoorRecipes";
|
||||||
repo = "recipes";
|
repo = "recipes";
|
||||||
rev = version;
|
rev = version;
|
||||||
hash = "sha256-3sitrTaIRKmjx+5vWOQXE0/Gu0jJ8VCpOq2cZZVLrbk=";
|
hash = "sha256-CkqNPG57e76TT/vF9lscS6m2FbXOvOfqiT/9aM2Il9E=";
|
||||||
};
|
};
|
||||||
|
|
||||||
yarnHash = "sha256-mZ8beCF+3mnpgKED0fP96RBbGbKNNXqEJkGSjgrEGBc=";
|
yarnHash = "sha256-atl2XrY9LmWh2USp6K2W50/khEsnY6OqKBUS26Ln9ZM=";
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
homepage = "https://tandoor.dev/";
|
homepage = "https://tandoor.dev/";
|
||||||
|
|
|
@ -5,28 +5,7 @@
|
||||||
, fetchpatch
|
, fetchpatch
|
||||||
}:
|
}:
|
||||||
let
|
let
|
||||||
python = python3.override {
|
python = python3;
|
||||||
packageOverrides = self: super: {
|
|
||||||
django = super.django_4;
|
|
||||||
|
|
||||||
django-crispy-forms = super.django-crispy-forms.overridePythonAttrs (_: rec {
|
|
||||||
version = "1.14.0";
|
|
||||||
format = "setuptools";
|
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
|
||||||
owner = "django-crispy-forms";
|
|
||||||
repo = "django-crispy-forms";
|
|
||||||
rev = "refs/tags/${version}";
|
|
||||||
hash = "sha256-NZ2lWxsQHc7Qc4HDoWgjJTZ/bJHmjpBf3q1LVLtzA+8=";
|
|
||||||
};
|
|
||||||
});
|
|
||||||
|
|
||||||
# Tests are incompatible with Django 4
|
|
||||||
django-js-reverse = super.django-js-reverse.overridePythonAttrs (_: {
|
|
||||||
doCheck = false;
|
|
||||||
});
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
common = callPackage ./common.nix { };
|
common = callPackage ./common.nix { };
|
||||||
|
|
||||||
|
@ -44,8 +23,8 @@ python.pkgs.pythonPackages.buildPythonPackage rec {
|
||||||
./media-root.patch
|
./media-root.patch
|
||||||
# https://github.com/TandoorRecipes/recipes/pull/2706
|
# https://github.com/TandoorRecipes/recipes/pull/2706
|
||||||
(fetchpatch {
|
(fetchpatch {
|
||||||
url = "https://github.com/TandoorRecipes/recipes/commit/8f66f5c3ca61751a80cc133ff4c59019d6fca406.patch";
|
url = "https://github.com/TandoorRecipes/recipes/commit/702c1d67d3b2d13cf471bf9daa1d2ef0f1837dec.patch";
|
||||||
hash = "sha256-oF5YlPg1LEdLvKpxiSqjTmYPbrGquPlRIz6A05031gs=";
|
hash = "sha256-6vmtYs6b0d38Ojxxc2I7oxqpkIlyRVlhzURBOTO2VlQ=";
|
||||||
})
|
})
|
||||||
];
|
];
|
||||||
|
|
||||||
|
@ -63,6 +42,7 @@ python.pkgs.pythonPackages.buildPythonPackage rec {
|
||||||
django-cleanup
|
django-cleanup
|
||||||
django-cors-headers
|
django-cors-headers
|
||||||
django-crispy-forms
|
django-crispy-forms
|
||||||
|
django-crispy-bootstrap4
|
||||||
django-hcaptcha
|
django-hcaptcha
|
||||||
django-js-reverse
|
django-js-reverse
|
||||||
django-oauth-toolkit
|
django-oauth-toolkit
|
||||||
|
@ -145,6 +125,11 @@ python.pkgs.pythonPackages.buildPythonPackage rec {
|
||||||
pytest-factoryboy
|
pytest-factoryboy
|
||||||
];
|
];
|
||||||
|
|
||||||
|
# flaky
|
||||||
|
disabledTests = [
|
||||||
|
"test_search_count"
|
||||||
|
];
|
||||||
|
|
||||||
passthru = {
|
passthru = {
|
||||||
inherit frontend python;
|
inherit frontend python;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user