ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-11-08 16:06:16 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions
21725 commits 1 branch 0 tags 448 MiB
Commit graph

222 commits

Author SHA1 Message Date
Mathieu Othacehe
19c90e5f69
pull: Add a dependency to guile-git. 
* build-aux/build-self.scm (guile-git, guile-bytestructures): New
  variables.
  (build): Add guile-git and guile-bytestructures to %load-path and
  %load-compiled-path.
 2017-06-09 09:48:26 +02:00
Ludovic Courtès
920803fbf4
maint: Add 'update-NEWS' target. 
* build-aux/update-NEWS.scm: New file.
* Makefile.am (EXTRA_DIST): Add it.
(GUIX_MAINTENANCE_DIRECTORY): New variable.
(update-NEWS): New target.
(.PHONY): Add it.
 2017-05-18 16:24:02 +02:00
Ludovic Courtès
d116695b31
hydra: Cross-build Guile 2.2. 
* build-aux/hydra/gnu-system.scm (%core-packages): Add GUILE-2.2.
 2017-05-16 14:16:56 +02:00
Ludovic Courtès
838ba73d6e
pull: Build with the matching Guile major version. 
Previously, 'guix pull' would always build with Guile 2.0.
Now it builds with the Guile that matches (effective-version).

* build-aux/build-self.scm (false-if-wrong-guile)
(package-for-current-guile): New procedures.
(guile-json, guile-ssh): Use it.
(guile-for-build): New procedure.
(build): Use (effective-version) instead of the hard-coded "/2.0".
Add (guix modules) closure to #:modules argument.  Pass
\#:guile-for-build argument to 'gexp->derivation'.
* guix/build/pull.scm (depends-on-guile-ssh?, all-scheme-files): New
procedures.
(build-guix): Show the output of (version).  Use the above procedures.
Filter out files that match 'depends-on-guile-ssh?' when (ssh session)
is missing.
 2017-05-09 18:08:24 +02:00
Ludovic Courtès
aa1c3a0000
maint: update-guix-package: Protect the checkout from GC. 
* build-aux/update-guix-package.scm (main): Define 'root', and call
'add-indirect-root' to protect SOURCE from GC.
 2017-05-09 12:58:42 +02:00
Ludovic Courtès
a7e5944e9c
maint: Check whether binaries cross-built to "arm-linux-gnueabihf" are available. 
* build-aux/check-available-binaries.scm: Add "arm-linux-gnueabihf" as a
cross target.
 2017-05-08 16:29:24 +02:00
Ludovic Courtès
8872fc0e09
maint: 'check-available-binaries' forces use of the official servers. 
* build-aux/check-available-binaries.scm: Pass #:substitute-urls to
'set-build-options'.
 2017-05-08 16:29:24 +02:00
Ludovic Courtès
c8ba269c26
maint: Use 'G_' in build-aux/ scripts. 
This is a followup to 69daee23af.

* build-aux/check-final-inputs-self-contained.scm (assert-valid-substitute):
Use 'G_' instead of '_'.
 2017-05-08 16:29:23 +02:00
Ludovic Courtès
7f4da8ff6b
maint: Add 'time-monotonic' bug workaround in build-aux/hydra/evaluate.scm. 
* build-aux/hydra/evaluate.scm: Add 'time-monotonic' workaround for
Guile 2.2.
 2017-05-07 00:18:36 +02:00
Ludovic Courtès
94fa8d7616
maint: Add 'update-guix-package' target. 
* build-aux/update-guix-package.scm: New file.
* Makefile.am (EXTRA_DIST): Add it.
(update-guix-package): New target.
(.PHONY): Add it.
* gnu/packages/package-management.scm (guix): Mention it.
 2017-05-07 00:18:36 +02:00
Ludovic Courtès
e6860b5e7f
build: Use Gnulib's 'git-version-gen'. 
* Makefile.am (EXTRA_DIST, BUILT_SOURCES): Add $(top_srcdir)/.version.
($(top_srcdir)/.version, gen-tarball-version): New targets.
(dist-hook): Depend on 'gen-tarball-version'.
(.PHONY): Add 'gen-tarball-version'.
* build-aux/git-version-gen: New file, from Gnulib v0.1-1312-ga87d5e5c6.
* configure.ac: Use it in 'AC_INIT'.  Use 'https' for the URL.
 2017-05-04 23:51:45 +02:00
