From patchwork Wed Feb 9 11:12:52 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: phodina X-Patchwork-Id: 37136 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 0267427BBEA; Wed, 9 Feb 2022 11:14:25 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,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 D45F127BBE9 for ; Wed, 9 Feb 2022 11:14:23 +0000 (GMT) Received: from localhost ([::1]:37984 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nHkvW-0004IJ-UL for patchwork@mira.cbaines.net; Wed, 09 Feb 2022 06:14:22 -0500 Received: from eggs.gnu.org ([209.51.188.92]:47770) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nHkvD-000431-6c for guix-patches@gnu.org; Wed, 09 Feb 2022 06:14:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:56163) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nHkvC-0008Jm-SS for guix-patches@gnu.org; Wed, 09 Feb 2022 06:14:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nHkvC-00015t-Go for guix-patches@gnu.org; Wed, 09 Feb 2022 06:14:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#53149] [PATCH v3 1/3] gnu: opencascade-occt: Update to 7.6.0. Resent-From: phodina Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 09 Feb 2022 11:14:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 53149 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: Guillaume Le Vaillant Cc: "53149@debbugs.gnu.org" <53149@debbugs.gnu.org> Received: via spool by 53149-submit@debbugs.gnu.org id=B53149.16444051944137 (code B ref 53149); Wed, 09 Feb 2022 11:14:02 +0000 Received: (at 53149) by debbugs.gnu.org; 9 Feb 2022 11:13:14 +0000 Received: from localhost ([127.0.0.1]:50060 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nHkuM-00014b-FH for submit@debbugs.gnu.org; Wed, 09 Feb 2022 06:13:14 -0500 Received: from mail-4316.protonmail.ch ([185.70.43.16]:43893) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nHkuF-00013w-AX for 53149@debbugs.gnu.org; Wed, 09 Feb 2022 06:13:09 -0500 Date: Wed, 09 Feb 2022 11:12:52 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1644405175; bh=ugTOrlsKH/hL0xfiUmU0ShCjfK1sfE5wFt5Ewbc6dAI=; h=Date:To:From:Cc:Reply-To:Subject:Message-ID:In-Reply-To: References:From:To:Cc:Date:Subject:Reply-To:Feedback-ID: Message-ID; b=XH4CLwDu0oIFN5Zc/9Mwkwu/HE/kxBxhOH8MB4hRDfV3C+TsksDfzplKLlTIQ275j aGL3ED6jSc4FsbSw09OWblB7h32LMSOALE0MJYeS/Z8L1GV3rLqxQM8biNq/DdVihy vzItMkBDwrqEk2wk+0mhKq5fb8E+XStWwKxiAiTuTtuL+ctIRKXPNm9+87tdTxWH4B IBFQ4RqXScVpk87Lq/FCWP2xRV0aHVpdDykYazu3yYvPgAMxFQN0zaSCQDqOFDIQIx SMG7/Pc9Ia4ozLjDVxpftalTlwRGdfYkMePazOZp1tvcVU7aczu8ITuxizYRSy+Tym ++bxdyAIqnl0Q== Message-ID: In-Reply-To: <87y2302kp1.fsf@kitej> References: <19pc1sQZe7q77dBcvmMFNJ3D1N3AZxoRrMmkEg03_fFRK_E67EDc8aCaJNmfvr1pAjyQ8uxVyJugXe3SZFFBD5367YWTYLnqvoSGCRVs9mw=@protonmail.com> <87y2302kp1.fsf@kitej> MIME-Version: 1.0 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" Reply-to: phodina X-ACL-Warn: , phodina via Guix-patches X-Patchwork-Original-From: phodina via Guix-patches via From: phodina X-getmail-retrieved-from-mailbox: Patches Hi Guillaume, On Friday, January 28th, 2022 at 11:45 AM, Guillaume Le Vaillant wrote: > phodina via Guix-patches via guix-patches@gnu.org skribis: > > > From 64195144def5a3dfdd593494523dd44df39be6f0 Mon Sep 17 00:00:00 2001 > > > > From: Petr Hodina phodina@protonmail.com > > > > Date: Sun, 9 Jan 2022 23:04:57 +0100 > > > > Subject: [PATCH v2 2/3] gnu: kicad: Update to 6.0.1. > > > > - gnu/packages/engineering.scm (kicad): Update to 6.0.1. > > > > Applied guix style command. > > > > [native-inputs]: Remove kicad-i18n. Use new syntax. > > > > [inputs]: Add bash-minimal, gtk+ and use opencascade-occt instead of > > > > opencascade-oce. Use new syntax. > > > > [arguments]: Remove phase install-translations. > > Hi, > > If the kicad-i18n package is not used anymore, I guess its definition > > can be removed. > > Also, the kicad-doc, kicad-symbols, kicad-footprints, kicad-packages3d > > and kicad-templates packages inherit their version number from the kicad > > package. So when the version of the kicad package changes, their base32 > > hashes usually have to be updated, or they may fail to build. You're right about keeping the packages in sync. Here is an updated version + rebased on latest master. The changes for the dependent packages are in one commit. ---- Petr From 89772f0ae376ea69e1b1855ed23349191f9ffc3e Mon Sep 17 00:00:00 2001 From: Petr Hodina Date: Sun, 9 Jan 2022 23:04:57 +0100 Subject: [PATCH v3 2/3] gnu: kicad: Update to 6.0.1. * gnu/packages/engineering.scm (kicad): Update to 6.0.1. Applied guix style command. [native-inputs]: Remove kicad-i18n. Use new syntax. [inputs]: Add bash-minimal, gtk+ and use opencascade-occt instead of opencascade-oce. Use new syntax. [arguments]: Remove phase install-translations. (kicad-doc): Update to 6.0.1. [native-inputs]: Add ruby-asciidoctor. Simplify inputs. (kicad-symbols, kicad-footprints, kicad-packages3d, kicad-templates): Update to 6.0.1. diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index ca665385bc..e78a2c64d9 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -25,7 +25,7 @@ ;;; Copyright © 2021 Gerd Heber ;;; Copyright © 2021, 2022 Guillaume Le Vaillant ;;; Copyright © 2021 Ivan Gankevich -;;; Copyright © 2021 Petr Hodina +;;; Copyright © 2021, 2022 Petr Hodina ;;; Copyright © 2021 Foo Chuan Wei ;;; Copyright © 2022 Evgeny Pisemsky ;;; @@ -65,6 +65,7 @@ (define-module (gnu packages engineering) #:use-module (gnu packages algebra) #:use-module (gnu packages autotools) #:use-module (gnu packages base) + #:use-module (gnu packages bash) #:use-module (gnu packages bdw-gc) #:use-module (gnu packages bison) #:use-module (gnu packages boost) @@ -119,6 +120,7 @@ (define-module (gnu packages engineering) #:use-module (gnu packages python-xyz) #:use-module (gnu packages qt) #:use-module (gnu packages readline) + #:use-module (gnu packages ruby) #:use-module (gnu packages serialization) #:use-module (gnu packages sqlite) #:use-module (gnu packages swig) @@ -928,37 +930,41 @@ (define-public inspekt3d (define-public kicad (package (name "kicad") - (version "5.1.12") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://gitlab.com/kicad/code/kicad.git") - (commit version))) - (sha256 - (base32 "0kgikchqxds3mp71nkg307mr4c1dgv8akbmksz4w9x8jg4i1mfqq")) - (file-name (git-file-name name version)))) + (version "6.0.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.com/kicad/code/kicad.git") + (commit version))) + (sha256 + (base32 + "1vpcbhhw8844hm6vpk3kk405wak531pvcvcpc66z0b48iprk3imr")) + (file-name (git-file-name name version)))) (build-system cmake-build-system) (arguments `(#:out-of-source? #t - #:tests? #f ; no tests - #:build-type "Release" + #:tests? + #f ;no tests + #:build-type + "Release" #:configure-flags - ,#~(list - "-DKICAD_SCRIPTING_PYTHON3=ON" - "-DKICAD_SCRIPTING_WXPYTHON_PHOENIX=ON" - "-DCMAKE_BUILD_WITH_INSTALL_RPATH=TRUE" - (string-append "-DOCC_INCLUDE_DIR=" - #$(this-package-input "opencascade-occt") "/include/opencascade")) + (list "-DKICAD_SCRIPTING_PYTHON3=ON" + (string-append "-DOCC_INCLUDE_DIR=" + (assoc-ref %build-inputs "opencascade-occt") + "/include/opencascade") + "-DKICAD_SCRIPTING_WXPYTHON_PHOENIX=ON" + "-DCMAKE_BUILD_WITH_INSTALL_RPATH=TRUE") #:phases (modify-phases %standard-phases (add-after 'unpack 'fix-ngspice-detection (lambda* (#:key inputs #:allow-other-keys) (substitute* "eeschema/CMakeLists.txt" - (("NGSPICE_DLL_FILE=\"\\$\\{NGSPICE_DLL_FILE\\}\"") - (string-append "NGSPICE_DLL_FILE=\"" - (assoc-ref inputs "libngspice") - "/lib/libngspice.so\""))))) + (("NGSPICE_DLL_FILE=\"\\$\\{NGSPICE_DLL_FILE\\}\"") (string-append + "NGSPICE_DLL_FILE=\"" + (assoc-ref + inputs + "libngspice") + "/lib/libngspice.so\""))))) (add-after 'unpack 'fix-python-detection (lambda _ (substitute* "CMakeModules/FindPythonLibs.cmake" @@ -967,72 +973,67 @@ (define-public kicad (add-after 'unpack 'add-missing-include (lambda _ (substitute* "common/lib_tree_model.cpp" - (("#include " all) - (string-append "#include \n" all))))) - (add-after 'install 'install-translations - (lambda* (#:key inputs outputs #:allow-other-keys) - (copy-recursively (assoc-ref inputs "kicad-i18n") - (assoc-ref outputs "out")) - #t)) + (("#include " all) (string-append + "#include +" + all))))) (add-after 'install 'wrap-program ;; Ensure correct Python at runtime. (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (python (assoc-ref inputs "python")) + (let* ((out (assoc-ref outputs "out")) (python (assoc-ref inputs + "python")) (file (string-append out "/bin/kicad")) - (path (string-append - out - "/lib/python" - ,(version-major+minor - (package-version python)) - "/site-packages:" - (getenv "GUIX_PYTHONPATH")))) + (path (string-append out "/lib/python" + ,(version-major+minor (package-version + python)) + "/site-packages:" + (getenv "GUIX_PYTHONPATH")))) (wrap-program file - `("GUIX_PYTHONPATH" ":" prefix (,path)) - `("PATH" ":" prefix - (,(string-append python "/bin:"))))) - #t))))) + `("GUIX_PYTHONPATH" ":" prefix + (,path)) + `("PATH" ":" prefix + (,(string-append python "/bin:"))))) #t))))) (native-search-paths (list (search-path-specification - (variable "KICAD") ; to find kicad-doc + (variable "KICAD") ;to find kicad-doc (files '(""))) (search-path-specification (variable "KICAD_TEMPLATE_DIR") (files '("share/kicad/template"))) (search-path-specification - (variable "KICAD_SYMBOL_DIR") ; symbol path + (variable "KICAD_SYMBOL_DIR") ;symbol path (files '("share/kicad/library"))) (search-path-specification - (variable "KISYSMOD") ; footprint path + (variable "KISYSMOD") ;footprint path (files '("share/kicad/modules"))) (search-path-specification - (variable "KISYS3DMOD") ; 3D model path + (variable "KISYS3DMOD") ;3D model path (files '("share/kicad/modules/packages3d"))))) - (native-inputs - `(("boost" ,boost) - ("desktop-file-utils" ,desktop-file-utils) - ("gettext" ,gettext-minimal) - ("kicad-i18n" ,kicad-i18n) - ("pkg-config" ,pkg-config) - ("swig" ,swig) - ("zlib" ,zlib))) - (inputs - `(("cairo" ,cairo) - ("curl" ,curl) - ("glew" ,glew) - ("glm" ,glm) - ("hicolor-icon-theme" ,hicolor-icon-theme) - ("libngspice" ,libngspice) - ("libsm" ,libsm) - ("mesa" ,mesa) - ("opencascade-occt" ,opencascade-occt) - ("openssl" ,openssl) - ("python" ,python-wrapper) - ("wxwidgets" ,wxwidgets) - ("wxpython" ,python-wxpython))) + (native-inputs (list boost + desktop-file-utils + gettext-minimal + pkg-config + swig + zlib)) + (inputs (list bash-minimal + cairo + curl + glew + glm + hicolor-icon-theme + libngspice + libsm + mesa + opencascade-occt + openssl + python-wrapper + gtk+ + wxwidgets + python-wxpython)) (home-page "https://www.kicad.org/") (synopsis "Electronics Design Automation Suite") - (description "Kicad is a program for the formation of printed circuit + (description + "Kicad is a program for the formation of printed circuit boards and electrical circuits. The software has a number of programs that perform specific functions, for example, pcbnew (Editing PCB), eeschema (editing electrical diagrams), gerbview (viewing Gerber files) and others.") @@ -1077,23 +1078,24 @@ (define-public kicad-doc (file-name (git-file-name name version)) (sha256 (base32 - "026cz4zm903i75yhdvzha2nsnk4c0w07q3gd3xw3jmsmn18imgm3")))) + "0zaafa9ckvdgsim6nhp3flj4r2fzzmwn054lc3iijwgga82qy7il")))) (build-system cmake-build-system) (arguments `(#:configure-flags (list "-DBUILD_FORMATS=html") - #:tests? #f ; no test suite + #:tests? + #f ;no test suite #:phases (modify-phases %standard-phases (delete 'build)))) - (native-inputs - `(("asciidoc" ,asciidoc) - ("gettext" ,gettext-minimal) - ("git" ,git-minimal) - ("perl" ,perl) - ("perl-unicode-linebreak" ,perl-unicode-linebreak) - ("perl-yaml-tiny" ,perl-yaml-tiny) - ("po4a" ,po4a) - ("source-highlight" ,source-highlight))) + (native-inputs (list asciidoc + gettext-minimal + git-minimal + perl + perl-unicode-linebreak + perl-yaml-tiny + po4a + ruby-asciidoctor + source-highlight)) (home-page "https://kicad.org") (synopsis "KiCad official documentation") (description "This repository contains the official KiCad documentation.") @@ -1111,7 +1113,7 @@ (define-public kicad-symbols (file-name (git-file-name name version)) (sha256 (base32 - "1zdajim409570xzis53kmrbdcf7000v2vmc90f49h214lrx2zhr2")))) + "1azjx1bmxaz8bniyw75lq60mc8hvay00jn9qdc2zp7isy3c9ibp0")))) (build-system cmake-build-system) (arguments `(#:tests? #f)) ; no tests exist @@ -1140,7 +1142,7 @@ (define-public kicad-footprints (file-name (git-file-name name version)) (sha256 (base32 - "0qpii55dgv2gxqg1qq0dngdnbb9din790qi5qv0l6qqrzx843h5s")))) + "0mv9xs0mmmfn0yhzx1v55r5app13ckagb16249rabyiz3v5crdpb")))) (synopsis "Official KiCad footprint libraries") (description "This package contains the official KiCad footprint libraries."))) @@ -1157,7 +1159,7 @@ (define-public kicad-packages3d (file-name (git-file-name name version)) (sha256 (base32 - "12w7m5nbk9kcnlnlg4sk1sd7xgb9i2kxfi0jcbd0phs89qyl7wjr")))) + "0vwcbzq42hzjl4f0zjaswmiff1x59hv64g5n00mx1gl0gwngnyla")))) (synopsis "Official KiCad 3D model libraries") (description "This package contains the official KiCad 3D model libraries."))) @@ -1174,7 +1176,7 @@ (define-public kicad-templates (file-name (git-file-name name version)) (sha256 (base32 - "1fbhn1l3j2rwc29aida9b408wif55i23bp9ddcs7dvf83smjm05g")))) + "13h9ly6amiwm7zkwa2fd9730kh295ls8j95fszlfjp9rczv2yyzm")))) (synopsis "Official KiCad project and worksheet templates") (description "This package contains the official KiCad project and worksheet templates."))) -- 2.34.0