diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2021-12-13 16:29:21 -0500 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2021-12-13 16:29:21 -0500 |
| commit | 6dffced09ecda024e0884e352778c221ad066fd6 (patch) | |
| tree | 1707e8d8df4d9c47317a39ab6abbfc2ca66a6c29 /gnu/system.scm | |
| parent | b603554ed044638dd40b6863d5dada59eefe03b8 (diff) | |
| parent | e3196755e60ba7f1ed9d432e73f26a85e0c8893c (diff) | |
Merge branch 'core-updates-frozen' into 'master'.
At last!
Diffstat (limited to 'gnu/system.scm')
| -rw-r--r-- | gnu/system.scm | 23 |
1 files changed, 22 insertions, 1 deletions
diff --git a/gnu/system.scm b/gnu/system.scm index 9de0f79b44..088c62ddde 100644 --- a/gnu/system.scm +++ b/gnu/system.scm @@ -170,6 +170,7 @@ %setuid-programs %sudoers-specification %base-packages + %base-packages-artwork %base-packages-interactive %base-packages-linux %base-packages-networking @@ -266,6 +267,7 @@ (default (operating-system-default-essential-services this-operating-system))) (services operating-system-user-services ; list of services + (thunked) ;allow for system-dependent services (default %base-services)) (pam-services operating-system-pam-services ; list of PAM services @@ -789,6 +791,10 @@ of PROVENANCE-SERVICE-TYPE to its services." (list ath9k-htc-firmware openfwwf-firmware)) +(define %base-packages-artwork + ;; Default set of artwork packages. + (list guix-icons)) + (define %base-packages-utils ;; Default set of utilities packages. (cons* procps psmisc which @@ -850,6 +856,7 @@ of PROVENANCE-SERVICE-TYPE to its services." ;; Default set of packages globally visible. It should include anything ;; required for basic administrator tasks. (append (list e2fsprogs) + %base-packages-artwork %base-packages-interactive %base-packages-linux %base-packages-networking @@ -881,6 +888,19 @@ syntactically correct." "--check" "--file" #$file) (copy-file #$file #$output))))) +(define (os-release) + (plain-file "os-release" + "\ +NAME=\"Guix System\" +ID=guix +PRETTY_NAME=\"Guix System\" +LOGO=guix-icon +HOME_URL=\"https://guix.gnu.org\" +DOCUMENTATION_URL=\"https://guix.gnu.org/en/manual\" +SUPPORT_URL=\"https://guix.gnu.org/en/help\" +BUG_REPORT_URL=\"https://lists.gnu.org/mailman/listinfo/bug-guix\" +")) + (define* (operating-system-etc-service os) "Return a <service> that builds a directory containing the static part of the /etc directory." @@ -986,7 +1006,8 @@ then source /run/current-system/profile/etc/profile.d/bash_completion.sh fi\n"))) (etc-service - `(("services" ,(file-append net-base "/etc/services")) + `(("os-release" ,#~#$(os-release)) + ("services" ,(file-append net-base "/etc/services")) ("protocols" ,(file-append net-base "/etc/protocols")) ("rpc" ,(file-append net-base "/etc/rpc")) ("login.defs" ,#~#$login.defs) |