HCoop
/
jackhill
/
guix
/
guix.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
gnu: monero-gui: Update to 0.16.0.1.
[jackhill/guix/guix.git]
/
build-aux
/
build-self.scm
diff --git
a/build-aux/build-self.scm
b/build-aux/build-self.scm
index
a8b05eb
..
e249591
100644
(file)
--- a/
build-aux/build-self.scm
+++ b/
build-aux/build-self.scm
@@
-1,5
+1,5
@@
;;; GNU Guix --- Functional package management for GNU
;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2014, 2016, 2017, 2018, 2019 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2014, 2016, 2017, 2018, 2019
, 2020
Ludovic Courtès <ludo@gnu.org>
;;;
;;; This file is part of GNU Guix.
;;;
;;;
;;; This file is part of GNU Guix.
;;;
@@
-54,10
+54,6
@@
;;; available at this point.
;;;
;;; 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
(define %persona-variables
;; (guix config) variables that define Guix's persona.
'(%guix-package-name
@@
-79,7
+75,7
@@
(package-name "GNU Guix")
(package-version "0")
(bug-report-address "bug-guix@gnu.org")
(package-name "GNU Guix")
(package-version "0")
(bug-report-address "bug-guix@gnu.org")
- (home-page-url "https://g
nu.org/s/guix
"))
+ (home-page-url "https://g
uix.gnu.org
"))
;; Hack so that Geiser is not confused.
(define defmod 'define-module)
;; Hack so that Geiser is not confused.
(define defmod 'define-module)
@@
-290,7
+286,8
@@
interface (FFI) of Guile.")
#:select? select?))
(gexp->script "compute-guix-derivation"
#~(begin
#:select? select?))
(gexp->script "compute-guix-derivation"
#~(begin
- (use-modules (ice-9 match))
+ (use-modules (ice-9 match)
+ (ice-9 threads))
(eval-when (expand load eval)
;; (gnu packages …) modules are going to be looked up
(eval-when (expand load eval)
;; (gnu packages …) modules are going to be looked up
@@
-387,11
+384,11
@@
interface (FFI) of Guile.")
#:key verbose? (version (date-version-string)) system
(pull-version 0)
#:key verbose? (version (date-version-string)) system
(pull-version 0)
- ;; For the standalone Guix, default to Guile
2.2
. For old
+ ;; For the standalone Guix, default to Guile
3.0
. For old
;; versions of 'guix pull' (pre-0.15.0), we have to use the
;; same Guile as the current one.
(guile-version (if (> pull-version 0)
;; versions of 'guix pull' (pre-0.15.0), we have to use the
;; same Guile as the current one.
(guile-version (if (> pull-version 0)
- "
2.2
"
+ "
3.0
"
(effective-version)))
#:allow-other-keys
(effective-version)))
#:allow-other-keys
@@
-403,11
+400,19
@@
files."
(mlet %store-monad ((build (build-program source version guile-version
#:pull-version pull-version))
(system (if system (return system) (current-system)))
(mlet %store-monad ((build (build-program source version guile-version
#:pull-version pull-version))
(system (if system (return system) (current-system)))
+ (home -> (getenv "HOME"))
+
+ ;; 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))))
(mbegin %store-monad
(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))
+ ;; Before 'with-build-handler' was implemented and used, we had to
+ ;; explicitly call 'show-what-to-build*'.
+ (munless (module-defined? (resolve-module '(guix store))
+ 'with-build-handler)
+ (show-what-to-build* (list build)))
(built-derivations (list build))
;; Use the port beneath the current store as the stdin of BUILD. This
(built-derivations (list build))
;; Use the port beneath the current store as the stdin of BUILD. This
@@
-420,6
+425,10
@@
files."
;; $GUILE_LOAD_PATH & co.
(with-clean-environment
(setenv "GUILE_WARN_DEPRECATED" "no") ;be quiet and drive
;; $GUILE_LOAD_PATH & co.
(with-clean-environment
(setenv "GUILE_WARN_DEPRECATED" "no") ;be quiet and drive
+ (setenv "COLUMNS" "120") ;show wider backtraces
+ (when home
+ ;; Inherit HOME so that 'xdg-directory' works.
+ (setenv "HOME" home))
(open-pipe* OPEN_READ
(derivation->output-path build)
source system version
(open-pipe* OPEN_READ
(derivation->output-path build)
source system version