me
/
guix
Archived
1
0
Fork 0
Commit Graph

303 Commits (b2dbc53ec2806f05d6c98287f79ee162d335050d)

Author SHA1 Message Date
Marius Bakke 4bdf4182fe
Merge branch 'core-updates' 2020-05-08 21:40:51 +02:00
Ludovic Courtès c81457a588
gnu: gcc-toolchain: Add 10.1.0.
* gnu/packages/commencement.scm (gcc-toolchain-10): New variable.
2020-05-08 16:34:58 +02:00
Jan (janneke) Nieuwenhuizen 1c5063af86
gnu: commencement: Build fix for python-boot0 on the Hurd.
Unlike during a non-chroot'ed build on Debian/Hurd, there is no /usr/include.

* gnu/packages/commencement.scm (python-boot0)[arguments]: When building on
the Hurd, add `fix-regen' stage to correct a reference to "/usr".
2020-04-19 16:18:01 +02:00
Ludovic Courtès e85d4cecbe
gnu: commencement: Memoize packages as a function of the system.
Previous, things like 'ld-wrapper-boot0' would be memoized with
(mlambda () …).  However, the definition of 'ld-wrapper-boot0' depends
on the result of (%boot0-inputs), which is itself a function
of (%current-system).  Thus, if one first calls:

  (parameterize ((%current-system "x86_64-linux"))
    (ld-wrapper-boot0))

then, in all subsequent calls to 'ld-wrapper-boot0', the value
of (%current-system) would be ignored because the result is already
memoized.  Concretely, 'ld-wrapper-boot0' would always have the
dependencies it has on x86_64-linux, even though they are different than
those on armhf-linux, say ("bash-mesboot" vs. "bootstrap-binaries").

Fixes <https://bugs.gnu.org/40482>.
Reported by Marius Bakke <mbakke@fastmail.com>.

* gnu/packages/commencement.scm (define/system-dependent): New macro.
(linux-libre-headers-boot0, hurd-core-headers-boot0, ld-wrapper-boot0)
(gcc-boot0-intermediate-wrapped, gcc-boot0-wrapped, ld-wrapper-boot3):
Define using 'define/system-dependent' instead of 'define' + 'mlambda'.
Adjust users so they no longer look like procedure calls.
* tests/guix-build.sh: Add test.
2020-04-11 00:32:41 +02:00
Marius Bakke 3cff86db8a
gnu: Python: Move arm-alignment.patch to a native-input + phase.
This follows up 67ca82e6dd which was ineffective
when running 'guix build --system=armhf-linux python' on e.g. x86_64-linux
because the conditional would always return the native system.

* gnu/packages/python.scm (python-3.8)[native-inputs]: Add "arm-alignment.patch".
[arguments]: Add phase to apply it.
[source](patches): Remove it.
* gnu/packages/commencement.scm (python-boot0): Prevent inheriting the phase.
2020-04-02 17:11:17 +02:00
Ludovic Courtès 71d17a09ee
gnu: commencement: Micro-optimize the package graph.
This removes 2 'add-data-to-store-cache' lookups.

* gnu/packages/commencement.scm (flex-boot0): Move (package (inherit …))
outside the 'propagated-inputs' field to avoid creating a new node each
time the field is accessed.
2020-03-29 23:14:28 +02:00
Marius Bakke 58f705c18e
gnu: coreutils-mesboot: Make variable private.
This fixes a test failure in tests/graph.scm because the package does not use
glibc, yet is part of the public packages.

* gnu/packages/commencement.scm (coreutils-mesboot): Use DEFINE instead of
DEFINE-PUBLIC.
2020-03-28 22:17:08 +01:00
Jan Nieuwenhuizen aaa4cb0cad
gnu: commencement: glibc-final: Allow gnumach-headers references.
* gnu/packages/commencement.scm (glibc-final): Allow gnumach-headers-boot0
references for the Hurd.
2020-03-26 12:59:33 +01:00
Jan Nieuwenhuizen 1320885ffa
gnu: commencement: gnumach-headers-boot0: Update to 1.8-116-g28b53508.
* gnu/packages/commencement.scm (gnumach-headers-boot0): Update to
1.8-116-g28b53508.
2020-03-26 12:59:32 +01:00
Jan Nieuwenhuizen 61249ba27c
gnu: commencement: hurd-source: Update to latest git.
* gnu/packages/commencement.scm (hurd-source-version): Update to
0.9-229-ga1efcee8.
(hurd-source-boot0): Update url to updated lilypond tarball.
2020-03-26 12:59:32 +01:00
Jan Nieuwenhuizen 05a852d8dd
gnu: commencement: glibc-intermediate: Build fixes for the Hurd.
* gnu/packages/commencement.scm (glibc-intermediate): Configure with
--disable-werror, update pthreads workaround.
2020-03-26 12:59:32 +01:00
Jan Nieuwenhuizen 0c7b63e065
gnu: commencement: hurd-minimal-boot0: Build from tarball.
The 'hurd-minimal' package (via hurd-headers) now uses a git checkout and
added dependencies on autoconf, automake and teiinfo to build.  Using those in
commencement creates a bootstrap loop.  So, revert to a tarball release.

* gnu/packages/commencement.scm (hurd-minimal-boot0): Build from tarball;
remove autoconf, automake, texinfo bootstrap dependencies.
2020-03-26 12:59:32 +01:00
Jan Nieuwenhuizen c9c5e032c3
gnu: commencement: hurd-headers-boot0: Build from tarball.
The 'hurd-headers' package now uses a git checkout and added dependencies on
autoconf and automake to build.  Using those in commencement creates a
bootstrap loop.  So, revert to a tarball release.

* gnu/packages/commencement.scm (hurd-version-boot0, hurd-source-boot0): New
variable.
(hurd-headers-boot0): Use it to build from tarball; remove autoconf, automake,
texinfo bootstrap dependencies.
2020-03-26 12:59:32 +01:00
Jan Nieuwenhuizen a50bbf44c7
gnu: commencement: gnumach-headers-boot0: Build from tarball.
The 'gnumach-headers' package now uses a git checkout and added dependencies
on autoconf, automake and texinfo to build.  Using those in commencement
creates a bootstrap loop.  So, revert to a tarball release.

* gnu/packages/commencement.scm (gnumach-headers-boot0): Build from tarball;
remove autoconf, automake, texinfo bootstrap dependencies.
2020-03-26 12:59:32 +01:00
Ludovic Courtès b6bee63bed
gnu: Default to Guile 3.0.
This patch changes three things:

  1. package derivations are built using Guile 3.0;

  2. 'gexp->derivation' defaults to Guile 3.0;

  3. "guile3.0-" packages are deprecated aliases for the regular
     package, which now depends on Guile 3.0; "guile2.2-" packages are
     introduced; "guile-next" is renamed to "guile".

* gnu/packages/guile.scm (guile-2.0/fixed): Remove.
(guile-3.0/fixed): New variable.
(package-for-guile-3.0): Remove.
(package-for-guile-2.2): New variable.
(define-deprecated-guile3.0-package): New macro.
(guile-3.0)[name]: Change to "guile".
(guile-json-3)[native-inputs, inputs]: New fields.
(guile2.2-json): New variable.
(guile3.0-json): Deprecate.
(guile-gdbm-ffi)[native-inputs]: Switch to GUILE-3.0.
(guile2.2-gdbm-ffi): New variable.
(guile3.0-gdbm-ffi): Deprecate.
(guile-sqlite3): Switch to GUILE-3.0.
(guile2.2-sqlite3): New variable.
(guile3.0-sqlite3): Deprecate.
(guile-bytestructures): Switch to GUILE-3.0.
(guile2.2-bytestructures): New variable.
(guile3.0-bytestructures): Deprecate.
(guile-git): Switch to GUILE-3.0.
(guile2.2-git): New variable.
(guile3.0-git): Deprecate.
(guile-2.2/bug-fix):
* gnu/packages/ci.scm (cuirass): Switch to GUILE-3.0.
* gnu/packages/emacs-xyz.scm (emacs-guix): Switch to GUILE-3.0.
* gnu/packages/gtk.scm (guile-cairo)[arguments]: New field.
Switch to GUILE-3.0.
(guile2.2-cairo): New variable.
(guile3.0-cairo): Deprecate.
(guile-rsvg): Switch to GUILE-3.0.
(guile2.2-cairo): New variable.
(guile3.0-cairo): Deprecate.
(guile-present): Switch to GUILE-3.0.
(guile2.2-present): New variable.
(guile3.0-present): Deprecate.
(guile-gnome)[propagated-inputs]: Use GUILE2.2-CAIRO and GUILE2.2-LIB.
* gnu/packages/guile-xyz.scm (guile-fibers)[arguments]: Add #:configure-flags.
Switch to GUILE-3.0.
(guile2.2-fibers): New variable.
(guile3.0-fibers): Deprecate.
(guile-syntax-highlight): Switch to GUILE-3.0.
(guile2.2-syntax-highlight): New variable.
(guile3.0-syntax-highlight): Deprecate.
(guile-colorized): Switch to GUILE-3.0.
(guile2.2-colorized): New variable.
(guile3.0-colorized): Deprecate.
(guile-pfds): Switch to GUILE-3.0.
(guile2.2-pfds): New variable.
(guile3.0-pfds): Deprecate.
(guile-simple-zmq): Switch to GUILE-3.0.
(guile2.2-simple-zmq): New variable.
(guile3.0-simple-zmq): Deprecate.
(guile-newt): Switch to GUILE-3.0.
(guile2.2-newt): New variable.
(guile3.0-newt): Deprecate.
(guile-parted): Switch to GUILE-3.0.
(guile2.2-parted): New variable.
(guile3.0-parted): Deprecate.
(guile-config): Switch to GUILE-3.0.
(guile2.2-config): New variable.
(guile3.0-config): Deprecate.
(guile-hall): Switch to GUILE-3.0.
(guile2.2-hall): New variable.
(guile3.0-hall): Deprecate.
(guile-ics): Switch to GUILE-3.0.
(guile2.2-ics): New variable.
(guile3.0-ics): Deprecate.
(guile-wisp)[arguments]: Add 'support-guile-3.0' phase.
Switch to GUILE-3.0.
(guile2.2-wisp): New variable.
(guile3.0-wisp): Deprecate.
(guile-lib): Switch to GUILE-3.0.
(guile2.2-lib): New variable.
(guile3.0-lib): Deprecate.
(guile-minikanren): Switch to GUILE-3.0.
(guile2.2-minikanren): New variable.
(guile3.0-minikanren): Deprecate.
(guile-irregex): Switch to GUILE-3.0.
(guile2.2-irregex): New variable.
(guile3.0-irregex): Deprecate.
(haunt): Switch to GUILE-3.0, and remove GUILE-READER.
(guile2.2-haunt): New variable.
(guile3.0-haunt): Deprecate.
(guile-commonmark): Switch to GUILE-3.0.
(guile2.2-commonmark): New variable.
(guile3.0-commonmark): Deprecate.
(mcron): Switch to GUILE-3.0.
(guile2.0-mcron): New variable.
(guile3.0-mcron): Deprecate.
(guile-picture-language): Switch to GUILE-3.0.
(guile2.2-picture-language): New variable.
(guile3.0-picture-language): Deprecate.
(guile-gi): Switch to GUILE-3.0.
(guile2.2-gi): New variable.
(guile3.0-gi): Deprecate.
(guile-hashing): Switch to GUILE-3.0.
(guile2.2-hashing): New variable.
(guile3.0-hashing): Deprecate.
* gnu/packages/package-management.scm (guix): Switch to GUILE-3.0.
(guile2.2-guix): New variable.
(guile3.0-guix): Deprecate.
(gwl): Replace "guile3.0-" with "guile-".
(guix-jupyter)[source]: Adjust for Guile 3.0.
Switch to GUILE-3.0.
* gnu/packages/ssh.scm (guile-ssh): Switch to GUILE-3.0.
(guile2.2-ssh): New variable.
(guile3.0-ssh): Deprecate.
* gnu/packages/admin.scm (shepherd): Switch to GUILE-3.0.
(guile2.2-shepherd): New variable.
(guile3.0-shepherd): Deprecate.
* gnu/packages/mail.scm (mailutils): Switch to GUILE-3.0.
(guile2.2-mailutils): New variable.
(guile3.0-mailutils): Deprecate.
* gnu/packages/plotutils.scm (guile-charting): Switch to GUILE-3.0.
(guile2.2-charting): New variable.
(guile3.0-charting): Deprecate.
* gnu/packages/version-control.scm (libgit2): Switch to GUILE-3.0.
* gnu/packages/vpn.scm (vpnc-scripts): Switch to GUILE-3.0.
* gnu/packages/web.scm (guix-data-service): Switch to GUILE-3.0.
(hpcguix-web): Switch to GUILE-3.0.
* guix/self.scm (specification->package): Refer to the "guile-" variants
instead of "guile3.0-".
* guix/gexp.scm (default-guile): Change to GUILE-3.0.
* build-aux/build-self.scm (build): #:guile-version defaults to "3.0".
* gnu/packages/commencement.scm (guile-final): Base on GUILE-3.0/FIXED.
2020-03-16 15:44:02 +01:00
Timothy Sample 0b870f7915
gnu: commencement: Fix gash and gash-utils version references.
* gnu/packages/commencement.scm (gash-boot): When configuring, use the
version of the Gash package instead the version of Guile!
(gash-utils-boot): Likewise, but for Gash-Utils.
2020-03-02 17:32:58 -05:00
Ludovic Courtès 5afcb5caa5
gnu: bootar: Add ftp.gnu.org URL.
* gnu/packages/commencement.scm (bootar)[source]: Add "mirror://gnu" URL.
2020-02-22 21:39:27 +01:00
Timothy Sample 4b807ef87c
gnu: bootar: Update to 1a.
* gnu/packages/commencement.scm (bootar): Update to 1a; remove BZip2
workaround for 32-bit platforms.
2020-02-21 23:56:27 -05:00
Jan Nieuwenhuizen a82cf70e8a
gnu: commencement: bootar: Build fix for i686-linux.
Fixes <https://bugs.gnu.org/39699>.

* gnu/packages/commencement.scm (bootar)[i686-linux]: Stub bzip2.
2020-02-21 22:25:13 +01:00
Jan Nieuwenhuizen b6aedea9cc
gnu: commencement: findutils-boot0: Build fix for ARM.
* gnu/packages/commencement.scm (findutils-boot0)[arm-linux, aarch64-linux]:
Configure with --disable-dependency-tracking.  Fixes build on arm/Aarch64.
2020-02-19 19:25:37 +01:00
Jan Nieuwenhuizen 70a27b445e
gnu: commencement: file: Build fix for ARM.
* gnu/packages/commencement.scm (file)[arm-linux, aarch64-linux]: Configure
with --disable-dependency-tracking.  Fixes build on arm/Aarch64.
2020-02-19 19:25:37 +01:00
Jan Nieuwenhuizen b06199e0e0
gnu: commencement: diffutils-boot0: Build fix for ARM.
* gnu/packages/commencement.scm (diffutils-boot0): Add
--disable-dependency-tracking.  Fixes arm/aarch64 builds.
2020-02-19 19:25:37 +01:00
Jan Nieuwenhuizen 0a3e8536d9
gnu: commencement: %boot0-inputs: Soft-code Scheme-only additions.
* gnu/packages/commencement.scm (%boot0-inputs)[x86-linux,x86_64-linux]: Include
*-boot0 additions for Scheme-only bootstrap.
2020-02-19 15:36:18 +01:00
Jan Nieuwenhuizen 0c54440b79
gnu: commencement: bzip2-boot0: Add diffutils-boot0 dependency.
* gnu/packages/commencement.scm (bzip2-boot0): Add diffutils-boot0 dependency;
fixes traditional bootstrap mode (non-intel-linux architectures).
2020-02-19 13:43:50 +01:00
Ludovic Courtès 76ad3053ae
gnu: bootstrap-mes-rewired: Remove unnecessary '@'.
* gnu/packages/commencement.scm (%bootstrap-mes-rewired)[native-inputs]:
Remove unnecessary use of '@'.
2020-02-18 11:18:03 +01:00
Ludovic Courtès 68bbd213e8
gnu: bootstrap-mes-rewired: Do not import the host's (srfi srfi-26).
* gnu/packages/commencement.scm (%bootstrap-mes-rewired): Remove (srfi
srfi-26) from #:modules.
2020-02-18 11:17:18 +01:00
Timothy Sample e157ed72ec
gnu: commencement: Fix '%boot-mesboot1-inputs'.
* gnu/packages/commencement.scm (%boot-mesboot1-inputs): In the list
of elements to delete from '%boot-mesboot0-inputs', remove a
duplicate 'bash', add 'bootar', and remove an extra space at the end
of 'grep'.
2020-02-17 23:21:05 +01:00
Timothy Sample 22a9f128ad
gnu: commencement: Remove %bootstrap-guile+guild.
* gnu/packages/commencement.scm (%bootstrap-guile+guild): Remove variable.
2020-02-17 23:21:05 +01:00
Timothy Sample 2ca7af43fe
gnu: commencement: Simplify Gash and Gash-Utils.
This change does three things.  First Gash-Utils is updated to
0.1.0.  Then, the bootstrap Gash and Gash-Utils packages are
arranged to be built without using 'guild'.  Finally, instead of
using a binary 'tar' via 'bootstrap-executable' to extract Gash and
Gash-Utils, a self-extracting Scheme implementation of 'tar' and
'gzip' is used instead.

These three changes need to happen in concert to avoid breaking the
bootstrap process.

* gnu/packages/shells.scm (gash-utils): Update to 0.1.0; remove
'autoconf' and 'automake' from 'native-inputs'; delete 'arguments';
update the home-page, synopsis, and description.
* gnu/packages/commencement.scm (bootar): New variable.
(gash-boot): Replace 'tar', and 'xz' with 'bootar'; remove 'bash'
and 'guile-source'; do not use 'guile-build-system' but rather
'gnu-build-system' with some modified phases; disable tests.
(gash-utils-boot): Likewise.
(%boot-gash-inputs): Add 'bootar'; replace '%bootstrap-guile+guild' with
'%bootstrap-guile'.
(mes-boot): In the configure phase, do not reference 'GUILE_LOAD_PATH'
as it is no longer set.
2020-02-17 23:21:05 +01:00
Timothy Sample 1681d3f1e0
gnu: Rename 'gash-core-utils' to 'gash-utils'.
* gnu/packages/shells.scm (gash-core-utils): Rename this...
(gash-utils): ...to this.
* gnu/packages/commencement.scm (gash-core-utils): Rename this...
(gash-utils): ...to this and update the parent package reference.
(%boot-gash-inputs): Update reference.
2020-02-17 23:21:04 +01:00
Jan Nieuwenhuizen a7e514170a
gnu: commencement: glibc-boot0: Remove gash, use bash-mesboot0 only.
* gnu/packages/commencement.scm (glibc-mesboot0): Use bash-mesboot0 only.
2020-02-17 23:21:04 +01:00
Jan Nieuwenhuizen 1fdc6a3829
gnu: commencement: mes-boot: Update to 0.22.
* gnu/packages/commencement.scm (mes-boot): Update to 0.22.
2020-02-17 23:21:04 +01:00
Jan Nieuwenhuizen 062bc72117
gnu: commencement: glibc-mesboot: Use gash only, instead of bash/gash mix.
While this works and is much cleaner, it is also much slower.

* gnu/packages/commencement.scm (glibc-mesboot0): Use gash only, instead of
bash/gash mix.
2020-02-17 23:21:04 +01:00
Jan Nieuwenhuizen a75a6aa1b8
gnu: commencement: gash-core-utils-boot: Update to 0.0.214-fc1b.
* gnu/packages/commencement.scm (gash-core-utils-boot): Update to 0.0.214-fc1b.
2020-02-17 23:21:04 +01:00
Jan Nieuwenhuizen 476614f782
gnu: commencement: gnu-make-mesboot: Rename from make-mesboot.
* gnu/packages/commencement.scm (gnu-make-mesboot): Rename
from. make-mesboot.  Update users.
2020-02-17 23:21:03 +01:00
Jan Nieuwenhuizen 2bb7deff9f
gnu: commencement: gnu-make-mesboot0: Rename from make-mesboot0.
* gnu/packages/commencement.scm (gnu-make-mesboot0): Rename from
make-mesboot0.  Update users.
2020-02-17 23:21:03 +01:00
Jan Nieuwenhuizen 6340afee28
gnu: commencement: %bootstrap-tarballs: Remove %bootstrap-binaries-tarball.
* gnu/packages/make-bootstrap.scm (%bootstrap-tarballs)[i686-linux,
x86_64-linux]: Remove %bootstrap-binaries-tarball.
* gnu/packages/commencement.scm (file-boot0): Drop bzlib dependency.
2020-02-17 23:21:03 +01:00
Jan Nieuwenhuizen f0505fde55
gnu: commencement: coreutils-final: Inherit from coreutils-minimal.
* gnu/packages/commencement.scm (coreutils-final): Inherit from
coreutils-minimal.
2020-02-17 23:21:03 +01:00
Jan Nieuwenhuizen cacb6b903d
gnu: commencement: Add coreutils-boot0.
(coreutils-boot0): New variable.
* gnu/packages/commencement.scm (%boot0-inputs): Add it.
2020-02-17 23:21:03 +01:00
Jan Nieuwenhuizen 1d313d6d88
gnu: commencement: Add tar-boot0.
* gnu/packages/commencement.scm (tar-boot0): New variable.
(%boot0-inputs): Add it.
2020-02-17 23:21:03 +01:00
Jan Nieuwenhuizen 2e41da947b
gnu: commencement: Add bzip2-boot0.
* gnu/packages/commencement.scm (bzip2-boot0): New variable.
(%boot0-inputs): Add it.
2020-02-17 23:21:02 +01:00
Jan Nieuwenhuizen 31a3db77e9
gnu: commencement: Add patch-boot0.
* gnu/packages/commencement.scm (patch-boot0): New variable: patch without
lzip dependency (via ed).
(%boot0-inputs): Add it.
2020-02-17 23:21:02 +01:00
Jan Nieuwenhuizen fdab061994
gnu: commencement: Add sed-boot0.
linux-libre-headers depends on `sed -E', introduced in sed 4.1.5.

