diff options
author | Marius Bakke <mbakke@fastmail.com> | 2020-02-03 15:45:44 +0100 |
---|---|---|
committer | Marius Bakke <mbakke@fastmail.com> | 2020-02-03 15:45:44 +0100 |
commit | 52665d2b6bd709ba46c1e364a6d6164f5f4824ff (patch) | |
tree | 55fd79b3939c08f6f6e9fe383f0df5e4caa82b57 /etc | |
parent | 584d08c5c98cb1893e4f44bd1c4191f405b13f01 (diff) | |
parent | 0a83339bb1429332ee889e9a976aa214ae2ac0db (diff) | |
download | guix-patches-52665d2b6bd709ba46c1e364a6d6164f5f4824ff.tar guix-patches-52665d2b6bd709ba46c1e364a6d6164f5f4824ff.tar.gz |
Merge branch 'staging' into core-updates
Diffstat (limited to 'etc')
-rwxr-xr-x | etc/guix-install.sh | 10 | ||||
-rw-r--r-- | etc/news.scm | 25 |
2 files changed, 32 insertions, 3 deletions
diff --git a/etc/guix-install.sh b/etc/guix-install.sh index b57d71981f..bfd3842933 100755 --- a/etc/guix-install.sh +++ b/etc/guix-install.sh @@ -395,10 +395,16 @@ sys_authorize_build_farms() sys_create_init_profile() { # Create /etc/profile.d/guix.sh for better desktop integration + [ -d "/etc/profile.d" ] || mkdir /etc/profile.d # Just in case cat <<"EOF" > /etc/profile.d/guix.sh # _GUIX_PROFILE: `guix pull` profile _GUIX_PROFILE="$HOME/.config/guix/current" -[ -L $_GUIX_PROFILE ] && export PATH="$_GUIX_PROFILE/bin${PATH:+:}$PATH" +if [ -L $_GUIX_PROFILE ]; then + export PATH="$_GUIX_PROFILE/bin${PATH:+:}$PATH" + # Export INFOPATH so that the updated info pages can be found + # and read by both /usr/bin/info and/or $GUIX_PROFILE/bin/info + export INFOPATH="$_GUIX_PROFILE/share/info${INFOPATH:+:}$INFOPATH" +fi # GUIX_PROFILE: User's default profile GUIX_PROFILE="$HOME/.guix-profile" @@ -409,7 +415,7 @@ export GUIX_PROFILE GUIX_LOCPATH eval `guix package --search-paths=prefix 2> /dev/null` # set XDG_DATA_DIRS to include Guix installations -export XDG_DATA_DIRS="$GUIX_PROFILE/share${XDG_DATA_DIRS:+:}$XDG_DATA_DIRS" +export XDG_DATA_DIRS="$GUIX_PROFILE/share:${XDG_DATA_DIRS:-/usr/local/share/:/usr/share/}" EOF } diff --git a/etc/news.scm b/etc/news.scm index e0894ca7ab..6b58e7742b 100644 --- a/etc/news.scm +++ b/etc/news.scm @@ -1,6 +1,6 @@ ;; GNU Guix news, for use by 'guix pull'. ;; -;; Copyright © 2019 Ludovic Courtès <ludo@gnu.org> +;; Copyright © 2019, 2020 Ludovic Courtès <ludo@gnu.org> ;; ;; Copying and distribution of this file, with or without modification, are ;; permitted in any medium without royalty provided the copyright notice and @@ -9,6 +9,29 @@ (channel-news (version 0) + (entry (commit "8234fe653e61d0090138cbd4c48d877568355439") + (title (en "Guix now runs on Guile 3.0") + (de "Guix läuft jetzt auf Guile 3.0") + (nl "Guix draait nu op Guile 3.0")) + (body (en "The Guix revision you just pulled runs on version 3.0 of +GNU@tie{}Guile (previously it would run on version 2.2). Guile 3.0 improves +performance through the use of just-in-time (JIT) native code generation. The +switch should be entirely transparent to you. See +@uref{https://gnu.org/software/guile} for more information on Guile 3.0.") + (de "Die Guix-Version, die Sie gerade gepullt haben, läuft auf +Version 3.0 von GNU@tie{}Guile (und nicht mehr auf Version 2.2). Guile 3.0 +verbessert die Rechenleistung, indem native Maschinenbefehle „just in time“ +erzeugt werden (JIT-Kompilierung). Der Wechsel sollte für Sie völlig +transparent sein und Guix verhält sich gleich. Siehe +@uref{https://gnu.org/software/guile} für weitere Informationen zu Guile +3.0.") + (nl "De Guix die u net heeft gepulld gebruikt versie 3.0 van +GNU@tie{}Guile (voorheen was dat versie 2.2). Guile@tie{}3.0 draait dezelfde +programma's doorgaans sneller door ze ‘just-in-time’ (JIT) te vertalen naar +machine-instructies. De omschakeling zou voor u volledig naadloos moeten +zijn. Lees @uref{https://gnu.org/software/guile} voor meer informatie over +Guile@tie{}3.0."))) + (entry (commit "828a39da68a9169ef1d9f9ff02a1c66b1bcbe884") (title (en "New @option{--diff} option for @command{guix challenge}") (de "Neue @option{--diff}-Option für @command{guix challenge}")) |