diff options
| author | Efraim Flashner <efraim@flashner.co.il> | 2023-01-30 11:33:18 +0200 |
|---|---|---|
| committer | Efraim Flashner <efraim@flashner.co.il> | 2023-01-30 12:39:40 +0200 |
| commit | 4cf1acc7f3033b50b0bf19e02c9f522d522d338c (patch) | |
| tree | 9fd64956ee60304c15387eb394cd649e49f01467 /etc/release-manifest.scm | |
| parent | edb8c09addd186d9538d43b12af74d6c7aeea082 (diff) | |
| parent | 595b53b74e3ef57a1c0c96108ba86d38a170a241 (diff) | |
Merge remote-tracking branch 'origin/master' into core-updates
Conflicts:
doc/guix.texi
gnu/local.mk
gnu/packages/admin.scm
gnu/packages/base.scm
gnu/packages/chromium.scm
gnu/packages/compression.scm
gnu/packages/databases.scm
gnu/packages/diffoscope.scm
gnu/packages/freedesktop.scm
gnu/packages/gnome.scm
gnu/packages/gnupg.scm
gnu/packages/guile.scm
gnu/packages/inkscape.scm
gnu/packages/llvm.scm
gnu/packages/openldap.scm
gnu/packages/pciutils.scm
gnu/packages/ruby.scm
gnu/packages/samba.scm
gnu/packages/sqlite.scm
gnu/packages/statistics.scm
gnu/packages/syndication.scm
gnu/packages/tex.scm
gnu/packages/tls.scm
gnu/packages/version-control.scm
gnu/packages/xml.scm
guix/build-system/copy.scm
guix/scripts/home.scm
Diffstat (limited to 'etc/release-manifest.scm')
| -rw-r--r-- | etc/release-manifest.scm | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/etc/release-manifest.scm b/etc/release-manifest.scm index e2be7f0eee..3ef3483300 100644 --- a/etc/release-manifest.scm +++ b/etc/release-manifest.scm @@ -51,18 +51,17 @@ TARGET." "openssh" "emacs" "vim" "python" "guile" "guix"))) (define %base-packages/armhf - ;; XXX: Relax requirements for armhf-linux for lack of enough build power. - (map (lambda (package) - (if (string=? (package-name package) "emacs") - (specification->package "emacs-no-x") - package)) - %base-packages)) + ;; The guix package doesn't build natively on armhf due to Guile memory + ;; issues compiling the package modules + (remove (lambda (package) + (string=? (package-name package) "guix")) + %base-packages)) (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"))) + #;"gcc-toolchain" "tar" "xz"))) (define %system-packages ;; Key packages proposed by the Guix System installer. @@ -112,8 +111,6 @@ TARGET." (cond ((string=? system "i586-gnu") %base-packages/hurd) ((string=? system "armhf-linux") - ;; FIXME: Drop special case when ci.guix.gnu.org - ;; has more ARMv7 build power. %base-packages/armhf) ((string=? system "powerpc64le-linux") ;; FIXME: Drop 'bootstrap-tarballs' until |