ci: Remove hydra support.

[jackhill/guix/guix.git] / etc / release-manifest.scm

diff --git a/etc/release-manifest.scm b/etc/release-manifest.scm
index 327d3e4..a1f731a 100644 (file)
--- a/etc/release-manifest.scm
+++ b/etc/release-manifest.scm
@@ -1,5 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2020 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -23,6 +24,7 @@
              (guix packages)
              (guix profiles)
              ((gnu ci) #:select (%cross-targets))
+             ((gnu services xorg) #:select (%default-xorg-modules))
              (guix utils)
              (srfi srfi-1)
              (srfi srfi-26))
@@ -47,26 +49,36 @@ 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.
-  (map specification->package
-       '("xorg-server" "xfce" "gnome" "mate" "enlightenment"
-         "openbox" "awesome" "i3-wm" "ratpoison"
-         "xlockmore" "slock" "libreoffice"
-         "connman" "network-manager" "network-manager-applet"
-         "openssh" "ntp" "tor"
-         "linux-libre" "grub-hybrid"
-         ;; FIXME: Add IceCat when Rust is available on i686.
-         ;;"icecat"
-         )))
+  (append (map specification->package
+               '("xorg-server" "xfce" "gnome" "mate" "enlightenment"
+                 "openbox" "awesome" "i3-wm" "ratpoison"
+                 "emacs" "emacs-exwm" "emacs-desktop-environment"
+                 "xlockmore" "slock" "libreoffice"
+                 "connman" "network-manager" "network-manager-applet"
+                 "openssh" "ntp" "tor"
+                 "linux-libre" "grub-hybrid"
+                 ;; FIXME: Add IceCat when Rust is available on i686.
+                 ;;"icecat"
+                 ))
+          %default-xorg-modules))
 
 (define %packages-to-cross-build
   ;; Packages that must be cross-buildable from x86_64-linux.
-  (cons (@ (gnu packages gcc) gcc)
-        (map specification->package
-             '("coreutils" "grep" "sed" "findutils" "diffutils" "patch"
-               "gawk" "gettext" "gzip" "xz"
-               "hello" "guile@2.2" "zlib"))))
+  ;; FIXME: Add (@ (gnu packages gcc) gcc) when <https://bugs.gnu.org/40463>
+  ;; is fixed.
+  (append (list (@ (gnu packages guile) guile-3.0/fixed))
+          (map specification->package
+               '("coreutils" "grep" "sed" "findutils" "diffutils" "patch"
+                 "gawk" "gettext" "gzip" "xz"
+                 "hello" "zlib"))))
 
 (define %packages-to-cross-build-for-mingw
   ;; Many things don't build for MinGW.  Restrict to what's known to work.
@@ -88,8 +100,17 @@ TARGET."
   (manifest
    (append-map (lambda (system)
                  (map (cut package->manifest-entry* <> system)
-                      %base-packages))
-               %hydra-supported-systems)))
+                      (if (string=? system "i586-gnu")
+                          %base-packages/hurd
+                          %base-packages)))
+               %cuirass-supported-systems)))
+
+(define %system-manifest
+  (manifest
+   (append-map (lambda (system)
+                 (map (cut package->manifest-entry* <> system)
+                      %system-packages))
+               '("x86_64-linux" "i686-linux"))))  ;Guix System
 
 (define %cross-manifest
   (manifest
@@ -113,5 +134,6 @@ TARGET."
 
 ;; Return the union of all three manifests.
 (concatenate-manifests (list %base-manifest
+                             %system-manifest
                              %cross-manifest
                              %cross-bootstrap-manifest))