systems: export default label generation to (sovereign systems)

It is not possible to otherwise construct a nice-looking definition of a system label.
That is because of a restriction by a lexical scope requirement.

The gnu:system:operating-system-default-label funciton is instead called in (sovereign systems) module.

* deployment/systems/aisaka.scm (operating-system): do this.
* deployment/systems/akashi.scm (operating-system): do this.
* deployment/systems/asakura.scm (operating-system): do this.
* deployment/systems/cokolwiek.scm (operating-system): do this.
* deployment/systems/mcdowell.scm (operating-system): do this.
* deployment/systems/rakan.scm (operating-system): do this.

6 files changed, 6 insertions, 6 deletions

diff --git a/deployment/systems/aisaka.scm b/deployment/systems/aisaka.scm
index 9fbb75f..6aa4168 100644
--- a/deployment/systems/aisaka.scm
+++ b/deployment/systems/aisaka.scm
@@ -442,7 +442,7 @@
   (gnu:system:operating-system
     (bootloader         system-bootloader)
     (label              (sovereign:systems:operating-system-label* system-name
-                                                                   (gnu:system:operating-system-default-label gnu:system:this-operating-system)))
+                                                                   gnu:system:this-operating-system))
     (kernel             nongnu:packages:linux:linux)
     (keyboard-layout    system-keyboard-layout)
     (initrd             nongnu:system:linux-initrd:microcode-initrd)
diff --git a/deployment/systems/akashi.scm b/deployment/systems/akashi.scm
index 03e188b..896f2f6 100644
--- a/deployment/systems/akashi.scm
+++ b/deployment/systems/akashi.scm
@@ -76,7 +76,7 @@
                                  gnu:system:%default-kernel-arguments))
       (bootloader         (machines:thinkpad-x200:bootloader-configuration* keyboard-layout*))
       (label              (sovereign:systems:operating-system-label* host-name*
-                                                                     (gnu:system:operating-system-default-label gnu:system:this-operating-system)))
+                                                                     gnu:system:this-operating-system))
       (keyboard-layout    keyboard-layout*)
       (host-name          host-name*)
       (file-systems       (file-systems))
diff --git a/deployment/systems/asakura.scm b/deployment/systems/asakura.scm
index bc00308..4571f83 100644
--- a/deployment/systems/asakura.scm
+++ b/deployment/systems/asakura.scm
@@ -120,7 +120,7 @@
    (kernel nongnu:packages:linux:linux)
    (bootloader (bootloader))
    (label      (sovereign:systems:operating-system-label* host-name
-                                                          (gnu:system:operating-system-default-label gnu:system:this-operating-system)))
+                                                          gnu:system:this-operating-system))
    (keyboard-layout keyboard-layout)
    (initrd nongnu:system:linux-initrd:microcode-initrd)
    (firmware (list nongnu:packages:linux:linux-firmware))
diff --git a/deployment/systems/cokolwiek.scm b/deployment/systems/cokolwiek.scm
index b306952..75358d5 100644
--- a/deployment/systems/cokolwiek.scm
+++ b/deployment/systems/cokolwiek.scm
@@ -90,7 +90,7 @@
       (kernel             nongnu:packages:linux:linux)
       (bootloader         l-bootloader)
       (label              (sovereign:systems:operating-system-label* system-name
-                                                                     (gnu:system:operating-system-default-label gnu:system:this-operating-system)))
+                                                                     gnu:system:this-operating-system))
       (keyboard-layout    sovereign:devices:pl-keyboard-layout)
       (initrd             nongnu:system:linux-initrd:microcode-initrd)
       (initrd-modules     l-initrd-modules)
diff --git a/deployment/systems/mcdowell.scm b/deployment/systems/mcdowell.scm
index 7a5cc02..06a7f45 100644
--- a/deployment/systems/mcdowell.scm
+++ b/deployment/systems/mcdowell.scm
@@ -106,7 +106,7 @@
       (kernel             nongnu:packages:linux:linux)
       (bootloader         l-bootloader)
       (label              (sovereign:systems:operating-system-label* system-name
-                                                                     (gnu:system:operating-system-default-label gnu:system:this-operating-system)))
+                                                                     gnu:system:this-operating-system))
       (keyboard-layout    sovereign:devices:pl-keyboard-layout)
       (initrd             nongnu:system:linux-initrd:microcode-initrd)
       (initrd-modules     l-initrd-modules)
diff --git a/deployment/systems/rakan.scm b/deployment/systems/rakan.scm
index d4de969..a9a0c54 100644
--- a/deployment/systems/rakan.scm
+++ b/deployment/systems/rakan.scm
@@ -126,7 +126,7 @@
       (kernel             nongnu:packages:linux:linux)
       (bootloader         l-bootloader)
       (label              (sovereign:systems:operating-system-label* system-name
-                                                                     (gnu:system:operating-system-default-label gnu:system:this-operating-system)))
+                                                                     gnu:system:this-operating-system))
       (keyboard-layout    sovereign:devices:pl-keyboard-layout)
       (initrd             nongnu:system:linux-initrd:microcode-initrd)
       (initrd-modules     l-initrd-modules)