From patchwork Fri Nov 26 00:58:49 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Morgan Smith X-Patchwork-Id: 34824 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 129B827BBEA; Fri, 26 Nov 2021 01:00:17 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,MSGID_FROM_MTA_HEADER, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 8304E27BBE9 for ; Fri, 26 Nov 2021 01:00:16 +0000 (GMT) Received: from localhost ([::1]:60324 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mqPb5-0006xh-Ly for patchwork@mira.cbaines.net; Thu, 25 Nov 2021 20:00:15 -0500 Received: from eggs.gnu.org ([209.51.188.92]:53568) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mqPat-0006xU-2z for guix-patches@gnu.org; Thu, 25 Nov 2021 20:00:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:46739) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mqPas-0003UL-L8 for guix-patches@gnu.org; Thu, 25 Nov 2021 20:00:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mqPas-00030S-KH for guix-patches@gnu.org; Thu, 25 Nov 2021 20:00:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#52116] [PATCH 2/2] gnu: Add printrun. Resent-From: Morgan.J.Smith@outlook.com Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 26 Nov 2021 01:00:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 52116 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 52116@debbugs.gnu.org Cc: Morgan Smith Received: via spool by 52116-submit@debbugs.gnu.org id=B52116.163788837611486 (code B ref 52116); Fri, 26 Nov 2021 01:00:02 +0000 Received: (at 52116) by debbugs.gnu.org; 26 Nov 2021 00:59:36 +0000 Received: from localhost ([127.0.0.1]:58284 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mqPaS-0002zC-AP for submit@debbugs.gnu.org; Thu, 25 Nov 2021 19:59:36 -0500 Received: from mail-dm3nam07olkn2073.outbound.protection.outlook.com ([40.92.43.73]:32864 helo=NAM02-DM3-obe.outbound.protection.outlook.com) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mqPaQ-0002yy-Ab for 52116@debbugs.gnu.org; Thu, 25 Nov 2021 19:59:34 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ga1lim6D4IweRkDCBRKj1kj3gns7qRGPI38y1Ro7CV32mdz2rpkzbZiCSix90QLYjn2MqqSYvWoG8H5av8Ql9VMY9/DFwd+Y5uRVINuiRQeI++sO8U42epIKeXxubGMUVCbK+ZQXfVghkhFjLZoq/GJkSn1PXX0stfN0P7hCMAtyJVcbDJ12gsZTP73PW73mAdzYb0dhki+//Oph1DqFHSuKcipmnQVJVWRbZinoclJP/Ho4r8YZlrr3HINt7K+HFDms9f75VGOJRk8CUCOGMSBIft7wKUcnf5DX2RinbwsmZMAtFClTTOKyXZDu/JFLpwfyYubByXgomrGOm3YAJQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=s9FKLsPyXWt40YW0VBoio9g0Dj8C9b1E+G/ABX2jVic=; b=d+8mnmpH32+0+dVnDkcgKVJw80p+q1atiqvWKh0sSr/VXlLonIUlNNptwVBJWfUp8GfzSaU3JsunHb9GVem1UFQod6hpKW3DdHAmXFXdQvaHQ7jpvZz/EeIn1apctjfKn6mcuJSEwQ5UkahUHg7dNLa10Xa9tjC/Ea1Gyur420WL0YtNIXqcd9+CfUOEAR0wmN7wUtxdYioWjFMhKJE8e3PCARNhzpGrmXKt3RBirH2V48gyJhkAEVvpFYH2TvoAUiGKi2MI1g/PoKJRL0Jr+d3jLiHGxWE5LZB5waH54J3SnVP2GMMvil/3D6w/FJOi+ns4CWqeU6YPYq+spbIibQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=s9FKLsPyXWt40YW0VBoio9g0Dj8C9b1E+G/ABX2jVic=; b=qPzRuySrrfIpPPcgzGWtZfgqRRW4XyUJQ801uNAGJfYSzrbyBenmKI1Tra+hGWCo8AVAJoHyjmMamYgBg3ODSIphpiJeypda9YRLVnJ2/ktkBKkXt9Dx925gqsrnNFb+3Ajp8RH785grfuy+a3GPR9tNwKx/rHcBB3kavvR61gfKLVfaQ6pnhImVp5WjsntioAWKTmob8rXGbxkEHaxeqQZfsX9hZHpdRxx9f/SXBJ1vyemK6m/lSfVxXts7Xr6LRCzTg7rjlWtbMjFiwFLDAHVVPCoHL+Os0DMNolta8EXPkBc072uxjBVFp/tXyfeZo7kvbJOFYEGgZzCwTJnqVw== Received: from BYAPR05MB4023.namprd05.prod.outlook.com (2603:10b6:a02:87::30) by BYAPR05MB4262.namprd05.prod.outlook.com (2603:10b6:a03::31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4734.14; Fri, 26 Nov 2021 00:59:28 +0000 Received: from BYAPR05MB4023.namprd05.prod.outlook.com ([fe80::d0d:4cad:e0e6:dca]) by BYAPR05MB4023.namprd05.prod.outlook.com ([fe80::d0d:4cad:e0e6:dca%6]) with mapi id 15.20.4734.020; Fri, 26 Nov 2021 00:59:28 +0000 From: Morgan.J.Smith@outlook.com Date: Thu, 25 Nov 2021 19:58:49 -0500 Message-ID: X-Mailer: git-send-email 2.34.0 In-Reply-To: <20211126005847.29607-1-Morgan.J.Smith@outlook.com> References: <20211126005847.29607-1-Morgan.J.Smith@outlook.com> X-TMN: [pyCLLKa3bPMjInXsByc3gX/JY0LceGbP] X-ClientProxiedBy: YQXPR0101CA0003.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:c00:15::16) To BYAPR05MB4023.namprd05.prod.outlook.com (2603:10b6:a02:87::30) X-Microsoft-Original-Message-ID: <20211126005847.29607-2-Morgan.J.Smith@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost (170.52.80.188) by YQXPR0101CA0003.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:c00:15::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4734.21 via Frontend Transport; Fri, 26 Nov 2021 00:59:27 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 6abaf4bd-1f9b-4ba3-f892-08d9b077ff1d X-MS-Exchange-SLBlob-MailProps: q+fD6XS3/UKxmD0LdNVdOI+YmrPSFfTHvvnzjfXQDzflEitc971QJjzUl+rirXPMbZr41/PMC/aht7WFrK3/XI6s9X0P9OMAc2gkT8aRjANyaaKvNTxZ6loc4uxeosDnfG1coe4P9EY2/iKtcLHeT8mAGMDTaMALtqcgVT9WJPMjMjyUO6yYxGWibAgQE9fyqwQ1x6w5RJKmif9nliHYF0eN5cfaV1RlfxXWgvFbC8EErA3jmXez1wuScvuJN5hmb961nFQyMRklcv7yI1tWmW0igjOk/KMhHs//sRODsA9h7Z0KejfrH1T9Us/7rx5d+aoVCrxfiqe/YeHG048EW7t8R7eUW78Lf4UbEUBa1M8Z4Ovv8+1+OevMT9tS+N1yWYAx7VHqhvhR9r5DL3zLP/cXJSvU0IJ4C7NMvet1qWDHVhTwPd45vgJAJkgClkWG5do79U9F9nzMLlpAhOujKbQvlfsHpfZSos30bdl6cVBCMcqrp8VxECuS+VC/DTn8CxbheEC3fyk1R2sV5ov/ZaCmGMy3rUp/1B3xQom1q1wzRJvG3AzK789lwqRyPbSQ7wM8IdUh9vgJ4+gvHxNNMmMbFSwY59RGmkWg3eDJs1LiUxhtzzU4J1Fx5s1LyUoRilARqxVB1mSkAhMOjRMJ9SVbMQxjYoi5m92ENZuD9VQLMIxyWh8KFwI538OVy+r+zFzcKocNCYs/977d3GwMPQ== X-MS-TrafficTypeDiagnostic: BYAPR05MB4262: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: KNEqMz30yuofDnfVKdZgVFnwTcsmh9bEDQUuZgOywyMfWNO0JvSHMWmOfLwles8lRHhd77+5ckSfAby0yR5SYHyMAyKtxO8JGgdEz/HAkN1Yh9ugT+P5g9Zegl+Cd6+6tnP+Ldl1ispIr47VHJlGn3uvt6dZTKTRtEGQ/3vg4esOzOAh2jjLNJyVO14KDt/MbSl8F9xkEYpJCHV2f8aIDD5uN3PLwokVCiL//tRD7c5k5PEM5v6/sGbPqe3hZz6KbCvYB0nJmYANDvTz8tqzd80DZA12LycBIY2LGwzDoxWzl3uGdge3hTsuQBXFOdrRKlfL/M2kimArgnwIX74egCkzWBIdHae4qRpwUpwWlnA+QH0/4UW+QBgHOYdEQfuoEycGkxrt0EJImht3qTh/gydhZF7WQ5jiQSvRtVRWOXONfv63+mA0Rcq2lmGPYra1GRYpgmJ9gCCIMbW6VMopPvRGIe3QCBeBPlAZKrfPD+I6eGtamaxbF5NyUBascScCnW7Iz7XGxFK9RQ3dKvOJjETKAco6WChMbY8QJKNSCf30wib/UYfaEk0+Enp5U9yJ0KuJRdJhffJRTqsqMaxKNksEyOCw+hVruAd8IU5Xsu1bCRMhi+7X7JpiknKtFbKl X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: BZNvwKP8MXsVY236EMrVTpMlFxHX5EVOuwmR0MCbHB/Qy/MJkpV+dayWn9xZaO7JVPumMhx/hgvIQPaRMGeH2sjHIBN5DPS9kyGJd47POWXGy2Hl+o43IaOmZNm0qKWtZFsREACAkH3EWq4ugZ1gmbx2VjZ5ZvkT3DLoqsnwG44P1F39dBmj2OEwMLTNkMANEb/K+0vBOgIA75SA6FYhDXGn33n7ZjcEaooaksoC02F3/XN2BgYYepZ1eAL88x0Eag3GoViksQyN/T3IQuXmLeiLdDt/ZVFZ2UGCxr/aEYGJeOIUwSw0y8ru2R3TUbpvuochVkpW2mQsubT5MBxXiKpgZiZRS1drr/9G2e09ImUSVheV75dsuPKNZrT0sVqzh4anHIHSSnAr7mO9THL7idbp7gXfIZiLIs6dNmrhhve05roK5eJF8p8PmMFC+OEkS/UEPWLj9u8FNqdmCLgC5UxN85KZuvL2DRXYTs1W/4r6RGZyS+Ea8yPxAuQfUOfCplPnAxVJDUZj+1D25HJkRZfGi6MF9yfCvkEtSJu8ygdRLkRa/I9eDvRmimfp+SwxKAqJ+0rVssacE/OPBPLkzexIAssFLHxeUu3vgaWFsUjxtuxmEwl9+Z7hs8LYEoUHe+D47vyqytlJvBfUZ210Z6YegEOZhCZ4Ha8h4rmnnqzJ4imsdJtvQbmqv0HN5bBKPGDT+bqxlxwsL1BsHzgfbg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6abaf4bd-1f9b-4ba3-f892-08d9b077ff1d X-MS-Exchange-CrossTenant-AuthSource: BYAPR05MB4023.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Nov 2021 00:59:28.0495 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR05MB4262 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+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches From: Morgan Smith * gnu/packages/printers.scm (printrun): New variable. --- gnu/packages/printers.scm | 66 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 66 insertions(+) diff --git a/gnu/packages/printers.scm b/gnu/packages/printers.scm index 619a2750e0..91ab1a0dfb 100644 --- a/gnu/packages/printers.scm +++ b/gnu/packages/printers.scm @@ -25,6 +25,7 @@ (define-module (gnu packages printers) #:use-module (guix download) #:use-module (guix build-system gnu) #:use-module (guix build-system perl) + #:use-module (guix build-system python) #:use-module (guix build-system cmake) #:use-module ((guix licenses) #:prefix license:) #:use-module (gnu packages compression) @@ -32,6 +33,7 @@ (define-module (gnu packages printers) #:use-module (gnu packages python) #:use-module (gnu packages python-xyz) #:use-module (gnu packages python-science) + #:use-module (gnu packages libffi) #:use-module (gnu packages libusb) #:use-module (gnu packages elf) #:use-module (gnu packages gcc) @@ -46,6 +48,8 @@ (define-module (gnu packages printers) #:use-module (gnu packages perl-check) #:use-module (gnu packages pkg-config) #:use-module (gnu packages web) + #:use-module (gnu packages wxwidgets) + #:use-module (gnu packages xml) #:use-module (gnu packages xorg) #:use-module (gnu packages qt)) @@ -288,3 +292,65 @@ (define-public slic3rapp (synopsis "") (description "") (license #f))) + +(define-public printrun + (package + (name "printrun") + (version "2.0.0rc8") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/kliment/Printrun") + (commit (string-append "printrun-" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0bvwrfhmn2km03fp343bd9ddjxv8sp3d0qdxk786rflw4yksbxgn")))) + (build-system python-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-files + (lambda* (#:key outputs #:allow-other-keys) + (substitute* "requirements.txt" + (("== 4.1.0") ">= 4.0.0") ;; wxPython + (("dbus-python.*") "")) ;; Not sure why it can't find dbus-python + (delete-file "printrun/power/osx.py") + (delete-file "printrun/packer.py") ;; Uses a non-free library + + ;; Changing the value of python variables + (substitute* "printrun/utils.py" + (("shared_pronterface_images_dir = .*") + (string-append "shared_pronterface_images_dir = \"" (assoc-ref outputs "out") + "/share/pronterface/images\"\n")) + (("shared_pixmaps_dir = .*") + (string-append "shared_pixmaps_dir = \"" (assoc-ref outputs "out") + "/share/pixmaps\"\n")) + (("shared_pronterface_dir = .*") + (string-append "shared_pixmaps_dir = \"" (assoc-ref outputs "out") + "/share/pronterface\"\n"))))) + (add-before 'check 'setup-display + (lambda* (#:key tests? inputs outputs #:allow-other-keys) + (when tests? + (system "Xvfb :1 &") + (setenv "DISPLAY" ":1"))))))) + (inputs + `(("python-appdirs" ,python-appdirs) + ("python-cairocffi" ,python-cairocffi) + ("python-cairosvg" ,python-cairosvg) + ("python-cffi" ,python-cffi) + ("python-dbus" ,python-dbus) + ("python-lxml" ,python-lxml) + ("python-numpy" ,python-numpy) + ("python-psutil" ,python-psutil) + ("python-pyglet" ,python-pyglet) + ("python-pyserial" ,python-pyserial) + ("python-wxpython" ,python-wxpython))) + (native-inputs + `(("python-cython" ,python-cython) + ("xvfb" ,xorg-server-for-tests))) + (home-page "https://github.com/kliment/Printrun/") + (synopsis "Printrun is a full suite of host interfaces for 3D printers and CNC") + (description "Printrun consists of printcore, pronsole and pronterface, and a small +collection of helpful scripts.") + (license license:gpl3+)))