aboutsummaryrefslogtreecommitdiff
path: root/gnu/packages
diff options
context:
space:
mode:
authorSimon South <simon@simonsouth.net>2023-09-28 16:14:45 -0400
committerChristopher Baines <mail@cbaines.net>2023-09-30 10:32:01 +0100
commit76c4ecc2dd1e1ceced7a865c9442ff8e2291d3c9 (patch)
tree1c526547c0defc4816398fb2599a2b48cfd31441 /gnu/packages
parent367f0317d9826c387430138ec9686f207e2d0c24 (diff)
downloadguix-76c4ecc2dd1e1ceced7a865c9442ff8e2291d3c9.tar.gz
guix-76c4ecc2dd1e1ceced7a865c9442ff8e2291d3c9.zip
gnu: sdcc: Update package style.
* gnu/packages/embedded.scm (sdcc)[source]<snippet>: Use gexp; drop trailing #t. [arguments]: Use gexps. <#:phases>: Drop trailing #t from phase. Signed-off-by: Christopher Baines <mail@cbaines.net>
Diffstat (limited to 'gnu/packages')
-rw-r--r--gnu/packages/embedded.scm49
1 files changed, 24 insertions, 25 deletions
diff --git a/gnu/packages/embedded.scm b/gnu/packages/embedded.scm
index 040290f94e..8de3c9c630 100644
--- a/gnu/packages/embedded.scm
+++ b/gnu/packages/embedded.scm
@@ -1648,12 +1648,11 @@ PicoBlaze; and Zilog Z80 families, plus many of their variants.")
"0ly0m3q9vzjb9kcfjh79s77wpl4w7xhybzy4h9x0bmmw4cfsx6xl"))
(modules '((guix build utils)))
(snippet
- '(begin
- ;; Remove non-free source files
- (delete-file-recursively "device/non-free")
- ;; Remove bundled μCsim source
- (delete-file-recursively "sim")
- #t))
+ #~(begin
+ ;; Remove non-free source files
+ (delete-file-recursively "device/non-free")
+ ;; Remove bundled μCsim source
+ (delete-file-recursively "sim")))
(patches (search-patches "sdcc-disable-non-free-code.patch"))))
(build-system gnu-build-system)
(inputs
@@ -1661,25 +1660,25 @@ PicoBlaze; and Zilog Z80 families, plus many of their variants.")
(native-inputs
(list bison boost flex python-2 texinfo zlib))
(arguments
- `(;; GPUTILS is required for the PIC ports, but the licensing status of
- ;; some of the files contained in its distribution is unclear (see
- ;; https://issues.guix.gnu.org/44557). For this reason it is not yet
- ;; available as a package in Guix.
- #:configure-flags
- '("--disable-pic14-port" "--disable-pic16-port" "--disable-ucsim")
- #:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'patch-makefiles
- (lambda _
- (substitute* (find-files "." "(\\.mk$|\\.in$)")
- (("/bin/sh") (which "sh")))
- ;; --disable-ucsim disables sdcc-misc, patch it back in.
- (substitute* "Makefile.in"
- (("debugger/mcs51" line)
- (string-append line "\n"
- "TARGETS += sdcc-misc\n"
- "PKGS += $(SDCC_MISC)")))
- #t)))))
+ (list
+ ;; GPUTILS is required for the PIC ports, but the licensing status of
+ ;; some of the files contained in its distribution is unclear (see
+ ;; https://issues.guix.gnu.org/44557). For this reason it is not yet
+ ;; available as a package in Guix.
+ #:configure-flags
+ #~(list "--disable-pic14-port" "--disable-pic16-port" "--disable-ucsim")
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'patch-makefiles
+ (lambda _
+ (substitute* (find-files "." "(\\.mk$|\\.in$)")
+ (("/bin/sh") (which "sh")))
+ ;; --disable-ucsim disables sdcc-misc, patch it back in.
+ (substitute* "Makefile.in"
+ (("debugger/mcs51" line)
+ (string-append line "\n"
+ "TARGETS += sdcc-misc\n"
+ "PKGS += $(SDCC_MISC)"))))))))
(home-page "https://sdcc.sourceforge.net")
(synopsis "C compiler suite for 8-bit microcontrollers")
(description "SDCC is a retargetable, optimizing Standard C compiler suite
ef='/guix/commit/gnu/packages?id=068f98887519bd1bb6ab9b03a0f85802b34c8470'>gnu: rust-nitrokey-sys-3: Update to 3.7.0....* gnu/packages/crates-io.scm (rust-nitrokey-sys-3): Update to 3.7.0. [cargo-inputs]: Add rust-bindgen-0.55, rust-cc-1. Efraim Flashner 2023-10-18gnu: rust-compact-str-0.7: Update to 0.7.1....* gnu/packages/crates-io.scm (rust-compact-str-0.7): Update to 0.7.1. [source]: Add snippet to allow newer versions of dependencies. [cargo-development-inputs]: Add rust-rkyv-0.7. Efraim Flashner 2023-10-18gnu: rust-tower-service-0.3: Update to 0.3.2....* gnu/packages/crates-io.scm (rust-tower-service-0.3): Update to 0.3.2. [cargo-development-inputs]: Add rust-futures-0.3, rust-tokio-1, rust-tower-layer-0.3. Replace rust-http-0.1 with 0.2. Efraim Flashner 2023-10-18gnu: rust-tower-layer-0.3: Update to 0.3.2....* gnu/packages/crates-io.scm (rust-tower-layer-0.3): Update to 0.3.2. [cargo-development-inputs]: Add rust-tower-0.4. Efraim Flashner 2023-10-18gnu: rust-tower-0.4: Update to 0.4.13....* gnu/packages/crates-io.scm (rust-tower-0.4): Update to 0.4.13. [arguments]: Don't skip build. [cargo-inputs]: Replace rust-hdrhistogram-6 with 7, rust-tokio-util-0.6 with 0.7. [cargo-development-inputs]: Add rust-futures-0.3, rust-hdrhistogram-7, rust-http-0.2, rust-lazy-static-1, rust-pin-project-lite-0.2, rust-tokio-1, rust-tokio-stream-0.1, rust-tokio-test-0.4, rust-tower-test-0.4, rust-tracing-subscriber-0.3. Efraim Flashner 2023-10-18gnu: Add rust-tower-test-0.4....* gnu/packages/crates-io.scm (rust-tower-test-0.4): New variable. rust-tower-test-0.3): Inherit from rust-tower-test-0.4. Efraim Flashner 2023-10-18gnu: Add rust-hdrhistogram-7....* gnu/packages/crates-io.scm (rust-hdrhistogram-7): New variable. (rust-hdrhistogram-6): Inherit from rust-hdrhistogram-7. Efraim Flashner 2023-10-18gnu: rust-glium-0.25: Fix inputs....* gnu/packages/crates-io.scm (rust-glium-0.25)[cargo-inputs]: Move rust-gl-gnerator-0.11 to here ... [cargo-development-inputs]: ... from here. Efraim Flashner 2023-10-18gnu: rust-webpki-roots-0.16: Skip building....* gnu/packages/crates-io.scm (rust-webpki-roots-0.16)[arguments]: Skip building. Efraim Flashner 2023-10-18gnu: rust-webpki-0.19: Skip building....* gnu/packages/crates-io.scm (rust-webpki-0.19)[arguments]: Skip building. Efraim Flashner 2023-10-18gnu: rust-webpki-0.18: Skip building....* gnu/packages/crates-io.scm (rust-webpki-0.18)[arguments]: Skip building. Efraim Flashner 2023-10-18gnu: rust-vcpkg-0.2: Remove bundled libraries....* gnu/packages/crates-io.scm (rust-vcpkg-0.2)[source]: Add snippet to remove bundled precompiled libraries. Efraim Flashner 2023-10-18gnu: rust-utf8-width-0.1: Update to 0.1.6....* gnu/packages/crates-io.scm (rust-utf8-width-0.1): Update to 0.1.6. [cargo-development-inputs]: Add rust-bencher-0.1. Efraim Flashner 2023-10-18gnu: rust-trust-dns-rustls-0.6: Skip building....* gnu/packages/crates-io.scm (rust-trust-dns-rustls-0.6)[arguments]: Skip building. Efraim Flashner 2023-10-18gnu: rust-trust-dns-https-0.19: Add missing input....* gnu/packages/crates-io.scm (rust-trust-dns-https-0.19)[native-inputs]: Add perl. Efraim Flashner 2023-10-18gnu: rust-trust-dns-https-0.3: Skip build....* gnu/packages/crates-io.scm (rust-trust-dns-https-0.3)[arguments]: Skip build. Efraim Flashner 2023-10-18gnu: rust-tokio-rustls-0.9: Skip build....* gnu/packages/crates-io.scm (rust-tokio-rustls-0.9)[arguments]: Skip build. Efraim Flashner 2023-10-18gnu: rust-tokio-core-0.1: Don't rely on deprecated features....* gnu/packages/crates-io.scm (rust-tokio-core-0.1)[source]: Add snippet to remove 'tokio' feature from dependencies. Efraim Flashner 2023-10-18gnu: rust-tokio-0.1: Don't rely on deprecated features....* gnu/packages/crates-io.scm (rust-tokio-0.1)[source]: Add snippet to remove 'tokio' feature from dependencies. Efraim Flashner 2023-10-18gnu: rust-standback-0.2: Fix inputs....* gnu/packages/crates-io.scm (rust-standback-0.2)[cargo-inputs]: Move rust-version-check-0.9 to here ... [cargo-development-inputs]: ... from here. Efraim Flashner 2023-10-18gnu: rust-system-deps-6: Remove precompiled library....* gnu/packages/crates-io.scm (rust-system-deps-6)[source]: Add snippet to remove precompiled library. Efraim Flashner 2023-10-18gnu: rust-structopt-0.2: Don't rely on deprecated features....* gnu/packages/crates-io.scm (rust-structopt-0.2)[source]: Add snippet to remove 'lints' feature from dependencies. Efraim Flashner 2023-10-18gnu: rust-serde-repr-0.1: Update to 0.1.16....* gnu/packages/crates-io.scm (rust-serde-repr-0.1): Update to 0.1.16. [cargo-inputs]: Replace rust-proc-macro2-1.0.34 with 1, rust-quote-1.0.10 with 1, rust-syn-1 with 2. [cargo-development-inputs]: Replace rust-serde-json-1.0.73 with 1, rust-trybuild-1.0.19 with 1. Efraim Flashner 2023-10-18gnu: rust-security-framework-sys-0.2: Skip build....* gnu/packages/crates-io.scm (rust-security-framework-sys-0.2) [arguments]: Skip build. Efraim Flashner 2023-10-18gnu: rust-sct-0.7: Add missing input....* gnu/packages/crates-io.scm (rust-sct-0.7)[native-inputs]: Add perl. Efraim Flashner 2023-10-18gnu: rust-sct-0.5: Skip build....* gnu/packages/crates-io.scm (rust-sct-0.5)[arguments]: Skip build. Efraim Flashner 2023-10-18gnu: rust-ring-0.13: Skip build....* gnu/packages/crates-io.scm (rust-ring-0.13)[arguments]: Skip build. Efraim Flashner 2023-10-18gnu: rust-ring-0.14: Skip build....* gnu/packages/crates-io.scm (rust-ring-0.14)[arguments]: Skip build. Efraim Flashner 2023-10-18gnu: rust-libpijul-0.12: Skip build....* gnu/packages/crates-io.scm (rust-libpijul-0.12)[arguments]: Skip build. Efraim Flashner 2023-10-18gnu: rust-riscv-0.7: Remove precompiled libraries....* gnu/packages/crates-io.scm (rust-riscv-0.7)[source]: Add snippet to remove bundled precompiled libraries. Efraim Flashner