public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

octoprint: 1.4.2 -> 1.5.1

Browse Source
This commit is contained in:
Bernardo Meurer 2020-12-04 12:08:40 -08:00 committed by Orivej Desh
parent fcbd213d38
commit 16f145e29f
1 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
pkgs/applications/misc/octoprint/default.nix
View File

@ -25,13 +25,29 @@ let
[ [
# the following dependencies are non trivial to update since later versions introduce backwards incompatible # 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 # changes that might affect plugins, or due to other observed problems
(mkOverride "markupsafe" "1.1.1" "29872e92839765e546828bb7754a68c418d927cd064fd4708fab9fe9c8bb116b")
(mkOverride "rsa" "4.0" "1a836406405730121ae9823e19c6e806c62bbad73f890574fff50efa4122c487") (mkOverride "rsa" "4.0" "1a836406405730121ae9823e19c6e806c62bbad73f890574fff50efa4122c487")
(mkOverride "markdown" "3.1.1" "2e50876bcdd74517e7b71f3e7a76102050edec255b3983403f1a63e7c8a41e7a") (mkOverride "markdown" "3.1.1" "2e50876bcdd74517e7b71f3e7a76102050edec255b3983403f1a63e7c8a41e7a")
(mkOverride "tornado" "5.1.1" "4e5158d97583502a7e2739951553cbd88a72076f152b4b11b64b9a10c4c49409") (mkOverride "tornado" "5.1.1" "4e5158d97583502a7e2739951553cbd88a72076f152b4b11b64b9a10c4c49409")
(mkOverride "unidecode" "0.04.21" "280a6ab88e1f2eb5af79edff450021a0d3f0448952847cd79677e55e58bad051") (mkOverride "unidecode" "0.04.21" "280a6ab88e1f2eb5af79edff450021a0d3f0448952847cd79677e55e58bad051")
(mkOverride "sarge" "0.1.5.post0" "1c1ll7pys9vra5cfi8jxlgrgaql6c27l6inpy15aprgqhc4ck36s") (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 # Built-in dependency
( (
self: super: { self: super: {
@ -55,13 +71,13 @@ let
self: super: { self: super: {
octoprint-firmwarecheck = self.buildPythonPackage rec { octoprint-firmwarecheck = self.buildPythonPackage rec {
pname = "OctoPrint-FirmwareCheck"; pname = "OctoPrint-FirmwareCheck";
version = "2020.06.22"; version = "2020.09.23";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "OctoPrint"; owner = "OctoPrint";
repo = "OctoPrint-FirmwareCheck"; repo = "OctoPrint-FirmwareCheck";
rev = version; rev = version;
sha256 = "19y7hrgg9z8hl7cwqkvg8nc8bk0wwrsfvjd1wawy33wn60psqv1h"; sha256 = "1l1ajhnsc39prgk59mp93h90dgl9gh660cci00z5b5gj2h6dv1d1";
}; };
doCheck = false; doCheck = false;
}; };
@ -72,13 +88,13 @@ let
self: super: { self: super: {
octoprint = self.buildPythonPackage rec { octoprint = self.buildPythonPackage rec {
pname = "OctoPrint"; pname = "OctoPrint";
version = "1.4.2"; version = "1.5.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "OctoPrint"; owner = "OctoPrint";
repo = "OctoPrint"; repo = "OctoPrint";
rev = version; rev = version;
sha256 = "1bblrjwkccy1ifw7lf55g3k9lq1sqzwd49vj8bfzj2w07a7qda62"; sha256 = "04x58cjivslsrld341ip11c50d50p2q01090nsyji0j255v986j9";
}; };
propagatedBuildInputs = with super; [ propagatedBuildInputs = with super; [
@ -119,6 +135,7 @@ let
filetype filetype
unidecode unidecode
blinker blinker
zeroconf
] ++ lib.optionals stdenv.isDarwin [ py.pkgs.appdirs ]; ] ++ lib.optionals stdenv.isDarwin [ py.pkgs.appdirs ];
checkInputs = with super; [ pytestCheckHook mock ddt ]; checkInputs = with super; [ pytestCheckHook mock ddt ];