diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2020-03-04 23:16:17 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2020-03-04 23:16:17 +0100 |
| commit | ebb7cf9e21060105d9950dd5142c0eb918083666 (patch) | |
| tree | 36c1607b80d92e27fb9d09029d1d3b57a1fd5065 /build-aux | |
| parent | 0b870f7915f5da43758753fd088a22033936dc50 (diff) | |
| parent | c2d7e800e6788277bc56f31d5836f9d507dc1506 (diff) | |
| download | guix-ebb7cf9e21060105d9950dd5142c0eb918083666.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'build-aux')
| -rw-r--r-- | build-aux/build-self.scm | 3 | ||||
| -rw-r--r-- | build-aux/git-authenticate.scm | 8 |
2 files changed, 6 insertions, 5 deletions
diff --git a/build-aux/build-self.scm b/build-aux/build-self.scm index fc13032b73..f2e785b7f1 100644 --- a/build-aux/build-self.scm +++ b/build-aux/build-self.scm @@ -1,5 +1,5 @@ ;;; 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. ;;; @@ -420,6 +420,7 @@ files." ;; $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)) diff --git a/build-aux/git-authenticate.scm b/build-aux/git-authenticate.scm index aa9103a372..640dedbff5 100644 --- a/build-aux/git-authenticate.scm +++ b/build-aux/git-authenticate.scm @@ -134,7 +134,8 @@ ("lsl88" "2AE3 1395 932B E642 FC0E D99C 9BED 6EDA 32E5 B0BC") ("mab" - "BE62 7373 8E61 6D6D 1B3A 08E8 A21A 0202 4881 6103") + ;; primary: "BE62 7373 8E61 6D6D 1B3A 08E8 A21A 0202 4881 6103" + "39B3 3C8D 9448 0D2D DCC2 A498 8B44 A0CD C7B9 56F2") ("marusich" "CBF5 9755 CBE7 E7EF EF18 3FB1 DD40 9A15 D822 469D") ("mbakke" @@ -183,8 +184,6 @@ "77DD AD2D 97F5 31BB C0F3 C7FD DFB5 EB09 AA62 5423") ("snape" "F494 72F4 7A59 00D5 C235 F212 89F9 6D48 08F3 59C7") - ("snape" - "F494 72F4 7A59 00D5 C235 F212 89F9 6D48 08F3 59C7") ("steap" "4E26 CCE9 578E 0828 9855 BDD4 1C79 95D2 D5A3 8336") ("taylanub" @@ -192,7 +191,8 @@ ;; https://lists.gnu.org/archive/html/guix-devel/2017-03/msg00826.html ("thomasd" - "1DD1 681F E285 E07F 11DC 0C59 2E15 A6BC D77D 54FD") + ;; primary: "1DD1 681F E285 E07F 11DC 0C59 2E15 A6BC D77D 54FD" + "3D2C DA58 819C 08C2 A649 D43D 5C3B 064C 724A 5726") ("thomasd (old)" "A5C5 92EA 606E 7106 A6A3 BC08 98B2 1575 91E1 2B08") |