2013-01-06 00:47:50 +01:00
|
|
|
|
;;; GNU Guix --- Functional package management for GNU
|
Add (guix memoization).
* guix/combinators.scm (memoize): Remove.
* guix/memoization.scm: New file.
* Makefile.am (MODULES): Add it.
* gnu/packages.scm, gnu/packages/bootstrap.scm,
guix/build-system/gnu.scm, guix/build-system/python.scm,
guix/derivations.scm, guix/gnu-maintenance.scm,
guix/import/cran.scm, guix/import/elpa.scm,
guix/modules.scm, guix/scripts/build.scm,
guix/scripts/graph.scm, guix/scripts/lint.scm,
guix/store.scm, guix/utils.scm: Adjust imports accordingly.
2017-01-28 16:33:57 +01:00
|
|
|
|
;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017 Ludovic Courtès <ludo@gnu.org>
|
2013-02-13 02:29:30 +01:00
|
|
|
|
;;; Copyright © 2013 Mark H Weaver <mhw@netris.org>
|
2014-07-20 18:29:48 +02:00
|
|
|
|
;;; Copyright © 2014 Eric Bavier <bavier@member.fsf.org>
|
2017-02-17 11:17:03 +01:00
|
|
|
|
;;; Copyright © 2016, 2017 Alex Kost <alezost@gmail.com>
|
2016-02-28 17:50:58 +01:00
|
|
|
|
;;; Copyright © 2016 Mathieu Lirzin <mthl@gnu.org>
|
2012-06-30 16:37:19 +02:00
|
|
|
|
;;;
|
2013-01-06 00:47:50 +01:00
|
|
|
|
;;; This file is part of GNU Guix.
|
2012-06-30 16:37:19 +02:00
|
|
|
|
;;;
|
2013-01-06 00:47:50 +01:00
|
|
|
|
;;; GNU Guix is free software; you can redistribute it and/or modify it
|
2012-06-30 16:37:19 +02: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.
|
|
|
|
|
;;;
|
2013-01-06 00:47:50 +01:00
|
|
|
|
;;; GNU Guix is distributed in the hope that it will be useful, but
|
2012-06-30 16:37:19 +02: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
|
2013-01-06 00:47:50 +01:00
|
|
|
|
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
|
2012-06-30 16:37:19 +02:00
|
|
|
|
|
2013-01-18 01:06:47 +01:00
|
|
|
|
(define-module (gnu packages)
|
2012-06-30 16:37:19 +02:00
|
|
|
|
#:use-module (guix packages)
|
2013-04-21 10:08:40 +02:00
|
|
|
|
#:use-module (guix ui)
|
2012-08-22 17:24:38 +02:00
|
|
|
|
#:use-module (guix utils)
|
2017-05-03 23:03:20 +02:00
|
|
|
|
#:use-module (guix discovery)
|
Add (guix memoization).
* guix/combinators.scm (memoize): Remove.
* guix/memoization.scm: New file.
* Makefile.am (MODULES): Add it.
* gnu/packages.scm, gnu/packages/bootstrap.scm,
guix/build-system/gnu.scm, guix/build-system/python.scm,
guix/derivations.scm, guix/gnu-maintenance.scm,
guix/import/cran.scm, guix/import/elpa.scm,
guix/modules.scm, guix/scripts/build.scm,
guix/scripts/graph.scm, guix/scripts/lint.scm,
guix/store.scm, guix/utils.scm: Adjust imports accordingly.
2017-01-28 16:33:57 +01:00
|
|
|
|
#:use-module (guix memoization)
|
2016-03-08 11:38:46 +01:00
|
|
|
|
#:use-module ((guix build utils)
|
|
|
|
|
#:select ((package-name->name+version
|
|
|
|
|
. hyphen-separated-name->name+version)))
|
2017-06-11 23:05:23 +02:00
|
|
|
|
#:autoload (guix profiles) (packages->manifest)
|
2013-02-13 02:29:30 +01:00
|
|
|
|
#:use-module (ice-9 vlist)
|
Build newest versions unless specified, and implement upgrades.
* gnu/packages.scm (find-newest-available-packages):
New exported procedure.
* guix-build.in (newest-available-packages, find-best-packages-by-name):
New procedures.
(find-package): Use find-best-packages-by-name, to guarantee that
if a version number is not specified, only the newest versions will
be considered.
* guix-package.in (%options): Add --upgrade/-u option.
(newest-available-packages, find-best-packages-by-name, upgradeable?):
New procedures.
(find-package): Use find-best-packages-by-name, to guarantee that
if a version number is not specified, only the newest versions will
be considered.
(process-actions): Implement upgrade option.
* doc/guix.texi (Invoking guix-package): In the description of --install,
mention that if no version number is specified, the newest available
version will be selected.
2013-02-12 07:24:21 +01:00
|
|
|
|
#:use-module (ice-9 match)
|
2012-06-30 16:37:19 +02:00
|
|
|
|
#:use-module (srfi srfi-1)
|
2014-09-01 01:45:09 +02:00
|
|
|
|
#:use-module (srfi srfi-11)
|
2012-06-30 16:37:19 +02:00
|
|
|
|
#:use-module (srfi srfi-26)
|
2015-01-20 10:17:24 +01:00
|
|
|
|
#:use-module (srfi srfi-34)
|
|
|
|
|
#:use-module (srfi srfi-35)
|
2012-08-22 17:24:38 +02:00
|
|
|
|
#:use-module (srfi srfi-39)
|
|
|
|
|
#:export (search-patch
|
2016-04-08 10:28:40 +02:00
|
|
|
|
search-patches
|
2017-02-17 11:17:03 +01:00
|
|
|
|
search-auxiliary-file
|
2012-10-17 21:44:25 +02:00
|
|
|
|
search-bootstrap-binary
|
2015-04-02 14:51:05 +02:00
|
|
|
|
%patch-path
|
2017-02-17 11:17:03 +01:00
|
|
|
|
%auxiliary-files-path
|
2012-11-25 16:28:52 +01:00
|
|
|
|
%bootstrap-binaries-path
|
2014-09-24 13:53:02 +02:00
|
|
|
|
%package-module-path
|
2014-07-20 18:29:48 +02:00
|
|
|
|
|
2012-11-19 22:37:50 +01:00
|
|
|
|
fold-packages
|
2014-07-20 18:29:48 +02:00
|
|
|
|
|
Build newest versions unless specified, and implement upgrades.
* gnu/packages.scm (find-newest-available-packages):
New exported procedure.
* guix-build.in (newest-available-packages, find-best-packages-by-name):
New procedures.
(find-package): Use find-best-packages-by-name, to guarantee that
if a version number is not specified, only the newest versions will
be considered.
* guix-package.in (%options): Add --upgrade/-u option.
(newest-available-packages, find-best-packages-by-name, upgradeable?):
New procedures.
(find-package): Use find-best-packages-by-name, to guarantee that
if a version number is not specified, only the newest versions will
be considered.
(process-actions): Implement upgrade option.
* doc/guix.texi (Invoking guix-package): In the description of --install,
mention that if no version number is specified, the newest available
version will be selected.
2013-02-12 07:24:21 +01:00
|
|
|
|
find-packages-by-name
|
2013-12-21 22:36:32 +01:00
|
|
|
|
find-best-packages-by-name
|
2014-07-20 18:29:48 +02:00
|
|
|
|
find-newest-available-packages
|
|
|
|
|
|
2015-06-17 10:49:29 +02:00
|
|
|
|
specification->package
|
2017-06-11 23:05:23 +02:00
|
|
|
|
specification->package+output
|
|
|
|
|
specifications->manifest))
|
2012-06-30 16:37:19 +02:00
|
|
|
|
|
|
|
|
|
;;; Commentary:
|
|
|
|
|
;;;
|
|
|
|
|
;;; General utilities for the software distribution---i.e., the modules under
|
2013-01-18 01:06:47 +01:00
|
|
|
|
;;; (gnu packages ...).
|
2012-06-30 16:37:19 +02:00
|
|
|
|
;;;
|
|
|
|
|
;;; Code:
|
|
|
|
|
|
2017-02-17 11:17:03 +01:00
|
|
|
|
;; By default, we store patches, auxiliary files and bootstrap binaries
|
|
|
|
|
;; alongside Guile modules. This is so that these extra files can be
|
|
|
|
|
;; found without requiring a special setup, such as a specific
|
|
|
|
|
;; installation directory and an extra environment variable. One
|
|
|
|
|
;; advantage of this setup is that everything just works in an
|
|
|
|
|
;; auto-compilation setting.
|
2012-10-27 22:30:42 +02:00
|
|
|
|
|
|
|
|
|
(define %bootstrap-binaries-path
|
2012-10-17 21:44:25 +02:00
|
|
|
|
(make-parameter
|
2013-01-18 01:06:24 +01:00
|
|
|
|
(map (cut string-append <> "/gnu/packages/bootstrap")
|
2012-11-25 16:28:52 +01:00
|
|
|
|
%load-path)))
|
2012-10-17 21:44:25 +02:00
|
|
|
|
|
2017-02-17 11:17:03 +01:00
|
|
|
|
(define %auxiliary-files-path
|
|
|
|
|
(make-parameter
|
|
|
|
|
(map (cut string-append <> "/gnu/packages/aux-files")
|
|
|
|
|
%load-path)))
|
|
|
|
|
|
|
|
|
|
(define (search-auxiliary-file file-name)
|
|
|
|
|
"Search the auxiliary FILE-NAME. Return #f if not found."
|
|
|
|
|
(search-path (%auxiliary-files-path) file-name))
|
|
|
|
|
|
2012-08-22 17:24:38 +02:00
|
|
|
|
(define (search-patch file-name)
|
2015-01-20 10:17:24 +01:00
|
|
|
|
"Search the patch FILE-NAME. Raise an error if not found."
|
|
|
|
|
(or (search-path (%patch-path) file-name)
|
|
|
|
|
(raise (condition
|
ui: Rename '_' to 'G_'.
This avoids collisions with '_' when the latter is used as a 'match'
pattern for instance. See
<https://lists.gnu.org/archive/html/guix-devel/2017-04/msg00464.html>.
* guix/ui.scm: Rename '_' to 'G_'.
* po/guix/Makevars (XGETTEXT_OPTIONS): Adjust accordingly.
* build-aux/compile-all.scm (warnings): Remove 'format'.
* gnu/packages.scm,
gnu/services.scm,
gnu/services/shepherd.scm,
gnu/system.scm,
gnu/system/shadow.scm,
guix/gnupg.scm,
guix/http-client.scm,
guix/import/cpan.scm,
guix/import/elpa.scm,
guix/import/pypi.scm,
guix/nar.scm,
guix/scripts.scm,
guix/scripts/archive.scm,
guix/scripts/authenticate.scm,
guix/scripts/build.scm,
guix/scripts/challenge.scm,
guix/scripts/container.scm,
guix/scripts/container/exec.scm,
guix/scripts/copy.scm,
guix/scripts/download.scm,
guix/scripts/edit.scm,
guix/scripts/environment.scm,
guix/scripts/gc.scm,
guix/scripts/graph.scm,
guix/scripts/hash.scm,
guix/scripts/import.scm,
guix/scripts/import/cpan.scm,
guix/scripts/import/cran.scm,
guix/scripts/import/crate.scm,
guix/scripts/import/elpa.scm,
guix/scripts/import/gem.scm,
guix/scripts/import/gnu.scm,
guix/scripts/import/hackage.scm,
guix/scripts/import/nix.scm,
guix/scripts/import/pypi.scm,
guix/scripts/import/stackage.scm,
guix/scripts/lint.scm,
guix/scripts/offload.scm,
guix/scripts/pack.scm,
guix/scripts/package.scm,
guix/scripts/perform-download.scm,
guix/scripts/publish.scm,
guix/scripts/pull.scm,
guix/scripts/refresh.scm,
guix/scripts/size.scm,
guix/scripts/substitute.scm,
guix/scripts/system.scm,
guix/ssh.scm,
guix/upstream.scm: Use 'G_' instead of '_'. Most of this change was
obtained by running: "sed -i -e's/(_ "/(G_ "/g' `find -name \*.scm`".
2017-05-03 15:57:02 +02:00
|
|
|
|
(&message (message (format #f (G_ "~a: patch not found")
|
2015-01-20 10:17:24 +01:00
|
|
|
|
file-name)))))))
|
2012-08-22 17:24:38 +02:00
|
|
|
|
|
2016-04-08 10:28:40 +02:00
|
|
|
|
(define-syntax-rule (search-patches file-name ...)
|
|
|
|
|
"Return the list of absolute file names corresponding to each
|
|
|
|
|
FILE-NAME found in %PATCH-PATH."
|
|
|
|
|
(list (search-patch file-name) ...))
|
|
|
|
|
|
2012-10-17 21:44:25 +02:00
|
|
|
|
(define (search-bootstrap-binary file-name system)
|
2015-01-25 23:07:50 +01:00
|
|
|
|
"Search the bootstrap binary FILE-NAME for SYSTEM. Raise an error if not
|
|
|
|
|
found."
|
|
|
|
|
(or (search-path (%bootstrap-binaries-path)
|
|
|
|
|
(string-append system "/" file-name))
|
|
|
|
|
(raise (condition
|
|
|
|
|
(&message
|
|
|
|
|
(message
|
ui: Rename '_' to 'G_'.
This avoids collisions with '_' when the latter is used as a 'match'
pattern for instance. See
<https://lists.gnu.org/archive/html/guix-devel/2017-04/msg00464.html>.
* guix/ui.scm: Rename '_' to 'G_'.
* po/guix/Makevars (XGETTEXT_OPTIONS): Adjust accordingly.
* build-aux/compile-all.scm (warnings): Remove 'format'.
* gnu/packages.scm,
gnu/services.scm,
gnu/services/shepherd.scm,
gnu/system.scm,
gnu/system/shadow.scm,
guix/gnupg.scm,
guix/http-client.scm,
guix/import/cpan.scm,
guix/import/elpa.scm,
guix/import/pypi.scm,
guix/nar.scm,
guix/scripts.scm,
guix/scripts/archive.scm,
guix/scripts/authenticate.scm,
guix/scripts/build.scm,
guix/scripts/challenge.scm,
guix/scripts/container.scm,
guix/scripts/container/exec.scm,
guix/scripts/copy.scm,
guix/scripts/download.scm,
guix/scripts/edit.scm,
guix/scripts/environment.scm,
guix/scripts/gc.scm,
guix/scripts/graph.scm,
guix/scripts/hash.scm,
guix/scripts/import.scm,
guix/scripts/import/cpan.scm,
guix/scripts/import/cran.scm,
guix/scripts/import/crate.scm,
guix/scripts/import/elpa.scm,
guix/scripts/import/gem.scm,
guix/scripts/import/gnu.scm,
guix/scripts/import/hackage.scm,
guix/scripts/import/nix.scm,
guix/scripts/import/pypi.scm,
guix/scripts/import/stackage.scm,
guix/scripts/lint.scm,
guix/scripts/offload.scm,
guix/scripts/pack.scm,
guix/scripts/package.scm,
guix/scripts/perform-download.scm,
guix/scripts/publish.scm,
guix/scripts/pull.scm,
guix/scripts/refresh.scm,
guix/scripts/size.scm,
guix/scripts/substitute.scm,
guix/scripts/system.scm,
guix/ssh.scm,
guix/upstream.scm: Use 'G_' instead of '_'. Most of this change was
obtained by running: "sed -i -e's/(_ "/(G_ "/g' `find -name \*.scm`".
2017-05-03 15:57:02 +02:00
|
|
|
|
(format #f (G_ "could not find bootstrap binary '~a' \
|
2015-01-25 23:07:50 +01:00
|
|
|
|
for system '~a'")
|
|
|
|
|
file-name system)))))))
|
2012-10-17 21:44:25 +02:00
|
|
|
|
|
2014-09-24 10:23:27 +02:00
|
|
|
|
(define %distro-root-directory
|
|
|
|
|
;; Absolute file name of the module hierarchy.
|
|
|
|
|
(dirname (search-path %load-path "guix.scm")))
|
2012-06-30 16:37:19 +02:00
|
|
|
|
|
2014-09-24 13:53:02 +02:00
|
|
|
|
(define %package-module-path
|
|
|
|
|
;; Search path for package modules. Each item must be either a directory
|
|
|
|
|
;; name or a pair whose car is a directory and whose cdr is a sub-directory
|
|
|
|
|
;; to narrow the search.
|
2014-09-24 14:05:52 +02:00
|
|
|
|
(let* ((not-colon (char-set-complement (char-set #\:)))
|
|
|
|
|
(environment (string-tokenize (or (getenv "GUIX_PACKAGE_PATH") "")
|
|
|
|
|
not-colon)))
|
|
|
|
|
;; Automatically add items from $GUIX_PACKAGE_PATH to Guile's search path.
|
|
|
|
|
(for-each (lambda (directory)
|
|
|
|
|
(set! %load-path (cons directory %load-path))
|
|
|
|
|
(set! %load-compiled-path
|
|
|
|
|
(cons directory %load-compiled-path)))
|
|
|
|
|
environment)
|
|
|
|
|
|
|
|
|
|
(make-parameter
|
|
|
|
|
(append environment `((,%distro-root-directory . "gnu/packages"))))))
|
2014-09-24 13:53:02 +02:00
|
|
|
|
|
2015-01-03 23:49:42 +01:00
|
|
|
|
(define %patch-path
|
|
|
|
|
;; Define it after '%package-module-path' so that '%load-path' contains user
|
|
|
|
|
;; directories, allowing patches in $GUIX_PACKAGE_PATH to be found.
|
|
|
|
|
(make-parameter
|
|
|
|
|
(map (lambda (directory)
|
|
|
|
|
(if (string=? directory %distro-root-directory)
|
|
|
|
|
(string-append directory "/gnu/packages/patches")
|
|
|
|
|
directory))
|
|
|
|
|
%load-path)))
|
|
|
|
|
|
2017-09-01 10:26:27 +02:00
|
|
|
|
(define* (fold-packages proc init
|
|
|
|
|
#:optional
|
|
|
|
|
(modules (all-modules (%package-module-path))))
|
|
|
|
|
"Call (PROC PACKAGE RESULT) for each available package defined in one of
|
|
|
|
|
MODULES, using INIT as the initial value of RESULT. It is guaranteed to never
|
|
|
|
|
traverse the same package twice."
|
2017-05-03 23:03:20 +02:00
|
|
|
|
(fold-module-public-variables (lambda (object result)
|
|
|
|
|
(if (and (package? object)
|
|
|
|
|
(not (hidden-package? object)))
|
|
|
|
|
(proc object result)
|
|
|
|
|
result))
|
|
|
|
|
init
|
2017-09-01 10:26:27 +02:00
|
|
|
|
modules))
|
2012-11-19 22:37:50 +01:00
|
|
|
|
|
2014-09-29 21:39:39 +02:00
|
|
|
|
(define find-packages-by-name
|
|
|
|
|
(let ((packages (delay
|
|
|
|
|
(fold-packages (lambda (p r)
|
|
|
|
|
(vhash-cons (package-name p) p r))
|
2015-04-18 22:30:07 +02:00
|
|
|
|
vlist-null)))
|
|
|
|
|
(version>? (lambda (p1 p2)
|
|
|
|
|
(version>? (package-version p1) (package-version p2)))))
|
2014-09-29 21:39:39 +02:00
|
|
|
|
(lambda* (name #:optional version)
|
|
|
|
|
"Return the list of packages with the given NAME. If VERSION is not #f,
|
2015-04-18 22:30:07 +02:00
|
|
|
|
then only return packages whose version is prefixed by VERSION, sorted in
|
|
|
|
|
decreasing version order."
|
|
|
|
|
(let ((matching (sort (vhash-fold* cons '() name (force packages))
|
|
|
|
|
version>?)))
|
2014-09-29 21:39:39 +02:00
|
|
|
|
(if version
|
|
|
|
|
(filter (lambda (package)
|
2015-04-18 22:30:07 +02:00
|
|
|
|
(string-prefix? version (package-version package)))
|
2014-09-29 21:39:39 +02:00
|
|
|
|
matching)
|
|
|
|
|
matching)))))
|
Build newest versions unless specified, and implement upgrades.
* gnu/packages.scm (find-newest-available-packages):
New exported procedure.
* guix-build.in (newest-available-packages, find-best-packages-by-name):
New procedures.
(find-package): Use find-best-packages-by-name, to guarantee that
if a version number is not specified, only the newest versions will
be considered.
* guix-package.in (%options): Add --upgrade/-u option.
(newest-available-packages, find-best-packages-by-name, upgradeable?):
New procedures.
(find-package): Use find-best-packages-by-name, to guarantee that
if a version number is not specified, only the newest versions will
be considered.
(process-actions): Implement upgrade option.
* doc/guix.texi (Invoking guix-package): In the description of --install,
mention that if no version number is specified, the newest available
version will be selected.
2013-02-12 07:24:21 +01:00
|
|
|
|
|
2013-12-21 22:36:32 +01:00
|
|
|
|
(define find-newest-available-packages
|
2017-01-28 17:09:34 +01:00
|
|
|
|
(mlambda ()
|
|
|
|
|
"Return a vhash keyed by package names, and with
|
Build newest versions unless specified, and implement upgrades.
* gnu/packages.scm (find-newest-available-packages):
New exported procedure.
* guix-build.in (newest-available-packages, find-best-packages-by-name):
New procedures.
(find-package): Use find-best-packages-by-name, to guarantee that
if a version number is not specified, only the newest versions will
be considered.
* guix-package.in (%options): Add --upgrade/-u option.
(newest-available-packages, find-best-packages-by-name, upgradeable?):
New procedures.
(find-package): Use find-best-packages-by-name, to guarantee that
if a version number is not specified, only the newest versions will
be considered.
(process-actions): Implement upgrade option.
* doc/guix.texi (Invoking guix-package): In the description of --install,
mention that if no version number is specified, the newest available
version will be selected.
2013-02-12 07:24:21 +01:00
|
|
|
|
associated values of the form
|
|
|
|
|
|
|
|
|
|
(newest-version newest-package ...)
|
|
|
|
|
|
|
|
|
|
where the preferred package is listed first."
|
|
|
|
|
|
2017-01-28 17:09:34 +01:00
|
|
|
|
;; FIXME: Currently, the preferred package is whichever one
|
|
|
|
|
;; was found last by 'fold-packages'. Find a better solution.
|
|
|
|
|
(fold-packages (lambda (p r)
|
|
|
|
|
(let ((name (package-name p))
|
|
|
|
|
(version (package-version p)))
|
|
|
|
|
(match (vhash-assoc name r)
|
|
|
|
|
((_ newest-so-far . pkgs)
|
|
|
|
|
(case (version-compare version newest-so-far)
|
|
|
|
|
((>) (vhash-cons name `(,version ,p) r))
|
|
|
|
|
((=) (vhash-cons name `(,version ,p ,@pkgs) r))
|
|
|
|
|
((<) r)))
|
|
|
|
|
(#f (vhash-cons name `(,version ,p) r)))))
|
|
|
|
|
vlist-null)))
|
2013-12-21 22:36:32 +01:00
|
|
|
|
|
|
|
|
|
(define (find-best-packages-by-name name version)
|
|
|
|
|
"If version is #f, return the list of packages named NAME with the highest
|
|
|
|
|
version numbers; otherwise, return the list of packages named NAME and at
|
|
|
|
|
VERSION."
|
|
|
|
|
(if version
|
|
|
|
|
(find-packages-by-name name version)
|
|
|
|
|
(match (vhash-assoc name (find-newest-available-packages))
|
|
|
|
|
((_ version pkgs ...) pkgs)
|
|
|
|
|
(#f '()))))
|
2014-07-20 18:29:48 +02:00
|
|
|
|
|
2014-08-16 20:00:34 +02:00
|
|
|
|
|
|
|
|
|
(define %sigint-prompt
|
|
|
|
|
;; The prompt to jump to upon SIGINT.
|
|
|
|
|
(make-prompt-tag "interruptible"))
|
|
|
|
|
|
|
|
|
|
(define (call-with-sigint-handler thunk handler)
|
|
|
|
|
"Call THUNK and return its value. Upon SIGINT, call HANDLER with the signal
|
|
|
|
|
number in the context of the continuation of the call to this function, and
|
|
|
|
|
return its return value."
|
|
|
|
|
(call-with-prompt %sigint-prompt
|
|
|
|
|
(lambda ()
|
|
|
|
|
(sigaction SIGINT
|
|
|
|
|
(lambda (signum)
|
|
|
|
|
(sigaction SIGINT SIG_DFL)
|
|
|
|
|
(abort-to-prompt %sigint-prompt signum)))
|
|
|
|
|
(dynamic-wind
|
|
|
|
|
(const #t)
|
|
|
|
|
thunk
|
|
|
|
|
(cut sigaction SIGINT SIG_DFL)))
|
|
|
|
|
(lambda (k signum)
|
|
|
|
|
(handler signum))))
|
|
|
|
|
|
2016-02-28 17:50:58 +01:00
|
|
|
|
|
|
|
|
|
;;;
|
|
|
|
|
;;; Package specification.
|
|
|
|
|
;;;
|
|
|
|
|
|
2017-05-01 15:45:41 +02:00
|
|
|
|
(define* (%find-package spec name version)
|
2016-02-28 17:50:58 +01:00
|
|
|
|
(match (find-best-packages-by-name name version)
|
|
|
|
|
((pkg . pkg*)
|
|
|
|
|
(unless (null? pkg*)
|
ui: Rename '_' to 'G_'.
This avoids collisions with '_' when the latter is used as a 'match'
pattern for instance. See
<https://lists.gnu.org/archive/html/guix-devel/2017-04/msg00464.html>.
* guix/ui.scm: Rename '_' to 'G_'.
* po/guix/Makevars (XGETTEXT_OPTIONS): Adjust accordingly.
* build-aux/compile-all.scm (warnings): Remove 'format'.
* gnu/packages.scm,
gnu/services.scm,
gnu/services/shepherd.scm,
gnu/system.scm,
gnu/system/shadow.scm,
guix/gnupg.scm,
guix/http-client.scm,
guix/import/cpan.scm,
guix/import/elpa.scm,
guix/import/pypi.scm,
guix/nar.scm,
guix/scripts.scm,
guix/scripts/archive.scm,
guix/scripts/authenticate.scm,
guix/scripts/build.scm,
guix/scripts/challenge.scm,
guix/scripts/container.scm,
guix/scripts/container/exec.scm,
guix/scripts/copy.scm,
guix/scripts/download.scm,
guix/scripts/edit.scm,
guix/scripts/environment.scm,
guix/scripts/gc.scm,
guix/scripts/graph.scm,
guix/scripts/hash.scm,
guix/scripts/import.scm,
guix/scripts/import/cpan.scm,
guix/scripts/import/cran.scm,
guix/scripts/import/crate.scm,
guix/scripts/import/elpa.scm,
guix/scripts/import/gem.scm,
guix/scripts/import/gnu.scm,
guix/scripts/import/hackage.scm,
guix/scripts/import/nix.scm,
guix/scripts/import/pypi.scm,
guix/scripts/import/stackage.scm,
guix/scripts/lint.scm,
guix/scripts/offload.scm,
guix/scripts/pack.scm,
guix/scripts/package.scm,
guix/scripts/perform-download.scm,
guix/scripts/publish.scm,
guix/scripts/pull.scm,
guix/scripts/refresh.scm,
guix/scripts/size.scm,
guix/scripts/substitute.scm,
guix/scripts/system.scm,
guix/ssh.scm,
guix/upstream.scm: Use 'G_' instead of '_'. Most of this change was
obtained by running: "sed -i -e's/(_ "/(G_ "/g' `find -name \*.scm`".
2017-05-03 15:57:02 +02:00
|
|
|
|
(warning (G_ "ambiguous package specification `~a'~%") spec)
|
|
|
|
|
(warning (G_ "choosing ~a@~a from ~a~%")
|
2017-03-08 23:12:09 +01:00
|
|
|
|
(package-name pkg) (package-version pkg)
|
2016-02-28 17:50:58 +01:00
|
|
|
|
(location->string (package-location pkg))))
|
2016-09-06 23:14:07 +02:00
|
|
|
|
(match (package-superseded pkg)
|
|
|
|
|
((? package? new)
|
ui: Rename '_' to 'G_'.
This avoids collisions with '_' when the latter is used as a 'match'
pattern for instance. See
<https://lists.gnu.org/archive/html/guix-devel/2017-04/msg00464.html>.
* guix/ui.scm: Rename '_' to 'G_'.
* po/guix/Makevars (XGETTEXT_OPTIONS): Adjust accordingly.
* build-aux/compile-all.scm (warnings): Remove 'format'.
* gnu/packages.scm,
gnu/services.scm,
gnu/services/shepherd.scm,
gnu/system.scm,
gnu/system/shadow.scm,
guix/gnupg.scm,
guix/http-client.scm,
guix/import/cpan.scm,
guix/import/elpa.scm,
guix/import/pypi.scm,
guix/nar.scm,
guix/scripts.scm,
guix/scripts/archive.scm,
guix/scripts/authenticate.scm,
guix/scripts/build.scm,
guix/scripts/challenge.scm,
guix/scripts/container.scm,
guix/scripts/container/exec.scm,
guix/scripts/copy.scm,
guix/scripts/download.scm,
guix/scripts/edit.scm,
guix/scripts/environment.scm,
guix/scripts/gc.scm,
guix/scripts/graph.scm,
guix/scripts/hash.scm,
guix/scripts/import.scm,
guix/scripts/import/cpan.scm,
guix/scripts/import/cran.scm,
guix/scripts/import/crate.scm,
guix/scripts/import/elpa.scm,
guix/scripts/import/gem.scm,
guix/scripts/import/gnu.scm,
guix/scripts/import/hackage.scm,
guix/scripts/import/nix.scm,
guix/scripts/import/pypi.scm,
guix/scripts/import/stackage.scm,
guix/scripts/lint.scm,
guix/scripts/offload.scm,
guix/scripts/pack.scm,
guix/scripts/package.scm,
guix/scripts/perform-download.scm,
guix/scripts/publish.scm,
guix/scripts/pull.scm,
guix/scripts/refresh.scm,
guix/scripts/size.scm,
guix/scripts/substitute.scm,
guix/scripts/system.scm,
guix/ssh.scm,
guix/upstream.scm: Use 'G_' instead of '_'. Most of this change was
obtained by running: "sed -i -e's/(_ "/(G_ "/g' `find -name \*.scm`".
2017-05-03 15:57:02 +02:00
|
|
|
|
(info (G_ "package '~a' has been superseded by '~a'~%")
|
2016-09-06 23:14:07 +02:00
|
|
|
|
(package-name pkg) (package-name new))
|
|
|
|
|
new)
|
|
|
|
|
(#f
|
|
|
|
|
pkg)))
|
2016-09-20 10:51:39 +02:00
|
|
|
|
(x
|
2016-02-28 17:50:58 +01:00
|
|
|
|
(if version
|
ui: Rename '_' to 'G_'.
This avoids collisions with '_' when the latter is used as a 'match'
pattern for instance. See
<https://lists.gnu.org/archive/html/guix-devel/2017-04/msg00464.html>.
* guix/ui.scm: Rename '_' to 'G_'.
* po/guix/Makevars (XGETTEXT_OPTIONS): Adjust accordingly.
* build-aux/compile-all.scm (warnings): Remove 'format'.
* gnu/packages.scm,
gnu/services.scm,
gnu/services/shepherd.scm,
gnu/system.scm,
gnu/system/shadow.scm,
guix/gnupg.scm,
guix/http-client.scm,
guix/import/cpan.scm,
guix/import/elpa.scm,
guix/import/pypi.scm,
guix/nar.scm,
guix/scripts.scm,
guix/scripts/archive.scm,
guix/scripts/authenticate.scm,
guix/scripts/build.scm,
guix/scripts/challenge.scm,
guix/scripts/container.scm,
guix/scripts/container/exec.scm,
guix/scripts/copy.scm,
guix/scripts/download.scm,
guix/scripts/edit.scm,
guix/scripts/environment.scm,
guix/scripts/gc.scm,
guix/scripts/graph.scm,
guix/scripts/hash.scm,
guix/scripts/import.scm,
guix/scripts/import/cpan.scm,
guix/scripts/import/cran.scm,
guix/scripts/import/crate.scm,
guix/scripts/import/elpa.scm,
guix/scripts/import/gem.scm,
guix/scripts/import/gnu.scm,
guix/scripts/import/hackage.scm,
guix/scripts/import/nix.scm,
guix/scripts/import/pypi.scm,
guix/scripts/import/stackage.scm,
guix/scripts/lint.scm,
guix/scripts/offload.scm,
guix/scripts/pack.scm,
guix/scripts/package.scm,
guix/scripts/perform-download.scm,
guix/scripts/publish.scm,
guix/scripts/pull.scm,
guix/scripts/refresh.scm,
guix/scripts/size.scm,
guix/scripts/substitute.scm,
guix/scripts/system.scm,
guix/ssh.scm,
guix/upstream.scm: Use 'G_' instead of '_'. Most of this change was
obtained by running: "sed -i -e's/(_ "/(G_ "/g' `find -name \*.scm`".
2017-05-03 15:57:02 +02:00
|
|
|
|
(leave (G_ "~A: package not found for version ~a~%") name version)
|
|
|
|
|
(leave (G_ "~A: unknown package~%") name)))))
|
2016-02-28 17:50:58 +01:00
|
|
|
|
|
2014-09-01 01:45:09 +02:00
|
|
|
|
(define (specification->package spec)
|
|
|
|
|
"Return a package matching SPEC. SPEC may be a package name, or a package
|
2016-02-28 23:11:36 +01:00
|
|
|
|
name followed by an at-sign and a version number. If the version number is not
|
2014-09-01 01:45:09 +02:00
|
|
|
|
present, return the preferred newest version."
|
2016-02-28 17:50:58 +01:00
|
|
|
|
(let-values (((name version) (package-name->name+version spec)))
|
|
|
|
|
(%find-package spec name version)))
|
2015-06-17 10:49:29 +02:00
|
|
|
|
|
|
|
|
|
(define* (specification->package+output spec #:optional (output "out"))
|
|
|
|
|
"Return the package and output specified by SPEC, or #f and #f; SPEC may
|
|
|
|
|
optionally contain a version number and an output name, as in these examples:
|
|
|
|
|
|
|
|
|
|
guile
|
2016-02-28 23:11:36 +01:00
|
|
|
|
guile@2.0.9
|
2015-06-17 10:49:29 +02:00
|
|
|
|
guile:debug
|
2016-02-28 23:11:36 +01:00
|
|
|
|
guile@2.0.9:debug
|
2015-06-17 10:49:29 +02:00
|
|
|
|
|
|
|
|
|
If SPEC does not specify a version number, return the preferred newest
|
|
|
|
|
version; if SPEC does not specify an output, return OUTPUT."
|
|
|
|
|
(let-values (((name version sub-drv)
|
|
|
|
|
(package-specification->name+version+output spec output)))
|
2016-02-28 17:50:58 +01:00
|
|
|
|
(match (%find-package spec name version)
|
|
|
|
|
(#f
|
|
|
|
|
(values #f #f))
|
|
|
|
|
(package
|
|
|
|
|
(if (member sub-drv (package-outputs package))
|
|
|
|
|
(values package sub-drv)
|
ui: Rename '_' to 'G_'.
This avoids collisions with '_' when the latter is used as a 'match'
pattern for instance. See
<https://lists.gnu.org/archive/html/guix-devel/2017-04/msg00464.html>.
* guix/ui.scm: Rename '_' to 'G_'.
* po/guix/Makevars (XGETTEXT_OPTIONS): Adjust accordingly.
* build-aux/compile-all.scm (warnings): Remove 'format'.
* gnu/packages.scm,
gnu/services.scm,
gnu/services/shepherd.scm,
gnu/system.scm,
gnu/system/shadow.scm,
guix/gnupg.scm,
guix/http-client.scm,
guix/import/cpan.scm,
guix/import/elpa.scm,
guix/import/pypi.scm,
guix/nar.scm,
guix/scripts.scm,
guix/scripts/archive.scm,
guix/scripts/authenticate.scm,
guix/scripts/build.scm,
guix/scripts/challenge.scm,
guix/scripts/container.scm,
guix/scripts/container/exec.scm,
guix/scripts/copy.scm,
guix/scripts/download.scm,
guix/scripts/edit.scm,
guix/scripts/environment.scm,
guix/scripts/gc.scm,
guix/scripts/graph.scm,
guix/scripts/hash.scm,
guix/scripts/import.scm,
guix/scripts/import/cpan.scm,
guix/scripts/import/cran.scm,
guix/scripts/import/crate.scm,
guix/scripts/import/elpa.scm,
guix/scripts/import/gem.scm,
guix/scripts/import/gnu.scm,
guix/scripts/import/hackage.scm,
guix/scripts/import/nix.scm,
guix/scripts/import/pypi.scm,
guix/scripts/import/stackage.scm,
guix/scripts/lint.scm,
guix/scripts/offload.scm,
guix/scripts/pack.scm,
guix/scripts/package.scm,
guix/scripts/perform-download.scm,
guix/scripts/publish.scm,
guix/scripts/pull.scm,
guix/scripts/refresh.scm,
guix/scripts/size.scm,
guix/scripts/substitute.scm,
guix/scripts/system.scm,
guix/ssh.scm,
guix/upstream.scm: Use 'G_' instead of '_'. Most of this change was
obtained by running: "sed -i -e's/(_ "/(G_ "/g' `find -name \*.scm`".
2017-05-03 15:57:02 +02:00
|
|
|
|
(leave (G_ "package `~a' lacks output `~a'~%")
|
2016-02-28 17:50:58 +01:00
|
|
|
|
(package-full-name package)
|
|
|
|
|
sub-drv))))))
|
2017-06-11 23:05:23 +02:00
|
|
|
|
|
|
|
|
|
(define (specifications->manifest specs)
|
|
|
|
|
"Given SPECS, a list of specifications such as \"emacs@25.2\" or
|
|
|
|
|
\"guile:debug\", return a profile manifest."
|
|
|
|
|
;; This procedure exists mostly so users of 'guix package -m' don't have to
|
|
|
|
|
;; fiddle with multiple-value returns.
|
|
|
|
|
(packages->manifest
|
|
|
|
|
(map (compose list specification->package+output) specs)))
|