system: hurd: Remove %hurd64-default-* variants.

Since 8f852885de485098812450711e81c1f446d3acb6 these are aliases.

* gnu/system/hurd.scm (%hurd64-default-operating-system,
%hurd64-default-operating-system-kernel): Delete variables.

* gnu/system/images/hurd.scm (hurd64-barebones-os): Replace
%hurd64-default-operating-system with %hurd-default-operating-system
* gnu/system/examples/bare-hurd64.tmpl (%hurd64-os): Same.
* gnu/tests/virtualization.scm (%childhurd64-os): Remove usage of
%hurd64-default-operating-system-kernel.

Merges: #5544.

Change-Id: Ie7345cd99dc37712e7a0f7683ad738c194c70fa7

4 files changed, 2 insertions, 12 deletions

diff --git a/gnu/system/examples/bare-hurd64.tmpl b/gnu/system/examples/bare-hurd64.tmpl
index 8d99dffa776..5cb04c2d0fc 100644
--- a/gnu/system/examples/bare-hurd64.tmpl
+++ b/gnu/system/examples/bare-hurd64.tmpl
@@ -32,7 +32,7 @@
 
 (define %hurd64-os
   (operating-system
-    (inherit %hurd64-default-operating-system)
+    (inherit %hurd-default-operating-system)
     (bootloader (bootloader-configuration
                  (bootloader grub-minimal-bootloader)
                  (targets '("/dev/sdX"))))
diff --git a/gnu/system/hurd.scm b/gnu/system/hurd.scm
index fa63a8cbef3..96aeed37dcc 100644
--- a/gnu/system/hurd.scm
+++ b/gnu/system/hurd.scm
@@ -52,8 +52,6 @@
             %desktop-services/hurd
             %hurd-default-operating-system
             %hurd-default-operating-system-kernel
-            %hurd64-default-operating-system
-            %hurd64-default-operating-system-kernel
             %setuid-programs/hurd))
 
 ;;; Commentary:
@@ -66,9 +64,6 @@
 (define %hurd-default-operating-system-kernel
   gnumach)
 
-(define %hurd64-default-operating-system-kernel
-  %hurd-default-operating-system-kernel)
-
 (define %base-packages/hurd
   ;; Note: the Shepherd comes before the Hurd, not just because its duty is to
   ;; shepherd the herd, but also because we want its 'halt' and 'reboot'
@@ -144,8 +139,4 @@
     (privileged-programs '())
     (setuid-programs %setuid-programs/hurd)))
 
-(define %hurd64-default-operating-system
-  (operating-system
-    (inherit %hurd-default-operating-system)
-    (kernel %hurd64-default-operating-system-kernel)))
 
diff --git a/gnu/system/images/hurd.scm b/gnu/system/images/hurd.scm
index 0aba57d2f31..ba223b1e0cd 100644
--- a/gnu/system/images/hurd.scm
+++ b/gnu/system/images/hurd.scm
@@ -71,7 +71,7 @@
 
 (define hurd64-barebones-os
   (operating-system
-    (inherit %hurd64-default-operating-system)
+    (inherit %hurd-default-operating-system)
     (bootloader (bootloader-configuration
                  (bootloader grub-minimal-bootloader)
                  (targets '("/dev/sdX"))))
diff --git a/gnu/tests/virtualization.scm b/gnu/tests/virtualization.scm
index 05b2e0748b0..4a4daa0f911 100644
--- a/gnu/tests/virtualization.scm
+++ b/gnu/tests/virtualization.scm
@@ -295,7 +295,6 @@
               (type 'hurd64-qcow2)
               (os (operating-system
                     (inherit %hurd-vm-operating-system)
-                    (kernel %hurd64-default-operating-system-kernel)
                     (kernel-arguments '("noide")) ;use rumpdisk
                     (users (cons (user-account
                                    (name "test")