branch master updated: Revert "system: Move nanorc to XDG_CONFIG_HOME."

[guix-commits]

This is an automated email from the git hooks/post-receive script.

lfam pushed a commit to branch master
in repository guix.

The following commit(s) were added to refs/heads/master by this push:
     new 49d20d5  Revert "system: Move nanorc to XDG_CONFIG_HOME."
49d20d5 is described below

commit 49d20d51e9f0b2944b0e13366d042950554ca931
Author: Leo Famulari <address@hidden>
AuthorDate: Mon Mar 30 16:01:40 2020 -0400

    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
    ------
---
 gnu/system/shadow.scm | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/gnu/system/shadow.scm b/gnu/system/shadow.scm
index 9bee3d1..46efdfd 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 
<address@hidden>
 ;;; Copyright © 2016 Alex Griffin <address@hidden>
 ;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <address@hidden>
-;;; Copyright © 2020 Efraim Flashner <address@hidden>
 ;;;
 ;;; 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)