Re: [PATCH] profiles: Report about upgrades.
Ludovic Courtès (2014-09-02 23:45 +0400) wrote: > Alex Kost skribis: > >> Ludovic Courtès (2014-08-31 23:57 +0400) wrote: >> >> [...] >> >>> Perhaps even a different format, like, say: >>> >>> The following package will be upgraded: >>> guile 1.8.8 → 2.0.9out /gnu/store/... >>> >>> Thoughts? >> >> I think, it would be perfect! > > Commit ef8993e does that. > > While I was at it, I took the freedom to adjust the format of these > lines (commit 9a91476) so that the version number would always appear in > the second column, while the output name no longer has a separate > column: > > $ ./pre-inst-env guix package -r idutils -u libtasn1 -i emacs libgc > libgc:debug -n -p foo > The following package would be removed: >idutils4.6 /gnu/store/40nbigb0bghwqvnchjdxsrafbzxmybh8-idutils-4.6 > > The following package would be upgraded: >libtasn1 3.6 → 4.1 > /gnu/store/52kdi2gmrl2ms92as0nsxbbkndqx07s4-libtasn1-4.1 > > The following packages would be installed: >libgc:debug7.4.0 > /gnu/store/98r76vrmvv3fvg26n3dzq3i72l25whl1-libgc-7.4.0-debug >libgc 7.4.0 /gnu/store/cqhp23ak0kaa4kv1jdvzbsrkw41krczh-libgc-7.4.0 >emacs 24.3/gnu/store/majxvz4dxcw75m1ni2hph3kbws400y94-emacs-24.3 > > It’s still time to complain if you don’t like it. :-) Great! I really like it and that ‘right-arrow’ is cool :) There is just one thing (that shouldn't be mentioned): +(lambda (key . args) + ">") I would make it "->". IMHO it is more "understandable" as such combination is used in output of some shell commands (like “mv -v” or “cp -v”). But that's a terrible nitpick and it should be ignored.
Re: Merging guix.el
Alex Kost skribis: > Merged into master, thanks. Thank *you* for all the good work! > Sorry, all I could take from my brain for the Savannah News is: > > Now GNU Guix has an Emacs interface. > > It can be installed along with the > [http://git.savannah.gnu.org/cgit/guix.git latest Guix]. For using and > configuring see documentation. > > So, I'm afraid you have to do it yourself (if this news is really > needed). Heheh. :-) I’ve come to think it’s important to reach out to fellow hackers and users-to-be. So here’s what I came up with: https://savannah.gnu.org/forum/forum.php?forum_id=8081 Ludo’.
[PATCH] utils: Clean trailing whitespace at end of SHELL
I found an unfortunate bug in the last patch I made to patch-makefile-SHELL that would leave a trailing ' ' at the end of SHELL assignments. This is fine for most packages, but caused gobject-introspection to fail building for me just now (for the curious: it effectively does an "(apply system* (string-split (string-append SHELL " " "./libtool") #\space))" which causes sh to try to execute "") The attached patch to core-updates should remedy the problem. >From c2467a4504737c13435304b1e5c7eb7e4ebf7b70 Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Thu, 4 Sep 2014 09:19:24 -0500 Subject: [PATCH] utils: Clean trailing whitespace at end of SHELL * guix/build/utils.scm (patch-makefile-SHELL): Remove trailing whitespace. --- guix/build/utils.scm |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/guix/build/utils.scm b/guix/build/utils.scm index f38b2ca..d6365c0 100644 --- a/guix/build/utils.scm +++ b/guix/build/utils.scm @@ -590,7 +590,7 @@ When KEEP-MTIME? is true, the atime/mtime of FILE are kept unchanged." (format (current-error-port) "patch-makefile-SHELL: ~a: changing `SHELL' from `~a' to `~a'~%" file old new)) -(string-append "SHELL = " new " " args +(string-append "SHELL = " new (if (string=? args "\n") "" " ") args (when keep-mtime? (set-file-time file st -- 1.7.9.5 -- Eric Bavier
Re: [PATCH] utils: Clean trailing whitespace at end of SHELL
Eric Bavier skribis:
> I found an unfortunate bug in the last patch I made to
> patch-makefile-SHELL that would leave a trailing ' ' at the end of SHELL
> assignments. This is fine for most packages, but caused
> gobject-introspection to fail building for me just now (for the curious:
> it effectively does an "(apply system* (string-split (string-append SHELL
> " " "./libtool") #\space))" which causes sh to try to execute "")
AFAIK trailing whitespace in assignments is ignored by ‘make’.
I grepped gobject-introspection out of curiosity and couldn’t find any
suspicious SHELL assignment. Do you still have it around?
> --- a/guix/build/utils.scm
> +++ b/guix/build/utils.scm
> @@ -590,7 +590,7 @@ When KEEP-MTIME? is true, the atime/mtime of FILE are
> kept unchanged."
>(format (current-error-port)
>"patch-makefile-SHELL: ~a: changing `SHELL' from `~a' to
> `~a'~%"
>file old new))
> -(string-append "SHELL = " new " " args
> +(string-append "SHELL = " new (if (string=? args "\n") "" " ")
> args
The (string=? args "\n") seems specific and non-obvious.
Wouldn’t this work better:
diff --git a/guix/build/utils.scm b/guix/build/utils.scm
index f38b2ca..057dcd2 100644
--- a/guix/build/utils.scm
+++ b/guix/build/utils.scm
@@ -582,7 +582,7 @@ When KEEP-MTIME? is true, the atime/mtime of FILE are kept unchanged."
(let ((st (stat file)))
(substitute* file
- (("^ *SHELL[[:blank:]]*=[[:blank:]]*([[:graph:]]*/)([[:graph:]]+)[[:blank:]]*(.*)$"
+ (("^ *SHELL[[:blank:]]*=[[:blank:]]*([[:graph:]]*/)([[:graph:]]+)(.*)$"
_ dir shell args)
(let* ((old (string-append dir shell))
(new (or (find-shell shell) old)))
Thanks,
Ludo’.
Re: [PATCH] profiles: Report about upgrades.
Alex Kost skribis: > Great! I really like it and that ‘right-arrow’ is cool :) :-) > There is just one thing (that shouldn't be mentioned): > > +(lambda (key . args) > + ">") > > I would make it "->". IMHO it is more "understandable" as such > combination is used in output of some shell commands (like “mv -v” or > “cp -v”). Makes sense. Done. > But that's a terrible nitpick and it should be ignored. There’s no such thing as terrible nitpicking. :-) Thanks, Ludo’.
How is Guix going to able to install GNOME if it has a systemd dependency?
How is Guix going to be able to install GNOME if Guix uses dmd while GNOME has a dependency for systemd? Will there be a compatiblity layer for systemd scripts? Or will GNOME have to go back to being init-agnostic?
Re: [PATCH] utils: Clean trailing whitespace at end of SHELL
Ludovic Courtès writes:
> Eric Bavier skribis:
>
>> I found an unfortunate bug in the last patch I made to
>> patch-makefile-SHELL that would leave a trailing ' ' at the end of SHELL
>> assignments. This is fine for most packages, but caused
>> gobject-introspection to fail building for me just now (for the curious:
>> it effectively does an "(apply system* (string-split (string-append SHELL
>> " " "./libtool") #\space))" which causes sh to try to execute "")
>
> AFAIK trailing whitespace in assignments is ignored by ‘make’.
>
> I grepped gobject-introspection out of curiosity and couldn’t find any
> suspicious SHELL assignment. Do you still have it around?
E.g. gobject-introspection-1.38.0/giscanner/utils.py:124
> The (string=? args "\n") seems specific and non-obvious.
I thought so too. Your suggestion does work. With this patch, I was
able to bootstrap and build gobject-introspection.
>From 11459384968f654c42ad7dba4443dada35191f5b Mon Sep 17 00:00:00 2001
From: Eric Bavier
Date: Thu, 4 Sep 2014 09:19:24 -0500
Subject: [PATCH] utils: Clean trailing whitespace at end of SHELL
* guix/build/utils.scm (patch-makefile-SHELL): Remove trailing whitespace.
---
guix/build/utils.scm |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/guix/build/utils.scm b/guix/build/utils.scm
index f38b2ca..d169053 100644
--- a/guix/build/utils.scm
+++ b/guix/build/utils.scm
@@ -582,7 +582,7 @@ When KEEP-MTIME? is true, the atime/mtime of FILE are kept unchanged."
(let ((st (stat file)))
(substitute* file
- (("^ *SHELL[[:blank:]]*=[[:blank:]]*([[:graph:]]*/)([[:graph:]]+)[[:blank:]]*(.*)$"
+ (("^ *SHELL[[:blank:]]*=[[:blank:]]*([[:graph:]]*/)([[:graph:]]+)(.*)$"
_ dir shell args)
(let* ((old (string-append dir shell))
(new (or (find-shell shell) old)))
@@ -590,7 +590,7 @@ When KEEP-MTIME? is true, the atime/mtime of FILE are kept unchanged."
(format (current-error-port)
"patch-makefile-SHELL: ~a: changing `SHELL' from `~a' to `~a'~%"
file old new))
-(string-append "SHELL = " new " " args
+(string-append "SHELL = " new args
(when keep-mtime?
(set-file-time file st
--
1.7.9.5
--
Eric Bavier
