diff options
| author | Mark H Weaver <mhw@netris.org> | 2016-02-27 08:52:23 -0500 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2016-02-27 08:52:23 -0500 |
| commit | 048ec1a8b092a87de08bfe410be65642522b63ed (patch) | |
| tree | 1279c4fa3fd09805dbfe06be3514879aa38d503e /guix/scripts/package.scm | |
| parent | fe5f687284889eeff3c1b73edab0aa26e58c3bc5 (diff) | |
| parent | b35461748b20d0172744974b39e7d9d033400c51 (diff) | |
| download | gnu-guix-048ec1a8b092a87de08bfe410be65642522b63ed.tar gnu-guix-048ec1a8b092a87de08bfe410be65642522b63ed.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'guix/scripts/package.scm')
| -rw-r--r-- | guix/scripts/package.scm | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/guix/scripts/package.scm b/guix/scripts/package.scm index b93ffb0b6b..f65834386b 100644 --- a/guix/scripts/package.scm +++ b/guix/scripts/package.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2012, 2013, 2014, 2015, 2016 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2013 Nikita Karetnikov <nikita@karetnikov.org> ;;; Copyright © 2013, 2015 Mark H Weaver <mhw@netris.org> -;;; Copyright © 2014 Alex Kost <alezost@gmail.com> +;;; Copyright © 2014, 2016 Alex Kost <alezost@gmail.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -551,10 +551,6 @@ upgrading, #f otherwise." (define (options->installable opts manifest) "Given MANIFEST, the current manifest, and OPTS, the result of 'args-fold', return the new list of manifest entries." - (define (package->manifest-entry* package output) - (check-package-freshness package) - (package->manifest-entry package output)) - (define upgrade? (options->upgrade-predicate opts)) @@ -567,7 +563,7 @@ return the new list of manifest entries." (call-with-values (lambda () (specification->package+output name output)) - package->manifest-entry*)))) + package->manifest-entry)))) (_ #f)) (manifest-entries manifest))) @@ -576,13 +572,13 @@ return the new list of manifest entries." (('install . (? package? p)) ;; When given a package via `-e', install the first of its ;; outputs (XXX). - (package->manifest-entry* p "out")) + (package->manifest-entry p "out")) (('install . (? string? spec)) (if (store-path? spec) (store-item->manifest-entry spec) (let-values (((package output) (specification->package+output spec))) - (package->manifest-entry* package output)))) + (package->manifest-entry package output)))) (_ #f)) opts)) |