diff options
author | Bernardo Meurer <bernardo@meurer.org> | 2020-12-04 12:08:40 -0800 |
---|---|---|
committer | Orivej Desh <orivej@gmx.fr> | 2020-12-07 13:12:04 +0000 |
commit | 16f145e29fb520cbcd7f62428da88b1ceac65b35 (patch) | |
tree | 3693642fef680361af3ed8ca898fc34f097bb392 /pkgs/applications/misc | |
parent | fcbd213d3856a81ca53d3d2367832e3f114be58a (diff) |
octoprint: 1.4.2 -> 1.5.1
Diffstat (limited to 'pkgs/applications/misc')
-rw-r--r-- | pkgs/applications/misc/octoprint/default.nix | 27 |
1 files changed, 22 insertions, 5 deletions
diff --git a/pkgs/applications/misc/octoprint/default.nix b/pkgs/applications/misc/octoprint/default.nix index 82cdf18b4846..71f40b6e681b 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 ]; |