[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
04/09: gnu: kicad: Don't hardcode version numbers.
From: |
guix-commits |
Subject: |
04/09: gnu: kicad: Don't hardcode version numbers. |
Date: |
Mon, 17 Dec 2018 05:41:32 -0500 (EST) |
efraim pushed a commit to branch master
in repository guix.
commit 917f5ee75c836028e277d7510fa0a226dd4cb20f
Author: Efraim Flashner <address@hidden>
Date: Sun Dec 16 23:07:44 2018 +0200
gnu: kicad: Don't hardcode version numbers.
* gnu/packages/engineering.scm (kicad)[source]: Replace hardcoded
version number with parameterized one.
[arguments]: Same.
---
gnu/packages/engineering.scm | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm
index 2105d98..75045f2 100644
--- a/gnu/packages/engineering.scm
+++ b/gnu/packages/engineering.scm
@@ -1,7 +1,7 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2015, 2016, 2017, 2018 Ricardo Wurmus <address@hidden>
;;; Copyright © 2015 Federico Beffa <address@hidden>
-;;; Copyright © 2016 Efraim Flashner <address@hidden>
+;;; Copyright © 2016, 2018 Efraim Flashner <address@hidden>
;;; Copyright © 2016 David Thompson <address@hidden>
;;; Copyright © 2016, 2017, 2018 Ludovic Courtès <address@hidden>
;;; Copyright © 2016, 2017, 2018 Theodoros Foradis <address@hidden>
@@ -691,8 +691,8 @@ language.")
(method url-fetch)
(file-name (string-append name "-" version ".tar.xz"))
(uri (string-append
- "https://launchpad.net/kicad/5.0/" version "/+download/" name
- "-" version ".tar.xz"))
+ "https://launchpad.net/kicad/" (version-major+minor version)
+ "/" version "/+download/" name "-" version ".tar.xz"))
(sha256
(base32 "17nqjszyvd25wi6550j981whlnb1wxzmlanljdjihiki53j84x9p"))))
(build-system cmake-build-system)
@@ -711,7 +711,9 @@ language.")
;; headers in the wxwidgets store item, but in wxPython.
(string-append "-DCMAKE_CXX_FLAGS=-I"
(assoc-ref %build-inputs "wxpython")
- "/include/wx-3.0")
+ "/include/wx-"
+ ,(version-major+minor
+ (package-version python2-wxpython)))
"-DCMAKE_BUILD_WITH_INSTALL_RPATH=TRUE"
"-DKICAD_SPICE=TRUE"
;; TODO: Enable this when CA certs are working with curl.
@@ -733,7 +735,10 @@ language.")
(file (string-append out "/bin/kicad"))
(path (string-append
out
- "/lib/python2.7/site-packages:"
+ "/lib/python"
+ ,(version-major+minor
+ (package-version python))
+ "/site-packages:"
(getenv "PYTHONPATH"))))
(wrap-program file
`("PYTHONPATH" ":" prefix (,path))
- branch master updated (f8be766 -> 1e2ebf7), guix-commits, 2018/12/17
- 01/09: gnu: nmap: Don't hardcode python version., guix-commits, 2018/12/17
- 04/09: gnu: kicad: Don't hardcode version numbers.,
guix-commits <=
- 02/09: gnu: gess: Don't hardcode python version., guix-commits, 2018/12/17
- 05/09: gnu: z3: Declare source-file-name., guix-commits, 2018/12/17
- 03/09: gnu: avogadro: Don't hardcode python version., guix-commits, 2018/12/17
- 09/09: gnu: tree: Update to 1.8.0., guix-commits, 2018/12/17
- 08/09: gnu: elemental: Don't use unstable tarball., guix-commits, 2018/12/17
- 06/09: gnu: z3: Fix building on non-Intel machines., guix-commits, 2018/12/17
- 07/09: gnu: elemental: Fix indentation., guix-commits, 2018/12/17