From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id 4L1PHJcakGFpPwAAgWs5BA (envelope-from ) for ; Sat, 13 Nov 2021 21:05:43 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id 6KIRGJcakGHGZQAA1q6Kng (envelope-from ) for ; Sat, 13 Nov 2021 20:05:43 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id D93423192E for ; Sat, 13 Nov 2021 21:05:42 +0100 (CET) Received: from localhost ([::1]:40632 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mlzHS-0006gl-2a for larch@yhetil.org; Sat, 13 Nov 2021 15:05:42 -0500 Received: from eggs.gnu.org ([209.51.188.92]:33412) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mlzGu-00063g-BA for guix-patches@gnu.org; Sat, 13 Nov 2021 15:05:11 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:36712) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mlzGr-0008Bb-9t for guix-patches@gnu.org; Sat, 13 Nov 2021 15:05:06 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mlzGr-0001PX-5J for guix-patches@gnu.org; Sat, 13 Nov 2021 15:05:05 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#51314] [PATCH v2 24/24] gnu: Add octoprint. Resent-From: Vinicius Monego Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 13 Nov 2021 20:05:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 51314 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 51314@debbugs.gnu.org Cc: Vinicius Monego Received: via spool by 51314-submit@debbugs.gnu.org id=B51314.16368338845342 (code B ref 51314); Sat, 13 Nov 2021 20:05:05 +0000 Received: (at 51314) by debbugs.gnu.org; 13 Nov 2021 20:04:44 +0000 Received: from localhost ([127.0.0.1]:48251 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mlzGV-0001O6-K7 for submit@debbugs.gnu.org; Sat, 13 Nov 2021 15:04:44 -0500 Received: from mout02.posteo.de ([185.67.36.66]:42007) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mlzGT-0001Nq-PR for 51314@debbugs.gnu.org; Sat, 13 Nov 2021 15:04:42 -0500 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id C0957240105 for <51314@debbugs.gnu.org>; Sat, 13 Nov 2021 21:04:35 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1636833875; bh=5kiU661gMYi/2JFWdAU4nge7ZtkV8I5vrd8+FHYAubM=; h=From:To:Cc:Subject:Date:From; b=C8k6SFy2GNrWMpXWSMkU92WT55hbcKshu+1Turm+8W+dsxDc7uJJ0MaUEJz8mEBRy tUUifsqNEpOwBC1PBY9pomREOnwhuKqbzYDG/X9ZF0jZmHCOHMbRA+MfFNPGItWNyq gkJoVaOtoj2Ibb1SP4SB1E9ijlv8Vl0XmkWcaUntvsQ2wY3c4bBWRVch6whIuNBQGM F9I+0gK9WEpFBA4pw/rXj28T+jJMg7NLYZhdbTVWbtRc/3EDDDc6edIXKR7ozTtkhu G6nZa8YSyQHm9OmYCgFXbcdwrK40yq2zKcls31bz1aeWy+MfQCRPDyiVub01Tknjjj jj2kGVnNTxLOQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Hs5yS4xGfz9rxQ; Sat, 13 Nov 2021 21:04:32 +0100 (CET) From: Vinicius Monego Date: Sat, 13 Nov 2021 20:02:30 +0000 Message-Id: <20211113200230.192559-24-monego@posteo.net> In-Reply-To: <20211113200230.192559-1-monego@posteo.net> References: <20211113200230.192559-1-monego@posteo.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1636833943; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=Q2vBw0Tq8J34NubwHxdGcK9Bt/3UATPyayLAsTprBHw=; b=Y8xDGBYJi0AQeZpzAGVApHrJgNJIDPOW4OJfKnUriAuuQsMJNF/DWznUhyXf+366FqCjKz 8a1Brg2imHldQhCMg1MfUswGy7RsmK9K5yy4qRU1laO0ZNpluFRtcgrxuXDDsACwH8Zn4q +CzDq7AmNvkR3eYdQH1Nedo1opq8AbJEiBXyJ3DcqYfMarAOPv1/iaBqW6V9LuYV9kv+Oe M5Zklbk1XUUY+uUk9hGolNb5jWphzzzOESIN4ZXp4AFCix5UIovluHb8H+sDHOqHFR+GeK +cHWSpOSpg2VhNQ2MIn38mRnZ5uICyoYA77N51if1rKrtezxtkrOAKGPzPGB1Q== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1636833943; a=rsa-sha256; cv=none; b=OklPUXLQbYzo1Et3pID+gvxOy62h5yzFXgfpZShXxz4pOZnnQq3lGCNKxe7p/23CAjFSFm WwxJIwZovN2fVBmPydcaIVafRvxbwPFDI8fQcIyQq7UjgoZHqejjqS3upPBwCsctx5X4Bj gjEcKeNcUc329hUTh1+4wO3DEG0Aaavv+d8+PMGRKZ9V/2CQJmjG7PiWFhMjqfghm/gE9/ 3ZbnCqpTAM04aFM4STEUbSmLwK33bE6L/FS+eBgdQOL05gUERUKFXTRph3LK4HmE3c22go YAg2yKy15NLqSnlVbdlSL8tKrBArcEDVRgKemBR0VXmsM9kkAlPmh4d0yVHIQw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=posteo.net header.s=2017 header.b=C8k6SFy2; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: -0.54 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=posteo.net header.s=2017 header.b=C8k6SFy2; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: D93423192E X-Spam-Score: -0.54 X-Migadu-Scanner: scn0.migadu.com X-TUID: yUvHG+iGYi2b * gnu/packages/printers.scm (octoprint): New variable. --- gnu/packages/printers.scm | 118 +++++++++++++++++++++++++++++++++++++- 1 file changed, 117 insertions(+), 1 deletion(-) diff --git a/gnu/packages/printers.scm b/gnu/packages/printers.scm index f1535d5db1..c2189a1b79 100644 --- a/gnu/packages/printers.scm +++ b/gnu/packages/printers.scm @@ -25,9 +25,15 @@ #:use-module (guix build-system gnu) #:use-module (guix build-system python) #:use-module ((guix licenses) #:prefix license:) + #:use-module (gnu packages check) #:use-module (gnu packages libusb) #:use-module (gnu packages pkg-config) - #:use-module (gnu packages qt)) + #:use-module (gnu packages python) + #:use-module (gnu packages python-check) + #:use-module (gnu packages python-web) + #:use-module (gnu packages python-xyz) + #:use-module (gnu packages qt) + #:use-module (gnu packages web)) ;; This is a module for packages related to printer-like devices, but not ;; related to CUPS. @@ -95,6 +101,116 @@ uploaded files that are known to cause issues while printing and which in the past have caused support requests on OctoPrint's Community Forums.") (license license:agpl3))) +(define-public octoprint + (package + (name "octoprint") + (version "1.7.2") + (source + (origin + (method git-fetch) ; no tests in the PyPI tarball. + (uri (git-reference + (url "https://github.com/OctoPrint/OctoPrint") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0zvjnbcmszifvr02rsmfzb5v24f1ss8klrnkd9fcg2351nkpqbbd")) + (modules '((guix build utils))) + (snippet + '(begin + ;; Remove bundled font-awesome. + (delete-file-recursively "src/octoprint/static/vendor") #t)))) + (build-system python-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'relax-version-requirements + ;; Octoprint maintains strict version requirements for Python2 + ;; compatibility. We're not packaging with Python2, so modify + ;; setup.py to relax those versions. Octoprint will drop Python2 + ;; support in version 2.0 so we won't need this change after it. + (lambda _ + (substitute* "setup.py" + (("cachelib>=0.1,<0.2") "cachelib>=0.1") + (("colorlog>=5.0.1,<6") "colorlog>=5.0.1") + (("markdown>=3.1,<3.2") "markdown>=3.1,<4") + (("watchdog==0.10.4") "watchdog>=0.10.4") + (("wrapt>=1.12.1,<1.13") "wrapt>=1.12.1") + (("zeroconf>=0.33,<0.34") "zeroconf>=0.33") + ;; Relax core packages that are outdated in Guix. + (("Jinja2>=2.11.3,<3") "Jinja2>=2.11.2,<3") + (("requests>=2.26.0,<3") "requests>=2.25,<3")))) + (add-before 'check 'set-home + (lambda _ + (setenv "HOME" (getcwd)))) ; some tests need a writable home + (replace 'check + (lambda* (#:key inputs outputs tests? #:allow-other-keys) + (when tests? + (add-installed-pythonpath inputs outputs) + (invoke "python" "-m" "pytest" "tests" "-k" + (string-append + ;; These tests try to write to the source tree and + ;; fail with PermissionError. + "not test_add_file_overwrite" + " and not test_set_external_modification")))))))) + (native-inputs + `(("python-ddt" ,python-ddt) + ("python-mock" ,python-mock) + ("python-pytest" ,python-pytest) + ("python-pytest-doctest-custom" + ,python-pytest-doctest-custom))) + (inputs + `(("octoprint-filecheck" ,octoprint-filecheck) + ("octoprint-firmwarecheck" ,octoprint-firmwarecheck) + ("octoprint-pisupport" ,octoprint-pisupport) + ("python-appdirs" ,python-appdirs) + ("python-blinker" ,python-blinker) + ("python-cachelib" ,python-cachelib) + ("python-click" ,python-click) + ("python-colorlog" ,python-colorlog) + ("python-emoji" ,python-emoji) + ("python-feedparser" ,python-feedparser) + ("python-filetype" ,python-filetype) + ("python-flask" ,python-flask) + ("python-flask-assets" ,python-flask-assets) + ("python-flask-babel" ,python-flask-babel) + ("python-flask-login" ,python-flask-login) + ("python-future" ,python-future) + ("python-immutabledict" ,python-immutabledict) + ("python-itsdangerous" ,python-itsdangerous) + ("python-jinja2" ,python-jinja2) + ("python-markdown" ,python-markdown) + ("python-markupsafe" ,python-markupsafe) + ("python-netaddr" ,python-netaddr) + ("python-netifaces" ,python-netifaces) + ("python-pathvalidate" ,python-pathvalidate) + ("python-pkginfo" ,python-pkginfo) + ("python-psutil" ,python-psutil) + ("python-pylru" ,python-pylru) + ("python-pyserial" ,python-pyserial) + ("python-pyyaml" ,python-pyyaml) + ("python-regex" ,python-regex) + ("python-requests" ,python-requests) + ("python-sarge" ,python-sarge) + ("python-semantic-version" + ,python-semantic-version) + ("python-sentry-sdk" ,python-sentry-sdk) + ("python-tornado" ,python-tornado-6) + ("python-unidecode" ,python-unidecode) + ("python-watchdog" ,python-watchdog) + ("python-websocket-client" + ,python-websocket-client) + ("python-werkzeug" ,python-werkzeug) + ("python-wrapt" ,python-wrapt) + ("python-zeroconf" ,python-zeroconf) + ("python-zipstream-new" ,python-zipstream-new))) + (home-page "https://octoprint.org") + (synopsis "Web interface for 3D printers") + (description "OctoPrint provides a snappy web interface for controlling +consumer 3D printers.") + ;; The web interface contains many third party JavaScript libraries under + ;; different licenses. Check THIRDPARTYLICENSES.md. + (license license:agpl3))) + (define-public robocut (package (name "robocut") -- 2.30.2