from:"Vivien Kraus"

bug#69961: java-jmh has flaky tests

2024-03-23 Thread Vivien Kraus via Bug reports for GNU Guix

Dear Guix, brave java team,

When building java-jmh, we experienced a flaky test:
https://bordeaux.guix.gnu.org/build/0aa9b4ea-57ad-439b-a5c7-7d59dd14e9cd/log

However, the build system does not give us enough information to know
what went wrong, as far as I understand.

Best regards,

Vivien

bug#69800: [PATCH gnome-team] gnu: kcalendarcore: Disable failing test.

2024-03-23 Thread Vivien Kraus via Bug reports for GNU Guix

* gnu/packages/kde-frameworks.scm (kcalendarcore) [#:phases]: Add
'disable-failing-test.

Change-Id: Ia0a5828b032d1940f30a7d38ebd276e60929c310
---
 gnu/packages/kde-frameworks.scm | 6 ++
 1 file changed, 6 insertions(+)

diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index 64e41b510d..c177c33d0d 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -509,6 +509,12 @@ (define-public kcalendarcore
  (list
   #:phases
   #~(modify-phases %standard-phases
+  (add-after 'unpack 'disable-failing-test
+(lambda _
+  ;; Reported as https://bugs.kde.org/show_bug.cgi?id=484306
+  (substitute* "autotests/CMakeLists.txt"
+(("testdateserialization")
+ ""
   (add-before 'check 'check-setup
 (lambda* (#:key inputs #:allow-other-keys) ;;; XXX: failing test
   (setenv "QT_QPA_PLATFORM" "offscreen")

base-commit: a9951a74a591a9b22ee2d93d8efe0523c6c42c97
-- 
2.41.0

bug#69800: kcalendarcore is a time bomb

2024-03-14 Thread Vivien Kraus via Bug reports for GNU Guix

Dear Guix,

Kcalendarcore does not build anymore. According to CI, it stopped
working this march, on gnome-team and rust-branch (I can’t build it
either on master).

http://ci.guix.gnu.org/search?query=kcalendarcore

Best regards,

Vivien

bug#63077: [PATCH] gnu: gnutls: skip examples on mingw.

2024-03-11 Thread Vivien Kraus via Bug reports for GNU Guix

Hello,

Le vendredi 08 mars 2024 à 18:22 +0100, Simon Tournier a écrit :
> > > +   #$@(if (target-mingw?)
> > > +  #~((add-after 'unpack 'skip-doc-examples
> > > +   ;; The examples in doc do not link to
> > > correct
> > > +   ;; gnulib modules.
> > > +   (lambda _
> > > + (substitute* "doc/Makefile.in"
> > > +   (("SUBDIRS = examples")
> > > +    "SUBDIRS =")
> > > +  #~())
> > 
> > Did you report it upstream?  Perhaps they'd know how to properly
> > fix it.
> 
> Digging all bugs, what about this?
> 
> It could be nice if it is fixed upstream.  On the other, we could
> also
> apply a fix waiting such fix.

I reported it, and I believe upstream fixed it:

https://gitlab.com/gnutls/gnutls/-/merge_requests/1761/diffs?commit_id=5db0db2e83da54d799f55984dc33039d6b22c933

However it’s difficult to check because libidn2 fails (maybe the more
recent 2.3.7 does not).  This libidn2 failure seems to have been
reported here:

https://gitlab.com/libidn/libidn2/-/issues/113

I notice that libidn2 uses its own libunistring instead of the guix’
one, because libunistring is not an input of libidn2.  Is this intended
to avoid a cycle?

Best regards,

Vivien

bug#69682: [PATCH v2] gnu: ocaml-extlib: Convert to dune-build-system.

2024-03-09 Thread Vivien Kraus via Bug reports for GNU Guix

* gnu/packages/ocaml.scm (ocaml-extlib) [build-system]: Convert to
dune-build-system.
[arguments]: Remove '#:phases' and add '#:package'.

Change-Id: Ia50c05423f3062200704fbcbb0680f2b326a7ca4
---
Opam still builds on gnome-team.

 gnu/packages/ocaml.scm | 6 ++
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index 0f4c351141..b70e925d51 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -644,11 +644,9 @@ (define-public ocaml-extlib
   (sha256
(base32
 "1jydzw2n84cfiz9y6lk4gih4wbr8jybanmiryfs01svd07g4vpjq"
-(build-system ocaml-build-system)
+(build-system dune-build-system)
 (arguments
- `(#:phases
-   (modify-phases %standard-phases
- (delete 'configure
+ (list #:package "extlib"))
 (native-inputs
   (list ocaml-cppo))
 (home-page "https://github.com/ygrek/ocaml-extlib";)

base-commit: 2f441fc738976175d438f7942211b1894e2eb416
-- 
2.41.0

bug#69682: [PATCH 1/1] gnu: ocaml-extlib: Build with minimal=1.

2024-03-09 Thread Vivien Kraus via Bug reports for GNU Guix

* gnu/packages/ocaml.scm (ocaml-extlib) [arguments]: Convert to list of
G-Expressions.  Add #:make-flags.

Change-Id: I42ee3c21a52788f20ddc3381927ef6ef40b2a354
---
 gnu/packages/ocaml.scm | 8 +---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index 0f4c351141..b911da8e5b 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -646,9 +646,11 @@ (define-public ocaml-extlib
 "1jydzw2n84cfiz9y6lk4gih4wbr8jybanmiryfs01svd07g4vpjq"
 (build-system ocaml-build-system)
 (arguments
- `(#:phases
-   (modify-phases %standard-phases
- (delete 'configure
+ (list
+  #:make-flags #~'("minimal=1")
+  #:phases
+  #~(modify-phases %standard-phases
+  (delete 'configure
 (native-inputs
   (list ocaml-cppo))
 (home-page "https://github.com/ygrek/ocaml-extlib";)
-- 
2.41.0

bug#69682: [PATCH 0/1] ocaml-extlib: Build with minimal=1.

2024-03-09 Thread Vivien Kraus via Bug reports for GNU Guix

Dear Guix, brave ocaml-team members,

According to https://github.com/ocaml/opam/issues/5694

it looks like ocaml-extlib should build with minimal=1.

This also fixes a build failure on gnome-team.

What do you think?

Best regards,

Vivien

Vivien Kraus (1):
  gnu: ocaml-extlib: Build with minimal=1.

 gnu/packages/ocaml.scm | 8 +---
 1 file changed, 5 insertions(+), 3 deletions(-)


base-commit: 2f441fc738976175d438f7942211b1894e2eb416
-- 
2.41.0

bug#69682: Opam should be using a minimal version of extlib

2024-03-09 Thread Vivien Kraus via Bug reports for GNU Guix

Dear OCaml-aware Guix,

opam seems to imply that we have to use a minimal variant of ocaml-
extlib to build opam:

https://github.com/ocaml/opam/issues/5694

This is likely related to a build failure we are experiencing on the
gnome-team branch:

https://issues.guix.gnu.org/69677

http://ci.guix.gnu.org/build/3415343/log/raw

Best regards,

Vivien

bug#67651: [gnome-team] What should we do with the "gnome" package?

2024-02-06 Thread Vivien Kraus via Bug reports for GNU Guix

This is being worked on at https://issues.guix.gnu.org/68716

bug#67838: [gnome-team] epiphany pdf.js can't save pdf

2024-01-22 Thread Vivien Kraus via Bug reports for GNU Guix

Hello Jack!

It is possible that the issue has been fixed with the newer webkitgtk
or the newer epiphany. Can you try that again?

Best regards,

Vivien

bug#67651: [gnome-team] What should we do with the "gnome" package?

2024-01-09 Thread Vivien Kraus via Bug reports for GNU Guix

Dear Guix,

Le dimanche 07 janvier 2024 à 17:53 +0100, Liliana Marie Prikler a
écrit :
> I've summarised our TODOs below: Each commented line (preceded by #)
> denotes a package that doesn't exist on the gnome-team branch yet.
> 
> core:atkmm:2.28.3:
Oops, I missed that one. Sorry. I checked the list by comparing our
versions to those of the list, but of course, our version of "atkmm" is
reported as 2.36.2, so I did not think further. 

The git log shows various documentation update, build system updates,
and documentation updates between 2.28.1 and 2.28.3.

> #core:calls:44.2:
(as said on IRC, I believe we have Calls already on gnome-team)

> core:font-abattis-cantarell:0.303.1:
I don’t know where this 0.303.1 tag comes from, I can’t see it. It’s
neither a tag nor a gitlab release. There has only been translation
updates for the appstream metadata since our commit.

> core:epiphany:44.7:
We now have it, thank you!

> #core:gnome-logs:43.0:
The day elogind supports the journald API, we will be delighted to have
it (also see https://issues.guix.gnu.org/67338 ).

> #core:gnome-software:44.5:
I thought it was pointless to package it, but see
https://issues.guix.gnu.org/68228 : it is claimed that we can use it to
install flatpaks.

> #core:gnome-tour:44.0:
That’s Rust, unfortunately.

> 
> I think we should settle on what to do with the gnome package soon to
> not stall the branch even further.  We can already start working
> towards GNOME 46 after the merge :)
In my opinion, we should have atkmm:2.28.3, but I see atkmm-2.28 being
used as a propagated-inputs for gtkmm-3, and gtkmm-3 is an input for
inkscape. That’s a world rebuild…

For Cantarell fonts, maybe we should point to the latest commit? That’s
another world rebuild though, and for very little gain as of now.

I’m not sure a flatpak-only gnome software is a hard requirement. It
would be most confusing. Gnome-tour is nice, but I think we can live
without it until we figure out this “rust” stuff.

> There is some gnome-adjacent software (particularly extensions, I
> don't
> want all of them to break like they did the last time and the time
> before) to have a look at as well before the merge

You mean, the gnome-shell-extension-* in (gnu packages gnome-xyz)? I
don’t use them (I was told they were frequently broken so I never
bothered to try them!) so I’m not sure I can reliably tell whether they
work correctly.

Best regards,

Vivien


P.S. After a brief period of not being able to send an e-mail, this is
the first I send with my new email-key-rotation-service-type! I hope it
travels safely to your inbox.
https://labo.planete-kraus.eu/email-key-rotation.git/tree/README.org

bug#67651: [gnome-team] What should we do with the "gnome" package?

2023-12-05 Thread Vivien Kraus via Bug reports for GNU Guix

Dear guix,

On the one hand, we have this list of packages:
https://ftp2.nluug.nl/windowing/gnome/teams/releng/44.6/versions

On the other hand, we have the propagated-inputs of the gnome package.

Should we update the latter so that it contains everything from the
former? What should we do about the comments dividing the propagated-
inputs into categories? Where do these categories come from? Should we
preserve them? How do we know which package goes to which category?

The gnome package disables eog on 32-bit machines because it depends on
librsvg-next. It seems a bit outdated to me, as most of gnome won’t
work on 32-bit machines, not only eog. Should we try and find which
ones work on 32-bit systems?

Best regards,

Vivien

bug#66339: [PATCH gnome-team v6] gnu: dbus-service: make the session available under /run/dbus

2023-10-08 Thread Vivien Kraus via Bug reports for GNU Guix

According to https://gitlab.gnome.org/GNOME/glib/-/merge_requests/3101, glib
now searches for the session bus socket in runstatedir. The dbus service must
thus have its socket in /run/dbus.

For interoperability with the dbus standard, /run/dbus is also symlinked to
/var/run/dbus.

* gnu/services/dbus.scm (dbus-activation): Symlink /run/dbus to /var/run/dbus.
(%dbus-accounts): Run dbus in /run/dbus.
(dbus-root-service-type): Save the pid file in /run/dbus.
---

Hello,

I changed my mind back to a previous mind change, so: the socket should be
installed in /run.  I believe that the code moves the content of the existing
/var/run/dbus to /run/dbus before trying the symlink again, if /var/run/dbus
exists and is not a symlink to /run/dbus.  I donât really have a way to check
the interesting case where existing files need to be moved.  However, the
gnome-team-configured VM works.

Best regards,

Vivien

 gnu/services/dbus.scm | 39 ---
 1 file changed, 36 insertions(+), 3 deletions(-)

diff --git a/gnu/services/dbus.scm b/gnu/services/dbus.scm
index 5a0c634393..aa9ce0720c 100644
--- a/gnu/services/dbus.scm
+++ b/gnu/services/dbus.scm
@@ -163,7 +163,7 @@ (define %dbus-accounts
  (group "messagebus")
  (system? #t)
  (comment "D-Bus system bus user")
- (home-directory "/var/run/dbus")
+ (home-directory "/run/dbus")
  (shell (file-append shadow "/sbin/nologin")
 
 (define dbus-setuid-programs
@@ -186,7 +186,40 @@ (define (dbus-activation config)
 (let ((user (getpwnam "messagebus")))
   ;; This directory contains the daemon's socket so it must be
   ;; world-readable.
-  (mkdir-p/perms "/var/run/dbus" user #o755))
+  (mkdir-p/perms "/run/dbus" user #o755))
+
+(catch 'system-error
+  (lambda ()
+(symlink "/run/dbus" "/var/run/dbus"))
+  (lambda args
+(let ((errno (system-error-errno args)))
+  (cond
+   ((= errno EEXIST)
+(let ((existing-name
+   (false-if-exception
+(readlink "/var/run/dbus"
+  (unless (equal? existing-name "/run/dbus")
+;; Move the content of /var/run/dbus to /run/dbus, and
+;; retry.
+(let ((dir (opendir "/var/run/dbus")))
+  (let move-to-/run/dbus ((next (readdir dir)))
+(cond
+ ((eof-object? next)
+  (closedir dir))
+ ((member next '("." ".."))
+  (move-to-/run/dbus (readdir dir)))
+ (else
+  (begin
+(rename-file (string-append "/var/run/dbus/" next)
+ (string-append "/run/dbus/" next))
+(move-to-/run/dbus (readdir dir
+  (rmdir "/var/run/dbus")
+  (symlink "/run/dbus" "/var/run/dbus")))
+   (else
+(format (current-error-port)
+"Failed to symlink /run/dbus to /var/run/dbus: ~s~%"
+(strerror errno))
+(error "cannot create /var/run/dbus"))
 
 (unless (file-exists? "/etc/machine-id")
   (format #t "creating /etc/machine-id...~%")
@@ -210,7 +243,7 @@ (define dbus-shepherd-service
  '(#:environment-variables '("DBUS_VERBOSE=1")
#:log-file "/var/log/dbus-daemon.log")
  '())
-  #:pid-file "/var/run/dbus/pid"))
+  #:pid-file "/run/dbus/pid"))
 (stop #~(make-kill-destructor)))
 
 (define dbus-root-service-type

base-commit: b18b2d13488f2a92331ccad2dc8cbb54ee15582f
-- 
2.41.0

bug#66339: [PATCH gnome-team v5] gnu: glib: Set runstatedir.

2023-10-07 Thread Vivien Kraus via Bug reports for GNU Guix

Glib has made /run the default runstatedir:

https://gitlab.gnome.org/GNOME/glib/-/merge_requests/3101

However, in Guix, the default runstatedir is /var/run.

* gnu/packages/glib.scm (glib): Set runtime_dir to /var/run.
---

I changed my mind again!  Following the IRC discussion, Guix has a separate
/var/run and /run (and puts /run/current-system/ in /run).  So, /var/run/dbus
is actually the correct place to put the system session socket.

 gnu/packages/glib.scm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm
index 8af89d60e0..c4fcc20bb6 100644
--- a/gnu/packages/glib.scm
+++ b/gnu/packages/glib.scm
@@ -254,6 +254,7 @@ (define glib
   #:configure-flags #~(list "--default-library=both"
 "-Dman=false"
 "-Dselinux=disabled"
+"-Druntime_dir=/var/run"
 (string-append "--bindir="
#$output:bin "/bin"))
   #:phases

base-commit: b18b2d13488f2a92331ccad2dc8cbb54ee15582f
-- 
2.41.0

bug#66339: [PATCH gnome-team v4] gnu: dbus-service: make the session available under /run/dbus

2023-10-06 Thread Vivien Kraus via Bug reports for GNU Guix

According to https://gitlab.gnome.org/GNOME/glib/-/merge_requests/3101, glib
now searches for the session bus socket in runstatedir. The dbus service must
thus have its socket in /run/dbus.

For interoperability with the dbus standard, /run/dbus is also symlinked to
/var/run/dbus.

* gnu/services/dbus.scm (dbus-activation): Symlink /run/dbus to /var/run/dbus.
(%dbus-accounts): Run dbus in /run/dbus.
(dbus-root-service-type): Save the pid file in /run/dbus.
---

> Perhaps, but it's not okay to fail if it's a regular directory.  We should
> move those!

Iâm not sure I understand.  What comes to my mind is:

1. Try to make the symlink. If it fails with EEXIST:
2. Try to read /var/run/dbus as a symlink. If it points to /run/dbus already,
   stop. Otherwise:
3. Move everything in /var/run/dbus to /run/dbus.
4. Delete the now-empty /var/run/dbus.
5. Symlink /run/dbus to /var/run/dbus.

Is it what you meant?

Best regards,

Vivien

 gnu/services/dbus.scm | 38 +++---
 1 file changed, 35 insertions(+), 3 deletions(-)

diff --git a/gnu/services/dbus.scm b/gnu/services/dbus.scm
index 5a0c634393..44bf0c910b 100644
--- a/gnu/services/dbus.scm
+++ b/gnu/services/dbus.scm
@@ -163,7 +163,7 @@ (define %dbus-accounts
  (group "messagebus")
  (system? #t)
  (comment "D-Bus system bus user")
- (home-directory "/var/run/dbus")
+ (home-directory "/run/dbus")
  (shell (file-append shadow "/sbin/nologin")
 
 (define dbus-setuid-programs
@@ -186,7 +186,39 @@ (define (dbus-activation config)
 (let ((user (getpwnam "messagebus")))
   ;; This directory contains the daemon's socket so it must be
   ;; world-readable.
-  (mkdir-p/perms "/var/run/dbus" user #o755))
+  (mkdir-p/perms "/run/dbus" user #o755))
+
+(catch 'system-error
+  (lambda ()
+(symlink "/run/dbus" "/var/run/dbus"))
+  (lambda args
+(let ((errno (system-error-errno args)))
+  (cond
+   ((= errno EEXIST)
+(let ((existing-name
+   (false-if-exception
+(readlink "/var/run/dbus"
+  (unless (equal? existing-name "/run/dbus")
+;; Move the content of /var/run/dbus to /run/dbus, and
+;; retry.
+(let ((dir (opendir "/var/run/dbus")))
+  (let move-to-/run/dbus ()
+(let ((next (readdir dir)))
+  (unless (or (equal? next ".")
+  (equal? next "..")
+  (eof-object? next))
+(rename-file (string-append "/var/run/dbus/" next)
+ (string-append "/run/dbus/" next)))
+  (unless (eof-object? next)
+(move-to-/run/dbus
+  (closedir dir)
+  (rmdir "/var/run/dbus")
+  (symlink "/run/dbus" "/var/run/dbus")
+   (else
+(format (current-error-port)
+"Failed to symlink /run/dbus to /var/run/dbus: ~s~%"
+(strerror errno))
+(error "cannot create /var/run/dbus"))
 
 (unless (file-exists? "/etc/machine-id")
   (format #t "creating /etc/machine-id...~%")
@@ -210,7 +242,7 @@ (define dbus-shepherd-service
  '(#:environment-variables '("DBUS_VERBOSE=1")
#:log-file "/var/log/dbus-daemon.log")
  '())
-  #:pid-file "/var/run/dbus/pid"))
+  #:pid-file "/run/dbus/pid"))
 (stop #~(make-kill-destructor)))
 
 (define dbus-root-service-type

base-commit: b18b2d13488f2a92331ccad2dc8cbb54ee15582f
-- 
2.41.0

bug#66339: [PATCH gnome-team v3] gnu: dbus-service: make the session available under /run/dbus

2023-10-06 Thread Vivien Kraus via Bug reports for GNU Guix

According to https://gitlab.gnome.org/GNOME/glib/-/merge_requests/3101, glib
now searches for the session bus socket in runstatedir. The dbus service must
thus have its socket in /run/dbus.

For interoperability with the dbus standard, /run/dbus is also symlinked to
/var/run/dbus.

* gnu/services/dbus.scm (dbus-activation): Symlink /run/dbus to /var/run/dbus.
(%dbus-accounts): Run dbus in /run/dbus.
(dbus-root-service-type): Save the pid file in /run/dbus.
---

Le jeudi 05 octobre 2023 Ã  06:41 +0200, Liliana Marie Prikler a Ã©crit :
> > Iâm still concerned about doing a symlink in the activation function.
> > What if we activate a new system from an existing one? Wonât the symlink
> > fail? I think we should preemptively delete /var/run/dbus and make a new
> > symlink every time. But I could be wrong, maybe this is not needed.
> >
> > What do you think?
> If we go this route, I think we should first check whether /var/run/dbus is
> indeed a symlink to /run/dbus and move the existing files if not before
> deleting the directory and creating the symlink.  But before that, we should
> try to symlink, which will fail with EEXIST if the file already exists,
> regardless of whether it's a symlink â thereafter you can check the cause of
> this failure through lstat.

I changed my mind! I now think it is OK for the system reconfigure to fail if
a different symlink already exists.

Best regards,

Vivien

 gnu/services/dbus.scm | 23 ---
 1 file changed, 20 insertions(+), 3 deletions(-)

diff --git a/gnu/services/dbus.scm b/gnu/services/dbus.scm
index 5a0c634393..206a7bb491 100644
--- a/gnu/services/dbus.scm
+++ b/gnu/services/dbus.scm
@@ -163,7 +163,7 @@ (define %dbus-accounts
  (group "messagebus")
  (system? #t)
  (comment "D-Bus system bus user")
- (home-directory "/var/run/dbus")
+ (home-directory "/run/dbus")
  (shell (file-append shadow "/sbin/nologin")
 
 (define dbus-setuid-programs
@@ -186,7 +186,24 @@ (define (dbus-activation config)
 (let ((user (getpwnam "messagebus")))
   ;; This directory contains the daemon's socket so it must be
   ;; world-readable.
-  (mkdir-p/perms "/var/run/dbus" user #o755))
+  (mkdir-p/perms "/run/dbus" user #o755))
+
+(catch 'system-error
+  (lambda ()
+(symlink "/run/dbus" "/var/run/dbus"))
+  (lambda args
+(let ((errno (system-error-errno args)))
+  (cond
+   ((= errno EEXIST)
+(let ((existing-name
+   (readlink "/run/dbus")))
+  (unless (equal? existing-name "/var/run/dbus")
+(error "the symlink /run/dbus exists and does not point to 
/var/run/dbus"
+   (else
+(format (current-error-port)
+"Failed to symlink /run/dbus to /var/run/dbus: ~s~%"
+(strerror errno))
+(error "cannot create /var/run/dbus"))
 
 (unless (file-exists? "/etc/machine-id")
   (format #t "creating /etc/machine-id...~%")
@@ -210,7 +227,7 @@ (define dbus-shepherd-service
  '(#:environment-variables '("DBUS_VERBOSE=1")
#:log-file "/var/log/dbus-daemon.log")
  '())
-  #:pid-file "/var/run/dbus/pid"))
+  #:pid-file "/run/dbus/pid"))
 (stop #~(make-kill-destructor)))
 
 (define dbus-root-service-type

base-commit: b18b2d13488f2a92331ccad2dc8cbb54ee15582f
-- 
2.41.0

bug#66339: [PATCH gnome-team v2] gnu: dbus-service: make the session available under /run/dbus

2023-10-04 Thread Vivien Kraus via Bug reports for GNU Guix

According to https://gitlab.gnome.org/GNOME/glib/-/merge_requests/3101, glib
now searches for the session bus socket in runstatedir. The dbus service must
thus have its socket in /run/dbus.

For interoperability with the dbus standard, /run/dbus is also symlinked to
/var/run/dbus.

* gnu/services/dbus.scm (dbus-activation): Symlink /run/dbus to /var/run/dbus.
(%dbus-accounts): Run dbus in /run/dbus.
(dbus-root-service-type): Save the pid file in /run/dbus.
---

Le mercredi 04 octobre 2023 Ã  20:30 +0200, Liliana Marie Prikler a Ã©crit :
> Am Mittwoch, dem 04.10.2023 um 12:47 +0200 schrieb Vivien Kraus:
> > * gnu/services/dbus.scm (dbus-activation): Symlink /var/run/dbus to
> > /run/dbus.
> > ---
> >  gnu/services/dbus.scm | 1 +
> >  1 file changed, 1 insertion(+)
> >
> > diff --git a/gnu/services/dbus.scm b/gnu/services/dbus.scm
> > index 5a0c634393..80968ac1a4 100644
> > --- a/gnu/services/dbus.scm
> > +++ b/gnu/services/dbus.scm
> > @@ -187,6 +187,7 @@ (define (dbus-activation config)
> >;; This directory contains the daemon's socket so it
> > must
> > be
> >;; world-readable.
> >(mkdir-p/perms "/var/run/dbus" user #o755))
> > +(symlink "/var/run/dbus" "/run/dbus")
> From [1]:
> > As documented in the NEWS file in
> > https://gitlab.freedesktop.org/dbus/dbus/-/merge_requests/209, itâs
> > only valid to use /run â rather than /var/run â for D-Bus if the
> > two
> > paths are interoperable. i.e. /var/run should be a symlink to /run,
> > and the D-Bus daemon should be configured to put its socket there.
>
> Thus, the order of the two ought to be reversed.  Alternatively, we
> could add '-Druntime_dir=/var/run' to glib.  WDYT?
> 
> [1]: https://gitlab.gnome.org/GNOME/glib/-/merge_requests/3101

Thank you for finding this information. I think we should follow glib, and
have the socket in /run/dbus, with the symlink for standard interoperability.

Iâm still concerned about doing a symlink in the activation function. What if
we activate a new system from an existing one? Wonât the symlink fail? I think
we should preemptively delete /var/run/dbus and make a new symlink every
time. But I could be wrong, maybe this is not needed.

What do you think?

Best regards,

Vivien

 gnu/services/dbus.scm | 10 +++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/gnu/services/dbus.scm b/gnu/services/dbus.scm
index 5a0c634393..53efa7adea 100644
--- a/gnu/services/dbus.scm
+++ b/gnu/services/dbus.scm
@@ -163,7 +163,7 @@ (define %dbus-accounts
  (group "messagebus")
  (system? #t)
  (comment "D-Bus system bus user")
- (home-directory "/var/run/dbus")
+ (home-directory "/run/dbus")
  (shell (file-append shadow "/sbin/nologin")
 
 (define dbus-setuid-programs
@@ -186,7 +186,11 @@ (define (dbus-activation config)
 (let ((user (getpwnam "messagebus")))
   ;; This directory contains the daemon's socket so it must be
   ;; world-readable.
-  (mkdir-p/perms "/var/run/dbus" user #o755))
+  (mkdir-p/perms "/run/dbus" user #o755))
+
+(when (file-exists? "/var/run/dbus")
+  (delete-file "/var/run/dbus"))
+(symlink "/run/dbus" "/var/run/dbus")
 
 (unless (file-exists? "/etc/machine-id")
   (format #t "creating /etc/machine-id...~%")
@@ -210,7 +214,7 @@ (define dbus-shepherd-service
  '(#:environment-variables '("DBUS_VERBOSE=1")
#:log-file "/var/log/dbus-daemon.log")
  '())
-  #:pid-file "/var/run/dbus/pid"))
+  #:pid-file "/run/dbus/pid"))
 (stop #~(make-kill-destructor)))
 
 (define dbus-root-service-type

base-commit: b18b2d13488f2a92331ccad2dc8cbb54ee15582f
-- 
2.41.0

bug#66339: [WIP PATCH gnome-team] gnu: dbus-service: make the session available under /run/dbus

2023-10-04 Thread Vivien Kraus via Bug reports for GNU Guix

* gnu/services/dbus.scm (dbus-activation): Symlink /var/run/dbus to /run/dbus.
---
 gnu/services/dbus.scm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gnu/services/dbus.scm b/gnu/services/dbus.scm
index 5a0c634393..80968ac1a4 100644
--- a/gnu/services/dbus.scm
+++ b/gnu/services/dbus.scm
@@ -187,6 +187,7 @@ (define (dbus-activation config)
   ;; This directory contains the daemon's socket so it must be
   ;; world-readable.
   (mkdir-p/perms "/var/run/dbus" user #o755))
+(symlink "/var/run/dbus" "/run/dbus")
 
 (unless (file-exists? "/etc/machine-id")
   (format #t "creating /etc/machine-id...~%")

base-commit: b18b2d13488f2a92331ccad2dc8cbb54ee15582f
-- 
2.41.0

bug#63331: Guile-GnuTLS/Git circular dependency and built-in git checkouts

2023-09-11 Thread Vivien Kraus via Bug reports for GNU Guix

Hello!

Le lundi 11 septembre 2023 à 16:36 +0200, Ludovic Courtès a écrit :
> Eventually, when users are all running recent versions of
> ‘guix-daemon’ with support for “builtin:git-download” (2–4
> years from now?), we’ll be able to use “builtin:git-download”
> unconditionally and thus be sure there are no risks of
> derivation cycles.

Do foreign distros need to update their guix package as well? If that
is the case, the provided time frame might be optimistic.

> Note that the patch series adds a hard dependency on Git.
> This is because the existing ‘git-fetch’ code depends on Git

I applaud the switch to the regular git program from libgit2, as I
would then be able to pull from my cgit "dumb" server instead of having
to maintain a mirror.

Vivien

bug#29644: gcc-objc is unusable without its 'gcc' executable

2023-09-02 Thread Vivien Kraus via Bug reports for GNU Guix

Hello!

I would like to learn and play with gnustep with objective-C, but it
seems like GCC does not come with objective-C in Guix.

I don’t know much about GCC or how Guix packages it. There is an early
comment by Ricardo Wurmus:

> The fix here is to patch “lang-spec.h”, so that it does not limit the
> gcc executable to the configured set of languages.  This way we will
> be
> able to use the same gcc executable with different languages.

The source of gcc-objc has a file named gcc-12.3.0/gcc/objc/lang-
specs.h that claims to be included as a static array literal, but I
don’t know what the rest of this citation means.

Vivien

bug#63331: Guile-GnuTLS/Git circular dependency

2023-05-09 Thread Vivien Kraus via Bug reports for GNU Guix

Le mardi 09 mai 2023 à 14:23 +0200, Simon Josefsson a écrit :
> A GitLab CI/CD build check on Guix would be nice, does anyone publish
> docker images for a Guix system?

The guix builder uses linux tools to provide an isolated build
environment. It is possible to run the guix build daemon without this
protection, so as to run it within a docker container, but build
scripts may behave incorrectly if they run outside of the sandbox. They
could see libraries that they should not be able to see and by that
configure incorrectly, or install things where they should not. Guix
packagers do not usually care if a build script writes files outside of
its correct store directory, because of the isolation provided by the
daemon. Such problems are thus hard to detect, and broken packages
could be anywhere. This is mostly a hypothetical issue, but opam (for
ocaml) warns about build scripts doing unpredictable things:

https://opam.ocaml.org/doc/FAQ.html#Why-does-opam-require-bwrap

Aside from that, guix is painfully slow in a container, and uses a lot
of disk space.

Vivien

bug#63331: Guile-GnuTLS/Git circular dependency

2023-05-06 Thread Vivien Kraus via Bug reports for GNU Guix

Hi!

Le samedi 06 mai 2023 à 19:20 +0200, Ludovic Courtès a écrit :
> We need to solve that.  For now, the only fix I can think of is
> having
> ‘guile-gnutls’ built from a “make dist”-provided tarballs. 
> Apparently
> we can add assets at ; would
> you
> like to upload a tarball and accompanying signature, Simon?

If the problem is with git-download, couldn’t we just use a "git-
archive"-provided tarball, and keep the bootstrapping process? Or are
there further dependencies with the autotools that require a dist-
provided tarball?

Vivien

bug#63077: [PATCH] gnu: gnutls: skip examples on mingw.

2023-04-25 Thread Vivien Kraus via Bug reports for GNU Guix

* gnu/packages/tls.scm (gnutls): Skip the doc/examples subdir on mingw,
because the gnulib modules are not correct.
---
 gnu/packages/tls.scm | 9 +
 1 file changed, 9 insertions(+)

diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm
index 6d7cff41b0..9e16b04702 100644
--- a/gnu/packages/tls.scm
+++ b/gnu/packages/tls.scm
@@ -253,6 +253,15 @@ (define-public gnutls
(substitute* "tests/fastopen.sh"
  (("^unset RETCODE")
   "exit 77\n"   ;skip
+   #$@(if (target-mingw?)
+  #~((add-after 'unpack 'skip-doc-examples
+   ;; The examples in doc do not link to correct
+   ;; gnulib modules.
+   (lambda _
+ (substitute* "doc/Makefile.in"
+   (("SUBDIRS = examples")
+"SUBDIRS =")
+  #~())
#$@(if (target-ppc32?)
   ;; https://gitlab.com/gnutls/gnutls/-/issues/1354
   ;; Extend the test timeout from the default of 20 * 1000

base-commit: e287a0e402ee15eefa80c2804e487025507fe3b1
-- 
2.39.2

bug#63076: This is for core-updates

2023-04-25 Thread Vivien Kraus via Bug reports for GNU Guix

Hello,

This patch should go to core-updates, but I can’t find the branch.

Best regards,

Vivien

bug#63076: [PATCH] gnu: libunistring: Update to 1.1.

2023-04-25 Thread Vivien Kraus via Bug reports for GNU Guix

* gnu/packages/libunistring.scm (libunistring): Update to 1.1.
---
 gnu/packages/libunistring.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/libunistring.scm b/gnu/packages/libunistring.scm
index eccd053a35..f0b071f11c 100644
--- a/gnu/packages/libunistring.scm
+++ b/gnu/packages/libunistring.scm
@@ -35,7 +35,7 @@ (define-module (gnu packages libunistring)
 (define-public libunistring
   (package
(name "libunistring")
-   (version "1.0")
+   (version "1.1")
(source (origin
 (method url-fetch)
 (uri (string-append
@@ -43,7 +43,7 @@ (define-public libunistring
   version ".tar.xz"))
 (sha256
  (base32
-  "0h97qx3c4970wvh25g51sjgz54xn37lrfy95dg97xmvmkys5basv"
+  "164vfbh3sf0qjcimjbnz4icqr9cai30dli8p2y5p6z3frfwiwz42"
(propagated-inputs (libiconv-if-needed))
(outputs '("out" "static"))
(build-system gnu-build-system)

base-commit: 74038cf66e3a8cdcd9d97a81d9176c3cdefdaaf7
-- 
2.39.2

bug#62181: [PATCH v2 1/2] gnu: gnulib: Reset the shebangs.

2023-03-18 Thread Vivien Kraus via Bug reports for GNU Guix

Hi!

Le vendredi 17 mars 2023 à 22:48 +0100, Ludovic Courtès a écrit :
> > * gnu/packages/tls.scm (guile-gnutls) [phase patch-more-shebangs]:
> > Fix how
> > autogen.sh invokes gnulib-tool, and how configure.ac invokes git-
> > version-gen,
> > so as not to rely on shebangs.
> 
> [...]
> 
> > +  (substitute* "autogen.sh"
> > +    (("\\$gnulib_tool \\$gnulib_tool_options")
> > + "sh $gnulib_tool $gnulib_tool_options"))
> 
> … this is still needed: GNULIB/bin/gnulib-tool, which has a correct
> shebang, is *not* used, and instead GNULIB/src/gnulib/gnulib-tool is
> used.
> 
> Should we remove GNULIB/bin/gnulib-tool?  Or should we remove the
> other
> one?

If we could have different outputs, one for bin/gnulib-tool and one for
the gnulib source, then it would be better: the default output would
retain no references, and the :bin output would only need a bash-
minimal to run gnulib-tool. So packages that call gnulib-tool directly
would add both outputs as native-inputs, and packages that use
bootstrap.conf would only need the default output.

Would that help solve the problem introduced by the bash-minimal
reference?

Anyway, I’m not sure the copy-build-system allows for different
outputs.

What do you think?

Vivien

bug#62181: [PATCH v2 1/2] gnu: gnulib: Reset the shebangs.

2023-03-16 Thread Vivien Kraus via Bug reports for GNU Guix

* gnu/packages/build-tools.scm (gnulib) [phase reset-shebangs]: After
installation, rewrite the /gnu/store shebangs in the distributed build-aux
files.
[inputs, native-inputs]: Add bash-minimal.
[phase let-autogen-execute-gnulib-tool]: Specify a shell to execute
gnulib-tool from autogen.sh.
---
 gnu/packages/build-tools.scm | 21 +
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/build-tools.scm b/gnu/packages/build-tools.scm
index 28ab77bbb4..caf0f3fc1c 100644
--- a/gnu/packages/build-tools.scm
+++ b/gnu/packages/build-tools.scm
@@ -973,12 +973,25 @@ (define (find-ucd-files . names)
("NormalizationTest.txt" . "uninorm")
("auxiliary/GraphemeBreakTest.txt" . "unigbrk")
("auxiliary/WordBreakTest.txt" . "uniwbrk")))
-(delete-file "gen-uni-tables")))
-(inputs ;; Shebangs for some auxiliary build files.
- (list python perl clisp))
+(delete-file "gen-uni-tables"
+  (add-after 'install 'restore-shebangs
+(lambda _
+  (substitute* (find-files
+(string-append #$output "/src/gnulib")
+(lambda (fname stat)
+  (and (not (string-suffix? 
"/lib/javaversion.class" fname))
+   (not (string-suffix? ".mo" fname)
+(("^#! ?(.*)/bin/sh" _ prefix)
+ "#!/bin/sh")
+(("^#! ?(.*)/bin/python3" _ prefix)
+ "#!/usr/bin/env python3")
+(("^#! ?(.*)/bin/([a-zA-Z0-9-]+)" _ prefix program)
+ (string-append "#!/usr/bin/" program
+(inputs ;; Shebang for gnulib-tool
+ (list bash-minimal))
 (native-inputs
  (list
-  python perl clisp
+  bash-minimal python perl clisp
   ;; Unicode data:
   ucd-next
   ;; Programs for the tests:
-- 
2.39.2

bug#62181: [PATCH v2 0/2] Drop references to other store items in /src, with better style

2023-03-16 Thread Vivien Kraus via Bug reports for GNU Guix

So I applied Ludoâs proposed style improvement with a few more tweaks to
respect the gnulib-intended shebangs, and making sure that substitute* failure
on /lib/javaversion.class and the .mo test data can be recovered.

This v2 is still not a silver bullet, because gnulib users need to patch a few
files before bootstrap.

Vivien Kraus (2):
  gnu: gnulib: Reset the shebangs.
  gnu: guile-gnutls: Do not expect gnulib shebangs to work.

 gnu/packages/build-tools.scm | 21 +
 gnu/packages/tls.scm |  6 ++
 2 files changed, 23 insertions(+), 4 deletions(-)


base-commit: 1820dc7ce6945569db4ef6e265764705e6aabc48
-- 
2.39.2

bug#62181: [PATCH v2 2/2] gnu: guile-gnutls: Do not expect gnulib shebangs to work.

2023-03-16 Thread Vivien Kraus via Bug reports for GNU Guix

* gnu/packages/tls.scm (guile-gnutls) [phase patch-more-shebangs]: Fix how
autogen.sh invokes gnulib-tool, and how configure.ac invokes git-version-gen,
so as not to rely on shebangs.
---
 gnu/packages/tls.scm | 6 ++
 1 file changed, 6 insertions(+)

diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm
index 81d90c86ae..5a44fa89dc 100644
--- a/gnu/packages/tls.scm
+++ b/gnu/packages/tls.scm
@@ -417,6 +417,12 @@ (define-public guile-gnutls
   #~(modify-phases %standard-phases
   (add-after 'unpack 'patch-more-shebangs
 (lambda _
+  (substitute* "autogen.sh"
+(("\\$gnulib_tool \\$gnulib_tool_options")
+ "sh $gnulib_tool $gnulib_tool_options"))
+  (substitute* "configure.ac"
+(("build-aux/git-version-gen")
+ "sh build-aux/git-version-gen"))
   (for-each patch-shebang
 '("autopull.sh" "autogen.sh"
   (replace 'bootstrap
-- 
2.39.2

bug#62181: [PATCH 2/2] gnu: guile-gnutls: Do not expect gnulib shebangs to work.

2023-03-16 Thread Vivien Kraus via Bug reports for GNU Guix

Le jeudi 16 mars 2023 à 11:48 +0100, Ludovic Courtès a écrit :
> > +  (substitute* "configure.ac"
> > +    (("build-aux/git-version-gen")
> > + "sh build-aux/git-version-gen"))
> >    (for-each patch-shebang
> >  '("autopull.sh" "autogen.sh"
> 
> Maybe you can instead add ‘build-aux/git-version-gen’ to the ‘for-
> each’
> list above?

Unfortunately, no, because it is imported from gnulib (so it does not
exist before this early patch shebang phase) and *immediately* invoked
by the same bootstrap script, so I have no time window when I can fix
it.

Vivien

bug#62181: [PATCH 0/2] Re: bug#62181: Gnulib package keeps references to clisp, Python, Perl, and Bash

2023-03-16 Thread Vivien Kraus via Bug reports for GNU Guix

Le jeudi 16 mars 2023 à 11:41 +0100, Ludovic Courtès a écrit :
> Apart from ‘gnulib-tool’, every script is first
> copied into the source tree, and that happens before the
> ‘patch-source-shebangs’ phase no?

Precisely, so if they are executed during the bootstrap phase, we can’t
rely on their shebangs being correct yet. It depends on individual
packages which build-aux scripts are actually called (although I’m
pretty sure noone will call the clisp thing). However, top/bootstrap-
funclib.sh is intended to be included in the top-level directory of the
package, to be invoked at bootstrap time, and at least this script
calls gnulib-tool (the one in /src, so the unpatched copy) incorrectly.

Vivien

bug#62181: [PATCH 2/2] gnu: guile-gnutls: Do not expect gnulib shebangs to work.

2023-03-14 Thread Vivien Kraus via Bug reports for GNU Guix

* gnu/packages/tls.scm (guile-gnutls) [phase patch-more-shebangs]: Fix how
autogen.sh invokes gnulib-tool, and how configure.ac invokes git-version-gen,
so as not to rely on shebangs.
---
 gnu/packages/tls.scm | 6 ++
 1 file changed, 6 insertions(+)

diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm
index 81d90c86ae..5a44fa89dc 100644
--- a/gnu/packages/tls.scm
+++ b/gnu/packages/tls.scm
@@ -417,6 +417,12 @@ (define-public guile-gnutls
   #~(modify-phases %standard-phases
   (add-after 'unpack 'patch-more-shebangs
 (lambda _
+  (substitute* "autogen.sh"
+(("\\$gnulib_tool \\$gnulib_tool_options")
+ "sh $gnulib_tool $gnulib_tool_options"))
+  (substitute* "configure.ac"
+(("build-aux/git-version-gen")
+ "sh build-aux/git-version-gen"))
   (for-each patch-shebang
 '("autopull.sh" "autogen.sh"
   (replace 'bootstrap
-- 
2.39.2

bug#62181: [PATCH 1/2] gnu: gnulib: Reset the shebangs.

2023-03-14 Thread Vivien Kraus via Bug reports for GNU Guix

* gnu/packages/build-tools.scm (gnulib) [phase reset-shebangs]: After
installation, rewrite the /gnu/store shebangs in the distributed build-aux
files.
[inputs, native-inputs]: Add bash-minimal.
[phase let-autogen-execute-gnulib-tool]: Specify a shell to execute
gnulib-tool from autogen.sh.
---
 gnu/packages/build-tools.scm | 28 
 1 file changed, 24 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/build-tools.scm b/gnu/packages/build-tools.scm
index 28ab77bbb4..f93a72f2f5 100644
--- a/gnu/packages/build-tools.scm
+++ b/gnu/packages/build-tools.scm
@@ -973,12 +973,32 @@ (define (find-ucd-files . names)
("NormalizationTest.txt" . "uninorm")
("auxiliary/GraphemeBreakTest.txt" . "unigbrk")
("auxiliary/WordBreakTest.txt" . "uniwbrk")))
-(delete-file "gen-uni-tables")))
-(inputs ;; Shebangs for some auxiliary build files.
- (list python perl clisp))
+(delete-file "gen-uni-tables"
+  (add-after 'install 'reset-shebangs
+(lambda _
+  (for-each
+   (lambda (file)
+ (false-if-exception
+  ;; Might fail on binary files, this is not a problem.
+  (substitute* file
+((#$(file-append (this-package-native-input "bash-minimal")
+ "/bin/sh"))
+ "/bin/sh")
+((#$(file-append (this-package-native-input "python")
+ "/bin/python3"))
+ "/usr/bin/env python3")
+((#$(file-append (this-package-native-input "perl")
+ "/bin/perl"))
+ "/usr/bin/perl")
+((#$(file-append (this-package-native-input "clisp")
+ "/bin/clisp"))
+ "/usr/bin/clisp"
+   (find-files (string-append #$output "/src/gnulib"
+(inputs ;; Shebang for gnulib-tool
+ (list bash-minimal))
 (native-inputs
  (list
-  python perl clisp
+  bash-minimal python perl clisp
   ;; Unicode data:
   ucd-next
   ;; Programs for the tests:
-- 
2.39.2

bug#62181: [PATCH 0/2] Re: bug#62181: Gnulib package keeps references to clisp, Python, Perl, and Bash

2023-03-14 Thread Vivien Kraus via Bug reports for GNU Guix

Hi!

Le mardi 14 mars 2023 Ã  09:34 +0100, Ludovic CourtÃ¨s a Ã©crit :
> The Gnulib package, which is meant to be source, retains references
> to
> several packages:
> 
> --8<---cut here---start->8---
> $ guix describe
> Generation 250  Mar 12 2023 23:58:03(current)
>   guix 1ed227d
> repository URL: https://git.savannah.gnu.org/git/guix.git
> branch: master
> commit: 1ed227d7952af48efe50a2f6c9537e17c356daa1
> $ guix gc --references $(guix build gnulib)
> /gnu/store/4y5m9lb8k3qkb1y9m02sw9w9a6hacd16-bash-minimal-5.1.8
> /gnu/store/76p04alhjimlv4cgijl670byf2m50qh8-clisp-2.49-92
> /gnu/store/bvnzi0z7i9qk31a03y64rs8sxrckkinr-python-3.9.9
> /gnu/store/hy6abswwv4d89zp464fw52z65fkzr7h5-perl-5.34.0
> --8<---cut here---end--->8---
> 
> We should probably fix that and add #:allowed-references '().

These were shebangs in the build auxiliary scripts. Itâs a tough problem,
because if I undo all the patch shebangs after installation, then gnulib is
not usable in the gnu-build-system bootstrap phase without a few more
tweaks. Thatâs not really a problem, because we can fix all our gnulib users
(guile-gnutls), but we should expect issues if gnulib bootstrap scripts call
themselves without an explicit interpreter.

In any case, #:allowed-reference is a gnu-build-system thing, so we canât use 
that for gnulib.

Vivien

Vivien Kraus (2):
  gnu: gnulib: Reset the shebangs.
  gnu: guile-gnutls: Do not expect gnulib shebangs to work.

 gnu/packages/build-tools.scm | 28 
 gnu/packages/tls.scm |  6 ++
 2 files changed, 30 insertions(+), 4 deletions(-)


base-commit: 302680dbce784a53bfddb4ce5e6a9505cd0c477a
-- 
2.39.2

bug#60811: Can’t change the build system of p11-kit to meson

2023-01-14 Thread Vivien Kraus via Bug reports for GNU Guix

Hello!

Le samedi 14 janvier 2023 à 21:10 +0100, Csepp a écrit :
> The way I debugged a cycle was:
> * use package graph type
> * import graph into Python's networkx using pydot
> * run networkx's cycle detection

If I select the "package" graph type, guix graph completes:

$ ./pre-inst-env guix graph --type=package p11-kit
digraph "Guix package" {
  "14023452720" [label = "p11-kit@0.23.22", shape = box, fontname =
sans];
  "14023452720" -> "14023453072" [color = magenta];
  "14023452720" -> "140300286436736" [color = magenta];
  "14023452720" -> "140299980957936" [color = magenta];
  "14023452720" -> "14023453072" [color = magenta];
  "14023453072" [label = "libtasn1@4.17.0", shape = box, fontname =
sans];
  "14023453072" -> "140299983720224" [color = blue];
  "140299983720224" [label = "perl@5.34.0", shape = box, fontname =
sans];
  "140299983720224" -> "140299983567616" [color = red];
  "140299983567616" [label = "coreutils-minimal@8.32", shape = box,
fontname = sans];
  "140300286436736" [label = "pkg-config@0.29.2", shape = box, fontname
= sans];
  "140299980957936" [label = "libffi@3.3", shape = box, fontname =
sans];

}

Thank you for your python script! Unfortunately, it does not detect any
cycles here.

Vivien

bug#60811: Can’t change the build system of p11-kit to meson

2023-01-14 Thread Vivien Kraus via Bug reports for GNU Guix

Dear guix,

p11-kit is switching its build system to meson. The README already
advertises it as the way to build p11-kit. When I try to change that,
guix builds fine. Then, if I try to run guix build p11-kit, guix will
crash after exhausting all my memory. I suspect a circular dependency
of some sort, but I don’t know how to debug it.

If I try and run:
$ ./pre-inst-env guix graph --type=bag p11-kit

Then I get as an output,

digraph "Guix bag" {

And then guix starts eating my memory indefinitely until I cancel it.

How can I debug this?

Best regards,

Vivien

bug#52667: System reconfiguration fails to build linux-modules.drv

2021-12-19 Thread Vivien Kraus via Bug reports for GNU Guix


Dear guix,

On master, I can’t reconfigure my system, because the linux-modules.drv
fails with the following error:

Backtrace:
  17 (primitive-load "/gnu/store/bvjcb7jbwlky0czin8p66949mil?")
In ice-9/eval.scm:
619:8 16 (_ #f)
   626:19 15 (_ #)
   293:34 14 (_ #(# #))
In srfi/srfi-1.scm:
   586:29 13 (map1 _)
   586:29 12 (map1 _)
   586:29 11 (map1 _)
   586:29 10 (map1 _)
   586:29  9 (map1 _)
   586:29  8 (map1 _)
   586:29  7 (map1 _)
   586:29  6 (map1 _)
   586:29  5 (map1 _)
   586:29  4 (map1 _)
   586:29  3 (map1 _)
   586:29  2 (map1 _)
   586:17  1 (map1 ("simplefb" "pata_acpi" "pata_atiixp" "isci" "?" ?))
In gnu/build/linux-modules.scm:
257:5  0 (_)

gnu/build/linux-modules.scm:257:5: kernel module not found "simplefb" 
"/gnu/store/1ai7mxw5ad58ic9slxsjzsxaryi5wksp-linux-libre-5.10.87/lib/modules"


The top of the backtrace is this file,
/gnu/store/bvjcb7jbwlky0czin8p66949milhvrql-linux-modules-builder:

(begin (use-modules (gnu build linux-modules) (guix build utils) (srfi
srfi-1) (srfi srfi-26)) (define module-dir (string-append
"/gnu/store/1ai7mxw5ad58ic9slxsjzsxaryi5wksp-linux-libre-5.10.87"
"/lib/modules")) (define modules (let* ((lookup (cut find-module-file
module-dir <>)) (modules (map lookup (quote ("ahci" "usb-storage" "uas"
"usbhid" "hid-generic" "hid-apple" "dm-crypt" "xts" "serpent_generic"
"wp512" "nls_iso8859-1" "framebuffer_coreboot" "simplefb" "pata_acpi"
"pata_atiixp" "isci" "virtio_pci" "virtio_balloon" "virtio_blk"
"virtio_net" "virtio_console" "virtio-rng") (append modules
(recursive-module-dependencies modules #:lookup-module lookup
(define (maybe-uncompress file) (cond ((string-contains file ".ko.gz")
(invoke
"/gnu/store/9q9z91mvc1r3h8zmi135msv3j1dgv2js-gzip-1.10/bin/gunzip"
file (mkdir ((@ (guile) getenv) "out")) (for-each (lambda (module)
(let ((out-module (string-append ((@ (guile) getenv) "out") "/"
(basename module (format #t "copying '~a'...~%" module) (copy-file
module out-module) (maybe-uncompress out-module))) (delete-duplicates
modules)) (write-module-name-database ((@ (guile) getenv) "out")))

This is the linux-related part of my system configuration:

(operating-system
  (kernel linux-libre-lts)
  (kernel-arguments
   `(,@%default-kernel-arguments
 "modprobe.blacklist=amdgpu,radeon"))
  …)

Best regards,

Vivien


signature.asc
Description: PGP signature

bug#52375: Both pages load fine for me

2021-12-13 Thread Vivien Kraus via Bug reports for GNU Guix

Dear guix,

As a guix home user on a GNOME guix system, both pages work in epiphany
(private mode) for me.

My graphics card is reported as "llvmpipe (LLVM 11.0.0, 256 bits)" by
GNOME.

Vivien


signature.asc
Description: This is a digitally signed message part

bug#51916: Can’t reconfigure with GNOME on core-updates-frozen

2021-11-17 Thread Vivien Kraus via Bug reports for GNU Guix


Dear guix,

There has been some discussion on IRC about this, but it lacks a formal
guix issue.

When using the gnome-service-type on core-updates-frozen, I can’t
reconfigure my system, because of the following error message:

guix system: error: profile contains conflicting entries for at-spi2-core
guix system: error:   first entry: at-spi2-core@2.40.0 
/gnu/store/6p5vr2dbvrcg5yd7frjhkbm1q5mapcs0-at-spi2-core-2.40.0
guix system: error:... propagated from at-spi2-atk@2.38.0
guix system: error:... propagated from gtk+@3.24.30
guix system: error:... propagated from network-manager-applet@1.22.0
guix system: error:   second entry: at-spi2-core@2.40.0 
/gnu/store/cczaicsl51krzxqfqll1dn451ngcai4h-at-spi2-core-2.40.0
guix system: error:... propagated from gnome@40.5
hint: Try upgrading both `network-manager-applet' and `gnome', or remove one of 
them from the profile.

Best regards,

Vivien


signature.asc
Description: PGP signature

bug#51869: [PATCH] Add emacs-vala-mode

2021-11-16 Thread Vivien Kraus via Bug reports for GNU Guix


Liliana Marie Prikler  writes:
> Please avoid pulling home-page up, it's not meant to be used as
> git-reference url.
OK.

>> +   (emacs-substitute-sexps "vala-mode.el"
>> + (";; Support multiline strings" 'disabled.)
>> + ("(defcustom vala-multiline-strings nil"
>> +  "This variable is ignored.")))
> This inserts mostly bogus into the file rather than killing the sexps
> as it should.  

The first substitution fully kills the whole sexp (and inserts a comment
that reads "Support for multiline strings disabled." if you don’t read
too closely ^^). It’s true that the second does not kill the defcustom
expansion, but since it’s part of the intended public API, I’m not so
sure we should remove it altogether. I think it’s clearer for the user
that way, because the two modifications are kind of documented in the
source.

Also, it’s shorter.

Anyway, Here are the two versions, you decide.

Vivien

From c0726be413991eab7b16ca0bebf42cc8eab616e1 Mon Sep 17 00:00:00 2001
From: Vivien Kraus 
Date: Mon, 15 Nov 2021 13:57:18 +
Subject: [PATCH] gnu: Add emacs-vala-mode.

* gnu/packages/emacs-xyz (emacs-vala-mode): New variable.
---
 gnu/packages/emacs-xyz.scm | 37 +
 1 file changed, 37 insertions(+)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 113471ae14..61d780c72b 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -29993,3 +29993,40 @@ (define-public emacs-global-tags
 wraps GNU Global calls and integration to editor using this API with
 project.el and xref.el.")
   (license license:gpl3+
+
+(define-public emacs-vala-mode
+  ;; Upstream has no tagged release.
+  (let ((commit "d696a8177e94c81ea557ad364a3b3dcc3abbc50f")
+(revision "0"))
+(package
+  (name "emacs-vala-mode")
+  (version (git-version "0.1" revision commit))
+  (source
+   (origin
+ (method git-fetch)
+ (uri (git-reference
+   (url "https://github.com/rrthomas/vala-mode";)
+   (commit commit)))
+ (sha256
+  (base32 "0g5pdq757z9d8rk489n5ilhqipdc4i4sfkjwwrxyvgjlapjc04c0"
+  (build-system emacs-build-system)
+  (arguments
+   '(#:phases
+ (modify-phases %standard-phases
+   (add-after 'unpack 'disable-multiline-support
+ (lambda* (#:key inputs #:allow-other-keys)
+   (make-file-writable "vala-mode.el")
+   (emacs-substitute-sexps "vala-mode.el"
+ (";; Support multiline strings" 'disabled.)
+ ("(defcustom vala-multiline-strings nil"
+  "This variable is ignored.")))
+  (home-page "https://github.com/rrthomas/vala-mode";)
+  (synopsis "Vala mode for Emacs")
+  (description
+   "This package provides a major mode for editing .vala and .vapi files
+in Emacs.  See @url{http://live.gnome.org/Vala} for details about Vala
+language.
+
+This mode was based on Dylan Moonfire's @samp{csharp-mode}.
+")
+  (license license:gpl2+
-- 
2.33.1

From f1d594081881e42a273dfd0d857f0af41615270d Mon Sep 17 00:00:00 2001
From: Vivien Kraus 
Date: Mon, 15 Nov 2021 13:57:18 +
Subject: [PATCH] gnu: Add emacs-vala-mode.

* gnu/packages/emacs-xyz (emacs-vala-mode): New variable.
---
 gnu/packages/emacs-xyz.scm | 43 ++
 1 file changed, 43 insertions(+)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 113471ae14..9be6a306e1 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -29993,3 +29993,46 @@ (define-public emacs-global-tags
 wraps GNU Global calls and integration to editor using this API with
 project.el and xref.el.")
   (license license:gpl3+
+
+(define-public emacs-vala-mode
+  ;; Upstream has no tagged release.
+  (let ((commit "d696a8177e94c81ea557ad364a3b3dcc3abbc50f")
+(revision "0"))
+(package
+  (name "emacs-vala-mode")
+  (version (git-version "0.1" revision commit))
+  (source
+   (origin
+ (method git-fetch)
+ (uri (git-reference
+   (url "https://github.com/rrthomas/vala-mode";)
+   (commit commit)))
+ (sha256
+  (base32 "0g5pdq757z9d8rk489n5ilhqipdc4i4sfkjwwrxyvgjlapjc04c0"
+  (build-system emacs-build-system)
+  (arguments
+   '(#:phases
+ (modify-phases %standard-phases
+   (add-after 'unpack 'disable-multiline-support
+ (lambda* (#:key inputs #:allow-other-keys)
+   (make-file-writable "

bug#51869: [PATCH] Add emacs-vala-mode

2021-11-16 Thread Vivien Kraus via Bug reports for GNU Guix


Liliana Marie Prikler  writes:
> I'd use our emacs sexp substitution tools to erase these defconsts and
> defcustoms rather than a patch.  Other than that LGTM.

I didn’t know about this great macro! Here is an updated version.

Vivien

From 759b0437e5016e7c558a5a99e2831f419a3b0802 Mon Sep 17 00:00:00 2001
From: Vivien Kraus 
Date: Mon, 15 Nov 2021 13:57:18 +
Subject: [PATCH] gnu: Add emacs-vala-mode.

* gnu/packages/emacs-xyz (emacs-vala-mode): New variable.
---
 gnu/packages/emacs-xyz.scm | 37 +
 1 file changed, 37 insertions(+)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 113471ae14..dadfa67ccf 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -29993,3 +29993,40 @@ (define-public emacs-global-tags
 wraps GNU Global calls and integration to editor using this API with
 project.el and xref.el.")
   (license license:gpl3+
+
+(define-public emacs-vala-mode
+  ;; Upstream has no tagged release.
+  (let ((commit "d696a8177e94c81ea557ad364a3b3dcc3abbc50f")
+(revision "0"))
+(package
+  (name "emacs-vala-mode")
+  (version (git-version "0.1" revision commit))
+  (home-page "https://github.com/rrthomas/vala-mode";)
+  (source
+   (origin
+ (method git-fetch)
+ (uri (git-reference
+   (url home-page)
+   (commit commit)))
+ (sha256
+  (base32 "0g5pdq757z9d8rk489n5ilhqipdc4i4sfkjwwrxyvgjlapjc04c0"
+  (build-system emacs-build-system)
+  (arguments
+   '(#:phases
+ (modify-phases %standard-phases
+   (add-after 'unpack 'disable-multiline-support
+ (lambda* (#:key inputs #:allow-other-keys)
+   (make-file-writable "vala-mode.el")
+   (emacs-substitute-sexps "vala-mode.el"
+ (";; Support multiline strings" 'disabled.)
+ ("(defcustom vala-multiline-strings nil"
+  "This variable is ignored.")))
+  (synopsis "Vala mode for Emacs")
+  (description
+   "This package provides a major mode for editing .vala and .vapi files
+in Emacs.  See @url{http://live.gnome.org/Vala} for details about Vala
+language.
+
+This mode was based on Dylan Moonfire's @samp{csharp-mode}.
+")
+  (license license:gpl2+
-- 
2.33.1



signature.asc
Description: PGP signature

bug#51879: [PATCH] On core-updates-frozen, deja-dup does not build

2021-11-15 Thread Vivien Kraus via Bug reports for GNU Guix


Hi guix,

deja-dup requires libsoup2 on core-updates-frozen.

Best regards,

Vivien

From c7900fe9eb83f7080008c094d095b9132c198180 Mon Sep 17 00:00:00 2001
From: Vivien Kraus 
Date: Mon, 15 Nov 2021 21:23:36 +
Subject: [PATCH] gnu: deja-dup: Use libsoup 2.

* gnu/packages/gnome.scm (deja-dup) [inputs]: Use libsoup 2.
---
 gnu/packages/gnome.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index fc84e5af1a..39ab43c90c 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -1859,7 +1859,7 @@ (define-public deja-dup
("libgpg-error" ,libgpg-error)
("libnotify" ,libnotify)
("libsecret" ,libsecret)
-   ("libsoup" ,libsoup)
+   ("libsoup" ,libsoup-minimal-2)
("libhandy" ,libhandy)
("packagekit" ,packagekit)
("python" ,python)
-- 
2.33.1



signature.asc
Description: PGP signature

bug#51869: [PATCH] Add emacs-vala-mode

2021-11-15 Thread Vivien Kraus via Bug reports for GNU Guix

Hi!

Liliana Marie Prikler  writes:
>> Since I don’t have a solution to fix this issue, I went away and
>> reverted the multiline support. It builds and is useful enough for
>> LSP to kick in, so I consider it fixed.
>> 
>> What do you think? Do you have a better fix?
> Given my superior knowledge of Emacs Lisp (just kidding), I'd guess the
> order of declarations is wrong.  Pull the defcustom before the other
> thing and it ought to work.
Unfortunately, it does not. I tried it, but it gives the same error
message. I’m a bit surprised, but reading the help entry for
c-lang-defconst, I see there is a lot of information about when things
are evaluated, so maybe someone smart can parse it and understand why we
can’t use the custom variable value.

>> +   (version "20201218.2109")
>> +   (source
>> +(origin
>> +  (method git-fetch)
>> +  (uri (git-reference
>> +(url "https://github.com/rrthomas/vala-mode.git";)
>> +(commit "d696a8177e94c81ea557ad364a3b3dcc3abbc50f")))
> Use the (let ((revision ...) (commit ...)) (package ...)) convention,
> adding a note that upstream has no tagged release.  Base version
> appears to be "0.1"
I didn’t know that convention, so here is the updated patch, still
waiting for a convincing fix for the multiline strings issue.

Vivien

From 2912a84d86372cac6944f7661a028b108484c556 Mon Sep 17 00:00:00 2001
From: Vivien Kraus 
Date: Mon, 15 Nov 2021 13:57:18 +
Subject: [PATCH] gnu: Add emacs-vala-mode.

* gnu/packages/emacs-xyz (emacs-vala-mode): New variable.
* gnu/packages/patches/vala-mode-fix.patch: Add a vala-mode patch to disable
multiline string support.
* gnu/local.mk (dist_patch_DATA): Register the patch to disable multiline
string support.
---
 gnu/local.mk  |  1 +
 gnu/packages/emacs-xyz.scm| 29 +++
 .../patches/emacs-vala-mode-fix.patch | 48 +++
 3 files changed, 78 insertions(+)
 create mode 100644 gnu/packages/patches/emacs-vala-mode-fix.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index 5b21a6ee1b..4a73e7cee1 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1033,6 +1033,7 @@ dist_patch_DATA =		\
   %D%/packages/patches/emacs-source-date-epoch.patch		\
   %D%/packages/patches/emacs-telega-path-placeholder.patch	\
   %D%/packages/patches/emacs-telega-test-env.patch		\
+  %D%/packages/patches/emacs-vala-mode-fix.patch		\
   %D%/packages/patches/emacs-wordnut-require-adaptive-wrap.patch	\
   %D%/packages/patches/enjarify-setup-py.patch			\
   %D%/packages/patches/enlightenment-fix-setuid-path.patch	\
diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index ec0376442b..ff42b4d4d6 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -29989,3 +29989,32 @@ (define-public emacs-global-tags
 wraps GNU Global calls and integration to editor using this API with
 project.el and xref.el.")
   (license license:gpl3+
+
+(define-public emacs-vala-mode
+  ;; Upstream has no tagged release.
+  (let ((commit "d696a8177e94c81ea557ad364a3b3dcc3abbc50f")
+(revision "0"))
+(package
+  (name "emacs-vala-mode")
+  (version (git-version "0.1" revision commit))
+  (home-page "https://github.com/rrthomas/vala-mode";)
+  (source
+   (origin
+ (method git-fetch)
+ (uri (git-reference
+   (url home-page)
+   (commit commit)))
+ (sha256
+  (base32 "0g5pdq757z9d8rk489n5ilhqipdc4i4sfkjwwrxyvgjlapjc04c0"))
+ (patches
+  (search-patches "emacs-vala-mode-fix.patch"
+  (build-system emacs-build-system)
+  (synopsis "Vala mode for Emacs")
+  (description
+   "This package provides a major mode for editing .vala and .vapi files
+in Emacs.  See @url{http://live.gnome.org/Vala} for details about Vala
+language.
+
+This mode was based on Dylan Moonfire's @samp{csharp-mode}.
+")
+  (license license:gpl2+
diff --git a/gnu/packages/patches/emacs-vala-mode-fix.patch b/gnu/packages/patches/emacs-vala-mode-fix.patch
new file mode 100644
index 00..0a50b0e362
--- /dev/null
+++ b/gnu/packages/patches/emacs-vala-mode-fix.patch
@@ -0,0 +1,48 @@
+From 68db3ae7410a7d89e606e1916240193b96ab335e Mon Sep 17 00:00:00 2001
+From: Vivien 
+Date: Mon, 15 Nov 2021 13:55:58 +
+Subject: [PATCH] Revert "vala-mode: support multiline strings"
+
+This reverts commit 671c287ba9cb81dcf6e9485e6ccc60bc2b7aba14.
+---
+ vala-mode.el | 17 -
+ 1 file changed, 17 deletions(-)
+
+diff --git a/vala-mode.el b/vala-mode.el
+index 8c4da4c..22c6e49 100644
+--- a/vala-mode.el
 b/vala-mode.el
+@@ -259,14 +259,6 @@ casts and declarations are fontified.  Used on level 2 and higher

bug#51873: [PATCH] Fix gnome-calendar on core-updates-frozen

2021-11-15 Thread Vivien Kraus via Bug reports for GNU Guix


Dear guix,

gnome-calendar also requires meson 0.59 in core-updates-frozen.

Best regards,

Vivien

From a2e4e6ac1d924fc8b95c0ac265f31eca0dbb58e1 Mon Sep 17 00:00:00 2001
From: Vivien Kraus 
Date: Mon, 15 Nov 2021 15:59:05 +
Subject: [PATCH] gnu: gnome-calendar: Fix build.

* gnu/packages/gnome.scm (gnome-calendar) [arguments]: Use meson 0.59.
---
 gnu/packages/gnome.scm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 2a60cc6afc..fc84e5af1a 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -9734,7 +9734,8 @@ (define-public gnome-calendar
 "0czasxnmbw2zm21lmxam8qixacagciq3f815s809hn0f9byh2dwy"
 (build-system meson-build-system)
 (arguments
- '(#:glib-or-gtk? #t
+ `(#:glib-or-gtk? #t
+   #:meson ,meson-0.59
;; gnome-calendar has to be installed before the tests can be run
;; https://bugzilla.gnome.org/show_bug.cgi?id=788224
#:tests? #f
-- 
2.33.1



signature.asc
Description: PGP signature

bug#51487: The openssh service does not allow multiple authorized key files per user

2021-11-15 Thread Vivien Kraus via Bug reports for GNU Guix


Ludovic Courtès  writes:
> I find it a bit hard to read.  What I had in mind is along these lines:
>
>   (match (openssh-authorized-keys config)
> (((users _ ...) ...)
>  ;; Build a user/key-list mapping.
>  (let ((user-keys (fold (lambda (spec table)
>   (match spec
> ((user keys ...)
>  (vhash-cons user keys table
> vlist-null
> (openssh-authorized-keys config
>;; Coalesce the key lists associated with each user.
>(map (lambda (user)
>   (concatenate (vhash-fold* cons '() user user-keys)))
> users

That’s way cleaner. I didn’t know of vhash-fold*, it seems to save the
day!

(just fixing the final map function not to forget the user name in the
alist, and removing "spec")

From 7bc8abcfd5024f5269c36dc8cb44803eb0ab29ba Mon Sep 17 00:00:00 2001
From: Vivien Kraus 
Date: Fri, 29 Oct 2021 18:25:24 +0200
Subject: [PATCH] gnu: openssh-service: Collect all keys for all users.

* gnu/services/ssh.scm (extend-openssh-authorized-keys): ensure that no key is forgotten.
---
 gnu/services/ssh.scm | 15 ++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/gnu/services/ssh.scm b/gnu/services/ssh.scm
index a018052eeb..92b470aa96 100644
--- a/gnu/services/ssh.scm
+++ b/gnu/services/ssh.scm
@@ -39,6 +39,7 @@ (define-module (gnu services ssh)
   #:use-module (srfi srfi-1)
   #:use-module (srfi srfi-26)
   #:use-module (ice-9 match)
+  #:use-module (ice-9 vlist)
   #:export (lsh-configuration
 lsh-configuration?
 lsh-service
@@ -535,7 +536,19 @@ (define (extend-openssh-authorized-keys config keys)
   (openssh-configuration
(inherit config)
(authorized-keys
-(append (openssh-authorized-keys config) keys
+(match (openssh-authorized-keys config)
+  (((users _ ...) ...)
+   ;; Build a user/key-list mapping.
+   (let ((user-keys (fold (match-lambda*
+(((user keys ...) table)
+ (vhash-cons user keys table)))
+  vlist-null
+  (openssh-authorized-keys config
+ ;; Coalesce the key lists associated with each user.
+ (map (lambda (user)
+`(,user
+  ,@(concatenate (vhash-fold* cons '() user user-keys
+  users)))
 
 (define openssh-service-type
   (service-type (name 'openssh)
-- 
2.33.1


Vivien


signature.asc
Description: PGP signature

bug#51872: [PATCH] On core-updates-frozen, gnome-mines requires the old meson too

2021-11-15 Thread Vivien Kraus via Bug reports for GNU Guix


Dear guix,

Yet another package that requires the old meson on core-updates-frozen
:)

Best regards,

Vivien

From 4bd36cebd69a2695f9b6db108868198aae2f48b9 Mon Sep 17 00:00:00 2001
From: Vivien Kraus 
Date: Mon, 15 Nov 2021 14:38:29 +
Subject: [PATCH] gnu: gnome-mines: Fix build.

* gnu/packages/gnome.scm (gnome-mines) [arguments]: Use meson 0.59.
---
 gnu/packages/gnome.scm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 17959ed347..2a60cc6afc 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -5112,7 +5112,8 @@ (define-public gnome-mines
 (base32 "0sf6kdvhr4pr3hddnj6ql9larz2wy108sri31id6x9g459nbly8z"
 (build-system meson-build-system)
 (arguments
- '(#:glib-or-gtk? #t
+ `(#:glib-or-gtk? #t
+   #:meson ,meson-0.59
#:phases
(modify-phases %standard-phases
  (add-after 'unpack 'skip-gtk-update-icon-cache
-- 
2.33.1



signature.asc
Description: PGP signature

bug#51871: [PATCH] Gnome 2048 does not build on core-updates-frozen

2021-11-15 Thread Vivien Kraus via Bug reports for GNU Guix


Dear guix,

Gnome 2048 requires the old meson too.

Best regards,

Vivien

From c3a77be9eb0673495be9745cfbfc24694b3790ae Mon Sep 17 00:00:00 2001
From: Vivien Kraus 
Date: Mon, 15 Nov 2021 14:25:20 +
Subject: [PATCH] gnu: gnome-2048: Fix build.

* gnu/packages/games.scm (gnome-2048) [arguments]: Use meson 0.59.
---
 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 dd2444e3c9..08a216e9ef 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -1768,7 +1768,8 @@ (define-public gnome-2048
 "0s5fg4z5in1h39fcr69j1qc5ynmg7a8mfprk3mc3c0csq3snfwz2"
 (build-system meson-build-system)
 (arguments
- '(#:glib-or-gtk? #t
+ `(#:glib-or-gtk? #t
+   #:meson ,meson-0.59
#:phases
(modify-phases %standard-phases
  (add-after 'unpack 'skip-gtk-update-icon-cache
-- 
2.33.1



signature.asc
Description: PGP signature

bug#51869: [PATCH] Add emacs-vala-mode

2021-11-15 Thread Vivien Kraus via Bug reports for GNU Guix


Dear guix,

There’s a vala mode for emacs. It is not very useful, but it registers a
major mode that is then used as a placeholder for the Emacs Language
Server Protocol client. In fact, it’s not possible to activate Vala
support for LSP on emacs without a vala mode, and this is the only
implementation I know.

This is the result of importing from MELPA. The project is not very well
maintained, so it fails to build on a recent emacs (see
https://github.com/rrthomas/vala-mode/issues/14). Since I don’t have a
solution to fix this issue, I went away and reverted the multiline
support. It builds and is useful enough for LSP to kick in, so I
consider it fixed.

What do you think? Do you have a better fix?

Best regards,

Vivien

From 7c382e721c74c319abadb65eb9f0942a7cfe24e1 Mon Sep 17 00:00:00 2001
From: Vivien Kraus 
Date: Mon, 15 Nov 2021 13:57:18 +
Subject: [PATCH] gnu: Add emacs-vala-mode.

* gnu/packages/emacs-xyz (emacs-vala-mode): New variable.
* gnu/packages/patches/vala-mode-fix.patch: Add a vala-mode patch to disable
multiline string support.
* gnu/local.mk (dist_patch_DATA): Register the patch to disable multiline
string support.
---
 gnu/local.mk |  1 +
 gnu/packages/emacs-xyz.scm   | 25 
 gnu/packages/patches/vala-mode-fix.patch | 48 
 3 files changed, 74 insertions(+)
 create mode 100644 gnu/packages/patches/vala-mode-fix.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index 5b21a6ee1b..139325c10b 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1886,6 +1886,7 @@ dist_patch_DATA =		\
   %D%/packages/patches/ustr-fix-build-with-gcc-5.patch		\
   %D%/packages/patches/util-linux-tests.patch			\
   %D%/packages/patches/upower-builddir.patch			\
+  %D%/packages/patches/vala-mode-fix.patch			\
   %D%/packages/patches/valgrind-enable-arm.patch		\
   %D%/packages/patches/vboot-utils-fix-format-load-address.patch	\
   %D%/packages/patches/vboot-utils-fix-tests-show-contents.patch	\
diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index ec0376442b..ac15d412c5 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -29989,3 +29989,28 @@ (define-public emacs-global-tags
 wraps GNU Global calls and integration to editor using this API with
 project.el and xref.el.")
   (license license:gpl3+
+
+(define-public emacs-vala-mode
+  (package
+   (name "emacs-vala-mode")
+   (version "20201218.2109")
+   (source
+(origin
+  (method git-fetch)
+  (uri (git-reference
+(url "https://github.com/rrthomas/vala-mode.git";)
+(commit "d696a8177e94c81ea557ad364a3b3dcc3abbc50f")))
+  (sha256
+   (base32 "0g5pdq757z9d8rk489n5ilhqipdc4i4sfkjwwrxyvgjlapjc04c0"))
+  (patches
+   (search-patches "vala-mode-fix.patch"
+   (build-system emacs-build-system)
+   (home-page "https://github.com/rrthomas/vala-mode";)
+   (synopsis "Vala mode for Emacs")
+   (description
+"This package provides a major mode for editing .vala and .vapi files in
+Emacs. See @url{http://live.gnome.org/Vala} for details about Vala language.
+
+This mode was based on Dylan Moonfire's @samp{csharp-mode}.
+")
+   (license license:gpl2+)))
diff --git a/gnu/packages/patches/vala-mode-fix.patch b/gnu/packages/patches/vala-mode-fix.patch
new file mode 100644
index 00..0a50b0e362
--- /dev/null
+++ b/gnu/packages/patches/vala-mode-fix.patch
@@ -0,0 +1,48 @@
+From 68db3ae7410a7d89e606e1916240193b96ab335e Mon Sep 17 00:00:00 2001
+From: Vivien 
+Date: Mon, 15 Nov 2021 13:55:58 +
+Subject: [PATCH] Revert "vala-mode: support multiline strings"
+
+This reverts commit 671c287ba9cb81dcf6e9485e6ccc60bc2b7aba14.
+---
+ vala-mode.el | 17 -
+ 1 file changed, 17 deletions(-)
+
+diff --git a/vala-mode.el b/vala-mode.el
+index 8c4da4c..22c6e49 100644
+--- a/vala-mode.el
 b/vala-mode.el
+@@ -259,14 +259,6 @@ casts and declarations are fontified.  Used on level 2 and higher."
+ (c-lang-defconst c-opt-cpp-prefix
+   vala "\\s *#\\s *")
+ 
+-;; Support multiline strings
+-;;
+-;; FIXME: This allows any string to be multiline. Currently, c-mode only
+-;; supports a single-character prefix to denote a multiline string, so the
+-;; real fix will be harder.
+-(c-lang-defconst c-multiline-string-start-char
+-  vala vala-multiline-strings)
+-
+ ;; Vala uses the following assignment operators
+ (c-lang-defconst c-assignment-operators
+   vala '("=" "*=" "/=" "%=" "+=" "-=" ">>=" "<<="
+@@ -428,15 +420,6 @@ casts and declarations are fontified.  Used on level 2 and higher."
+   :type 'hook
+   :group 'c)
+ 
+-(defcustom vala-multiline-strings nil
+-  "Whether to enable support for multiline strings.
+-
+-It can conflict with some

bug#51812: On core-updates-frozen, vala-language-server does not build

2021-11-13 Thread Vivien Kraus via Bug reports for GNU Guix


Dear guix,

vala-language-server (gnu packages gnome-xyz) does not build on
core-updates-frozen, but the latest version builds fine.

Best regards,

Vivien

From 782ff398d79f20409ee5561ee284bcd1396b0b07 Mon Sep 17 00:00:00 2001
From: Vivien Kraus 
Date: Sat, 13 Nov 2021 13:51:58 +
Subject: [PATCH] gnu: vala-language-server: Upgrade to 0.48.3.

* gnu/packages/gnome-xyz.scm (vala-language-server): Upgrade to 0.48.3.
---
 gnu/packages/gnome-xyz.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/gnome-xyz.scm b/gnu/packages/gnome-xyz.scm
index 79d8668523..60c93d86e6 100644
--- a/gnu/packages/gnome-xyz.scm
+++ b/gnu/packages/gnome-xyz.scm
@@ -896,7 +896,7 @@ (define-public vala-language-server
 ;; Note to maintainer: VLS must be built with a Vala toolchain the same
 ;; version or newer. Therefore when you update this package you may need
 ;; to update Vala too.
-(version "0.48.1")
+(version "0.48.3")
 (source (origin
   (method git-fetch)
   (uri (git-reference
@@ -904,7 +904,7 @@ (define-public vala-language-server
 (commit version)))
   (file-name (git-file-name name version))
   (sha256
-   (base32 "12k095052jkvbiyz8gzkj6w7r7p16d5m18fyikl48yvh5nln8fw0"
+   (base32 "1gnvc91gdp3wj9r3r3xxfr09f9lw39cfypn2q5f0443dhhmp059j"
 (build-system meson-build-system)
 (arguments '(#:glib-or-gtk? #t))
 (inputs
-- 
2.33.1



signature.asc
Description: PGP signature

bug#51805: Don’t upgrade nautilus if you don’t want to

2021-11-13 Thread Vivien Kraus via Bug reports for GNU Guix


As a precision, the second patch is the only one required, apply the
others at your discretion.

Vivien


signature.asc
Description: PGP signature

bug#51808: [PATCH] Devhelp: On core-updates-frozen, upgrade to 41.2 to use webkit2 4.1

2021-11-13 Thread Vivien Kraus via Bug reports for GNU Guix


Dear guix,

devhelp 41 gained support for building against webkit2 4.1. I think we
should upgrade, right?

Vivien

From fadbf75a7667cfb9e2a25024913373a53310d06c Mon Sep 17 00:00:00 2001
From: Vivien Kraus 
Date: Sat, 13 Nov 2021 10:35:26 +
Subject: [PATCH] gnu: devhelp: Upgrade to 41.2.

* gnu/packages/gnome.scm (devhelp): Upgrade to 41.2 to upgrade the webkit
dependency to 4.1.
* gnu/packages/gnome.scm (devhelp) [arguments]: Use meson 0.59.
* gnu/packages/gnome.scm (devhelp) [phase skip-gtk-update-icon-cache]: the
post install script has been moved from meson_post_install.py to
build-aux/meson/.
* gnu/packages/gnome.scm (devhelp) [phase fix-devhelp-gir-inputs]: the devhelp
GIR still mentions webkit 4.0, use 4.1 instead.
---
 gnu/packages/gnome.scm | 16 +++-
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index d097495b1e..3f1eada0c0 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -5775,7 +5775,7 @@ (define-public amtk
 (define-public devhelp
   (package
 (name "devhelp")
-(version "40.1")
+(version "41.2")
 (source (origin
   (method url-fetch)
   (uri (string-append "mirror://gnome/sources/" name "/"
@@ -5783,17 +5783,23 @@ (define-public devhelp
   name "-" version ".tar.xz"))
   (sha256
(base32
-"1fvb69l1nyxdrs95ar95rmpfs8nfkpys4x74r8ilid44hhzdk2iy"
+"1lk0gycjvs6gibhy0zs3ffkrkzrkyl5nkp7n60hgpa6syjq91apc"
 (build-system meson-build-system)
 (arguments
- '(#:glib-or-gtk? #t
+ `(#:glib-or-gtk? #t
+   #:meson ,meson-0.59
#:phases
(modify-phases %standard-phases
  (add-after 'unpack 'skip-gtk-update-icon-cache
;; Don't create 'icon-theme.cache'.
(lambda _
- (substitute* "meson_post_install.py"
-   (("gtk-update-icon-cache") "true")))
+ (substitute* "build-aux/meson/meson_post_install.py"
+   (("gtk-update-icon-cache") "true"
+ (add-after 'unpack 'fix-devhelp-gir-inputs
+   ;; It still mentions webkitgtk 4.0
+   (lambda _
+ (substitute* "devhelp/meson.build"
+   (("'WebKit2-4.0'") "'WebKit2-4.1'")))
 (native-inputs
  `(("intltool" ,intltool)
("itstool" ,itstool)
-- 
2.33.1



signature.asc
Description: PGP signature

bug#51806: Does this work?

2021-11-13 Thread Vivien Kraus via Bug reports for GNU Guix



I’d like to close 51806 :)

bug#51806: Acknowledgement ([PATCH] Fix dconf-editor)

2021-11-13 Thread Vivien Kraus via Bug reports for GNU Guix



Please ignore, it has already been fixed, thanks :)

bug#51806: [PATCH] Fix dconf-editor

2021-11-13 Thread Vivien Kraus via Bug reports for GNU Guix


Dear Guix,

dconf-editor needs the old meson to build.

Best regards,

Vivien

From 228729b7bd0bd0bf6249866d691ed8ab1f051a7b Mon Sep 17 00:00:00 2001
From: Vivien Kraus 
Date: Sat, 13 Nov 2021 09:33:20 +
Subject: [PATCH] gnu: dconf-editor: Fix build.

* gnu/packages/gnome.scm (dconf-editor) [arguments]: Use meson 0.59.
---
 gnu/packages/gnome.scm | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 4f43f83631..ec7466546c 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -9252,6 +9252,8 @@ (define-public dconf-editor
 (base32
  "1qvrxrk1h8bd75xwasxbvlkqrw6xkavjimvc7sslkw6lvb3z86jp"
 (build-system meson-build-system)
+(arguments
+ `(#:meson ,meson-0.59))
 (native-inputs
  `(("glib:bin" ,glib "bin") ; for glib-compile-schemas, gio-2.0.
("gtk+-bin" ,gtk+ "bin") ; for gtk-update-icon-cache
-- 
2.33.1



signature.asc
Description: PGP signature

bug#51731: [PATCH] gnome-tweaks fails to start on core-updates-frozen

2021-11-13 Thread Vivien Kraus via Bug reports for GNU Guix


Hello!

Liliana Marie Prikler  writes:
>> > > Subject: [PATCH 4/5] gnu: gnome-tweaks: Add bash-minimal as an
>> > > input to wrap the program.
>> > Split the long line.  Also perhaps add a comment in the file itself
>> > as to why this is needed if it's not already obvious from best
>> > practises in core-updates-frozen.
>> It’s flagged by the linter, because wrapping a program produces a
>> shell script that needs to be executed.
> "Flagged by the linter" is not a good description in a commit message
> or elsewhere.  I think a few packages on c-u-frozen might have a
> comment along the lines of "; for wrap-program" or similar.
I wrote "to execute the wrapper program" in a comment.

I also updated it to the core-updates-frozen-batched-changes merge,
because we need an older meson now, and libsoup2 for seahorse.

Vivien

From e0fd1eab227d720bd57ff8e9412d1ed0adc59bfb Mon Sep 17 00:00:00 2001
From: Vivien Kraus 
Date: Tue, 9 Nov 2021 22:17:43 +
Subject: [PATCH 1/7] gnu: gnome-tweaks: Use libhandy 1.

* gnu/packages/gnome.scm (gnome-tweaks)[inputs]: Use libhandy 1, not libhandy
0.
---
 gnu/packages/gnome.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 2340d2b391..13e6721597 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -9872,7 +9872,7 @@ (define-public gnome-tweaks
("gtk+" ,gtk+)
("gobject-introspection" ,gobject-introspection)
("gsettings-desktop-schemas" ,gsettings-desktop-schemas)
-   ("libhandy" ,libhandy-0.0)
+   ("libhandy" ,libhandy)
("libnotify" ,libnotify)
("libsoup" ,libsoup)
("nautilus" ,nautilus)
-- 
2.33.1

From 65469d76bb1485281db8fba2ea15316a31cc1f67 Mon Sep 17 00:00:00 2001
From: Vivien Kraus 
Date: Tue, 9 Nov 2021 22:57:13 +
Subject: [PATCH 2/7] gnu: gnome-tweaks: Set the python path.

gnu/packages/gnome.scm (gnome-tweaks)[phase wrap-gi-typelib-and-python]:
Also wrap with GUIX_PYTHONPATH.
---
 gnu/packages/gnome.scm | 12 +---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 13e6721597..012a261a44 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -9857,12 +9857,18 @@ (define-public gnome-tweaks
(("gtk-update-icon-cache") "true"
  (add-after 'install 'wrap
(@@ (guix build python-build-system) wrap))
- (add-after 'wrap 'wrap-gi-typelib
+ (add-after 'wrap 'wrap-gi-typelib-and-python
(lambda* (#:key inputs outputs #:allow-other-keys)
  (let ((out   (assoc-ref outputs "out"))
(gi-typelib-path   (getenv "GI_TYPELIB_PATH")))
-   (wrap-program (string-append out "/bin/gnome-tweaks")
- `("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path)
+   (let ((python-path
+  (string-append out "/lib/python"
+ ,(version-major+minor
+   (package-version python))
+ "/site-packages")))
+ (wrap-program (string-append out "/bin/gnome-tweaks")
+   `("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path))
+   `("GUIX_PYTHONPATH" ":" prefix (,python-path))
 (native-inputs
  `(("glib:bin" ,glib "bin") ; for glib-compile-resources, etc.
("intltool" ,intltool)
-- 
2.33.1

From 5dcc96bc39f72e41c3c4ad524dbf23cc1952e5d8 Mon Sep 17 00:00:00 2001
From: Vivien Kraus 
Date: Tue, 9 Nov 2021 23:01:45 +
Subject: [PATCH 3/7] gnu: gnome-tweaks: Add bash-minimal as an input.

* gnu/packages/gnome.scm (gnome-tweaks)[inputs]: Add bash-minimal.
---
 gnu/packages/gnome.scm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 012a261a44..3943e6e7cc 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -9874,7 +9874,8 @@ (define-public gnome-tweaks
("intltool" ,intltool)
("pkg-config" ,pkg-config)))
 (inputs
- `(("gnome-desktop" ,gnome-desktop)
+ `(("bash-minimal" ,bash-minimal) ; to execute the wrapper program
+   ("gnome-desktop" ,gnome-desktop)
("gtk+" ,gtk+)
("gobject-introspection" ,gobject-introspection)
("gsettings-desktop-schemas" ,gsettings-desktop-schemas)
-- 
2.33.1

From 07b11864df5ccef11659927de7fe49c97e3a7b3e Mon Sep 17 00

bug#51805: Update nautilus on core-updates-frozen

2021-11-13 Thread Vivien Kraus via Bug reports for GNU Guix


Dear guix,

If we update gnome-autoar (the tool to manage archives), we can update
nautilus. What do you think?

Vivien

From bcdf96f406b6b108be3cd0e701ad9f08756dd450 Mon Sep 17 00:00:00 2001
From: Vivien Kraus 
Date: Sat, 13 Nov 2021 08:57:15 +
Subject: [PATCH 1/3] gnu: gnome-autoar: Upgrade to 0.4.1.

* gnu/packages/gnome.scm (gnome-autoar): Update to 0.4.1.
* gnu/packages/gnome.scm (gnome-autoar) [build-system]: Switch to meson.
* gnu/packages/gnome.scm (gnome-autoar) [native-inputs]: Add glib:bin for
glib-mkenums.
---
 gnu/packages/gnome.scm | 7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index bc885156e4..a0005f0f63 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -8837,7 +8837,7 @@ (define-public gtk-vnc
 (define-public gnome-autoar
   (package
 (name "gnome-autoar")
-(version "0.3.3")
+(version "0.4.1")
 (source (origin
   (method url-fetch)
   (uri (string-append "mirror://gnome/sources/" name "/"
@@ -8845,10 +8845,11 @@ (define-public gnome-autoar
   name "-" version ".tar.xz"))
   (sha256
(base32
-"012w7rhhpxvlrnnhqy01vwzg1wxqpy8jbqgizn47wnip7bvh0917"
-(build-system glib-or-gtk-build-system)
+"03hmm7cjgjvyxlflghfa89s1amj16qapl2c9pv0r2bfrp87dasv4"
+(build-system meson-build-system)
 (native-inputs
  `(("gobject-introspection" ,gobject-introspection)
+   ("glib:bin" ,glib "bin")
("pkg-config" ,pkg-config)))
 (propagated-inputs
  `(("libarchive" ,libarchive)))  ; Required by gnome-autoar-0.pc
-- 
2.33.1

From 9103c852de3eee1e0f3a1ace79a2e1860812ee23 Mon Sep 17 00:00:00 2001
From: Vivien Kraus 
Date: Sat, 13 Nov 2021 08:49:32 +
Subject: [PATCH 2/3] gnu: nautilus: Use libsoup 2 because of tracker.

* gnu/packages/gnome.scm (nautilus) [inputs]: Use libsoup-2.
* gnu/packages/gnome.scm (nautilus) [arguments]: Use meson 0.59.
---
 gnu/packages/gnome.scm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index a0005f0f63..250e200783 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -9081,7 +9081,8 @@ (define-public nautilus
 "03gn416vvpvyy75pj3xkpxrqilbvjhqbvrdi5fdaivp50zzg47mp"
 (build-system meson-build-system)
 (arguments
- '(#:glib-or-gtk? #t
+ `(#:glib-or-gtk? #t
+   #:meson ,meson-0.59
#:phases
(modify-phases %standard-phases
  (add-after 'unpack 'skip-gtk-update-icon-cache
@@ -9111,7 +9112,7 @@ (define-public nautilus
("libportal" ,libportal)
("libseccomp" ,libseccomp)
("libselinux" ,libselinux)
-   ("libsoup" ,libsoup)
+   ("libsoup" ,libsoup-minimal-2) ; to satisfy tracker dependencies
    ("tracker" ,tracker)
("tracker-miners" ,tracker-miners)
;; XXX: gtk+ is required by libnautilus-extension.pc
-- 
2.33.1

From 1a9f43b31715e5a3b2269501d35dd4ab094a9cb8 Mon Sep 17 00:00:00 2001
From: Vivien Kraus 
Date: Sat, 13 Nov 2021 08:58:20 +
Subject: [PATCH 3/3] gnu: nautilus: Update to 41.0.

* gnu/packages/gnome.scm (nautilus): Upgrade to 41.0.
* gnu/packages/gnome.scm (nautilus) [arguments]: Use meson 0.59.
---
 gnu/packages/gnome.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 250e200783..e10d9ca481 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -9070,7 +9070,7 @@ (define-public tracker-miners
 (define-public nautilus
   (package
 (name "nautilus")
-(version "40.2")
+(version "41.0")
 (source (origin
   (method url-fetch)
   (uri (string-append "mirror://gnome/sources/" name "/"
@@ -9078,7 +9078,7 @@ (define-public nautilus
   name "-" version ".tar.xz"))
   (sha256
(base32
-"03gn416vvpvyy75pj3xkpxrqilbvjhqbvrdi5fdaivp50zzg47mp"
+"1rd1a0wjh2sc7mzw6m61rryvgxpi2lin4xj0x9khqw04q6nl3fgr"
 (build-system meson-build-system)
 (arguments
  `(#:glib-or-gtk? #t
-- 
2.33.1



signature.asc
Description: PGP signature

bug#51790: [PATCH] Re: bug#51790: Fix it (On core-updates-frozen, tracker-miners can’t find its tracker dependency)

2021-11-13 Thread Vivien Kraus via Bug reports for GNU Guix


It turns out that tracker-miners wants the same libsoup version as
tracker, so we need libsoup-minimal-2.

From e76c51853913686234ec008cc9cf6e3117a15fa2 Mon Sep 17 00:00:00 2001
From: Vivien Kraus 
Date: Sat, 13 Nov 2021 08:19:09 +
Subject: [PATCH] gnu: tracker-miners: Require the same libsoup as tracker.

* gnu/packages/gnome.scm (tracker-miners) [inputs]: Use the same libsoup
version as tracker.
* gnu/packages/gnome.scm (tracker) [inputs]: Warn that tracker-miners should
use the same version of libsoup.
---
 gnu/packages/gnome.scm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 9557fcf4c8..bc885156e4 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -8923,7 +8923,8 @@ (define-public tracker
("libxml2" ,libxml2)
("icu4c" ,icu4c) ; libunistring gets miner-miner-fs test to fail.
("json-glib" ,json-glib)
-   ("libsoup" ,libsoup-minimal-2)))
+   ("libsoup" ,libsoup-minimal-2)   ; tracker-miners requires the same version.
+   ))
 (synopsis "Metadata database, indexer and search tool")
 (home-page "https://wiki.gnome.org/Projects/Tracker";)
 (description
@@ -9042,7 +9043,7 @@ (define-public tracker-miners
("libosinfo" ,libosinfo)
("libpng" ,libpng)
("libseccomp" ,libseccomp)
-   ("libsoup" ,libsoup)
+   ("libsoup" ,libsoup-minimal-2) ; because tracker requires this version.
("libtiff" ,libtiff)
("libvorbis" ,libvorbis)
("libxml2" ,libxml2)
-- 
2.33.1


Vivien


signature.asc
Description: PGP signature

bug#51790: On core-updates-frozen, tracker-miners can’t find its tracker dependency

2021-11-12 Thread Vivien Kraus via Bug reports for GNU Guix


Dear guix,

I can’t build tracker-miners on core-updates-frozen, because it fails
its configuration phase not finding tracker-sparql 3.0 (a pkg-config
definition installed by tracker, which is a dependency).

Best regards,

Vivien


signature.asc
Description: PGP signature

bug#51789: Appstream-glib is broken on core-updates-frozen

2021-11-12 Thread Vivien Kraus via Bug reports for GNU Guix


Dear guix,

Appstream-glib is not ready yet for libsoup 3. I propose that we still
use libsoup-minimal-2.

Best regards,

Vivien

From 88cac92aa69022620ff5f7007ef7a76488f2139a Mon Sep 17 00:00:00 2001
From: Vivien Kraus 
Date: Fri, 12 Nov 2021 12:16:32 +
Subject: [PATCH] gnu: appstream-glib: Fix build.

* gnu/packages/glib.scm (appstream-glib) [inputs]: Use libsoup-minimal-2.
---
 gnu/packages/glib.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm
index 3c835300e4..398d3943e5 100644
--- a/gnu/packages/glib.scm
+++ b/gnu/packages/glib.scm
@@ -1185,7 +1185,7 @@ (define-public appstream-glib
("gtk+" ,gtk+)
("json-glib" ,json-glib)
("libarchive" ,libarchive)
-   ("libsoup" ,libsoup)))
+   ("libsoup" ,libsoup-minimal-2)))
 (arguments
  `(#:configure-flags
(list "-Ddep11=false"
-- 
2.33.1



signature.asc
Description: PGP signature

bug#51746: Ignore the styling commit

2021-11-11 Thread Vivien Kraus via Bug reports for GNU Guix


The styling commit should be ignored. The styling will happen for all
packages at once.


signature.asc
Description: PGP signature

bug#51731: [PATCH] gnome-tweaks fails to start on core-updates-frozen

2021-11-10 Thread Vivien Kraus via Bug reports for GNU Guix

Hello,

Liliana Marie Prikler  writes:
> Am Dienstag, den 09.11.2021, 23:10 + schrieb Vivien Kraus:
>> I fixed a couple of linter errors, and applied guix style to
>> it. However, now the linter complains that we have the "bin" output
>> of glib in something that would be called "glib" and not "glib:bin"…
>> Should we still keep the styled output?
> IIUC that's an issue with the linter or perhaps the implementation of
> short input lists in general.  I've CC'd Ludo as he is the one who
> allowed us to write inputs (list bash sed ...) in the first place,
> perhaps he knows what to do here.  We probably ought to convert this to
> short-style inputs anyway.
Apparently, we shouldn’t apply guix style yet, we will apply it for all
packages at once some day.

>> Subject: [PATCH 1/5] gnu: gnome-tweaks: Use libhandy 1.
> Note, libhandy 0.0 only exists on master (and therefore core-updates),
> because there are packages still using it.  If there's no more users
> post updating gnome-tweaks, it is to be removed!
I tried, but there are 2 problems:
1. I can’t update authenticator (gnu/packages/gnome.scm), because
upstream switched to Rust and I don’t know how to package that;
2. Geary needs it too (and gmime 2, which we could drop the same way),
but it’s a pain to upgrade. I went a long way, but there’s some vala
code that acts on strings as if they were arrays and I don’t know what
happens: maybe a newer vala is required, or the glib string type does
not apply for some reason.

However, I can provide an upgrade for seahorse (and its dependency
gcr). That’s a start, I guess.
:)

>> Subject: [PATCH 2/5] gnu: gnome-tweaks: Set the python path.
> Nice catch, I think this was previously done by a different phase. 
> However...
>> gnu/packages/gnome.scm (gnome-tweaks)[phases]: Also wrap with
>> GUIX_PYTHONPATH.
> Please note the phase and perhaps change its name to reflect what it
> does.
Is the 'wrap-gi-typelib-and-python boring name appropriate?

>> Subject: [PATCH 3/5] gnu: gnome-tweaks: gobject-introspection should
>> be a native input.
> I'm not sure this is the correct move here.  Python uses GI at runtime,
> not natively during build.  If gnome-tweaks requires GI at build time,
> it's to be added as both inputs.
It does not, I’ll drop it.

>> Subject: [PATCH 4/5] gnu: gnome-tweaks: Add bash-minimal as an input
>> to wrap the program.
> Split the long line.  Also perhaps add a comment in the file itself as
> to why this is needed if it's not already obvious from best practises
> in core-updates-frozen.
It’s flagged by the linter, because wrapping a program produces a shell
script that needs to be executed.

>> Subject: [PATCH 5/5] gnu: gnome-tweaks: Style it.
> This should probably done first, particularly if it helps avoid the
> linter complaints you encounter.
I’ve dropped the guix style for the reason above.

> In my personal opinion, 1, 3, 4 and 5 could also be done in a single
> commit, though YMMV.  Also, I'm not active on core-updates-frozen, so
> take everything I said as lexical analysis at best and with sufficient
> amounts of salt.
I’ll wait for more desalinated advice, because lumping commits together
is easier than separating a big one.

From af7235dc2bbfa84cc1c94792b9822c74db2baf60 Mon Sep 17 00:00:00 2001
From: Vivien Kraus 
Date: Tue, 9 Nov 2021 22:17:43 +
Subject: [PATCH 1/5] gnu: gnome-tweaks: Use libhandy 1.

* gnu/packages/gnome.scm (gnome-tweaks)[inputs]: Use libhandy 1, not libhandy
0.
---
 gnu/packages/gnome.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 32f237e218..3903a00398 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -9795,7 +9795,7 @@ (define-public gnome-tweaks
("gtk+" ,gtk+)
("gobject-introspection" ,gobject-introspection)
("gsettings-desktop-schemas" ,gsettings-desktop-schemas)
-   ("libhandy" ,libhandy-0.0)
+   ("libhandy" ,libhandy)
("libnotify" ,libnotify)
("libsoup" ,libsoup)
("nautilus" ,nautilus)
-- 
2.33.1

From edc67015e65dfce75d1b2cd4317e1105d4730057 Mon Sep 17 00:00:00 2001
From: Vivien Kraus 
Date: Tue, 9 Nov 2021 22:57:13 +
Subject: [PATCH 2/5] gnu: gnome-tweaks: Set the python path.

gnu/packages/gnome.scm (gnome-tweaks)[phase wrap-gi-typelib-and-python]:
Also wrap with GUIX_PYTHONPATH.
---
 gnu/packages/gnome.scm | 12 +---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 3903a00398..05750ea365 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -9780,12 +9780,18 @@ (define-public gnome-tweaks
((

bug#51746: Gnome Boxes on core-updates-frozen can’t clone VMs

2021-11-10 Thread Vivien Kraus via Bug reports for GNU Guix


Dear guix,

Gnome Boxes 41.1 fixes a regression on core-updates-frozen where if you
clone a VM, gnome-boxes won’t be able to restart again, because the
clone operation corrupts the new VM description.

I propose that we upgrade it, what do you think?

Vivien

From bb504043513b451e89b5e26c24513157e9acac39 Mon Sep 17 00:00:00 2001
From: Vivien Kraus 
Date: Wed, 10 Nov 2021 09:51:41 +
Subject: [PATCH 1/3] gnu: gnome-boxes: Update to 41.1.

* gnu/packages/gnome.scm (gnome-boxes): Update to 41.1.
---
 gnu/packages/gnome.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index f15dc593f2..598d8a3dfc 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -11538,7 +11538,7 @@ (define-public polari
 (define-public gnome-boxes
   (package
 (name "gnome-boxes")
-(version "40.3")
+(version "41.1")
 (source
  (origin
(method url-fetch)
@@ -11546,7 +11546,7 @@ (define-public gnome-boxes
(version-major version) "/"
"gnome-boxes-" version ".tar.xz"))
(sha256
-(base32 "0n20yzxsc7mv73a905djvsas76vknfn67ad1n0rnvgm48n7qxw7z"
+(base32 "1wzhm8n485cqhbai4qshgrwl05ix881g8gjshilrj6vg8p1li79h"
 (build-system meson-build-system)
 (arguments
  '(#:glib-or-gtk? #t
-- 
2.33.1

From 5664393120a972a4e69acfc406dd1fb217024a91 Mon Sep 17 00:00:00 2001
From: Vivien Kraus 
Date: Wed, 10 Nov 2021 09:52:11 +
Subject: [PATCH 2/3] =?UTF-8?q?gnu:=20gnome-boxes:=20Don=E2=80=99t=20use?=
 =?UTF-8?q?=20bundled=20libhandy.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/gnome.scm (gnome-boxes) [inputs]: Add libhandy.
---
 gnu/packages/gnome.scm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 598d8a3dfc..3f8bc1b4b9 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -11570,6 +11570,7 @@ (define-public gnome-boxes
("gtk-vnc" ,gtk-vnc)
("gtksourceview" ,gtksourceview)
("json-glib" ,json-glib)
+   ("libhandy" ,libhandy)
("libosinfo" ,libosinfo)
("libsecret" ,libsecret)
("libsoup" ,libsoup)
-- 
2.33.1

From 6a52747aacddf6ce3dbb669a8bae2a26989031fb Mon Sep 17 00:00:00 2001
From: Vivien Kraus 
Date: Wed, 10 Nov 2021 09:54:10 +
Subject: [PATCH 3/3] gnu: gnome-boxes: Apply guix style.

* gnu/packages/gnome.scm (gnome-boxes): Apply guix style.
---
 gnu/packages/gnome.scm | 58 +-
 1 file changed, 29 insertions(+), 29 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 3f8bc1b4b9..2dc1ea9af8 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -11555,35 +11555,35 @@ (define-public gnome-boxes
   (assoc-ref %outputs "out")
   "/lib/gnome-boxes"
 (native-inputs
- `(("glib:bin" ,glib "bin") ; for glib-compile-resources
-   ("gtk+:bin" ,gtk+ "bin") ; for gtk-update-icon-cache
-   ("desktop-file-utils" ,desktop-file-utils) ; for update-desktop-database
-   ("itstool" ,itstool)
-   ("intltool" ,intltool)
-   ("vala" ,vala)
-   ("pkg-config" ,pkg-config)))
-(inputs
- `(("libarchive" ,libarchive)
-   ("glib-networking" ,glib-networking) ;for TLS support
-   ("gsettings-desktop-schemas" ,gsettings-desktop-schemas)
-   ("gtk" ,gtk+)
-   ("gtk-vnc" ,gtk-vnc)
-   ("gtksourceview" ,gtksourceview)
-   ("json-glib" ,json-glib)
-   ("libhandy" ,libhandy)
-   ("libosinfo" ,libosinfo)
-   ("libsecret" ,libsecret)
-   ("libsoup" ,libsoup)
-   ("libusb" ,libusb)
-   ("libvirt" ,libvirt)
-   ("libvirt-glib" ,libvirt-glib)
-   ("libxml" ,libxml2)
-   ("spice-gtk" ,spice-gtk)
-   ("sparql-query" ,sparql-query)
-   ("vte" ,vte)
-   ("webkitgtk" ,webkitgtk)
-   ("tracker" ,tracker)
-   ("libgudev" ,libgudev)))
+ (list `(,glib "bin") ; for glib-compile-resources
+   `(,gtk+ "bin") ; for gtk-update-icon-cache
+   desktop-file-utils ; for update-desktop-database
+   itstool
+   intltool
+   vala
+   pkg-config))
+(inputs
+ (list libarchive
+   glib-networking ;for TLS support
+   gsettings-desktop-schemas

bug#51731: [PATCH] gnome-tweaks fails to start on core-updates-frozen

2021-11-09 Thread Vivien Kraus via Bug reports for GNU Guix


Dear guix,

gnome-tweaks does not start on core-updates-frozen, because it needs
libhandy 1 and is given libhandy 0.0.

Also, it cannot find its own python module, so the python path needs to
be wrapped.

I fixed a couple of linter errors, and applied guix style to
it. However, now the linter complains that we have the "bin" output of
glib in something that would be called "glib" and not "glib:bin"… Should
we still keep the styled output?

Best regards,

Vivien

From 4612c8235c14bcb9b7583746683e1d2559df390b Mon Sep 17 00:00:00 2001
From: Vivien Kraus 
Date: Tue, 9 Nov 2021 22:17:43 +
Subject: [PATCH 1/5] gnu: gnome-tweaks: Use libhandy 1.

* gnu/packages/gnome.scm (gnome-tweaks)[inputs]: Use libhandy 1, not libhandy
0.
---
 gnu/packages/gnome.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 3eafcc2f10..17dd87fd62 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -9795,7 +9795,7 @@ (define-public gnome-tweaks
("gtk+" ,gtk+)
("gobject-introspection" ,gobject-introspection)
("gsettings-desktop-schemas" ,gsettings-desktop-schemas)
-   ("libhandy" ,libhandy-0.0)
+   ("libhandy" ,libhandy)
("libnotify" ,libnotify)
("libsoup" ,libsoup)
("nautilus" ,nautilus)
-- 
2.33.1

From cdb79baa5705adbfee8711e5698aa687fd3685f1 Mon Sep 17 00:00:00 2001
From: Vivien Kraus 
Date: Tue, 9 Nov 2021 22:57:13 +
Subject: [PATCH 2/5] gnu: gnome-tweaks: Set the python path.

gnu/packages/gnome.scm (gnome-tweaks)[phases]: Also wrap with GUIX_PYTHONPATH.
---
 gnu/packages/gnome.scm | 10 --
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 17dd87fd62..f725dfe981 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -9784,8 +9784,14 @@ (define-public gnome-tweaks
(lambda* (#:key inputs outputs #:allow-other-keys)
  (let ((out   (assoc-ref outputs "out"))
(gi-typelib-path   (getenv "GI_TYPELIB_PATH")))
-   (wrap-program (string-append out "/bin/gnome-tweaks")
- `("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path)
+   (let ((python-path
+  (string-append out "/lib/python"
+ ,(version-major+minor
+   (package-version python))
+ "/site-packages")))
+ (wrap-program (string-append out "/bin/gnome-tweaks")
+   `("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path))
+   `("GUIX_PYTHONPATH" ":" prefix (,python-path))
 (native-inputs
  `(("glib:bin" ,glib "bin") ; for glib-compile-resources, etc.
("intltool" ,intltool)
-- 
2.33.1

From 4f5dc6bdb473380619b42986097b56e1ea305f13 Mon Sep 17 00:00:00 2001
From: Vivien Kraus 
Date: Tue, 9 Nov 2021 22:39:57 +
Subject: [PATCH 3/5] gnu: gnome-tweaks: gobject-introspection should be a
 native input.

* gnu/packages/gnome.scm (gnome-tweaks)[inputs]: Move gobject-introspection to
a native input.
---
 gnu/packages/gnome.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index f725dfe981..ab16157fb5 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -9795,11 +9795,11 @@ (define-public gnome-tweaks
 (native-inputs
  `(("glib:bin" ,glib "bin") ; for glib-compile-resources, etc.
("intltool" ,intltool)
-   ("pkg-config" ,pkg-config)))
+   ("pkg-config" ,pkg-config)
+   ("gobject-introspection" ,gobject-introspection)))
 (inputs
  `(("gnome-desktop" ,gnome-desktop)
("gtk+" ,gtk+)
-   ("gobject-introspection" ,gobject-introspection)
("gsettings-desktop-schemas" ,gsettings-desktop-schemas)
("libhandy" ,libhandy)
("libnotify" ,libnotify)
-- 
2.33.1

From f45038630cff73514f24248684cb8c968106f225 Mon Sep 17 00:00:00 2001
From: Vivien Kraus 
Date: Tue, 9 Nov 2021 23:01:45 +
Subject: [PATCH 4/5] gnu: gnome-tweaks: Add bash-minimal as an input to wrap
 the program.

* gnu/packages/gnome.scm (gnome-tweaks)[inputs]: Add bash-minimal.
---
 gnu/packages/gnome.scm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index ab16157fb5..d0bd796fa4 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -9806,7 +9806,8 @@ (define-public gnome-tweaks
("libsoup" ,libso

bug#51719: [PATCH] Orbit2 is broken on core-updates-frozen

2021-11-09 Thread Vivien Kraus via Bug reports for GNU Guix


Dear Guix,

orbit2 is a dependency for libreoffice, and it does not build
reproducibly on core-updates-frozen (I don’t know on master). The issue
is well-known, for instance here on Arch:
https://bbs.archlinux.org/viewtopic.php?id=240775

I applied the fix, and it builds with parallel make. What do you think?

Vivien

From 9ba9da5a195a3d863f1c6715349be6c9eea02aeb Mon Sep 17 00:00:00 2001
From: Vivien Kraus 
Date: Tue, 9 Nov 2021 15:02:30 +0100
Subject: [PATCH] gnu: orbit2: Fix parallel build.

* gnu/packages/gnome.scm (orbit2)[phases]: Add a phase so that
orbit-name-server-2 depends on libname-server-2.a.
---
 gnu/packages/gnome.scm | 8 
 1 file changed, 8 insertions(+)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 8f6dade3d8..3eafcc2f10 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -3627,6 +3627,14 @@ (define-public orbit2
;; ... which they then completly ignore !!
#:phases
(modify-phases %standard-phases
+ (add-after 'unpack 'fix-parallel-build
+   ;; Parallel build fails because of a failed dependency,
+   ;; https://bugzilla.gnome.org/show_bug.cgi?id=732274
+   (lambda _
+ (substitute* "src/services/name/Makefile.am"
+   (("orbit_name_server_2_DEPENDENCIES = \\$(DEPS) CosNaming.h")
+"orbit_name_server_2_DEPENDENCIES = \
+$(DEPS) CosNaming.h libname-server-2.a"
  (add-before 'configure 'ignore-deprecations
(lambda _
  (substitute* "linc2/src/Makefile.in"
-- 
2.33.1



signature.asc
Description: PGP signature

bug#51487: The openssh service does not allow multiple authorized key files per user

2021-11-07 Thread Vivien Kraus via Bug reports for GNU Guix

Hello,

Ludovic Courtès  writes:
> Could you write it in functional style using a vhash (info "(guile)
> VHashes")?  You’ll probably need two list traversals: one to build the
> user/key mapping, and one to compute the list of users.

I thought that as the vhash data structure inherited the drawbacks of
vlist, it would not be worth using in place of a hash table, but you’re
saying that it’s still a better (more functional) data structure, noted.

Here is the new patch (and I also forgot that appending short lists to
long lists was not great, so I do all the appending at the end of the
function now).

>From a2c4d7cefbc71fd3d35b0b7cc2f61118bd3a29b2 Mon Sep 17 00:00:00 2001
From: Vivien Kraus 
Date: Fri, 29 Oct 2021 18:25:24 +0200
Subject: [PATCH] gnu: openssh-service: Collect all keys for all users.

* gnu/services/ssh.scm (extend-openssh-authorized-keys): ensure that no key is forgotten.
---
 gnu/services/ssh.scm | 29 +
 1 file changed, 25 insertions(+), 4 deletions(-)

diff --git a/gnu/services/ssh.scm b/gnu/services/ssh.scm
index a018052eeb..6ddaf55eeb 100644
--- a/gnu/services/ssh.scm
+++ b/gnu/services/ssh.scm
@@ -39,6 +39,7 @@ (define-module (gnu services ssh)
   #:use-module (srfi srfi-1)
   #:use-module (srfi srfi-26)
   #:use-module (ice-9 match)
+  #:use-module (ice-9 vlist)
   #:export (lsh-configuration
 lsh-configuration?
 lsh-service
@@ -532,10 +533,30 @@ (define (openssh-pam-services config)
 
 (define (extend-openssh-authorized-keys config keys)
   "Extend CONFIG with the extra authorized keys listed in KEYS."
-  (openssh-configuration
-   (inherit config)
-   (authorized-keys
-(append (openssh-authorized-keys config) keys
+  (let generate-keys
+  ((user-keys
+(append (openssh-authorized-keys config) keys))
+   ;; The by-user vhash indexes a list of list of keys for each user, the
+   ;; list of list is not concatenated eagerly to avoid quadratic
+   ;; complexity.
+   (by-user (alist->vhash '(
+(match user-keys
+  (()
+   (openssh-configuration
+(inherit config)
+(authorized-keys
+ (vhash-fold
+  (lambda (user keys other-users)
+`((,user ,@(apply append (reverse keys))) ,@other-users))
+  '() by-user
+  (((user keys ...) other-user-keys ...)
+   (let ((existing
+  (match (vhash-assoc user by-user)
+((_ . keys) keys)
+(#f '()
+ (generate-keys
+  other-user-keys
+  (vhash-cons user `(,keys ,@existing) by-user)))
 
 (define openssh-service-type
   (service-type (name 'openssh)
-- 
2.33.1


Vivien

bug#51435: Fix it (unison does not build on core-updates-frozen)

2021-11-04 Thread Vivien Kraus via Bug reports for GNU Guix


Rekado on #guix told me that I had to create a simple texlive package
for the missing package, that’s what I did. Since I’m not familiar with
the texlive way of doing things, I’m not sure the homepage is that of
l3backend (and thus, I’m not sure of the license if it’s not), and I
need someone to review the description for the package too.

Vivien

>From 093b913147b8f7e9aab66887ed1484e6aaeeb102 Mon Sep 17 00:00:00 2001
From: Vivien Kraus 
Date: Thu, 4 Nov 2021 10:59:18 +0100
Subject: [PATCH 1/2] gnu: Add texlive-dvips-l3backend.

* gnu/packages/tex.scm (texlive-dvips-l3backend): New variable.
---
 gnu/packages/tex.scm | 17 +
 1 file changed, 17 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index bf427f1594..888ded3fce 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -3513,6 +3513,23 @@ (define-public texlive-latex-l3packages
 @end enumerate\n")
 (license license:lppl1.3c+)))
 
+(define-public texlive-dvips-l3backend
+  (package
+(inherit (simple-texlive-package
+  "texlive-dvips-l3backend"
+  (list
+   "/dvips/l3backend/")
+  (base32
+   "1hvj153h1pn93h6n76dv3mg9ai0mcz9q9mysfiqjfpqzijz9ikky")
+  #:trivial? #t))
+(home-page "https://www.ctan.org/pkg/l3backend";)
+(synopsis "LaTeX3 backend drivers for dvips")
+(description
+ "This package forms parts of expl3, and contains the code used to
+interface with backends (drivers) across the expl3 codebase.  The functions
+here are defined for the dvips engine only.")
+(license license:lppl1.3c+)))
+
 (define-public texlive-fontspec
   (let ((template (simple-texlive-package
"texlive-fontspec"
-- 
2.33.1

>From a7568441319c4e42ec2e51dfddf62eacb0a054e2 Mon Sep 17 00:00:00 2001
From: Vivien Kraus 
Date: Thu, 4 Nov 2021 01:02:39 +0100
Subject: [PATCH 2/2] gnu: unison: Fix building the manual.

* gnu/packages/ocaml.scm (unison)[native-inputs]: Add the missing texlive inputs.
---
 gnu/packages/ocaml.scm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index 7b1363a5c3..5b190e7e8d 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -1205,7 +1205,8 @@ (define-public unison
  `(("ocaml" ,ocaml-4.09)
;; For documentation
("ghostscript" ,ghostscript)
-   ("texlive" ,texlive-tiny)
+   ("texlive" ,(texlive-updmap.cfg
+(list texlive-fonts-ec texlive-dvips-l3backend)))
("hevea" ,hevea)
("lynx" ,lynx)
("which" ,which)))
-- 
2.33.1

bug#51435: unison does not build on core-updates-frozen

2021-11-03 Thread Vivien Kraus via Bug reports for GNU Guix


So, trying to understand why the error happens, I added all the known
texlive packages (exported variables in gnu/packages/texlive.scm that
start with texlive- and that are packages), and it still fails, but if I
just add the full texlive it builds just fine.

Vivien

>From c8e5a85dd13dad9e5c388c6e7f852a3ac6341f7c Mon Sep 17 00:00:00 2001
From: Vivien Kraus 
Date: Thu, 4 Nov 2021 01:02:39 +0100
Subject: [PATCH 1/2] =?UTF-8?q?[DBG]=20I=20can=E2=80=99t=20get=20it=20to?=
 =?UTF-8?q?=20build,=20even=20with=20all=20the=20texlive=20packages=20I=20?=
 =?UTF-8?q?can=20get.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 gnu/packages/ocaml.scm | 297 -
 1 file changed, 296 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index 7b1363a5c3..c3b69e0f18 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -1205,7 +1205,302 @@ (define-public unison
  `(("ocaml" ,ocaml-4.09)
;; For documentation
("ghostscript" ,ghostscript)
-   ("texlive" ,texlive-tiny)
+   ("texlive" ,(texlive-updmap.cfg
+(list texlive-fonts-ec
+
+  texlive-adjustbox
+  texlive-ae
+  texlive-amscls
+  texlive-amsfonts
+  texlive-arev
+  texlive-babel
+  texlive-babel-swedish
+  texlive-base
+  texlive-beamer
+  texlive-bera
+  texlive-biblatex
+  texlive-bibtex
+  texlive-booktabs
+  texlive-cabin
+  texlive-caption
+  texlive-charter
+  texlive-cm
+  texlive-cm-super
+  texlive-collectbox
+  texlive-context
+  texlive-courier
+  texlive-csquotes
+  texlive-dehyph-exptl
+  texlive-dejavu
+  texlive-doi
+  texlive-dvips
+  texlive-epsf
+  texlive-etex
+  texlive-etoolbox
+  texlive-eurosym
+  texlive-filemod
+  texlive-fontaxes
+  texlive-fontinst
+  texlive-fontname
+  texlive-fonts-ec
+  texlive-fonts-iwona
+  texlive-fonts-latex
+  texlive-fonts-rsfs
+  texlive-fontspec
+  texlive-fourier
+  texlive-fpl
+  texlive-generic-atbegshi
+  texlive-generic-babel-english
+  texlive-generic-babel-german
+  texlive-generic-bigintcalc
+  texlive-generic-bitset
+  texlive-generic-etexcmds
+  texlive-generic-gettitlestring
+  texlive-generic-iftex
+  texlive-generic-infwarerr
+  texlive-generic-intcalc
+  texlive-generic-kvdefinekeys
+  texlive-generic-kvsetkeys
+  texlive-generic-listofitems
+  texlive-generic-ltxcmds
+  texlive-generic-pdfescape
+  texlive-generic-ulem
+  texlive-generic-uniquecounter
+  texlive-graphics-cfg
+  texlive-graphics-def
+  texlive-grfext
+  texlive-helvetic
+  texlive-hyperref
+  texlive-hyph-utf8
+  texlive-hyphen-afrikaans
+  texlive-hyphen-ancientgreek
+  texlive-hyphen-armenian
+  texlive-hyphen-base
+  texlive-hyphen-basque
+  texlive-hyphen-belarusian
+  texlive-hyphen-bulgarian
+  texlive-hyphen-catalan
+  texlive-hyphen-chinese
+  texlive-hyphen-churchslavonic
+  texlive-hyphen-coptic
+  texlive-hyphen-croatian
+  texlive-hyphen-czech
+  texlive-hyphen-danish
+  texlive-hyphen-dutch
+  texlive-hyphen-englis

bug#51447: More explanations for the fix

2021-11-03 Thread Vivien Kraus via Bug reports for GNU Guix


I was told that this issues gives headaches, so I added a short comment
explaining it.

Vivien

>From 93224afab672465f3e8e1a6be00def0d5507bb76 Mon Sep 17 00:00:00 2001
From: Vivien Kraus 
Date: Tue, 2 Nov 2021 18:19:03 +0100
Subject: [PATCH] guile-gi: fix a source code encoding error

* gnu/packages/guile-xyz.scm (guile-gi) [phases]: remove the default dotted
circle from the combining character that is tested in test/string.scm.
---
 gnu/packages/guile-xyz.scm | 10 ++
 1 file changed, 10 insertions(+)

diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm
index 3c93779209..1ef872ffe1 100644
--- a/gnu/packages/guile-xyz.scm
+++ b/gnu/packages/guile-xyz.scm
@@ -3145,6 +3145,16 @@ (define-public guile-gi
   (ice-9 rdelim))
#:phases
(modify-phases %standard-phases
+ (add-after 'unpack 'remove-dotted-circle-from-combining-character
+   ;; The test/string.scm files contain ◌̀, which is a dotted circle
+   ;; (U+25cc) followed by an upper combining character (U+0300). The
+   ;; old guile 3.0.2 reader incorrectly ignores the dotted circle,
+   ;; and parses it as the combining character alone, but the new
+   ;; guile reader does not.
+   ;; See https://github.com/spk121/guile-gi/issues/112
+   (lambda* _
+ (substitute* "test/string.scm"
+   (("#◌̀") "#\\x0300"
  (add-after 'unpack 'patch-references-to-extension
(lambda* (#:key outputs #:allow-other-keys)
  (let ((effective (read-line
-- 
2.33.1

bug#51447: [PATCH] Re: bug#51447: guile-gi source code has a placeholder for a combining character

2021-11-02 Thread Vivien Kraus via Bug reports for GNU Guix


Vivien Kraus  writes:
> The string failure is due to a dotted circle as a basis for the
> combining character, that may have been inserted by a clever source code
> editor. Replacing it with the hex value for the character itself, the
> test passes.

Sorry, the phase name is not good, because it’s not a problem with the
guile reader but a problem with the source code. So, this should be
better.

Vivien
>From ce832d8593413f4a812211f2fbd98ab5086fe2a2 Mon Sep 17 00:00:00 2001
From: Vivien Kraus 
Date: Tue, 2 Nov 2021 18:19:03 +0100
Subject: [PATCH] guile-gi: fix a source code encoding error

* gnu/packages/guile-xyz.scm (guile-gi) [phases]: remove the default dotted
circle from the combining character that is tested in test/string.scm.
---
 gnu/packages/guile-xyz.scm | 4 
 1 file changed, 4 insertions(+)

diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm
index 3c93779209..8fc37d2069 100644
--- a/gnu/packages/guile-xyz.scm
+++ b/gnu/packages/guile-xyz.scm
@@ -3145,6 +3145,10 @@ (define-public guile-gi
   (ice-9 rdelim))
#:phases
(modify-phases %standard-phases
+ (add-after 'unpack 'remove-dotted-circle-from-combining-character
+   (lambda* _
+ (substitute* "test/string.scm"
+   (("#◌̀") "#\\x0300"
  (add-after 'unpack 'patch-references-to-extension
(lambda* (#:key outputs #:allow-other-keys)
  (let ((effective (read-line
-- 
2.33.1

bug#51447: there’s no other test failing than string.scm

2021-11-02 Thread Vivien Kraus via Bug reports for GNU Guix



It turns out that the other failures only happen in a guix shell, not as
a package build in guix.

Vivien

bug#51447: [PATCH] Re: bug#51447: guile-gi source code has a placeholder for a combining character

2021-11-02 Thread Vivien Kraus via Bug reports for GNU Guix


The string failure is due to a dotted circle as a basis for the
combining character, that may have been inserted by a clever source code
editor. Replacing it with the hex value for the character itself, the
test passes.

Vivien

>From 308bd116d75861c70f7540890a514b0eb487c2f7 Mon Sep 17 00:00:00 2001
From: Vivien Kraus 
Date: Tue, 2 Nov 2021 18:19:03 +0100
Subject: [PATCH] guile-gi: fix a source code encoding error

* gnu/packages/guile-xyz.scm (guile-gi) [phases]: remove the default dotted
circle from the combining character that is tested in test/string.scm.
---
 gnu/packages/guile-xyz.scm | 4 
 1 file changed, 4 insertions(+)

diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm
index 3c93779209..6a401cda45 100644
--- a/gnu/packages/guile-xyz.scm
+++ b/gnu/packages/guile-xyz.scm
@@ -3145,6 +3145,10 @@ (define-public guile-gi
   (ice-9 rdelim))
#:phases
(modify-phases %standard-phases
+ (add-after 'unpack 'workaround-guile-reader-failure
+   (lambda* _
+ (substitute* "test/string.scm"
+   (("#◌̀") "#\\x0300"
  (add-after 'unpack 'patch-references-to-extension
(lambda* (#:key outputs #:allow-other-keys)
  (let ((effective (read-line
-- 
2.33.1

bug#51487: Acknowledgement (The openssh service does not allow multiple authorized key files per user)

2021-10-29 Thread Vivien Kraus via Bug reports for GNU Guix

After some discussion on #guix, this seems to be the easier way to fix
the problem:

Vivien
From d029179554fc2f9656f708e5315bca52928e9254 Mon Sep 17 00:00:00 2001
From: Vivien Kraus 
Date: Fri, 29 Oct 2021 18:25:24 +0200
Subject: [PATCH] gnu: openssh-service: Collect all keys for all users.

* gnu/services/ssh.scm: (authorized-key-directory)[build]: ensure that no key is forgotten.
---
 gnu/services/ssh.scm | 14 ++
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/gnu/services/ssh.scm b/gnu/services/ssh.scm
index a018052eeb..1309e062ce 100644
--- a/gnu/services/ssh.scm
+++ b/gnu/services/ssh.scm
@@ -532,10 +532,16 @@ (define (openssh-pam-services config)
 
 (define (extend-openssh-authorized-keys config keys)
   "Extend CONFIG with the extra authorized keys listed in KEYS."
-  (openssh-configuration
-   (inherit config)
-   (authorized-keys
-(append (openssh-authorized-keys config) keys
+  (let ((all-keys (make-hash-table)))
+(for-each
+ (match-lambda
+   ((user keys ...)
+(hash-set! all-keys user (append (hash-ref all-keys user '()) keys
+ (append (openssh-authorized-keys config) keys))
+(openssh-configuration
+ (inherit config)
+ (authorized-keys
+  (hash-map->list cons all-keys)
 
 (define openssh-service-type
   (service-type (name 'openssh)
-- 
2.33.1

bug#51487: Acknowledgement (The openssh service does not allow multiple authorized key files per user)

2021-10-29 Thread Vivien Kraus via Bug reports for GNU Guix

Le vendredi 29 octobre 2021 à 23:22 +0200, Vivien Kraus a écrit :
> After some discussion on #guix, this seems to be the easier way to
> fix
> the problem:
Sorry, I forgot to update the commit message.

Vivien
From b2f47730a3d9aa97716741134917c340354d9c3a Mon Sep 17 00:00:00 2001
From: Vivien Kraus 
Date: Fri, 29 Oct 2021 18:25:24 +0200
Subject: [PATCH] gnu: openssh-service: Collect all keys for all users.

* gnu/services/ssh.scm (extend-openssh-authorized-keys): ensure that no key is forgotten.
---
 gnu/services/ssh.scm | 14 ++
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/gnu/services/ssh.scm b/gnu/services/ssh.scm
index a018052eeb..1309e062ce 100644
--- a/gnu/services/ssh.scm
+++ b/gnu/services/ssh.scm
@@ -532,10 +532,16 @@ (define (openssh-pam-services config)
 
 (define (extend-openssh-authorized-keys config keys)
   "Extend CONFIG with the extra authorized keys listed in KEYS."
-  (openssh-configuration
-   (inherit config)
-   (authorized-keys
-(append (openssh-authorized-keys config) keys
+  (let ((all-keys (make-hash-table)))
+(for-each
+ (match-lambda
+   ((user keys ...)
+(hash-set! all-keys user (append (hash-ref all-keys user '()) keys
+ (append (openssh-authorized-keys config) keys))
+(openssh-configuration
+ (inherit config)
+ (authorized-keys
+  (hash-map->list cons all-keys)
 
 (define openssh-service-type
   (service-type (name 'openssh)
-- 
2.33.1

bug#51487: Acknowledgement (The openssh service does not allow multiple authorized key files per user)

2021-10-29 Thread Vivien Kraus via Bug reports for GNU Guix

The patch does not seem to get formatted correctly, sorry. Hopefully,
this should work.

Vivien
From 8dcf1a92cb6ebbc537029f88d5c7197cbf4959aa Mon Sep 17 00:00:00 2001
From: Vivien Kraus 
Date: Fri, 29 Oct 2021 18:25:24 +0200
Subject: [PATCH] gnu: openssh-service: Collect all keys for all users.

* gnu/services/ssh.scm: (authorized-key-directory)[build]: ensure that no key is forgotten.
---
 gnu/services/ssh.scm | 28 +---
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/gnu/services/ssh.scm b/gnu/services/ssh.scm
index a018052eeb..118dfdbef8 100644
--- a/gnu/services/ssh.scm
+++ b/gnu/services/ssh.scm
@@ -415,17 +415,23 @@ (define build
(guix build utils))
 
   (mkdir #$output)
-  (for-each (match-lambda
-  ((user keys ...)
-   (let ((file (string-append #$output "/" user)))
- (call-with-output-file file
-   (lambda (port)
- (for-each (lambda (key)
- (call-with-input-file key
-   (cut dump-port <> port)))
-   keys))
-'#$keys
-
+  (let ((by-user (make-hash-table)))
+(for-each
+ (match-lambda
+   ((user keys ...)
+(hash-set! by-user user (append (hash-ref by-user user '()) keys
+ '#$keys)
+(hash-for-each
+ (match-lambda*
+   ((user keys)
+(let ((file (string-append #$output "/" user)))
+  (call-with-output-file file
+(lambda (port)
+  (for-each (lambda (key)
+  (call-with-input-file key
+(cut dump-port <> port)))
+keys))
+ by-user)
   (computed-file "openssh-authorized-keys" build))
 
 (define (openssh-config-file config)
-- 
2.33.1

bug#51487: Acknowledgement (The openssh service does not allow multiple authorized key files per user)

2021-10-29 Thread Vivien Kraus via Bug reports for GNU Guix


Vivien Kraus  writes:
> I have a patch, what do you think?
>
> I tested it by building an operating system of the form:
>
> (operating-system
>   ...
>   (services
>(append
>(list
> (service openssh-service-type
>  (openssh-configuration
>   (authorized-keys
>`(("root" ,(plain-file "first-key" "ssh-rsa ..."))
>  ("root" ,(plain-file "second-key" "ssh-rsa ..."))
>
> I caught the derivation to build the authorized-keys directory, and root
> had 2 keys. Without the patch, root had only 1 key.

The patch wasn’t formatted correctly, sorry.

<<< message/external-body; name="~/Projets/guix/0001-gnu-openssh-service-Collect-all-keys-for-all-users.patch"; access-type=local-file: Unrecognized >>>

>
> Vivien

bug#51487: Acknowledgement (The openssh service does not allow multiple authorized key files per user)

2021-10-29 Thread Vivien Kraus via Bug reports for GNU Guix


I have a patch, what do you think?

I tested it by building an operating system of the form:

(operating-system
  ...
  (services
   (append
   (list
(service openssh-service-type
 (openssh-configuration
  (authorized-keys
   `(("root" ,(plain-file "first-key" "ssh-rsa ..."))
 ("root" ,(plain-file "second-key" "ssh-rsa ..."))

I caught the derivation to build the authorized-keys directory, and root
had 2 keys. Without the patch, root had only 1 key.

Vivien

<<< message/external-body; name="~/Projets/guix/0001-gnu-openssh-service-Collect-all-keys-for-all-users.patch"; access-type=local-file: Unrecognized >>>


signature.asc
Description: PGP signature

bug#51487: The openssh service does not allow multiple authorized key files per user

2021-10-29 Thread Vivien Kraus via Bug reports for GNU Guix


Dear guix,

The openssh service is configured with a list of authorized keys, as a
list of items, where each item is a list of 2 values, the user name (as
a string) and the public key file (a file-like object). The service can
be extended with new keys.

To have multiple keys per user, we can put them on the same file-like
object, each on its own line. However, if we put two different records,
only the last one is remembered.

This is a problem if we want to extend the service for users that
already have a key. As I am trying to create a service that would
convert GPG keys to SSH keys, I am in this exact situation: the users
may have already defined SSH keys, and I want to add some more without
losing the others.

Best regards,

Vivien


signature.asc
Description: PGP signature

bug#51447: Guile-gi fails a few tests on core-updates-frozen

2021-10-27 Thread Vivien Kraus via Bug reports for GNU Guix

Dear guix,

For my program, I depend on guile-gi. However, the test/string.scm test
contains some characters that are not recognized by guile (I suggest
using (call-with-input-string "" read-char) instead of
#\), and once that’s fixed, more tests fail, for which I
have no solution.

Best regards,

Vivien

bug#51439: python-poppler-qt5 fails to build on core-updates-frozen

2021-10-27 Thread Vivien Kraus via Bug reports for GNU Guix

Dear guix,

python-poppler-qt5 (gnu/packages/pdf.scm) fails to build. This is the
latest version, and I’m afraid there’s little we can do:

sip: poppler-form.sip:152:
::Poppler::FormFieldChoice::choicesWithExportValues() unsupported
function return type - provide %MethodCode and a C++ signature

Vivien

bug#51438: Jami does not start on core-updates-frozen

2021-10-27 Thread Vivien Kraus via Bug reports for GNU Guix

Dear guix,

jami (jami-qt or jami-gnome) can’t start on core-updates-frozen, an
error message (jami-gnome) or a console error (jami-qt) says that dring
cannot be started.

Best regards,

Vivien

bug#51436: [PATCH] deja-dup does not build on core-updates-frozen

2021-10-27 Thread Vivien Kraus via Bug reports for GNU Guix

Dear guix,

deja-dup does not build on core-updates-frozen. I think the best way to
fix it is upgrade it to 42.8. What do you think?

Best regards,

Vivien
From 92ea987cae3d3558bef30bb70f84e46b68a67d8f Mon Sep 17 00:00:00 2001
From: Vivien Kraus 
Date: Wed, 27 Oct 2021 12:38:16 +
Subject: [PATCH] gnu: deja-dup: Update to 42.8.

* gnu/packages/gnome.scm (deja-dup): Update to 42.8.
* gnu/packages/gnome.scm (deja-dup)[inputs]: Add libhandy.
---
 gnu/packages/gnome.scm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index b3553196dd..345d1dbd7c 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -1787,14 +1787,14 @@ (define-public gnome-menus
 (define-public deja-dup
   (package
 (name "deja-dup")
-(version "40.6")
+(version "42.8")
 (source (origin
   (method url-fetch)
   (uri (string-append "https://gitlab.gnome.org/World/deja-dup/-/archive/";
   version "/deja-dup-" version ".tar.bz2"))
   (sha256
(base32
-"0lwazh6crby5wpy9fg6zvwy4plqbhs2f98bm5lbizjdlbh88n5q0"
+"0d1jnlxpk52x56aqxz1g2xb4y4sm24h08p2di8mc1k8n8b52rpi4"
 (build-system meson-build-system)
 (arguments
  `(#:glib-or-gtk? #t
@@ -1848,6 +1848,7 @@ (define-public deja-dup
("libnotify" ,libnotify)
("libsecret" ,libsecret)
("libsoup" ,libsoup)
+   ("libhandy" ,libhandy)
("packagekit" ,packagekit)
("python" ,python)
("python-pygobject" ,python-pygobject)))
-- 
2.33.1

bug#51435: unison does not build on core-updates-frozen

2021-10-27 Thread Vivien Kraus via Bug reports for GNU Guix

Dear guix hackers,

unison (gnu/packages/ocaml.scm) does not build (the install-doc phase
fails) on core-updates-frozen, because it lacks at least texlive-fonts-
ec as an input, and then it fails with:

dvips: ! Couldn't find header file: l3backend-dvips.pro

I tried to add texlive-latex-l3backend, but it does not fix the
problem.

Best regards,

Vivien

bug#51127: Acknowledgement (deja-dup cannot start a backup)

2021-10-16 Thread Vivien Kraus via Bug reports for GNU Guix

Le jeudi 14 octobre 2021 à 18:56 +0200, Vivien Kraus a écrit :
> Le jeudi 14 octobre 2021 à 18:43 +0200, Vivien Kraus a écrit :
> > So, I figured out the Gio backends for duplicity need a few tweaks.
> > 
> > You can test it by creating a stupid backup (backup any dir in
> > /tmp).
> > Now it works :)

And now with cooler ChangeLog commit messages!
> 
> > What do you think?
> > 
> > Vivien

From 39d4726859760ae84f2c82d6d3f811ed092bd373 Mon Sep 17 00:00:00 2001
From: Vivien Kraus 
Date: Thu, 14 Oct 2021 17:30:09 +0200
Subject: [PATCH 3/3] gnu: deja-dup: let deja-dup find duplicity

* gnome.scm (deja-dup)[phases]:
Wrap deja-dup to include duplicity in PATH.
---
 gnu/packages/gnome.scm | 9 -
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 20c0be8d9d..3a3219f07a 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -1773,7 +1773,14 @@ (define-public deja-dup
(lambda _
  (substitute* "data/post-install.sh"
(("gtk-update-icon-cache") "true"))
- #t)
+ #t))
+ (add-after 'install 'wrap-program
+   (lambda* (#:key inputs outputs #:allow-other-keys)
+ ;; Add duplicity to the search path
+ (wrap-program (string-append (assoc-ref outputs "out")
+  "/bin/deja-dup")
+   `("PATH" ":" prefix
+ (,(format #f "~a/bin" (assoc-ref inputs "duplicity"))
 (inputs
  `(("gsettings-desktop-schemas" ,gsettings-desktop-schemas)
("duplicity" ,duplicity)
-- 
2.33.1

From c7325a5dfbc56e76e92017cb93914a8ed4545c35 Mon Sep 17 00:00:00 2001
From: Vivien Kraus 
Date: Thu, 14 Oct 2021 18:18:56 +0200
Subject: [PATCH 2/3] gnu: duplicity: depend on dbus

* gnu/packages/backup.scm (duplicity)[inputs]:
Add dbus as an input.

* gnu/packages/backup.scm (duplicity)[phases]:
Substitute the dbus-launch program name.
---
 gnu/packages/backup.scm | 7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm
index 407f6b7212..d1a718eab3 100644
--- a/gnu/packages/backup.scm
+++ b/gnu/packages/backup.scm
@@ -119,6 +119,7 @@ (define-public duplicity
 (inputs
  `(("librsync" ,librsync)
("lftp" ,lftp)
+   ("dbus" ,dbus)   ; dbus-launch (Gio backend)
("gnupg" ,gnupg) ; gpg executable needed
("util-linux" ,util-linux))) ; for setsid
 (arguments
@@ -130,7 +131,11 @@ (define-public duplicity
  (substitute* "duplicity/gpginterface.py"
(("self.call = u'gpg'")
 (string-append "self.call = '" (assoc-ref inputs "gnupg") "/bin/gpg'")))
-
+ (substitute* "duplicity/backends/giobackend.py"
+   (("subprocess.Popen\\(\\[u'dbus-launch'\\]")
+(string-append "subprocess.Popen([u'"
+   (assoc-ref inputs "dbus")
+   "/bin/dbus-launch']")))
  (substitute* '("testing/functional/__init__.py"
 "testing/overrides/bin/lftp")
(("/bin/sh") (which "sh")))
-- 
2.33.1

From ecaf5368c3d82045d500e0fdb4f1ee45dfbcf185 Mon Sep 17 00:00:00 2001
From: Vivien Kraus 
Date: Thu, 14 Oct 2021 17:18:29 +0200
Subject: [PATCH 1/3] gnu: duplicity: depend on pygobject

* gnu/packages/backup.scm (duplicity)[propagated-inputs]:
Add missing input.
---
 gnu/packages/backup.scm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm
index a3f98c95f9..407f6b7212 100644
--- a/gnu/packages/backup.scm
+++ b/gnu/packages/backup.scm
@@ -114,7 +114,8 @@ (define-public duplicity
("mock" ,python-mock)))
 (propagated-inputs
  `(("lockfile" ,python-lockfile)
-   ("urllib3" ,python-urllib3)))
+   ("urllib3" ,python-urllib3)
+   ("pygobject" ,python-pygobject)))
 (inputs
  `(("librsync" ,librsync)
("lftp" ,lftp)
-- 
2.33.1

bug#51127: Acknowledgement (deja-dup cannot start a backup)

2021-10-14 Thread Vivien Kraus via Bug reports for GNU Guix

Le jeudi 14 octobre 2021 à 18:43 +0200, Vivien Kraus a écrit :
> So, I figured out the Gio backends for duplicity need a few tweaks.
> 
> You can test it by creating a stupid backup (backup any dir in /tmp).
> Now it works :)

Sorry, I forgot to run guix lint, and it said that I needed bash-
minimal as an input for wrapped programs.

> What do you think?
> 
> Vivien

From 5eb63be36f0173eb5b177e57dcf11616c01d8a07 Mon Sep 17 00:00:00 2001
From: Vivien Kraus 
Date: Thu, 14 Oct 2021 17:30:09 +0200
Subject: [PATCH 3/3] gnu: deja-dup: let deja-dup find duplicity

* gnome.scm (deja-dup): wrap deja-dup to set PATH
---
 gnu/packages/gnome.scm | 12 ++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 17fb2e0146..a0af7b3777 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -1773,7 +1773,14 @@ (define-public deja-dup
(lambda _
  (substitute* "data/post-install.sh"
(("gtk-update-icon-cache") "true"))
- #t)
+ #t))
+ (add-after 'install 'wrap-program
+   (lambda* (#:key inputs outputs #:allow-other-keys)
+ ;; Add duplicity to the search path
+ (wrap-program (string-append (assoc-ref outputs "out")
+  "/bin/deja-dup")
+   `("PATH" ":" prefix
+ (,(format #f "~a/bin" (assoc-ref inputs "duplicity"))
 (inputs
  `(("gsettings-desktop-schemas" ,gsettings-desktop-schemas)
("duplicity" ,duplicity)
@@ -1785,7 +1792,8 @@ (define-public deja-dup
("libgpg-error" ,libgpg-error)
("libsecret" ,libsecret)
("libsoup" ,libsoup)
-   ("packagekit" ,packagekit)))
+   ("packagekit" ,packagekit)
+   ("bash-minimal" ,bash-minimal)))
     (native-inputs
  `(("appstream-glib" ,appstream-glib)
("desktop-file-utils" ,desktop-file-utils)
-- 
2.33.0

From 6e8a3455fc6d1a65debcf0b9c7e83d8832ce9671 Mon Sep 17 00:00:00 2001
From: Vivien Kraus 
Date: Thu, 14 Oct 2021 18:18:56 +0200
Subject: [PATCH 2/3] gnu: duplicity: depend on dbus

* gnu/packages/backup.scm (duplicity): add dbus ad an input
---
 gnu/packages/backup.scm | 7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm
index 407f6b7212..d1a718eab3 100644
--- a/gnu/packages/backup.scm
+++ b/gnu/packages/backup.scm
@@ -119,6 +119,7 @@ (define-public duplicity
 (inputs
  `(("librsync" ,librsync)
("lftp" ,lftp)
+   ("dbus" ,dbus)   ; dbus-launch (Gio backend)
("gnupg" ,gnupg) ; gpg executable needed
("util-linux" ,util-linux))) ; for setsid
 (arguments
@@ -130,7 +131,11 @@ (define-public duplicity
  (substitute* "duplicity/gpginterface.py"
(("self.call = u'gpg'")
 (string-append "self.call = '" (assoc-ref inputs "gnupg") "/bin/gpg'")))
-
+ (substitute* "duplicity/backends/giobackend.py"
+   (("subprocess.Popen\\(\\[u'dbus-launch'\\]")
+(string-append "subprocess.Popen([u'"
+   (assoc-ref inputs "dbus")
+   "/bin/dbus-launch']")))
  (substitute* '("testing/functional/__init__.py"
 "testing/overrides/bin/lftp")
(("/bin/sh") (which "sh")))
-- 
2.33.0

From 14576b7216b7810168dcda328048417bbb9fa9cd Mon Sep 17 00:00:00 2001
From: Vivien Kraus 
Date: Thu, 14 Oct 2021 17:18:29 +0200
Subject: [PATCH 1/3] gnu: duplicity: depend on pygobject

* gnu/packages/backup.scm (duplicity): add missing input.
---
 gnu/packages/backup.scm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm
index a3f98c95f9..407f6b7212 100644
--- a/gnu/packages/backup.scm
+++ b/gnu/packages/backup.scm
@@ -114,7 +114,8 @@ (define-public duplicity
("mock" ,python-mock)))
 (propagated-inputs
  `(("lockfile" ,python-lockfile)
-   ("urllib3" ,python-urllib3)))
+   ("urllib3" ,python-urllib3)
+   ("pygobject" ,python-pygobject)))
 (inputs
  `(("librsync" ,librsync)
("lftp" ,lftp)
-- 
2.33.0

bug#51127: Acknowledgement (deja-dup cannot start a backup)

2021-10-14 Thread Vivien Kraus via Bug reports for GNU Guix

So, I figured out the Gio backends for duplicity need a few tweaks.

You can test it by creating a stupid backup (backup any dir in /tmp).
Now it works :)

What do you think?

Vivien
From 429fdb8003a0f39a23749d15c02e2bfca9e96f15 Mon Sep 17 00:00:00 2001
From: Vivien Kraus 
Date: Thu, 14 Oct 2021 17:30:09 +0200
Subject: [PATCH 3/3] gnu: deja-dup: let deja-dup find duplicity

* gnome.scm (deja-dup): wrap deja-dup to set PATH
---
 gnu/packages/gnome.scm | 9 -
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 17fb2e0146..1adb22773e 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -1773,7 +1773,14 @@ (define-public deja-dup
(lambda _
  (substitute* "data/post-install.sh"
(("gtk-update-icon-cache") "true"))
- #t)
+ #t))
+ (add-after 'install 'wrap-program
+   (lambda* (#:key inputs outputs #:allow-other-keys)
+ ;; Add duplicity to the search path
+ (wrap-program (string-append (assoc-ref outputs "out")
+  "/bin/deja-dup")
+   `("PATH" ":" prefix
+ (,(format #f "~a/bin" (assoc-ref inputs "duplicity"))
 (inputs
  `(("gsettings-desktop-schemas" ,gsettings-desktop-schemas)
("duplicity" ,duplicity)
-- 
2.33.0

From 6e8a3455fc6d1a65debcf0b9c7e83d8832ce9671 Mon Sep 17 00:00:00 2001
From: Vivien Kraus 
Date: Thu, 14 Oct 2021 18:18:56 +0200
Subject: [PATCH 2/3] gnu: duplicity: depend on dbus

* gnu/packages/backup.scm (duplicity): add dbus ad an input
---
 gnu/packages/backup.scm | 7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm
index 407f6b7212..d1a718eab3 100644
--- a/gnu/packages/backup.scm
+++ b/gnu/packages/backup.scm
@@ -119,6 +119,7 @@ (define-public duplicity
 (inputs
  `(("librsync" ,librsync)
("lftp" ,lftp)
+   ("dbus" ,dbus)   ; dbus-launch (Gio backend)
("gnupg" ,gnupg) ; gpg executable needed
("util-linux" ,util-linux))) ; for setsid
 (arguments
@@ -130,7 +131,11 @@ (define-public duplicity
  (substitute* "duplicity/gpginterface.py"
(("self.call = u'gpg'")
 (string-append "self.call = '" (assoc-ref inputs "gnupg") "/bin/gpg'")))
-
+ (substitute* "duplicity/backends/giobackend.py"
+   (("subprocess.Popen\\(\\[u'dbus-launch'\\]")
+(string-append "subprocess.Popen([u'"
+   (assoc-ref inputs "dbus")
+       "/bin/dbus-launch']")))
  (substitute* '("testing/functional/__init__.py"
 "testing/overrides/bin/lftp")
(("/bin/sh") (which "sh")))
-- 
2.33.0

From 14576b7216b7810168dcda328048417bbb9fa9cd Mon Sep 17 00:00:00 2001
From: Vivien Kraus 
Date: Thu, 14 Oct 2021 17:18:29 +0200
Subject: [PATCH 1/3] gnu: duplicity: depend on pygobject

* gnu/packages/backup.scm (duplicity): add missing input.
---
 gnu/packages/backup.scm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm
index a3f98c95f9..407f6b7212 100644
--- a/gnu/packages/backup.scm
+++ b/gnu/packages/backup.scm
@@ -114,7 +114,8 @@ (define-public duplicity
("mock" ,python-mock)))
 (propagated-inputs
  `(("lockfile" ,python-lockfile)
-   ("urllib3" ,python-urllib3)))
+   ("urllib3" ,python-urllib3)
+   ("pygobject" ,python-pygobject)))
 (inputs
  `(("librsync" ,librsync)
("lftp" ,lftp)
-- 
2.33.0

bug#50677: [PATCH] Minetest basic_materials really depends on moreores

2021-10-14 Thread Vivien Kraus via Bug reports for GNU Guix

Hello Maxime,

Le mercredi 22 septembre 2021 à 20:43 +0200, Maxime Devos a écrit :
> Vivien Kraus schreef op wo 22-09-2021 om 20:37 [+0200]:
> > Le mercredi 22 septembre 2021 à 20:15 +0200, Maxime Devos a écrit :
> > > The latest patch you sent looks good to me, but I didn't test ti.
> > 
> > I tested it by comparing the build of minetest-moreores when it
> > fails
> > because of the missing file and when it succeeds. Do you think it
> > should be enough if it were to be tested that way?
> 
> That should be enough I think.
> 
> Greetings,
> Maxime.

On IRC you said that you did one test. Aside from you, it seems that
noone cares about minetest.

Would you accept this patch? If not, then I’ll trash the error handler
modification and just keep the new packages. What do you think?

Best regards,

Vivien

bug#51127: deja-dup cannot start a backup

2021-10-10 Thread Vivien Kraus via Bug reports for GNU Guix

Dear guix,

After configuring deja-dup for either SSH storage or local file
storage, I try to start the backup, but I get a popup saying:

BackendException: Could not initialize backend: No module named 'gi'

To me, it looks like a python error, but I could not find any
substantial amount of python code in deja-dup, and I could not find any
python file importing gi in the duplicity package.

Best regards,

Vivien

bug#50677: [PATCH] Minetest basic_materials really depends on moreores

2021-09-22 Thread Vivien Kraus via Bug reports for GNU Guix

Le mercredi 22 septembre 2021 à 20:15 +0200, Maxime Devos a écrit :
> The latest patch you sent looks good to me, but I didn't test ti.

I tested it by comparing the build of minetest-moreores when it fails
because of the missing file and when it succeeds. Do you think it
should be enough if it were to be tested that way?

Vivien

bug#50677: [PATCH] Minetest basic_materials really depends on moreores

2021-09-22 Thread Vivien Kraus via Bug reports for GNU Guix

Le mercredi 22 septembre 2021 à 19:41 +0200, Maxime Devos a écrit :
> It would be more convenient
> if the output of Minetest was send to current-output-port,
OK, so it’s like the existing solution, except it should not stop just
at the first error.
From ed878447d600aabdfd80073dab4fdb77cef3801d Mon Sep 17 00:00:00 2001
From: Vivien Kraus 
Date: Sun, 19 Sep 2021 17:00:45 +0200
Subject: [PATCH 4/4] gnu: minetest-basic-materials: Depend on
 minetest-moreores.

* minetest.scm (minetest-basic-materials): Add minetest-moreores as a propagated input.
---
 gnu/packages/minetest.scm | 4 
 1 file changed, 4 insertions(+)

diff --git a/gnu/packages/minetest.scm b/gnu/packages/minetest.scm
index 0730de7351..189889f890 100644
--- a/gnu/packages/minetest.scm
+++ b/gnu/packages/minetest.scm
@@ -221,6 +221,10 @@ numeric identifier TOPIC-ID on the official Minetest forums."
 (base32 "0v6l3lrjgshy4sccjhfhmfxc3gk0cdy73qb02i9wd2vw506v5asx"))
(file-name (git-file-name name version
 (build-system minetest-mod-build-system)
+(propagated-inputs
+ ;; basic_materials:silver_wire cannot be crafted without
+ ;; moreores:silver_ingot.
+ `(("minetest-moreores" ,minetest-moreores)))
 (home-page (minetest-topic 21000))
 (synopsis "Some \"basic\" materials and items for other Minetest mods to use")
 (description
-- 
2.33.0

From f018ebee7972f49bfd6c3012d822432f9d97b767 Mon Sep 17 00:00:00 2001
From: Vivien Kraus 
Date: Sun, 19 Sep 2021 16:58:53 +0200
Subject: [PATCH 3/4] gnu: Add minetest-moreores.

* gnu/packages/minetest.scm (minetest-moreores): New variable.
---
 gnu/packages/minetest.scm | 19 +++
 1 file changed, 19 insertions(+)

diff --git a/gnu/packages/minetest.scm b/gnu/packages/minetest.scm
index fd1439d4d2..0730de7351 100644
--- a/gnu/packages/minetest.scm
+++ b/gnu/packages/minetest.scm
@@ -187,6 +187,25 @@ numeric identifier TOPIC-ID on the official Minetest forums."
   (string-append "https://forum.minetest.net/viewtopic.php?t=";
  (number->string topic-id)))
 
+(define-public minetest-moreores
+  (package
+(name "minetest-moreores")
+(version "2.1.0")
+(source
+ (origin
+   (method git-fetch)
+   (uri (git-reference
+ (url "https://github.com/minetest-mods/moreores";)
+ (commit "0b6f669df4c9b7771c03e0e6ba8effb471cdfcae")))
+   (sha256 (base32 "1chfqbc6bb27aacjc67j5l5wcdvmcsvk2rfmangipd7nwini3y34"))
+   (file-name (git-file-name name version
+(build-system minetest-mod-build-system)
+(home-page (minetest-topic 549))
+(synopsis "Adds new ore types")
+(description "More ores for Minetest.")
+(license license:zlib)
+(properties `((upstream-name . "Calinou/moreores")
+
 (define-public minetest-basic-materials
   (package
 (name "minetest-basic-materials")
-- 
2.33.0

From 9b6a7751a3240e6363b231a50f6795aaf0433f76 Mon Sep 17 00:00:00 2001
From: Vivien Kraus 
Date: Sun, 19 Sep 2021 22:42:49 +0200
Subject: [PATCH 2/4] guix: minetest-build-system: Also install config.txt and
 _config.txt

* minetest-build-system.scm (mod-install-plan): Add config.txt and _config.txt to the list of installed files.
---
 guix/build/minetest-build-system.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/guix/build/minetest-build-system.scm b/guix/build/minetest-build-system.scm
index c14c6d1fcc..5f68686067 100644
--- a/guix/build/minetest-build-system.scm
+++ b/guix/build/minetest-build-system.scm
@@ -41,7 +41,7 @@
  ;; See <https://github.com/minetest/minetest/blob/master/doc/lua_api.txt>
  ;; for an incomple list of files that can be found in mods.
  #:include ("mod.conf" "modpack.conf" "settingtypes.txt" "depends.txt"
-"description.txt")
+"description.txt" "config.txt" "_config.txt")
  #:include-regexp (".lua$" ".png$" ".ogg$" ".obj$" ".b3d$" ".tr$"
".mts$"
 
-- 
2.33.0

From f1eec756c9b35442f7f2730585eb671e57ddb50c Mon Sep 17 00:00:00 2001
From: Vivien Kraus 
Date: Sun, 19 Sep 2021 20:03:10 +0200
Subject: [PATCH 1/4] guix: minetest-build-system: Gather the whole output when
 a test fails

* minetest-build-system.scm (check): Gather the whole output when a test fails.
---
 guix/build/minetest-build-system.scm | 23 ++-
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/guix/build/minetest-build-system.scm b/guix/build/minetest-build-system.scm
index 477cc3d1d0..c14c6d1fcc 100644
--- a/guix/build/minetest-build-system.scm
+++ b/guix/build/minetest-build-system.scm
@@ -23,6 +23,7 @@
   #:use-module (ice-9 rdelim)
   #:use-mo

bug#50677: [PATCH] Minetest basic_materials really depends on moreores

2021-09-22 Thread Vivien Kraus via Bug reports for GNU Guix

lylip on the #guix chat suggested to save the log to disk, so that the
errors can be read in context. I think it is the best thing to do, what
do you think?

Vivien
From f5cafa5aaf26b065f3627d5e013d06c86c251f8f Mon Sep 17 00:00:00 2001
From: Vivien Kraus 
Date: Sun, 19 Sep 2021 17:00:45 +0200
Subject: [PATCH 4/4] gnu: minetest-basic-materials: Depend on
 minetest-moreores.

* minetest.scm (minetest-basic-materials): Add minetest-moreores as a propagated input.
---
 gnu/packages/minetest.scm | 4 
 1 file changed, 4 insertions(+)

diff --git a/gnu/packages/minetest.scm b/gnu/packages/minetest.scm
index 0730de7351..189889f890 100644
--- a/gnu/packages/minetest.scm
+++ b/gnu/packages/minetest.scm
@@ -221,6 +221,10 @@ numeric identifier TOPIC-ID on the official Minetest forums."
 (base32 "0v6l3lrjgshy4sccjhfhmfxc3gk0cdy73qb02i9wd2vw506v5asx"))
(file-name (git-file-name name version
 (build-system minetest-mod-build-system)
+(propagated-inputs
+ ;; basic_materials:silver_wire cannot be crafted without
+ ;; moreores:silver_ingot.
+ `(("minetest-moreores" ,minetest-moreores)))
 (home-page (minetest-topic 21000))
 (synopsis "Some \"basic\" materials and items for other Minetest mods to use")
 (description
-- 
2.33.0

From 92e59ddbcd185faaf0de00d8ac3cc68fdd13f531 Mon Sep 17 00:00:00 2001
From: Vivien Kraus 
Date: Sun, 19 Sep 2021 16:58:53 +0200
Subject: [PATCH 3/4] gnu: Add minetest-moreores.

* gnu/packages/minetest.scm (minetest-moreores): New variable.
---
 gnu/packages/minetest.scm | 19 +++
 1 file changed, 19 insertions(+)

diff --git a/gnu/packages/minetest.scm b/gnu/packages/minetest.scm
index fd1439d4d2..0730de7351 100644
--- a/gnu/packages/minetest.scm
+++ b/gnu/packages/minetest.scm
@@ -187,6 +187,25 @@ numeric identifier TOPIC-ID on the official Minetest forums."
   (string-append "https://forum.minetest.net/viewtopic.php?t=";
  (number->string topic-id)))
 
+(define-public minetest-moreores
+  (package
+(name "minetest-moreores")
+(version "2.1.0")
+(source
+ (origin
+   (method git-fetch)
+   (uri (git-reference
+ (url "https://github.com/minetest-mods/moreores";)
+ (commit "0b6f669df4c9b7771c03e0e6ba8effb471cdfcae")))
+   (sha256 (base32 "1chfqbc6bb27aacjc67j5l5wcdvmcsvk2rfmangipd7nwini3y34"))
+   (file-name (git-file-name name version
+(build-system minetest-mod-build-system)
+(home-page (minetest-topic 549))
+(synopsis "Adds new ore types")
+(description "More ores for Minetest.")
+(license license:zlib)
+(properties `((upstream-name . "Calinou/moreores")
+
 (define-public minetest-basic-materials
   (package
 (name "minetest-basic-materials")
-- 
2.33.0

From 9176a157e6cd73fe70549d3796772a944db822ed Mon Sep 17 00:00:00 2001
From: Vivien Kraus 
Date: Sun, 19 Sep 2021 22:42:49 +0200
Subject: [PATCH 2/4] guix: minetest-build-system: Also install config.txt and
 _config.txt

* minetest-build-system.scm (mod-install-plan): Add config.txt and _config.txt to the list of installed files.
---
 guix/build/minetest-build-system.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/guix/build/minetest-build-system.scm b/guix/build/minetest-build-system.scm
index df6fb50416..d238056231 100644
--- a/guix/build/minetest-build-system.scm
+++ b/guix/build/minetest-build-system.scm
@@ -41,7 +41,7 @@
  ;; See <https://github.com/minetest/minetest/blob/master/doc/lua_api.txt>
  ;; for an incomple list of files that can be found in mods.
  #:include ("mod.conf" "modpack.conf" "settingtypes.txt" "depends.txt"
-"description.txt")
+"description.txt" "config.txt" "_config.txt")
  #:include-regexp (".lua$" ".png$" ".ogg$" ".obj$" ".b3d$" ".tr$"
".mts$"
 
-- 
2.33.0

From ffcd1922af4a1249b78f8e749d37b83e5f20034a Mon Sep 17 00:00:00 2001
From: Vivien Kraus 
Date: Sun, 19 Sep 2021 20:03:10 +0200
Subject: [PATCH 1/4] guix: minetest-build-system: Save the full test log

* minetest-build-system.scm (check): Save the full test log.
---
 guix/build/minetest-build-system.scm | 35 +---
 1 file changed, 21 insertions(+), 14 deletions(-)

diff --git a/guix/build/minetest-build-system.scm b/guix/build/minetest-build-system.scm
index 477cc3d1d0..df6fb50416 100644
--- a/guix/build/minetest-build-system.scm
+++ b/guix/build/minetest-build-system.scm
@@ -23,6 +23,7 @@
   #:use-module (ice-9 rdelim)
   #:use-module (ice-9 receive)
   #:use-module (ice-9 regex)
+  #:use-module (ice-9 exceptions)
   #:use-module ((guix build gnu-build-syst

bug#50677: [PATCH] Minetest basic_materials really depends on moreores

2021-09-19 Thread Vivien Kraus via Bug reports for GNU Guix

Le dimanche 19 septembre 2021 à 21:11 +0200, Maxime Devos a écrit :
> I found a use of "config.txt" (
> https://forum.minetest.net/viewtopic.php?t=2290),
> "settingstypes.txt" (
> https://github.com/NathanSalapat/more_fire/blob/master/settingtypes.txt
> )
> and another "_config.txt" (
> https://forum.minetest.net/viewtopic.php?t=25275).
> 
> "settingstypes.txt" is already in mod-install-plan (guix build
> minetest-build-system).
> I suppose you can add "config.txt" and "_config.txt" as well.

OK.

> Vivien Kraus schreef op zo 19-09-2021 om 20:59 [+0200]:
> > Le dimanche 19 septembre 2021 à 20:54 +0200, Vivien Kraus a écrit :
> > > I forgot to say, I could not figure out why the package did not
> > > build,
> > > because the check phase in the minetest build system stops after
> the
> > > first error line of output, which only stated that there was a
> > > problem
> > > with init.lua. I had to disable the error line detection in the
> build
> > > system implementation to know it was a problem with this file.
> So, I
> > > figured out that what we need to do is gather all error lines,
> until
> > > either the server stops or starts despite the error, and fail
> only
> > > then.
> > >
> > > I prefer the exceptions API because it can handle multiple lines
> of
> > > errors while displaying them cleanly (unlike the error function,
> that
> > > displays an ugly ~a and prints the arguments on 1 line). But,
> it’s
> > > only
> > > for the "new" guile 3.0.
> 
> This modified error reporting seems reasonable to me, but I haven't
> tested
> it.

I link my output without 0001 (fail at first error line) nor 0002 (fail
because of _config.txt): the build fails without a mention of
_config.txt; and my output just without 0002: the build fails more
nicely. Also, all other packages returned by "guix search minetest"
still build successfully.

Vivien
From 154ff4665ededc1af5d088987362975b623d8303 Mon Sep 17 00:00:00 2001
From: Vivien Kraus 
Date: Sun, 19 Sep 2021 17:00:45 +0200
Subject: [PATCH 4/4] gnu: minetest-basic-materials: Depend on
 minetest-moreores.

* minetest.scm (minetest-basic-materials): Add minetest-moreores as a propagated input.
---
 gnu/packages/minetest.scm | 4 
 1 file changed, 4 insertions(+)

diff --git a/gnu/packages/minetest.scm b/gnu/packages/minetest.scm
index 0730de7351..189889f890 100644
--- a/gnu/packages/minetest.scm
+++ b/gnu/packages/minetest.scm
@@ -221,6 +221,10 @@ numeric identifier TOPIC-ID on the official Minetest forums."
 (base32 "0v6l3lrjgshy4sccjhfhmfxc3gk0cdy73qb02i9wd2vw506v5asx"))
(file-name (git-file-name name version
 (build-system minetest-mod-build-system)
+(propagated-inputs
+ ;; basic_materials:silver_wire cannot be crafted without
+     ;; moreores:silver_ingot.
+ `(("minetest-moreores" ,minetest-moreores)))
 (home-page (minetest-topic 21000))
 (synopsis "Some \"basic\" materials and items for other Minetest mods to use")
 (description
-- 
2.33.0

From 60eb61bf110a9a3702ae6a7d35efc347363d73f1 Mon Sep 17 00:00:00 2001
From: Vivien Kraus 
Date: Sun, 19 Sep 2021 16:58:53 +0200
Subject: [PATCH 3/4] gnu: Add minetest-moreores.

* gnu/packages/minetest.scm (minetest-moreores): New variable.
---
 gnu/packages/minetest.scm | 19 +++
 1 file changed, 19 insertions(+)

diff --git a/gnu/packages/minetest.scm b/gnu/packages/minetest.scm
index fd1439d4d2..0730de7351 100644
--- a/gnu/packages/minetest.scm
+++ b/gnu/packages/minetest.scm
@@ -187,6 +187,25 @@ numeric identifier TOPIC-ID on the official Minetest forums."
   (string-append "https://forum.minetest.net/viewtopic.php?t=";
  (number->string topic-id)))
 
+(define-public minetest-moreores
+  (package
+(name "minetest-moreores")
+(version "2.1.0")
+(source
+ (origin
+   (method git-fetch)
+   (uri (git-reference
+ (url "https://github.com/minetest-mods/moreores";)
+ (commit "0b6f669df4c9b7771c03e0e6ba8effb471cdfcae")))
+   (sha256 (base32 "1chfqbc6bb27aacjc67j5l5wcdvmcsvk2rfmangipd7nwini3y34"))
+   (file-name (git-file-name name version
+(build-system minetest-mod-build-system)
+(home-page (minetest-topic 549))
+(synopsis "Adds new ore types")
+(description "More ores for Minetest.")
+(license license:zlib)
+(properties `((upstream-name . "Calinou/moreores")
+
 (define-public minetest-basic-materials
   (package
 (name "minetest-basic-materials")
-- 
2.33.0

From a2de70e505e5e541a516cb7f2b8f46e58c0d918f

bug#50677: [PATCH] Minetest basic_materials really depends on moreores

2021-09-19 Thread Vivien Kraus via Bug reports for GNU Guix

Le dimanche 19 septembre 2021 à 20:54 +0200, Vivien Kraus a écrit :
> I forgot to say, I could not figure out why the package did not
> build,
> because the check phase in the minetest build system stops after the
> first error line of output, which only stated that there was a
> problem
> with init.lua. I had to disable the error line detection in the build
> system implementation to know it was a problem with this file. So, I
> figured out that what we need to do is gather all error lines, until
> either the server stops or starts despite the error, and fail only
> then.
> 
> I prefer the exceptions API because it can handle multiple lines of
> errors while displaying them cleanly (unlike the error function, that
> displays an ugly ~a and prints the arguments on 1 line). But, it’s
> only
> for the "new" guile 3.0.
Sorry, the patterns were not in the correct order. This version is
better.
From 8daeded7ce3eeb02a1b239577fd26ffdf6a2b247 Mon Sep 17 00:00:00 2001
From: Vivien Kraus 
Date: Sun, 19 Sep 2021 20:03:10 +0200
Subject: [PATCH 1/3] guix: minetest-build-system: Report all error lines
 before failing

* minetest-build-system.scm (check): Report all error lines before failing.
---
 guix/build/minetest-build-system.scm | 24 +++-
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/guix/build/minetest-build-system.scm b/guix/build/minetest-build-system.scm
index 477cc3d1d0..985859036c 100644
--- a/guix/build/minetest-build-system.scm
+++ b/guix/build/minetest-build-system.scm
@@ -23,6 +23,7 @@
   #:use-module (ice-9 rdelim)
   #:use-module (ice-9 receive)
   #:use-module (ice-9 regex)
+  #:use-module (ice-9 exceptions)
   #:use-module ((guix build gnu-build-system) #:prefix gnu:)
   #:use-module ((guix build copy-build-system) #:prefix copy:)
   #:export (%standard-phases
@@ -199,20 +200,25 @@ auth_backend = sqlite3
 (define (stop? line)
   (and (string? line)
(string-contains line "ACTION[Server]: singleplayer [127.0.0.1] joins game.")))
-(let loop ()
-  (match (read-line port)
-((? error? line)
- (error "minetest raised an error: ~a" line))
-((? stop?)
+(let loop ((errors '()))
+  (match `(,(read-line port) ,errors)
+(((? error? line) errors)
+ (loop `(,line ,@errors)))
+(((? stop?) ())
  (kill pid SIGINT)
  (close-port port)
  (waitpid pid))
-((? string? line)
+(((? eof-object?) ())
+ (error "minetest didn't start"))
+(((or (? stop?) (? eof-object?)) errors)
+ (raise-exception
+  (apply make-exception
+ (map make-exception-with-message
+  (reverse errors)
+(((? string? line) errors)
  (display line)
  (newline)
- (loop))
-((? eof-object?)
- (error "minetest didn't start"
+ (loop errors
 
 (define %standard-phases
   (modify-phases gnu:%standard-phases
-- 
2.33.0

bug#50677: [PATCH] Minetest basic_materials really depends on moreores

2021-09-19 Thread Vivien Kraus via Bug reports for GNU Guix

Hello,

Le dimanche 19 septembre 2021 à 19:40 +0200, Maxime Devos a écrit :
> > + (version "v2.1.0")
> 
> Versions in guix don't use any leading "v" prefix.  If I'm not
> mistaken,
> Ludovic applied the patched to remove them automatically.
Right, I just had not guix pulled lately, I confirm it works with a
more recent guix version.

> > /share/minetest/mods/moreores/_config.txt
> 
> Is this "_config.txt" file moreores-specific?  If not, maybe
> minetest-mod-build-system
> could be modified to install these files by default?
I don’t know, but a quick web search for:

   minetest mod "_config.txt"

gave me 2 hits, one for moreores, and one for moreblocks, by the same
author. I supposed it is an author preference.

I forgot to say, I could not figure out why the package did not build,
because the check phase in the minetest build system stops after the
first error line of output, which only stated that there was a problem
with init.lua. I had to disable the error line detection in the build
system implementation to know it was a problem with this file. So, I
figured out that what we need to do is gather all error lines, until
either the server stops or starts despite the error, and fail only
then.

I prefer the exceptions API because it can handle multiple lines of
errors while displaying them cleanly (unlike the error function, that
displays an ugly ~a and prints the arguments on 1 line). But, it’s only
for the "new" guile 3.0.

What do you think?

Vivien
From eeb9c3a599aa07b36bd8b8ca8000ad6ef594dd99 Mon Sep 17 00:00:00 2001
From: Vivien Kraus 
Date: Sun, 19 Sep 2021 17:00:45 +0200
Subject: [PATCH 3/3] gnu: minetest-basic-materials: Depend on
 minetest-moreores.

* minetest.scm (minetest-basic-materials): Add minetest-moreores as a propagated input.
---
 gnu/packages/minetest.scm | 4 
 1 file changed, 4 insertions(+)

diff --git a/gnu/packages/minetest.scm b/gnu/packages/minetest.scm
index de1415097d..666f78c6ba 100644
--- a/gnu/packages/minetest.scm
+++ b/gnu/packages/minetest.scm
@@ -230,6 +230,10 @@ numeric identifier TOPIC-ID on the official Minetest forums."
 (base32 "0v6l3lrjgshy4sccjhfhmfxc3gk0cdy73qb02i9wd2vw506v5asx"))
(file-name (git-file-name name version
 (build-system minetest-mod-build-system)
+(propagated-inputs
+ ;; basic_materials:silver_wire cannot be crafted without
+ ;; moreores:silver_ingot.
+ `(("minetest-moreores" ,minetest-moreores)))
 (home-page (minetest-topic 21000))
 (synopsis "Some \"basic\" materials and items for other Minetest mods to use")
 (description
-- 
2.33.0

From d19f2812f8b77fc2896ff1b8b42b9d99efb42a0c Mon Sep 17 00:00:00 2001
From: Vivien Kraus 
Date: Sun, 19 Sep 2021 16:58:53 +0200
Subject: [PATCH 2/3] gnu: Add minetest-moreores.

* gnu/packages/minetest.scm (minetest-moreores): New variable.
---
 gnu/packages/minetest.scm | 28 
 1 file changed, 28 insertions(+)

diff --git a/gnu/packages/minetest.scm b/gnu/packages/minetest.scm
index fd1439d4d2..de1415097d 100644
--- a/gnu/packages/minetest.scm
+++ b/gnu/packages/minetest.scm
@@ -187,6 +187,34 @@ numeric identifier TOPIC-ID on the official Minetest forums."
   (string-append "https://forum.minetest.net/viewtopic.php?t=";
  (number->string topic-id)))
 
+(define-public minetest-moreores
+  (package
+(name "minetest-moreores")
+(version "2.1.0")
+(source
+ (origin
+   (method git-fetch)
+   (uri (git-reference
+ (url "https://github.com/minetest-mods/moreores";)
+ (commit "0b6f669df4c9b7771c03e0e6ba8effb471cdfcae")))
+   (sha256 (base32 "1chfqbc6bb27aacjc67j5l5wcdvmcsvk2rfmangipd7nwini3y34"))
+   (file-name (git-file-name name version
+(build-system minetest-mod-build-system)
+(arguments
+ `(#:phases
+   (modify-phases %standard-phases
+ (add-after 'install 'install-_config.txt
+   (lambda* _
+ (copy-file
+  "_config.txt"
+  (string-append %output "/share/minetest/mods/moreores/_config.txt"))
+ #t)
+(home-page (minetest-topic 549))
+(synopsis "Adds new ore types")
+(description "More ores for Minetest.")
+(license license:zlib)
+(properties `((upstream-name . "Calinou/moreores")
+
 (define-public minetest-basic-materials
   (package
 (name "minetest-basic-materials")
-- 
2.33.0

From 48095aa751cef4202e280c2d0ffa35a8d1cb5c12 Mon Sep 17 00:00:00 2001
From: Vivien Kraus 
Date: Sun, 19 Sep 2021 20:03:10 +0200
Subject: [PATCH 1/3] guix: minetest-build-system: Report all error lines
 before failing

* minetest-build-system.scm (check): Report all error lines before failing.
---

bug#50677: [PATCH] Minetest basic_materials really depends on moreores

2021-09-19 Thread Vivien Kraus via Bug reports for GNU Guix

Dear guix,

basic_materials actually requires moreores, otherwise some craft
recipes are just not possible. For instance,
basic_materials:silver_wire can only be crafted with
moreores:silver_ingot. This silver wire is actually needed for basic
technic machines, such as the LV compressor.

So, let’s add minetest-moreores!

Vivien
From 29ad4ee950fae906c90c512dedde7b5198f09f63 Mon Sep 17 00:00:00 2001
From: Vivien Kraus 
Date: Sun, 19 Sep 2021 17:00:45 +0200
Subject: [PATCH 2/2] gnu: minetest-basic-materials: Depend on
 minetest-moreores.

* minetest.scm (minetest-basic-materials): Add minetest-moreores as a propagated input.
---
 gnu/packages/minetest.scm | 4 
 1 file changed, 4 insertions(+)

diff --git a/gnu/packages/minetest.scm b/gnu/packages/minetest.scm
index 49e5a00fd2..9bcd470634 100644
--- a/gnu/packages/minetest.scm
+++ b/gnu/packages/minetest.scm
@@ -230,6 +230,10 @@ numeric identifier TOPIC-ID on the official Minetest forums."
 (base32 "0v6l3lrjgshy4sccjhfhmfxc3gk0cdy73qb02i9wd2vw506v5asx"))
(file-name (git-file-name name version
 (build-system minetest-mod-build-system)
+(propagated-inputs
+ ;; basic_materials:silver_wire cannot be crafted without
+ ;; moreores:silver_ingot.
+ `(("minetest-moreores" ,minetest-moreores)))
 (home-page (minetest-topic 21000))
 (synopsis "Some \"basic\" materials and items for other Minetest mods to use")
 (description
-- 
2.33.0

From 7beb382034560802e189a6494b6de40818cc1755 Mon Sep 17 00:00:00 2001
From: Vivien Kraus 
Date: Sun, 19 Sep 2021 16:58:53 +0200
Subject: [PATCH 1/2] gnu: Add minetest-moreores.

* gnu/packages/minetest.scm (minetest-moreores): New variable.
---
 gnu/packages/minetest.scm | 28 
 1 file changed, 28 insertions(+)

diff --git a/gnu/packages/minetest.scm b/gnu/packages/minetest.scm
index fd1439d4d2..49e5a00fd2 100644
--- a/gnu/packages/minetest.scm
+++ b/gnu/packages/minetest.scm
@@ -187,6 +187,34 @@ numeric identifier TOPIC-ID on the official Minetest forums."
   (string-append "https://forum.minetest.net/viewtopic.php?t=";
  (number->string topic-id)))
 
+(define-public minetest-moreores
+  (package
+(name "minetest-moreores")
+(version "v2.1.0")
+(source
+ (origin
+   (method git-fetch)
+   (uri (git-reference
+ (url "https://github.com/minetest-mods/moreores";)
+ (commit "0b6f669df4c9b7771c03e0e6ba8effb471cdfcae")))
+   (sha256 (base32 "1chfqbc6bb27aacjc67j5l5wcdvmcsvk2rfmangipd7nwini3y34"))
+   (file-name (git-file-name name version
+(build-system minetest-mod-build-system)
+(arguments
+ `(#:phases
+   (modify-phases %standard-phases
+ (add-after 'install 'install-_config.txt
+   (lambda* (#:key inputs #:allow-other-keys)
+ (copy-file
+  "_config.txt"
+  (string-append %output "/share/minetest/mods/moreores/_config.txt"))
+ #t)
+(home-page (minetest-topic 549))
+(synopsis "Adds new ore types")
+(description "More ores for Minetest.")
+(license license:zlib)
+(properties `((upstream-name . "Calinou/moreores")
+
 (define-public minetest-basic-materials
   (package
 (name "minetest-basic-materials")
-- 
2.33.0

bug#49369: Duplicated SSL_CERT_DIR value, and the cuirass service

2021-07-03 Thread Vivien Kraus via Bug reports for GNU Guix

Dear guix,

When I set up the cuirass service, my /run/current-
system/profile/etc/profile file goes from:

export SSL_CERT_DIR="${GUIX_PROFILE:-
/gnu/store/v7yks560hnm9zkjw1ynsavfdgwbvkq9w-
profile}/etc/ssl/certs${SSL_CERT_DIR:+:}$SSL_CERT_DIR"

to:

export SSL_CERT_DIR="${GUIX_PROFILE:-
/gnu/store/4zby6gn6kv92mn4mck4jw3jxcs82821p-profile}/etc/ssl/certs"

Notice how with cuirass, the variable is expanded to potentially
multiple values.

As a result (I don’t fully understand why), with the cuirass service in
place, my $SSL_CERT_DIR is set to:

/run/current-system/profile/etc/ssl/certs:/run/current-
system/profile/etc/ssl/certs

(notice the duplicated entry)

Due to that, the guile web client is broken because guile does not
support a colon-separated path in SSL_CERT_DIR.

Attributing the blame to this breakage is tricky, because guile is not
100% clean (it should support a path), it’s not clear to me why cuirass
needs to re-define SSL_CERT_DIR, but maybe guix should not consider
that cuirass is installed when it is used as a service.

Best regards,

Vivien

bug#37403: Cannot 'guix guix build --target=x86_64-w64-mingw32 perl'

2019-09-14 Thread Vivien Kraus



Hello,

Jan Nieuwenhuizen writes:
> Are you using the core-updates-next branch?

No, how do I do that?

Best regards,

Vivien

bug#37403: Cannot 'guix guix build --target=x86_64-w64-mingw32 perl'

2019-09-14 Thread Vivien Kraus


Hello,


Danny Milosavljevic writes:

> The purpose of "remove-extra-references" seems to be to shrink the
> number of recorded dependencies, so maybe compare it with the unshrinked
> list of dependencies by printing the latter out (apparently it should be
> inside Config_heavy.pl and Config.pm in the temporary build
> directory--could you post those?).

I have several Config.pm files:

./lib/perl5/5.28.0/Net/Config.pm
./lib/perl5/5.28.0/ExtUtils/MakeMaker/Config.pm
./lib/perl5/5.28.0/x86_64-linux-thread-multi/Config.pm
./lib/perl5/5.28.0/x86_64-linux-thread-multi/Encode/Config.pm

In doubt I attach all four, plus the Config_heavy one :)

# This file was created by configpm when Perl was built. Any changes
# made to this file will be lost the next time perl is built.

package Config;
use strict;
use warnings;
our %Config;

sub bincompat_options {
return split ' ', (Internals::V())[0];
}

sub non_bincompat_options {
return split ' ', (Internals::V())[1];
}

sub compile_date {
return (Internals::V())[2]
}

sub local_patches {
my (undef, undef, undef, @patches) = Internals::V();
return @patches;
}

sub _V {
die "Perl lib was built for 'linux' but is being run on '$^O'"
unless "linux" eq $^O;

my ($bincompat, $non_bincompat, $date, @patches) = Internals::V();

my @opts = sort split ' ', "$bincompat $non_bincompat";

print Config::myconfig();
print "\nCharacteristics of this binary (from libperl): \n";

print "  Compile-time options:\n";
print "$_\n" for @opts;

if (@patches) {
print "  Locally applied patches:\n";
print "$_\n" foreach @patches;
}

print "  Built under linux\n";

print "  $date\n" if defined $date;

my @env = map { "$_=\"$ENV{$_}\"" } sort grep {/^PERL/} keys %ENV;

if (@env) {
print "  \%ENV:\n";
print "$_\n" foreach @env;
}
print "  \@INC:\n";
print "$_\n" foreach @INC;
}

sub header_files {
return qw(EXTERN.h INTERN.h XSUB.h av.h config.h cop.h cv.h
  dosish.h embed.h embedvar.h form.h gv.h handy.h hv.h hv_func.h
  intrpvar.h iperlsys.h keywords.h mg.h nostdio.h op.h opcode.h
  pad.h parser.h patchlevel.h perl.h perlio.h perliol.h perlsdio.h
  perlvars.h perly.h pp.h pp_proto.h proto.h regcomp.h regexp.h
  regnodes.h scope.h sv.h thread.h time64.h unixish.h utf8.h
  util.h);
}

##!/gnu/store/q19l04vd2za80mk1845pz7r8cz29qk43-bash-minimal-4.4.23/bin/sh
##
## This file was produced by running the Configure script. It holds all the
## definitions figured out by Configure. Should you modify one of these values,
## do not forget to propagate your changes by running "Configure -der". You may
## instead choose to run each of the .SH files by yourself, or "Configure -S".
##
#
## Package name  : perl5
## Source directory  : .
## Configuration time: 1970-01-01
## Configured by : guix
## Target system : linux 
#
#: Configure command line arguments.
#
#: Variables propagated from previous config.sh file.

our $summary = <<'!END!';
Summary of my $package (revision $revision $version_patchlevel_string) configuration:
  $git_commit_id_title $git_commit_id$git_ancestor_line
  Platform:
osname=$osname
osvers=$osvers
archname=$archname
uname='$myuname'
config_args='$config_args'
hint=$hint
useposix=$useposix
d_sigaction=$d_sigaction
useithreads=$useithreads
usemultiplicity=$usemultiplicity
use64bitint=$use64bitint
use64bitall=$use64bitall
uselongdouble=$uselongdouble
usemymalloc=$usemymalloc
default_inc_excludes_dot=$default_inc_excludes_dot
bincompat5005=undef
  Compiler:
cc='$cc'
ccflags ='$ccflags'
optimize='$optimize'
cppflags='$cppflags'
ccversion='$ccversion'
gccversion='$gccversion'
gccosandvers='$gccosandvers'
intsize=$intsize
longsize=$longsize
ptrsize=$ptrsize
doublesize=$doublesize
byteorder=$byteorder
doublekind=$doublekind
d_longlong=$d_longlong
longlongsize=$longlongsize
d_longdbl=$d_longdbl
longdblsize=$longdblsize
longdblkind=$longdblkind
ivtype='$ivtype'
ivsize=$ivsize
nvtype='$nvtype'
nvsize=$nvsize
Off_t='$lseektype'
lseeksize=$lseeksize
alignbytes=$alignbytes
prototype=$prototype
  Linker and Libraries:
ld='$ld'
ldflags ='$ldflags'
libpth=$libpth
libs=$libs
perllibs=$perllibs
libc=$libc
so=$so
useshrplib=$useshrplib
libperl=$libperl
gnulibc_version='$gnulibc_version'
  Dynamic Linking:
dlsrc=$dlsrc
dlext=$dlext
d_dlsymun=$d_dlsymun
ccdlflags='$ccdlflags'
cccdlflags='$cccdlflags'
lddlflags='$lddlflags'

!END!
my $summary_expanded;

sub myconfig {
return $summary_expanded if $summary_expanded;
($summary_expanded = $summary) =~ s{\$(\w+)}
		 { 
			my $c;
			if ($1 eq 'git_ancestor_line') {
if ($Config::Config{git_ancestor}) {

bug#37403: Cannot 'guix guix build --target=x86_64-w64-mingw32 perl'

2019-09-14 Thread Vivien Kraus

P writes:
> Seems like cross compiling with mingw is broken for other packages too, I 
> tried the guile example about a week ago and also Lua (which is a super 
> portable language, so it should work everywhere, usually without 
> modifications) and neither worked.

Oops.  I was hoping I could build my Gtk+ application with guix,
and thus get rid of the Fedora container.

This bug is so depressing though: perl builds just fine, installs just
fine, but guix fails at the very end, in the 'remove-extra-references' step.

Vivien

bug#37403: Cannot 'guix guix build --target=x86_64-w64-mingw32 perl'

2019-09-14 Thread Vivien Kraus



Hello guix,

Trying to run 'guix build --target=x86_64-w64-mingw32 perl' results in
the following exception in the latest stages of the build:

phase `install' succeeded after 36.7 seconds
starting phase `remove-extra-references'
Backtrace:
  13 (primitive-load "/gnu/store/qnavzfxvw5rng7z8rzlx9zw0ji9…")
In ice-9/eval.scm:
   191:35 12 (_ _)
In srfi/srfi-1.scm:
   863:16 11 (every1 # …)
In 
/gnu/store/gfprsx2m62cvqbh7ysc9ay9slhijvmal-module-import/guix/build/gnu-build-system.scm:
   799:28 10 (_ _)
In ice-9/eval.scm:
619:8  9 (_ #(#(#(#(#(#(#) …) …) …) …) …))
In ice-9/boot-9.scm:
841:4  8 (with-throw-handler _ _ _)
In ice-9/ports.scm:
   444:17  7 (call-with-input-file _ _ #:binary _ #:encoding _ # _)
In 
/gnu/store/gfprsx2m62cvqbh7ysc9ay9slhijvmal-module-import/guix/build/utils.scm:
   641:26  6 (_ _)
   667:26  5 (_ # …)
In srfi/srfi-1.scm:
   466:18  4 (fold # …)
In ice-9/eval.scm:
   202:51  3 (_ #(#(#(#(#(#(# …)) …) …) …) …))
163:9  2 (_ #(#(#(#(#(#(# …)) …) …) …) …))
In unknown file:
   1 (string-append "incpth='" #f "/include'\n")
In ice-9/boot-9.scm:
   752:25  0 (dispatch-exception _ _ _)

ice-9/boot-9.scm:752:25: In procedure dispatch-exception:
In procedure string-append: Wrong type (expecting string): #f
builder for
`/gnu/store/2khcqc5rpc0wizhihpq69x6qn3f7nw5l-perl-5.28.0.drv' failed
with exit code 1


I have the full log.  Do you wish to see it?

Did I do something wrong?  Is it the same for you?  Is there a
workaround?

Best regards,

Vivien

bug#35858: Null pointer error when partitioning with the graphical installer

2019-05-31 Thread Vivien Kraus

Hello,

I have installed with the manual method, it worked, I rebooted but my
luck ends here: after entering my decryption key twice (the first time
with a keyboard configured as US, the second with my azerty
configuration, is this normal?  Whatever I can add a new luks key with
the US keyboard), I get a boot screen reading:

GC Warning: pthread_getattr_np or pthread_attr_getstack failed for main
thread
GC Warning: Couldn't read /proc/stat
Welcome, this is GNU's early boot Guile.
Use '--repl' for an initrd REPL.

loading kernel modules...
Enter passphrase for /dev/sda2:
ext2fs_check_if_mount: Can't check if filesystem is mounted due to
missing mtab file while determining whether /dev/dm-0 is mounted.
guix-root: clean, 181099/91545600 files, 7013116/366152801 blocks
loading '/gnu/store/vxpwkiw1dp8m4xpjnzvmfq5bsnzccf61-system/boot'...
making '/gnu/store/vxpwkiw1dp8m4xpjnzvmfq5bsnzccf61-system' the current
system...
setting up setuid programs in '/run/setuid-programs'...
populating /etc from /gnu/store/qm_brk2hzpvzqsr3g62m3krbz9j4zh2i-etc...
error in finalization thread: Success
CP437: Invalid argument
[   17.016506] udevd[245]: no sender credentials received, message
ignored
nscd: 249 monitoring file `/etc/hosts` (1)
nscd: 249 monitoring directory `/etc` (2)
nscd: 249 monitoring file `/etc/resolv.conf` (3)
nscd: 249 monitoring directory `/etc` (2)
nscd: 249 monitoring file `/etc/services` (4)
nscd: 249 monitoring directory `/etc` (2)
[   19.155923] Error: Driver 'pcspkr' is already registered,
aborting...



The success error and pcspkr are also printed when running the
installer.

I have 2 partitions: /dev/sda1 is the 512MB ESP partition, and
/dev/sda2 is the fully encrypted disk (named 'guix-root').  Except for
the keyboard configuration, UUIDs and default user, I have kept the
default 'desktop' configuration.scm.

There is no disk activity, no fan activity and it does not respond to
C-M-Fn, but it does reboot on C-M-DEL.

And if I re-run the graphical installer, I still get the null pointer
dereference.


So I will revert to having guix on top of another distro for now.



Best regards,

Vivien

1 2 >

1 - 100 of 111 matches

Mail list logo