From badd2161724b6fe7acd1da5144ebfe68ffc2b3b6 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 29 Jun 2020 23:12:13 +0200 Subject: gnu: gcc-toolchain: Remove "glibc:debug" and "glibc:static" from "out". MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit With this change, the closure of "gcc-toolchain:out" goes from 1 GiB to 393 MiB, which was the intention. * gnu/packages/commencement.scm (make-gcc-toolchain): Filter out "libc-debug" and "libc-static" from OUT. --- gnu/packages/commencement.scm | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'gnu/packages/commencement.scm') diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 59ef5d078b..ef250e037b 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -3828,14 +3828,17 @@ COREUTILS-FINAL vs. COREUTILS, etc." '(#:modules ((guix build union)) #:builder (begin (use-modules (ice-9 match) + (srfi srfi-1) (srfi srfi-26) (guix build union)) (let ((out (assoc-ref %outputs "out"))) - - (match %build-inputs - (((names . directories) ...) - (union-build out directories))) + (union-build out + (filter-map (match-lambda + (("libc-debug" . _) #f) + (("libc-static" . _) #f) + ((_ . directory) directory)) + %build-inputs)) (union-build (assoc-ref %outputs "debug") (list (assoc-ref %build-inputs -- cgit v1.2.3 From af74c0633aa62d7d4e341920cfa3265f27f793cf Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 2 Jul 2020 23:27:04 +0200 Subject: gnu: gash, gash-utils: Build with Guile 3.0. * gnu/packages/shells.scm (gash)[source]: Add 'modules' and 'snippet'. [inputs]: Change GUILE-2.2 to GUILE-3.0. (gash-utils)[source]: Add 'modules' and 'snippet'. [inputs]: Change GUILE-2.2 to GUILE-3.0. * gnu/packages/commencement.scm (gash-utils-boot)[source]: Remove unneeded 'modules' field, and add 'snippet'. (gash-utils-boot)[source]: New field. * gnu/packages/patches/gash-utils-ls-test.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. --- gnu/local.mk | 1 + gnu/packages/commencement.scm | 6 +++++- gnu/packages/patches/gash-utils-ls-test.patch | 25 +++++++++++++++++++++++++ gnu/packages/shells.scm | 24 ++++++++++++++++++++---- 4 files changed, 51 insertions(+), 5 deletions(-) create mode 100644 gnu/packages/patches/gash-utils-ls-test.patch (limited to 'gnu/packages/commencement.scm') diff --git a/gnu/local.mk b/gnu/local.mk index deece17539..040882192f 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -943,6 +943,7 @@ dist_patch_DATA = \ %D%/packages/patches/fontconfig-hurd-path-max.patch \ %D%/packages/patches/freeimage-unbundle.patch \ %D%/packages/patches/fuse-overlapping-headers.patch \ + %D%/packages/patches/gash-utils-ls-test.patch \ %D%/packages/patches/gawk-shell.patch \ %D%/packages/patches/gcc-arm-bug-71399.patch \ %D%/packages/patches/gcc-arm-link-spec-fix.patch \ diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index ef250e037b..d0393ebe25 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -140,7 +140,7 @@ pure Scheme to Tar and decompression in one easy step.") (name "gash-boot") (source (origin (inherit (package-source gash)) - (modules '()))) + (snippet #f))) ;discard snippet for Guile 3.0 support (arguments `(#:implicit-inputs? #f #:tests? #f @@ -170,6 +170,10 @@ pure Scheme to Tar and decompression in one easy step.") (package (inherit gash-utils) (name "gash-utils-boot") + (source (origin + (inherit (package-source gash-utils)) + (patches '()) + (snippet #f))) ;discard snippet for Guile 3.0 support (arguments `(#:implicit-inputs? #f #:tests? #f diff --git a/gnu/packages/patches/gash-utils-ls-test.patch b/gnu/packages/patches/gash-utils-ls-test.patch new file mode 100644 index 0000000000..e1dfb9c23b --- /dev/null +++ b/gnu/packages/patches/gash-utils-ls-test.patch @@ -0,0 +1,25 @@ +'ls.scm' monkey-patches (ice-9 getopt-long) to allow it to recognize '-1' +as a valid option. Unfortunately, monkey patching no longer works with +Guile 3.0 due to inlining, so change the test to make do without '-1'. + +diff --git a/tests/core-utils.org b/tests/core-utils.org +index d35ede8..22718e3 100644 +--- a/tests/core-utils.org ++++ b/tests/core-utils.org +@@ -93,14 +93,11 @@ + * ls + :script: + #+begin_src sh +- ls -1 tests/data/star ++ ls tests/data/star + #+end_src + :stdout: + #+begin_example +- 0 +- 1 +- 2 +- 3 ++ 0 1 2 3 + #+end_example + + * test-file diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm index 109baacc30..b790a0cc18 100644 --- a/gnu/packages/shells.scm +++ b/gnu/packages/shells.scm @@ -856,12 +856,19 @@ scripts.") (sha256 (base32 "13m0yz5h9nj3x40mr6wr5xcpq1lscndfwcicw3skrz801025hhgf")) - (modules '((guix build utils))))) + (modules '((guix build utils))) + (snippet + '(begin + ;; Allow builds with Guile 3.0. + (substitute* "configure" + (("search=\"2\\.2 2\\.0\"") + "search=\"3.0 2.2 2.0\"")) + #t)))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) (inputs - `(("guile" ,guile-2.2))) + `(("guile" ,guile-3.0))) (arguments '(#:make-flags '("XFAIL_TESTS=tests/redirects.org"))) (home-page "https://savannah.nongnu.org/projects/gash/") @@ -882,12 +889,21 @@ as part of the Guix bootstrap process.") version ".tar.gz")) (sha256 (base32 - "0ib2p52qmbac5n0s5bys4fiwim461ps546976l1n7pwbs0avh7fk")))) + "0ib2p52qmbac5n0s5bys4fiwim461ps546976l1n7pwbs0avh7fk")) + (patches (search-patches "gash-utils-ls-test.patch")) + (modules '((guix build utils))) + (snippet + '(begin + ;; Allow builds with Guile 3.0. + (substitute* "configure" + (("search=\"2\\.2 2\\.0\"") + "search=\"3.0 2.2 2.0\"")) + #t)))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) (inputs - `(("guile" ,guile-2.2) + `(("guile" ,guile-3.0) ("gash" ,gash))) (home-page "https://savannah.nongnu.org/projects/gash/") (synopsis "Core POSIX utilities written in Guile Scheme") -- cgit v1.2.3 From 7b2ab96a6efcd30ce12371cac101f1f965ff20b8 Mon Sep 17 00:00:00 2001 From: guy fleury iteriteka Date: Thu, 16 Jul 2020 16:35:14 +0200 Subject: gnu: Add gdc-toolchain. * gnu/packages/commencement.scm(gdc-toolchain): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/commencement.scm | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'gnu/packages/commencement.scm') diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index d0393ebe25..aa30e3fa18 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -8,6 +8,7 @@ ;;; Copyright © 2018, 2019, 2020 Jan (janneke) Nieuwenhuizen ;;; Copyright © 2019, 2020 Marius Bakke ;;; Copyright © 2020 Timothy Sample +;;; Copyright © 2020 Guy Fleury Iteriteka ;;; ;;; This file is part of GNU Guix. ;;; @@ -3901,6 +3902,14 @@ binaries, plus debugging symbols in the @code{debug} output), and Binutils.") (define-public gcc-toolchain-10 (make-gcc-toolchain gcc-10)) +(define-public gdc-toolchain-10 + (package (inherit (make-gcc-toolchain gdc-10)) + (synopsis "Complete GCC tool chain for D lang development") + (description "This package provides a complete GCC tool chain for +D lang development to be installed in user profiles. This includes +gdc, as well as libc (headers and binaries, plus debugging symbols +in the @code{debug} output), and binutils."))) + ;; Provide the Fortran toolchain package only for the version of gfortran that ;; is used by Guix internally to build Fortran libraries, because combining ;; code compiled with different versions can cause problems. -- cgit v1.2.3