>From 0185800f0af7c7ade1a2be11b357e327ed43e841 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <rek...@elephly.net>
Date: Sat, 26 Dec 2015 11:29:14 +0100
Subject: [PATCH 1/2] licenses: Add CC BY SA 3.0.
* guix/licenses.scm (cc-by-sa3.0): New variable.
---
guix/licenses.scm | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/guix/licenses.scm b/guix/licenses.scm
index 7e05b32..9ace7f5 100644
--- a/guix/licenses.scm
+++ b/guix/licenses.scm
@@ -30,7 +30,7 @@
non-copyleft
bsd-style ;deprecated!
cc0
- cc-by-sa4.0 cc-by3.0
+ cc-by-sa4.0 cc-by-sa3.0 cc-by3.0
cddl1.0
cecill-c
artistic2.0 clarified-artistic
@@ -144,6 +144,11 @@ at URI, which may be a file:// URI pointing the package's tree."
"http://creativecommons.org/licenses/by-sa/4.0/";
"Creative Commons Attribution-ShareAlike 4.0 International"))
+(define cc-by-sa3.0
+ (license "CC-BY-SA 3.0"
+ "http://creativecommons.org/licenses/by-sa/3.0/";
+ "Creative Commons Attribution-ShareAlike 3.0 Unported"))
+
(define cc-by3.0
(license "CC-BY 3.0"
"http://creativecommons.org/licenses/by/3.0/";
--
2.5.0
>From 57643330185a58ab0d6f5d039dd6654c63e10b30 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <rek...@elephly.net>
Date: Sat, 26 Dec 2015 11:30:43 +0100
Subject: [PATCH 2/2] gnu: Add Fritzing.
* gnu/packages/engineering.scm (fritzing): New variable.
---
gnu/packages/engineering.scm | 51 ++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 51 insertions(+)
diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm
index 554399b..7263cdf 100644
--- a/gnu/packages/engineering.scm
+++ b/gnu/packages/engineering.scm
@@ -376,6 +376,57 @@ multipole-accelerated algorithm.")
multipole-accelerated algorithm.")
(license (license:non-copyleft #f "See induct.c."))))
+(define-public fritzing
+ (package
+ (name "fritzing")
+ (version "0.9.2b")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "https://github.com/fritzing/";
+ "fritzing-app/archive/" version ".tar.gz"))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "0pvk57z2pxz89pcwwm61lkpvj4w9qxqz8mi0zkpj6pnaljabp7bf"))))
+ (build-system gnu-build-system)
+ (arguments
+ `(#:phases
+ (modify-phases %standard-phases
+ (replace 'configure
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (and (zero? (system* "tar"
+ "-xvf" (assoc-ref inputs "fritzing-parts-db")
+ "-C" "parts"))
+ (zero? (system* "qmake"
+ (string-append "PREFIX="
+ (assoc-ref outputs "out"))
+ "phoenix.pro"))))))))
+ (inputs
+ `(("qt" ,qt)
+ ("boost" ,boost)
+ ("zlib" ,zlib)
+ ("fritzing-parts-db"
+ ,(origin
+ (method url-fetch)
+ (uri (string-append "https://github.com/fritzing/";
+ "fritzing-parts/archive/" version ".tar.gz"))
+ (file-name (string-append "fritzing-parts-" version ".tar.gz"))
+ (sha256
+ (base32
+ "0jqr8yjg7177f3pk1fcns584r0qavwpr280nggsi2ff3pwk5wpsz"))))))
+ (home-page "http://fritzing.org";)
+ (synopsis "Electronic circuit design")
+ (description
+ "The Fritzing application is an @dfn{Electronic Design Automation} (EDA)
+software with a low entry barrier, suited for the needs of makers and
+hobbyists. It offers a unique real-life \"breadboard\" view, and a parts
+library with many commonly used high-level components. Fritzing makes it very
+easy to communicate about circuits, as well as to turn them into PCB layouts
+ready for production.")
+ ;; Documentation and parts are released under CC-BY-SA 3.0; source code is
+ ;; released under GPLv3+.
+ (license (list license:gpl3+ license:cc-by-sa3.0))))
+
(define-public gerbv
(package
(name "gerbv")
--
2.5.0
