Merge pull request #173251 from K900/python-bullshittery
This commit is contained in:
commit
ab39425ba3
6 changed files with 22 additions and 48 deletions
|
@ -243,5 +243,7 @@ buildPythonPackage rec {
|
|||
homepage = "https://airflow.apache.org/";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ bhipple costrouc ingenieroariel ];
|
||||
# requires extremely outdated versions of multiple dependencies
|
||||
broken = true;
|
||||
};
|
||||
}
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, buildPythonPackage, fetchFromGitHub, django, isPy27 }:
|
||||
{ lib, buildPythonPackage, fetchFromGitHub, django, pytz, isPy27 }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
version = "3.12.4";
|
||||
|
@ -15,7 +15,7 @@ buildPythonPackage rec {
|
|||
# Test settings are missing
|
||||
doCheck = false;
|
||||
|
||||
propagatedBuildInputs = [ django ];
|
||||
propagatedBuildInputs = [ django pytz ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Web APIs for Django, made easy";
|
||||
|
|
|
@ -13,7 +13,7 @@
|
|||
|
||||
buildPythonApplication rec {
|
||||
pname = "mkdocs-material";
|
||||
version = "8.2.11";
|
||||
version = "8.2.15";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
@ -22,7 +22,7 @@ buildPythonApplication rec {
|
|||
owner = "squidfunk";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-YAXdIA36QWwdQxTux6Sy/F0j8lprSO+5/VezFcsGQYg=";
|
||||
hash = "sha256-6x3ENFPGmtRDMV6YRGlTLCYusmX49LrGBDwicg8sDB0=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, hatchling
|
||||
, pytestCheckHook
|
||||
, markdown
|
||||
, pyyaml
|
||||
|
@ -38,26 +38,17 @@ let
|
|||
in
|
||||
buildPythonPackage rec {
|
||||
pname = "pymdown-extensions";
|
||||
version = "9.1";
|
||||
version = "9.4";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "facelessuser";
|
||||
repo = "pymdown-extensions";
|
||||
rev = version;
|
||||
sha256 = "sha256-II8Po8144h3wPFrzMbOB/qiCm2HseYrcZkyIZFGT+ek=";
|
||||
sha256 = "sha256-9oYLDerz6ZcE4QyLO4mFPuHws8oZoXX8LcSV209MFec=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# this patch is needed to allow tests to pass for later versions of the
|
||||
# markdown dependency
|
||||
#
|
||||
# it can be removed after the next pymdown-extensions release
|
||||
(fetchpatch {
|
||||
url = "https://github.com/facelessuser/pymdown-extensions/commit/8ee5b5caec8f9373e025f50064585fb9d9b71f86.patch";
|
||||
sha256 = "sha256-jTHNcsV0zL0EkSTSj8zCGXXtpUaLnNPldmL+krZj3Gk=";
|
||||
})
|
||||
];
|
||||
nativeBuildInputs = [ hatchling ];
|
||||
|
||||
propagatedBuildInputs = [ markdown pygments ];
|
||||
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchpatch
|
||||
, fetchPypi
|
||||
, pythonOlder
|
||||
|
||||
|
@ -40,6 +41,15 @@ buildPythonPackage rec {
|
|||
sha256 = "sha256-gmkiK8pIHfubbbxNdm/D6L2o722FptxYgINYdIUOn4Y=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# FIXME: backport Python 3.10 support fix, remove for next release
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.com/mailman/hyperkitty/-/commit/551a44a76e46931fc5c1bcb341235d8f579820be.patch";
|
||||
sha256 = "sha256-5XCrvyrDEqH3JryPMoOXSlVVDLQ+PdYBqwGYxkExdvk=";
|
||||
includes = [ "hyperkitty/*" ];
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
# isort is a development dependency
|
||||
sed -i '/isort/d' setup.py
|
||||
|
|
|
@ -9,36 +9,7 @@
|
|||
let
|
||||
py = python3.override {
|
||||
packageOverrides = self: super: {
|
||||
django = super.django_3;
|
||||
jsonschema = super.jsonschema.overridePythonAttrs (old: rec {
|
||||
version = "3.2.0";
|
||||
src = self.fetchPypi {
|
||||
pname = old.pname;
|
||||
inherit version;
|
||||
sha256 = "c8a85b28d377cc7737e46e2d9f2b4f44ee3c0e1deac6bf46ddefc7187d30797a";
|
||||
};
|
||||
});
|
||||
lxml = super.lxml.overridePythonAttrs (old: rec {
|
||||
version = "4.6.5";
|
||||
src = self.fetchPypi {
|
||||
pname = old.pname;
|
||||
inherit version;
|
||||
sha256 = "6e84edecc3a82f90d44ddee2ee2a2630d4994b8471816e226d2b771cda7ac4ca";
|
||||
};
|
||||
});
|
||||
werkzeug = super.werkzeug.overridePythonAttrs (old: rec {
|
||||
version = "2.0.3";
|
||||
src = self.fetchPypi {
|
||||
pname = "Werkzeug";
|
||||
inherit version;
|
||||
sha256 = "sha256-uGP4/wV8UiFktgZ8niiwQRYbS+W6TQ2s7qpQoWOCLTw=";
|
||||
};
|
||||
});
|
||||
sentry-sdk = super.sentry-sdk.overridePythonAttrs (old: rec {
|
||||
disabledTestPaths = old.disabledTestPaths ++ [
|
||||
"tests/integrations/flask/test_flask.py"
|
||||
];
|
||||
});
|
||||
django = super.django_4;
|
||||
};
|
||||
};
|
||||
|
||||
|
@ -64,7 +35,7 @@ py.pkgs.buildPythonApplication rec {
|
|||
];
|
||||
|
||||
propagatedBuildInputs = with py.pkgs; [
|
||||
django_3
|
||||
django_4
|
||||
django-cors-headers
|
||||
django-debug-toolbar
|
||||
django-filter
|
||||
|
|
Loading…
Reference in a new issue