diff options
| author | Jan Nieuwenhuizen <janneke@gnu.org> | 2020-03-08 15:54:42 +0100 |
|---|---|---|
| committer | Jan Nieuwenhuizen <janneke@gnu.org> | 2020-03-19 12:14:19 +0100 |
| commit | ac75bd010260f6a722e1723b35992b04fd79d44c (patch) | |
| tree | 58442bac56f652a7f7da987e25aeb99c57128b38 /gnu/system/shadow.scm | |
| parent | afa3b4d191d08e8ab88d764778f53c6a5d155a3b (diff) | |
gnu: system: Remove guile-wm from skeleton.
* gnu/system/shadow.scm (default-skeletons): Remove guile-wm (especially as a
dependency).
Diffstat (limited to 'gnu/system/shadow.scm')
| -rw-r--r-- | gnu/system/shadow.scm | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/gnu/system/shadow.scm b/gnu/system/shadow.scm index 13b8b140954..46efdfddab5 100644 --- a/gnu/system/shadow.scm +++ b/gnu/system/shadow.scm | |||
| @@ -1,6 +1,7 @@ | |||
| 1 | ;;; GNU Guix --- Functional package management for GNU | 1 | ;;; GNU Guix --- Functional package management for GNU |
| 2 | ;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès <ludo@gnu.org> | 2 | ;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès <ludo@gnu.org> |
| 3 | ;;; Copyright © 2016 Alex Griffin <a@ajgrf.com> | 3 | ;;; Copyright © 2016 Alex Griffin <a@ajgrf.com> |
| 4 | ;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org> | ||
| 4 | ;;; | 5 | ;;; |
| 5 | ;;; This file is part of GNU Guix. | 6 | ;;; This file is part of GNU Guix. |
| 6 | ;;; | 7 | ;;; |
| @@ -32,7 +33,6 @@ | |||
| 32 | #:use-module ((gnu packages admin) | 33 | #:use-module ((gnu packages admin) |
| 33 | #:select (shadow)) | 34 | #:select (shadow)) |
| 34 | #:use-module (gnu packages bash) | 35 | #:use-module (gnu packages bash) |
| 35 | #:use-module (gnu packages guile-wm) | ||
| 36 | #:use-module (srfi srfi-1) | 36 | #:use-module (srfi srfi-1) |
| 37 | #:use-module (srfi srfi-26) | 37 | #:use-module (srfi srfi-26) |
| 38 | #:use-module (srfi srfi-34) | 38 | #:use-module (srfi srfi-34) |
| @@ -117,12 +117,6 @@ | |||
| 117 | (define (default-skeletons) | 117 | (define (default-skeletons) |
| 118 | "Return the default skeleton files for /etc/skel. These files are copied by | 118 | "Return the default skeleton files for /etc/skel. These files are copied by |
| 119 | 'useradd' in the home directory of newly created user accounts." | 119 | 'useradd' in the home directory of newly created user accounts." |
| 120 | (define copy-guile-wm | ||
| 121 | (with-imported-modules '((guix build utils)) | ||
| 122 | #~(begin | ||
| 123 | (use-modules (guix build utils)) | ||
| 124 | (copy-file (car (find-files #+guile-wm "wm-init-sample.scm")) | ||
| 125 | #$output)))) | ||
| 126 | 120 | ||
| 127 | (let ((profile (plain-file "bash_profile" "\ | 121 | (let ((profile (plain-file "bash_profile" "\ |
| 128 | # Honor per-interactive-shell startup file | 122 | # Honor per-interactive-shell startup file |
| @@ -162,7 +156,6 @@ alias grep='grep --color=auto'\n")) | |||
| 162 | (zprofile (plain-file "zprofile" "\ | 156 | (zprofile (plain-file "zprofile" "\ |
| 163 | # Honor system-wide environment variables | 157 | # Honor system-wide environment variables |
| 164 | source /etc/profile\n")) | 158 | source /etc/profile\n")) |
| 165 | (guile-wm (computed-file "guile-wm" copy-guile-wm)) | ||
| 166 | (xdefaults (plain-file "Xdefaults" "\ | 159 | (xdefaults (plain-file "Xdefaults" "\ |
| 167 | XTerm*utf8: always | 160 | XTerm*utf8: always |
| 168 | XTerm*metaSendsEscape: true\n")) | 161 | XTerm*metaSendsEscape: true\n")) |
| @@ -202,7 +195,6 @@ convenient interactive line editing and input history.\\n\\n\"))) | |||
| 202 | (else | 195 | (else |
| 203 | (display \"Consider installing the 'guile-colorized' package | 196 | (display \"Consider installing the 'guile-colorized' package |
| 204 | for a colorful Guile experience.\\n\\n\"))))\n")) | 197 | for a colorful Guile experience.\\n\\n\"))))\n")) |
| 205 | (".guile-wm" ,guile-wm) | ||
| 206 | (".gdbinit" ,gdbinit)))) | 198 | (".gdbinit" ,gdbinit)))) |
| 207 | 199 | ||
| 208 | (define (skeleton-directory skeletons) | 200 | (define (skeleton-directory skeletons) |
