From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id aF8rOm7ncGHR1QAAgWs5BA (envelope-from ) for ; Thu, 21 Oct 2021 06:07:10 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id KJq3NW7ncGGoeAAAbx9fmQ (envelope-from ) for ; Thu, 21 Oct 2021 04:07:10 +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 629DF9EEC for ; Thu, 21 Oct 2021 06:07:10 +0200 (CEST) Received: from localhost ([::1]:44394 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mdPMD-0006Ln-GA for larch@yhetil.org; Thu, 21 Oct 2021 00:07:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40264) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mdPKD-0004q2-Dx for guix-patches@gnu.org; Thu, 21 Oct 2021 00:05:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:44477) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mdPKD-0001r0-42 for guix-patches@gnu.org; Thu, 21 Oct 2021 00:05:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mdPKC-0005jD-Vg for guix-patches@gnu.org; Thu, 21 Oct 2021 00:05:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#51314] [PATCH 29/29] gnu: Add octoprint. Resent-From: Vinicius Monego Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 21 Oct 2021 04:05:04 +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.163478907721941 (code B ref 51314); Thu, 21 Oct 2021 04:05:04 +0000 Received: (at 51314) by debbugs.gnu.org; 21 Oct 2021 04:04:37 +0000 Received: from localhost ([127.0.0.1]:56017 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mdPJl-0005hp-97 for submit@debbugs.gnu.org; Thu, 21 Oct 2021 00:04:37 -0400 Received: from mout01.posteo.de ([185.67.36.65]:49851) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mdPJj-0005hP-BV for 51314@debbugs.gnu.org; Thu, 21 Oct 2021 00:04:36 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id C71C2240029 for <51314@debbugs.gnu.org>; Thu, 21 Oct 2021 06:04:29 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1634789069; bh=Vh8H21BMXiEHaf+vag7t1ori8Q1IEAt66N8sdc59dSA=; h=From:To:Cc:Subject:Date:From; b=XOxBynBCtQEGhtYDxAQQn/GZJN2KAwd17xxMBrC+OHY3AEYlSjgpLQJqZRV1WEmT7 +xf94e/NKD0IF6gB7HG2ToS330ZGkrv57czOfXnnfCEYcIqwtkTKjYJc0MnFPh9He/ tW0P8IhEGSzDg+I5ZSup5jY1e+sF/TSdd1TT1xzydmTqtDf9HwjcCoWAkOpIn9RqTR bGX69YeoOakKN75rw5jAG9BYy3Yr14vtYMq1TzTP+hZAI5R+CljbZYw4gIiN2MtvZ8 O/835GzpR0mFwOSFBiEW7dFLvlMXV8pE+8N9m/+f3f/8DdnyhqM6z1FChAeEbu63SM BfSjU24xNhz0w== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4HZYlJ6Yymz6tmD; Thu, 21 Oct 2021 06:04:28 +0200 (CEST) From: Vinicius Monego Date: Thu, 21 Oct 2021 04:02:00 +0000 Message-Id: <20211021040200.241873-25-monego@posteo.net> In-Reply-To: <20211021040200.241873-1-monego@posteo.net> References: <20211021040200.241873-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 ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1634789230; 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=MrPRRFrKWN0ku+STSU4fRF8vVmSbv9mMDdbmxrMbI7s=; b=n0DG4Crx4ALm0HuVK42FwX7/g8dx9DI+AVT8SF8GkwyBgRBI+ETgdOWsJ1BK9ymEhZgMxg y+QmiUPXKY2l1N0AlKpYmK+NRsvedsB7s8idiHPVHec0eIU/BqpQ1Vgf58/zkWbwSk8c3h L78MZId2LX7cV9Ssy9bXY+UYyxIp/3X6GPp418Ef64IYwKxHL3HnIsd3yODFWTftTFln/4 0JOzAwe2YvvN6kEb9f8MPC7W9rtEpxpprOwo0kg0TYKBw4yRNfGh5W6REzTaD9gc33YJCG xEN4ujynIQGwvFKZuLMsj9EbLcOauFWwgSxQvtf7JLgT2x3vkgXNKpUF/xyBQw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1634789230; a=rsa-sha256; cv=none; b=Wn+VhgxXiFRnqCSRu6q1bcGUoBnPr+Oz7SXMK161NWEj1vXNLYdVlQrcDjjhyggjzqo99J GTPiScT0ykw1zqn0jPzv5dgElC7r7d+qpKO/ws6QFpHYW+ZhuRptBCbR5La2BEm/wvHenf uqxS+htuXwNr2lFR3U/fqdbZQT0Eq/NrWIUdWp7ViZxDGDO6mBO0ZVctAbjapWYBCRYw8l LJoUC8oeOvQO46T2UXESOl/YSAn/ct2iDTGQpvDNzjTbbAfyPNATLURLfssopDhKNLFVNU L8YI46Zb/06CqX+JFPp8tWNlZbBiYYDCZEUIJ94J/CxHwZetExJP0daAX1CFpw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=posteo.net header.s=2017 header.b=XOxBynBC; dmarc=fail reason="SPF not aligned (strict)" header.from=posteo.net (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: 3.67 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=posteo.net header.s=2017 header.b=XOxBynBC; dmarc=fail reason="SPF not aligned (strict)" header.from=posteo.net (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: 629DF9EEC X-Spam-Score: 3.67 X-Migadu-Scanner: scn0.migadu.com X-TUID: b7R049JHhWXz * gnu/packages/printers.scm (octoprint): New variable. --- gnu/packages/printers.scm | 115 +++++++++++++++++++++++++++++++++++++- 1 file changed, 114 insertions(+), 1 deletion(-) diff --git a/gnu/packages/printers.scm b/gnu/packages/printers.scm index 4056a66ad3..37e1734aad 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,113 @@ 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.0") + (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 "08a1in2kbgy4w02q2xkhp7m09mvw0hxn3fgcbi1z7f6hg8ibym9n")) + (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" + (("markdown>=3.1,<3.2") "markdown>=3.1,<4") + (("watchdog==0.10.4") "watchdog>=0.10.4") + ;; 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