bug#70529: [PATCH] gnu: kauth: Fix KAUTH_HELPER_INSTALL_ABSOLUTE_DIR.

[iyzsong--- via Bug reports for GNU Guix]

From: 宋文武 

KAuth helpers use KAUTH_HELPER_INSTALL_ABSOLUTE_DIR as the prefix for "Exec="
in their dbus service files, which should really be an absolute directory.

Fixes .

* gnu/packages/kde-frameworks.scm (kauth)[arguments]<#:phases>: In
fix-cmake-install-directories phase, replace KAUTH_HELPER_INSTALL_DIR
with '${KDE_INSTALL_LIBEXECDIR}/kauth' and KAUTH_HELPER_INSTALL_ABSOLUTE_DIR
with '${KDE_INSTALL_FULL_LIBEXECDIR}/kauth'.

Change-Id: I57920c59dca503fd4bc8727cb35e1b0fb6016e56
---
 gnu/packages/kde-frameworks.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index 95c0f95e8c..8991c36f89 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -1645,9 +1645,9 @@ (define-public kauth
 (("@KAUTH_POLICY_FILES_INSTALL_DIR@")
  "${KDE_INSTALL_DATADIR}/polkit-1/actions")
 (("@KAUTH_HELPER_INSTALL_DIR@")
- "${KDE_INSTALL_LIBEXECDIR}")
+ "${KDE_INSTALL_LIBEXECDIR}/kauth")
 (("@KAUTH_HELPER_INSTALL_ABSOLUTE_DIR@")
- "${KDE_INSTALL_LIBEXECDIR}"
+ "${KDE_INSTALL_FULL_LIBEXECDIR}/kauth"
   (replace 'check
 (lambda* (#:key tests? #:allow-other-keys)
   (when tests?

base-commit: 4514239971895fc7ad47c7752e30d98a0c44a154
-- 
2.41.0

bug#65684: [PATCH 1/2] gnu: kaidan: Add missing input.

[iyzsong--- via Bug reports for GNU Guix]

From: 宋文武 

Fixes .

* gnu/packages/messaging.scm (kaidan)[inputs]: Add sonnet.
---
 gnu/packages/messaging.scm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index d6296d43aa..5c65760caf 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -1435,6 +1435,7 @@ (define-public kaidan
   qtxmlpatterns
   qqc2-desktop-style
   qxmpp
+  sonnet
   zxing-cpp))
 (home-page "https://www.kaidan.im/;)
 (synopsis "Qt-based XMPP/Jabber Client")

base-commit: c72bc0bb71a7315241c174636f96faee46a6dfa8
-- 
2.41.0

bug#63151: [PATCH] gnu: sound-juicer: Update to 3.40.0.

[iyzsong--- via Bug reports for GNU Guix]

From: 宋文武 

* gnu/packages/gnome.scm (sound-juicer): Update to 3.40.0.
[arguments]: Adjust 'disable-gtk-update-icon-cache'.
Add 'wrap-program' for GST_PLUGIN_SYSTEM_PATH.
---
 gnu/packages/gnome.scm | 22 --
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 4a2e867476..8d8d091407 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -11430,7 +11430,7 @@ (define-public passwordsafe
 (define-public sound-juicer
   (package
 (name "sound-juicer")
-(version "3.38.0")
+(version "3.40.0")
 (source
  (origin
(method url-fetch)
@@ -11439,15 +11439,25 @@ (define-public sound-juicer
name "-" version ".tar.xz"))
(sha256
 (base32
- "08d5d81rz9sj3m5paw8fwbgxmhlbr7bcjdzpmzj832qvg8smydxf"
+ "1rhxmvx2mr22zd5p0azc0svi0mbnzcjnh3sasv3b9gli8ds85s1f"
 (build-system meson-build-system)
 (arguments
  (list
   #:glib-or-gtk? #t
-  #:phases #~(modify-phases %standard-phases
-   (add-after 'unpack 'disable-gtk-update-icon-cache
- (lambda _
-   (setenv "DESTDIR" "/"))
+  #:phases
+  #~(modify-phases %standard-phases
+  (add-after 'unpack 'disable-gtk-update-icon-cache
+(lambda _
+  (substitute* "meson.build"
+(("gtk_update_icon_cache: true")
+ "gtk_update_icon_cache: false"
+  (add-after 'install 'wrap-program
+(lambda _
+  (let ((prog (string-append #$output "/bin/sound-juicer"))
+(gst-plugin-path (getenv "GST_PLUGIN_SYSTEM_PATH")))
+(wrap-program prog
+  `("GST_PLUGIN_SYSTEM_PATH"
+":" prefix (,gst-plugin-path)
 (native-inputs
  (list desktop-file-utils
gettext-minimal

base-commit: 4e531e55dcdc99c83bcfe3eec67c3fd95c7b6ca7
-- 
2.41.0

bug#65506: [PATCH] gnu: anki: Fix preferences error.

[iyzsong--- via Bug reports for GNU Guix]

From: 宋文武 

Fixes .

* gnu/packages/education.scm (anki)[source]: Add snippet.
---
 gnu/packages/education.scm | 7 +++
 1 file changed, 7 insertions(+)

diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm
index bb307cf7ab..21c8a60c0b 100644
--- a/gnu/packages/education.scm
+++ b/gnu/packages/education.scm
@@ -737,6 +737,13 @@ (define-public anki
version "-source.tgz"))
(sha256
 (base32 "1gfr51rnllkyzli73p4r51h5ypzfa3m7lic3m3rzpywmqwrxs07k"))
+   (modules '((guix build utils)))
+   ;; #65506 Fix preferences error.
+   (snippet '(substitute* "aqt/preferences.py"
+   (("qc\\['collapseTime']/60\\.0" x)
+(format #f "int(~a)" x))
+   (("qc\\['timeLim']/60\\.0" x)
+(format #f "int(~a)" x
(patches (search-patches "anki-mpv-args.patch"
 (build-system gnu-build-system)
 (arguments

base-commit: 1c916c167b7eb1f2f8af2cf621aa1512b00b1033
-- 
2.41.0

bug#65390: [PATCH] gnu: naev: Fix build.

[iyzsong--- via Bug reports for GNU Guix]

From: 宋文武 

* gnu/packages/games.scm (naev)[inputs]: Don't use sdl-union.
Remove sdl2-mixer.
---
 gnu/packages/games.scm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index a5fa19fc20..38f9343499 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -8242,7 +8242,8 @@ (define-public naev
physfs
python
python-pyyaml
-   (sdl-union (list sdl2 sdl2-image sdl2-mixer))
+   sdl2
+   sdl2-image
suitesparse))
 (home-page "https://naev.org/;)
 (synopsis "Game about space exploration, trade and combat")

base-commit: ad5e4fe54a66c725dc03dedebf8e5c65723ccb74
-- 
2.41.0

bug#64981: [PATCH] gnu: libepoxy: Hardcode paths to GLES libraries.

[iyzsong--- via Bug reports for GNU Guix]

From: 宋文武 

Fixes .

* gnu/packages/gl.scm (libepoxy)[arguments]<#:phases>:
Hardcode paths to libGLESv1_CM.so.1 and libGLESv2.so.2.
---
 gnu/packages/gl.scm | 10 +++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm
index b53b42a9ba..f662f0f7da 100644
--- a/gnu/packages/gl.scm
+++ b/gnu/packages/gl.scm
@@ -742,10 +742,14 @@ (define-public libepoxy
   #~(modify-phases %standard-phases
   (add-before 'configure 'patch-paths
 (lambda* (#:key inputs #:allow-other-keys)
-  (let ((mesa (dirname (search-input-file inputs "lib/libGL.so"
+  (let ((mesa-lib
+ (lambda (file)
+   (search-input-file inputs (string-append "lib/" 
file)
 (substitute* (find-files "." "\\.[ch]$")
-  (("libGL.so.1") (string-append mesa "/libGL.so.1"))
-  (("libEGL.so.1") (string-append mesa "/libEGL.so.1")
+  (("libGL.so.1") (mesa-lib "libGL.so.1"))
+  (("libEGL.so.1") (mesa-lib "libEGL.so.1"))
+  (("libGLESv1_CM.so.1") (mesa-lib "libGLESv1_CM.so.1"))
+  (("libGLESv2.so.2") (mesa-lib "libGLESv2.so.2")
 (build-system meson-build-system)
 (native-inputs
  (list pkg-config python))

base-commit: 597af70fd24eb85a85fa8c45008c9cfa241f4d0b
-- 
2.41.0

bug#20255: [PATCH 4/4] news: Add entry for '/etc/profile' changes.

[iyzsong--- via Bug reports for GNU Guix]

From: 宋文武 

* etc/news.scm: Add entry.
---
 etc/news.scm | 33 +
 1 file changed, 33 insertions(+)

diff --git a/etc/news.scm b/etc/news.scm
index f5dc3ca0d5..2da92eeac3 100644
--- a/etc/news.scm
+++ b/etc/news.scm
@@ -26,6 +26,39 @@
 (channel-news
  (version 0)
 
+ (entry (commit "2e888b4d07c67ad74fbb4ec9afb812a236852027")
+(title
+ (en "@file{/etc/profile} changes require manual intervention"))
+(body
+ (en "On Guix System, now the personal shell startup file
+@file{~/.bash_profile} or @file{~/.zprofile} will be used to set up
+environment variables for the user instead of @file{/etc/profile}.  And
+search-paths from multiple profiles are honored, which means a system
+configured Xfce desktop environment can find its panel plugins in the user
+profile.
+
+Before run @command{guix system reconfigure}, append the snippet below to each
+user's @file{~/.bash_profile} or @file{~/.zprofile}:
+
+@example
+# Merge search-paths from multiple profiles, the order matters.
+eval \"$(guix package --search-paths \\
+-p $HOME/.config/guix/current \\
+-p $HOME/.guix-profile \\
+-p /run/current-system/profile)\"
+
+# Prepend setuid programs.
+export PATH=/run/setuid-programs:$PATH
+
+# Set up Guix Home profile
+if [ -d ~/.guix-home ]; then . ~/.profile; fi
+@end example
+
+Or you can override them with updated skeleton files after system reconfigure.
+In addition, Guix Home users need to upgrade via @command{guix home
+reconfigure}.  See @uref{https://issues.guix.gnu.org/20255} for the
+rationale.")))
+
  (entry (commit "ae11fcb84ac478dfa56d322ef08890645183a087")
 (title
  (en "New @option{--with-configure-flag} transformation option")
-- 
2.40.1

bug#20255: [PATCH 1/4] home: shells: Merge search-paths of multiple profiles.

[iyzsong--- via Bug reports for GNU Guix]

From: 宋文武 

This is a followup to 40310efde9b4a4f2cf98081d6cd10f843685ebb6.

* gnu/home/services.scm (environment-variables->setup-environment-script):
Merge search-paths from multiple profiles via "guix package".
* gnu/home/services/shells.scm (zsh-file-zprofile, add-bash-configuration):
Adjust comments.
---
 gnu/home/services.scm| 14 ++
 gnu/home/services/shells.scm |  6 ++
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/gnu/home/services.scm b/gnu/home/services.scm
index b17a34d19d..3a061cf310 100644
--- a/gnu/home/services.scm
+++ b/gnu/home/services.scm
@@ -260,11 +260,17 @@ (define (environment-variables->setup-environment-script 
vars)
(lambda (port)
  (set-port-encoding! port "UTF-8")
  (display "\
-HOME_ENVIRONMENT=$HOME/.guix-home
-GUIX_PROFILE=\"$HOME_ENVIRONMENT/profile\"
-PROFILE_FILE=\"$HOME_ENVIRONMENT/profile/etc/profile\"
-[ -f $PROFILE_FILE ] && . $PROFILE_FILE
+# Merge search-paths from multiple profiles, the order matters.
+eval \"$(guix package --search-paths \\
+-p $HOME/.config/guix/current \\
+-p $HOME/.guix-home/profile \\
+-p $HOME/.guix-profile \\
+-p /run/current-system/profile)\"
+
+# Prepend setuid programs.
+export PATH=/run/setuid-programs:$PATH
 
+HOME_ENVIRONMENT=$HOME/.guix-home
 case $XDG_DATA_DIRS in
   *$HOME_ENVIRONMENT/profile/share*) ;;
   *) export XDG_DATA_DIRS=$HOME_ENVIRONMENT/profile/share:$XDG_DATA_DIRS ;;
diff --git a/gnu/home/services/shells.scm b/gnu/home/services/shells.scm
index f05f2221d6..7c8908083e 100644
--- a/gnu/home/services/shells.scm
+++ b/gnu/home/services/shells.scm
@@ -185,9 +185,8 @@ (define (zsh-file-zprofile config)
   (mixed-text-file
"zprofile"
"\
-# Set up the system, user profile, and related variables.
+# Set up environment variables of profiles.
 source /etc/profile
-# Set up the home environment profile.
 source ~/.profile
 
 # It's only necessary if zsh is a login shell, otherwise profiles will
@@ -399,9 +398,8 @@ (define (add-bash-configuration config)
   ,(mixed-text-file
 "bash_profile"
 "\
-# Set up the system, user profile, and related variables.
+# Set up environment variables of profiles.
 # /etc/profile will be sourced by bash automatically
-# Set up the home environment profile.
 if [ -f ~/.profile ]; then source ~/.profile; fi
 
 # Honor per-interactive-shell startup file

base-commit: cf82526ac400fe953ddfbf9d7458d62ea4871d10
-- 
2.40.1

bug#20255: [PATCH 3/4] system: Only source system profile's settings in '/etc/profile'.

[iyzsong--- via Bug reports for GNU Guix]

From: 宋文武 

This is a followup to 40310efde9b4a4f2cf98081d6cd10f843685ebb6.

* gnu/system.scm (operating-system-etc-service)[profile]:
Don't source profile of '~/.guix-profile' and '~/.config/guix/current'.
---
 gnu/system.scm | 23 ---
 1 file changed, 4 insertions(+), 19 deletions(-)

diff --git a/gnu/system.scm b/gnu/system.scm
index 354f58f55b..a48c206e18 100644
--- a/gnu/system.scm
+++ b/gnu/system.scm
@@ -1009,8 +1009,8 @@ (define* (operating-system-etc-service os)
 ;; environment variables.
 (profile(mixed-text-file "profile"  "\
 # Crucial variables that could be missing in the profiles' 'etc/profile'
-# because they would require combining both profiles.
-# FIXME: See .
+# because they would require honoring search paths of dependencies.
+# FIXME: See .
 export 
MANPATH=$HOME/.guix-profile/share/man:/run/current-system/profile/share/man
 export 
INFOPATH=$HOME/.guix-profile/share/info:/run/current-system/profile/share/info
 export 
XDG_DATA_DIRS=$HOME/.guix-profile/share:/run/current-system/profile/share
@@ -1037,27 +1037,12 @@ (define* (operating-system-etc-service os)
   export `cat /etc/environment | cut -d= -f1`
 fi
 
-# Arrange so that ~/.config/guix/current comes first.
-for profile in \"$HOME/.guix-profile\" \"$HOME/.config/guix/current\"
-do
-  if [ -f \"$profile/etc/profile\" ]
-  then
-# Load the user profile's settings.
-GUIX_PROFILE=\"$profile\" ; \\
-. \"$profile/etc/profile\"
-  else
-# At least define this one so that basic things just work
-# when the user installs their first package.
-export PATH=\"$profile/bin:$PATH\"
-  fi
-done
+# Make basic things just work when the user installs their first package.
+export PATH=\"$HOME/.config/guix/current/bin:$HOME/.guix-profile/bin:$PATH\"
 
 # Prepend setuid programs.
 export PATH=/run/setuid-programs:$PATH
 
-# Arrange so that ~/.config/guix/current/share/info comes first.
-export INFOPATH=\"$HOME/.config/guix/current/share/info:$INFOPATH\"
-
 # Set the umask, notably for users logging in via 'lsh'.
 # See .
 umask 022
-- 
2.40.1

bug#20255: [PATCH 2/4] system: default-skeletons: Set up Guix home profile when it exists.

[iyzsong--- via Bug reports for GNU Guix]

From: 宋文武 

This is a followup to 40310efde9b4a4f2cf98081d6cd10f843685ebb6.

* gnu/system/shadow.scm (default-skeletons)[bash_profile, zprofile]:
Source '~/.profile' when '~/.guix-home' exists.
---
 gnu/system/shadow.scm | 9 ++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/gnu/system/shadow.scm b/gnu/system/shadow.scm
index 4a8cc87f0f..afb47fc42d 100644
--- a/gnu/system/shadow.scm
+++ b/gnu/system/shadow.scm
@@ -151,9 +151,6 @@ (define (default-skeletons)
 'useradd' in the home directory of newly created user accounts."
 
   (let ((profile (plain-file "bash_profile" "\
-# Set up Guix Home profile
-if [ -f ~/.profile ]; then . ~/.profile; fi
-
 # Honor per-interactive-shell startup file
 if [ -f ~/.bashrc ]; then . ~/.bashrc; fi
 
@@ -165,6 +162,9 @@ (define (default-skeletons)
 
 # Prepend setuid programs.
 export PATH=/run/setuid-programs:$PATH
+
+# Set up Guix Home profile
+if [ -d ~/.guix-home ]; then . ~/.profile; fi
 "))
 (bashrc  %default-bashrc)
 (zprofile(plain-file "zprofile" "\
@@ -179,6 +179,9 @@ (define (default-skeletons)
 
 # Prepend setuid programs.
 export PATH=/run/setuid-programs:$PATH
+
+# Set up Guix Home profile
+if [ -d ~/.guix-home ]; then . ~/.profile; fi
 "))
 (xdefaults (plain-file "Xdefaults" "\
 XTerm*utf8: always
-- 
2.40.1