diff options
| author | Leo Famulari <leo@famulari.name> | 2020-03-30 16:01:40 -0400 |
|---|---|---|
| committer | Leo Famulari <leo@famulari.name> | 2020-03-30 16:02:38 -0400 |
| commit | 49d20d51e9f0b2944b0e13366d042950554ca931 (patch) | |
| tree | d713e638280742364e270cdb557149be4dd11410 /gnu/system | |
| parent | 04fd952d54ffbc4935a44c50219be7c1da306531 (diff) | |
| download | patches-49d20d51e9f0b2944b0e13366d042950554ca931.tar patches-49d20d51e9f0b2944b0e13366d042950554ca931.tar.gz | |
Revert "system: Move nanorc to XDG_CONFIG_HOME."
This reverts commit bd71818df31364bbd04f3f13b3bbb251636748b4.
This changed caused system reconfiguration to fail like this:
------
building /gnu/store/y1x8asbzw624ywgkpin35p1i4bqnyfy2-skel.drv...
Backtrace:
4 (primitive-load "/gnu/store/2x7d0jsbgf2ndb5fsk0nj07rhsx?")
In ice-9/eval.scm:
619:8 3 (_ #f)
In ice-9/boot-9.scm:
260:13 2 (for-each #<procedure 7ffff6ad8100 at ice-9/eval.scm:3?> ?)
In guix/build/utils.scm:
343:27 1 (_ "/gnu/store/ajrgkj1s9vdcq00drn703f4zj9dvfrsv-nanorc" ?)
In unknown file:
0 (copy-file "/gnu/store/ajrgkj1s9vdcq00drn703f4zj9dvfrs?" ?)
ERROR: In procedure copy-file:
In procedure copy-file: No such file or directory
`/gnu/store/v1grsca743phw41lyf63dzmh9nz5jlpn-bash_profile' -> `.bash_profile'
`/gnu/store/xdsaw0mj6axj427hyi6ysrnsxi21n7d5-bashrc' -> `.bashrc'
`/gnu/store/6i0b236dyar78zc5k5hrj5dv3vr4zb9w-zprofile' -> `.zprofile'
`/gnu/store/ajrgkj1s9vdcq00drn703f4zj9dvfrsv-nanorc' -> `.config/nano/nanorc'
builder for `/gnu/store/y1x8asbzw624ywgkpin35p1i4bqnyfy2-skel.drv' failed with exit code 1
------
Diffstat (limited to 'gnu/system')
| -rw-r--r-- | gnu/system/shadow.scm | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/gnu/system/shadow.scm b/gnu/system/shadow.scm index 9bee3d1693..46efdfddab 100644 --- a/gnu/system/shadow.scm +++ b/gnu/system/shadow.scm @@ -2,7 +2,6 @@ ;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2016 Alex Griffin <a@ajgrf.com> ;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org> -;;; Copyright © 2020 Efraim Flashner <efraim@flashner.co.il> ;;; ;;; This file is part of GNU Guix. ;;; @@ -173,7 +172,7 @@ set auto-load safe-path /gnu/store/*/lib\n"))) ;; after ~/.zshrc. To avoid interfering with any customizations a user ;; may have made in their ~/.zshrc, put this in .zprofile, not .zlogin. (".zprofile" ,zprofile) - (".config/nano/nanorc" ,(plain-file "nanorc" "\ + (".nanorc" ,(plain-file "nanorc" "\ # Include all the syntax highlighting modules. include /run/current-system/profile/share/nano/*.nanorc\n")) (".Xdefaults" ,xdefaults) |