Ludovic Courtès
69daee23af
ui: Rename '_' to 'G_'. 
This avoids collisions with '_' when the latter is used as a 'match'
pattern for instance.  See
<https://lists.gnu.org/archive/html/guix-devel/2017-04/msg00464.html>.

* guix/ui.scm: Rename '_' to 'G_'.
* po/guix/Makevars (XGETTEXT_OPTIONS): Adjust accordingly.
* build-aux/compile-all.scm (warnings): Remove 'format'.
* gnu/packages.scm,
gnu/services.scm,
gnu/services/shepherd.scm,
gnu/system.scm,
gnu/system/shadow.scm,
guix/gnupg.scm,
guix/http-client.scm,
guix/import/cpan.scm,
guix/import/elpa.scm,
guix/import/pypi.scm,
guix/nar.scm,
guix/scripts.scm,
guix/scripts/archive.scm,
guix/scripts/authenticate.scm,
guix/scripts/build.scm,
guix/scripts/challenge.scm,
guix/scripts/container.scm,
guix/scripts/container/exec.scm,
guix/scripts/copy.scm,
guix/scripts/download.scm,
guix/scripts/edit.scm,
guix/scripts/environment.scm,
guix/scripts/gc.scm,
guix/scripts/graph.scm,
guix/scripts/hash.scm,
guix/scripts/import.scm,
guix/scripts/import/cpan.scm,
guix/scripts/import/cran.scm,
guix/scripts/import/crate.scm,
guix/scripts/import/elpa.scm,
guix/scripts/import/gem.scm,
guix/scripts/import/gnu.scm,
guix/scripts/import/hackage.scm,
guix/scripts/import/nix.scm,
guix/scripts/import/pypi.scm,
guix/scripts/import/stackage.scm,
guix/scripts/lint.scm,
guix/scripts/offload.scm,
guix/scripts/pack.scm,
guix/scripts/package.scm,
guix/scripts/perform-download.scm,
guix/scripts/publish.scm,
guix/scripts/pull.scm,
guix/scripts/refresh.scm,
guix/scripts/size.scm,
guix/scripts/substitute.scm,
guix/scripts/system.scm,
guix/ssh.scm,
guix/upstream.scm: Use 'G_' instead of '_'.  Most of this change was
obtained by running: "sed -i -e's/(_ "/(G_ "/g' `find -name \*.scm`".
 2017-05-03 16:16:17 +02:00
Ludovic Courtès
b31b0155ea
build: Download aarch64 bootstrap binaries from alpha.gnu.org. 
* build-aux/download.scm (file-name->uri): Remove flashner.co.il URL.
* gnu/packages/package-management.scm (boot-guile-uri): Likewise.
 2017-04-14 18:17:58 +02:00
Ludovic Courtès
6f9f01fbf6
hydra: Don't build deprecated packages. 
* build-aux/hydra/gnu-system.scm (hydra-jobs): When iterating over the
packages, exclude those that match 'package-superseded'.
 2017-03-30 23:46:07 +02:00
Marius Bakke
84157bb8bf
Merge branch 'master' into core-updates 
Most conflicts are from 6fd52309b8.
 2017-03-30 22:59:53 +02:00
Ludovic Courtès
32e18d3754
hydra: Include the localstatedir in the binary tarball. 
This is a followup to 6b63c43e06.

* build-aux/hydra/gnu-system.scm (tarball-jobs): Pass #:localstatedir? #t
to 'self-contained-tarball'.
 2017-03-30 11:15:16 +02:00
Efraim Flashner
0371b345e8
Merge remote-tracking branch 'origin/master' into core-updates 2017-03-23 14:53:33 +02:00
Ludovic Courtès
73a46451af
build: 'test-driver.scm' prints Scheme values with 'write'. 
Previously it would print them with 'display', which was inconvenient.

* build-aux/test-driver.scm (test-display): Use ~S for VALUE.
(test-runner-gnu): Use 'format' instead of 'test-display' for the test
name, location, and result kind.
 2017-03-22 15:02:33 +01:00
Mark H Weaver
f67337e23e
Merge branch 'master' into core-updates 2017-03-19 18:52:12 -04:00
Ludovic Courtès
36626c556e
build: Require Guile >= 2.0.9. 
* configure.ac: Bump requirement to 2.0.9.
* doc/guix.texi (Requirements): Adjust accordingly.
* README (Requirements): Likewise.
* build-aux/download.scm: Remove workaround for <http://bugs.gnu.org/13095>.
* guix/build/download.scm: Likewise.
(http-fetch)[post-2.0.7?]: Remove.  Remove conditional code for not
POST-2.0.7?.
* guix/http-client.scm:  Remove workaround for <http://bugs.gnu.org/13095>.
(http-fetch)[post-2.0.7?]: Remove.  Remove conditional code for not
POST-2.0.7?.
* guix/serialization.scm (read-latin1-string): Remove mention of 2.0.9.
* tests/nar.scm: Use (ice-9 control).
(let/ec): Remove.
 2017-03-18 00:39:49 +01:00
Ludovic Courtès
4c0c4db070
utils: Move base16 procedures to (guix base16). 
* guix/utils.scm (bytevector->base16-string, base16-string->bytevector):
Move to...
* guix/base16.scm: ... here.  New file.
* tests/utils.scm ("bytevector->base16-string->bytevector"): Move to...
* tests/base16.scm: ... here.  New file.
* Makefile.am (MODULES): Add guix/base16.scm.
(SCM_TESTS): Add tests/base16.scm.
* build-aux/download.scm, guix/derivations.scm,
guix/docker.scm, guix/import/snix.scm, guix/pk-crypto.scm,
guix/scripts/authenticate.scm, guix/scripts/download.scm,
guix/scripts/hash.scm, guix/store.scm, tests/hash.scm,
tests/pk-crypto.scm: Adjust imports accordingly.
 2017-03-16 22:50:14 +01:00
Marius Bakke
4b7e5c1131
Merge branch 'master' into core-updates 2017-03-15 17:52:26 +01:00
Ludovic Courtès
ae196fa349
build: On 2.2, build package files with almost no optimizations. 
* build-aux/compile-all.scm (%default-optimizations)
(%lightweight-optimizations): New variables.
(optimization-options): New procedure.
(compile-file*): Use it.
 2017-03-14 10:28:57 +01:00
Efraim Flashner
3f9543aee1
Merge remote-tracking branch 'origin/master' into core-updates 2017-03-13 23:08:49 +02:00
Ludovic Courtès
239c22663a
Add 'guix pack'. 
* gnu/system/install.scm (self-contained-tarball): Move to...
* guix/scripts/pack.scm: ... here.  New file.
* doc/guix.texi (Binary Installation): Mention 'guix pack'.
(Invoking guix pack): New node.
* build-aux/make-binary-tarball.scm: Remove.
* Makefile.am (MODULES): Add guix/scripts/pack.scm.
(EXTRA_DIST): Remove build-aux/make-binary-tarball.scm.
(guix-binary.%.tar.xz): Rewrite using 'guix pack'.
* build-aux/hydra/gnu-system.scm (tarball-jobs): Adjust accordingly.
 2017-03-12 17:47:25 +01:00
Ludovic Courtès
e90e0fad1b
Merge branch 'master' into core-updates 2017-03-09 16:35:41 +01:00
Ludovic Courtès
9ec2a4d3fe
hydra: Really disable 32-to-64-bit cross-builds. 
Fixes <http://bugs.gnu.org/26022>.
Reported by Efraim Flashner <efraim@flashner.co.il>.

* build-aux/hydra/gnu-system.scm (hydra-jobs)[cross-jobs](from-32-to-64?):
Check whether TARGET contains "64" rather than checking whether TARGET
ends in "64", which is rarely the case.
(same?): Add special case for armhf-linux.
 2017-03-09 16:28:36 +01:00
Ludovic Courtès
19c1ac8d88
build: Unset 'NIX_BUILD_HOOK' when offloading support is missing. 
* build-aux/pre-inst-env.in: Export 'NIX_BUILD_HOOK' only when
nix/scripts/offload is executable; unset it otherwise.
 2017-03-08 23:42:52 +01:00
Efraim Flashner
3b88f3767d
gnu: Add bootstrap-binaries for 'aarch64-linux'. 
These bootstrap-binaries were built against commit
8f8f250bdc.

* gnu/packages/bootstrap/aarch64-linux/bash,
gnu/packages/bootstrap/aarch64-linux/mkdir,
gnu/packages/bootstrap/aarch64-linux/xz,
gnu/packages/bootstrap/aarch64-linux/tar: New files.

* gnu/local.mk (bootstrap_aarch64_linuxdir)
(dist_bootstrap_aarch64_linux_DATA)
(nodist_bootstrap_aarch64_linux_DATA): New variables.
(DISTCLEANFILES): Add $(nodist_bootstrap_aarch64_linux_DATA).
(gnu/packages/bootstrap/aarch64-linux/guile-2.0.14.tar.xz): New target.
* build-aux/download.scm (filename->uri): Add aarch64-linux entry.
* gnu/packages/bootstrap.scm (raw-build): Use guile-2.0.14.tar.xz on
aarch64-linux.
(glibc-dynamic-linker, %bootstrap-coreutils&co, %boostrap-binutils)
(%bootstrap-glibc, %bootstrap-gcc): Add aarch64-linux cases.
* m4/guix.m4 (GUIX_SYSTEM_TYPE): Add aarch64 case.
(GUIX_ASSERT_SUPPORTED_SYSTEM): Add aarch64-linux to supported list.
* doc/guix.texi (GNU Distribution): Add aarch64-linux to the list of
supported systems.
* tests/packages.scm (package-search-derivation, snippet): Add aarch64
case.
 2017-02-20 12:58:07 +02:00
Efraim Flashner
ac16cf3ece
hydra: Add "aarch64-linux-gnu" as a cross-compilation target. 
* build-aux/hydra/gnu-system.scm (%cross-targets): Add
"aarch64-linux-gnu".
 2017-02-17 12:33:55 +02:00
Efraim Flashner
300211e349
hydra: Add "aarch64-linux-gnu" as a cross-compilation target. 
* build-aux/hydra/gnu-system.scm (%cross-targets): Add
"aarch64-linux-gnu".
 2017-02-14 23:40:22 +02:00
Ludovic Courtès
677b30221b
hydra: Add "i586-pc-gnu" as a cross-compilation target. 
* build-aux/hydra/gnu-system.scm (%cross-targets): Add "i586-pc-gnu".
 2017-01-20 22:32:47 +01:00
Leo Famulari
74288230ea
Merge branch 'master' into core-updates 2017-01-06 17:14:41 -05:00
Ludovic Courtès
9410a5aa91
hydra: Add "powerpc-linux-gnu" as a cross-compilation target. 
* build-aux/hydra/gnu-system.scm (%cross-targets): Add
"powerpc-linux-gnu".
 2017-01-05 00:00:59 +01:00
Ludovic Courtès
a3a2774501
hydra: Remove 'qemu-image' job. 
As per the discussion at
<https://lists.gnu.org/archive/html/guix-devel/2016-12/msg01098.html>.

* build-aux/hydra/gnu-system.scm (demo-os): Remove.
(qemu-jobs): Remove 'qemu-image' job.
* build-aux/hydra/demo-os.scm: Remove.
 2016-12-31 01:44:04 +01:00
Ludovic Courtès
8a4c988892
build: check-final-inputs-self-contained has an exception for 'bash:include'. 
Currently 'bash:include' of the final Bash depends on bootstrap stuff.

* build-aux/check-final-inputs-self-contained.scm (final-inputs): Add
clause for 'bash:include'.
* gnu/packages/commencement.scm (bash-final): Add FIXME comment.
 2016-12-18 12:37:26 +01:00
Ludovic Courtès
a69bc7071e
hydra: Fix wrong-num-args error when computing the cross jobs. 
Fixes a regression introduced in
dea91108cf.

* build-aux/hydra/gnu-system.scm (hydra-jobs)[cross-jobs](either): Add
third parameter and honor it.
 2016-12-08 00:28:48 +01:00
Ludovic Courtès
530b8bda1f
hydra: Adjust to make-bootstrap.scm change. 
This is a followup to commit f13f60cb26.

* build-aux/hydra/gnu-system.scm (%core-packages): Call
'%glibc-bootstrap-tarball' since it's now a thunk, not a package.
 2016-12-08 00:28:48 +01:00
Ludovic Courtès
0a050ebc35
hydra: Use '%final-inputs' from base.scm, not commencement.scm. 
* build-aux/hydra/gnu-system.scm (package->job): Use the '%final-inputs'
procedure from (gnu packages base).
 2016-12-08 00:28:47 +01:00
Ludovic Courtès
dea91108cf
hydra: Add "i686-w64-mingw32" as a cross-compilation target. 
* build-aux/hydra/gnu-system.scm (%cross-targets): Add "i686-w64-mingw32".
(hydra-jobs)[cross-jobs?](pointless?): New procedure.
Use it.
 2016-12-07 10:23:18 +01:00
Ludovic Courtès
aa28ecc40a
pull: Hack to allow compilation with older Guile-SSH packages. 
Reported by iyzsong@member.fsf.org (宋文武)
at <https://lists.gnu.org/archive/html/guix-devel/2016-11/msg01045.html>.

* build-aux/build-self.scm (build): Set 'LTDL_LIBRARY_PATH' when
GUILE-SSH has a "0.9." version prefix.
 2016-11-27 23:06:09 +01:00
宋文武
5aed7f10f3
pull: Add guile-ssh to the dependencies. 
Fix regression introduced in 9e76eed.

* build-aux/build-self.scm (guile-ssh): New variable.
(build)[builder]: Add 'guile-ssh' to %load-path and %load-compiled-path.
 2016-11-26 22:03:23 +08:00
Ludovic Courtès
6cb02e6e00
tests: 'make check-system' prints the "build trace". 
* build-aux/run-system-tests.scm (run-system-tests): Pass
  #:print-build-trace to 'set-build-options*'.
 2016-11-03 15:44:49 +01:00
Ludovic Courtès
d88767a399
tests: Use #:fallback? #t when building system tests. 
* build-aux/run-system-tests.scm (run-system-tests): Pass #:fallback? #t
to 'set-build-options*'.
 2016-10-27 01:00:41 +02:00
Ludovic Courtès
6ef6246cfc
hydra: Add "arm-linux-gnueabihf" as a cross-compilation target. 
* build-aux/hydra/gnu-system.scm (%cross-targets): Add
"arm-linux-gnueabihf".
 2016-10-20 15:43:59 +02:00
Ludovic Courtès
402bb3b9f7
build: Arrange so temporary .go files are deleted upon SIGINT. 
* build-aux/compile-all.scm: Install SIGINT handler.
 2016-10-12 23:35:41 +02:00
Taylan Ulrich Bayırlı/Kammer
5a88b2d130
build: Improve Guile 2.2 compatibility. 
* build-aux/compile-all.scm (compile-file*): Ensure loading of
  compilation related modules before going parallel.
* guix/build/pull.scm (build-guix): Ditto.
 2016-09-29 23:59:06 +02:00
Ludovic Courtès
b006ba5038
pull: Update the version string. 
Fixes <http://bugs.gnu.org/19278>.
Reported by Tomáš Čech <tcech@suse.cz>.

This allows 'guix --version' to return something that better represents
what version is being used.

* build-aux/build-self.scm (date-version-string): New procedure.
(build): Add #:version.
[builder]: Pass it to 'build-guix' as #:package-version.
 2016-07-20 22:53:02 +02:00
Ludovic Courtès
13cee334f1
pull: Install (guix config) module to override the user's one. 
* build-aux/build-self.scm (zlib, gzip, bzip2, xz): New variables.
(build)[storedir, localstatedir, sysconfdir, sbindir]: New variables.
[builder]: Pass them to 'build-guix'.
* guix/build/pull.scm (build-guix): Add #:system, #:storedir,
  #:localstatedir, #:sysconfdir, #:sbindir, #:package-name,
  #:package-version, #:bug-report-address, #:home-page-url, #:libgcrypt,
  #:zlib, #:gzip, #:bzip2, and #:xz.  Remove #:gcrypt.
  Instantiate all the substitution variables in (guix config).  Remove
  code to delete OUT/guix/config.{scm,go}.
* guix/config.scm.in: Add note about (guix script pull).
 2016-07-20 22:53:02 +02:00
David Craven
9dd674db01
daemon: Rename 'NIX_CONF_DIR' to 'GUIX_CONFIGURATION_DIRECTORY'. 
Partly fixes <http://bugs.gnu.org/22459>.
Reported by Jeff Mickey <j@codemac.net> and David Craven <david@craven.ch>.

* nix/libstore/globals.cc (Settings::processEnvironment()): Change
'NIX_CONF_DIR' to 'GUIX_CONFIGURATION_DIRECTORY'.
* nix/local.mk (libstore_a_CPPFLAGS): Likewise.
* guix/config.scm.in (%config-directory): Likewise.
* build-aux/test-env.in: Likewise.
* gnu/packages/patches/hydra-automake-1.15.patch: Likewise.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
 2016-06-26 23:11:07 +02:00