From 12b0644a20f000972e97728f049e2555a4003b28 Mon Sep 17 00:00:00 2001 From: Edmund Wu Date: Tue, 23 Jun 2020 15:53:38 -0400 Subject: [PATCH 1/4] pythonPackages.flask-reverse-proxy-fix: fix build --- .../python-modules/flask-reverse-proxy-fix/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/python-modules/flask-reverse-proxy-fix/default.nix b/pkgs/development/python-modules/flask-reverse-proxy-fix/default.nix index d6912de6fe8..f8001bc2aff 100644 --- a/pkgs/development/python-modules/flask-reverse-proxy-fix/default.nix +++ b/pkgs/development/python-modules/flask-reverse-proxy-fix/default.nix @@ -3,6 +3,7 @@ , fetchFromGitHub , isPy3k , flask +, werkzeug }: buildPythonPackage rec { @@ -20,8 +21,13 @@ buildPythonPackage rec { disabled = !isPy3k; + postPatch = '' + sed -i 's@werkzeug.contrib.fixers@werkzeug.middleware.proxy_fix@g' flask_reverse_proxy_fix/middleware/__init__.py + ''; + propagatedBuildInputs = [ flask + werkzeug ]; meta = with stdenv.lib; { From ba09be4c69d0e09dde774243696cfd26b69c5b09 Mon Sep 17 00:00:00 2001 From: Edmund Wu Date: Tue, 23 Jun 2020 15:54:13 -0400 Subject: [PATCH 2/4] pythonPackages.geoalchemy2: fix build --- pkgs/development/python-modules/geoalchemy2/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/python-modules/geoalchemy2/default.nix b/pkgs/development/python-modules/geoalchemy2/default.nix index 892b373f065..ea673dc3346 100644 --- a/pkgs/development/python-modules/geoalchemy2/default.nix +++ b/pkgs/development/python-modules/geoalchemy2/default.nix @@ -3,6 +3,8 @@ , fetchPypi , sqlalchemy , shapely +, setuptools_scm +, pytest }: buildPythonPackage rec { @@ -14,8 +16,12 @@ buildPythonPackage rec { sha256 = "a5a2444d90ce7f2c6b2d7bd7346c8aed16fd32c3e190e631576a51814e8f7ee9"; }; + nativeBuildInputs = [ setuptools_scm ]; propagatedBuildInputs = [ sqlalchemy shapely ]; + # https://github.com/geoalchemy/geoalchemy2/blob/e05a676350b11f0e73609379dae5625c5de2e868/TEST.rst + doCheck = false; + meta = with stdenv.lib; { homepage = "http://geoalchemy.org/"; license = licenses.mit; From d1795bbb69fc2035b379edc805ef90733fa23b0c Mon Sep 17 00:00:00 2001 From: Edmund Wu Date: Tue, 23 Jun 2020 15:54:37 -0400 Subject: [PATCH 3/4] pythonPackages.flask-admin: fix build --- .../python-modules/flask-admin/default.nix | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/flask-admin/default.nix b/pkgs/development/python-modules/flask-admin/default.nix index 5803d8ea2c7..dc1e795054f 100644 --- a/pkgs/development/python-modules/flask-admin/default.nix +++ b/pkgs/development/python-modules/flask-admin/default.nix @@ -8,12 +8,16 @@ , wtf-peewee , sqlalchemy , sqlalchemy-citext +, sqlalchemy-utils , flask-mongoengine , flask_sqlalchemy , flask-babelex , shapely , geoalchemy2 , psycopg2 +, arrow +, colour +, email_validator , flask , wtforms , isPy27 @@ -22,12 +26,12 @@ buildPythonPackage rec { pname = "flask-admin"; - version = "1.5.3"; + version = "1.5.6"; src = fetchPypi { pname = "Flask-Admin"; inherit version; - sha256 = "ca0be6ec11a6913b73f656c65c444ae5be416c57c75638dd3199376ce6bc7422"; + sha256 = "1f31vzc0p2xni5mh1wvjk9jxf4ddlx2fj4r0f3vv2n9db3c63iv8"; }; checkInputs = [ @@ -38,12 +42,16 @@ buildPythonPackage rec { wtf-peewee sqlalchemy sqlalchemy-citext + sqlalchemy-utils flask-mongoengine flask_sqlalchemy flask-babelex shapely geoalchemy2 psycopg2 + arrow + colour + email_validator ]; propagatedBuildInputs = [ @@ -52,13 +60,14 @@ buildPythonPackage rec { ] ++ lib.optionals isPy27 [ enum34 ]; checkPhase = '' - # disable tests that require mongodb, postresql + # disable tests that require mongodb, postresql, or network nosetests \ -e "mongoengine" \ -e "pymongo" \ -e "test_form_upload" \ -e "test_postgres" \ -e "geoa" \ + -e "test_ajax_fk" \ flask_admin/tests ''; From af36ff22eabdbd7d08e70e8a12cde95f3020f807 Mon Sep 17 00:00:00 2001 From: Edmund Wu Date: Tue, 23 Jun 2020 15:54:44 -0400 Subject: [PATCH 4/4] buku: 4.3 -> 4.4 --- pkgs/applications/misc/buku/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/buku/default.nix b/pkgs/applications/misc/buku/default.nix index f4018cff5f4..9b8f531e800 100644 --- a/pkgs/applications/misc/buku/default.nix +++ b/pkgs/applications/misc/buku/default.nix @@ -1,14 +1,14 @@ { stdenv, python3, fetchFromGitHub }: with python3.pkgs; buildPythonApplication rec { - version = "4.3"; + version = "4.4"; pname = "buku"; src = fetchFromGitHub { owner = "jarun"; repo = "buku"; rev = "v${version}"; - sha256 = "1cq508ymak3g5fhi1n4bdiiqkc86s2l3k4dvzw842vv2x0441cac"; + sha256 = "10r5f1n0vcxxmqqqsgmlvibwg1xffijrr2id6r140rgiyhprz556"; }; checkInputs = [ @@ -38,6 +38,7 @@ with python3.pkgs; buildPythonApplication rec { click html5lib vcrpy + toml ]; postPatch = ''