Age | Commit message (Collapse) | Author |
|
Using PYTHONPATH as a mean to discover the Python packages had the following
issues:
1. It is not versioned, so different versions of Python would clash if
installed in a shared profile.
2. It would interfere with the host Python site on foreign
distributions, sometimes preventing a a user to login their GDM
session (!).
3. It would take precedence over user installed Python packages
installed through pip.
4. It would leak into Python virtualenvs, which are supposed to create
isolated Python environments.
This changes fixes the above issues by making use of a sitecustomize.py
module. The newly introduced GUIX_PYTHONPATH environment variable is read
from the environment, filtered for the current Python version of the
interpreter, and spliced in 'sys.path' just before Python's own site location,
which provides the expected behavior.
* gnu/packages/aux-files/python/sitecustomize.py: New file.
* Makefile.am: Register it.
* gnu/packages/python.scm (customize-site)
(guix-pythonpath-search-path): New procedures.
(python-2.7)[phases]{install-sitecustomize.py}: New phase.
[native-inputs]{sitecustomize.py}: New input.
[native-search-paths]: Replace PYTHONPATH with GUIX_PYTHONPATH.
(python-3.9)[native-search-paths]: Likewise.
[phases]{install-sitecustomize}: Override with correct version.
[native-search-paths]: Replace PYTHONPATH with GUIX_PYTHONPATH.
* gnu/packages/commencement.scm (python-boot0):
[phases]{install-sitecustomize}: Likewise.
[native-inputs]{sitecustomize.py}: New input.
[native-search-paths]: Replace PYTHONPATH with GUIX_PYTHONPATH.
* guix/build/python-build-system.scm (site-packages): Do not add a trailing
'/'.
squash! gnu: python: Replace PYTHONPATH by GUIX_PYTHONPATH.
|
|
* gnu/packages/commencement.scm (%boot-tcc-inputs): Remove
diffutils-mesboot. Add gash-utils-boot.
(diffutils-mesboot): Remove variable.
|
|
* gnu/packages/base.scm (findutils): Update to 4.8.0.
[source](patches): Remove "findutils-test-rwlock-threads.patch".
* gnu/packages/patches/findutils-test-rwlock-threads.patch: Remove.
* gnu/local.mk (dist_patch_DATA): Adjust accordingly.
* gnu/packages/commencement.scm (findutils-boot0)[arguments]: Add
'skip-fnmatch-test' phase.
|
|
|
|
* gnu/packages/cross-base.scm (cross-gcc-arguments): Add
"--with-long-double-128" when TARGET is "powerpc64le-linux-gnu".
* gnu/packages/commencement.scm (gcc-boot0): Likewise for (boot-triplet).
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
|
|
* gnu/packages/base.scm (grep, tar, findutils)
(coreutils, coreutils-8.30, gnu-make, gnu-make-4.2)
(binutils-gold, glibc, make-glibc-locales):
(glibc/hurd-headers, tzdata): Remove trailing #t in build phases.
* gnu/packages/commencement.scm (bootar)
(gash-boot, gash-utils-boot, mes-boot):
(gzip-mesboot, gnu-make-mesboot0, bzip2-mesboot)
(bash-mesboot0, tcc-boot, diffutils-mesboot)
(patch-mesboot, sed-mesboot0, binutils-mesboot0)
(gcc-core-mesboot0, mesboot-headers, gawk-mesboot0)
(glibc-mesboot0, gcc-mesboot0, tar-mesboot)
(grep-mesboot, binutils-mesboot1, gnu-make-mesboot)
(gawk-mesboot, sed-mesboot, bash-mesboot)
(gcc-core-mesboot1, gcc-mesboot1, binutils-mesboot)
(glibc-headers-mesboot, glibc-mesboot, gcc-mesboot1-wrapper)
(gcc-mesboot, gnu-make-boot0, binutils-boot0)
(libstdc++-boot0, gcc-boot0, perl-boot0, python-boot0)
(glibc-final-with-bootstrap-bash)
(cross-gcc-wrapper, gettext-boot0, gcc-final): Remove trailing #t in
build phases.
|
|
Conflicts:
gnu/packages/admin.scm
gnu/packages/commencement.scm
gnu/packages/gdb.scm
gnu/packages/llvm.scm
gnu/packages/package-management.scm
gnu/packages/tls.scm
|
|
This allows 'gcc-toolchain' to be used as a drop-in replacement for the
default tool chain through '--with-toolchain=gcc-toolchain'.
* gnu/packages/commencement.scm (make-gcc-toolchain)[native-search-paths]
[search-paths]: Append LIBC's search paths.
|
|
* gnu/packages/mes.scm (nyacc): Rename to...
(nyacc-0.99): ... this.
(nyacc): New variable.
(mes)[propagated-inputs]: Replace NYACC with NYACC-0.99.
(mes-rb5)[native-inputs]: Likewise.
* gnu/packages/commencement.scm (mes-boot)[native-inputs]: Likewise.
(tcc-boot0)[native-inputs]: Likewise.
|
|
Until now the version number would be wrong.
* gnu/packages/commencement.scm (gawk-boot0): Inherit from GAWK, not
PATCH.
|
|
Fixes <https://bugs.gnu.org/43508>.
* gnu/packages/commencement.scm (gcc-mesboot)[native-inputs]: Remove
GCC-MESBOOT1, which is already in %BOOT-MESBOOT4-INPUTS.
|
|
This is a follow-up to commit d9484fba91bc360ad18fe82cb9f4963ccb32c580, and
fixes "make dist".
* gnu/packages/commencement (bash-mesboot0): Remove reference to store item.
|
|
Fixes <https://bugs.gnu.org/43005>.
Reported by Vagrant Cascadian <vagrant@debian.org>.
* gnu/packages/commencement.scm (bash-mesboot0)[arguments]: Break store file
name in comment and add unquoted string-append to silence the
’assert-no-store-file-names’ check. The store file name check is really meant
for code; this file name was unfortunately used is a comment.
|
|
|
|
* gnu/packages/commencement.scm (make-gcc-toolchain)[description]: Reword.
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
|
|
Fixes <https://bugs.gnu.org/43303>.
Reported by Jeffrey Walton <noloader@gmail.com>.
* gnu/packages/commencement.scm (gcc-toolchain-aka-gcc): New variable.
|
|
Conflicts:
gnu/packages/ruby.scm
|
|
As the comment explains, this is only necessary when building with
--enable-obsolete-rpc, which we aren't using anymore.
* gnu/packages/commencement.scm
(glibc-final-with-bootstrap-bash)[inputs]: Remove native-gcc.
|
|
* gnu/packages/commencement.scm
(glibc-final-with-bootstrap-bash)[arguments]: Don't patch sunrpc,
as it's no longer required. Tweak C_INCLUDE_PATH and
CPLUS_INCLUDE_PATH instead of CPATH.
|
|
* gnu/packages/commencement.scm(gdc-toolchain): New variable.
Signed-off-by: Efraim Flashner <efraim@flashner.co.il>
|
|
* 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.
|
|
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 (gcc-toolchain-10): New variable.
|
|
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".
|
|
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.
|
|
This follows up 67ca82e6ddc9f1c87fa8c033729a1f53b7c2b3ba 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.
|
|
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.
|
|
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.
|
|
* gnu/packages/commencement.scm (glibc-final): Allow gnumach-headers-boot0
references for the Hurd.
|
|
* gnu/packages/commencement.scm (gnumach-headers-boot0): Update to
1.8-116-g28b53508.
|
|
* gnu/packages/commencement.scm (hurd-source-version): Update to
0.9-229-ga1efcee8.
(hurd-source-boot0): Update url to updated lilypond tarball.
|
|
* gnu/packages/commencement.scm (glibc-intermediate): Configure with
--disable-werror, update pthreads workaround.
|
|
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.
|
|
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.
|
|
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.
|
|
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.
|
|
* 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.
|
|
* gnu/packages/commencement.scm (bootar)[source]: Add "mirror://gnu" URL.
|
|
* gnu/packages/commencement.scm (bootar): Update to 1a; remove BZip2
workaround for 32-bit platforms.
|
|
Fixes <https://bugs.gnu.org/39699>.
* gnu/packages/commencement.scm (bootar)[i686-linux]: Stub bzip2.
|
|
* gnu/packages/commencement.scm (findutils-boot0)[arm-linux, aarch64-linux]:
Configure with --disable-dependency-tracking. Fixes build on arm/Aarch64.
|
|
* gnu/packages/commencement.scm (file)[arm-linux, aarch64-linux]: Configure
with --disable-dependency-tracking. Fixes build on arm/Aarch64.
|
|
* gnu/packages/commencement.scm (diffutils-boot0): Add
--disable-dependency-tracking. Fixes arm/aarch64 builds.
|
|
* gnu/packages/commencement.scm (%boot0-inputs)[x86-linux,x86_64-linux]: Include
*-boot0 additions for Scheme-only bootstrap.
|
|
* gnu/packages/commencement.scm (bzip2-boot0): Add diffutils-boot0 dependency;
fixes traditional bootstrap mode (non-intel-linux architectures).
|
|
* gnu/packages/commencement.scm (%bootstrap-mes-rewired)[native-inputs]:
Remove unnecessary use of '@'.
|
|
* gnu/packages/commencement.scm (%bootstrap-mes-rewired): Remove (srfi
srfi-26) from #:modules.
|
|
* 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'.
|
|
* gnu/packages/commencement.scm (%bootstrap-guile+guild): Remove variable.
|