2013-12-22 01:08:21 +01:00
|
|
|
|
;;; GNU Guix --- Functional package management for GNU
|
monads: Move '%store-monad' and related procedures where they belong.
This turns (guix monads) into a generic module for monads, and moves the
store monad and related monadic procedures in their corresponding
module.
* guix/monads.scm (store-return, store-bind, %store-monad, store-lift,
text-file, interned-file, package-file, package->derivation,
package->cross-derivation, origin->derivation, imported-modules,
compiled, modules, built-derivations, run-with-store): Move to...
* guix/store.scm (store-return, store-bind, %store-monad, store-lift,
text-file, interned-file): ... here.
(%guile-for-build): New variable.
(run-with-store): Moved from monads.scm. Remove default value for
#:guile-for-build.
* guix/packages.scm (default-guile): Export.
(set-guile-for-build): New procedure.
(package-file, package->derivation, package->cross-derivation,
origin->derivation): Moved from monads.scm.
* guix/derivations.scm (%guile-for-build): Remove.
(imported-modules): Rename to...
(%imported-modules): ... this.
(compiled-modules): Rename to...
(%compiled-modules): ... this.
(built-derivations, imported-modules, compiled-modules): New
procedures.
* gnu/services/avahi.scm, gnu/services/base.scm, gnu/services/dbus.scm,
gnu/services/dmd.scm, gnu/services/networking.scm,
gnu/services/ssh.scm, gnu/services/xorg.scm, gnu/system/install.scm,
gnu/system/linux-initrd.scm, gnu/system/shadow.scm, guix/download.scm,
guix/gexp.scm, guix/git-download.scm, guix/profiles.scm,
guix/svn-download.scm, tests/monads.scm: Adjust imports accordingly.
* guix/monad-repl.scm (default-guile-derivation): New procedure.
(store-monad-language, run-in-store): Use it.
* build-aux/hydra/gnu-system.scm (qemu-jobs): Add explicit
'set-guile-for-build' call.
* guix/scripts/archive.scm (derivation-from-expression): Likewise.
* guix/scripts/build.scm (options/resolve-packages): Likewise.
* guix/scripts/environment.scm (guix-environment): Likewise.
* guix/scripts/system.scm (guix-system): Likewise.
* doc/guix.texi (The Store Monad): Adjust module names accordingly.
2015-01-14 13:34:52 +01:00
|
|
|
|
;;; Copyright © 2013, 2014, 2015 Ludovic Courtès <ludo@gnu.org>
|
2013-12-22 01:08:21 +01:00
|
|
|
|
;;;
|
|
|
|
|
;;; This file is part of GNU Guix.
|
|
|
|
|
;;;
|
|
|
|
|
;;; GNU Guix is free software; you can redistribute it and/or modify it
|
|
|
|
|
;;; 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.
|
|
|
|
|
;;;
|
|
|
|
|
;;; GNU Guix is distributed in the hope that it will be useful, but
|
|
|
|
|
;;; 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
|
|
|
|
|
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
|
|
|
|
|
|
(define-module (guix scripts archive)
|
|
|
|
|
#:use-module (guix config)
|
|
|
|
|
#:use-module (guix utils)
|
2014-01-05 23:40:06 +01:00
|
|
|
|
#:use-module ((guix build utils) #:select (mkdir-p))
|
2013-12-22 01:08:21 +01:00
|
|
|
|
#:use-module (guix store)
|
|
|
|
|
#:use-module (guix packages)
|
|
|
|
|
#:use-module (guix derivations)
|
2014-03-13 19:21:49 +01:00
|
|
|
|
#:use-module (guix monads)
|
2013-12-22 01:08:21 +01:00
|
|
|
|
#:use-module (guix ui)
|
2013-12-30 22:46:21 +01:00
|
|
|
|
#:use-module (guix pki)
|
|
|
|
|
#:use-module (guix pk-crypto)
|
2013-12-22 01:08:21 +01:00
|
|
|
|
#:use-module (ice-9 match)
|
2014-01-06 22:25:29 +01:00
|
|
|
|
#:use-module (ice-9 format)
|
|
|
|
|
#:use-module (ice-9 rdelim)
|
2013-12-22 01:08:21 +01:00
|
|
|
|
#:use-module (srfi srfi-1)
|
|
|
|
|
#:use-module (srfi srfi-11)
|
|
|
|
|
#:use-module (srfi srfi-26)
|
|
|
|
|
#:use-module (srfi srfi-37)
|
|
|
|
|
#:use-module (guix scripts build)
|
|
|
|
|
#:use-module (guix scripts package)
|
2013-12-30 23:18:52 +01:00
|
|
|
|
#:use-module (rnrs io ports)
|
2013-12-22 01:08:21 +01:00
|
|
|
|
#:export (guix-archive))
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
;;;
|
|
|
|
|
;;; Command-line options.
|
|
|
|
|
;;;
|
|
|
|
|
|
|
|
|
|
(define %default-options
|
|
|
|
|
;; Alist of default option values.
|
|
|
|
|
`((system . ,(%current-system))
|
|
|
|
|
(substitutes? . #t)
|
|
|
|
|
(max-silent-time . 3600)
|
|
|
|
|
(verbosity . 0)))
|
|
|
|
|
|
|
|
|
|
(define (show-help)
|
|
|
|
|
(display (_ "Usage: guix archive [OPTION]... PACKAGE...
|
|
|
|
|
Export/import one or more packages from/to the store.\n"))
|
|
|
|
|
(display (_ "
|
|
|
|
|
--export export the specified files/packages to stdout"))
|
2015-01-17 17:05:54 +01:00
|
|
|
|
(display (_ "
|
|
|
|
|
-r, --recursive combined with '--export', include dependencies"))
|
2013-12-22 01:08:21 +01:00
|
|
|
|
(display (_ "
|
|
|
|
|
--import import from the archive passed on stdin"))
|
2014-01-06 22:25:29 +01:00
|
|
|
|
(display (_ "
|
|
|
|
|
--missing print the files from stdin that are missing"))
|
2013-12-22 01:08:21 +01:00
|
|
|
|
(newline)
|
2013-12-30 22:46:21 +01:00
|
|
|
|
(display (_ "
|
|
|
|
|
--generate-key[=PARAMETERS]
|
|
|
|
|
generate a key pair with the given parameters"))
|
2014-02-28 22:31:16 +01:00
|
|
|
|
(display (_ "
|
|
|
|
|
--authorize authorize imports signed by the public key on stdin"))
|
|
|
|
|
(newline)
|
2013-12-22 01:08:21 +01:00
|
|
|
|
(display (_ "
|
|
|
|
|
-e, --expression=EXPR build the package or derivation EXPR evaluates to"))
|
|
|
|
|
(display (_ "
|
|
|
|
|
-S, --source build the packages' source derivations"))
|
|
|
|
|
(display (_ "
|
|
|
|
|
-s, --system=SYSTEM attempt to build for SYSTEM--e.g., \"i686-linux\""))
|
|
|
|
|
(display (_ "
|
|
|
|
|
--target=TRIPLET cross-build for TRIPLET--e.g., \"armel-linux-gnu\""))
|
guix build: Factorize common options.
* guix/scripts/build.scm (show-build-options-help,
set-build-options-from-command-line): New procedures.
(show-help): Remove description of --dry-run,
--fallback, --no-substitutes, --max-silent-time, and --cores. Call
'show-build-options-help'.
(%standard-build-options): New variable.
(%options): Remove --dry-run, --fallback, --no-substitutes,
--verbosity, --max-silent-time, and --cores. Add
%STANDARD-BUILD-OPTIONS.
(guix-build): Use 'set-build-options-from-command-line' instead of
'set-build-options'.
* guix/scripts/archive.scm (show-help): Remove description of --dry-run,
--fallback, --no-substitutes, --max-silent-time, and --cores. Call
'show-build-options-help'.
(%options): Remove --dry-run, --fallback, --no-substitutes,
--verbosity, --max-silent-time, and --cores. Add
%STANDARD-BUILD-OPTIONS.
(export-from-store): Call 'set-build-options-from-command-line'
instead of 'set-build-options.
2014-02-18 00:13:06 +01:00
|
|
|
|
|
|
|
|
|
(newline)
|
|
|
|
|
(show-build-options-help)
|
|
|
|
|
|
2013-12-22 01:08:21 +01:00
|
|
|
|
(newline)
|
|
|
|
|
(display (_ "
|
|
|
|
|
-h, --help display this help and exit"))
|
|
|
|
|
(display (_ "
|
|
|
|
|
-V, --version display version information and exit"))
|
|
|
|
|
(newline)
|
|
|
|
|
(show-bug-report-information))
|
|
|
|
|
|
2014-03-20 22:33:52 +01:00
|
|
|
|
(define %key-generation-parameters
|
|
|
|
|
;; Default key generation parameters. We prefer Ed25519, but it was
|
|
|
|
|
;; introduced in libgcrypt 1.6.0.
|
|
|
|
|
(if (version>? (gcrypt-version) "1.6.0")
|
|
|
|
|
"(genkey (ecdsa (curve Ed25519) (flags rfc6979)))"
|
|
|
|
|
"(genkey (rsa (nbits 4:4096)))"))
|
|
|
|
|
|
2013-12-22 01:08:21 +01:00
|
|
|
|
(define %options
|
|
|
|
|
;; Specifications of the command-line options.
|
guix build: Factorize common options.
* guix/scripts/build.scm (show-build-options-help,
set-build-options-from-command-line): New procedures.
(show-help): Remove description of --dry-run,
--fallback, --no-substitutes, --max-silent-time, and --cores. Call
'show-build-options-help'.
(%standard-build-options): New variable.
(%options): Remove --dry-run, --fallback, --no-substitutes,
--verbosity, --max-silent-time, and --cores. Add
%STANDARD-BUILD-OPTIONS.
(guix-build): Use 'set-build-options-from-command-line' instead of
'set-build-options'.
* guix/scripts/archive.scm (show-help): Remove description of --dry-run,
--fallback, --no-substitutes, --max-silent-time, and --cores. Call
'show-build-options-help'.
(%options): Remove --dry-run, --fallback, --no-substitutes,
--verbosity, --max-silent-time, and --cores. Add
%STANDARD-BUILD-OPTIONS.
(export-from-store): Call 'set-build-options-from-command-line'
instead of 'set-build-options.
2014-02-18 00:13:06 +01:00
|
|
|
|
(cons* (option '(#\h "help") #f #f
|
|
|
|
|
(lambda args
|
|
|
|
|
(show-help)
|
|
|
|
|
(exit 0)))
|
|
|
|
|
(option '(#\V "version") #f #f
|
|
|
|
|
(lambda args
|
|
|
|
|
(show-version-and-exit "guix build")))
|
|
|
|
|
|
|
|
|
|
(option '("export") #f #f
|
|
|
|
|
(lambda (opt name arg result)
|
|
|
|
|
(alist-cons 'export #t result)))
|
2015-01-17 17:05:54 +01:00
|
|
|
|
(option '(#\r "recursive") #f #f
|
|
|
|
|
(lambda (opt name arg result)
|
|
|
|
|
(alist-cons 'export-recursive? #t result)))
|
guix build: Factorize common options.
* guix/scripts/build.scm (show-build-options-help,
set-build-options-from-command-line): New procedures.
(show-help): Remove description of --dry-run,
--fallback, --no-substitutes, --max-silent-time, and --cores. Call
'show-build-options-help'.
(%standard-build-options): New variable.
(%options): Remove --dry-run, --fallback, --no-substitutes,
--verbosity, --max-silent-time, and --cores. Add
%STANDARD-BUILD-OPTIONS.
(guix-build): Use 'set-build-options-from-command-line' instead of
'set-build-options'.
* guix/scripts/archive.scm (show-help): Remove description of --dry-run,
--fallback, --no-substitutes, --max-silent-time, and --cores. Call
'show-build-options-help'.
(%options): Remove --dry-run, --fallback, --no-substitutes,
--verbosity, --max-silent-time, and --cores. Add
%STANDARD-BUILD-OPTIONS.
(export-from-store): Call 'set-build-options-from-command-line'
instead of 'set-build-options.
2014-02-18 00:13:06 +01:00
|
|
|
|
(option '("import") #f #f
|
|
|
|
|
(lambda (opt name arg result)
|
|
|
|
|
(alist-cons 'import #t result)))
|
|
|
|
|
(option '("missing") #f #f
|
|
|
|
|
(lambda (opt name arg result)
|
|
|
|
|
(alist-cons 'missing #t result)))
|
|
|
|
|
(option '("generate-key") #f #t
|
|
|
|
|
(lambda (opt name arg result)
|
|
|
|
|
(catch 'gcry-error
|
|
|
|
|
(lambda ()
|
2014-03-17 23:49:35 +01:00
|
|
|
|
;; XXX: Curve25519 was actually introduced in
|
|
|
|
|
;; libgcrypt 1.6.0.
|
guix build: Factorize common options.
* guix/scripts/build.scm (show-build-options-help,
set-build-options-from-command-line): New procedures.
(show-help): Remove description of --dry-run,
--fallback, --no-substitutes, --max-silent-time, and --cores. Call
'show-build-options-help'.
(%standard-build-options): New variable.
(%options): Remove --dry-run, --fallback, --no-substitutes,
--verbosity, --max-silent-time, and --cores. Add
%STANDARD-BUILD-OPTIONS.
(guix-build): Use 'set-build-options-from-command-line' instead of
'set-build-options'.
* guix/scripts/archive.scm (show-help): Remove description of --dry-run,
--fallback, --no-substitutes, --max-silent-time, and --cores. Call
'show-build-options-help'.
(%options): Remove --dry-run, --fallback, --no-substitutes,
--verbosity, --max-silent-time, and --cores. Add
%STANDARD-BUILD-OPTIONS.
(export-from-store): Call 'set-build-options-from-command-line'
instead of 'set-build-options.
2014-02-18 00:13:06 +01:00
|
|
|
|
(let ((params
|
|
|
|
|
(string->canonical-sexp
|
2014-03-20 22:33:52 +01:00
|
|
|
|
(or arg %key-generation-parameters))))
|
guix build: Factorize common options.
* guix/scripts/build.scm (show-build-options-help,
set-build-options-from-command-line): New procedures.
(show-help): Remove description of --dry-run,
--fallback, --no-substitutes, --max-silent-time, and --cores. Call
'show-build-options-help'.
(%standard-build-options): New variable.
(%options): Remove --dry-run, --fallback, --no-substitutes,
--verbosity, --max-silent-time, and --cores. Add
%STANDARD-BUILD-OPTIONS.
(guix-build): Use 'set-build-options-from-command-line' instead of
'set-build-options'.
* guix/scripts/archive.scm (show-help): Remove description of --dry-run,
--fallback, --no-substitutes, --max-silent-time, and --cores. Call
'show-build-options-help'.
(%options): Remove --dry-run, --fallback, --no-substitutes,
--verbosity, --max-silent-time, and --cores. Add
%STANDARD-BUILD-OPTIONS.
(export-from-store): Call 'set-build-options-from-command-line'
instead of 'set-build-options.
2014-02-18 00:13:06 +01:00
|
|
|
|
(alist-cons 'generate-key params result)))
|
2014-04-22 11:41:52 +02:00
|
|
|
|
(lambda (key proc err)
|
2014-03-17 23:47:18 +01:00
|
|
|
|
(leave (_ "invalid key generation parameters: ~a: ~a~%")
|
|
|
|
|
(error-source err)
|
|
|
|
|
(error-string err))))))
|
guix build: Factorize common options.
* guix/scripts/build.scm (show-build-options-help,
set-build-options-from-command-line): New procedures.
(show-help): Remove description of --dry-run,
--fallback, --no-substitutes, --max-silent-time, and --cores. Call
'show-build-options-help'.
(%standard-build-options): New variable.
(%options): Remove --dry-run, --fallback, --no-substitutes,
--verbosity, --max-silent-time, and --cores. Add
%STANDARD-BUILD-OPTIONS.
(guix-build): Use 'set-build-options-from-command-line' instead of
'set-build-options'.
* guix/scripts/archive.scm (show-help): Remove description of --dry-run,
--fallback, --no-substitutes, --max-silent-time, and --cores. Call
'show-build-options-help'.
(%options): Remove --dry-run, --fallback, --no-substitutes,
--verbosity, --max-silent-time, and --cores. Add
%STANDARD-BUILD-OPTIONS.
(export-from-store): Call 'set-build-options-from-command-line'
instead of 'set-build-options.
2014-02-18 00:13:06 +01:00
|
|
|
|
(option '("authorize") #f #f
|
|
|
|
|
(lambda (opt name arg result)
|
|
|
|
|
(alist-cons 'authorize #t result)))
|
|
|
|
|
|
|
|
|
|
(option '(#\S "source") #f #f
|
|
|
|
|
(lambda (opt name arg result)
|
|
|
|
|
(alist-cons 'source? #t result)))
|
|
|
|
|
(option '(#\s "system") #t #f
|
|
|
|
|
(lambda (opt name arg result)
|
|
|
|
|
(alist-cons 'system arg
|
|
|
|
|
(alist-delete 'system result eq?))))
|
|
|
|
|
(option '("target") #t #f
|
|
|
|
|
(lambda (opt name arg result)
|
|
|
|
|
(alist-cons 'target arg
|
|
|
|
|
(alist-delete 'target result eq?))))
|
|
|
|
|
(option '(#\e "expression") #t #f
|
|
|
|
|
(lambda (opt name arg result)
|
|
|
|
|
(alist-cons 'expression arg result)))
|
|
|
|
|
(option '(#\n "dry-run") #f #f
|
|
|
|
|
(lambda (opt name arg result)
|
|
|
|
|
(alist-cons 'dry-run? #t result)))
|
|
|
|
|
|
|
|
|
|
%standard-build-options))
|
2013-12-22 01:08:21 +01:00
|
|
|
|
|
2014-03-13 19:21:49 +01:00
|
|
|
|
(define (derivation-from-expression store str package-derivation
|
|
|
|
|
system source?)
|
|
|
|
|
"Read/eval STR and return the corresponding derivation path for SYSTEM.
|
|
|
|
|
When SOURCE? is true and STR evaluates to a package, return the derivation of
|
|
|
|
|
the package source; otherwise, use PACKAGE-DERIVATION to compute the
|
|
|
|
|
derivation of a package."
|
|
|
|
|
(match (read/eval str)
|
|
|
|
|
((? package? p)
|
|
|
|
|
(if source?
|
|
|
|
|
(let ((source (package-source p)))
|
|
|
|
|
(if source
|
|
|
|
|
(package-source-derivation store source)
|
|
|
|
|
(leave (_ "package `~a' has no source~%")
|
|
|
|
|
(package-name p))))
|
|
|
|
|
(package-derivation store p system)))
|
|
|
|
|
((? procedure? proc)
|
monads: Move '%store-monad' and related procedures where they belong.
This turns (guix monads) into a generic module for monads, and moves the
store monad and related monadic procedures in their corresponding
module.
* guix/monads.scm (store-return, store-bind, %store-monad, store-lift,
text-file, interned-file, package-file, package->derivation,
package->cross-derivation, origin->derivation, imported-modules,
compiled, modules, built-derivations, run-with-store): Move to...
* guix/store.scm (store-return, store-bind, %store-monad, store-lift,
text-file, interned-file): ... here.
(%guile-for-build): New variable.
(run-with-store): Moved from monads.scm. Remove default value for
#:guile-for-build.
* guix/packages.scm (default-guile): Export.
(set-guile-for-build): New procedure.
(package-file, package->derivation, package->cross-derivation,
origin->derivation): Moved from monads.scm.
* guix/derivations.scm (%guile-for-build): Remove.
(imported-modules): Rename to...
(%imported-modules): ... this.
(compiled-modules): Rename to...
(%compiled-modules): ... this.
(built-derivations, imported-modules, compiled-modules): New
procedures.
* gnu/services/avahi.scm, gnu/services/base.scm, gnu/services/dbus.scm,
gnu/services/dmd.scm, gnu/services/networking.scm,
gnu/services/ssh.scm, gnu/services/xorg.scm, gnu/system/install.scm,
gnu/system/linux-initrd.scm, gnu/system/shadow.scm, guix/download.scm,
guix/gexp.scm, guix/git-download.scm, guix/profiles.scm,
guix/svn-download.scm, tests/monads.scm: Adjust imports accordingly.
* guix/monad-repl.scm (default-guile-derivation): New procedure.
(store-monad-language, run-in-store): Use it.
* build-aux/hydra/gnu-system.scm (qemu-jobs): Add explicit
'set-guile-for-build' call.
* guix/scripts/archive.scm (derivation-from-expression): Likewise.
* guix/scripts/build.scm (options/resolve-packages): Likewise.
* guix/scripts/environment.scm (guix-environment): Likewise.
* guix/scripts/system.scm (guix-system): Likewise.
* doc/guix.texi (The Store Monad): Adjust module names accordingly.
2015-01-14 13:34:52 +01:00
|
|
|
|
(run-with-store store
|
|
|
|
|
(mbegin %store-monad
|
|
|
|
|
(set-guile-for-build (default-guile))
|
|
|
|
|
(proc)) #:system system))))
|
2014-03-13 19:21:49 +01:00
|
|
|
|
|
2013-12-22 01:08:21 +01:00
|
|
|
|
(define (options->derivations+files store opts)
|
|
|
|
|
"Given OPTS, the result of 'args-fold', return a list of derivations to
|
|
|
|
|
build and a list of store files to transfer."
|
|
|
|
|
(define package->derivation
|
|
|
|
|
(match (assoc-ref opts 'target)
|
|
|
|
|
(#f package-derivation)
|
|
|
|
|
(triplet
|
|
|
|
|
(cut package-cross-derivation <> <> triplet <>))))
|
|
|
|
|
|
|
|
|
|
(define src? (assoc-ref opts 'source?))
|
|
|
|
|
(define sys (assoc-ref opts 'system))
|
|
|
|
|
|
|
|
|
|
(fold2 (lambda (arg derivations files)
|
|
|
|
|
(match arg
|
|
|
|
|
(('expression . str)
|
|
|
|
|
(let ((drv (derivation-from-expression store str
|
|
|
|
|
package->derivation
|
|
|
|
|
sys src?)))
|
|
|
|
|
(values (cons drv derivations)
|
|
|
|
|
(cons (derivation->output-path drv) files))))
|
|
|
|
|
(('argument . (? store-path? file))
|
|
|
|
|
(values derivations (cons file files)))
|
|
|
|
|
(('argument . (? string? spec))
|
|
|
|
|
(let-values (((p output)
|
|
|
|
|
(specification->package+output spec)))
|
|
|
|
|
(if src?
|
|
|
|
|
(let* ((s (package-source p))
|
|
|
|
|
(drv (package-source-derivation store s)))
|
|
|
|
|
(values (cons drv derivations)
|
|
|
|
|
(cons (derivation->output-path drv)
|
|
|
|
|
files)))
|
|
|
|
|
(let ((drv (package->derivation store p sys)))
|
|
|
|
|
(values (cons drv derivations)
|
|
|
|
|
(cons (derivation->output-path drv output)
|
|
|
|
|
files))))))
|
|
|
|
|
(_
|
|
|
|
|
(values derivations files))))
|
|
|
|
|
'()
|
|
|
|
|
'()
|
|
|
|
|
opts))
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
;;;
|
|
|
|
|
;;; Entry point.
|
|
|
|
|
;;;
|
|
|
|
|
|
|
|
|
|
(define (export-from-store store opts)
|
|
|
|
|
"Export the packages or derivations specified in OPTS from STORE. Write the
|
|
|
|
|
resulting archive to the standard output port."
|
|
|
|
|
(let-values (((drv files)
|
|
|
|
|
(options->derivations+files store opts)))
|
guix build: Factorize common options.
* guix/scripts/build.scm (show-build-options-help,
set-build-options-from-command-line): New procedures.
(show-help): Remove description of --dry-run,
--fallback, --no-substitutes, --max-silent-time, and --cores. Call
'show-build-options-help'.
(%standard-build-options): New variable.
(%options): Remove --dry-run, --fallback, --no-substitutes,
--verbosity, --max-silent-time, and --cores. Add
%STANDARD-BUILD-OPTIONS.
(guix-build): Use 'set-build-options-from-command-line' instead of
'set-build-options'.
* guix/scripts/archive.scm (show-help): Remove description of --dry-run,
--fallback, --no-substitutes, --max-silent-time, and --cores. Call
'show-build-options-help'.
(%options): Remove --dry-run, --fallback, --no-substitutes,
--verbosity, --max-silent-time, and --cores. Add
%STANDARD-BUILD-OPTIONS.
(export-from-store): Call 'set-build-options-from-command-line'
instead of 'set-build-options.
2014-02-18 00:13:06 +01:00
|
|
|
|
(set-build-options-from-command-line store opts)
|
2013-12-22 01:08:21 +01:00
|
|
|
|
(show-what-to-build store drv
|
|
|
|
|
#:use-substitutes? (assoc-ref opts 'substitutes?)
|
|
|
|
|
#:dry-run? (assoc-ref opts 'dry-run?))
|
|
|
|
|
|
|
|
|
|
(if (or (assoc-ref opts 'dry-run?)
|
|
|
|
|
(build-derivations store drv))
|
2015-01-17 17:05:54 +01:00
|
|
|
|
(export-paths store files (current-output-port)
|
|
|
|
|
#:recursive? (assoc-ref opts 'export-recursive?))
|
2013-12-30 22:46:21 +01:00
|
|
|
|
(leave (_ "unable to export the given packages~%")))))
|
|
|
|
|
|
|
|
|
|
(define (generate-key-pair parameters)
|
|
|
|
|
"Generate a key pair with PARAMETERS, a canonical sexp, and store it in the
|
|
|
|
|
right place."
|
|
|
|
|
(when (or (file-exists? %public-key-file)
|
|
|
|
|
(file-exists? %private-key-file))
|
|
|
|
|
(leave (_ "key pair exists under '~a'; remove it first~%")
|
|
|
|
|
(dirname %public-key-file)))
|
|
|
|
|
|
|
|
|
|
(format (current-error-port)
|
|
|
|
|
(_ "Please wait while gathering entropy to generate the key pair;
|
|
|
|
|
this may take time...~%"))
|
|
|
|
|
|
|
|
|
|
(let* ((pair (catch 'gcry-error
|
|
|
|
|
(lambda ()
|
|
|
|
|
(generate-key parameters))
|
2014-04-22 11:41:52 +02:00
|
|
|
|
(lambda (key proc err)
|
2013-12-30 22:46:21 +01:00
|
|
|
|
(leave (_ "key generation failed: ~a: ~a~%")
|
|
|
|
|
(error-source err)
|
|
|
|
|
(error-string err)))))
|
|
|
|
|
(public (find-sexp-token pair 'public-key))
|
|
|
|
|
(secret (find-sexp-token pair 'private-key)))
|
|
|
|
|
;; Create the following files as #o400.
|
|
|
|
|
(umask #o266)
|
|
|
|
|
|
2014-01-05 23:40:06 +01:00
|
|
|
|
(mkdir-p (dirname %public-key-file))
|
2013-12-30 22:46:21 +01:00
|
|
|
|
(with-atomic-file-output %public-key-file
|
|
|
|
|
(lambda (port)
|
|
|
|
|
(display (canonical-sexp->string public) port)))
|
|
|
|
|
(with-atomic-file-output %private-key-file
|
|
|
|
|
(lambda (port)
|
|
|
|
|
(display (canonical-sexp->string secret) port)))
|
|
|
|
|
|
|
|
|
|
;; Make the public key readable by everyone.
|
|
|
|
|
(chmod %public-key-file #o444)))
|
2013-12-22 01:08:21 +01:00
|
|
|
|
|
2013-12-30 23:18:52 +01:00
|
|
|
|
(define (authorize-key)
|
|
|
|
|
"Authorize imports signed by the public key passed as an advanced sexp on
|
|
|
|
|
the input port."
|
|
|
|
|
(define (read-key)
|
|
|
|
|
(catch 'gcry-error
|
|
|
|
|
(lambda ()
|
|
|
|
|
(string->canonical-sexp (get-string-all (current-input-port))))
|
2014-04-22 11:41:52 +02:00
|
|
|
|
(lambda (key proc err)
|
2013-12-30 23:18:52 +01:00
|
|
|
|
(leave (_ "failed to read public key: ~a: ~a~%")
|
|
|
|
|
(error-source err) (error-string err)))))
|
|
|
|
|
|
|
|
|
|
(let ((key (read-key))
|
|
|
|
|
(acl (current-acl)))
|
|
|
|
|
(unless (eq? 'public-key (canonical-sexp-nth-data key 0))
|
|
|
|
|
(leave (_ "s-expression does not denote a public key~%")))
|
|
|
|
|
|
|
|
|
|
;; Add KEY to the ACL and write that.
|
|
|
|
|
(let ((acl (public-keys->acl (cons key (acl->public-keys acl)))))
|
2014-03-31 21:53:51 +02:00
|
|
|
|
(mkdir-p (dirname %acl-file))
|
2013-12-30 23:18:52 +01:00
|
|
|
|
(with-atomic-file-output %acl-file
|
2014-04-04 00:23:17 +02:00
|
|
|
|
(cut write-acl acl <>)))))
|
2013-12-30 23:18:52 +01:00
|
|
|
|
|
2013-12-22 01:08:21 +01:00
|
|
|
|
(define (guix-archive . args)
|
2014-01-06 22:25:29 +01:00
|
|
|
|
(define (lines port)
|
|
|
|
|
;; Return lines read from PORT.
|
|
|
|
|
(let loop ((line (read-line port))
|
|
|
|
|
(result '()))
|
|
|
|
|
(if (eof-object? line)
|
|
|
|
|
(reverse result)
|
|
|
|
|
(loop (read-line port)
|
|
|
|
|
(cons line result)))))
|
|
|
|
|
|
2013-12-22 01:08:21 +01:00
|
|
|
|
(with-error-handling
|
|
|
|
|
;; Ask for absolute file names so that .drv file names passed from the
|
|
|
|
|
;; user to 'read-derivation' are absolute when it returns.
|
|
|
|
|
(with-fluids ((%file-port-name-canonicalization 'absolute))
|
2015-02-25 23:31:51 +01:00
|
|
|
|
(let ((opts (parse-command-line args %options (list %default-options))))
|
2013-12-30 22:46:21 +01:00
|
|
|
|
(cond ((assoc-ref opts 'generate-key)
|
|
|
|
|
=>
|
|
|
|
|
generate-key-pair)
|
2013-12-30 23:18:52 +01:00
|
|
|
|
((assoc-ref opts 'authorize)
|
|
|
|
|
(authorize-key))
|
2013-12-22 01:08:21 +01:00
|
|
|
|
(else
|
2013-12-30 22:46:21 +01:00
|
|
|
|
(let ((store (open-connection)))
|
|
|
|
|
(cond ((assoc-ref opts 'export)
|
|
|
|
|
(export-from-store store opts))
|
|
|
|
|
((assoc-ref opts 'import)
|
|
|
|
|
(import-paths store (current-input-port)))
|
2014-01-06 22:25:29 +01:00
|
|
|
|
((assoc-ref opts 'missing)
|
|
|
|
|
(let* ((files (lines (current-input-port)))
|
|
|
|
|
(missing (remove (cut valid-path? store <>)
|
|
|
|
|
files)))
|
|
|
|
|
(format #t "~{~a~%~}" missing)))
|
2013-12-30 22:46:21 +01:00
|
|
|
|
(else
|
|
|
|
|
(leave
|
|
|
|
|
(_ "either '--export' or '--import' \
|
|
|
|
|
must be specified~%")))))))))))
|