Re: Update btrfs-progs once again and add static output

[Leo Famulari]

On Thu, Apr 14, 2016 at 06:30:18PM +0200, Ludovic Courtès wrote:
> Leo Famulari  skribis:
> 
> > On Mon, Apr 11, 2016 at 08:07:09PM -0400, Leo Famulari wrote:
> >> On Sat, Apr 02, 2016 at 03:29:31PM +0200, Tobias Geerinckx-Rice wrote:
> >> > Some simple patches to add a ‘static’ output to the btrfs-progs
> >> > package, containing statically linked versions of all the tools.
> >> 
> >> I've applied your patches (with some very minor edits to the commit
> >> messages), bringing HEAD to 5f3f3ac2874.
> >
> > I forgot to check how many packages would be rebuilt by the change to
> > util-linux: 714.
> >
> > Should I revert the change and put it on core-updates?
> 
> That would have been the way to go, yes.

Okay, thanks to Dave and Mark for doing the necessary reversions.

Hopefully I won't forget to check this again, but if I do it would be
good for me to know what happens when changes are pushed the master
branch on Savannah.

Does hydra start building the changes immediately? If so, and I had
reverted the change, would that have stopped the ongoing build?

Re: [PATCH 1/2] build: Move included files to subdirectories.

[Mathieu Lirzin]

l...@gnu.org (Ludovic Courtès) writes:

> Eric Bavier  skribis:
>>
>> I don't prefer the "local.mk" convention.  It becomes
>> non-obvious that the file is input for Automake, and the name loses any
>> descriptive power.
>
> I have mixed feelings (notably because file names in those .mk files
> remain relative to $top_srcdir, which can be confusing and will make M-/
> useless).

I didn't know about M-/ :)

To emphasize how the file names relate to the current directory of the
‘Makefile’ snippet, we could use ‘%reldir%’ or ‘%D%’ like describe in:

  https://www.gnu.org/software/automake/manual/automake.html#Include

Moreover this would makes the future move/rename of directories less
troublesome.

WDYT?

-- 
Mathieu Lirzin

Re: bug#22536: guix lint

[Ludovic Courtès]

Danny Milosavljevic  skribis:

 (string-pad-middle "http://foo; "bar 34 B/s" 80)
> "http://foobar 34 B/s"
>
> Arguments against it are (o: questionable mitigation, leaning heavily 
> against; *: against it with OK mitigation; X: definitely against it):
> o The terminal width is not passed to it correctly (can be fixed, although I 
> have to read up on what the currently recommeded way is. tcgetattr ?).
> o The terminal width can change while the script is running (can this be 
> fixed? It would need a SIGWINCH handler and some kind of notification to 
> scripts/download so it reprints the progress text). Now you can have a race 
> between (1) and (2), fun.
> * The terminal width can be changed after the script is done and has printed 
> its thing (nobody can fix the output up anymore). In our present case, the 
> text is supposedly ephemeral, so it shouldn't be there anymore, so it's fine.

Unfortunately, except when using ‘guix download’, this code’s stdout is
always captured by the daemon, which in turn passes it to the client
(the ‘guix’ command), and the client’s terminal width can hardly be
known to the download code.

However, commit b0a6a9713076347c14ee2dd0ea494ab086df2a82 improves the
situation in some cases.

> o Since it uses string-length it doesn't actually count how many glyphs would 
> be printed on the terminal, while it should do so (this can be fixed - but at 
> large complexity increase and as long as the terminal doesn't use 
> variable-width fonts; arguably if it's documented to be only used for ASCII 
> strings it's simple. We should probably do the latter - and never translate 
> it into another human language).

‘string-length’ returns the number of Unicode codepoints, which is the
number of glyphs in this case.

> I can also fix up string-pad-middle while maintaining its way, but just for 
> the record, this is a bad way of doing it.
>
> If we are concerned about all emphemeral "transferred" lines lining up, just 
> print the speed first (with fixed width, if possible) and the URL afterwards, 
> with one space in-between.

I believe this one is fixed by 8a2154fefaafe631905c12891c9c2587dadbc863.

> We could abbreviate it if we have to - but should the download fail, the 
> error message then has to contain the unabbreviated URL for usability (note: 
> it does). At that point, why have the URL in the download progress at all? 
> Total percentage done (over all the downloads) would be a lot more useful.

This was initially discussed at
.
It seems we’ve diverged from what was proposed there, though.

Thoughts?

> If we do print a table, I would suggest setting a tab stop (using ESC H or 
> similar) and using the tab character to print tables - that's what they are 
> for. Note: there's a standalone "column -t" tool which also does the right 
> thing, apparently.

So, what would be your preference?  :-)

> Also, is there a control character which returns to the beginning of the 
> paragraph? Double-clicking on a paragraph in gnome-terminal selects the 
> entire paragraph - so it does know what extent the paragraph has. However, 
> printing CR returns me to the beginning of the row, not the beginning of the 
> paragraph.

No idea.

Thanks for your feedback!

Ludo’.

Re: [PATCH] Add rapicorn.

[Andreas Enge]

Hello Ricardo,

On Wed, Apr 13, 2016 at 09:34:03PM +0200, Ricardo Wurmus wrote:
> Note that it depends on libpng 1.2.x, which is added by the first patch.
> +(define-public libpng12

in line with our other package names, I would tend to call this libpng-1.2
(just like our old command line syntax).

Andreas

[PATCH 1/3] doc: Add specification for Java packages

[Hartmut Goebel]

* doc/guix.texi (Java Packages): New subsection.
---
 doc/guix.texi | 19 +++
 1 file changed, 19 insertions(+)

diff --git a/doc/guix.texi b/doc/guix.texi
index dcc1124..c1f80cb 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -10979,6 +10979,25 @@ are also prepended by @code{perl-}.  Such modules tend 
to have the word
 prefix.  For instance, @code{libwww-perl} becomes @code{perl-libwww}.
 
 
+@node Java Packages
+@subsection Java Packages
+
+Java programs standing for themselves are named as any other package,
+using the lowercase upstream name.
+
+To avoid confusion and naming clashes with other programming languages,
+it's desirable that the name of a package for a Java package is prefixed
+with @code{java-}.  If a project already contains the word
+@code{java}, we drop this; for instance, the package @code{dnsjava}
+is packaged under the name @code{java-dns}.
+
+For Java packages containing a single class or a small class hierarchy,
+we use the lowercase class name, replace all occurrences of @code{.} by
+dashes and prepend the prefix @code{java-}. So the class
+@code{apache.commons.cli} becomes package
+@code{java-apache-commons-cli}.
+
+
 @node Fonts
 @subsection Fonts
 
-- 
2.7.4

[PATCH 3/3] gnu: Add aliases for the old Java package names.

[Hartmut Goebel]

* gnu/packages/bioninformatics.scm (htsjdk) (ngs-java): New
  function aliases.
* gnu/packages/java.scm (swt): New function alias.
---
 gnu/packages/bioinformatics.scm | 8 
 gnu/packages/java.scm   | 4 
 2 files changed, 12 insertions(+)

diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm
index 3094489..2f8821f 100644
--- a/gnu/packages/bioinformatics.scm
+++ b/gnu/packages/bioinformatics.scm
@@ -2113,6 +2113,10 @@ sequencing (HTS) data.  There are also an number of 
useful utilities for
 manipulating HTS data.")
 (license license:expat)))
 
+;; old name "htsjdk" is obsolete and will be removed soon
+(define-public htsjdk java-htsjdk)
+
+
 (define-public htslib
   (package
 (name "htslib")
@@ -3030,6 +3034,10 @@ simultaneously.")
("ngs-sdk" ,ngs-sdk)))
 (synopsis "Java bindings for NGS SDK")))
 
