Merge branch 'master' into core-updates
Conflicts:
Makefile.am
gnu/packages/base.scm
release.nix: Hack to unchroot more stuff.
* release.nix (unchrootedNixpkgs): New function.
(jobs)[tarball, build, build_disable_daemon, distro): Use it.
Should fix <http://hydra.gnu.org:3000/build/7279>.
release.nix: Adjust to current Nixpkgs.
* release.nix: s/buildNativeInputs/nativeBuildInputs/.
Merge branch 'master' into core-updates
Conflicts:
Makefile.am
guix/scripts/gc.scm
guix/scripts/package.scm
guix/ui.scm
tests/guix-package.sh
release.nix: Reduce the number of dependencies.
* release.nix (tarball): Use a minimal Git.
release.nix: Unchroot recursively.
* release.nix (unchroot): Operate recursively on build inputs.
release.nix: Build outside of a chroot.
* release.nix (unchroot): New function.
(jobs)[tarball, build, build_disable_daemon]: Use it.
Merge branch 'core-updates'
Conflicts:
guix/build/union.scm
Merge branch 'master' into core-updates
Conflicts:
build-aux/download.scm
distro/packages/autotools.scm
distro/packages/base.scm
distro/packages/bootstrap.scm
distro/packages/lsh.scm
distro/packages/make-bootstrap.scm
distro/packages/ncurses.scm
distro/packages/perl.scm
tests/derivations.scm
tests/union.scm
Update license headers.
Change all license headers, except guix/build/* and ld-wrapper.scm, with
this code:
(use-modules (guix build utils)
(srfi srfi-1))
(fluid-set! %default-port-encoding "UTF-8")
(substitute* (remove (lambda (f)
(or (string-contains f ".tar.")
(string-contains f ".git/")
(string-contains f ".so")
(string-suffix? ".o" f)
(string-suffix? ".a" f)
(string-suffix? ".go" f)
(string-suffix? ".pdf" f)
(string-suffix? ".png" f)
(string-suffix? ".info" f)
(equal? (basename f) "guix-daemon")
(equal? (basename f) "nix-setuid-helper")
(string-contains f "nix-upstream/")
(string-contains f "distro/packages/bootstrap/")))
(find-files "." "\\.[a-z]+$"))
(("^([[:graph:]]+) This file is part of Guix." _ comment-start)
(string-append comment-start " This file is part of GNU Guix."))
(("^([[:graph:]]+) Guix --- Nix package management.*" _ comment-start)
(string-append comment-start
" GNU Guix --- Functional package management for GNU\n"))
(("^([[:graph:]]+) Guix is " _ comment-start)
(string-append comment-start " GNU Guix is "))
(("^([[:graph:]]+) along with Guix." _ comment-start)
(string-append comment-start " along with GNU Guix."))
(("^([[:graph:]]+) Copyright \\(C\\)" _ comment-start)
(string-append comment-start " Copyright ©")))
Change headers using C-style comments manually.
release.nix: Update to new bootstrap Guile tarball.
* release.nix (bootstrap_guile): Update URLs and SHA256.
(build)[preBuild]: Adjust tarball name.
Merge branch 'master' into core-updates
Conflicts:
distro/packages/multiprecision.scm
release.nix: Remove trailing "/nix" from localstatedir.
* release.nix (tarball, build): Use /nix/var as localstatedir, as a
follow-up to 7f4f065.
release.nix: tarball: Fix typo.
* release.nix (tarball): Replace "gnulib" by "nix".
release.nix: tarball: Fix typo.
* release.nix (tarball): Replace "gnulib" by "nix".
Merge branch 'nix-integration'
Conflicts:
tests/guix-package.sh
release.nix: Add `build_disable_daemon'.
* release.nix (build_disable_daemon): New job.
release.nix: build: Allow builds within a chroot.
* release.nix (build): Remove `__noChroot' and `preConfigure'.
release.nix: Build the daemon.
* release.nix (tarball): Add `preAutoconf'. Augment `buildInputs' and
`configureFlags' to allow daemon builds.
(build): Likewise.