Re: 03/04: gnu: fribidi: Update to 1.0.2.

[Marius Bakke]

Leo Famulari  writes:

> On Fri, Mar 23, 2018 at 01:27:11PM +0100, Marius Bakke wrote:
>> Also note that Fribidi gained 2149 new dependents on 'core-updates', so
>> we'll have to be careful about updating it once the branch starts.
>
> Just curious, what was the change?

Recent Pango uses it (it had an embedded copy before):

https://git.savannah.gnu.org/cgit/guix.git/commit/?id=13236d30a70ece00d727b7f7f7c850f81d846d1d


signature.asc
Description: PGP signature

[PATCH] Create INDEX.LIST; Was: Fix references in jar manifests

[Danny Milosavljevic]

diff --git a/guix/build/ant-build-system.scm b/guix/build/ant-build-system.scm
index 6ce813a00..d09062625 100644
--- a/guix/build/ant-build-system.scm
+++ b/guix/build/ant-build-system.scm
@@ -172,6 +172,18 @@ to the default GNU unpack strategy."
 #:allow-other-keys)
   (zero? (apply system* `("ant" ,build-target ,@make-flags
 
+(define* (generate-jar-indices #:key outputs #:allow-other-keys)
+  "Generate file \"META-INF/INDEX.LIST\".  This file does not use word wraps
+and is preferred over \"META-INF/MAINFEST.MF\", which does use word wraps,
+by Java when resolving dependencies.  So we make sure to create it so that
+grafting works."
+  (define (generate-index jar)
+(invoke "jar" "-i" jar))
+  (every (match-lambda
+   ((output . directory)
+(every generate-index (find-files directory "\\.jar$"
+ outputs))
+
 (define* (strip-jar-timestamps #:key outputs
#:allow-other-keys)
   "Unpack all jar archives, reset the timestamp of all contained files, and
@@ -232,7 +244,9 @@ repack them.  This is necessary to ensure that archives are 
reproducible."
 (replace 'build build)
 (replace 'check check)
 (replace 'install install)
-(add-after 'install 'strip-jar-timestamps strip-jar-timestamps)))
+(add-after 'install 'generate-jar-indices generate-jar-indices)
+(add-after 'generate-jar-indices 'strip-jar-timestamps
+   strip-jar-timestamps)))
 
 (define* (ant-build #:key inputs (phases %standard-phases)
 #:allow-other-keys #:rest args)


pgpRfm8SJyyhm.pgp
Description: OpenPGP digital signature

Re: XWayland, /tmp/.X11-unix

[Thorsten Wilms]

On 22.03.2018 14:04, Thorsten Wilms wrote:

On 22.03.2018 00:00, Ricardo Wurmus wrote:


Thorsten Wilms  writes:


Initially I thought creation of /tmp/.X11-unix should be tied to the
xorg-server-xwayland package, but since it is more generic: which
component should create that dir on Guix SD (based on what)?


It is needed at run-time (because packages cannot create files outside
of their store prefix at build time), so it should be created by a
system service.  A service is not the same as a shepherd service; we
also have activation services that run once and only create a file or a
directory.


Revisiting, this wasn't too hard, actually:

Using (guix gexp) implied:

; Create /tmp/.X11-unix and make it writeable to, as required by 
weston-launch with XWayland enabled:

(define mkdir-x11-service
  (simple-service 'mkdir-x11
  activation-service-type
  #~(begin (let ((p "/tmp/.X11-unix"))
  (mkdir-p p)
  (chmod p #o777)

Or perhaps rather:

(define mkdir-x11-service
  (simple-service 'mkdir-x11
  activation-service-type
  #~(begin (use-modules (guix build utils))
   (let ((p "/tmp/.X11-unix"))
  (mkdir-p p)
  (chmod p #o777)


I can't find anything that suggests a way to automatically add such a 
service to the operating system, if xorg-server-xwayland (or anything 
else that would use that dir) is installed.



--
Thorsten Wilms

thorwil's design for free software:
http://thorwil.wordpress.com/

Re: Modification for guix installation script.

[Ricardo Wurmus]

Hi Tatiana,

> I have installed guix for the first time and noticed that the installation
> script at
> https://git.savannah.gnu.org/cgit/guix.git/tree/etc/guix-install.sh did not
> work for me. So, I had to make some modifications.
>
> There was a problem with the path to root user home directory. Below I
> provide diff output for original script and my modified script.

Thank you.

Could you please make that change on top of the current version of the
Guix sources as a git commit?  Then you can run “git format-patch -1” to
format it as a patch in a format that we can apply.  You can send the
resulting patch file as an attachment to a reply to this email.

This also fixes bug #30728, so please add this line to the commit
message:

Fixes .


--
Ricardo

GPG: BCA6 89B6 3655 3801 C3C6  2150 197A 5888 235F ACAC
https://elephly.net

Re: Modification for guix installation script.

[Mark H Weaver]

Ricardo Wurmus  writes:

>> I have installed guix for the first time and noticed that the installation
>> script at
>> https://git.savannah.gnu.org/cgit/guix.git/tree/etc/guix-install.sh did not
>> work for me. So, I had to make some modifications.
>>
>> There was a problem with the path to root user home directory. Below I
>> provide diff output for original script and my modified script.
>
> Thank you.
>
> Could you please make that change on top of the current version of the
> Guix sources as a git commit?  Then you can run “git format-patch -1” to
> format it as a patch in a format that we can apply.  You can send the
> resulting patch file as an attachment to a reply to this email.
>
> This also fixes bug #30728, so please add this line to the commit
> message:
>
> Fixes .

Note that there's also another proposed patch for this same issue, here:

https://bugs.gnu.org/30728#11

Regards,
  Mark