+;; old name "ngs-java" is obsolete and will be removed soon
+(define-public ngs-java java-ngs)
+
+
 (define-public ncbi-vdb
   (package
 (name "ncbi-vdb")
diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index 7a9f47d..ae50f8a 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -133,6 +133,10 @@ is implemented.")
   license:mpl2.0
   license:lgpl2.1+
 
+;; old name "swt" is obsolete and will be removed soon
+(define-public swt java-swt)
+
+
 (define-public ant
   (package
 (name "ant")
-- 
2.7.4

[PATCH 2/3] gnu: Rename Java packages to match new naming specification.

[Hartmut Goebel]

* gnu/packages/bioinformatics.scm (htsjdk) (ngs-java): rename to ...
  (java-htsjdk) (java-ngs) ... this.
  (ncbi-vdb) [configure] [inputs] Use new name.
* gnu/packages/java.scm (swt): rename to ...
  (java-swt) ... this.
* gnu/packages/music.scm (tuxguitar) [make-flags] [inputs]
  [PROPERTIES]: Use new name of package "swt".
---
 gnu/packages/bioinformatics.scm | 12 ++--
 gnu/packages/java.scm   |  4 ++--
 gnu/packages/music.scm  |  6 +++---
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm
index b76aadc..3094489 100644
--- a/gnu/packages/bioinformatics.scm
+++ b/gnu/packages/bioinformatics.scm
@@ -2075,9 +2075,9 @@ HMMs).")
 from high-throughput sequencing assays.")
 (license license:gpl3+)))
 
-(define-public htsjdk
+(define-public java-htsjdk
   (package
-(name "htsjdk")
+(name "java-htsjdk")
 (version "1.129")
 (source (origin
   (method url-fetch)
@@ -3012,9 +3012,9 @@ any particular back-end implementation, and supports use 
of multiple back-ends
 simultaneously.")
 (license license:public-domain)))
 
-(define-public ngs-java
+(define-public java-ngs
   (package (inherit ngs-sdk)
-(name "ngs-java")
+(name "java-ngs")
 (arguments
  `(,@(substitute-keyword-arguments
  `(#:modules ((guix build gnu-build-system)
@@ -3077,7 +3077,7 @@ simultaneously.")
 (string-append "--with-ngs-sdk-prefix="
(assoc-ref inputs "ngs-sdk"))
 (string-append "--with-ngs-java-prefix="
-   (assoc-ref inputs "ngs-java"))
+   (assoc-ref inputs "java-ngs"))
 (string-append "--with-hdf5-prefix="
(assoc-ref inputs "hdf5"))
 (alist-cons-after
@@ -3103,7 +3103,7 @@ simultaneously.")
 (inputs
  `(("libxml2" ,libxml2)
("ngs-sdk" ,ngs-sdk)
-   ("ngs-java" ,ngs-java)
+   ("java-ngs" ,java-ngs)
("libmagic" ,file)
("hdf5" ,hdf5)))
 (native-inputs `(("perl" ,perl)))
diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index 9b6a647..7a9f47d 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -51,9 +51,9 @@
   #:use-module (gnu packages texinfo)
   #:use-module ((srfi srfi-1) #:select (fold alist-delete)))
 
-(define-public swt
+(define-public java-swt
   (package
-(name "swt")
+(name "java-swt")
 (version "4.4.2")
 (source (origin
   (method url-fetch)
diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index f733e45..a540845 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -734,7 +734,7 @@ is subjective.")
   (string-append "PREFIX="
  (assoc-ref %outputs "out"))
   (string-append "SWT_PATH="
- (assoc-ref %build-inputs "swt")
+ (assoc-ref %build-inputs "java-swt")
  "/share/java/swt.jar"))
#:tests? #f ;no "check" target
#:parallel-build? #f ;not supported
@@ -749,11 +749,11 @@ is subjective.")
(string-append "GCJFLAGS=-fsource=1.4 -fPIC " rest))
   (("PROPERTIES\\?=")
(string-append "PROPERTIES?= -Dswt.library.path="
-  (assoc-ref inputs "swt") "/lib"))
+  (assoc-ref inputs "java-swt") "/lib"))
   (("\\$\\(GCJ\\) -o") "$(GCJ) $(LDFLAGS) -o"))
 #t)
 (inputs
- `(("swt" ,swt)))
+ `(("java-swt" ,java-swt)))
 (native-inputs
  `(("gcj" ,gcj)
("pkg-config" ,pkg-config)))
-- 
2.7.4

[PATCH 0/3] Prefix "java-" for Java packages

[Hartmut Goebel]

As discussed on the mailinglist earlier this day, these patches
introduce the prefix "java-" for Java packages.

Hartmut Goebel (3):
  doc: Add specification for Java packages
  gnu: Rename Java packages to match new naming specification.
  gnu: Add aliases for the old Java package names.

 doc/guix.texi   | 19 +++
 gnu/packages/bioinformatics.scm | 20 ++--
 gnu/packages/java.scm   |  8 ++--
 gnu/packages/music.scm  |  6 +++---
 4 files changed, 42 insertions(+), 11 deletions(-)

-- 
2.7.4

Re: Update btrfs-progs once again and add static output

[Thompson, David]

On Thu, Apr 14, 2016 at 12:30 PM, Ludovic Courtès  wrote:
> Leo Famulari  skribis:
>
>> On Mon, Apr 11, 2016 at 08:07:09PM -0400, Leo Famulari wrote:
>>> On Sat, Apr 02, 2016 at 03:29:31PM +0200, Tobias Geerinckx-Rice wrote:
>>> > Some simple patches to add a ‘static’ output to the btrfs-progs
>>> > package, containing statically linked versions of all the tools.
>>>
>>> I've applied your patches (with some very minor edits to the commit
>>> messages), bringing HEAD to 5f3f3ac2874.
>>
>> I forgot to check how many packages would be rebuilt by the change to
>> util-linux: 714.
>>
>> Should I revert the change and put it on core-updates?
>
> That would have been the way to go, yes.
>
> However, at this point I think it’s too late to revert.  Mark?

I reverted it, as discussed on IRC.

- Dave

Re: [PATCH 1/5] gnu: Add avr-binutils.

[Manolis Ragkousis]

Hey Ludo,

On 04/14/16 20:04, Ludovic Courtès wrote:

> AFAICS --target=avr is redundant:
> 
> --8<---cut here---start->8---
> $ git describe
> v0.10.0-204-ga2d0e20
> $ wget -q -O - $(./pre-inst-env guix build --log-file -e '((@ (gnu packages 
> cross-base) cross-binutils) "avr")') |grep -e --target
> configure flags: 
> ("CONFIG_SHELL=/gnu/store/b1yqjimbdh5bf9jnizd4h7yf110744j2-bash-4.3.42/bin/bash"
>  "SHELL=/gnu/store/b1yqjimbdh5bf9jnizd4h7yf110744j2-bash-4.3.42/bin/bash" 
> "--prefix=/gnu/store/gqmq8gis9igpg4xy6022mvq8qpvp7kk4-binutils-cross-avr-2.25.1"
>  "--enable-fast-install" "--build=x86_64-unknown-linux-gnu" "--target=avr" 
> "--with-sysroot=/" "LDFLAGS=-static-libgcc" "--with-lib-path=/no-ld-lib-path" 
> "--disable-werror" "--enable-install-libbfd" 
> "--enable-deterministic-archives")
> --8<---cut here---end--->8---
> 
> … and --disable-nls is orthogonal and probably unnecessary.
> 
> Can we skip this patch?  :-)

We added --disable-nls mostly because it was suggested from the avr-libc
manual to be passed to binutils and gcc.


David can you build the toolchain without it and see if it works?

And I would really prefer if we had a way to explicitly install
avr-binutils.  This way it will be more clear to someone only wanting to
install this specific package.

We could keep something like this

(define-public avr-binutils
  (package
(inherit (cross-binutils "avr"))
(name "avr-binutils")))

Manolis

[PATCH] Add BEAST.

[Ricardo Wurmus]

Hi Guix,

meet the BEAST!  This depends on the patches to add libpng12 and
rapicorn.

I haven’t played much with it yet, but it starts.  Yay!

~~ Ricardo

>From 618c5a2e9826f196706e7fab2a9b653fc69c2b1c Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Thu, 14 Apr 2016 20:26:23 +0200
Subject: [PATCH 2/2] gnu: Add Beast.

* gnu/packages/music.scm (beast): New variable.
---
 gnu/packages/music.scm | 41 +
 1 file changed, 41 insertions(+)

diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index d5fdd18..4463d3d 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -59,6 +59,7 @@
   #:use-module (gnu packages gl)
   #:use-module (gnu packages glib)
   #:use-module (gnu packages gnome)
+  #:use-module (gnu packages graphics)
   #:use-module (gnu packages gtk)
   #:use-module (gnu packages guile)
   #:use-module (gnu packages image)
@@ -740,6 +741,46 @@ modification devices that brought world-wide fame to the names and products of
 Laurens Hammond and Don Leslie.")
 (license license:gpl2+)))
 
+(define-public beast
+  (package
+(name "beast")
+(version "0.10.0")
+(source (origin
+  (method url-fetch)
+  (uri (string-append "https://testbit.eu/pub/dists/beast/beast-;
+  version ".tar.xz"))
+  (sha256
+   (base32
+"1jzzmfwssklzw8fvvil04n8csc0zm99fnd9p2xa7c0xchg37lvhn"
+(build-system gnu-build-system)
+(inputs
+ `(("rapicorn" ,rapicorn)
+   ("guile" ,guile-1.8)
+   ("python" ,python-2)
+   ("cython" ,python2-cython)
+   ("libgnomecanvas" ,libgnomecanvas)
+   ("libogg" ,libogg)
+   ("libmad" ,libmad)
+   ("flac" ,flac)
+   ("alsa-lib" ,alsa-lib)
+   ("libvorbis" ,libvorbis)
+   ("gettext" ,gnu-gettext)))
+(native-inputs
+ `(("pkg-config" ,pkg-config)
+   ("glib:bin" ,glib "bin")
+   ("perl" ,perl)
+   ("perl-xml-parser" ,perl-xml-parser)))
+(home-page "https://testbit.eu/wiki/Beast_Home;)
+(synopsis "Music composition and modular synthesis environment")
+(description
+ "Beast is a music composition and modular synthesis application.  It
+supports a wide range of standards in the field, such as MIDI, various audio
+file formats and LADSPA modules.  It allows for multitrack editing, real-time
+synthesis, 32bit audio rendering, precise timing down to sample granularity,
+on-demand and partial loading of wave files, on the fly decoding, stereo
+mixing, FFT scopes, MIDI automation and full scriptability in Scheme.")
+(license license:gpl3+)))
+
 ;; TODO: startBristol script does not work
 (define-public bristol
   (package
-- 
2.7.3

Re: [PATCH] Add rapicorn.

[Ricardo Wurmus]

Ricardo Wurmus  writes:

> Mathieu Lirzin  writes:
>
>>> +   (modify-phases %standard-phases
>>> + (add-after 'unpack 'replace-/bin/ls
>>> +   (lambda _
>>> + (substitute* '("Makefile.decl"
>>> +"tools/Makefile.in"
>>> +"tests/Makefile.in"
>>> +"aidacc/tests/Makefile.in"
>>> +"aidacc/Makefile.in"
>>> +"cython/Makefile.in"
>>> +"res/Makefile.in"
>>> +"ui/tests/Makefile.in"
>>> +"ui/Makefile.in"
>>> +"docs/tutorial/Makefile.in"
>>> +"docs/mans/Makefile.in"
>>> +"docs/Makefile.in"
>>> +"docs/examples/Makefile.in"
>>> +"docs/imports/Makefile.in"
>>> +"Makefile.in"
>>> +"pytests/Makefile.in"
>>> +"examples/Makefile.in"
>>> +"data/Makefile.in"
>>> +"rcore/tests/Makefile.in"
>>> +"rcore/Makefile.in")
>>> +   (("/bin/ls") (which "ls")))
>>
>> Can you try to use ‘find-files’ for this substitution?
>
> Yes, that would be better.  I’ll send a new version of this patch
> later; I found that some inputs need to be propagated.

Here’s a new version of the patch moving around inputs to the
propagated-inputs field and using “find-files”.

~~ Ricardo

>From 168af32c5973fa30c56679b6c08e878e3ea2f632 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Wed, 13 Apr 2016 08:56:16 +0200
Subject: [PATCH 1/2] gnu: Add rapicorn.

* gnu/packages/graphics.scm (rapicorn): New variable.
---
 gnu/packages/graphics.scm | 63 +++
 1 file changed, 63 insertions(+)

diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm
index 1c52c2c..da764ed 100644
--- a/gnu/packages/graphics.scm
+++ b/gnu/packages/graphics.scm
@@ -31,22 +31,32 @@
   #:use-module (gnu packages audio)
   #:use-module (gnu packages autotools)
   #:use-module (gnu packages bash)
+  #:use-module (gnu packages bison)
   #:use-module (gnu packages boost)
+  #:use-module (gnu packages doxygen)
+  #:use-module (gnu packages haskell)
   #:use-module (gnu packages image)
   #:use-module (gnu packages python)
+  #:use-module (gnu packages flex)
   #:use-module (gnu packages fontutils)
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages pulseaudio)  ;libsndfile, libsamplerate
   #:use-module (gnu packages compression)
   #:use-module (gnu packages multiprecision)
   #:use-module (gnu packages gl)
+  #:use-module (gnu packages glib)
+  #:use-module (gnu packages graphviz)
+  #:use-module (gnu packages gtk)
+  #:use-module (gnu packages gnome)
   #:use-module (gnu packages image)
   #:use-module (gnu packages jemalloc)
   #:use-module (gnu packages photo)
   #:use-module (gnu packages python)
   #:use-module (gnu packages qt)
+  #:use-module (gnu packages readline)
   #:use-module (gnu packages sdl)
   #:use-module (gnu packages video)
+  #:use-module (gnu packages xml)
   #:use-module (gnu packages xorg))
 
 (define-public blender
@@ -271,6 +281,59 @@ visual effects work for film.")
 (home-page "http://www.openimageio.org;)
 (license license:bsd-3)))
 
+(define-public rapicorn
+  (package
+(name "rapicorn")
+(version "16.0.0")
+(source (origin
+  (method url-fetch)
+  (uri (string-append "https://testbit.eu/pub/dists/rapicorn/;
+  "rapicorn-" version ".tar.xz"))
+  (sha256
+   (base32
+"1y51yjrpsihas1jy905m9p3r8iiyhq6bwi2690c564i5dnix1f9d"
+(build-system gnu-build-system)
+(arguments
+ `(;; FIXME: At least "testrcore1" fails.
+   #:tests? #f
+   #:phases
+   (modify-phases %standard-phases
+ (add-after 'unpack 'replace-/bin/ls
+   (lambda _
+ (substitute* (cons "Makefile.decl"
+(find-files "." "^Makefile\\.in$"))
+   (("/bin/ls") (which "ls")))
+ #t)
+;; These libraries are listed in the "Required" section of the pkg-config
+;; file.
+(propagated-inputs
+ `(("librsvg" ,librsvg)
+   ("cairo" ,cairo)
+   ("pango" ,pango)
+   ("libxml2" ,libxml2)))
+(inputs
+ `(("gdk-pixbuf" ,gdk-pixbuf)
+   ("libpng" ,libpng12)
+   ("readline" ,readline)
+   ("libcroco" ,libcroco)
+   ("python" ,python-2)
+   ("cython" ,python2-cython)))
+(native-inputs
+ `(("pandoc" ,ghc-pandoc)
+   ("bison" ,bison)
+   ("flex" ,flex)
+   ("doxygen" ,doxygen)
+   ("graphviz" ,graphviz)
+   ("intltool" 

[PATCH] gnu: update inputs for python-django-simple-math-captcha

[Hartmut Goebel]

* gnu/packages/django.scm: (python-django-simple-math-captcha)
  move python-setuptools to native-imports
---
 gnu/packages/django.scm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm
index 12e2bb1..1ae103c 100644
--- a/gnu/packages/django.scm
+++ b/gnu/packages/django.scm
@@ -71,8 +71,9 @@ DRY principle.")
   "0906hms6y6znjhpd0g4wmzv9vcla4brkdpsm4zha9zdj8g5vq2hd"
   (build-system python-build-system)
   (inputs
-`(("python-django" ,python-django)
-  ("python-setuptools" ,python-setuptools)))
+`(("python-django" ,python-django)))
+  (native-inputs
+`(("python-setuptools" ,python-setuptools)))
   (home-page "https://github.com/alsoicode/django-simple-math-captcha;)
   (synopsis
 "Easy-to-use math field/widget captcha for Django forms")
-- 
2.7.4

Re: [PATCH 3/5] gnu: avr-libc: Fix build.

[Thompson, David]

On Thu, Apr 14, 2016 at 1:26 PM, Ludovic Courtès  wrote:
> David Thompson  skribis:
>
>> * gnu/packages/avr.scm (avr-libc): Update to 2.0.0.
>> [native-inputs]: Use new avr-gcc and avr-binutils.
>> [arguments]: Add phase to unset C_INCLUDE_PATH.
>
> Please make the update a separate patch, which you can push right away.
> ;-)

I don't see why I should push that separately given that avr-libc has
been broken for a long time.

http://debbugs.gnu.org/cgi/bugreport.cgi?bug=23115

I can just not update it here at all and get everything fixed first.

- Dave

Re: Proposal: Prefix "java-" for Java packages

[Hartmut Goebel]

Am 14.04.2016 um 18:59 schrieb Ludovic Courtès:
> If there are no objections, you’re welcome to submit a patch, Hartmut!
Fine, I'll do.

Does anyone have a better example than "ffmpeg-java" (which I more or
less invented)?

-- 
Regards
Hartmut Goebel

| Hartmut Goebel  | h.goe...@crazy-compilers.com   |
| www.crazy-compilers.com | compilers which you thought are impossible |

Re: [PATCH 2/3] gnu: util-linux: Add "static" output.

[Thompson, David]

Leo, I had to revert this patch as it caused a rebuild of over 700
packages.  We should target core-updates instead.

Building the following 358 packages would ensure 737 dependent
packages are rebuilt: smproxy-1.0.6 xinit-1.3.4 lsh-2.1 xkill-1.0.4
xrdb-1.1.0 xsetroot-1.1.1 x11perf-1.6.0 xhost-1.0.7 wmctrl-1.07
windowmaker-0.95.6 wmnd-0.4.17 wmclock-1.0.16 wmcpuload-1.0.1
xboing-2.4 xkbutils-1.0.4 clusterssh-3.28 guix-0.10.0-0.7611
skribilo-0.9.3 emacs-w3m-1.4.538+0.20141022 hydra-20150407.4c0e3e4
libstdc++-doc-5.3.0 libstdc++-doc-4.9.3 singular-4.0.3 xwd-1.0.6
xosd-2.2.14 xeyes-1.0.1 assword-0.8 shroud-0.1.1 xlockmore-5.46
tvtime-1.0.2 r-dt-0.1 r-ztable-0.1.5 r-servr-0.2 r-doparallel-1.0.10
r-lattice-0.20-33 r-dplyr-0.4.3 r-devtools-1.10.0 r-plotly-2.0.3
r-rmarkdown-0.8.1 python2-rpy2-2.7.6 python-rpy2-2.7.6 r-pracma-1.8.8
r-adaptivesparsity-1.4 rsem-1.2.20 r-dnacopy-1.44.0 r-qtl-1.38-4
r-acsnminer-0.15.11 r-org-dm-eg-db-3.2.3 r-org-hs-eg-db-3.2.3
r-org-mm-eg-db-3.2.3 r-org-ce-eg-db-3.2.3
r-bsgenome-celegans-ucsc-ce6-1.4.0 r-motifrg-1.14.0
r-bsgenome-dmelanogaster-ucsc-dm3-1.4.0
r-bsgenome-mmusculus-ucsc-mm9-1.4.0 r-variantannotation-1.16.4
r-genomation-1.2.2 r-topgo-2.22.0 ratpoison-1.4.8 plotutils-2.6
procmail-3.22 links-2.12 xpdf-3.04 a2ps-4.14 xboard-4.8.0 fvwm-2.6.5
sawfish-1.11 pidgin-otr-4.0.2 ruby-atoulme-antwrap-0.7.5 htsjdk-1.129
icedtea-1.13.10 fluxbox-1.3.7 sxiv-1.3.2 openbox-3.6.1 scrot-0.8
feh-2.14.1 gkrellm-2.3.5 emacs-no-x-toolkit-24.5
guile-toxcore-0.1-6a9fbe0 i3-wm-4.12 colordiff-1.0.16 perf-4.5.1
taskwarrior-2.4.3 mu-0.9.13 qemu-minimal-2.5.0 password-store-1.6.5
node-5.10.0 man-db-2.7.1 aegis-4.24 extundelete-0.2.4 zerofree-1.0.3
ripperx-2.8.0 abcde-2.7.1 orpheus-1.6 emms-4.0 mpc123-0.2.4 xmp-4.0.10
mdadm-3.3.2 libcanberra-gtk2-0.30 wmbattery-2.50 xdriinfo-1.0.5
xf86-video-r128-6.10.1 xf86-video-cirrus-1.5.3 xf86-input-mouse-1.9.1
xf86-input-joystick-1.6.2 xf86-video-mach64-6.9.5
xf86-video-voodoo-1.2.5 xf86-video-sis-0.10.8 xf86-video-savage-2.3.8
xf86-input-evdev-2.10.1 xf86-video-vesa-2.3.4 xf86-video-tga-1.2.2
xf86-video-sunffb-1.2.2 xf86-video-nouveau-1.0.12 xf86-video-ark-0.7.5
xf86-video-glint-1.2.8 xf86-video-neomagic-1.2.9
xf86-input-synaptics-1.8.3 xf86-video-openchrome-0.3.3
xf86-video-ati-7.6.1 xf86-input-keyboard-1.8.1 xf86-video-fbdev-0.4.4
xf86-video-siliconmotion-1.7.8 xf86-video-suncg6-1.1.2
xf86-video-i128-1.3.6 xf86-video-trident-1.3.7 xf86-video-nv-2.1.20
xf86-video-modesetting-0.9.0 xf86-input-void-1.4.1
xf86-video-geode-2.11.18 xf86-video-mga-1.6.4
xf86-video-intel-2.99.917-1-d167280 xf86-video-vmware-13.1.0
xf86-video-tdfx-1.4.6 scribus-1.5.1 python-pyqt-5.5
owncloud-client-2.1.1 lxqt-session-0.9.0 lxqt-common-0.9.1
quassel-0.12.3 gpsbabel-1.5.2 tiled-0.15.1 librecad-2.0.9
fritzing-0.9.2b gecode-4.4.0 pumpa-0.9.2 frescobaldi-2.18.2
keepassx-2.0.2 wine-1.9.4 vtk-6.1.0 sdl2-ttf-2.0.14 sdl2-mixer-2.0.1
gst-plugins-ugly-1.8.0 sdl-gfx-2.0.24 qemu-2.5.0 agg-2.5 fizmo-0.7.9
gzochi-0.9 desmume-0.9.11 mplayer-1.3.0 pianobar-2015.11.22
mpd-0.19.14 gst-libav-1.8.0 guile-gnunet-0.0.383eac2 slim-1.3.6
asymptote-2.35 sdl2-image-2.0.1 wesnoth-1.12.4 gourmet-0.17.4
calibre-2.51.0 raincat-1.1.1.3 guile-sly-0.1 xscreensaver-5.34
wxmaxima-15.04.0 python-h5py-2.6.0 python-numexpr-2.4.4
python-biopython-1.66 python-ipython-3.2.1 python-statsmodels-0.6.1
python-scikit-image-0.11.3 python-scikit-learn-0.16.1
python-seaborn-0.5.1 idr-2.0.0 python2-numexpr-2.4.4
python2-ipython-3.2.1 python2-scikit-image-0.11.3
python2-statsmodels-0.6.1 enblend-enfuse-4.1.3 rseqc-2.6.1
seqmagick-0.6.1 grit-2.0.2 macs-2.1.0.20151222 crossmap-0.2.1
pbtranscript-tofu-2.2.3.8f5467fe6 pepr-1.0.9 python2-seaborn-0.5.1
miso-0.5.3 couger-1.8.2 python2-warpedlmm-0.21 pyicoteo-2.0.7
deeptools-2.1.1 clipper-0.3.0 mate-icon-theme-1.12.0 gmtp-1.3.10
tuxguitar-1.2 conkeror-1.0pre1.20150730 lablgtk-2.18.3
inklingreader-0.8 gxmessage-3.4.3 zathura-djvu-0.2.4 zathura-cb-0.1.4
zathura-ps-0.2.2 zathura-pdf-poppler-0.2.5 pspp-0.10.1 pavucontrol-3.0
gnunet-gtk-0.10.1 baobab-3.18.1 libmateweather-1.12.1
mate-desktop-1.12.1 byzanz-0.2-1.f7af3a5 gnome-screenshot-3.18.0
vte-0.36.5 gnome-sudoku-3.18.2 gsegrafix-1.0.6 gnumeric-1.12.24
gnome-mines-3.18.2 aisleriot-3.18.2 d-feet-0.3.10 gnucash-2.6.12
devhelp-3.18.1 libzapojit-0.0.3 hexchat-2.12.0 claws-mail-3.13.2
ibus-libpinyin-1.7.2 ibus-anthy-1.5.8 file-roller-3.16.4 tilda-1.3.1
gtk-vnc-0.5.4 gnome-klotski-3.18.2 dconf-editor-3.18.2 seahorse-3.18.0
pioneers-15.3 sfxr-1.2.1 fcitx-4.2.8.6 hop-2.4.0 proof-general-4.2
emacs-undo-tree-0.6.4 emacs-popup-0.5.3 emacs-slime-2.15
emacs-constants-2.2 emacs-mit-scheme-doc-20140203 emacs-auctex-11.88.6
emacs-god-mode-20151005.925.1-6cf0807b6
emacs-scheme-complete-20151223.9b5cf224 emacs-butler-0.2.4
emacs-debbugs-0.9 emacs-flycheck-0.23 magit-svn-2.1.1
emacs-ob-ipython-20150704.8807064693 emacs-typo-1.1
guile-emacs-20150512.41120e0 transmission-2.84 abiword-3.0.1
maim-3.4.47 libreoffice-5.0.5.2 brdf-explorer-17 pinball-0.3.1
gnujump-1.0.8 

Re: [PATCH 2/2] build: Move environment scripts to 'build-aux' directory.

[Ludovic Courtès]

Mathieu Lirzin  skribis:

> * pre-inst-env.in: Move to ...
> * build-aux/pre-inst-env.in: ... here.
> * test-env.in: Move to ...
> * build-aux/test-env.in: ... here.
> * configure.ac (AC_CONFIG_FILES): Adapt to this.

I had the same initial reaction as Alex, but I’m glad you had foreseen
that.  ;-)

LGTM, thanks!

Ludo’.

Re: Installing Guix easily on other distros

[Hartmut Goebel]

Am 14.04.2016 um 19:00 schrieb Mathieu Lirzin:
> If we are able to generate deb and rpm files from the Guix package
> definition without too much burden, I think it is a good idea.  However
> having a "debian" directory + a spec file +   will require
> additional maintenance efforts and an extra layer of “noise” in the
> repository that seems undesirable to me.

Perhaps it's enough to point to other builds in the manual or some wiki?

-- 
Regards
Hartmut Goebel

| Hartmut Goebel  | h.goe...@crazy-compilers.com   |
| www.crazy-compilers.com | compilers which you thought are impossible |

Re: [PATCH 0/2] emacs: Use full profile name in Guix buffer names.

[Ludovic Courtès]

Alex Kost  skribis:

> Currently names of buffers with Guix packages may look mysterious.
> If you call "M-x guix-installed-user-package", you get:
>
>   *Guix Package List: guix-profile*
>
> If you call "M-x guix-installed-system-packages", you get:
>
>   *Guix Package List: profile*
>
> It is not obvious what "guix-profile" and "profile" stand for.  The
> answer is: it is just a last part of profile name:
>
>   /var/guix/profiles/per-user//guix-profile → guix-profile
>   /var/guix/profiles/system/profile   → profile
>
> I think it will be more user-friendly if a default buffer name contains
> a full profile name.  The result buffer name may be a bit long, but at
> least it is clear, WDYT?

It’s going to be a bit long, indeed, but that sounds reasonable.

Ludo’.

Re: [PATCH 2/2] emacs: Use full profile name in Guix buffer names.

[Ludovic Courtès]

Alex Kost  scribes:

> * emacs/guix-ui.el (guix-ui-buffer-name-default): Rename to...
> (guix-ui-buffer-name-short): ... this.
> (guix-ui-buffer-name-full): New procedure.
> (guix-ui-buffer-name-function): Set it as default.

OK, thanks!

Ludo'.

Re: [PATCH 1/2] emacs: Factorize code for buffer names.

[Ludovic Courtès]

Alex Kost  skribis:

> * emacs/guix-ui.el (guix-ui-buffer-name-default): Extract the code to
>   compose buffer name and move to...
> * emacs/guix-utils.el (guix-compose-buffer-name): ... here.  New procedure.

OK.

Re: [PATCH 4/5] gnu: Add avr-toolchain.

[Ludovic Courtès]

David Thompson  skribis:

> * gnu/packages/avr.scm (avr-toolchain): New variable.

I’m guessing that the goal is to allow users to install it in a profile
and build stuff interactively from there, right?

However, profiles currently contain only native packages; patch #2 moves
’search-paths’ to ‘native-search-paths’, which in part is a way to work
around this limitation.

I think a better solution would be to allow users to build profiles that
contain non-native packages.  That way, we could do things like:

  guix environment --target=avr foo

Thoughts?

Until this is possible, we could apply this patch with the added
search-paths/native-search-paths hack (assuming said hack has been
removed from patch #2.)

Does it makes sense?

Thanks,
Ludo’.

Re: [PATCH 3/5] gnu: avr-libc: Fix build.

[Ludovic Courtès]

David Thompson  skribis:

> * gnu/packages/avr.scm (avr-libc): Update to 2.0.0.
> [native-inputs]: Use new avr-gcc and avr-binutils.
> [arguments]: Add phase to unset C_INCLUDE_PATH.

Please make the update a separate patch, which you can push right away.
;-)

I think the rest won’t be needed given my comments on patch #2.

Ludo’.

Re: [PATCH 2/5] gnu: Add avr-gcc.

[Ludovic Courtès]

David Thompson  skribis:

> * gnu/packages/avr.scm (avr-gcc): New variable.

[...]

> +  `(modify-phases ,phases
> + ;; Without a working multilib build, the resulting GCC lacks
> + ;; support for nearly every AVR chip.
> + (add-after 'unpack 'fix-genmultilib
> +   (lambda _
> + (substitute* "gcc/genmultilib"
> +   (("#!/bin/sh") (string-append "#!" (which "sh"

Just: (patch-shebang "gcc/genmultilib").

I think the reason this file is not automatically patched during the
‘patch-shebangs’ phase is because it does not have the executable bit.
Would be worth mentioning in a comment IMO.

What’s unclear, though, is why the invalid shebang is a problem at all
given that this file is not executable anyway.  Thoughts?

> + ((#:configure-flags flags)
> +  '(list "--target=avr"
> + "--enable-languages=c,c++"
> + "--disable-nls"
> + "--disable-libssp"
> + "--with-dwarf2"

I think we should minimize target-specific changes and justify them in a
comment when they’re unavoidable.

Here, I think we can safely remove --target and --disable-nls.
--disable-libssp and --enable-languages are already in
‘cross-gcc-arguments’, so that leaves us with just --with-dwarf2, IIUC.

Why is it needed?

> +  (native-search-paths
> +   (list (search-path-specification
> +  (variable "CROSS_CPATH")
> +  (files '("avr/include")))
> + (search-path-specification
> +  (variable "CROSS_LIBRARY_PATH")
> +  (files '("avr/lib"

That these go in ‘native-search-paths’ feels wrong.

But I think it’s because we’re trying to build avr-libc like a “normal”
package with a cross-toolchain as its input.

Instead, the “intended use” is that libc is treated specially as in
‘cross-libc’ in cross-base.scm.  Probably we need to:

  1. Remove #:configure-flags and ‘native-inputs’ from the ‘avr-libc’
 package.

  2. Add (supported-systems '()) or similar to the ‘avr-libc’ package.

  3. Use something similar to ‘cross-libc’ but that uses avr-libc
 instead of glibc in cross-base.scm, thus setting CROSS_CPATH and
 CROSS_LIBRARY_PATH appropriately.

WDYT?

Apologies for spoiling the party.  ;-)  This is clearly a
tricky/inelegant area.

Thanks,
Ludo’.

Re: [PATCH 2/5] gnu: Add avr-gcc.

[Ludovic Courtès]

Manolis Ragkousis  skribis:

> Hey David,
>
> On 04/14/16 16:17, David Thompson wrote:
>> +   (substitute-keyword-arguments (package-arguments xgcc)
>> + ((#:phases phases)
>> +  `(modify-phases ,phases
>> + ;; Without a working multilib build, the resulting GCC lacks
>> + ;; support for nearly every AVR chip.
>> + (add-after 'unpack 'fix-genmultilib
>> +   (lambda _
>> + (substitute* "gcc/genmultilib"
>> +   (("#!/bin/sh") (string-append "#!" (which "sh"
>> + #t
>
> I think we should add fix-genmultilib to one of the existing standard
> phases because this problem appears to Ricardo's arm-none-eabi
> cross-toolchain as well. All the cross-toolchains will benefit from this.

Agreed.  Could you prepare a patch for ‘core-updates’ that does this?

In the meantime we’ll add something along the lines of what David
posted in ‘master’.

Ludo’.

Re: [PATCH 1/5] gnu: Add avr-binutils.

[Ludovic Courtès]

David Thompson  skribis:

> * gnu/packages/avr.scm (avr-binutils): New variable.

[...]

> +(define-public avr-binutils
> +  (package
> +(inherit (cross-binutils "avr"))
> +(name "avr-binutils")
> +(arguments
> + '(#:configure-flags '("--target=avr"
> +   "--disable-nls")

AFAICS --target=avr is redundant:

--8<---cut here---start->8---
$ git describe
v0.10.0-204-ga2d0e20
$ wget -q -O - $(./pre-inst-env guix build --log-file -e '((@ (gnu packages 
cross-base) cross-binutils) "avr")') |grep -e --target
configure flags: 
("CONFIG_SHELL=/gnu/store/b1yqjimbdh5bf9jnizd4h7yf110744j2-bash-4.3.42/bin/bash"
 "SHELL=/gnu/store/b1yqjimbdh5bf9jnizd4h7yf110744j2-bash-4.3.42/bin/bash" 
"--prefix=/gnu/store/gqmq8gis9igpg4xy6022mvq8qpvp7kk4-binutils-cross-avr-2.25.1"
 "--enable-fast-install" "--build=x86_64-unknown-linux-gnu" "--target=avr" 
"--with-sysroot=/" "LDFLAGS=-static-libgcc" "--with-lib-path=/no-ld-lib-path" 
"--disable-werror" "--enable-install-libbfd" "--enable-deterministic-archives")
--8<---cut here---end--->8---

… and --disable-nls is orthogonal and probably unnecessary.

Can we skip this patch?  :-)

Ludo’.

Re: Installing Guix easily on other distros

[Mathieu Lirzin]

Ricardo Wurmus  writes:

> Could we add the .spec, PKGBUILD, and debian files to the Guix
> repository?  I know of many projects that include the package manifests
> to simplify building packages for major distributions.
>
> An advantage would be that we knew about these files and users wouldn’t
> have to search around for the latest package sources.

If we are able to generate deb and rpm files from the Guix package
definition without too much burden, I think it is a good idea.  However
having a "debian" directory + a spec file +   will require
additional maintenance efforts and an extra layer of “noise” in the
repository that seems undesirable to me.

-- 
Mathieu Lirzin

Re: Proposal: Prefix "java-" for Java packages

[Ludovic Courtès]

Ricardo Wurmus  skribis:

> Hartmut Goebel  writes:
>
>> To avoid confusion and naming clashes with other programming languages,
>> it's desirable that the name of a package for a Java package contains
>> the word "java". If a project already contains the word java, we drop
>> this; for instance, the module ffmpeg-java is packaged under the name
>> java-ffmpeg.
>
> I’m in favour of a prefix, although I don’t have any preference as to
> what it should be named.

I like this idea too, and “java-” sounds like the obvious prefix to me.

If there are no objections, you’re welcome to submit a patch, Hartmut!

Ludo’.

Re: Patches to add emacs-rfcview and emacs-ffap-rfc-space

[Federico Beffa]

On Tue, Apr 12, 2016 at 10:59 AM, Alex Kost  wrote:
> Alex Kost (2016-04-05 12:29 +0300) wrote:
>
>> Chris Marusich (2016-04-04 03:58 +0300) wrote:
>>
>>> Hi,
>>>
>>> The attached patches add some useful modules for reading RFCs (and STDs)
>>> in Emacs.
>>
>> Overall the patches look good to me, thanks!  But there is a problem
>> with both packages: the URL of the origin does not point to a versioned
>> file, so when the author will touch the source, the hash will be changed
>> and our package will not work anymore.  I suppose there are no mirrors
>> where we can fetch the "constant" source code, so we probably have to
>> live with this, but it is a potential problem-maker.
>
> Ping for the other reviewers.  I don't know what to do with these
> packages: on one hand they are unreliable because their hashes may
> change any time.  But OTOH we already have the same potential problems
> with 'emacs-mit-scheme-doc' and 'emacs-constants' packages.
>
> I personally wouldn't like to include such packages in Guix at all.  I
> think the only hope with them is that they are dead, so their hashes
> will not be changed.  Federico, did you have this problem in mind when
> you packaged them?

Of course I did and I agree it is annoying.

'emacs-constants' has not been changed in a long time because it is
kind of "done". I've recently sent a patch to the author and took the
occasion to mention to him that it would help us to have versioned
releases. He accepted the patch, but I think he is not into archiving
old versions. So probably this package will soon break, but it will be
a matter of fixing the hash (and maybe again in a few years).

In any case, from my point of view, proposing to drop packages is not
very constructive. A more helpful approach would be to find a place
where we could archive specific versions of packages with this kind of
problem. I know that people here do not particularly like GitHub, but
possibly a similar place/service could do.

Regards,
Fede

Re: Installing Guix easily on other distros

[Ludovic Courtès]

"Thompson, David"  skribis:

> On Thu, Apr 14, 2016 at 10:28 AM, Ricardo Wurmus
>  wrote:
>>
>> Thompson, David  writes:
>>
>>> On Thu, Apr 14, 2016 at 9:51 AM, Hartmut Goebel
>>>  wrote:
 Hi,

 today on irc, there was discussion about that Guix should be easily
 installable and manageable in other distros being higher priority. This
 could attract more users to ry out Guix. So I created a draft .spec-file
 for building and installing Guix o RPM-based systems like Fedora.

 Maybe someone using Fedora may want to add a package request in their
 bug-tracker. I already did for Mageia.
>>>
>>> This has come up several times, and I agree that we should provide
>>> packages for popular GNU/Linux distributions.  However, Guix *cannot*
>>> be made available in many distros official repositories (most notably
>>> Debian and Fedora) because Guix violates their policies, such as:
>>>
>>> - Software must conform to the Filesystem Hierarchy Standard
>>> (violation: Guix introduces the /gnu directory)
>>> - Software must be bootstrapped from source (violation: Guix requires
>>> a set of bootstrap binaries that *cannot* be replaced by the distro
>>> without changing the hashes of every package, effectively preventing
>>> them from receiving binaries from hydra.gnu.org)
>>>
>>> Guix is at odds with other distros because it is a distro itself.  So,
>>> I think what would be best is for users of these distros to host Guix
>>> packages in popular places for third-party packages, like Arch's AUR
>>> or Fedora's COPR:
>>>
>>> https://aur.archlinux.org/packages/guix/
>>> https://copr.fedorainfracloud.org/coprs/lantw44/guix/
>>>
>>> What would be even better is if people *told us* when they made a
>>> package.  I learned about these indirectly, long after they were
>>> originally available.
>>
>> Could we add the .spec, PKGBUILD, and debian files to the Guix
>> repository?  I know of many projects that include the package manifests
>> to simplify building packages for major distributions.
>>
>> An advantage would be that we knew about these files and users wouldn’t
>> have to search around for the latest package sources.
>
> That sounds like a good idea.  I would welcome patches for such things.

Seconded (as long as it’s one or two files per distro.)

Ludo’.

Re: [PATCH 2/6] gnu: gnome-documents

[Ludovic Courtès]

ren...@openmailbox.org skribis:

> From a9fa68e37bd262a9f0b7ba999c163964beba4995 Mon Sep 17 00:00:00 2001
> From: Rene Saavedra 
> Date: Wed, 13 Apr 2016 23:45:12 -0500
> Subject: [PATCH] gnu: Add tracker.
>
> * gnu/packages/gnome.scm (tracker): New variable.
> * gnu/packages/patches/tracker-db-journal.patch: New file.
> * gnu/packages/patches/tracker-dbus-test.patch: New file.
> * gnu/packages/patches/tracker-gb-737023.patch: New file.
> * gnu/packages/patches/tracker-ontology.patch: New file.
> * gnu/packages/patches/tracker-steroids-test.patch: New file.
> * gnu/packages/patches/tracker-test.patch: New file.
> * gnu-system.am (dist_patch_DATA): Add it.
>
> Co-authored-by: Ludovic Court\xc3\xa8s 

[...]

> +++ b/gnu/packages/patches/tracker-db-journal.patch
> @@ -0,0 +1,18 @@
> +Skip the 'tracker-db-journal'. 

Missing word: “test”.

Could you add a few words as to why we must skip this test?  It’s
important to keep track of why we skip tests when we do, so we can be
confident about the choices we make and maintain them in the future.

> +++ b/gnu/packages/patches/tracker-ontology.patch
> @@ -0,0 +1,17 @@
> +Skip the 'tracker-ontology-test'.

Likewise.

> +++ b/gnu/packages/patches/tracker-steroids-test.patch
> @@ -0,0 +1,15 @@
> +Skip the 'tracker.test', connection is attempted.

Connection to what?  Could you clarify this?

Otherwise LGTM, we’re almost there!

Could you send an updated patch?

Thank you!

Ludo’.

Re: avr-gcc

[Ludovic Courtès]

Jan Nieuwenhuizen  skribis:

> From 5a6b6ba5a440d43af3e8c5cbd1d24f3be5a99804 Mon Sep 17 00:00:00 2001
> From: Jan Nieuwenhuizen 
> Date: Sun, 27 Mar 2016 16:00:36 +0200
> Subject: [PATCH 1/9] gnu: gcc: use CPATH, fixes cross builds.
>
> * gnu/packages/gcc (gcc): Use CPATH instead of C_INCLUDE_PATH.  Fixes usage of
>   native glibc headers when cross-compiling.

This would be reverting the fix for  as the
comment above explains.

I suppose the problem is that CPATH is still used elsewhere, leading to
interference with this one.  However, the cross-compilers for
mips64el-linux-gnu and armhf-linux-gnueabi work fine, AFAIK.

Thoughts?

Ludo’.

Re: Update btrfs-progs once again and add static output

[Ludovic Courtès]

Leo Famulari  skribis:

> On Mon, Apr 11, 2016 at 08:07:09PM -0400, Leo Famulari wrote:
>> On Sat, Apr 02, 2016 at 03:29:31PM +0200, Tobias Geerinckx-Rice wrote:
>> > Some simple patches to add a ‘static’ output to the btrfs-progs
>> > package, containing statically linked versions of all the tools.
>> 
>> I've applied your patches (with some very minor edits to the commit
>> messages), bringing HEAD to 5f3f3ac2874.
>
> I forgot to check how many packages would be rebuilt by the change to
> util-linux: 714.
>
> Should I revert the change and put it on core-updates?

That would have been the way to go, yes.

However, at this point I think it’s too late to revert.  Mark?

Ludo’.

[PATCH] Fix pandas test failures.

[Ricardo Wurmus]

Hi Guix,

the attached patch fixes the pandas test failures by applying upstream
patches to the test suite.  Originally, these were two separate commits
with additional noise, so I merged them into one patch file, removing
the hunks we are not interested in.

With this patch python-pandas builds again.

~~ Ricardo

>From e4cae585c1a2ba93cddf623ec3be6b388c4aead6 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Thu, 14 Apr 2016 17:43:27 +0200
Subject: [PATCH] gnu: python-pandas: Fix test failures.

* gnu/packages/patches/python-pandas-fix-tslib-test-failure.patch: New
  file.
* gnu-system.am (dist_patch_DATA): Register it.
* gnu/packages/python.scm (python-pandas)[source]: Add patch.
---
 gnu-system.am  |   1 +
 .../python-pandas-fix-tslib-test-failure.patch | 141 +
 gnu/packages/python.scm|   6 +-
 3 files changed, 146 insertions(+), 2 deletions(-)
 create mode 100644 gnu/packages/patches/python-pandas-fix-tslib-test-failure.patch

diff --git a/gnu-system.am b/gnu-system.am
index 8822d0b..24539c9 100644
--- a/gnu-system.am
+++ b/gnu-system.am
@@ -686,6 +686,7 @@ dist_patch_DATA =		\
   gnu/packages/patches/python-paste-remove-website-test.patch	\
   gnu/packages/patches/python-paste-remove-timing-test.patch	\
   gnu/packages/patches/python2-pygobject-2-gi-info-type-error-domain.patch \
+  gnu/packages/patches/python-pandas-fix-tslib-test-failure.patch \
   gnu/packages/patches/qemu-CVE-2015-8558.patch			\
   gnu/packages/patches/qemu-CVE-2015-8567.patch			\
   gnu/packages/patches/qemu-CVE-2015-8613.patch			\
diff --git a/gnu/packages/patches/python-pandas-fix-tslib-test-failure.patch b/gnu/packages/patches/python-pandas-fix-tslib-test-failure.patch
new file mode 100644
index 000..62d6a38
--- /dev/null
+++ b/gnu/packages/patches/python-pandas-fix-tslib-test-failure.patch
@@ -0,0 +1,141 @@
+This patch is required to fix a test failure when python-dateutil version
+2.5.2 or later is used.  It is derived from the following commits:
+
+80ef4e06526b9b60cf24268454c9456585a790a3
+845ff974af6f7c3b3067cce8a7149b771c2be87
+
+diff --git a/pandas/tseries/tests/test_tslib.py b/pandas/tseries/tests/test_tslib.py
+index f0d5bf7..863bc6f 100644
+--- a/pandas/tseries/tests/test_tslib.py
 b/pandas/tseries/tests/test_tslib.py
+@@ -474,6 +474,11 @@ def test_does_not_convert_mixed_integer(self):
+ good_date_string))
+ 
+ def test_parsers(self):
++
++# https://github.com/dateutil/dateutil/issues/217
++import dateutil
++yearfirst = dateutil.__version__ >= LooseVersion('2.5.0')
++
+ cases = {'2011-01-01': datetime.datetime(2011, 1, 1),
+  '2Q2005': datetime.datetime(2005, 4, 1),
+  '2Q05': datetime.datetime(2005, 4, 1),
+@@ -527,20 +532,26 @@ def test_parsers(self):
+  }
+ 
+ for date_str, expected in compat.iteritems(cases):
+-result1, _, _ = tools.parse_time_string(date_str)
+-result2 = to_datetime(date_str)
+-result3 = to_datetime([date_str])
+-result4 = to_datetime(np.array([date_str], dtype=object))
+-result5 = Timestamp(date_str)
+-result6 = DatetimeIndex([date_str])[0]
+-result7 = date_range(date_str, freq='S', periods=1)
++result1, _, _ = tools.parse_time_string(date_str,
++yearfirst=yearfirst)
++result2 = to_datetime(date_str, yearfirst=yearfirst)
++result3 = to_datetime([date_str], yearfirst=yearfirst)
++result4 = to_datetime(np.array([date_str], dtype=object),
++  yearfirst=yearfirst)
++result6 = DatetimeIndex([date_str], yearfirst=yearfirst)[0]
+ self.assertEqual(result1, expected)
+ self.assertEqual(result2, expected)
+ self.assertEqual(result3, expected)
+ self.assertEqual(result4, expected)
+-self.assertEqual(result5, expected)
+ self.assertEqual(result6, expected)
+-self.assertEqual(result7, expected)
++
++# these really need to have yearfist, but we don't support
++if not yearfirst:
++result5 = Timestamp(date_str)
++self.assertEqual(result5, expected)
++result7 = date_range(date_str, freq='S', periods=1,
++ yearfirst=yearfirst)
++self.assertEqual(result7, expected)
+ 
+ # NaT
+ result1, _, _ = tools.parse_time_string('NaT')
+@@ -589,23 +589,62 @@ def test_parsers_quarter_invalid(self):
+ self.assertRaises(ValueError, tools.parse_time_string, case)
+ 
+ def test_parsers_dayfirst_yearfirst(self):
++
++# https://github.com/dateutil/dateutil/issues/217
++# this issue was closed
++import dateutil

Re: [PATCH 4/6] gnu: gnome-documents

[rennes]

On 2016-03-29 14:25, l...@gnu.org wrote:

ren...@openmailbox.org skribis:


+ `(#:configure-flags
+   '("--with-ca-certificates=/etc/ssl/certs/ca-certificates.crt")


AFAICS glib-networking uses GnuTLS, for which we already had such a
setting (except that it can read all the .crt files from 
/etc/ssl/certs,

not just one bundle.)


I did more tests and remove this part.


+   (modify-phases %standard-phases
+ (add-before 'check 'use-empty-ssl-cert-file
+ (lambda _
+   ; Search for ca-certificates.crt files
+   ; during the check phase.
+   (setenv "SSL_CERT_FILE" "/dev/null")


Does this really have an effect?  This is the environment variable used
by OpenSSL, but not GnuTLS.


indeed, it works.

Question, to which package module I can add the patch?

ThanksFrom d9abadd86ca67bfae8a7563f8c29ef97f6fbc54a Mon Sep 17 00:00:00 2001
From: Rene Saavedra 
Date: Thu, 14 Apr 2016 09:52:51 -0500
Subject: [PATCH] gnu: Add uhttpmock.

* gnu/packages/uhttpmock.scm (uhttpmock): New file.

---
 gnu/packages/uhttpmock.scm | 65 ++
 1 file changed, 65 insertions(+)
 create mode 100644 gnu/packages/uhttpmock.scm

diff --git a/gnu/packages/uhttpmock.scm b/gnu/packages/uhttpmock.scm
new file mode 100644
index 000..550453e
--- /dev/null
+++ b/gnu/packages/uhttpmock.scm
@@ -0,0 +1,65 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2016 Rene Saavedra 
+;;;
+;;; This file is part of GNU Guix.
+;;;
+;;; GNU Guix is free software; you can redistribute it and/or modify it
+;;; under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 3 of the License, or (at
+;;; your option) any later version.
+;;;
+;;; GNU Guix is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with GNU Guix.  If not, see .
+
+(define-module (gnu packages uhttpmock)
+  #:use-module ((guix licenses) #:prefix license:)
+  #:use-module (guix build-system glib-or-gtk)  
+  #:use-module (guix download)
+  #:use-module (guix packages)
+  #:use-module (guix utils)
+  #:use-module (gnu packages glib)
+  #:use-module (gnu packages gnome)
+  #:use-module (gnu packages pkg-config))
+
+(define-public uhttpmock
+  (package
+(name "uhttpmock")
+(version "0.5.0")
+(source
+ (origin
+   (method url-fetch)
+   (uri (string-append "http://tecnocode.co.uk/downloads/uhttpmock/;
+   name "-" version ".tar.xz"))
+   (sha256
+(base32
+ "0vniyx341pnnmvxmqacc49k0g7h9a9nhknfslidrqmxj5lm1ini6"
+(build-system glib-or-gtk-build-system)
+(arguments
+ `(#:phases
+   (modify-phases %standard-phases
+ (add-before 'check 'use-empty-ssl-cert-file
+   (lambda _
+ ;; Search for ca-certificates.crt files
+ ;; during the check phase.
+ (setenv "SSL_CERT_FILE" "/dev/null")
+ #t)
+(native-inputs
+ `(("glib-networking" ,glib-networking) ;; For check phase.
+   ("gobject-introspection" ,gobject-introspection)
+   ;; For check phase.
+   ("gsettings-desktop-schemas" ,gsettings-desktop-schemas)
+   ("pkg-config" ,pkg-config)))
+(inputs
+ `(("libsoup" ,libsoup)))
+(home-page "https://gitlab.com/groups/uhttpmock;)
+(synopsis "Library for mocking web service APIs which use HTTP or HTTPS")
+(description
+ "Uhttpmock is a project for mocking web service APIs which use HTTP or
+HTTPS.  It provides a library, libuhttpmock, which implements recording and
+playback of HTTP request/response traces.")
+(license license:lgpl2.1+)))
-- 
2.6.3

Re: [PATCH 01/14] gnu: Add r-acepack.

[Ricardo Wurmus]

Leo Famulari  writes:

> On Tue, Apr 12, 2016 at 09:51:14AM +0200, Ricardo Wurmus wrote:
>> * gnu/packages/statistics.scm (r-acepack): New variable.
>
> I read this patch series and did a basic license auditing. The packages
> seem straightforward. I assume you are already using these in
> production, providing a more complete test of the packaging than I could
> do.
>
> If so, looks good!

Thank you for the review.  I pushed these patches with one license
change from x11 to expat.

~~ Ricardo

Re: Proposal: Prefix "java-" for Java packages

[Ricardo Wurmus]

Hartmut Goebel  writes:

> To avoid confusion and naming clashes with other programming languages,
> it's desirable that the name of a package for a Java package contains
> the word "java". If a project already contains the word java, we drop
> this; for instance, the module ffmpeg-java is packaged under the name
> java-ffmpeg.

I’m in favour of a prefix, although I don’t have any preference as to
what it should be named.

Note that we also have Java libraries in other modules, such as “htsjdk”
or “ngs-java” in the bioinformatics module.

~~ Ricardo

Re: Installing Guix easily on other distros

[Ricardo Wurmus]

Thompson, David  writes:

> On Thu, Apr 14, 2016 at 9:51 AM, Hartmut Goebel
>  wrote:
>> Hi,
>>
>> today on irc, there was discussion about that Guix should be easily
>> installable and manageable in other distros being higher priority. This
>> could attract more users to ry out Guix. So I created a draft .spec-file
>> for building and installing Guix o RPM-based systems like Fedora.
>>
>> Maybe someone using Fedora may want to add a package request in their
>> bug-tracker. I already did for Mageia.
>
> This has come up several times, and I agree that we should provide
> packages for popular GNU/Linux distributions.  However, Guix *cannot*
> be made available in many distros official repositories (most notably
> Debian and Fedora) because Guix violates their policies, such as:
>
> - Software must conform to the Filesystem Hierarchy Standard
> (violation: Guix introduces the /gnu directory)
> - Software must be bootstrapped from source (violation: Guix requires
> a set of bootstrap binaries that *cannot* be replaced by the distro
> without changing the hashes of every package, effectively preventing
> them from receiving binaries from hydra.gnu.org)
>
> Guix is at odds with other distros because it is a distro itself.  So,
> I think what would be best is for users of these distros to host Guix
> packages in popular places for third-party packages, like Arch's AUR
> or Fedora's COPR:
>
> https://aur.archlinux.org/packages/guix/
> https://copr.fedorainfracloud.org/coprs/lantw44/guix/
>
> What would be even better is if people *told us* when they made a
> package.  I learned about these indirectly, long after they were
> originally available.

Could we add the .spec, PKGBUILD, and debian files to the Guix
repository?  I know of many projects that include the package manifests
to simplify building packages for major distributions.

An advantage would be that we knew about these files and users wouldn’t
have to search around for the latest package sources.

~~ Ricardo

Re: Installing Guix easily on other distros

[Cyril Roelandt]

On 04/14/2016 03:51 PM, Hartmut Goebel wrote:
> Hi,
> 
> today on irc, there was discussion about that Guix should be easily
> installable and manageable in other distros being higher priority. This
> could attract more users to ry out Guix. So I created a draft .spec-file
> for building and installing Guix o RPM-based systems like Fedora.
> 

Someone already did that in copr:
https://copr.fedorainfracloud.org/coprs/lantw44/guix/

Maybe you could work with them?

Cyril.

Re: [PATCH 2/5] gnu: Add avr-gcc.

[Manolis Ragkousis]

Hey David,

On 04/14/16 16:17, David Thompson wrote:
> +   (substitute-keyword-arguments (package-arguments xgcc)
> + ((#:phases phases)
> +  `(modify-phases ,phases
> + ;; Without a working multilib build, the resulting GCC lacks
> + ;; support for nearly every AVR chip.
> + (add-after 'unpack 'fix-genmultilib
> +   (lambda _
> + (substitute* "gcc/genmultilib"
> +   (("#!/bin/sh") (string-append "#!" (which "sh"
> + #t

I think we should add fix-genmultilib to one of the existing standard
phases because this problem appears to Ricardo's arm-none-eabi
cross-toolchain as well. All the cross-toolchains will benefit from this.

Other than that, we have a working toolchain at last :-D

Thank you,
Manolis

[PATCH 0/6] Fix AVR toolchain.

[David Thompson]

Manolis and I spend quite a lot of time figuring out why our GCC AVR
cross-compilation toolchain is so broken and we were finally able to fix it!
So here's a patch set that fixes things, updates avr-libc to 2.0.0, and adds a
handy avr-toolchain package inspired by the gcc-toolchain package.

Happy firmware hacking!

- Dave

Re: [PATCH 1/9] gnu: Add ttfautohint.

[Eric Bavier]

On 2016-04-13 16:36, l...@gnu.org wrote:

ericbav...@openmailbox.org skribis:


From: Eric Bavier 

* gnu/packages/fontutils.scm (ttfautohint): New variable.
* gnu/packages/patches/ttfautohint-source-date-epoch.patch: New patch.
* gnu-system.am (dist_patch_DATA): Add it.


LGTM!


Great.  Thanks for reviewing.



Did you submit the SOURCE_DATE_EPOCH patch upstream?  Good work!



I just sent the patch to Werner Lemberg.

`~Eric

--
`~Eric

Re: Installing Guix easily on other distros

[Thompson, David]

On Thu, Apr 14, 2016 at 10:28 AM, Ricardo Wurmus
 wrote:
>
> Thompson, David  writes:
>
>> On Thu, Apr 14, 2016 at 9:51 AM, Hartmut Goebel
>>  wrote:
>>> Hi,
>>>
>>> today on irc, there was discussion about that Guix should be easily
>>> installable and manageable in other distros being higher priority. This
>>> could attract more users to ry out Guix. So I created a draft .spec-file
>>> for building and installing Guix o RPM-based systems like Fedora.
>>>
>>> Maybe someone using Fedora may want to add a package request in their
>>> bug-tracker. I already did for Mageia.
>>
>> This has come up several times, and I agree that we should provide
>> packages for popular GNU/Linux distributions.  However, Guix *cannot*
>> be made available in many distros official repositories (most notably
>> Debian and Fedora) because Guix violates their policies, such as:
>>
>> - Software must conform to the Filesystem Hierarchy Standard
>> (violation: Guix introduces the /gnu directory)
>> - Software must be bootstrapped from source (violation: Guix requires
>> a set of bootstrap binaries that *cannot* be replaced by the distro
>> without changing the hashes of every package, effectively preventing
>> them from receiving binaries from hydra.gnu.org)
>>
>> Guix is at odds with other distros because it is a distro itself.  So,
>> I think what would be best is for users of these distros to host Guix
>> packages in popular places for third-party packages, like Arch's AUR
>> or Fedora's COPR:
>>
>> https://aur.archlinux.org/packages/guix/
>> https://copr.fedorainfracloud.org/coprs/lantw44/guix/
>>
>> What would be even better is if people *told us* when they made a
>> package.  I learned about these indirectly, long after they were
>> originally available.
>
> Could we add the .spec, PKGBUILD, and debian files to the Guix
> repository?  I know of many projects that include the package manifests
> to simplify building packages for major distributions.
>
> An advantage would be that we knew about these files and users wouldn’t
> have to search around for the latest package sources.

That sounds like a good idea.  I would welcome patches for such things.

- Dave

Re: Installing Guix easily on other distros

[Thompson, David]

On Thu, Apr 14, 2016 at 9:51 AM, Hartmut Goebel
 wrote:
> Hi,
>
> today on irc, there was discussion about that Guix should be easily
> installable and manageable in other distros being higher priority. This
> could attract more users to ry out Guix. So I created a draft .spec-file
> for building and installing Guix o RPM-based systems like Fedora.
>
> Maybe someone using Fedora may want to add a package request in their
> bug-tracker. I already did for Mageia.

This has come up several times, and I agree that we should provide
packages for popular GNU/Linux distributions.  However, Guix *cannot*
be made available in many distros official repositories (most notably
Debian and Fedora) because Guix violates their policies, such as:

- Software must conform to the Filesystem Hierarchy Standard
(violation: Guix introduces the /gnu directory)
- Software must be bootstrapped from source (violation: Guix requires
a set of bootstrap binaries that *cannot* be replaced by the distro
without changing the hashes of every package, effectively preventing
them from receiving binaries from hydra.gnu.org)

Guix is at odds with other distros because it is a distro itself.  So,
I think what would be best is for users of these distros to host Guix
packages in popular places for third-party packages, like Arch's AUR
or Fedora's COPR:

https://aur.archlinux.org/packages/guix/
https://copr.fedorainfracloud.org/coprs/lantw44/guix/

What would be even better is if people *told us* when they made a
package.  I learned about these indirectly, long after they were
originally available.

Hope this helps,

- Dave

Re: [PATCH 3/5] gnu: avr-libc: Fix build.

[Manolis Ragkousis]

On 04/14/16 16:17, David Thompson wrote:
> +   (modify-phases %standard-phases
> + (add-before 'unpack 'fix-cpath
> +   (lambda _
> + ;; C_INCLUDE_PATH poses issues for cross-building, leading to
> + ;; failures when building avr-libc on 64-bit systems.  Simply
> + ;; unsetting it allows the build to succeed because it doesn't
> + ;; try to use any of the native system's headers.
> + (unsetenv "C_INCLUDE_PATH")
> + #t)

Currently I am building it on arm to see if it works there as well.

The reason why this works is because avr-gcc has it's own definition of
limits.h and it uses that when glibc is not present.

Manolis

Re: [PATCH 2/5] gnu: Add avr-gcc.

[Thompson, David]

On Thu, Apr 14, 2016 at 9:53 AM, Manolis Ragkousis  wrote:
> Hey David,
>
> On 04/14/16 16:17, David Thompson wrote:
>> +   (substitute-keyword-arguments (package-arguments xgcc)
>> + ((#:phases phases)
>> +  `(modify-phases ,phases
>> + ;; Without a working multilib build, the resulting GCC lacks
>> + ;; support for nearly every AVR chip.
>> + (add-after 'unpack 'fix-genmultilib
>> +   (lambda _
>> + (substitute* "gcc/genmultilib"
>> +   (("#!/bin/sh") (string-append "#!" (which "sh"
>> + #t
>
> I think we should add fix-genmultilib to one of the existing standard
> phases because this problem appears to Ricardo's arm-none-eabi
> cross-toolchain as well. All the cross-toolchains will benefit from this.

I think that would be a good next step, after this patch set is merged.

- Dave

Proposal: Prefix "java-" for Java packages

[Hartmut Goebel]

Hi,

I propose the following specification:

To avoid confusion and naming clashes with other programming languages,
it's desirable that the name of a package for a Java package contains
the word "java". If a project already contains the word java, we drop
this; for instance, the module ffmpeg-java is packaged under the name
java-ffmpeg.

Java programs standing for themselves are named as any other package,
using the lowercase upstream name.


Rational:

Like other programming languages (R, Perl, Python, guile, etc.), java
has a huge collection of packages/classes. On current distributions I
always get confused by names like "felix" or "germonimo" which are not
know to me. So to avoid confusion and to be consistent with the other
programming languages, I suggest prefixing Java packages with "java-".

The specification above is modeled after the one for Python and Perl
packages.

As of now, gnu/packages/java.scm contains only four definitions (swt,
ant, incedtea-6 and icedtea-7), three of which are applications. So only
"swt" would be affected when introducing this *now*.

Comments are welcome.

-- 
Regards
Hartmut Goebel

| Hartmut Goebel  | h.goe...@crazy-compilers.com   |
| www.crazy-compilers.com | compilers which you thought are impossible |

Installing Guix easily on other distros

[Hartmut Goebel]

Hi,

today on irc, there was discussion about that Guix should be easily
installable and manageable in other distros being higher priority. This
could attract more users to ry out Guix. So I created a draft .spec-file
for building and installing Guix o RPM-based systems like Fedora.

Maybe someone using Fedora may want to add a package request in their
bug-tracker. I already did for Mageia.

The .spec-file can be found attached to


-- 
Regards
Hartmut Goebel

| Hartmut Goebel  | h.goe...@crazy-compilers.com   |
| www.crazy-compilers.com | compilers which you thought are impossible |

Correction: [PATCH 0/5] Fix AVR toolchain.

[Thompson, David]

I made a typo. There are only 5 patches, not 6.

[PATCH 4/5] gnu: Add avr-toolchain.

[David Thompson]

* gnu/packages/avr.scm (avr-toolchain): New variable.
---
 gnu/packages/avr.scm | 21 +
 1 file changed, 21 insertions(+)

diff --git a/gnu/packages/avr.scm b/gnu/packages/avr.scm
index 81ca162..94776d8 100644
--- a/gnu/packages/avr.scm
+++ b/gnu/packages/avr.scm
@@ -24,8 +24,10 @@
   #:use-module (guix download)
   #:use-module (guix packages)
   #:use-module (guix build-system gnu)
+  #:use-module (guix build-system trivial)
   #:use-module (gnu packages)
   #:use-module (gnu packages cross-base)
+  #:use-module (gnu packages flashing-tools)
   #:use-module (gnu packages vim)
   #:use-module (gnu packages zip))
 
@@ -102,6 +104,25 @@ for use with GCC on Atmel AVR microcontrollers.")
 (license
  (license:non-copyleft "http://www.nongnu.org/avr-libc/LICENSE.txt;
 
+(define-public avr-toolchain
+  (package
+(name "avr-toolchain")
+(version (package-version avr-gcc))
+(source #f)
+(build-system trivial-build-system)
+(arguments '(#:builder (mkdir %output)))
+(propagated-inputs
+ `(("avrdude" ,avrdude)
+   ("binutils" ,avr-binutils)
+   ("gcc" ,avr-gcc)
+   ("libc" ,avr-libc)))
+(synopsis "Complete GCC tool chain for AVR microcontroller development")
+(description "This package provides a complete GCC tool chain for AVR
+microcontroller development.  This includes the GCC AVR cross compiler and
+avrdude for firmware flashing.  The supported programming languages are C and
+C++.")
+(home-page (package-home-page avr-libc))
+(license (package-license avr-gcc
 
 (define-public microscheme
   (package
-- 
2.7.3

[PATCH 5/5] gnu: Remove xgcc-avr.

[David Thompson]

We now have a dedicated package module for the AVR toolchain with
important modifications on top of what cross-gcc produces.

* gnu/packages/cross-base.scm (xgcc-avr): Delete.
---
 gnu/packages/cross-base.scm | 6 --
 1 file changed, 6 deletions(-)

diff --git a/gnu/packages/cross-base.scm b/gnu/packages/cross-base.scm
index aa67d21..9b97e75 100644
--- a/gnu/packages/cross-base.scm
+++ b/gnu/packages/cross-base.scm
@@ -352,12 +352,6 @@ XBINUTILS and the cross tool chain."
(package-supported-systems xgcc)
'("mips64el-linux" "i686-linux"))
 
-(define-public xgcc-avr
-  ;; AVR cross-compiler, used to build AVR-Libc.
-  (let ((triplet "avr"))
-(cross-gcc triplet
-   (cross-binutils triplet
-
 (define-public xgcc-xtensa
   ;; Bare-bones Xtensa cross-compiler, used to build the Atheros firmware.
   (cross-gcc "xtensa-elf"))
-- 
2.7.3

[PATCH 3/5] gnu: avr-libc: Fix build.

[David Thompson]

* gnu/packages/avr.scm (avr-libc): Update to 2.0.0.
[native-inputs]: Use new avr-gcc and avr-binutils.
[arguments]: Add phase to unset C_INCLUDE_PATH.
---
 gnu/packages/avr.scm | 32 +---
 1 file changed, 21 insertions(+), 11 deletions(-)

diff --git a/gnu/packages/avr.scm b/gnu/packages/avr.scm
index 0ec115e..81ca162 100644
--- a/gnu/packages/avr.scm
+++ b/gnu/packages/avr.scm
@@ -70,28 +70,38 @@
 (define-public avr-libc
   (package
 (name "avr-libc")
-(version "1.8.1")
+(version "2.0.0")
 (source (origin
   (method url-fetch)
-  (uri (string-append
-"mirror://savannah//avr-libc/avr-libc-"
-version ".tar.bz2"))
+  (uri (string-append "mirror://savannah//avr-libc/avr-libc-"
+  version ".tar.bz2"))
   (sha256
(base32
-"0sd9qkvhmk9av4g1f8dsjwc309hf1g0731bhvicnjb3b3d42l1n3"
+"15svr2fx8j6prql2il2fc0ppwlv50rpmyckaxx38d3gxxv97zpdj"
 (build-system gnu-build-system)
 (arguments
- `(#:out-of-source? #t
-   #:configure-flags '("--host=avr")))
-
-(native-inputs `(("cross-binutils" ,(cross-binutils "avr"))
- ("cross-gcc" ,xgcc-avr)))
+ '(#:out-of-source? #t
+   #:configure-flags '("--host=avr")
+   #:phases
+   (modify-phases %standard-phases
+ (add-before 'unpack 'fix-cpath
+   (lambda _
+ ;; C_INCLUDE_PATH poses issues for cross-building, leading to
+ ;; failures when building avr-libc on 64-bit systems.  Simply
+ ;; unsetting it allows the build to succeed because it doesn't
+ ;; try to use any of the native system's headers.
+ (unsetenv "C_INCLUDE_PATH")
+ #t)
+(native-inputs `(("avr-binutils" ,avr-binutils)
+ ("avr-gcc" ,avr-gcc)))
 (home-page "http://www.nongnu.org/avr-libc/;)
 (synopsis "The AVR C Library")
 (description
  "AVR Libc is a project whose goal is to provide a high quality C library
 for use with GCC on Atmel AVR microcontrollers.")
-(license (license:non-copyleft 
"http://www.nongnu.org/avr-libc/LICENSE.txt;
+(license
+ (license:non-copyleft "http://www.nongnu.org/avr-libc/LICENSE.txt;
+
 
 (define-public microscheme
   (package
-- 
2.7.3

[PATCH 1/5] gnu: Add avr-binutils.

[David Thompson]

* gnu/packages/avr.scm (avr-binutils): New variable.
---
 gnu/packages/avr.scm | 11 ++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/avr.scm b/gnu/packages/avr.scm
index d59816b..b30c64e 100644
--- a/gnu/packages/avr.scm
+++ b/gnu/packages/avr.scm
@@ -1,6 +1,7 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2014 Manolis Fragkiskos Ragkousis 
+;;; Copyright © 2014, 2016 Manolis Fragkiskos Ragkousis 
 ;;; Copyright © 2015 Ricardo Wurmus 
+;;; Copyright © 2016 David Thompson 
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -27,6 +28,14 @@
   #:use-module (gnu packages vim)
   #:use-module (gnu packages zip))
 
+(define-public avr-binutils
+  (package
+(inherit (cross-binutils "avr"))
+(name "avr-binutils")
+(arguments
+ '(#:configure-flags '("--target=avr"
+   "--disable-nls")
+
 (define-public avr-libc
   (package
 (name "avr-libc")
-- 
2.7.3

Re: [PATCH] gnu: Add openttd-engine

[Albin]

Thanks!  Just one little thing: in the TODO, please change
"openttd-opensfx" to "openttd-openmsx".  This will give the user free
GPLv2 licensed music (along with the graphics) and should make a good
out-of-the-box experience even without the non-free (NC) opensfx sound
effects that I guess we shouldn't distribute directly ourselves.

I will work on the additional packages but I can't say when they will be
finished.

Albin

Den 2016-04-14 kl. 11:04, skrev Alex Kost:
> Albin (2016-04-13 05:09 +0300) wrote:
> 
>> Here is a new patch for OpenTTD.
>>
>> I have
>>
>> * changed the name to openttd-engine (so that we can later add game data
>> as companion packages),
> 
> I'm going to make this 'openttd-engine' variable private and to add the
> following lines after it (I'm not sure if I should do it in a separate
> commit):
> 
> --8<---cut here---start->8---
> ;; TODO Add 'openttd-opengfx' and 'openttd-opensfx' packages and make
> ;; 'openttd' a wrapper around them.  The engine is playable by itself,
> ;; but it asks a user to download graphics if it's not found.
> 
> (define-public openttd
>   (package
> (inherit openttd-engine)
> (name "openttd")))
> --8<---cut here---end--->8---
> 
> So you are welcome to add these graphics/sound packages if you wish :-)
> 
>> * removed the "Unix"->"GNU" hack,
>> * enabled 'lzo',
>> * added more licenses,
>> * rephrased a few comments,
>> * modified the commit message.
> 
> OK, thanks for your great work on this package!
> 
> I'm going to commit it in a day or two if there will be no other
> comments.
> 
> No need to resend the patch, I will adjust it as I mentioned and also
> for the following nitpicks:
> 
> [...]
>> +(define-public openttd-engine
>> +  (package
>> +(name "openttd-engine")
>> +(version "1.6.0")
>> +(source
>> + (origin (method url-fetch)
>> + (uri (string-append "http://binaries.openttd.org/releases/;
>> + version "/openttd-" version 
>> "-source.tar.xz"))
>> + (sha256
>> +  (base32
>> +   "1cjf9gz7d0sn7893wv9d00q724sxv3d81bgb0c5f5ppz2ssyc4jc"))
>> + (modules '((guix build utils)))
>> + (snippet
>> +  '(begin
>> + ;; The DOS port contains proprietary software.
>> + (delete-file-recursively "os/dos")
> 
> No need to use 'begin' here.
> 
>> +(build-system gnu-build-system)
>> +(arguments
>> + `(#:tests? #f ;; no "check" target.
> 
> It is a convention to use ";" for marginal comments and ";;" for
> comments that are placed on separate lines.
> 
>> +   #:phases
>> +   (modify-phases %standard-phases
>> + ;; The build process fails if the configure script is passed the
>> + ;; option "--enable-fast-install".
>> + (replace 'configure
>> +   (lambda* (#:key inputs outputs #:allow-other-keys)
>> + (let ((out (assoc-ref outputs "out"))
>> +   (lzo (assoc-ref inputs "lzo")))
>> +   (zero?
>> +(system* "./configure"
>> + (string-append "--prefix=" out)
>> + ;; Provide the "lzo" path.
>> + (string-append "--with-liblzo2="
>> +lzo "/lib/liblzo2.a")
>> + ;; Put the symlink to the binary in
>> + ;; ".guix-profile/bin/".
> 
> I prefer your previous commentary:
> 
> ;; Put the binary in 'bin' instead of 'games'.
> 
>> + "--binary-dir=bin"
>> +(native-inputs `(("pkg-config" ,pkg-config)))
>> +(inputs
>> + `(("allegro" ,allegro-4)
>> +   ("fontconfig" ,fontconfig)
>> +   ("freetype" ,freetype)
>> +   ("icu4c" ,icu4c)
>> +   ("libpng" ,libpng)
>> +   ("lzo" ,lzo)
>> +   ("sdl" ,sdl)
>> +   ("xz" ,xz)
>> +   ("zlib" ,zlib)))
>> +(synopsis "Transportation economics simulator")
>> +(description "OpenTTD is a game in which you transport goods and
>> +passengers by land, water and air.  It is a re-implementation of Transport
>> +Tycoon Deluxe with many enhancements including multiplayer mode,
>> +internationalization support, conditional orders and the ability to clone,
>> +autoreplace and autoupdate vehicles.")
>> +(home-page "http://openttd.org/;)
>> +;; This package is GPLv2, except for a few files located in
>> +;; "src/3rdparty/" which are under the 3-clause BSD, LGPLv2.1+ and Zlib
>> +;; licenses.  In addition, this software contains an in-game downloader
>> +;; from which the user may find non-functional data licensed under
>> +;; different terms.
>> +(license (list license:bsd-3 license:gpl2 license:lgpl2.1+ 
>> license:zlib
>> +
>>  (define-public pinball
>>(package
>>  (name "pinball")
> 



signature.asc
Description: OpenPGP digital signature

Re: [PATCH] gnu: Add openttd-engine

[Alex Kost]

Albin (2016-04-13 05:09 +0300) wrote:

> Here is a new patch for OpenTTD.
>
> I have
>
> * changed the name to openttd-engine (so that we can later add game data
> as companion packages),

I'm going to make this 'openttd-engine' variable private and to add the
following lines after it (I'm not sure if I should do it in a separate
commit):

--8<---cut here---start->8---
;; TODO Add 'openttd-opengfx' and 'openttd-opensfx' packages and make
;; 'openttd' a wrapper around them.  The engine is playable by itself,
;; but it asks a user to download graphics if it's not found.

(define-public openttd
  (package
(inherit openttd-engine)
(name "openttd")))
--8<---cut here---end--->8---

So you are welcome to add these graphics/sound packages if you wish :-)

> * removed the "Unix"->"GNU" hack,
> * enabled 'lzo',
> * added more licenses,
> * rephrased a few comments,
> * modified the commit message.

OK, thanks for your great work on this package!

I'm going to commit it in a day or two if there will be no other
comments.

No need to resend the patch, I will adjust it as I mentioned and also
for the following nitpicks:

[...]
> +(define-public openttd-engine
> +  (package
> +(name "openttd-engine")
> +(version "1.6.0")
> +(source
> + (origin (method url-fetch)
> + (uri (string-append "http://binaries.openttd.org/releases/;
> + version "/openttd-" version 
> "-source.tar.xz"))
> + (sha256
> +  (base32
> +   "1cjf9gz7d0sn7893wv9d00q724sxv3d81bgb0c5f5ppz2ssyc4jc"))
> + (modules '((guix build utils)))
> + (snippet
> +  '(begin
> + ;; The DOS port contains proprietary software.
> + (delete-file-recursively "os/dos")

No need to use 'begin' here.

> +(build-system gnu-build-system)
> +(arguments
> + `(#:tests? #f ;; no "check" target.

It is a convention to use ";" for marginal comments and ";;" for
comments that are placed on separate lines.

> +   #:phases
> +   (modify-phases %standard-phases
> + ;; The build process fails if the configure script is passed the
> + ;; option "--enable-fast-install".
> + (replace 'configure
> +   (lambda* (#:key inputs outputs #:allow-other-keys)
> + (let ((out (assoc-ref outputs "out"))
> +   (lzo (assoc-ref inputs "lzo")))
> +   (zero?
> +(system* "./configure"
> + (string-append "--prefix=" out)
> + ;; Provide the "lzo" path.
> + (string-append "--with-liblzo2="
> +lzo "/lib/liblzo2.a")
> + ;; Put the symlink to the binary in
> + ;; ".guix-profile/bin/".

I prefer your previous commentary:

;; Put the binary in 'bin' instead of 'games'.

> + "--binary-dir=bin"
> +(native-inputs `(("pkg-config" ,pkg-config)))
> +(inputs
> + `(("allegro" ,allegro-4)
> +   ("fontconfig" ,fontconfig)
> +   ("freetype" ,freetype)
> +   ("icu4c" ,icu4c)
> +   ("libpng" ,libpng)
> +   ("lzo" ,lzo)
> +   ("sdl" ,sdl)
> +   ("xz" ,xz)
> +   ("zlib" ,zlib)))
> +(synopsis "Transportation economics simulator")
> +(description "OpenTTD is a game in which you transport goods and
> +passengers by land, water and air.  It is a re-implementation of Transport
> +Tycoon Deluxe with many enhancements including multiplayer mode,
> +internationalization support, conditional orders and the ability to clone,
> +autoreplace and autoupdate vehicles.")
> +(home-page "http://openttd.org/;)
> +;; This package is GPLv2, except for a few files located in
> +;; "src/3rdparty/" which are under the 3-clause BSD, LGPLv2.1+ and Zlib
> +;; licenses.  In addition, this software contains an in-game downloader
> +;; from which the user may find non-functional data licensed under
> +;; different terms.
> +(license (list license:bsd-3 license:gpl2 license:lgpl2.1+ 
> license:zlib
> +
>  (define-public pinball
>(package
>  (name "pinball")

-- 
Alex

Re: [PATCH] gnu: geda-gaf: Make gsch2pcb work out-of-the-box.

[Ricardo Wurmus]

Eric Bavier  writes:

> On 2016-04-13 09:45, Thompson, David wrote:
>> * gnu/packages/engineering.scm (geda-gaf)[inputs]: Add m4 and pcb.
>> [arguments]: Add configure flags that point to PCB data files.
>
> Nitpick: '[' should align with "gnu".
>
> Is m4 really required at runtime?

Yes.  As far as I understand some of the configurable footprints such as
“CONNECTOR” are m4 macros.

~~ Ricardo

Re: [PATCH] Add rapicorn.

[Ricardo Wurmus]

Mathieu Lirzin  writes:

>> +   (modify-phases %standard-phases
>> + (add-after 'unpack 'replace-/bin/ls
>> +   (lambda _
>> + (substitute* '("Makefile.decl"
>> +"tools/Makefile.in"
>> +"tests/Makefile.in"
>> +"aidacc/tests/Makefile.in"
>> +"aidacc/Makefile.in"
>> +"cython/Makefile.in"
>> +"res/Makefile.in"
>> +"ui/tests/Makefile.in"
>> +"ui/Makefile.in"
>> +"docs/tutorial/Makefile.in"
>> +"docs/mans/Makefile.in"
>> +"docs/Makefile.in"
>> +"docs/examples/Makefile.in"
>> +"docs/imports/Makefile.in"
>> +"Makefile.in"
>> +"pytests/Makefile.in"
>> +"examples/Makefile.in"
>> +"data/Makefile.in"
>> +"rcore/tests/Makefile.in"
>> +"rcore/Makefile.in")
>> +   (("/bin/ls") (which "ls")))
>
> Can you try to use ‘find-files’ for this substitution?

Yes, that would be better.  I’ll send a new version of this patch
later; I found that some inputs need to be propagated.

~~ Ricardo

Re: [PATCH] Add rapicorn.

[Ricardo Wurmus]

Florian Paul Schmidt  writes:

> Hi,
>
> awesome! Do you also press ahead with packaging Beast? Just asking to 
> avoid duplication of effort..

Yes, I did.  I hope to have a working Beast package by the end of this
week.

~~ Ricardo

Re: [PATCH] gnu: Add openttd-engine

[Alex Kost]

Albin (2016-04-13 05:14 +0300) wrote:

> I've also changed the download URL to the official one and the package
> builds fine.

I think this happened because you already had the source in the store,
so it wasn't redownloaded from the official url (which would fail).

FYI that downloading bug was fixed (thanks for reporting!):
http://git.savannah.gnu.org/cgit/guix.git/commit/?id=82fd23b81f6ab71ef4bc5f95f273bd77dbe6baf5

-- 
Alex

Re: [PATCH 2/2] gnu: packages: Use 'search-patches' everywhere.

[Alex Kost]

Ludovic Courtès (2016-04-13 23:53 +0300) wrote:

> Alex Kost  skribis:
>
>> Ludovic Courtès (2016-04-09 18:08 +0300) wrote:
>>
>> [...]
>>> Woow, thanks for taking the time to do it!
>>
>> Heh, it didn't take too much, actually.
>>
>>> (If you haven’t done it already, you can check with ‘guix lint -t
>>> derivation’ that all the files are found, and run, say, ‘guix build
>>> libreoffice -d’ and make sure the result is the same as before.)
>>
>> Yes, I checked, thanks for pointing!  It looks like this change will be
>> harmless.  Should it go to master now, or better to wait for a couple of
>> days for other comments (maybe about 'search-patches' name)?
>
> I think it can go to ‘master’ now.

Committed.

> (The name sounds good to me given that the singular form is already
> called ‘search-patch’ anyway.)

I agree (I couldn't invent a better name).

-- 
Alex

Re: [PATCH] Add rapicorn.

[Florian Paul Schmidt]

Hi,

awesome! Do you also press ahead with packaging Beast? Just asking to 
avoid duplication of effort..


Flo

On 13.04.2016 21:34, Ricardo Wurmus wrote:

Hi Guix,

this patch adds Rapicorn, the graphics library used by Beast.  A new
version of Rapicorn has just been released that removed a bundled and
modified version of librsvg, so it’s finally possible to add it to Guix
upstream.

Note that it depends on libpng 1.2.x, which is added by the first patch.

~~ Ricardo

Re: rfc/rfh: i686-w64-mingw32 cross target

[Jan Nieuwenhuizen]

Ludovic Courtès writes:

> Sorry for the delay, but this is awesome work!  I’m impressed that you
> got it working in so little time.

Thank you!  The way Guix (and Nix) handles builds, using clean
environments, together with the gcc-cross-environment-variables patch
makes it a lot less error-prone.

The fact that almost every little change triggers a full world rebuild
makes creating a cross build on Guix quite annoying, though.  I wonder
if we would like to make this friendlier, even if only to bootstrap
cross builds.

Our old GUB cross build system has two features that vastly reduce the
number of toolchain/world rebuilds

   * every package (class Name) can possbly have a architecture-specific
 specialisation: class Name__, that the build system looks
 for and uses if present

   * there is a `-x,--no-dependencies' option that says: just rebuild
 this package, even if some of its dependencies are out of date

I can speficy e.g. a modified Gcc for mingw only (GUB uses Python, my
favourite before I changed to Guile) like so

class Gcc (cross.AutoBuild):
...

class Gcc_core (Gcc):
...build minimal c-only compiler to build a libc...

class Gcc__mingw (Gcc):
 ...add a patch for the c++ compiler to build...

Then the native toolchain won't be rebuilt when experimenting with
mingw.  To avoid rebuilding the core gcc and the c library when
working to get the c++ compiler built, I can use --no-dependencies
until it works, then suffer a full rebuild only once at the end.

> I’m not offering a full review yet.  I think it’s an additional
> incentive to finally merge the remaining bits from wip-hurd.  ;-)

Ok, thanks! :-)

> My main concern is the complexity of the cross-base stuff.  Why is
> ‘cross-gcc-core’ needed, for instance?

It is needed to break a circular bootstrap dependency.  To build a new c
library, you need a cross compiler.  A full flegded gcc can only be
built when you have a c library: the circular dependency.  This simple,
minimal `core-gcc' can be built with only the headers of the new c
library; breaking the circle.

> It’s probably inevitable for the complexity to be proportional to the
> number of target libcs, but I think we should start thinking about how
> to master this complexity by factoring/abstracting things a bit.

Okay.  It's cross-base is getting better but I/we haven't really
addressed this.  So no need to review that bit.  Meanwhile I'm offering
a new set of patches leading up to a mingw guile.exe for others to look
at and will look at refactoring cross-base.  Note that hello.exe runs
in wine

   ./pre-inst-env guix build --target=i686-w64-mingw32 hello

but guile.exe still segfaults.

> A cosmetic comment: I’d put the MinGW packages in a separate module.

Ok.

> I think portability patches should be (1) submitted upstream ;-), and
> (2) applied unconditionally on all architectures (assuming they do not
> make any difference on the other architectures.)

Yes, I agree.

Greetings,
Jan

on master:
>From 294f158558279bb25ad64b08ffb74281ba9da78d Mon Sep 17 00:00:00 2001
From: Jan Nieuwenhuizen 
Date: Sun, 27 Mar 2016 16:00:36 +0200
Subject: [PATCH 1/9] gnu: gcc: use CPATH, fixes cross builds.

* gnu/packages/gcc (gcc): Use CPATH instead of C_INCLUDE_PATH.  Fixes usage of
  native glibc headers when cross-compiling.
---
 gnu/packages/gcc.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm
index bdcb275..fc0ef6e 100644
--- a/gnu/packages/gcc.scm
+++ b/gnu/packages/gcc.scm
@@ -311,7 +311,7 @@ where the OS part is overloaded to denote a specific ABI---into GCC
;; treated as "system headers" (headers exempt from warnings) just like
;; the typical /usr/include headers on an FHS system.
(list (search-path-specification
-  (variable "C_INCLUDE_PATH")
+  (variable "CPATH")
   (files '("include")))
  (search-path-specification
   (variable "CPLUS_INCLUDE_PATH")
-- 
2.7.3

>From bca595306390b85c01bd226d6167b9336df1b59a Mon Sep 17 00:00:00 2001
From: Jan Nieuwenhuizen 
Date: Thu, 14 Apr 2016 07:27:07 +0200
Subject: [PATCH 2/9] gnu: bootstrap: Add i686-mingw.

* gnu/packages/bootstrap.scm (glibc-dynamic-linker): Add i686-mingw.
---
 gnu/packages/bootstrap.scm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gnu/packages/bootstrap.scm b/gnu/packages/bootstrap.scm
index 561de0d..02ed901 100644
--- a/gnu/packages/bootstrap.scm
+++ b/gnu/packages/bootstrap.scm
@@ -171,6 +171,7 @@ successful, or false to signal an error."
 ;; here just so we can keep going.
 ((string=? system "xtensa-elf") "no-ld.so")
 ((string=? system "avr") "no-ld.so")
+((string=? system "i686-mingw") "no-ld.so")
 
 (else (error "dynamic linker name not known for this system"
  system
-- 
2.7.3

>From