bug#61033: opam importer can't handle list field

[Csepp]

Truncated stack trace:

```
...
In guix/import/opam.scm:
287:2  3 (opam->guix-package "mirage-crypto-pk" #:repo _ # _)
In unknown file:
   2 (filter # …)
In guix/import/opam.scm:
   290:13  1 (_ ("mirage-no-solo5" "mirage-no-xen"))
In unknown file:
   0 (string-prefix? "conf-" ("mirage-no-solo5" "mirage-n…") …)

ERROR: In procedure string-prefix?:
In procedure string-prefix?: Wrong type argument in position 2 (expecting 
string): ("mirage-no-solo5" "mirage-no-xen")
```

bug#60927: gPodder database version field different when built using --with-latest

[Csepp]

Tobias Geerinckx-Rice  writes:

> Hullo,
>
> On 2023-01-18 9:13, Csepp wrote:
>> Haven't completely debugged this, but the symptoms are:
>> * running the packaged version doesn't work, blank scree, failed assert
>> on console about differing database schema version
>
> I can't reproduce this, in either direction.  However, I didn't have
> an existing GPodder configuration or database, and I'm not even sure
> where those are kept.
>
> If you do, could you grep for one of the hashes?

So it looks like the hashes are the same and the difference is instead
in how it's run.
Usually I run it with i3's XDG desktop file based launcher, but when I
used the --with-latest transformation I was running it from a guix
shell.
Maybe it's using the non-canonicalized path to itself as part of the
version string.

bug#61011: ‘guix system vm’ spawns QEMU and hangs

[Ludovic Courtès]

Hello,

Josselin Poiret  skribis:

> Leo Famulari  writes:
>
>> On Sun, Jan 22, 2023 at 10:36:21PM +0100, Ludovic Courtès wrote:
>>>   $(guix time-machine --commit=9923100a42ffa80f604c1c13a5e999e6a4c15146 \
>>> -- system vm gnu/system/examples/bare-bones.tmpl) -m 1024  # Bad!
>>
>> I can reproduce.
>>
>> It seems to work fine without '-m 1024', in which case it only has 512
>> MB RAM.
>
> This is probably due to the following kernel bug [1], which could be
> related to the khugepaged hangs I'm getting on my system since 6.1.
>
> [1]
> https://lore.kernel.org/kvm/b8017e09-f336-3035-8344-c549086c2...@kernel.org/ 

Ouch.  I’m running 6.1 since January 16th, which is about the time I
first experienced the issue.

Ludo’.

bug#58290: guile ssh error on guix deploy

[Ludovic Courtès]

Hi Artyom,

"Artyom V. Poptsov"  skribis:

> I figured out how to fix Guile-SSH channel "leak", so to say, that lead
> to the OpenSSH "no more sessions" problem.
>
> Please run your tests with this branch and let me know if it works for
> you (including all the edge cases):
>   https://github.com/artyom-poptsov/guile-ssh/tree/wip-fix-channel-leak

It works!  Specifically, I ran:

  guix shell guile guile-ssh \
--with-branch=guile-ssh=wip-fix-channel-leak -- \
guile ssh-channels.scm

and the script (same one as before) ran several hundreds of iterations
just fine.

I had looked at ‘ptob_close’ and related code but didn’t see this issue;
good catch!

If you plan to push a new release, we’ll just upgrade in Guix; otherwise
we can apply the patch locally.

Thank you!

Ludo’.

bug#61011: ‘guix system vm’ spawns QEMU and hangs

[Josselin Poiret via Bug reports for GNU Guix]

Hi,
Leo Famulari  writes:

> On Sun, Jan 22, 2023 at 10:36:21PM +0100, Ludovic Courtès wrote:
>>   $(guix time-machine --commit=9923100a42ffa80f604c1c13a5e999e6a4c15146 \
>> -- system vm gnu/system/examples/bare-bones.tmpl) -m 1024  # Bad!
>
> I can reproduce.
>
> It seems to work fine without '-m 1024', in which case it only has 512
> MB RAM.

This is probably due to the following kernel bug [1], which could be
related to the khugepaged hangs I'm getting on my system since 6.1.

[1]
https://lore.kernel.org/kvm/b8017e09-f336-3035-8344-c549086c2...@kernel.org/ 


Best,
-- 
Josselin Poiret

bug#58290: guile ssh error on guix deploy

[Artyom V. Poptsov]

Hello,

I figured out how to fix Guile-SSH channel "leak", so to say, that lead
to the OpenSSH "no more sessions" problem.

Please run your tests with this branch and let me know if it works for
you (including all the edge cases):
  https://github.com/artyom-poptsov/guile-ssh/tree/wip-fix-channel-leak

Thanks,
- avp

-- 
Artyom "avp" Poptsov 
Home page: https://memory-heap.org/~avp/
CADR Hackerspace co-founder: https://cadrspace.ru/
GPG: D0C2 EAC1 3310 822D 98DE  B57C E9C5 A2D9 0898 A02F


signature.asc
Description: PGP signature

bug#58880: [PATCH v3 2/2] nls: Update translation keys for guix gc

