From d0e31655f99c4b10188da9575ae70ca886b2f155 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Fri, 4 Dec 2020 11:45:34 -0800 Subject: [PATCH 1/5] python3Packages.sgmllib3k: init at 1.0.0 --- .../python-modules/sgmllib3k/default.nix | 27 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/development/python-modules/sgmllib3k/default.nix diff --git a/pkgs/development/python-modules/sgmllib3k/default.nix b/pkgs/development/python-modules/sgmllib3k/default.nix new file mode 100644 index 00000000000..6884bed2748 --- /dev/null +++ b/pkgs/development/python-modules/sgmllib3k/default.nix @@ -0,0 +1,27 @@ +{ stdenv +, buildPythonPackage +, fetchFromGitHub +, isPy27 +, lib +}: + +buildPythonPackage rec { + pname = "sgmllib3k"; + version = "1.0.0"; + disabled = isPy27; + + # fetchFromGitHub instead of fetchPypi to run tests. + src = fetchFromGitHub { + owner = "hsoft"; + repo = "sgmllib"; + rev = "799964676f35349ca2dd04503e34c2b3ad522c0d"; + sha256 = "0bzf6pv85dzfxfysm6zbj8m40hp0xzr9h8qlk4hp3nmy88rznqvr"; + }; + + meta = with lib; { + homepage = "https://pypi.org/project/sgmllib3k/"; + description = "Python 3 port of sgmllib"; + license = licenses.bsd2; + maintainers = with maintainers; [ lovesegfault ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 93f09234a45..bec5ad3ef64 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6696,6 +6696,8 @@ in { sfepy = callPackage ../development/python-modules/sfepy { }; + sgmllib3k = callPackage ../development/python-modules/sgmllib3k { }; + shamir-mnemonic = callPackage ../development/python-modules/shamir-mnemonic { }; shap = callPackage ../development/python-modules/shap { }; From fcbd213d3856a81ca53d3d2367832e3f114be58a Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Fri, 4 Dec 2020 11:49:58 -0800 Subject: [PATCH 2/5] python3Packages.feedparser: fix build, run tests --- pkgs/development/python-modules/feedparser/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/feedparser/default.nix b/pkgs/development/python-modules/feedparser/default.nix index 55ed8d7f6e7..aeeb9b3e496 100644 --- a/pkgs/development/python-modules/feedparser/default.nix +++ b/pkgs/development/python-modules/feedparser/default.nix @@ -1,19 +1,25 @@ { stdenv , buildPythonPackage , fetchPypi +, isPy27 +, sgmllib3k }: buildPythonPackage rec { pname = "feedparser"; version = "6.0.2"; + disabled = isPy27; src = fetchPypi { inherit pname version; sha256 = "1b00a105425f492f3954fd346e5b524ca9cef3a4bbf95b8809470e9857aa1074"; }; - # lots of networking failures - doCheck = false; + propagatedBuildInputs = [ sgmllib3k ]; + + checkPhase = '' + python -Wd tests/runtests.py + ''; meta = with stdenv.lib; { homepage = "https://github.com/kurtmckee/feedparser"; From 16f145e29fb520cbcd7f62428da88b1ceac65b35 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Fri, 4 Dec 2020 12:08:40 -0800 Subject: [PATCH 3/5] octoprint: 1.4.2 -> 1.5.1 --- pkgs/applications/misc/octoprint/default.nix | 27 ++++++++++++++++---- 1 file changed, 22 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/misc/octoprint/default.nix b/pkgs/applications/misc/octoprint/default.nix index 82cdf18b484..71f40b6e681 100644 --- a/pkgs/applications/misc/octoprint/default.nix +++ b/pkgs/applications/misc/octoprint/default.nix @@ -25,13 +25,29 @@ let [ # the following dependencies are non trivial to update since later versions introduce backwards incompatible # changes that might affect plugins, or due to other observed problems - (mkOverride "markupsafe" "1.1.1" "29872e92839765e546828bb7754a68c418d927cd064fd4708fab9fe9c8bb116b") (mkOverride "rsa" "4.0" "1a836406405730121ae9823e19c6e806c62bbad73f890574fff50efa4122c487") (mkOverride "markdown" "3.1.1" "2e50876bcdd74517e7b71f3e7a76102050edec255b3983403f1a63e7c8a41e7a") (mkOverride "tornado" "5.1.1" "4e5158d97583502a7e2739951553cbd88a72076f152b4b11b64b9a10c4c49409") (mkOverride "unidecode" "0.04.21" "280a6ab88e1f2eb5af79edff450021a0d3f0448952847cd79677e55e58bad051") (mkOverride "sarge" "0.1.5.post0" "1c1ll7pys9vra5cfi8jxlgrgaql6c27l6inpy15aprgqhc4ck36s") + # Octoprint needs zeroconf >=0.24 <0.25. While this should be done in + # the mkOverride aboves, this package also has broken tests, so we need + # a proper override. + ( + self: super: { + zeroconf = super.zeroconf.overrideAttrs (oldAttrs: rec { + version = "0.24.5"; + src = oldAttrs.src.override { + inherit version; + sha256 = "0jpgd0rk91si93857mjrizan5gc42kj1q4fi4160qgk68la88fl9"; + }; + buildInputs = [ self.nose ]; + checkPhase = "nosetests"; + }); + } + ) + # Built-in dependency ( self: super: { @@ -55,13 +71,13 @@ let self: super: { octoprint-firmwarecheck = self.buildPythonPackage rec { pname = "OctoPrint-FirmwareCheck"; - version = "2020.06.22"; + version = "2020.09.23"; src = fetchFromGitHub { owner = "OctoPrint"; repo = "OctoPrint-FirmwareCheck"; rev = version; - sha256 = "19y7hrgg9z8hl7cwqkvg8nc8bk0wwrsfvjd1wawy33wn60psqv1h"; + sha256 = "1l1ajhnsc39prgk59mp93h90dgl9gh660cci00z5b5gj2h6dv1d1"; }; doCheck = false; }; @@ -72,13 +88,13 @@ let self: super: { octoprint = self.buildPythonPackage rec { pname = "OctoPrint"; - version = "1.4.2"; + version = "1.5.1"; src = fetchFromGitHub { owner = "OctoPrint"; repo = "OctoPrint"; rev = version; - sha256 = "1bblrjwkccy1ifw7lf55g3k9lq1sqzwd49vj8bfzj2w07a7qda62"; + sha256 = "04x58cjivslsrld341ip11c50d50p2q01090nsyji0j255v986j9"; }; propagatedBuildInputs = with super; [ @@ -119,6 +135,7 @@ let filetype unidecode blinker + zeroconf ] ++ lib.optionals stdenv.isDarwin [ py.pkgs.appdirs ]; checkInputs = with super; [ pytestCheckHook mock ddt ]; From e82416909fe032ba5c263334cd36d519b2fba792 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Fri, 4 Dec 2020 12:09:22 -0800 Subject: [PATCH 4/5] octoprint: sort propagatedBuildInputs --- pkgs/applications/misc/octoprint/default.nix | 62 ++++++++++---------- 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/pkgs/applications/misc/octoprint/default.nix b/pkgs/applications/misc/octoprint/default.nix index 71f40b6e681..6babde028ec 100644 --- a/pkgs/applications/misc/octoprint/default.nix +++ b/pkgs/applications/misc/octoprint/default.nix @@ -98,43 +98,43 @@ let }; propagatedBuildInputs = with super; [ - octoprint-firmwarecheck - octoprint-filecheck - markupsafe - tornado - markdown - rsa - regex + blinker + cachelib + click + emoji + feedparser + filetype flask - jinja2 - flask_login flask-babel flask_assets - werkzeug - itsdangerous - cachelib - pyyaml - pyserial - netaddr - watchdog - sarge - netifaces - pylru - pkginfo - requests - semantic-version - psutil - click - feedparser - future - websocket_client - wrapt - emoji + flask_login frozendict + future + itsdangerous + jinja2 + markdown + markupsafe + netaddr + netifaces + octoprint-filecheck + octoprint-firmwarecheck + pkginfo + psutil + pylru + pyserial + pyyaml + regex + requests + rsa + sarge + semantic-version sentry-sdk - filetype + tornado unidecode - blinker + watchdog + websocket_client + werkzeug + wrapt zeroconf ] ++ lib.optionals stdenv.isDarwin [ py.pkgs.appdirs ]; From 5a772d4cb0808382a392464cf42b1fa3d7552df9 Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Mon, 7 Dec 2020 13:14:38 +0000 Subject: [PATCH 5/5] octoprint: pin flask-babel to 1.0.0 --- pkgs/applications/misc/octoprint/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/misc/octoprint/default.nix b/pkgs/applications/misc/octoprint/default.nix index 6babde028ec..974b733ae64 100644 --- a/pkgs/applications/misc/octoprint/default.nix +++ b/pkgs/applications/misc/octoprint/default.nix @@ -25,6 +25,7 @@ let [ # the following dependencies are non trivial to update since later versions introduce backwards incompatible # changes that might affect plugins, or due to other observed problems + (mkOverride "flask-babel" "1.0.0" "0gmb165vkwv5v7dxsxa2i3zhafns0fh938m2zdcrv4d8z5l099yn") (mkOverride "rsa" "4.0" "1a836406405730121ae9823e19c6e806c62bbad73f890574fff50efa4122c487") (mkOverride "markdown" "3.1.1" "2e50876bcdd74517e7b71f3e7a76102050edec255b3983403f1a63e7c8a41e7a") (mkOverride "tornado" "5.1.1" "4e5158d97583502a7e2739951553cbd88a72076f152b4b11b64b9a10c4c49409")