* gnu/packages/commencement.scm (sed-boot0): New variable.
(%boot0-inputs): Add it.
2020-02-17 23:21:02 +01:00
Jan Nieuwenhuizen 4bfce839f9
gnu: commencement: Add gawk-boot0.
* gnu/packages/commencement.scm (gawk-boot0): New variable.
(%boot0-inputs): Add it.
2020-02-17 23:21:02 +01:00
Jan Nieuwenhuizen f8d1a95ea4
gnu: commencement: file: Build file without bzip2.
* gnu/packages/commencement.scm (file): New variable.  Use it instead of (gnu
packages file), removing failing bzip2 extension.
2020-02-17 23:21:00 +01:00
Jan Nieuwenhuizen f29fdd4e00
gnu: commencement: %bootstrap-inputs+toolchain: Use Gash instead of coreutils&co.
* gnu/packages/commencement.scm (%bootstrap-inputs+toolchain): Use Gash
instead of coreutils&co.
2020-02-17 23:16:45 +01:00
Jan Nieuwenhuizen 47fb2466b8
gnu: commencement: Remove m4-mesboot.
* gnu/packages/commencement.scm (m4-mesboot): Remove.
2020-02-17 23:16:45 +01:00
Jan Nieuwenhuizen 15af8e1d9d
gnu: commencement: Add coreutils-mesboot.
* gnu/packages/commencement.scm (coreutils-mesboot): New variable.
(%boot-mesboot6-inputs): New variable.
2020-02-17 23:16:45 +01:00
Jan Nieuwenhuizen d7e8467f97
gnu: commencement: gcc-mesboot-wrapper: Use Gash instead of coreutils&co.
* gnu/packages/commencement.scm (gcc-mesboot-wrapper): Use Gash instead of
coreutils&co.
(%boot-mesboot5-inputs): New variable.
2020-02-17 23:16:45 +01:00
Jan Nieuwenhuizen d9de3abcab
gnu: commencement: gcc-mesboot: Use Gash instead of coreutils&co.
* gnu/packages/commencement.scm (gcc-mesboot): Use Gash instead of
coreutils&co.
2020-02-17 23:16:45 +01:00