[Remco van 't Veer]

* po/*/*.po (guix/scripts/gc.scm): Round MiBs in user feedback.
---
 po/guix/bn.po|  6 +++---
 po/guix/cs.po|  6 +++---
 po/guix/da.po| 14 +++---
 po/guix/de.po| 14 +++---
 po/guix/eo.po|  6 +++---
 po/guix/es.po| 14 +++---
 po/guix/fa.po|  6 +++---
 po/guix/fi.po|  6 +++---
 po/guix/fr.po| 14 +++---
 po/guix/hu.po|  6 +++---
 po/guix/ja.po|  6 +++---
 po/guix/ka.po|  6 +++---
 po/guix/ko.po|  6 +++---
 po/guix/lt.po|  6 +++---
 po/guix/nl.po| 14 +++---
 po/guix/oc.po|  6 +++---
 po/guix/pl.po| 12 ++--
 po/guix/pt_BR.po | 14 +++---
 po/guix/ru.po|  6 +++---
 po/guix/si.po|  6 +++---
 po/guix/sk.po| 14 +++---
 po/guix/sr.po|  6 +++---
 po/guix/sv.po|  6 +++---
 po/guix/ta.po| 12 ++--
 po/guix/tr.po|  6 +++---
 po/guix/uk.po|  6 +++---
 po/guix/vi.po|  6 +++---
 po/guix/zh_CN.po |  6 +++---
 28 files changed, 118 insertions(+), 118 deletions(-)

diff --git a/po/guix/bn.po b/po/guix/bn.po
index 55a2942212..83cf451f8f 100644
--- a/po/guix/bn.po
+++ b/po/guix/bn.po
@@ -4067,11 +4067,11 @@ msgid "invoke the garbage collector"
 msgstr ""
 
 #: guix/scripts/gc.scm:263
-msgid "already ~h MiBs available on ~a, nothing to do~%"
+msgid "already ~,2h MiBs available on ~a, nothing to do~%"
 msgstr ""
 
 #: guix/scripts/gc.scm:266
-msgid "freeing ~h MiBs~%"
+msgid "freeing ~,2h MiBs~%"
 msgstr ""
 
 #: guix/scripts/gc.scm:306
@@ -4080,7 +4080,7 @@ msgid "extraneous arguments: ~{~a ~}~%"
 msgstr ""
 
 #: guix/scripts/gc.scm:330 guix/scripts/gc.scm:333
-msgid "freed ~h MiBs~%"
+msgid "freed ~,2h MiBs~%"
 msgstr ""
 
 #: guix/scripts/git.scm:26
diff --git a/po/guix/cs.po b/po/guix/cs.po
index 3b5128f227..b0f1c04ea0 100644
--- a/po/guix/cs.po
+++ b/po/guix/cs.po
@@ -4132,11 +4132,11 @@ msgid "invoke the garbage collector"
 msgstr ""
 
 #: guix/scripts/gc.scm:263
-msgid "already ~h MiBs available on ~a, nothing to do~%"
+msgid "already ~,2h MiBs available on ~a, nothing to do~%"
 msgstr ""
 
 #: guix/scripts/gc.scm:266
-msgid "freeing ~h MiBs~%"
+msgid "freeing ~,2h MiBs~%"
 msgstr ""
 
 #: guix/scripts/gc.scm:306
@@ -4145,7 +4145,7 @@ msgid "extraneous arguments: ~{~a ~}~%"
 msgstr "Neplatný argument: ~a~%"
 
 #: guix/scripts/gc.scm:330 guix/scripts/gc.scm:333
-msgid "freed ~h MiBs~%"
+msgid "freed ~,2h MiBs~%"
 msgstr ""
 
 #: guix/scripts/git.scm:26
diff --git a/po/guix/da.po b/po/guix/da.po
index 809f0a6d20..c3db9c9ac6 100644
--- a/po/guix/da.po
+++ b/po/guix/da.po
@@ -22,7 +22,7 @@ msgstr ""
 "Project-Id-Version: guix 1.1.0-pre1\n"
 "Report-Msgid-Bugs-To: bug-guix@gnu.org\n"
 "POT-Creation-Date: 2022-11-21 03:18+\n"
-"PO-Revision-Date: 2020-03-08 14:10+0200\n"
+"PO-Revision-Date: 2023-01-23 14:36+0100\n"
 "Last-Translator: joe Hansen \n"
 "Language-Team: Danish \n"
 "Language: da\n"
@@ -4507,12 +4507,12 @@ msgid "invoke the garbage collector"
 msgstr ""
 
 #: guix/scripts/gc.scm:263
-msgid "already ~h MiBs available on ~a, nothing to do~%"
-msgstr "der er allerede ~h MiBs tilgængelige på ~a, intet at udføre~%"
+msgid "already ~,2h MiBs available on ~a, nothing to do~%"
+msgstr "der er allerede ~,2h MiBs tilgængelige på ~a, intet at udføre~%"
 
 #: guix/scripts/gc.scm:266
-msgid "freeing ~h MiBs~%"
-msgstr "frigiver ~h MiBs~%"
+msgid "freeing ~,2h MiBs~%"
+msgstr "frigiver ~,2h MiBs~%"
 
 #: guix/scripts/gc.scm:306
 #, scheme-format
@@ -4520,8 +4520,8 @@ msgid "extraneous arguments: ~{~a ~}~%"
 msgstr "uvedkommende argumenter: ~{~a ~}~%"
 
 #: guix/scripts/gc.scm:330 guix/scripts/gc.scm:333
-msgid "freed ~h MiBs~%"
-msgstr "frigav ~h MiBs~%"
+msgid "freed ~,2h MiBs~%"
+msgstr "frigav ~,2h MiBs~%"
 
 #: guix/scripts/git.scm:26
 #, fuzzy
diff --git a/po/guix/de.po b/po/guix/de.po
index 39de45814e..f8493fd523 100644
--- a/po/guix/de.po
+++ b/po/guix/de.po
@@ -13,7 +13,7 @@ msgstr ""
 "Project-Id-Version: guix 1.2.0-pre3\n"
 "Report-Msgid-Bugs-To: bug-guix@gnu.org\n"
 "POT-Creation-Date: 2022-11-21 03:18+\n"
-"PO-Revision-Date: 2022-12-09 21:22+\n"
+"PO-Revision-Date: 2023-01-23 14:23+0100\n"
 "Last-Translator: Florian Pelz \n"
 "Language-Team: German 
\n"
 "Language: de\n"
@@ -4561,12 +4561,12 @@ msgid "invoke the garbage collector"
 msgstr "den Müllsammler aufrufen"
 
 #: guix/scripts/gc.scm:263
-msgid "already ~h MiBs available on ~a, nothing to do~%"
-msgstr "Es sind bereits ~h MiB verfügbar auf ~a, nichts zu tun~%"
+msgid "already ~,2h MiBs available on ~a, nothing to do~%"
+msgstr "Es sind bereits ~,2h MiB verfügbar auf ~a, nichts zu tun~%"
 
 #: guix/scripts/gc.scm:266
-msgid "freeing ~h MiBs~%"
-msgstr "~h MiB werden freigegeben~%"
+msgid "freeing ~,2h MiBs~%"
+msgstr "~,2h MiB werden freigegeben~%"
 
 #: guix/scripts/gc.scm:306
 #, scheme-format
@@ -4574,8 +4574,8 @@ msgid "extraneous arguments: ~{~a ~}~%"
 msgstr "Zusätzliche Argumente: ~{~a ~}~%"
 
 #: 

bug#58880: [PATCH v3 1/2] guix gc: Round MiBs in user feedback.

[Remco van 't Veer]

* guix/scripts/gc.scm (guix-gc): Round MiBs in user feedback.
---
 guix/scripts/gc.scm | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/guix/scripts/gc.scm b/guix/scripts/gc.scm
index 5e775c5cdb..2bbfb26d5d 100644
--- a/guix/scripts/gc.scm
+++ b/guix/scripts/gc.scm
@@ -260,10 +260,10 @@ (define-command (guix-gc . args)
 ;; Attempt to have at least SPACE bytes available in STORE.
 (let ((free (free-disk-space (%store-prefix
   (if (> free space)
-  (info (G_ "already ~h MiBs available on ~a, nothing to do~%")
+  (info (G_ "already ~,2h MiBs available on ~a, nothing to do~%")
 (/ free 1024. 1024.) (%store-prefix))
   (let ((to-free (- space free)))
-(info (G_ "freeing ~h MiBs~%") (/ to-free 1024. 1024.))
+(info (G_ "freeing ~,2h MiBs~%") (/ to-free 1024. 1024.))
 (collect-garbage store to-free)
 
   (define (delete-generations store pattern)
@@ -327,10 +327,10 @@ (define-command (guix-gc . args)
  (ensure-free-space store free-space))
 (min-freed
  (let-values (((paths freed) (collect-garbage store min-freed)))
-  (info (G_ "freed ~h MiBs~%") (/ freed 1024. 1024.
+  (info (G_ "freed ~,2h MiBs~%") (/ freed 1024. 1024.
 (else
  (let-values (((paths freed) (collect-garbage store)))
-  (info (G_ "freed ~h MiBs~%") (/ freed 1024. 1024.)))
+  (info (G_ "freed ~,2h MiBs~%") (/ freed 1024. 1024.)))
 ((list-roots)
  (assert-no-extra-arguments)
  (list-roots))
-- 
2.39.1

bug#58880: [PATCH v2 2/2] nls: Update translation keys for guix gc

[Remco van 't Veer]

2023/01/23 14:14, Julien Lepiller:

> Ah this is dangerous. You updated the msgid but not the msgstr. This
> means the translation will keep using the old format string. Could you
> also update the msgstr when a translation exists?

The order of the arguments is still the same for all translatable
strings so the danger is minimal.  I'll send a v3 with the msgstrs
updated too (using po-mode.el) but I'll only touch the ones having "~h"
(and changed them to "~,2h") and will leave the ones having "~a" for the
size argument as they were, just to be sure (don't want to break a
translation).

> You can also drop all the files with no translation for the affected
> msgids from your patch, though this works too.

Thanks for the tip but I'll leave them as is for now.

Cheers,
Remco

bug#25235: [PATCH v2 1/1] build-system/pyproject: Do not wrap native-inputs.

[Maxim Cournoyer]

Hi Ludovic,

Ludovic Courtès  writes:

> Hi,
>
> Maxim Cournoyer  skribis:
>
>> Fixes .
>>
>> * guix/build/pyproject-build-system.scm (wrap) [native-inputs]: New argument.
>> Filter out native inputs from the values in GUIX_PYTHONPATH.
>
> LGTM!
>
>> -  ;; Do not require "guile" to be present in the package inputs
>> -  ;; even when there is nothing to wrap.
>> -  ;; Also, calculate (guile) only once to prevent some I/O.
>> -  (define %guile (delay (search-input-file inputs "bin/guile")))
>> -  (define (guile) (force %guile))
>
> I still don’t see what branch this snippet is on, what am I missing?
> :-)

It's based on https://issues.guix.gnu.org/60868, itself based on
https://issues.guix.gnu.org/60847.  I've tried to express this
relationship by marking the dependent changes blocked by the submissions
they are based on.

I've just rebased the 3 submissions and added you in CC; hopefully that
helps!

-- 
Thanks,
Maxim

bug#58880: Patch impacting translation (was Re: bug#58880: 'guix gc' does not round the amount of disk space freed)

[bokr]

On +2023-01-23 08:51:16 +0100, zimoun wrote:
[ ... ]
> 
> Julien, the patch is here:
> 
> http://issues.guix.gnu.org/msgid/20221125203328.21379-1-re...@remworks.net

https://... works too, for me.
Any reason to prefer http://... ?

[ ... ]
> 
> Cheers,
> simo
> 
--
Regards,
Bengt Richter

bug#25235: [PATCH v3 1/1] build-system/pyproject: Do not wrap native-inputs.

[Maxim Cournoyer]

Fixes .

* guix/build/pyproject-build-system.scm (wrap) [native-inputs]: New argument.
Filter out native inputs from the values in GUIX_PYTHONPATH.

---

Changes in v3:
- Rebase

Changes in v2:
- Add missing copyright line
- Rework wrap phase to avoid removing inputs found in both native-inputs and 
inputs
- Enclose wrap computations in an 'unless' form and streamline

 guix/build/pyproject-build-system.scm | 39 ---
 1 file changed, 24 insertions(+), 15 deletions(-)

diff --git a/guix/build/pyproject-build-system.scm 
b/guix/build/pyproject-build-system.scm
index a66c1fb34a..9da86bfc54 100644
--- a/guix/build/pyproject-build-system.scm
+++ b/guix/build/pyproject-build-system.scm
@@ -1,6 +1,7 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2021 Lars-Dominik Braun 
 ;;; Copyright © 2022 Marius Bakke 
+;;; Copyright © 2023 Maxim Cournoyer 
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -445,7 +446,7 @@ (define* (add-install-to-pythonpath #:key native-inputs 
outputs
   "A phase that just wraps the 'add-installed-pythonpath' procedure."
   (add-installed-pythonpath native-inputs outputs))
 
-(define* (wrap #:key inputs outputs #:allow-other-keys)
+(define* (wrap #:key native-inputs inputs outputs #:allow-other-keys)
   (define (list-of-files dir)
 (find-files dir (lambda (file stat)
   (and (eq? 'regular (stat:type stat))
@@ -458,20 +459,28 @@ (define bindirs
  (string-append dir "/sbin"
 outputs))
 
-  ;; Do not require "guile" to be present in the package inputs
-  ;; even when there is nothing to wrap.
-  ;; Also, calculate (guile) only once to prevent some I/O.
-  (define %guile (delay (search-input-file inputs "bin/guile")))
-  (define (guile) (force %guile))
-
-  (let* ((var `("GUIX_PYTHONPATH" prefix
-,(search-path-as-string->list
-  (or (getenv "GUIX_PYTHONPATH") "")
-(for-each (lambda (dir)
-(let ((files (list-of-files dir)))
-  (for-each (cut wrap-script <> #:guile (guile) var)
-files)))
-  bindirs)))
+  (unless (null? bindirs)
+(let* ((guile (search-input-file inputs "bin/guile"))
+   (native-input-dirs (match native-inputs
+(((_ . dir) ...)
+ dir)))
+   (input-dirs (match inputs
+ (((_ . dir) ...)
+  dir)))
+   (build-inputs (lset-difference string=? native-input-dirs
+  input-dirs))
+   ;; A build input is an input listed in native-inputs and NOT in
+   ;; inputs.
+   (build-input? (lambda (x)
+   (any (cut string-prefix? <> x) build-inputs)))
+   (var `("GUIX_PYTHONPATH" prefix
+  ,(remove build-input? (search-path-as-string->list
+ (or (getenv "GUIX_PYTHONPATH") 
""))
+  (for-each (lambda (dir)
+  (let ((files (list-of-files dir)))
+(for-each (cut wrap-script <> #:guile guile var)
+  files)))
+bindirs
 
 (define* (rename-pth-file #:key name native-inputs outputs #:allow-other-keys
   #:rest args)
-- 
2.39.1

bug#25235: [PATCH v3 0/1] build-system/pyproject: Do not wrap native-inputs.

[Maxim Cournoyer]

This fixes a longstanding issue.  The fix is made trivial by the changes made
in #60847 adding cross-compilation support for the pyproject build system.
Additionally, it's based on #60868, which touches the wrap phase to use
wrap-script instead of wrap-program.

Changes in v3:
- Rebase

Changes in v2:
- Add missing copyright line
- Rework wrap phase to avoid removing inputs found in both native-inputs and 
inputs
- Enclose wrap computations in an 'unless' form and streamline

Maxim Cournoyer (1):
  build-system/pyproject: Do not wrap native-inputs.

 guix/build/pyproject-build-system.scm | 39 ---
 1 file changed, 24 insertions(+), 15 deletions(-)


base-commit: 490e386e10ca2b7496c3da7ed85299ed3e9c2404
-- 
2.39.1

bug#58880: [PATCH v2 2/2] nls: Update translation keys for guix gc

[Julien Lepiller]

Ah this is dangerous. You updated the msgid but not the msgstr. This means the 
translation will keep using the old format string. Could you also update the 
msgstr when a translation exists?

You can also drop all the files with no translation for the affected msgids 
from your patch, though this works too.

Le 23 janvier 2023 14:01:26 GMT+01:00, Remco van 't Veer  a 
écrit :
>* po/*/*.po (guix/scripts/gc.scm): Round MiBs in user feedback.
>---
> po/guix/bn.po| 6 +++---
> po/guix/cs.po| 6 +++---
> po/guix/da.po| 6 +++---
> po/guix/de.po| 6 +++---
> po/guix/eo.po| 6 +++---
> po/guix/es.po| 6 +++---
> po/guix/fa.po| 6 +++---
> po/guix/fi.po| 6 +++---
> po/guix/fr.po| 6 +++---
> po/guix/hu.po| 6 +++---
> po/guix/ja.po| 6 +++---
> po/guix/ka.po| 6 +++---
> po/guix/ko.po| 6 +++---
> po/guix/lt.po| 6 +++---
> po/guix/nl.po| 6 +++---
> po/guix/oc.po| 6 +++---
> po/guix/pl.po| 6 +++---
> po/guix/pt_BR.po | 6 +++---
> po/guix/ru.po| 6 +++---
> po/guix/si.po| 6 +++---
> po/guix/sk.po| 6 +++---
> po/guix/sr.po| 6 +++---
> po/guix/sv.po| 6 +++---
> po/guix/ta.po| 6 +++---
> po/guix/tr.po| 6 +++---
> po/guix/uk.po| 6 +++---
> po/guix/vi.po| 6 +++---
> po/guix/zh_CN.po | 6 +++---
> 28 files changed, 84 insertions(+), 84 deletions(-)
>
>diff --git a/po/guix/bn.po b/po/guix/bn.po
>index 55a2942212..83cf451f8f 100644
>--- a/po/guix/bn.po
>+++ b/po/guix/bn.po
>@@ -4067,11 +4067,11 @@ msgid "invoke the garbage collector"
> msgstr ""
> 
> #: guix/scripts/gc.scm:263
>-msgid "already ~h MiBs available on ~a, nothing to do~%"
>+msgid "already ~,2h MiBs available on ~a, nothing to do~%"
> msgstr ""
> 
> #: guix/scripts/gc.scm:266
>-msgid "freeing ~h MiBs~%"
>+msgid "freeing ~,2h MiBs~%"
> msgstr ""
> 
> #: guix/scripts/gc.scm:306
>@@ -4080,7 +4080,7 @@ msgid "extraneous arguments: ~{~a ~}~%"
> msgstr ""
> 
> #: guix/scripts/gc.scm:330 guix/scripts/gc.scm:333
>-msgid "freed ~h MiBs~%"
>+msgid "freed ~,2h MiBs~%"
> msgstr ""
> 
> #: guix/scripts/git.scm:26
>diff --git a/po/guix/cs.po b/po/guix/cs.po
>index 3b5128f227..b0f1c04ea0 100644
>--- a/po/guix/cs.po
>+++ b/po/guix/cs.po
>@@ -4132,11 +4132,11 @@ msgid "invoke the garbage collector"
> msgstr ""
> 
> #: guix/scripts/gc.scm:263
>-msgid "already ~h MiBs available on ~a, nothing to do~%"
>+msgid "already ~,2h MiBs available on ~a, nothing to do~%"
> msgstr ""
> 
> #: guix/scripts/gc.scm:266
>-msgid "freeing ~h MiBs~%"
>+msgid "freeing ~,2h MiBs~%"
> msgstr ""
> 
> #: guix/scripts/gc.scm:306
>@@ -4145,7 +4145,7 @@ msgid "extraneous arguments: ~{~a ~}~%"
> msgstr "Neplatný argument: ~a~%"
> 
> #: guix/scripts/gc.scm:330 guix/scripts/gc.scm:333
>-msgid "freed ~h MiBs~%"
>+msgid "freed ~,2h MiBs~%"
> msgstr ""
> 
> #: guix/scripts/git.scm:26
>diff --git a/po/guix/da.po b/po/guix/da.po
>index 809f0a6d20..89917a7613 100644
>--- a/po/guix/da.po
>+++ b/po/guix/da.po
>@@ -4507,11 +4507,11 @@ msgid "invoke the garbage collector"
> msgstr ""
> 
> #: guix/scripts/gc.scm:263
>-msgid "already ~h MiBs available on ~a, nothing to do~%"
>+msgid "already ~,2h MiBs available on ~a, nothing to do~%"
> msgstr "der er allerede ~h MiBs tilgængelige på ~a, intet at udføre~%"
> 
> #: guix/scripts/gc.scm:266
>-msgid "freeing ~h MiBs~%"
>+msgid "freeing ~,2h MiBs~%"
> msgstr "frigiver ~h MiBs~%"
> 
> #: guix/scripts/gc.scm:306
>@@ -4520,7 +4520,7 @@ msgid "extraneous arguments: ~{~a ~}~%"
> msgstr "uvedkommende argumenter: ~{~a ~}~%"
> 
> #: guix/scripts/gc.scm:330 guix/scripts/gc.scm:333
>-msgid "freed ~h MiBs~%"
>+msgid "freed ~,2h MiBs~%"
> msgstr "frigav ~h MiBs~%"
> 
> #: guix/scripts/git.scm:26
>diff --git a/po/guix/de.po b/po/guix/de.po
>index 39de45814e..ed4da5fdf9 100644
>--- a/po/guix/de.po
>+++ b/po/guix/de.po
>@@ -4561,11 +4561,11 @@ msgid "invoke the garbage collector"
> msgstr "den Müllsammler aufrufen"
> 
> #: guix/scripts/gc.scm:263
>-msgid "already ~h MiBs available on ~a, nothing to do~%"
>+msgid "already ~,2h MiBs available on ~a, nothing to do~%"
> msgstr "Es sind bereits ~h MiB verfügbar auf ~a, nichts zu tun~%"
> 
> #: guix/scripts/gc.scm:266
>-msgid "freeing ~h MiBs~%"
>+msgid "freeing ~,2h MiBs~%"
> msgstr "~h MiB werden freigegeben~%"
> 
> #: guix/scripts/gc.scm:306
>@@ -4574,7 +4574,7 @@ msgid "extraneous arguments: ~{~a ~}~%"
> msgstr "Zusätzliche Argumente: ~{~a ~}~%"
> 
> #: guix/scripts/gc.scm:330 guix/scripts/gc.scm:333
>-msgid "freed ~h MiBs~%"
>+msgid "freed ~,2h MiBs~%"
> msgstr "~h MiB wurden freigegeben~%"
> 
> #: guix/scripts/git.scm:26
>diff --git a/po/guix/eo.po b/po/guix/eo.po
>index f0e433ed1f..bbd6870f4f 100644
>--- a/po/guix/eo.po
>+++ b/po/guix/eo.po
>@@ -4344,12 +4344,12 @@ msgid "invoke the garbage collector"
> msgstr ""
> 
> #: guix/scripts/gc.scm:263
>-msgid "already ~h MiBs available on ~a, nothing to do~%"
>+msgid "already ~,2h MiBs available on ~a, nothing to do~%"
> msgstr ""
> 
> #: guix/scripts/gc.scm:266
> #, fuzzy
>-msgid "freeing ~h MiBs~%"

bug#58880: [PATCH v2 0/2] split into 2 commits and rebased on master

[Remco van 't Veer]

I'm not sure about the commit message of the second commit.

Remco van 't Veer (2):
  guix gc: Round MiBs in user feedback.
  nls: Update translation keys for guix gc

 guix/scripts/gc.scm | 8 
 po/guix/bn.po   | 6 +++---
 po/guix/cs.po   | 6 +++---
 po/guix/da.po   | 6 +++---
 po/guix/de.po   | 6 +++---
 po/guix/eo.po   | 6 +++---
 po/guix/es.po   | 6 +++---
 po/guix/fa.po   | 6 +++---
 po/guix/fi.po   | 6 +++---
 po/guix/fr.po   | 6 +++---
 po/guix/hu.po   | 6 +++---
 po/guix/ja.po   | 6 +++---
 po/guix/ka.po   | 6 +++---
 po/guix/ko.po   | 6 +++---
 po/guix/lt.po   | 6 +++---
 po/guix/nl.po   | 6 +++---
 po/guix/oc.po   | 6 +++---
 po/guix/pl.po   | 6 +++---
 po/guix/pt_BR.po| 6 +++---
 po/guix/ru.po   | 6 +++---
 po/guix/si.po   | 6 +++---
 po/guix/sk.po   | 6 +++---
 po/guix/sr.po   | 6 +++---
 po/guix/sv.po   | 6 +++---
 po/guix/ta.po   | 6 +++---
 po/guix/tr.po   | 6 +++---
 po/guix/uk.po   | 6 +++---
 po/guix/vi.po   | 6 +++---
 po/guix/zh_CN.po| 6 +++---
 29 files changed, 88 insertions(+), 88 deletions(-)

-- 
2.39.1

bug#58880: [PATCH v2 2/2] nls: Update translation keys for guix gc

[Remco van 't Veer]

* po/*/*.po (guix/scripts/gc.scm): Round MiBs in user feedback.
---
 po/guix/bn.po| 6 +++---
 po/guix/cs.po| 6 +++---
 po/guix/da.po| 6 +++---
 po/guix/de.po| 6 +++---
 po/guix/eo.po| 6 +++---
 po/guix/es.po| 6 +++---
 po/guix/fa.po| 6 +++---
 po/guix/fi.po| 6 +++---
 po/guix/fr.po| 6 +++---
 po/guix/hu.po| 6 +++---
 po/guix/ja.po| 6 +++---
 po/guix/ka.po| 6 +++---
 po/guix/ko.po| 6 +++---
 po/guix/lt.po| 6 +++---
 po/guix/nl.po| 6 +++---
 po/guix/oc.po| 6 +++---
 po/guix/pl.po| 6 +++---
 po/guix/pt_BR.po | 6 +++---
 po/guix/ru.po| 6 +++---
 po/guix/si.po| 6 +++---
 po/guix/sk.po| 6 +++---
 po/guix/sr.po| 6 +++---
 po/guix/sv.po| 6 +++---
 po/guix/ta.po| 6 +++---
 po/guix/tr.po| 6 +++---
 po/guix/uk.po| 6 +++---
 po/guix/vi.po| 6 +++---
 po/guix/zh_CN.po | 6 +++---
 28 files changed, 84 insertions(+), 84 deletions(-)

diff --git a/po/guix/bn.po b/po/guix/bn.po
index 55a2942212..83cf451f8f 100644
--- a/po/guix/bn.po
+++ b/po/guix/bn.po
@@ -4067,11 +4067,11 @@ msgid "invoke the garbage collector"
 msgstr ""
 
 #: guix/scripts/gc.scm:263
-msgid "already ~h MiBs available on ~a, nothing to do~%"
+msgid "already ~,2h MiBs available on ~a, nothing to do~%"
 msgstr ""
 
 #: guix/scripts/gc.scm:266
-msgid "freeing ~h MiBs~%"
+msgid "freeing ~,2h MiBs~%"
 msgstr ""
 
 #: guix/scripts/gc.scm:306
@@ -4080,7 +4080,7 @@ msgid "extraneous arguments: ~{~a ~}~%"
 msgstr ""
 
 #: guix/scripts/gc.scm:330 guix/scripts/gc.scm:333
-msgid "freed ~h MiBs~%"
+msgid "freed ~,2h MiBs~%"
 msgstr ""
 
 #: guix/scripts/git.scm:26
diff --git a/po/guix/cs.po b/po/guix/cs.po
index 3b5128f227..b0f1c04ea0 100644
--- a/po/guix/cs.po
+++ b/po/guix/cs.po
@@ -4132,11 +4132,11 @@ msgid "invoke the garbage collector"
 msgstr ""
 
 #: guix/scripts/gc.scm:263
-msgid "already ~h MiBs available on ~a, nothing to do~%"
+msgid "already ~,2h MiBs available on ~a, nothing to do~%"
 msgstr ""
 
 #: guix/scripts/gc.scm:266
-msgid "freeing ~h MiBs~%"
+msgid "freeing ~,2h MiBs~%"
 msgstr ""
 
 #: guix/scripts/gc.scm:306
@@ -4145,7 +4145,7 @@ msgid "extraneous arguments: ~{~a ~}~%"
 msgstr "Neplatný argument: ~a~%"
 
 #: guix/scripts/gc.scm:330 guix/scripts/gc.scm:333
-msgid "freed ~h MiBs~%"
+msgid "freed ~,2h MiBs~%"
 msgstr ""
 
 #: guix/scripts/git.scm:26
diff --git a/po/guix/da.po b/po/guix/da.po
index 809f0a6d20..89917a7613 100644
--- a/po/guix/da.po
+++ b/po/guix/da.po
@@ -4507,11 +4507,11 @@ msgid "invoke the garbage collector"
 msgstr ""
 
 #: guix/scripts/gc.scm:263
-msgid "already ~h MiBs available on ~a, nothing to do~%"
+msgid "already ~,2h MiBs available on ~a, nothing to do~%"
 msgstr "der er allerede ~h MiBs tilgængelige på ~a, intet at udføre~%"
 
 #: guix/scripts/gc.scm:266
-msgid "freeing ~h MiBs~%"
+msgid "freeing ~,2h MiBs~%"
 msgstr "frigiver ~h MiBs~%"
 
 #: guix/scripts/gc.scm:306
@@ -4520,7 +4520,7 @@ msgid "extraneous arguments: ~{~a ~}~%"
 msgstr "uvedkommende argumenter: ~{~a ~}~%"
 
 #: guix/scripts/gc.scm:330 guix/scripts/gc.scm:333
-msgid "freed ~h MiBs~%"
+msgid "freed ~,2h MiBs~%"
 msgstr "frigav ~h MiBs~%"
 
 #: guix/scripts/git.scm:26
diff --git a/po/guix/de.po b/po/guix/de.po
index 39de45814e..ed4da5fdf9 100644
--- a/po/guix/de.po
+++ b/po/guix/de.po
@@ -4561,11 +4561,11 @@ msgid "invoke the garbage collector"
 msgstr "den Müllsammler aufrufen"
 
 #: guix/scripts/gc.scm:263
-msgid "already ~h MiBs available on ~a, nothing to do~%"
+msgid "already ~,2h MiBs available on ~a, nothing to do~%"
 msgstr "Es sind bereits ~h MiB verfügbar auf ~a, nichts zu tun~%"
 
 #: guix/scripts/gc.scm:266
-msgid "freeing ~h MiBs~%"
+msgid "freeing ~,2h MiBs~%"
 msgstr "~h MiB werden freigegeben~%"
 
 #: guix/scripts/gc.scm:306
@@ -4574,7 +4574,7 @@ msgid "extraneous arguments: ~{~a ~}~%"
 msgstr "Zusätzliche Argumente: ~{~a ~}~%"
 
 #: guix/scripts/gc.scm:330 guix/scripts/gc.scm:333
-msgid "freed ~h MiBs~%"
+msgid "freed ~,2h MiBs~%"
 msgstr "~h MiB wurden freigegeben~%"
 
 #: guix/scripts/git.scm:26
diff --git a/po/guix/eo.po b/po/guix/eo.po
index f0e433ed1f..bbd6870f4f 100644
--- a/po/guix/eo.po
+++ b/po/guix/eo.po
@@ -4344,12 +4344,12 @@ msgid "invoke the garbage collector"
 msgstr ""
 
 #: guix/scripts/gc.scm:263
-msgid "already ~h MiBs available on ~a, nothing to do~%"
+msgid "already ~,2h MiBs available on ~a, nothing to do~%"
 msgstr ""
 
 #: guix/scripts/gc.scm:266
 #, fuzzy
-msgid "freeing ~h MiBs~%"
+msgid "freeing ~,2h MiBs~%"
 msgstr "ni forigas ~a~%"
 
 #: guix/scripts/gc.scm:306
@@ -4358,7 +4358,7 @@ msgid "extraneous arguments: ~{~a ~}~%"
 msgstr "~A: fremda argumento~%"
 
 #: guix/scripts/gc.scm:330 guix/scripts/gc.scm:333
-msgid "freed ~h MiBs~%"
+msgid "freed ~,2h MiBs~%"
 msgstr ""
 
 #: guix/scripts/git.scm:26
diff --git a/po/guix/es.po b/po/guix/es.po
index c2b10cd0b1..f0d1d1fb62 100644
--- a/po/guix/es.po
+++ b/po/guix/es.po
@@ -4622,11 +4622,11 @@ msgid "invoke the garbage collector"
 msgstr "invocación del recolector 

bug#58880: [PATCH v2 1/2] guix gc: Round MiBs in user feedback.

[Remco van 't Veer]

* guix/scripts/gc.scm (guix-gc): Round MiBs in user feedback.
---
 guix/scripts/gc.scm | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/guix/scripts/gc.scm b/guix/scripts/gc.scm
index 5e775c5cdb..2bbfb26d5d 100644
--- a/guix/scripts/gc.scm
+++ b/guix/scripts/gc.scm
@@ -260,10 +260,10 @@ (define-command (guix-gc . args)
 ;; Attempt to have at least SPACE bytes available in STORE.
 (let ((free (free-disk-space (%store-prefix
   (if (> free space)
-  (info (G_ "already ~h MiBs available on ~a, nothing to do~%")
+  (info (G_ "already ~,2h MiBs available on ~a, nothing to do~%")
 (/ free 1024. 1024.) (%store-prefix))
   (let ((to-free (- space free)))
-(info (G_ "freeing ~h MiBs~%") (/ to-free 1024. 1024.))
+(info (G_ "freeing ~,2h MiBs~%") (/ to-free 1024. 1024.))
 (collect-garbage store to-free)
 
   (define (delete-generations store pattern)
@@ -327,10 +327,10 @@ (define-command (guix-gc . args)
  (ensure-free-space store free-space))
 (min-freed
  (let-values (((paths freed) (collect-garbage store min-freed)))
-  (info (G_ "freed ~h MiBs~%") (/ freed 1024. 1024.
+  (info (G_ "freed ~,2h MiBs~%") (/ freed 1024. 1024.
 (else
  (let-values (((paths freed) (collect-garbage store)))
-  (info (G_ "freed ~h MiBs~%") (/ freed 1024. 1024.)))
+  (info (G_ "freed ~,2h MiBs~%") (/ freed 1024. 1024.)))
 ((list-roots)
  (assert-no-extra-arguments)
  (list-roots))
-- 
2.39.1

bug#25235: [PATCH v2 1/1] build-system/pyproject: Do not wrap native-inputs.

[Ludovic Courtès]

Hi,

Maxim Cournoyer  skribis:

> Fixes .
>
> * guix/build/pyproject-build-system.scm (wrap) [native-inputs]: New argument.
> Filter out native inputs from the values in GUIX_PYTHONPATH.

LGTM!

> -  ;; Do not require "guile" to be present in the package inputs
> -  ;; even when there is nothing to wrap.
> -  ;; Also, calculate (guile) only once to prevent some I/O.
> -  (define %guile (delay (search-input-file inputs "bin/guile")))
> -  (define (guile) (force %guile))

I still don’t see what branch this snippet is on, what am I missing?
:-)

Thanks,
Ludo’.

bug#58880: Patch impacting translation (was Re: bug#58880: 'guix gc' does not round the amount of disk space freed)

[zimoun]

Hi,

On Sun, 22 Jan 2023 at 17:43, Julien Lepiller  wrote:
> Changing the po files in guix repo will work at first, it'll be
> negated next time I push changes from weblate. We could change the po
> files to ensure continuity, but we have to also apply the change to
> the repo behind weblate. I can take care of it after the patch is
> pushed.

Julien, the patch is here:

http://issues.guix.gnu.org/msgid/20221125203328.21379-1-re...@remworks.net

and it does not apply because PO files changes since.

Well, I propose to split the patch into two parts: the first containing
the change of guix/scripts/gc.scm and another one about the translation.

Remco, could you rebase and resent these 2 patches?  Sorry for the
annoyance and this small extra work.


Cheers,
simo