gnu: kicad: Update to 5.0.0.

* gnu/packages/engineering.scm (kicad): Update to 5.0.0.
[source]: Change from git to url-fetch.
[arguments]: Remove now unneeded build version parameter.
[inputs]: Add opencascade-oce.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
This commit is contained in:
Jonathan Brielmaier 2018-08-16 13:33:48 +02:00 committed by Ludovic Courtès
parent 906a396bff
commit b50658fe8a
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5

View file

@ -8,6 +8,7 @@
;;; Copyright © 2017 Julien Lepiller <julien@lepiller.eu> ;;; Copyright © 2017 Julien Lepiller <julien@lepiller.eu>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Clément Lassieur <clement@lassieur.org> ;;; Copyright © 2018 Clément Lassieur <clement@lassieur.org>
;;; Copyright © 2018 Jonathan Brielmaier <jonathan.brielmaier@web.de>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -680,24 +681,19 @@ (define-public libfive
(define-public ao (define-public ao
(deprecated-package "ao-cad" libfive)) (deprecated-package "ao-cad" libfive))
;; We use kicad from a git commit, because support for boost 1.61.0 has been
;; recently added.
(define-public kicad (define-public kicad
(let ((commit "5f4599fb56da4dd748845ab10abec02961d477f3")
(revision "2"))
(package (package
(name "kicad") (name "kicad")
(version (string-append "4.0-" revision "." (version "5.0.0")
(string-take commit 7)))
(source (source
(origin (origin
(method git-fetch) (method url-fetch)
(uri (git-reference (file-name (string-append name "-" version ".tar.xz"))
(url "https://git.launchpad.net/kicad") (uri (string-append
(commit commit))) "https://launchpad.net/kicad/5.0/" version "/+download/" name
"-" version ".tar.xz"))
(sha256 (sha256
(base32 "1833pln2975gmc5s18xf7s8m9vg834lmxxdjk0wlk3lq7bvjjnff")) (base32 "17nqjszyvd25wi6550j981whlnb1wxzmlanljdjihiki53j84x9p"))))
(file-name (string-append name "-" version "-checkout"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
`(#:out-of-source? #t `(#:out-of-source? #t
@ -706,8 +702,6 @@ (define-public kicad
#:configure-flags #:configure-flags
(list "-DKICAD_STABLE_VERSION=ON" (list "-DKICAD_STABLE_VERSION=ON"
"-DKICAD_REPO_NAME=stable" "-DKICAD_REPO_NAME=stable"
,(string-append "-DKICAD_BUILD_VERSION=4.0-"
(string-take commit 7))
"-DKICAD_SKIP_BOOST=ON"; Use our system's boost library. "-DKICAD_SKIP_BOOST=ON"; Use our system's boost library.
"-DKICAD_SCRIPTING=ON" "-DKICAD_SCRIPTING=ON"
"-DKICAD_SCRIPTING_MODULES=ON" "-DKICAD_SCRIPTING_MODULES=ON"
@ -754,6 +748,7 @@ (define-public kicad
("libngspice" ,libngspice) ("libngspice" ,libngspice)
("libsm" ,libsm) ("libsm" ,libsm)
("mesa" ,mesa) ("mesa" ,mesa)
("opencascade-oce" ,opencascade-oce)
("openssl" ,openssl) ("openssl" ,openssl)
("python" ,python-2) ("python" ,python-2)
("wxwidgets" ,wxwidgets-gtk2) ("wxwidgets" ,wxwidgets-gtk2)
@ -764,7 +759,7 @@ (define-public kicad
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.")
(license license:gpl3+)))) (license license:gpl3+)))
(define-public kicad-library (define-public kicad-library
(let ((version "4.0.7")) (let ((version "4.0.7"))