rekahsoft/guix
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity
30347040de
guix/Makefile.am

369 lines
10 KiB
Makefile
Raw Normal View History

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.
2013-01-05 23:47:50 +00:00
# GNU Guix --- Functional package management for GNU
Add (guix sets). * guix/sets.scm, tests/sets.scm: New files.sets * Makefile.am (MODULES, SCM_TESTS): Add them.
2015-01-11 22:43:30 +00:00
# Copyright © 2012, 2013, 2014, 2015 Ludovic Courtès <ludo@gnu.org>
distro: Add file. * distro/packages/file.scm: New file. * Makefile.am (MODULES): Add it.
2013-01-17 21:09:15 +00:00
# Copyright © 2013 Andreas Enge <andreas@enge.fr>
Add a build system. * configure.ac, Makefile.am: New files.
2012-06-13 16:01:25 +00:00
#
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.
2013-01-05 23:47:50 +00:00
# This file is part of GNU Guix.
Add a build system. * configure.ac, Makefile.am: New files.
2012-06-13 16:01:25 +00:00
#
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.
2013-01-05 23:47:50 +00:00
# GNU Guix is free software; you can redistribute it and/or modify it
Add a build system. * configure.ac, Makefile.am: New files.
2012-06-13 16:01:25 +00:00
# under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 3 of the License, or (at
# your option) any later version.
#
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.
2013-01-05 23:47:50 +00:00
# GNU Guix is distributed in the hope that it will be useful, but
Add a build system. * configure.ac, Makefile.am: New files.
2012-06-13 16:01:25 +00:00
# WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
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.
2013-01-05 23:47:50 +00:00
# along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
Add a build system. * configure.ac, Makefile.am: New files.
2012-06-13 16:01:25 +00:00
Add `guix-download'. * guix-download.in: New file. * configure.ac: Emit `guix-download' and make it executable. * Makefile.am (bin_SCRIPTS): Add `guix-download'. * po/POTFILES.in: Add `guix-download.in'.
2012-10-24 21:10:09 +00:00
bin_SCRIPTS = \
Replace individual scripts with master 'guix' script. * scripts/guix.in: New script. * Makefile.am (bin_SCRIPTS): Add 'scripts/guix'. Remove 'guix-build', 'guix-download', 'guix-import', 'guix-package', and 'guix-gc'. (MODULES): Add 'guix/scripts/build.scm', 'guix/scripts/download.scm', 'guix/scripts/import.scm', 'guix/scripts/package.scm', and 'guix/scripts/gc.scm'. * configure.ac (AC_CONFIG_FILES): Add 'scripts/guix'. Remove 'guix-build', 'guix-download', 'guix-import', 'guix-package', and 'guix-gc'. * guix-build.in, guix-download.in, guix-gc.in, guix-import.in, guix-package.in: Remove shell script boilerplate. Move to guix-COMMAND.in to guix/scripts/COMMAND.scm. Rename module from (guix-COMMAND) to (guix scripts COMMAND). Change "guix-COMMAND" to "guix COMMAND" in usage help string. * pre-inst-env.in: Add "@abs_top_builddir@/scripts" to the front of $PATH. Export $GUIX_UNINSTALLED. * tests/guix-build.sh, tests/guix-daemon.sh, tests/guix-download.sh, tests/guix-gc.sh, tests/guix-package.sh: Use "guix COMMAND" instead of "guix-COMMAND". * doc/guix.texi: Replace all occurrences of "guix-COMMAND" with "guix COMMAND". * po/POTFILES.in: Update.
2013-02-14 09:15:25 +00:00
scripts/guix
Add `guix-build'. * guix-build.in: New file. * configure.ac: Emit `guix-build'. Add `commands-exec'. * Makefile.am (bin_SCRIPTS): New variable. * po/POTFILES.in: Add `guix-build.in'.
2012-06-30 22:56:24 +00:00
Add pre-inst-env and test-env to nodist_noinst_SCRIPTS in Makefile.am. * Makefile.am: Add nodist_noinst_SCRIPTS = pre-inst-env test-env.
2013-02-12 00:23:20 +00:00
nodist_noinst_SCRIPTS = \
pre-inst-env \
test-env
build: Split Makefile.am into two parts. * Makefile.am (MODULES): Move gnu/* to gnu-system.am. (patchdir, dist_patch_DATA, bootstrapdir, bootstrap_x86_64_linuxdir, bootstrap_i686_linuxdir, dist_bootstrap_x86_64_linux_DATA, dist_bootstrap_i686_linux_DATA, nodist_bootstrap_x86_64_linux_DATA, nodist_bootstrap_i686_linux_DATA, install-data-hook, DISTCLEANFILES, DOWNLOAD_FILE, gnu/packages/bootstrap/x86_64-linux/guile-2.0.7.tar.xz, gnu/packages/bootstrap/i686-linux/guile-2.0.7.tar.xz): Move to... * gnu-system.am: ... here. New file.
2013-06-19 21:19:03 +00:00
include gnu-system.am
Add a build system. * configure.ac, Makefile.am: New files.
2012-06-13 16:01:25 +00:00
MODULES = \
Move base32 code to (guix base32). * guix/utils.scm (bytevector-quintet-ref, bytevector-quintet-ref-right, bytevector-quintet-length, bytevector-quintet-fold, bytevector-quintet-fold-right, make-bytevector->base32-string, %nix-base32-chars, %rfc4648-base32-chars, bytevector->base32-string, bytevector->nix-base32-string, bytevector-quintet-set!, bytevector-quintet-set-right!, base32-string-unfold, base32-string-unfold-right, make-base32-string->bytevector, base32-string->bytevector, nix-base32-string->bytevector): Move to... * guix/base32.scm: ... here. New file. * tests/utils.scm (%nix-hash, "bytevector->base32-string", "base32-string->bytevector", "nix-base32-string->bytevector", "sha256 & bytevector->base32-string"): Move to... * tests/base32.scm: ... here. New file * guix-download.in, guix/derivations.scm, guix/packages.scm, guix/snix.scm, tests/builders.scm, tests/derivations.scm: Adjust accordingly. * guix.scm (%public-modules): Add `base32'.
2012-11-11 21:33:28 +00:00
guix/base32.scm \
substitute-binary: Support the Signature field of a narinfo file. * guix/scripts/substitute-binary.scm (<narinfo>): Add the 'signature' and 'contents' fields. (narinfo-signature->canonical-sexp): New function. (narinfo-maker): Add the 'signature' argument and use it. (assert-valid-signature): New function. (read-narinfo): Support the Signature field. (write-narinfo): Use 'narinfo-contents'. (%allow-unauthenticated-substitutes?): New variable. * guix/base64.scm, tests/base64.scm, tests/substitute-binary.scm: New files. * Makefile.am (SCM_TESTS): Add tests/base64.scm and tests/substitute-binary.scm. (MODULES): Add guix/base64.scm. * test-env.in: Set 'GUIX_ALLOW_UNAUTHENTICATED_SUBSTITUTES'.
2014-03-28 23:06:41 +00:00
guix/base64.scm \
Move record utilities to (guix records). * guix/utils.scm (define-record-type*): Move to... * guix/records.scm: ... here. New file. * guix/build-system.scm, guix/packages.scm: Use it. * guix/gnu-maintenance.scm: Likewise. (official-gnu-packages)[alist->record]: Remove. * guix/scripts/substitute-binary.scm: Likewise. (alist->record, object->fields): Remove. * tests/utils.scm ("define-record-type*", "define-record-type* with letrec* behavior", "define-record-type* & inherit", "define-record-type* & inherit & letrec* behavior", "define-record-type* & thunked", "define-record-type* & thunked & default", "define-record-type* & thunked & inherited"): Move to... * tests/records.scm: ... here. New file.
2013-05-12 13:46:16 +00:00
guix/records.scm \
Add (guix gcrypt). * guix/gcrypt.scm: New file. * Makefile.am (MODULES): Add it. * guix/pk-crypto.scm: Use it. (libgcrypt-func, gcrypt-version): Remove.
2015-01-26 20:38:49 +00:00
guix/gcrypt.scm \
Move `sha256' to (guix hash). * guix/utils.scm (sha256): Move to... * guix/hash.scm: ... here. New file. * Makefile.am (MODULES): Add it. * guix/derivations.scm, guix/scripts/download.scm, guix/scripts/hash.scm, guix/scripts/refresh.scm, tests/base32.scm, tests/derivations.scm, tests/store.scm: Use (guix hash).
2013-07-01 21:28:21 +00:00
guix/hash.scm \
Add (guix pk-crypto). * guix/pk-crypto.scm, tests/pk-crypto.scm: New files. * Makefile.am (MODULES, SCM_TESTS): Add them.
2013-12-19 23:36:26 +00:00
guix/pk-crypto.scm \
Add (guix pki). * guix/pki.scm, tests/pki.scm: New files. * Makefile.am (MODULES): Add 'guix/pki.scm'. (SCM_TESTS): Add 'tests/pki.scm'.
2013-12-29 14:53:49 +00:00
guix/pki.scm \
build: Build (guix utils) first. * Makefile.am (MODULES): Move `guix/utils.scm' first.
2012-07-01 13:10:50 +00:00
guix/utils.scm \
Add (guix sets). * guix/sets.scm, tests/sets.scm: New files.sets * Makefile.am (MODULES, SCM_TESTS): Add them.
2015-01-11 22:43:30 +00:00
guix/sets.scm \
build: Work around build problem on systems that lack (gnutls). Reported at <https://lists.gnu.org/archive/html/guix-devel/2013-12/msg00002.html>. * Makefile.am (MODULES): Shuffle modules to work around build failure on systems that lack the (gnutls) module.
2013-12-05 21:49:51 +00:00
guix/download.scm \
Add (guix git-download). * guix/git-download.scm, guix/build/git.scm: New files. * Makefile.am (MODULES): Add them. * guix/packages.scm (<origin>): Fix comment for 'method' field.
2014-02-21 22:41:11 +00:00
guix/git-download.scm \
Add (guix monads). * guix/monads.scm: New file. * tests/monads.scm: New file. * Makefile.am (MODULES): Add guix/monads.scm. (SCM_TESTS): Add tests/monads.scm. * doc/guix.texi (The Store Monad): New node. (The Store): Reference it.
2013-10-03 20:45:25 +00:00
guix/monads.scm \
Add (guix monad-repl). * guix/monad-repl.scm: New file. * guix.scm: Add it. * Makefile.am (MODULES): Add it. * doc/guix.texi (The Store Monad): Document it.
2014-08-15 14:22:11 +00:00
guix/monad-repl.scm \
Add (guix gexp). * guix/gexp.scm: New file. * tests/gexp.scm: New file. * Makefile.am (MODULES): Add guix/gexp.scm. (SCM_TESTS): Add tests/gexp.scm. * doc/guix.texi (Derivations): Add #:inputs in 'derivation' example. Mark 'build-expression->derivation' as deprecated, refer to "G-Expressions". Remove paragraph about code strata. (G-Expressions): New node.
2014-04-28 21:00:57 +00:00
guix/gexp.scm \
Add (guix profiles). * guix/scripts/package.scm (show-what-to-remove/install): New procedure, moved from... (guix-package): ... here. (<manifest>, make-manifest, <manifest-entry>, profile-manifest, manifest->sexp, sexp->manifest, read-manifest, write-manifest, remove-manifest-entry, manifest-remove, manifest-installed?, manifest=?, profile-regexp, generation-numbers, previous-generation-number, profile-derivation, generation-number, generation-file-name, generation-time, lower-input): Move to... * guix/profiles.scm: ... here. New file. * Makefile.am (MODULES): Add it.
2013-11-01 15:31:45 +00:00
guix/profiles.scm \
Add (guix nar) and (guix serialization). * guix/store.scm (write-int, read-int, write-long-long, read-long-long, write-padding, write-string, read-string, read-latin1-string, write-string-list, read-string-list, write-store-path, read-store-path, write-store-path-list, read-store-path-list): Move to serialization.scm. (write-contents, write-file): Move to nar.scm. * guix/nar.scm, guix/serialization.scm: New files. * Makefile.am (MODULES): Add them.
2013-04-04 20:29:08 +00:00
guix/serialization.scm \
guix/nar.scm \
Add a build system. * configure.ac, Makefile.am: New files.
2012-06-13 16:01:25 +00:00
guix/derivations.scm \
Add (guix gnu-maintenance). * guix/gnu-maintenance.scm: New file. * Makefile.am (MODULES): Add it.
2012-12-04 23:02:22 +00:00
guix/gnu-maintenance.scm \
Add (guix licenses). * guix/licenses.scm: New file. * Makefile.am (MODULES): Add it.
2012-12-08 01:48:17 +00:00
guix/licenses.scm \
Abstract build systems. * Makefile.am (MODULES): Add `guix/build-system.scm' and `guix/build-system/gnu.scm'. Remove `guix/gnu-build-system.scm'. * guix/build-system.scm: New file. * guix/gnu-build-system.scm: Rename to... * guix/build-system/gnu.scm: ... this. (gnu-build-system): New variable. * tests/builders.scm: Adjust `use-module' clauses. ("gnu-build-system"): New test.
2012-06-27 21:58:07 +00:00
guix/build-system.scm \
Add (guix build-system cmake). * guix/build/cmake-build-system.scm, guix/build-system/cmake.scm: New files. * Makefile.am (MODULES): Add them.
2013-03-26 21:14:24 +00:00
guix/build-system/cmake.scm \
gnu: Add the 'glib-or-gtk' build system. * guix/build-system/glib-or-gtk.scm, guix/build/glib-or-gtk-build-system.scm: New files. * Makefile.am (MODULES): Add them. Signed-off-by: Ludovic Courtès <ludo@gnu.org>
2014-10-06 13:49:29 +00:00
guix/build-system/glib-or-gtk.scm \
Abstract build systems. * Makefile.am (MODULES): Add `guix/build-system.scm' and `guix/build-system/gnu.scm'. Remove `guix/gnu-build-system.scm'. * guix/build-system.scm: New file. * guix/gnu-build-system.scm: Rename to... * guix/build-system/gnu.scm: ... this. (gnu-build-system): New variable. * tests/builders.scm: Adjust `use-module' clauses. ("gnu-build-system"): New test.
2012-06-27 21:58:07 +00:00
guix/build-system/gnu.scm \
Add (guix build-system perl). * guix/build-system/perl.scm, guix/build/perl-build-system.scm: New files. * Makefile.am (MODULES): Add them. * guix/build-system/gnu.scm (standard-inputs): Make public.
2013-03-03 23:41:46 +00:00
guix/build-system/perl.scm \
Add 'python-build-system'. * guix/build-system/python.scm, guix/build/python-build-system.scm: New files. * Makefile.am (MODULES): Add them.
2013-05-08 22:44:28 +00:00
guix/build-system/python.scm \
build: Add ruby build system. * guix/build-system/ruby.scm: New file. * guix/build/ruby-build-system: New file. * Makefile.am (MODULES): Add new files. * doc/guix.texi (Build Systems): Document ruby-build-system.
2014-09-28 15:14:53 +00:00
guix/build-system/ruby.scm \
Add (guix build-system trivial). * guix/build-system/trivial.scm: New file. * Makefile.am (MODULES): Add it. * tests/packages.scm ("trivial"): New test. * guix/packages.scm (package-derivation): Allow SOURCE to be #f.
2012-09-10 20:47:10 +00:00
guix/build-system/trivial.scm \
Add (guix ftp) and companion modules. * guix/ftp-client.scm, guix/ftp.scm, guix/build/ftp.scm: New files. * Makefile.am (MODULES): Add them. * distro/base.scm (libffi): Use `ftp-fetch'.
2012-09-12 21:47:49 +00:00
guix/ftp-client.scm \
Rename (guix web) to (guix http-client). * guix/web.scm: Rename to... * guix/http-client.scm: ... this. * guix/gnu-maintenance.scm, guix/scripts/substitute-binary.scm, Makefile.am, po/POTFILES.in: Update accordingly.
2013-07-14 14:35:37 +00:00
guix/http-client.scm \
Add `guix refresh' and related auto-update tools. * guix/gnu-maintenance.scm (ftp-server/directory)[quirks]: Add glib. (package-update-path, download-tarball, package-update, update-package-source): New procedures. * guix/gnupg.scm, guix/scripts/refresh.scm: New files. * Makefile.am (MODULES): Add them. * guix/utils.scm (file-extension): New procedure.
2013-04-24 21:48:36 +00:00
guix/gnupg.scm \
Add (guix elf). * guix/elf.scm: New file. Taken from Guile 'master', commit 3f826e3. * Makefile.am (MODULES): Add it. * THANKS: Thank Andy, who wrote this module.
2014-11-27 22:51:48 +00:00
guix/elf.scm \
Add a build system. * configure.ac, Makefile.am: New files.
2012-06-13 16:01:25 +00:00
guix/store.scm \
Add (guix svn-download). * guix/svn-download.scm, guix/build/svn.scm: New files. * Makefile.am (MODULES): Add them. Signed-off-by: Ludovic Courtès <ludo@gnu.org>
2014-03-26 16:59:01 +00:00
guix/svn-download.scm \
Add (guix ui). * guix/ui.scm: New file. * Makefile.am (MODULES): Add it. * po/POTFILES.in: Add it. * guix-build.in: Use it. (_, N_, leave): Remove. (guix-build): Use `with-error-handling' instead of the `guard' form. * guix-download.in: Use it. (_, N_, leave): Remove.
2012-10-31 23:50:01 +00:00
guix/ui.scm \
Add (guix download) and (guix build download). * guix/download.scm, guix/build/download.scm: New files. * Makefile.am (MODULES): Add them. * tests/builders.scm ("url-fetch"): New test. * distro/packages/bootstrap.scm (bootstrap-origin): Support `url-fetch'. * guix/snix.scm (snix-derivation->guix-package): Use `url-fetch' instead of `http-fetch'.
2012-11-12 22:10:26 +00:00
guix/build/download.scm \
Add (guix build-system cmake). * guix/build/cmake-build-system.scm, guix/build-system/cmake.scm: New files. * Makefile.am (MODULES): Add them.
2013-03-26 21:14:24 +00:00
guix/build/cmake-build-system.scm \
Add (guix git-download). * guix/git-download.scm, guix/build/git.scm: New files. * Makefile.am (MODULES): Add them. * guix/packages.scm (<origin>): Fix comment for 'method' field.
2014-02-21 22:41:11 +00:00
guix/build/git.scm \
gnu: Add the 'glib-or-gtk' build system. * guix/build-system/glib-or-gtk.scm, guix/build/glib-or-gtk-build-system.scm: New files. * Makefile.am (MODULES): Add them. Signed-off-by: Ludovic Courtès <ludo@gnu.org>
2014-10-06 13:49:29 +00:00
guix/build/glib-or-gtk-build-system.scm \
Add a build system. * configure.ac, Makefile.am: New files.
2012-06-13 16:01:25 +00:00
guix/build/gnu-build-system.scm \
build-system/gnu: Add `dist-package'. * guix/build/gnu-dist.scm: New file. * Makefile.am (MODULES): Add it. * guix/build-system/gnu.scm (%default-modules): New variable. (gnu-build): Use it. (dist-package): New procedure.
2013-08-24 15:17:06 +00:00
guix/build/gnu-dist.scm \
Add (guix build-system perl). * guix/build-system/perl.scm, guix/build/perl-build-system.scm: New files. * Makefile.am (MODULES): Add them. * guix/build-system/gnu.scm (standard-inputs): Make public.
2013-03-03 23:41:46 +00:00
guix/build/perl-build-system.scm \
Add 'python-build-system'. * guix/build-system/python.scm, guix/build/python-build-system.scm: New files. * Makefile.am (MODULES): Add them.
2013-05-08 22:44:28 +00:00
guix/build/python-build-system.scm \
build: Add ruby build system. * guix/build-system/ruby.scm: New file. * guix/build/ruby-build-system: New file. * Makefile.am (MODULES): Add new files. * doc/guix.texi (Build Systems): Document ruby-build-system.
2014-09-28 15:14:53 +00:00
guix/build/ruby-build-system.scm \
vm: Move store copy handling to (guix build store-copy). * gnu/build/vm.scm (read-reference-graph, populate-store): Move to... * guix/build/store-copy.scm: ... here. New file. * Makefile.am (MODULES): Add it. * gnu/system/vm.scm (expression->derivation-in-linux-vm): Adjust default #:modules values accordingly. * tests/gexp.scm ("gexp->derivation, store copy"): New test.
2014-09-04 21:05:12 +00:00
guix/build/store-copy.scm \
Build (guix) last. * Makefile.am (MODULES): Move `guix.scm' last.
2012-06-15 08:03:08 +00:00
guix/build/utils.scm \
Add (guix build union). * guix/build/union.scm, tests/union.scm: New files. * Makefile.am (MODULES): Add `guix/build/union.scm'. (TESTS): Add `tests/union.scm'.
2012-10-29 21:39:46 +00:00
guix/build/union.scm \
pull: Move build code to (guix build pull). * guix/build/pull.scm: New file. * Makefile.am (MODULES): Add it. * guix/scripts/pull.scm (unpack): Use it.
2013-12-16 22:07:17 +00:00
guix/build/pull.scm \
Add (guix build rpath). * guix/build/rpath.scm: New file. * Makefile.am (MODULES): Add it. * gnu/packages/python.scm (python): Use it; remove local copy of the *rpath* procedures. * gnu/packages/samba.scm (samba): Likewise.
2013-05-08 21:24:05 +00:00
guix/build/rpath.scm \
Add (guix svn-download). * guix/svn-download.scm, guix/build/svn.scm: New files. * Makefile.am (MODULES): Add them. Signed-off-by: Ludovic Courtès <ludo@gnu.org>
2014-03-26 16:59:01 +00:00
guix/build/svn.scm \
Add (guix build syscalls). * guix/build/syscalls.scm, tests/syscalls.scm: New files. * Makefile.am (MODULES): Add guix/build/syscalls.scm. (SCM_TESTS): Add tests/syscalls.scm. * guix/utils.scm (%libc-errno-pointer, errno): Remove; take from (guix build syscalls).
2014-05-10 19:49:11 +00:00
guix/build/syscalls.scm \
Add (guix build emacs-utils). * guix/build/emacs-utils.scm: New file. * Makefile.am (MODULES): Add it. * .dir-locals.el: Add indentation rules.
2014-08-02 23:24:50 +00:00
guix/build/emacs-utils.scm \
derivations: Add 'graft-derivation'. * guix/derivations.scm (graft-derivation): New procedure. * guix/build/graft.scm: New file. * Makefile.am (MODULES): Add it. * tests/derivations.scm ("graft-derivation"): New test.
2014-10-07 21:23:09 +00:00
guix/build/graft.scm \
Add a declarative packaging layer. * Makefile.am (MODULES): Add `guix/packages.scm' and `distro/base.scm'. (TESTS): Add `tests/packages.scm'. (EXTRA_DIST): New variable. * guix/packages.scm, distro/base.scm, tests/packages.scm: New files. * guix/http.scm (http-fetch): Make `name' an optional argument, to match the expectations of `package-source-derivation'.
2012-06-27 23:24:34 +00:00
guix/packages.scm \
import: Add PyPI importer. * guix/snix.scm: Delete. * guix/import/snix.scm: New file. * guix/import/pypi.scm: New file. * guix/import/utils.scm: New file. * guix/scripts/import/nix.scm: New file. * guix/scripts/import/pypi.scm: New file. * tests/pypi.scm: New file. * tests/snix.scm: Import (guix import snix) module. * guix/scripts/import.scm (%default-options, %options): Delete. (%standard-import-options, importers): New variables. (show-help): List importers. (guix-import): Factor out Nix-specific logic. Delegate to correct importer based upon first argument. * configure.ac (HAVE_GUILE_JSON): New conditional. * Makefile.am (MODULES): Add new files and remove 'guix/snix.scm'. (SCM_TESTS): Add 'tests/pypi.scm' if guile-json is installed.
2014-09-27 14:16:23 +00:00
guix/import/utils.scm \
import: Add GNU importer. Suggested by Karl Berry <karl@gnu.org> and Andreas Enge <andreas@enge.fr>. * guix/import/gnu.scm, guix/scripts/import/gnu.scm: New files. * Makefile.am (MODULES): Add them. * guix/scripts/import.scm (importers): Add "gnu". * guix/gnu-maintenance.scm (gnu-release-archive-types): New procedure. (download-tarball): Export.
2014-11-11 14:30:58 +00:00
guix/import/gnu.scm \
import: Add PyPI importer. * guix/snix.scm: Delete. * guix/import/snix.scm: New file. * guix/import/pypi.scm: New file. * guix/import/utils.scm: New file. * guix/scripts/import/nix.scm: New file. * guix/scripts/import/pypi.scm: New file. * tests/pypi.scm: New file. * tests/snix.scm: Import (guix import snix) module. * guix/scripts/import.scm (%default-options, %options): Delete. (%standard-import-options, importers): New variables. (show-help): List importers. (guix-import): Factor out Nix-specific logic. Delegate to correct importer based upon first argument. * configure.ac (HAVE_GUILE_JSON): New conditional. * Makefile.am (MODULES): Add new files and remove 'guix/snix.scm'. (SCM_TESTS): Add 'tests/pypi.scm' if guile-json is installed.
2014-09-27 14:16:23 +00:00
guix/import/snix.scm \
build: Work around build problem on systems that lack (gnutls). Reported at <https://lists.gnu.org/archive/html/guix-devel/2013-12/msg00002.html>. * Makefile.am (MODULES): Shuffle modules to work around build failure on systems that lack the (gnutls) module.
2013-12-05 21:49:51 +00:00
guix/scripts/download.scm \
guix/scripts/build.scm \
Add 'guix archive'. * guix/scripts/archive.scm, tests/guix-archive.sh: New files. * Makefile.am (MODULES): Add 'archive.scm'. (SH_TESTS): Add 'guix-archive.sh'. * doc/guix.texi (Invoking guix archive): New section. * guix/scripts/build.scm: Export 'derivation-from-expression'. * guix/scripts/package.scm: Export 'specification->package+output'.
2013-12-22 00:08:21 +00:00
guix/scripts/archive.scm \
build: Work around build problem on systems that lack (gnutls). Reported at <https://lists.gnu.org/archive/html/guix-devel/2013-12/msg00002.html>. * Makefile.am (MODULES): Shuffle modules to work around build failure on systems that lack the (gnutls) module.
2013-12-05 21:49:51 +00:00
guix/scripts/import.scm \
guix/scripts/package.scm \
guix/scripts/gc.scm \
guix/scripts/hash.scm \
guix/scripts/pull.scm \
guix/scripts/substitute-binary.scm \
daemon: Implement signed archive import/export. * guix/scripts/authenticate.scm, nix/scripts/guix-authenticate.in, tests/signing-key.pub, tests/signing-key.sec: New files. * po/POTFILES.in: Add 'guix/scripts/authenticate.scm'. * guix/store.scm (dump-port): New procedure. (process-stderr): Add 'user-port' optional parameter. Handle the %STDERR-WRITE and %STDERR-READ cases as expected. (import-paths, export-path, export-paths): New procedures. * tests/store.scm ("export/import several paths", "import corrupt path"): New tests. * Makefile.am (MODULES): Add 'guix/scripts/authenticate.scm'. (EXTRA_DIST): Add 'tests/signing-key.{pub,sec}'. * daemon.am (libstore_a_CPPFLAGS)[-DNIX_CONF_DIR]: Change 'NIX_CONF_DIR' to .../guix. Change 'OPENSSL_PATH' to 'guix-authenticate'. * config-daemon.ac: Instantiate 'nix/scripts/guix-authenticate'. * nix/nix-daemon/guix-daemon.cc (main): Augment $PATH to include 'settings.nixLibexecDir'. * test-env.in: Export 'NIX_CONF_DIR' and 'NIX_LIBEXEC_DIR'. Populate $NIX_CONF_DIR.
2013-12-20 16:17:42 +00:00
guix/scripts/authenticate.scm \
build: Work around build problem on systems that lack (gnutls). Reported at <https://lists.gnu.org/archive/html/guix-devel/2013-12/msg00002.html>. * Makefile.am (MODULES): Shuffle modules to work around build failure on systems that lack the (gnutls) module.
2013-12-05 21:49:51 +00:00
guix/scripts/refresh.scm \
Add 'guix system'. * guix/scripts/system.scm: New file. * Makefile.am (MODULES): Add it. * po/POTFILES.in: Likewise. * doc/guix.texi (Using the Configuration System): Link to "Invoking guix system". (Invoking guix system): New node.
2014-02-18 22:45:58 +00:00
guix/scripts/system.scm \
scripts: add guix lint * guix/scripts/lint.scm: New file. Defines a 'lint' tool for Guix packages. * tests/lint.scm: New file. * Makefile.am (MODULES, SCM_TESTS): Add them. * po/guix/Makevars: Update appropriately. * po/guix/POTFILES.in: Update appropriately. * doc/guix.texi: Document "guix lint".
2014-09-01 00:13:21 +00:00
guix/scripts/lint.scm \
import: Add GNU importer. Suggested by Karl Berry <karl@gnu.org> and Andreas Enge <andreas@enge.fr>. * guix/import/gnu.scm, guix/scripts/import/gnu.scm: New files. * Makefile.am (MODULES): Add them. * guix/scripts/import.scm (importers): Add "gnu". * guix/gnu-maintenance.scm (gnu-release-archive-types): New procedure. (download-tarball): Export.
2014-11-11 14:30:58 +00:00
guix/scripts/import/gnu.scm \
import: Add PyPI importer. * guix/snix.scm: Delete. * guix/import/snix.scm: New file. * guix/import/pypi.scm: New file. * guix/import/utils.scm: New file. * guix/scripts/import/nix.scm: New file. * guix/scripts/import/pypi.scm: New file. * tests/pypi.scm: New file. * tests/snix.scm: Import (guix import snix) module. * guix/scripts/import.scm (%default-options, %options): Delete. (%standard-import-options, importers): New variables. (show-help): List importers. (guix-import): Factor out Nix-specific logic. Delegate to correct importer based upon first argument. * configure.ac (HAVE_GUILE_JSON): New conditional. * Makefile.am (MODULES): Add new files and remove 'guix/snix.scm'. (SCM_TESTS): Add 'tests/pypi.scm' if guile-json is installed.
2014-09-27 14:16:23 +00:00
guix/scripts/import/nix.scm \
scripts: Add 'environment' command. * guix/scripts/environment.scm: New file. * Makefile.am (MODULES): Add it. * doc/guix.texi ("Invoking guix environment"): New node.
2014-09-21 17:40:05 +00:00
guix/scripts/environment.scm \
Add a declarative packaging layer. * Makefile.am (MODULES): Add `guix/packages.scm' and `distro/base.scm'. (TESTS): Add `tests/packages.scm'. (EXTRA_DIST): New variable. * guix/packages.scm, distro/base.scm, tests/packages.scm: New files. * guix/http.scm (http-fetch): Make `name' an optional argument, to match the expectations of `package-source-derivation'.
2012-06-27 23:24:34 +00:00
guix.scm \
build: Split Makefile.am into two parts. * Makefile.am (MODULES): Move gnu/* to gnu-system.am. (patchdir, dist_patch_DATA, bootstrapdir, bootstrap_x86_64_linuxdir, bootstrap_i686_linuxdir, dist_bootstrap_x86_64_linux_DATA, dist_bootstrap_i686_linux_DATA, nodist_bootstrap_x86_64_linux_DATA, nodist_bootstrap_i686_linux_DATA, install-data-hook, DISTCLEANFILES, DOWNLOAD_FILE, gnu/packages/bootstrap/x86_64-linux/guile-2.0.7.tar.xz, gnu/packages/bootstrap/i686-linux/guile-2.0.7.tar.xz): Move to... * gnu-system.am: ... here. New file.
2013-06-19 21:19:03 +00:00
$(GNU_SYSTEM_MODULES)
Add a build system. * configure.ac, Makefile.am: New files.
2012-06-13 16:01:25 +00:00
Add 'guix offload' as a daemon build hook. * nix/nix-daemon/guix-daemon.cc (GUIX_OPT_NO_BUILD_HOOK): New macro. (options): Add '--no-build-hook'. (parse_opt): Handle it. (main)[HAVE_DAEMON_OFFLOAD_HOOK]: Set 'useBuildHook' by default. Set $NIX_BUILD_HOOK to our offload hook unless otherwise specified. [!HAVE_DAEMON_OFFLOAD_HOOK]: Clear 'useBuildHook'. * pre-inst-env.in: Set and export NIX_BUILD_HOOK. * nix/scripts/offload.in, guix/scripts/offload.scm: New files. * guix/ui.scm (show-guix-help)[internal?]: Add "offload". * config-daemon.ac: Call 'GUIX_CHECK_UNBUFFERED_CBIP'. Instantiate 'nix/scripts/offload'. Set 'BUILD_DAEMON_OFFLOAD' conditional, and optionally define 'HAVE_DEAMON_OFFLOAD_HOOK' cpp macro. * daemon.am (nodist_pkglibexec_SCRIPTS)[BUILD_DAEMON_OFFLOAD]: Add it. * Makefile.am (MODULES)[BUILD_DAEMON_OFFLOAD]: Add 'guix/scripts/offload.scm'. (EXTRA_DIST)[!BUILD_DAEMON_OFFLOAD]: Likewise. * m4/guix.m4 (GUIX_CHECK_UNBUFFERED_CBIP): New macro. * doc/guix.texi (Setting Up the Daemon): Move most of the body to... (Build Environment Setup): ... this. New subsection. (Daemon Offload Setup): New subsection.
2014-01-23 22:48:34 +00:00
if BUILD_DAEMON_OFFLOAD
MODULES += \
guix/scripts/offload.scm
endif BUILD_DAEMON_OFFLOAD
Factorize test suite support in (guix tests). * guix/tests.scm: New file. * Makefile.am (noinst_DATA): New variable. (GOBJECTS): Add guix/tests.go. * tests/builders.scm (%store): Use 'open-connection-for-tests' from (guix tests). * tests/derivations.scm: Likewise. * tests/monads.scm: Likewise. * tests/packages.scm: Likewise. * tests/profiles.scm: Likewise. * tests/union.scm: Likewise. * tests/gexp.scm: Likewise. (guile-for-build): Remove. Use (%guile-for-build) instead. * tests/nar.scm (make-random-bytevector, %seed, random-text): Remove. (populate-file): Change 'make-random-bytevector' to 'random-bytevector'. Use (guix tests). * tests/store.scm (%seed, random-text): Remove. Use (guix tests).
2014-08-23 17:18:01 +00:00
# Internal module with test suite support.
build: Add guix/tests.scm to the distribution. * Makefile.am (noinst_DATA): Rename to... (dist_noinst_DATA): ... this.
2014-11-17 16:52:40 +00:00
dist_noinst_DATA = guix/tests.scm
Factorize test suite support in (guix tests). * guix/tests.scm: New file. * Makefile.am (noinst_DATA): New variable. (GOBJECTS): Add guix/tests.go. * tests/builders.scm (%store): Use 'open-connection-for-tests' from (guix tests). * tests/derivations.scm: Likewise. * tests/monads.scm: Likewise. * tests/packages.scm: Likewise. * tests/profiles.scm: Likewise. * tests/union.scm: Likewise. * tests/gexp.scm: Likewise. (guile-for-build): Remove. Use (%guile-for-build) instead. * tests/nar.scm (make-random-bytevector, %seed, random-text): Remove. (populate-file): Change 'make-random-bytevector' to 'random-bytevector'. Use (guix tests). * tests/store.scm (%seed, random-text): Remove. Use (guix tests).
2014-08-23 17:18:01 +00:00
build: Build guix/scripts/download.go after guix/build/download.go. * Makefile.am (guix/scripts/download.go): Add dependency on `guix/build/download.go'. Reported by Nikita Karetnikov <nikita@karetnikov.org>.
2013-02-17 21:18:16 +00:00
# Because of the autoload hack in (guix build download), we must build it
# first to avoid errors on systems where (gnutls) is unavailable.
guix/scripts/download.go: guix/build/download.go
build: Work around build problem on systems that lack (gnutls). Reported at <https://lists.gnu.org/archive/html/guix-devel/2013-12/msg00002.html>. * Makefile.am (MODULES): Shuffle modules to work around build failure on systems that lack the (gnutls) module.
2013-12-05 21:49:51 +00:00
guix/download.go: guix/build/download.go
distro: Split (distro packages base) into several files. * distro/packages/base.scm (libsigsegv, gawk, perl, m4, gmp, mpfr, mpc, ncurses, readline, bash, libtool, libunistring, libffi, pkg-config, libgc): Move to modules of their own. (guile-1.8, guile-2.0): Move to... * distro/packages/guile.scm: ... here. * distro/packages/bash.scm, distro/packages/bdw-gc.scm, distro/packages/gawk.scm, distro/packages/libffi.scm, distro/packages/libsigsegv.scm, distro/packages/libtool.scm, distro/packages/libunistring.scm, distro/packages/m4.scm, distro/packages/multiprecision.scm, distro/packages/ncurses.scm, distro/packages/perl.scm, distro/packages/pkg-config.scm, distro/packages/readline.scm: New files.
2012-11-04 21:37:22 +00:00
gnu: linux-libre: Add i686 and x86_64 full-blown configs. Thanks to Jason Self <jself@gnu.org> for the kernel configs. * gnu/packages/linux.scm (kernel-config): New procedure. (linux-libre)[build-phase]: Copy it to .config. Reduce the list of things appended to .config. [native-inputs]: Add "kconfig" input. * gnu/packages/linux-libre-i686.conf, gnu/packages/linux-libre-x86_64.conf: New files, from <http://jxself.org/x86-32.txt> and <http://jxself.org/x86-64.txt>. * Makefile.am (KCONFIGS): New variable. (nobase_dist_guilemodule_DATA): Add it.
2014-07-09 22:31:31 +00:00
# Linux-Libre configurations.
KCONFIGS = \
gnu/packages/linux-libre-i686.conf \
gnu/packages/linux-libre-x86_64.conf
build: Provide a replacement (srfi srfi-37) when the user's one is broken. * srfi/srfi-37.scm.in: New file, taken from Guile 2.0.9. * m4/guix.m4: New macro. * configure.ac: Use it. Define Automake conditional `INSTALL_SRFI_37'. * Makefile.am (nobase_nodist_guilemodule_DATA)[INSTALL_SRFI_37]: Add srfi/srfi-37.scm. (GOBJECTS)[INSTALL_SRFI_37]: Add srfi/srfi-37.go. (srfi/srfi-37.scm)[INSTALL_SRFI_37]: New target. (EXTRA_DIST): Add srfi/srfi-37.scm.in.
2013-07-17 09:05:19 +00:00
build: 'make clean' doesn't delete os-config.tmpl. Fixes <http://bugs.gnu.org/18243>. Reported by Andreas Enge and Mark H. Weaver. * Makefile.am (EXAMPLES): New variable. (nobase_dist_guilemodule_DATA): Add it. * gnu-system.am (GNU_SYSTEM_MODULES): Remove gnu/system/os-config.tmpl.
2014-08-11 15:15:27 +00:00
# Templates, examples.
EXAMPLES = \
gnu/system/os-config.tmpl
Factorize test suite support in (guix tests). * guix/tests.scm: New file. * Makefile.am (noinst_DATA): New variable. (GOBJECTS): Add guix/tests.go. * tests/builders.scm (%store): Use 'open-connection-for-tests' from (guix tests). * tests/derivations.scm: Likewise. * tests/monads.scm: Likewise. * tests/packages.scm: Likewise. * tests/profiles.scm: Likewise. * tests/union.scm: Likewise. * tests/gexp.scm: Likewise. (guile-for-build): Remove. Use (%guile-for-build) instead. * tests/nar.scm (make-random-bytevector, %seed, random-text): Remove. (populate-file): Change 'make-random-bytevector' to 'random-bytevector'. Use (guix tests). * tests/store.scm (%seed, random-text): Remove. Use (guix tests).
2014-08-23 17:18:01 +00:00
GOBJECTS = $(MODULES:%.scm=%.go) guix/config.go guix/tests.go
Add a build system. * configure.ac, Makefile.am: New files.
2012-06-13 16:01:25 +00:00
gnu: Add GCJ * gnu/packages/gcc.scm (gcj-4.8, ecj-bootstrap-4.8): New variables. * gnu/packages/javac.in: New file. * gnu-system.am (MISC_DISTRO_FILES): Add it. * Makefile.am (nobase_dist_guilemodule_DATA): Add MISC_DISTRO_FILES.
2014-12-23 11:31:50 +00:00
nobase_dist_guilemodule_DATA = \
$(MODULES) $(KCONFIGS) $(EXAMPLES) \
$(MISC_DISTRO_FILES)
build: Provide a replacement (srfi srfi-37) when the user's one is broken. * srfi/srfi-37.scm.in: New file, taken from Guile 2.0.9. * m4/guix.m4: New macro. * configure.ac: Use it. Define Automake conditional `INSTALL_SRFI_37'. * Makefile.am (nobase_nodist_guilemodule_DATA)[INSTALL_SRFI_37]: Add srfi/srfi-37.scm. (GOBJECTS)[INSTALL_SRFI_37]: Add srfi/srfi-37.go. (srfi/srfi-37.scm)[INSTALL_SRFI_37]: New target. (EXTRA_DIST): Add srfi/srfi-37.scm.in.
2013-07-17 09:05:19 +00:00
nobase_nodist_guilemodule_DATA = $(GOBJECTS) guix/config.scm
distro: Move patches to their own directory. * Makefile.am (nobase_dist_guilemodule_DATA): Keep only $(MODULES). (patchdir): New variable. (dist_patch_DATA): New variable. Patch files formerly in $(nobase_dist_guilemodule_DATA). (.scm.go): Define `DISTRO_PATCH_DIRECTORY' and `DISTRO_INSTALLED_PATCH_DIRECTORY'. (TESTS_ENVIRONMENT): Define `DISTRO_PATCH_DIRECTORY'. * distro.scm (%patch-directory): New variable. (search-patch): New procedure. * distro/base.scm: Use `search-patch' instead of `(search-path %load-path ...)'. * distro/findutils-absolute-paths.patch, distro/guile-1.8-cpp-4.5.patch, distro/m4-readlink-EINVAL.patch, distro/m4-s_isdir.patch, distro/make-impure-dirs.patch: Move to `distro/patches'.
2012-08-22 15:24:38 +00:00
build: Provide a replacement (srfi srfi-37) when the user's one is broken. * srfi/srfi-37.scm.in: New file, taken from Guile 2.0.9. * m4/guix.m4: New macro. * configure.ac: Use it. Define Automake conditional `INSTALL_SRFI_37'. * Makefile.am (nobase_nodist_guilemodule_DATA)[INSTALL_SRFI_37]: Add srfi/srfi-37.scm. (GOBJECTS)[INSTALL_SRFI_37]: Add srfi/srfi-37.go. (srfi/srfi-37.scm)[INSTALL_SRFI_37]: New target. (EXTRA_DIST): Add srfi/srfi-37.scm.in.
2013-07-17 09:05:19 +00:00
# Do we need to provide our own non-broken (srfi srfi-37) module?
if INSTALL_SRFI_37
nobase_nodist_guilemodule_DATA += srfi/srfi-37.scm
GOBJECTS += srfi/srfi-37.go
srfi/srfi-37.scm: srfi/srfi-37.scm.in
$(MKDIR_P) srfi
cp "$<" "$@"
endif INSTALL_SRFI_37
distro: Use our own pre-built Guile to bootstrap. * distro/packages/base.scm (%bootstrap-guile): Build from a tarball containing a pre-built Guile. * distro.scm (%bootstrap-binaries-directory): New variable. (search-bootstrap-binary): New procedure. * Makefile.am (bootstrapdir, bootstrap_x86_64_linuxdir, dist_bootstrap_x86_64_linux_DATA, DISTCLEANFILES, DOWNLOAD_FILE): New variables. (distro/packages/bootstrap/x86_64-linux/guile-bootstrap-2.0.6.tar.xz): New rule. (EXTRA_DIST): Add `build-aux/download.scm'. (.scm.go): Define the `DISTRO_BOOTSTRAP_DIRECTORY' and `DISTRO_INSTALLED_BOOTSTRAP_DIRECTORY' environment variables. * pre-inst-env.in: Define `DISTRO_BOOTSTRAP_DIRECTORY'. * build-aux/download.scm: New file. * distro/packages/bootstrap/x86_64-linux/{bash, mkdir, tar, xz}: New files.
2012-10-17 19:44:25 +00:00
build: Add 'clean-go' target. * Makefile.am (clean-go): New phony target.
2013-10-15 21:25:08 +00:00
# Handy way to remove the .go files without removing all the rest.
clean-go:
-$(RM) -f $(GOBJECTS)
Add a build system. * configure.ac, Makefile.am: New files.
2012-06-13 16:01:25 +00:00
build: Replace *.log in `CLEANFILES' by the exact list of files. * Makefile.am (SCM_TESTS, SH_TESTS): New variables. (TESTS): Use them. (CLEANFILES): Replace *.log by $(SCM_TESTS:%.scm=%.log).
2013-04-29 19:52:21 +00:00
SCM_TESTS = \
Move base32 code to (guix base32). * guix/utils.scm (bytevector-quintet-ref, bytevector-quintet-ref-right, bytevector-quintet-length, bytevector-quintet-fold, bytevector-quintet-fold-right, make-bytevector->base32-string, %nix-base32-chars, %rfc4648-base32-chars, bytevector->base32-string, bytevector->nix-base32-string, bytevector-quintet-set!, bytevector-quintet-set-right!, base32-string-unfold, base32-string-unfold-right, make-base32-string->bytevector, base32-string->bytevector, nix-base32-string->bytevector): Move to... * guix/base32.scm: ... here. New file. * tests/utils.scm (%nix-hash, "bytevector->base32-string", "base32-string->bytevector", "nix-base32-string->bytevector", "sha256 & bytevector->base32-string"): Move to... * tests/base32.scm: ... here. New file * guix-download.in, guix/derivations.scm, guix/packages.scm, guix/snix.scm, tests/builders.scm, tests/derivations.scm: Adjust accordingly. * guix.scm (%public-modules): Add `base32'.
2012-11-11 21:33:28 +00:00
tests/base32.scm \
substitute-binary: Support the Signature field of a narinfo file. * guix/scripts/substitute-binary.scm (<narinfo>): Add the 'signature' and 'contents' fields. (narinfo-signature->canonical-sexp): New function. (narinfo-maker): Add the 'signature' argument and use it. (assert-valid-signature): New function. (read-narinfo): Support the Signature field. (write-narinfo): Use 'narinfo-contents'. (%allow-unauthenticated-substitutes?): New variable. * guix/base64.scm, tests/base64.scm, tests/substitute-binary.scm: New files. * Makefile.am (SCM_TESTS): Add tests/base64.scm and tests/substitute-binary.scm. (MODULES): Add guix/base64.scm. * test-env.in: Set 'GUIX_ALLOW_UNAUTHENTICATED_SUBSTITUTES'.
2014-03-28 23:06:41 +00:00
tests/base64.scm \
hash: Add `open-sha256-port'. * guix/hash.scm (GCRY_MD_SHA256): New macro. (sha256): Use it. (open-sha256-md, md-write, md-read, md-close, open-sha256-port, port-sha256): New procedures. * tests/hash.scm: New file. * Makefile.am (SCM_TESTS): Add it.
2013-07-02 20:38:03 +00:00
tests/hash.scm \
Add (guix pk-crypto). * guix/pk-crypto.scm, tests/pk-crypto.scm: New files. * Makefile.am (MODULES, SCM_TESTS): Add them.
2013-12-19 23:36:26 +00:00
tests/pk-crypto.scm \
Add (guix pki). * guix/pki.scm, tests/pki.scm: New files. * Makefile.am (MODULES): Add 'guix/pki.scm'. (SCM_TESTS): Add 'tests/pki.scm'.
2013-12-29 14:53:49 +00:00
tests/pki.scm \
Add (guix sets). * guix/sets.scm, tests/sets.scm: New files.sets * Makefile.am (MODULES, SCM_TESTS): Add them.
2015-01-11 22:43:30 +00:00
tests/sets.scm \
substitute-binary: Support the Signature field of a narinfo file. * guix/scripts/substitute-binary.scm (<narinfo>): Add the 'signature' and 'contents' fields. (narinfo-signature->canonical-sexp): New function. (narinfo-maker): Add the 'signature' argument and use it. (assert-valid-signature): New function. (read-narinfo): Support the Signature field. (write-narinfo): Use 'narinfo-contents'. (%allow-unauthenticated-substitutes?): New variable. * guix/base64.scm, tests/base64.scm, tests/substitute-binary.scm: New files. * Makefile.am (SCM_TESTS): Add tests/base64.scm and tests/substitute-binary.scm. (MODULES): Add guix/base64.scm. * test-env.in: Set 'GUIX_ALLOW_UNAUTHENTICATED_SUBSTITUTES'.
2014-03-28 23:06:41 +00:00
tests/substitute-binary.scm \
Add a build system. * configure.ac, Makefile.am: New files.
2012-06-13 16:01:25 +00:00
tests/builders.scm \
tests/derivations.scm \
guix-package: Report `--search' matches in recutils format. * guix/ui.scm (fill-paragraph, string->recutils, package->recutils): New procedures. * guix-package.in (guix-package)[process-query]: Use `package->recutils' to display package meta-data. * tests/guix-package.sh: Adjust test. * tests/ui.scm: New file. * Makefile.am (TESTS): Add it. * doc/guix.texi (Invoking guix-package): Adjust `--search' documentation, and give an example.
2013-02-01 12:16:27 +00:00
tests/ui.scm \
Move record utilities to (guix records). * guix/utils.scm (define-record-type*): Move to... * guix/records.scm: ... here. New file. * guix/build-system.scm, guix/packages.scm: Use it. * guix/gnu-maintenance.scm: Likewise. (official-gnu-packages)[alist->record]: Remove. * guix/scripts/substitute-binary.scm: Likewise. (alist->record, object->fields): Remove. * tests/utils.scm ("define-record-type*", "define-record-type* with letrec* behavior", "define-record-type* & inherit", "define-record-type* & inherit & letrec* behavior", "define-record-type* & thunked", "define-record-type* & thunked & default", "define-record-type* & thunked & inherited"): Move to... * tests/records.scm: ... here. New file.
2013-05-12 13:46:16 +00:00
tests/records.scm \
Add a declarative packaging layer. * Makefile.am (MODULES): Add `guix/packages.scm' and `distro/base.scm'. (TESTS): Add `tests/packages.scm'. (EXTRA_DIST): New variable. * guix/packages.scm, distro/base.scm, tests/packages.scm: New files. * guix/http.scm (http-fetch): Make `name' an optional argument, to match the expectations of `package-source-derivation'.
2012-06-27 23:24:34 +00:00
tests/utils.scm \
Add builder-side utilities for phases, stream editing, & co. * guix/build/utils.scm (with-directory-excursion): New macro. (alist-cons-before, alist-cons-after, alist-replace): New procedures. (substitute): New procedure. * tests/build-utils.scm: New file. * Makefile.am (TESTS): Add `tests/build-utils.scm'.
2012-07-01 15:32:03 +00:00
tests/build-utils.scm \
Add (guix build union). * guix/build/union.scm, tests/union.scm: New files. * Makefile.am (MODULES): Add `guix/build/union.scm'. (TESTS): Add `tests/union.scm'.
2012-10-29 21:39:46 +00:00
tests/packages.scm \
Add (guix snix) and the `guix-import' command. * guix/snix.scm, tests/snix.scm, guix-import.in: New files. * configure.ac: Output `guix-import' and make it executable. * Makefile.am (bin_SCRIPTS): Add `guix-import'. (MODULES): Add `guix/snix.scm'. (TESTS): Add `tests/snix.scm'.
2012-11-04 18:38:31 +00:00
tests/snix.scm \
store: Add GC-related operations. * guix/store.scm (gc-action): New enumerate type. (read-long-long, read-string-list, write-store-path, write-store-path-list, read-store-path-list): New procedures. (write-arg): Add support for `store-path' and `store-path-list'. (read-arg): Add support for `store-path-list'. (define-operation): Add support for multiple-value returns. (run-gc, live-paths, dead-paths, collect-garbage, delete-paths): New procedures. (%long-long-max): New macro. * tests/store.scm: New file. * Makefile.am (TESTS): Add it.
2012-12-09 22:52:59 +00:00
tests/store.scm \
Add (guix monads). * guix/monads.scm: New file. * tests/monads.scm: New file. * Makefile.am (MODULES): Add guix/monads.scm. (SCM_TESTS): Add tests/monads.scm. * doc/guix.texi (The Store Monad): New node. (The Store): Reference it.
2013-10-03 20:45:25 +00:00
tests/monads.scm \
Add (guix gexp). * guix/gexp.scm: New file. * tests/gexp.scm: New file. * Makefile.am (MODULES): Add guix/gexp.scm. (SCM_TESTS): Add tests/gexp.scm. * doc/guix.texi (Derivations): Add #:inputs in 'derivation' example. Mark 'build-expression->derivation' as deprecated, refer to "G-Expressions". Remove paragraph about code strata. (G-Expressions): New node.
2014-04-28 21:00:57 +00:00
tests/gexp.scm \
nar: Implement restoration from Nar. * guix/nar.scm (&nar-error, &nar-read-error): New condition types. (dump): New procedure. (write-contents)[dump]: Remove. Use the one above instead. (read-contents, write-file, restore-file): New procedures. (%archive-version-1): New variable.
2013-04-08 20:54:08 +00:00
tests/nar.scm \
guix package: Allow removal of a specific package output. Fixes <http://bugs.gnu.org/15756>. * guix/profiles.scm (<manifest-pattern>): New record type. (remove-manifest-entry): Remove. (entry-predicate, manifest-matching-entries): New procedures. (manifest-remove): Accept a list of <manifest-pattern>. (manifest-installed?): Replace 'name' parameter by 'pattern', a <manifest-pattern>. * guix/scripts/package.scm (options->removable): Return a list of <manifest-pattern>. (guix-package)[process-action]: Use 'manifest-matching-entries' to compute the list of packages to remove. * tests/profiles.scm: New file. * Makefile.am (SCM_TESTS): Add it.
2013-11-01 22:11:17 +00:00
tests/union.scm \
Add (guix build syscalls). * guix/build/syscalls.scm, tests/syscalls.scm: New files. * Makefile.am (MODULES): Add guix/build/syscalls.scm. (SCM_TESTS): Add tests/syscalls.scm. * guix/utils.scm (%libc-errno-pointer, errno): Remove; take from (guix build syscalls).
2014-05-10 19:49:11 +00:00
tests/profiles.scm \
scripts: add guix lint * guix/scripts/lint.scm: New file. Defines a 'lint' tool for Guix packages. * tests/lint.scm: New file. * Makefile.am (MODULES, SCM_TESTS): Add them. * po/guix/Makevars: Update appropriately. * po/guix/POTFILES.in: Update appropriately. * doc/guix.texi: Document "guix lint".
2014-09-01 00:13:21 +00:00
tests/syscalls.scm \
tests/lint.scm
build: Replace *.log in `CLEANFILES' by the exact list of files. * Makefile.am (SCM_TESTS, SH_TESTS): New variables. (TESTS): Use them. (CLEANFILES): Replace *.log by $(SCM_TESTS:%.scm=%.log).
2013-04-29 19:52:21 +00:00
import: Add PyPI importer. * guix/snix.scm: Delete. * guix/import/snix.scm: New file. * guix/import/pypi.scm: New file. * guix/import/utils.scm: New file. * guix/scripts/import/nix.scm: New file. * guix/scripts/import/pypi.scm: New file. * tests/pypi.scm: New file. * tests/snix.scm: Import (guix import snix) module. * guix/scripts/import.scm (%default-options, %options): Delete. (%standard-import-options, importers): New variables. (show-help): List importers. (guix-import): Factor out Nix-specific logic. Delegate to correct importer based upon first argument. * configure.ac (HAVE_GUILE_JSON): New conditional. * Makefile.am (MODULES): Add new files and remove 'guix/snix.scm'. (SCM_TESTS): Add 'tests/pypi.scm' if guile-json is installed.
2014-09-27 14:16:23 +00:00
if HAVE_GUILE_JSON
build: Build pypi modules only if 'guile-json' is available. * Makefile.am (MODULES): Wrap 'guix/import/pypi.scm' and 'guix/scripts/import/pypi.scm' in 'if HAVE_GUILE_JSON'.
2014-09-30 05:41:59 +00:00
MODULES += \
import: Factorize utility functions. * guix/import/pypi.scm (hash-table->alist, flatten, assoc-ref*, url-fetch, json-fetch): Pull procedures from here into... * guix/import/utils.scm: Here and... * guix/import/json.scm: Here. New file. * Makefile.am (MODULE)[HAVE_GUILE_JSON]: Add it. * guix/import/gnu.scm (file-sha256): Move from here to... * guix/hash.scm: Here. * tests/pypi.scm (pypi->guix-package): Update mock module reference.
2015-01-08 20:38:54 +00:00
guix/import/json.scm \
build: Build pypi modules only if 'guile-json' is available. * Makefile.am (MODULES): Wrap 'guix/import/pypi.scm' and 'guix/scripts/import/pypi.scm' in 'if HAVE_GUILE_JSON'.
2014-09-30 05:41:59 +00:00
guix/import/pypi.scm \
import: Add CPAN importer. * guix/import/cpan.scm, guix/scripts/import/cpan.scm, tests/cpan.scm: New files. * Makefile.am (MODULE)[HAVE_GUILE_JSON]: Add them. * guix/scripts/import.scm (importers): Add cpan. * doc/guix.texi (Requirements): Mention `guix import cpan` as a user of guile-json. (Invoking guix import): Document new `guix import cpan` command.
2015-01-08 20:51:13 +00:00
guix/scripts/import/pypi.scm \
guix/import/cpan.scm \
guix/scripts/import/cpan.scm
build: Build pypi modules only if 'guile-json' is available. * Makefile.am (MODULES): Wrap 'guix/import/pypi.scm' and 'guix/scripts/import/pypi.scm' in 'if HAVE_GUILE_JSON'.
2014-09-30 05:41:59 +00:00
import: Add CPAN importer. * guix/import/cpan.scm, guix/scripts/import/cpan.scm, tests/cpan.scm: New files. * Makefile.am (MODULE)[HAVE_GUILE_JSON]: Add them. * guix/scripts/import.scm (importers): Add cpan. * doc/guix.texi (Requirements): Mention `guix import cpan` as a user of guile-json. (Invoking guix import): Document new `guix import cpan` command.
2015-01-08 20:51:13 +00:00
SCM_TESTS += \
tests/pypi.scm \
tests/cpan.scm
import: Add PyPI importer. * guix/snix.scm: Delete. * guix/import/snix.scm: New file. * guix/import/pypi.scm: New file. * guix/import/utils.scm: New file. * guix/scripts/import/nix.scm: New file. * guix/scripts/import/pypi.scm: New file. * tests/pypi.scm: New file. * tests/snix.scm: Import (guix import snix) module. * guix/scripts/import.scm (%default-options, %options): Delete. (%standard-import-options, importers): New variables. (show-help): List importers. (guix-import): Factor out Nix-specific logic. Delegate to correct importer based upon first argument. * configure.ac (HAVE_GUILE_JSON): New conditional. * Makefile.am (MODULES): Add new files and remove 'guix/snix.scm'. (SCM_TESTS): Add 'tests/pypi.scm' if guile-json is installed.
2014-09-27 14:16:23 +00:00
endif
build: Replace *.log in `CLEANFILES' by the exact list of files. * Makefile.am (SCM_TESTS, SH_TESTS): New variables. (TESTS): Use them. (CLEANFILES): Replace *.log by $(SCM_TESTS:%.scm=%.log).
2013-04-29 19:52:21 +00:00
SH_TESTS = \
Add a preliminary `guix-package' command-line tool. * guix-package.in, tests/guix-package.sh: New files. * configure.ac: Output `guix-package'. * Makefile.am (TESTS): Add `tests/guix-package.sh'. (bin_SCRIPTS): Add `guix-package'.
2012-11-01 00:46:15 +00:00
tests/guix-build.sh \
guix-download: Error out when the HTTP response code is not 200. * guix-download.in (http-fetch): Leave with an error message when RESPONSE's code is not 200. * tests/guix-download.sh: New file. * Makefile.am (TESTS): Add it.
2012-11-07 23:13:25 +00:00
tests/guix-download.sh \
Add `guix-gc'. * guix-gc.in, tests/guix-gc.sh: New files. * configure.ac: Output `guix-gc', and make it executable. * Makefile.am (bin_SCRIPTS): Add `guix-gc'. (TESTS): Add `tests/guix-gc.sh'. * doc/guix.texi (Features): Add xref to "Invoking guix-gc". (Invoking guix-gc): New node. * po/POTFILES.in: Add `guix-gc.in'.
2013-01-05 23:28:06 +00:00
tests/guix-gc.sh \
tests: Add `guix hash' test. * guix/scripts/hash.scm (guix-hash)[eof->null]: New procedure. Use it to convert the EOF object to the empty bytevector. * tests/guix-hash.sh: New file. * Makefile.am (SH_TESTS): Add it.
2013-05-11 13:09:56 +00:00
tests/guix-hash.sh \
authenticate: Add test. * tests/guix-authenticate.sh: New file. * Makefile.am (SH_TESTS): Add it.
2013-12-21 20:47:17 +00:00
tests/guix-package.sh \
guix {system,offload}: Improve reporting of syntax errors. * guix/scripts/system.scm (read-operating-system) <catch handler>: Add case for 'syntax-error'. Correct message for default case. * guix/scripts/offload.scm (build-machines) <catch handler>: Add case for 'syntax-error'. * tests/guix-system.sh: New file. * Makefile.am (SH_TESTS): Add it.
2014-06-26 20:23:36 +00:00
tests/guix-system.sh \
Add 'guix archive'. * guix/scripts/archive.scm, tests/guix-archive.sh: New files. * Makefile.am (MODULES): Add 'archive.scm'. (SH_TESTS): Add 'guix-archive.sh'. * doc/guix.texi (Invoking guix archive): New section. * guix/scripts/build.scm: Export 'derivation-from-expression'. * guix/scripts/package.scm: Export 'specification->package+output'.
2013-12-22 00:08:21 +00:00
tests/guix-archive.sh \
guix lint: add the --checkers option. * guix/scripts/lint.scm: add the "--checkers" option. * doc/guix.texi (Invoking guix lint): Document it. * tests/guix-lint.sh: New file * Makefile.am (SCM_TESTS): Add it.
2014-10-11 23:58:29 +00:00
tests/guix-authenticate.sh \
tests/guix-lint.sh
Add a build system. * configure.ac, Makefile.am: New files.
2012-06-13 16:01:25 +00:00
Add 'guix-register'. * nix/guix-register/guix-register.cc, tests/guix-register.sh: New files. * Makefile.am (SH_TESTS)[BUILD_DAEMON]: Add tests/guix-register.sh. * daemon.am (sbin_PROGRAMS, guix_register_SOURCES, guix_register_CPPFLAGS, guix_register_LDADD): New variables. * test-env.in: Export 'storedir', 'prefix', 'datarootdir', 'datadir', and 'localstatedir'.
2013-09-22 21:23:38 +00:00
if BUILD_DAEMON
SH_TESTS += tests/guix-register.sh
endif BUILD_DAEMON
build: Replace *.log in `CLEANFILES' by the exact list of files. * Makefile.am (SCM_TESTS, SH_TESTS): New variables. (TESTS): Use them. (CLEANFILES): Replace *.log by $(SCM_TESTS:%.scm=%.log).
2013-04-29 19:52:21 +00:00
TESTS = $(SCM_TESTS) $(SH_TESTS)
build: Add unit test for the `guix-build' command. * tests/guix-build.sh: New file. * Makefile.am (TESTS): Add it. (LOG_COMPILER): Rename to... (SCM_LOG_COMPILER): ... this. Move flags to... (AM_SCM_LOG_FLAGS): ... this. (TEST_EXTENSIONS, SH_LOG_COMPILER, AM_SH_LOG_FLAGS): New variables.
2012-10-31 22:27:51 +00:00
TEST_EXTENSIONS = .scm .sh
guix-download: Add support for file:// URIs. * guix-download.in (fetch-and-store): New procedure. (guix-download): Use it to compute PATH. Call `add-to-store' when a `file' URI scheme is used. * Makefile.am (AM_TESTS_ENVIRONMENT): New variable. * tests/guix-download.sh: Add test.
2012-11-13 21:57:50 +00:00
AM_TESTS_ENVIRONMENT = abs_top_srcdir="$(abs_top_srcdir)"
build: Run all the tests against the just-built daemon. * test-env.in: New file. * configure.ac: Add it to `AC_CONFIG_FILES' and `commands-exec'. * config-daemon.ac: Set and substitute `GUIX_TEST_ROOT'. * Makefile.am (SCM_LOG_COMPILER, SH_LOG_COMPILER): Use it in lieu of `pre-inst-env'. * daemon.am (test_root): Remove (AM_TESTS_ENVIRONMENT): Remove `TEST_ROOT'. (clean-local): Use $(GUIX_TEST_ROOT); make files writable before removing them.guix_test_root * tests/guix-daemon.sh: Remove `NIX_' variable settings; don't launch `guix-daemon'.
2012-12-05 23:03:26 +00:00
SCM_LOG_COMPILER = $(top_builddir)/test-env $(GUILE)
build: Add unit test for the `guix-build' command. * tests/guix-build.sh: New file. * Makefile.am (TESTS): Add it. (LOG_COMPILER): Rename to... (SCM_LOG_COMPILER): ... this. Move flags to... (AM_SCM_LOG_FLAGS): ... this. (TEST_EXTENSIONS, SH_LOG_COMPILER, AM_SH_LOG_FLAGS): New variables.
2012-10-31 22:27:51 +00:00
AM_SCM_LOG_FLAGS = --no-auto-compile -L "$(top_srcdir)"
build: Run all the tests against the just-built daemon. * test-env.in: New file. * configure.ac: Add it to `AC_CONFIG_FILES' and `commands-exec'. * config-daemon.ac: Set and substitute `GUIX_TEST_ROOT'. * Makefile.am (SCM_LOG_COMPILER, SH_LOG_COMPILER): Use it in lieu of `pre-inst-env'. * daemon.am (test_root): Remove (AM_TESTS_ENVIRONMENT): Remove `TEST_ROOT'. (clean-local): Use $(GUIX_TEST_ROOT); make files writable before removing them.guix_test_root * tests/guix-daemon.sh: Remove `NIX_' variable settings; don't launch `guix-daemon'.
2012-12-05 23:03:26 +00:00
SH_LOG_COMPILER = $(top_builddir)/test-env $(SHELL)
build: Add unit test for the `guix-build' command. * tests/guix-build.sh: New file. * Makefile.am (TESTS): Add it. (LOG_COMPILER): Rename to... (SCM_LOG_COMPILER): ... this. Move flags to... (AM_SCM_LOG_FLAGS): ... this. (TEST_EXTENSIONS, SH_LOG_COMPILER, AM_SH_LOG_FLAGS): New variables.
2012-10-31 22:27:51 +00:00
AM_SH_LOG_FLAGS = -x -e
Add a build system. * configure.ac, Makefile.am: New files.
2012-06-13 16:01:25 +00:00
build: Run `tests/guix-gc.sh' last to avoid test failures. * Makefile.am (tests/guix-gc.log): New target. This should fix failures that occurred with "make check -j" the first time.
2013-05-11 20:37:33 +00:00
# Make sure `tests/guix-gc.sh' runs last, after all the others. Otherwise it
# could end up removing files from the store while they are being used by
# other instances of the daemon.
tests/guix-gc.log: \
$(patsubst %.sh,%.log,$(filter-out tests/guix-gc.sh,$(SH_TESTS))) \
$(SCM_TESTS:%.scm=%.log)
Add hydra.gnu.org's narinfo signing public key. * hydra.gnu.org.pub: New file. * Makefile.am (pkgdata_DATA): New variable.
2014-03-30 21:34:20 +00:00
# Public key used to sign substitutes from hydra.gnu.org.
build: Add 'hydra.gnu.org.pub' to the distribution. * Makefile.am (pkgdata_DATA): Rename to... (dist_pkgdata_DATA): ... this.
2014-04-07 16:04:39 +00:00
dist_pkgdata_DATA = hydra.gnu.org.pub
build: Run `tests/guix-gc.sh' last to avoid test failures. * Makefile.am (tests/guix-gc.log): New target. This should fix failures that occurred with "make check -j" the first time.
2013-05-11 20:37:33 +00:00
build: Add 'assert-final-inputs-self-contained' rule. * build-aux/check-final-inputs-self-contained.scm: New file. * Makefile.am (EXTRA_DIST): Add it. (assert-final-inputs-self-contained): New target. (distcheck-hook): Depend on it.
2014-06-18 13:03:13 +00:00
EXTRA_DIST = \
HACKING \
ROADMAP \
TODO \
.dir-locals.el \
pull: Use the build procedure provided by the newly-downloaded Guix. Fixes <http://bugs.gnu.org/18534>. * guix/scripts/pull.scm (with-environment-variable, with-PATH): New macros. (temporary-directory, first-directory, interned-then-deleted): New procedures. (unpack): Rewrite to do the unpacking in the current process rather than as a separate derivation. (%self-build-file): New variable. (build-from-source): New procedure. (build-and-install): Use it. * guix/build/pull.scm (build-guix): Rename 'tarball' argument to 'source'. Remove #:tar and #:gzip parameters, as well as 'tar' invocation. Remove 'scandir' invocation. Wrap body in 'with-directory-excursion'. * build-aux/build-self.scm: New file. * Makefile.am (EXTRA_DIST): Add it.
2014-11-09 21:32:21 +00:00
build-aux/build-self.scm \
build: Add 'assert-final-inputs-self-contained' rule. * build-aux/check-final-inputs-self-contained.scm: New file. * Makefile.am (EXTRA_DIST): Add it. (assert-final-inputs-self-contained): New target. (distcheck-hook): Depend on it.
2014-06-18 13:03:13 +00:00
build-aux/hydra/gnu-system.scm \
build-aux/hydra/demo-os.scm \
build-aux/hydra/guix.scm \
build-aux/check-available-binaries.scm \
build-aux/check-final-inputs-self-contained.scm \
build-aux/download.scm \
build-aux/list-packages.scm \
srfi/srfi-37.scm.in \
srfi/srfi-64.scm \
srfi/srfi-64.upstream.scm \
tests/test.drv \
tests/signing-key.pub \
tests/signing-key.sec \
build-aux/config.rpath \
bootstrap \
release.nix \
build: Add SRFI-64 to the distribution. * Makefile.am (MODULES): Add `srfi/srfi-64.scm' and `srfi/srfi-64.upstream.scm'.
2012-08-14 16:28:04 +00:00
$(TESTS)
distro: Add GNU Guile 1.8. * distro/base.scm (guile-1.8): New variable. * distro/guile-1.8-cpp-4.5.patch: New file. * Makefile.am (nobase_dist_guilemodule_DATA): Add it.
2012-07-05 22:55:07 +00:00
Add 'guix offload' as a daemon build hook. * nix/nix-daemon/guix-daemon.cc (GUIX_OPT_NO_BUILD_HOOK): New macro. (options): Add '--no-build-hook'. (parse_opt): Handle it. (main)[HAVE_DAEMON_OFFLOAD_HOOK]: Set 'useBuildHook' by default. Set $NIX_BUILD_HOOK to our offload hook unless otherwise specified. [!HAVE_DAEMON_OFFLOAD_HOOK]: Clear 'useBuildHook'. * pre-inst-env.in: Set and export NIX_BUILD_HOOK. * nix/scripts/offload.in, guix/scripts/offload.scm: New files. * guix/ui.scm (show-guix-help)[internal?]: Add "offload". * config-daemon.ac: Call 'GUIX_CHECK_UNBUFFERED_CBIP'. Instantiate 'nix/scripts/offload'. Set 'BUILD_DAEMON_OFFLOAD' conditional, and optionally define 'HAVE_DEAMON_OFFLOAD_HOOK' cpp macro. * daemon.am (nodist_pkglibexec_SCRIPTS)[BUILD_DAEMON_OFFLOAD]: Add it. * Makefile.am (MODULES)[BUILD_DAEMON_OFFLOAD]: Add 'guix/scripts/offload.scm'. (EXTRA_DIST)[!BUILD_DAEMON_OFFLOAD]: Likewise. * m4/guix.m4 (GUIX_CHECK_UNBUFFERED_CBIP): New macro. * doc/guix.texi (Setting Up the Daemon): Move most of the body to... (Build Environment Setup): ... this. New subsection. (Daemon Offload Setup): New subsection.
2014-01-23 22:48:34 +00:00
if !BUILD_DAEMON_OFFLOAD
EXTRA_DIST += \
guix/scripts/offload.scm
endif !BUILD_DAEMON_OFFLOAD
build: Replace *.log in `CLEANFILES' by the exact list of files. * Makefile.am (SCM_TESTS, SH_TESTS): New variables. (TESTS): Use them. (CLEANFILES): Replace *.log by $(SCM_TESTS:%.scm=%.log).
2013-04-29 19:52:21 +00:00
CLEANFILES = \
$(GOBJECTS) \
build: Really clean .log files from SRFI-64. * Makefile.am (CLEANFILES): Really catch .log files from SRFI-64.
2013-05-11 20:42:38 +00:00
$(SCM_TESTS:tests/%.scm=%.log)
Add a build system. * configure.ac, Makefile.am: New files.
2012-06-13 16:01:25 +00:00
build: Add silent-rules machinery for `guild compile'. * Makefile.am (AM_V_GUILEC, AM_V_GUILEC_, AM_V_GUILEC_0): New variables. (.scm.go): Use $(AM_V_GUILEC).
2013-04-29 20:00:24 +00:00
AM_V_GUILEC = $(AM_V_GUILEC_$(V))
AM_V_GUILEC_ = $(AM_V_GUILEC_$(AM_DEFAULT_VERBOSITY))
AM_V_GUILEC_0 = @echo " GUILEC" $@;
build: Make sure only the local .go files are loaded during compilation. Reported by Andreas Enge <andreas@enge.fr> at <http://lists.gnu.org/archive/html/guix-devel/2015-01/msg00272.html>. * Makefile.am (.scm.go): Add "unset GUILE_LOAD_COMPILED_PATH".
2015-01-20 13:55:06 +00:00
# Unset 'GUILE_LOAD_COMPILED_PATH' altogether while compiling. Otherwise, if
# $GUILE_LOAD_COMPILED_PATH contains $(moduledir), we may find .go files in
# there that are newer than the local .scm files (for instance because the
# user ran 'make install' recently). When that happens, we end up loading
# those previously-installed .go files, which may be stale, thereby breaking
# the whole thing.
#
build: Run `guild compile' under the C locale. * Makefile.am (.scm.go): Set LC_ALL=C.
2013-02-08 23:05:24 +00:00
# XXX: Use the C locale for when Guile lacks
# <http://git.sv.gnu.org/cgit/guile.git/commit/?h=stable-2.0&id=e2c6bf3866d1186c60bacfbd4fe5037087ee5e3f>.
Add a build system. * configure.ac, Makefile.am: New files.
2012-06-13 16:01:25 +00:00
.scm.go:
build: Add silent-rules machinery for `guild compile'. * Makefile.am (AM_V_GUILEC, AM_V_GUILEC_, AM_V_GUILEC_0): New variables. (.scm.go): Use $(AM_V_GUILEC).
2013-04-29 20:00:24 +00:00
$(AM_V_GUILEC)$(MKDIR_P) `dirname "$@"` ; \
build: Make sure only the local .go files are loaded during compilation. Reported by Andreas Enge <andreas@enge.fr> at <http://lists.gnu.org/archive/html/guix-devel/2015-01/msg00272.html>. * Makefile.am (.scm.go): Add "unset GUILE_LOAD_COMPILED_PATH".
2015-01-20 13:55:06 +00:00
unset GUILE_LOAD_COMPILED_PATH ; \
build: Run `guild compile' under the C locale. * Makefile.am (.scm.go): Set LC_ALL=C.
2013-02-08 23:05:24 +00:00
LC_ALL=C \
build: Add $(top_builddir) to the load path. * Makefile.am (DOWNLOAD_FILE): Add $(top_builddir) to the search path, since that's where guix/config.scm is. (.scm.go): Likewise.
2012-11-12 23:33:43 +00:00
$(top_builddir)/pre-inst-env \
$(GUILD) compile -L "$(top_builddir)" -L "$(top_srcdir)" \
-Wformat -Wunbound-variable -Warity-mismatch \
--target="$(host)" \
Add a build system. * configure.ac, Makefile.am: New files.
2012-06-13 16:01:25 +00:00
-o "$@" "$<"
SUFFIXES = .go
# Make sure source files are installed first, so that the mtime of
# installed compiled files is greater than that of installed source
# files. See
# <http://lists.gnu.org/archive/html/guile-devel/2010-07/msg00125.html>
# for details.
guix_install_go_files = install-nobase_nodist_guilemoduleDATA
$(guix_install_go_files): install-nobase_dist_guilemoduleDATA
Gettextize, with GNU Gettext 0.18.1. * Makefile.am (EXTRA_DIST): Add `build-aux/config.rpath'. (SUBDIRS, ACLOCAL_AMFLAGS): New variables. * configure.ac: Use `AM_GNU_GETTEXT'. Emit `po/Makefile.in'. * po/Makevars, po/POTFILES.in: New files.
2012-06-29 20:22:48 +00:00
build: Make sure the installed 'config.go' is newer than 'config.scm'. Fixes <http://bugs.gnu.org/19317>. Reported by rekado <rekado@elephly.net>. * gnu-system.am (install-data-hook): Rename to... (set-bootstrap-executable-permissions): ... this. * Makefile.am (install-data-hook): New target.
2014-12-09 10:44:21 +00:00
# The above trick doesn't work for 'config.go' because both 'config.scm' and
# 'config.go' are listed in $(nobase_nodist_guilemodule_DATA). Thus, give it
# special treatment.
install-data-hook: set-bootstrap-executable-permissions
touch "$(DESTDIR)$(guilemoduledir)/guix/config.go"
Separate package description translations from string translations. * po/packages/LINGUAS, po/packages/Makevars, po/packages/POTFILES.in: New files. * po/guix/Makevars (DOMAIN): Change to "guix". (XGETTEXT_OPTIONS): Remove "--keyword=synopsis --keyword=description". * po/guix/POTFILES.in: Remove gnu/packages/*.scm. * configure.ac: Change to gettext 0.18.3. Produce po/packages/Makefile.in. * Makefile.am (SUBDIRS): Add po/packages. * guix/ui.scm (%package-text-domain): New variable. (P_): New procedure. (package->recutils): Use 'P_' instead of '_'. * guix/scripts/package.scm (find-packages-by-description): Use 'P_' instead of 'gettext'.
2014-06-13 15:30:40 +00:00
SUBDIRS = po/guix po/packages
doc: Make sure out-of-source-tree builds find os-config.tmpl. * Makefile.am (BUILT_SOURCES): New variable. * daemon.am (BUILT_SOURCES): Use +=. * doc.am (BUILT_SOURCES, MAINTAINERCLEANFILES, EXTRA_DIST): Add doc/os-config.texi. (doc/os-config.texi): New target. * doc/guix.texi (System Installation): Include os-config.texi.
2014-07-24 21:38:39 +00:00
BUILT_SOURCES =
build: Build docs from the top-level Makefile. This undoes commit 575ed8d ("doc: Create own Makefile.am in subdirectory."), and fixes a bug whereby "make pdf" or "make ps" wouldn't do anything. * doc/Makefile.am: Remove. * doc.am: New file. Use `-local' rules to build the image. * Makefile.am: Include it. * configure.ac: Use `-Woverride' to avoid undesired overridding of Automake rules.
2013-08-29 19:20:51 +00:00
include doc.am
doc: Add the stub of a manual. * doc/guix.texi: New file. * doc/fdl-1.3.texi: New file, copied from Gnulib. * Makefile.am (info_TEXINFOS): New variable. (EXTRA_DIST): Add `doc/fdl-1.3.texi'.
2012-10-13 14:05:01 +00:00
build: Include a copy of Nix's libstore and daemon; build it. * configure.ac: Call `AC_USE_SYSTEM_EXTENSIONS', and `GUIX_SYSTEM_TYPE'. Add `--with-store-dir' option, and substitute `storedir'. Include `config-daemon.ac'. * config-daemon.ac: New file. * Makefile.am [BUILD_DAEMON]: Include `daemon.am'. * daemon.am: New file. * m4/guix.m4 (GUIX_SYSTEM_TYPE): New macro. * nix/libutil/gcrypt-hash.cc, nix/libutil/gcrypt-hash.hh, nix/libutil/md5.h, nix/libutil/sha1.h, nix/libutil/sha256.h, nix/nix-daemon/guix-daemon.cc, nix/nix-daemon/shared.hh: New files.
2012-12-03 22:04:47 +00:00
if BUILD_DAEMON
include daemon.am
endif BUILD_DAEMON
Gettextize, with GNU Gettext 0.18.1. * Makefile.am (EXTRA_DIST): Add `build-aux/config.rpath'. (SUBDIRS, ACLOCAL_AMFLAGS): New variables. * configure.ac: Use `AM_GNU_GETTEXT'. Emit `po/Makefile.in'. * po/Makevars, po/POTFILES.in: New files.
2012-06-29 20:22:48 +00:00
ACLOCAL_AMFLAGS = -I m4
build: Clearly mark Nixpkgs as optional. * configure.ac: Always show the result of checking for Nixpkgs. Don't warn when Nixpkgs is not found. * Makefile.am (AM_DISTCHECK_CONFIGURE_FLAGS): Remove `--with-nixpkgs' flag. * guix/utils.scm (%nixpkgs-directory): Use either the compile-time or the run-time `NIXPKGS' environment variable. * release.nix (jobs.tarball, jobs.build): Remove `--with-nixpkgs' configure flag. * README: Mark Nixpkgs as optional. * distro/packages/databases.scm, distro/packages/guile.scm, distro/packages/typesetting.scm: Change uses of `nixpkgs-derivation*' to `nixpkgs-derivation', to avoid failing at compile-time.
2012-11-03 20:11:02 +00:00
AM_DISTCHECK_CONFIGURE_FLAGS = \
build: Require GNU libgcrypt. * guix/utils.scm (sha256): Remove Coreutils- and libchop-based implementations. * README: Update accordingly. * m4/guix.m4: New file. * configure.ac: Use `GUIX_ASSERT_LIBGCRYPT_USABLE'. Set and substitute `LIBGCRYPT_PREFIX'. * Makefile.am (AM_DISTCHECK_CONFIGURE_FLAGS): Pass `--with-libgcrypt-prefix=$(LIBGCRYPT_PREFIX)'.
2012-11-03 20:43:30 +00:00
--with-libgcrypt-prefix="$(LIBGCRYPT_PREFIX)" \
build: Add --with-libgcrypt-libdir=DIR to support Debian's multi-arch layout. * configure.ac: Remove 'LIBGCRYPT_PREFIX' and use 'LIBGCRYPT_LIBDIR' instead. Add --with-libgcrypt-libdir=DIR option. * Makefile.am (AM_DISTCHECK_CONFIGURE_FLAGS): Pass '--with-libgcrypt-libdir'. * config-daemon.ac: Honor $LIBGCRYPT_LIBDIR when computing LIBGCRYPT_LIBS.
2014-05-17 13:41:56 +00:00
--with-libgcrypt-libdir="$(LIBGCRYPT_LIBDIR)" \
build: Run `distcheck' with `--enable-daemon'. * Makefile.am (AM_DISTCHECK_CONFIGURE_FLAGS): Add `--enable-daemon'.
2012-12-05 23:04:43 +00:00
--with-nix-prefix="$(NIX_PREFIX)" \
--enable-daemon
build: Add `sync-synopses.scm'. * build-aux/sync-synopses.scm: New file. * Makefile.am (EXTRA_DIST): Add it. (dist-hook): New target.
2013-04-17 16:09:43 +00:00
Add Emacs user interface. * configure.ac (emacsuidir): New variable. (AC_CONFIG_FILES): Add 'emacs/guix-init.el', 'emacs/guix-helper.scm'. * Makefile.am: Include 'emacs.am'. * emacs.am: New file. * doc/emacs.texi: New file. * doc/guix.texi: Include 'emacs.texi'. * emacs/guix-backend.el: New file. * emacs/guix-base.el: New file. * emacs/guix-helper.scm.in: New file. * emacs/guix-history.el: New file. * emacs/guix-info.el: New file. * emacs/guix-init.el.in: New file. * emacs/guix-list.el: New file. * emacs/guix-main.scm: New file. * emacs/guix-utils.el: New file. * emacs/guix.el: New file.
2014-08-27 12:44:17 +00:00
dist_emacsui_DATA = emacs/guix-main.scm
nodist_emacsui_DATA = emacs/guix-helper.scm
include emacs.am
build: 'sync-descriptions' now compares GNU package descriptions. * build-aux/sync-synopses.scm: Rename to... * build-aux/sync-descriptions.scm: ... this. Compare the value of 'gnu-package-doc-description' and 'package-description' and report any mismatch. * Makefile.am (EXTRA_DIST): Adjust accordingly. (sync-synopses): Rename to... (sync-descriptions): ... this.
2013-10-09 14:13:02 +00:00
dist-hook: sync-descriptions gen-ChangeLog assert-no-store-file-names
build: Add 'assert-final-inputs-self-contained' rule. * build-aux/check-final-inputs-self-contained.scm: New file. * Makefile.am (EXTRA_DIST): Add it. (assert-final-inputs-self-contained): New target. (distcheck-hook): Depend on it.
2014-06-18 13:03:13 +00:00
distcheck-hook: assert-binaries-available assert-final-inputs-self-contained
build: Generate a ChangeLog file upon "make dist". * Makefile.am (sync-synopses): New rule, formerly `dist-hook. (gen-ChangeLog): New rule. (dist-hook): Depend on these two targets.
2013-05-12 14:14:25 +00:00
build: 'sync-descriptions' now compares GNU package descriptions. * build-aux/sync-synopses.scm: Rename to... * build-aux/sync-descriptions.scm: ... this. Compare the value of 'gnu-package-doc-description' and 'package-description' and report any mismatch. * Makefile.am (EXTRA_DIST): Adjust accordingly. (sync-synopses): Rename to... (sync-descriptions): ... this.
2013-10-09 14:13:02 +00:00
sync-descriptions:
build: Unset 'GUIX_PACKAGE_PATH' in 'sync-descriptions'. * Makefile.am (sync-descriptions): Clear 'GUIX_PACKAGE_PATH'.
2015-01-26 22:56:58 +00:00
-GUIX_PACKAGE_PATH= \
$(top_builddir)/pre-inst-env guix lint --checkers=gnu-description
build: Generate a ChangeLog file upon "make dist". * Makefile.am (sync-synopses): New rule, formerly `dist-hook. (gen-ChangeLog): New rule. (dist-hook): Depend on these two targets.
2013-05-12 14:14:25 +00:00
gen-ChangeLog:
if test -d .git; then \
$(top_srcdir)/build-aux/gitlog-to-changelog \
> $(distdir)/cl-t; \
rm -f $(distdir)/ChangeLog; \
mv $(distdir)/cl-t $(distdir)/ChangeLog; \
fi
Change the default store file name to /gnu/store. * configure.ac: Change the default 'storedir' to /gnu/store. Print $storedir. * doc/guix.texi: Replace "/nix/store" by "/gnu/store", except where describing Nix compatibility. * Makefile.am: Likewise.
2014-03-09 21:09:12 +00:00
# Make sure we're not shipping a file that embeds a local /gnu/store file name.
build: Make sure the distribution doesn't embed store file names. * Makefile.am (assert-no-store-file-names): New target. (dist-hook): Depend on it.
2013-05-12 14:26:12 +00:00
assert-no-store-file-names:
if grep -r --exclude=*.texi --exclude=*.info \
"$(storedir)/[a-z0-9]{32}-" $(distdir) ; \
then \
echo "error: store file names embedded in the distribution" >&2 ; \
exit 1 ; \
fi
build: Check for the availability of binaries upon "distcheck". * build-aux/check-available-binaries.scm: New file. * Makefile.am (EXTRA_DIST): Add it. (distcheck-hook, assert-binaries-available): New target.
2013-07-15 21:06:14 +00:00
# Make sure hydra.gnu.org has the important binaries.
assert-binaries-available:
$(top_builddir)/pre-inst-env "$(GUILE)" \
"$(top_srcdir)/build-aux/check-available-binaries.scm"
build: Add 'assert-final-inputs-self-contained' rule. * build-aux/check-final-inputs-self-contained.scm: New file. * Makefile.am (EXTRA_DIST): Add it. (assert-final-inputs-self-contained): New target. (distcheck-hook): Depend on it.
2014-06-18 13:03:13 +00:00
# Make sure the final inputs don't refer to bootstrap tools.
assert-final-inputs-self-contained:
$(top_builddir)/pre-inst-env "$(GUILE)" \
"$(top_srcdir)/build-aux/check-final-inputs-self-contained.scm"
build: Add 'clean-go' target. * Makefile.am (clean-go): New phony target.
2013-10-15 21:25:08 +00:00
.PHONY: sync-descriptions gen-ChangeLog clean-go
build: Check for the availability of binaries upon "distcheck". * build-aux/check-available-binaries.scm: New file. * Makefile.am (EXTRA_DIST): Add it. (distcheck-hook, assert-binaries-available): New target.
2013-07-15 21:06:14 +00:00
.PHONY: assert-no-store-file-names assert-binaries-available
build: Add 'assert-final-inputs-self-contained' rule. * build-aux/check-final-inputs-self-contained.scm: New file. * Makefile.am (EXTRA_DIST): Add it. (assert-final-inputs-self-contained): New target. (distcheck-hook): Depend on it.
2014-06-18 13:03:13 +00:00
.PHONY: assert-final-inputs-self-contained
Reference in New Issue Copy Permalink