diff options
| author | Marius Bakke <marius@gnu.org> | 2020-11-15 23:45:34 +0100 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2020-11-15 23:45:34 +0100 |
| commit | 4e5e05d40908e9f1336ffc5a6c4928ab61ad034c (patch) | |
| tree | ad6d6be0ece396ba3353871a5691e514253508f8 /etc | |
| parent | 2c400ae94207b3b84fcdcaa21c122076c050d307 (diff) | |
| parent | e1fa3ea9fe8d01dd124c5e304bde9243876378ba (diff) | |
| download | guix-patches-4e5e05d40908e9f1336ffc5a6c4928ab61ad034c.tar guix-patches-4e5e05d40908e9f1336ffc5a6c4928ab61ad034c.tar.gz | |
Merge branch 'master' into staging
Diffstat (limited to 'etc')
| -rwxr-xr-x | etc/guix-install.sh | 6 | ||||
| -rw-r--r-- | etc/release-manifest.scm | 10 |
2 files changed, 13 insertions, 3 deletions
diff --git a/etc/guix-install.sh b/etc/guix-install.sh index 7f0dd00e53..f0a1550a74 100755 --- a/etc/guix-install.sh +++ b/etc/guix-install.sh @@ -6,6 +6,7 @@ # Copyright © 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr> # Copyright © 2020 Morgan Smith <Morgan.J.Smith@outlook.com> # Copyright © 2020 Simon Tournier <zimon.toutoune@gmail.com> +# Copyright © 2020 Daniel Brooks <db48x@db48x.net> # # This file is part of GNU Guix. # @@ -60,6 +61,7 @@ INF="[ INFO ] " DEBUG=0 GNU_URL="https://ftp.gnu.org/gnu/guix/" +#GNU_URL="https://alpha.gnu.org/gnu/guix/" OPENPGP_SIGNING_KEY_ID="3CE464558A84FDC69DB40CFB090B11993D9AEBB5" # This script needs to know where root's home directory is. However, we @@ -228,11 +230,11 @@ guix_get_bin_list() # Filter only version and architecture bin_ver_ls=("$(wget -qO- "$gnu_url" \ - | sed -n -e 's/.*guix-binary-\([0-9.]*\)\..*.tar.xz.*/\1/p' \ + | sed -n -e 's/.*guix-binary-\([0-9.]*[a-z0-9]*\)\..*.tar.xz.*/\1/p' \ | sort -Vu)") latest_ver="$(echo "$bin_ver_ls" \ - | grep -oE "([0-9]{1,2}\.){2}[0-9]{1,2}" \ + | grep -oE "([0-9]{1,2}\.){2}[0-9]{1,2}[a-z0-9]*" \ | tail -n1)" default_ver="guix-binary-${latest_ver}.${ARCH_OS}" diff --git a/etc/release-manifest.scm b/etc/release-manifest.scm index 7f54fe8768..da98d6e00b 100644 --- a/etc/release-manifest.scm +++ b/etc/release-manifest.scm @@ -49,6 +49,12 @@ TARGET." '("bootstrap-tarballs" "gcc-toolchain" "nss-certs" "openssh" "emacs" "vim" "python" "guile" "guix"))) +(define %base-packages/hurd + ;; XXX: For now we are less demanding of "i586-gnu". + (map specification->package + '("coreutils" "grep" "findutils" "gawk" "make" + "gcc-toolchain" "tar" "xz"))) + (define %system-packages ;; Key packages proposed by the Guix System installer. (append (map specification->package @@ -94,7 +100,9 @@ TARGET." (manifest (append-map (lambda (system) (map (cut package->manifest-entry* <> system) - %base-packages)) + (if (string=? system "i586-gnu") + %base-packages/hurd + %base-packages))) %hydra-supported-systems))) (define %system-manifest |