me
/
guix
Archived
1
0
Fork 0
Code

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.

Signed-off-by: Guillaume Le Vaillant <glv@posteo.net>
master
Petr Hodina 2022-01-09 23:04:57 +01:00 committed by Guillaume Le Vaillant
parent 4c1dff9abe
commit 4a7bbfeef6
No known key found for this signature in database
GPG Key ID: 6BE8208ADF21FE3F
1 changed files with 70 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

115
gnu/packages/engineering.scm
View File

@ -25,7 +25,7 @@
;;; Copyright © 2021 Gerd Heber <gerd.heber@gmail.com> ;;; Copyright © 2021 Gerd Heber <gerd.heber@gmail.com>
;;; Copyright © 2021, 2022 Guillaume Le Vaillant <glv@posteo.net> ;;; Copyright © 2021, 2022 Guillaume Le Vaillant <glv@posteo.net>
;;; Copyright © 2021 Ivan Gankevich <i.gankevich@spbu.ru> ;;; Copyright © 2021 Ivan Gankevich <i.gankevich@spbu.ru>
;;; Copyright © 2021 Petr Hodina <phodina@protonmail.com> ;;; Copyright © 2021, 2022 Petr Hodina <phodina@protonmail.com>
;;; Copyright © 2021 Foo Chuan Wei <chuanwei.foo@hotmail.com> ;;; Copyright © 2021 Foo Chuan Wei <chuanwei.foo@hotmail.com>
;;; Copyright © 2022 Evgeny Pisemsky <evgeny@pisemsky.com> ;;; Copyright © 2022 Evgeny Pisemsky <evgeny@pisemsky.com>
;;; ;;;
@ -65,6 +65,7 @@
#:use-module (gnu packages algebra) #:use-module (gnu packages algebra)
#:use-module (gnu packages autotools) #:use-module (gnu packages autotools)
#:use-module (gnu packages base) #:use-module (gnu packages base)
#:use-module (gnu packages bash)
#:use-module (gnu packages bdw-gc) #:use-module (gnu packages bdw-gc)
#:use-module (gnu packages bison) #:use-module (gnu packages bison)
#:use-module (gnu packages boost) #:use-module (gnu packages boost)
@ -119,6 +120,7 @@
#:use-module (gnu packages python-xyz) #:use-module (gnu packages python-xyz)
#:use-module (gnu packages qt) #:use-module (gnu packages qt)
#:use-module (gnu packages readline) #:use-module (gnu packages readline)
#:use-module (gnu packages ruby)
#:use-module (gnu packages serialization) #:use-module (gnu packages serialization)
#:use-module (gnu packages sqlite) #:use-module (gnu packages sqlite)
#:use-module (gnu packages swig) #:use-module (gnu packages swig)
@ -928,15 +930,15 @@ Emacs).")
(define-public kicad (define-public kicad
(package (package
(name "kicad") (name "kicad")
(version "5.1.12") (version "6.0.1")
(source (source (origin
(origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://gitlab.com/kicad/code/kicad.git") (url "https://gitlab.com/kicad/code/kicad.git")
(commit version))) (commit version)))
(sha256 (sha256
(base32 "0kgikchqxds3mp71nkg307mr4c1dgv8akbmksz4w9x8jg4i1mfqq")) (base32
"1vpcbhhw8844hm6vpk3kk405wak531pvcvcpc66z0b48iprk3imr"))
(file-name (git-file-name name version)))) (file-name (git-file-name name version))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
@ -944,12 +946,12 @@ Emacs).")
#:tests? #f ;no tests #:tests? #f ;no tests
#:build-type "Release" #:build-type "Release"
#:configure-flags #:configure-flags
,#~(list ,#~(list "-DKICAD_SCRIPTING_PYTHON3=ON"
"-DKICAD_SCRIPTING_PYTHON3=ON"
"-DKICAD_SCRIPTING_WXPYTHON_PHOENIX=ON"
"-DCMAKE_BUILD_WITH_INSTALL_RPATH=TRUE"
(string-append "-DOCC_INCLUDE_DIR=" (string-append "-DOCC_INCLUDE_DIR="
#$(this-package-input "opencascade-occt") "/include/opencascade")) #$(this-package-input "opencascade-occt")
"/include/opencascade")
"-DKICAD_SCRIPTING_WXPYTHON_PHOENIX=ON"
"-DCMAKE_BUILD_WITH_INSTALL_RPATH=TRUE")
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'unpack 'fix-ngspice-detection (add-after 'unpack 'fix-ngspice-detection
@ -969,29 +971,22 @@ Emacs).")
(substitute* "common/lib_tree_model.cpp" (substitute* "common/lib_tree_model.cpp"
(("#include <eda_pattern_match.h>" all) (("#include <eda_pattern_match.h>" all)
(string-append "#include <algorithm>\n" all))))) (string-append "#include <algorithm>\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))
(add-after 'install 'wrap-program (add-after 'install 'wrap-program
;; Ensure correct Python at runtime. ;; Ensure correct Python at runtime.
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out")) (let* ((out (assoc-ref outputs "out"))
(python (assoc-ref inputs "python")) (python (assoc-ref inputs "python"))
(file (string-append out "/bin/kicad")) (file (string-append out "/bin/kicad"))
(path (string-append (path (string-append out "/lib/python"
out ,(version-major+minor (package-version
"/lib/python" python))
,(version-major+minor
(package-version python))
"/site-packages:" "/site-packages:"
(getenv "GUIX_PYTHONPATH")))) (getenv "GUIX_PYTHONPATH"))))
(wrap-program file (wrap-program file
`("GUIX_PYTHONPATH" ":" prefix (,path)) `("GUIX_PYTHONPATH" ":" prefix
(,path))
`("PATH" ":" prefix `("PATH" ":" prefix
(,(string-append python "/bin:"))))) (,(string-append python "/bin:"))))))))))
#t)))))
(native-search-paths (native-search-paths
(list (search-path-specification (list (search-path-specification
(variable "KICAD") ;to find kicad-doc (variable "KICAD") ;to find kicad-doc
@ -1008,31 +1003,31 @@ Emacs).")
(search-path-specification (search-path-specification
(variable "KISYS3DMOD") ;3D model path (variable "KISYS3DMOD") ;3D model path
(files '("share/kicad/modules/packages3d"))))) (files '("share/kicad/modules/packages3d")))))
(native-inputs (native-inputs (list boost
`(("boost" ,boost) desktop-file-utils
("desktop-file-utils" ,desktop-file-utils) gettext-minimal
("gettext" ,gettext-minimal) pkg-config
("kicad-i18n" ,kicad-i18n) swig
("pkg-config" ,pkg-config) zlib))
("swig" ,swig) (inputs (list bash-minimal
("zlib" ,zlib))) cairo
(inputs curl
`(("cairo" ,cairo) glew
("curl" ,curl) glm
("glew" ,glew) hicolor-icon-theme
("glm" ,glm) libngspice
("hicolor-icon-theme" ,hicolor-icon-theme) libsm
("libngspice" ,libngspice) mesa
("libsm" ,libsm) opencascade-occt
("mesa" ,mesa) openssl
("opencascade-occt" ,opencascade-occt) python-wrapper
("openssl" ,openssl) gtk+
("python" ,python-wrapper) wxwidgets
("wxwidgets" ,wxwidgets) python-wxpython))
("wxpython" ,python-wxpython)))
(home-page "https://www.kicad.org/") (home-page "https://www.kicad.org/")
(synopsis "Electronics Design Automation Suite") (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 boards and electrical circuits. The software has a number of programs that
perform specific functions, for example, pcbnew (Editing PCB), eeschema (editing perform specific functions, for example, pcbnew (Editing PCB), eeschema (editing
electrical diagrams), gerbview (viewing Gerber files) and others.") electrical diagrams), gerbview (viewing Gerber files) and others.")
@ -1077,7 +1072,7 @@ translations for KiCad.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"026cz4zm903i75yhdvzha2nsnk4c0w07q3gd3xw3jmsmn18imgm3")))) "0zaafa9ckvdgsim6nhp3flj4r2fzzmwn054lc3iijwgga82qy7il"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
`(#:configure-flags (list "-DBUILD_FORMATS=html") `(#:configure-flags (list "-DBUILD_FORMATS=html")
@ -1085,15 +1080,15 @@ translations for KiCad.")
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(delete 'build)))) (delete 'build))))
(native-inputs (native-inputs (list asciidoc
`(("asciidoc" ,asciidoc) gettext-minimal
("gettext" ,gettext-minimal) git-minimal
("git" ,git-minimal) perl
("perl" ,perl) perl-unicode-linebreak
("perl-unicode-linebreak" ,perl-unicode-linebreak) perl-yaml-tiny
("perl-yaml-tiny" ,perl-yaml-tiny) po4a
("po4a" ,po4a) ruby-asciidoctor
("source-highlight" ,source-highlight))) source-highlight))
(home-page "https://kicad.org") (home-page "https://kicad.org")
(synopsis "KiCad official documentation") (synopsis "KiCad official documentation")
(description "This repository contains the official KiCad documentation.") (description "This repository contains the official KiCad documentation.")
@ -1111,7 +1106,7 @@ translations for KiCad.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"1zdajim409570xzis53kmrbdcf7000v2vmc90f49h214lrx2zhr2")))) "1azjx1bmxaz8bniyw75lq60mc8hvay00jn9qdc2zp7isy3c9ibp0"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
`(#:tests? #f)) ; no tests exist `(#:tests? #f)) ; no tests exist
@ -1140,7 +1135,7 @@ libraries.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"0qpii55dgv2gxqg1qq0dngdnbb9din790qi5qv0l6qqrzx843h5s")))) "0mv9xs0mmmfn0yhzx1v55r5app13ckagb16249rabyiz3v5crdpb"))))
(synopsis "Official KiCad footprint libraries") (synopsis "Official KiCad footprint libraries")
(description "This package contains the official KiCad footprint libraries."))) (description "This package contains the official KiCad footprint libraries.")))
@ -1157,7 +1152,7 @@ libraries.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"12w7m5nbk9kcnlnlg4sk1sd7xgb9i2kxfi0jcbd0phs89qyl7wjr")))) "0vwcbzq42hzjl4f0zjaswmiff1x59hv64g5n00mx1gl0gwngnyla"))))
(synopsis "Official KiCad 3D model libraries") (synopsis "Official KiCad 3D model libraries")
(description "This package contains the official KiCad 3D model libraries."))) (description "This package contains the official KiCad 3D model libraries.")))
@ -1174,7 +1169,7 @@ libraries.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"1fbhn1l3j2rwc29aida9b408wif55i23bp9ddcs7dvf83smjm05g")))) "13h9ly6amiwm7zkwa2fd9730kh295ls8j95fszlfjp9rczv2yyzm"))))
(synopsis "Official KiCad project and worksheet templates") (synopsis "Official KiCad project and worksheet templates")
(description "This package contains the official KiCad project and (description "This package contains the official KiCad project and
worksheet templates."))) worksheet templates.")))