From ec8bc4a34e99363f80b0156587892b5623709098 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 26 Mar 2019 11:36:33 +0100 Subject: build-self: Disable position recording. 'guix pull -n' goes roughly from 40s to 35s. * build-aux/build-self.scm (build-program): Add call to 'read-disable'. --- build-aux/build-self.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'build-aux') diff --git a/build-aux/build-self.scm b/build-aux/build-self.scm index d18b4504cf..a8b05eb0ff 100644 --- a/build-aux/build-self.scm +++ b/build-aux/build-self.scm @@ -313,7 +313,11 @@ interface (FFI) of Guile.") (cons (string-append #$guile-gcrypt "/lib/guile/" (effective-version) "/site-ccache") - %load-compiled-path))) + %load-compiled-path)) + + ;; Disable position recording to save time and space + ;; when loading the package modules. + (read-disable 'positions)) (use-modules (guix store) (guix self) -- cgit v1.2.3 From ab77b69eca6959c9ce946ca18d218aab8ade1cc1 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 16 Apr 2019 23:23:02 +0200 Subject: self: Remove unused variable. This variable is unused since commit 45779fa676419de8838cb26b6c7a24678a2be1cd. * guix/self.scm (%dependency-variables): Remove. * build-aux/build-self.scm (%dependency-variables): Remove. --- build-aux/build-self.scm | 4 ---- guix/self.scm | 4 ---- 2 files changed, 8 deletions(-) (limited to 'build-aux') diff --git a/build-aux/build-self.scm b/build-aux/build-self.scm index a8b05eb0ff..9619e0e5b2 100644 --- a/build-aux/build-self.scm +++ b/build-aux/build-self.scm @@ -54,10 +54,6 @@ ;;; available at this point. ;;; -(define %dependency-variables - ;; (guix config) variables corresponding to dependencies. - '(%libgcrypt %libz %xz %gzip %bzip2)) - (define %persona-variables ;; (guix config) variables that define Guix's persona. '(%guix-package-name diff --git a/guix/self.scm b/guix/self.scm index 7ba2764eb9..de921e6d9c 100644 --- a/guix/self.scm +++ b/guix/self.scm @@ -753,10 +753,6 @@ Info manual." ;;; Generating (guix config). ;;; -(define %dependency-variables - ;; (guix config) variables corresponding to dependencies. - '(%libz %xz %gzip %bzip2)) - (define %persona-variables ;; (guix config) variables that define Guix's persona. '(%guix-package-name -- cgit v1.2.3 From 04b5ac212f33fc20696fbe43816a1a86aad1a9f2 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 19 Apr 2019 16:49:46 +0200 Subject: build: Show completion percentage while building. * build-aux/compile-all.scm (%): New procedure. (command-line): Use it to report completion. --- build-aux/compile-all.scm | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) (limited to 'build-aux') diff --git a/build-aux/compile-all.scm b/build-aux/compile-all.scm index d2afbdab02..4259ea523c 100644 --- a/build-aux/compile-all.scm +++ b/build-aux/compile-all.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2016 Taylan Ulrich Bayırlı/Kammer -;;; Copyright © 2016, 2017 Ludovic Courtès +;;; Copyright © 2016, 2017, 2019 Ludovic Courtès ;;; ;;; This file is part of GNU Guix. ;;; @@ -17,7 +17,8 @@ ;;; You should have received a copy of the GNU General Public License ;;; along with GNU Guix. If not, see . -(use-modules (ice-9 match) +(use-modules (ice-9 format) + (ice-9 match) (ice-9 threads) (srfi srfi-1) (guix build compile) @@ -78,6 +79,10 @@ to 'make'." (current-processor-count)))) (loop tail))))))))) +(define (% completed total) + "Return the completion percentage of COMPLETED over TOTAL as an integer." + (inexact->exact (round (* 100. (/ completed total))))) + ;; Install a SIGINT handler to give unwind handlers in 'compile-file' an ;; opportunity to run upon SIGINT and to remove temporary output files. (sigaction SIGINT @@ -92,10 +97,14 @@ to 'make'." #:host host #:report-load (lambda (file total completed) (when file - (format #t " LOAD ~a~%" file) + (format #t "[~3d%] LOAD ~a~%" + (% (+ 1 completed) (* 2 total)) + file) (force-output))) #:report-compilation (lambda (file total completed) (when file - (format #t " GUILEC ~a~%" + (format #t "[~3d%] GUILEC ~a~%" + (% (+ total completed 1) + (* 2 total)) (scm->go file)) (force-output)))))) -- cgit v1.2.3 From fa9e6e8b676ca920a894cf3b48bfcb670077144f Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Sun, 21 Apr 2019 13:58:08 -0400 Subject: build-self: Avoid deprecated bindings. * build-aux/build-self.scm (build): Replace references to nix-server-* with store-connection-*. --- build-aux/build-self.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'build-aux') diff --git a/build-aux/build-self.scm b/build-aux/build-self.scm index 9619e0e5b2..6ff1db4c48 100644 --- a/build-aux/build-self.scm +++ b/build-aux/build-self.scm @@ -399,9 +399,9 @@ files." (mlet %store-monad ((build (build-program source version guile-version #:pull-version pull-version)) (system (if system (return system) (current-system))) - (port ((store-lift nix-server-socket))) - (major ((store-lift nix-server-major-version))) - (minor ((store-lift nix-server-minor-version)))) + (port ((store-lift store-connection-socket))) + (major ((store-lift store-connection-major-version))) + (minor ((store-lift store-connection-minor-version)))) (mbegin %store-monad (show-what-to-build* (list build)) (built-derivations (list build)) -- cgit v1.2.3 From ffc8ab75f10ecaaf52cdc38f5846e9af8e2dadd5 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 23 Apr 2019 00:47:41 +0200 Subject: Revert "build-self: Avoid deprecated bindings." This reverts commit fa9e6e8b676ca920a894cf3b48bfcb670077144f. By using the new bindings, we would prevent users of Guix prior to de9fbe9cdcf5f8deb08becfc54b523084fd67bda, such as version 0.16.0, to upgrade to current master. Thus, we will keep using the old names for a while. --- build-aux/build-self.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'build-aux') diff --git a/build-aux/build-self.scm b/build-aux/build-self.scm index 6ff1db4c48..9619e0e5b2 100644 --- a/build-aux/build-self.scm +++ b/build-aux/build-self.scm @@ -399,9 +399,9 @@ files." (mlet %store-monad ((build (build-program source version guile-version #:pull-version pull-version)) (system (if system (return system) (current-system))) - (port ((store-lift store-connection-socket))) - (major ((store-lift store-connection-major-version))) - (minor ((store-lift store-connection-minor-version)))) + (port ((store-lift nix-server-socket))) + (major ((store-lift nix-server-major-version))) + (minor ((store-lift nix-server-minor-version)))) (mbegin %store-monad (show-what-to-build* (list build)) (built-derivations (list build)) -- cgit v1.2.3 From 04fa9c62d94e35fe0a978857458fac3c5e960aed Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 23 Apr 2019 16:39:00 +0200 Subject: build-self: Explain why we keep using deprecated bindings. * build-aux/build-self.scm (build): Add comment regarding the deprecated names. --- build-aux/build-self.scm | 3 +++ 1 file changed, 3 insertions(+) (limited to 'build-aux') diff --git a/build-aux/build-self.scm b/build-aux/build-self.scm index 9619e0e5b2..1ddd2233b0 100644 --- a/build-aux/build-self.scm +++ b/build-aux/build-self.scm @@ -399,6 +399,9 @@ files." (mlet %store-monad ((build (build-program source version guile-version #:pull-version pull-version)) (system (if system (return system) (current-system))) + + ;; Note: Use the deprecated names here because the + ;; caller might be Guix <= 0.16.0. (port ((store-lift nix-server-socket))) (major ((store-lift nix-server-major-version))) (minor ((store-lift nix-server-minor-version)))) -- cgit v1.2.3