From mboxrd@z Thu Jan 1 00:00:00 1970 From: David Thompson Subject: [PATCH] scripts: Move 'set-build-options-from-command-line*' to (guix scripts build) module. Date: Wed, 20 May 2015 18:51:45 -0400 Message-ID: <877fs2ooam.fsf@fsf.org> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:44833) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YvCqA-0001rH-DS for guix-devel@gnu.org; Wed, 20 May 2015 18:51:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YvCq9-00037X-7Y for guix-devel@gnu.org; Wed, 20 May 2015 18:51:54 -0400 Received: from mail.fsf.org ([208.118.235.13]:50141) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YvCq9-00037T-3z for guix-devel@gnu.org; Wed, 20 May 2015 18:51:53 -0400 Received: from jumpgate.fsf.org ([74.94.156.211]:47791 helo=izanagi) by mail.fsf.org with esmtpsa (TLS-1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.69) (envelope-from ) id 1YvCq8-0005Cj-H4 for guix-devel@gnu.org; Wed, 20 May 2015 18:51:52 -0400 List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org To: guix-devel@gnu.org --=-=-= Content-Type: text/plain More tidying. Moving this monadic procedure to the more sensible place will allow reuse in other scripts. 'guix deploy' will use it. --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=0001-scripts-Move-set-build-options-from-command-line-to-.patch >From 8bb17b4ce15e6db8c9a6aea3cd83208dd76f8e8c Mon Sep 17 00:00:00 2001 From: David Thompson Date: Wed, 20 May 2015 18:48:10 -0400 Subject: [PATCH] scripts: Move 'set-build-options-from-command-line*' to (guix scripts build) module. * guix/scripts/build.scm (set-build-options-from-command-line*): New procedure. * guix/scripts/environment.scm (set-build-options-from-command-line*): Delete. --- guix/scripts/build.scm | 4 ++++ guix/scripts/environment.scm | 4 ---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/guix/scripts/build.scm b/guix/scripts/build.scm index da71adb..2307f76 100644 --- a/guix/scripts/build.scm +++ b/guix/scripts/build.scm @@ -37,6 +37,7 @@ #:autoload (guix download) (download-to-store) #:export (%standard-build-options set-build-options-from-command-line + set-build-options-from-command-line* show-build-options-help guix-build)) @@ -139,6 +140,9 @@ options handled by 'set-build-options-from-command-line', and listed in #:print-build-trace (assoc-ref opts 'print-build-trace?) #:verbosity (assoc-ref opts 'verbosity))) +(define set-build-options-from-command-line* + (store-lift set-build-options-from-command-line)) + (define %standard-build-options ;; List of standard command-line options for tools that build something. (list (option '(#\L "load-path") #t #f diff --git a/guix/scripts/environment.scm b/guix/scripts/environment.scm index f403e95..d053daf 100644 --- a/guix/scripts/environment.scm +++ b/guix/scripts/environment.scm @@ -191,10 +191,6 @@ packages." (delete-duplicates (append-map transitive-inputs packages))) -;; TODO: Deduplicate these. -(define set-build-options-from-command-line* - (store-lift set-build-options-from-command-line)) - (define (build-inputs inputs opts) "Build the packages in INPUTS using the build options in OPTS." (let ((substitutes? (assoc-ref opts 'substitutes?)) -- 2.1.4 --=-=-= Content-Type: text/plain -- David Thompson GPG Key: 0FF1D807 --=-=-=--