Merge remote-tracking branch 'upstream/staging' into deps-reorg

8 files changed, 150 insertions, 107 deletions

diff --git a/pkgs/development/guile-modules/guile-cairo/default.nix b/pkgs/development/guile-modules/guile-cairo/default.nix
index 6611c074506..f5e000f3980 100644
--- a/pkgs/development/guile-modules/guile-cairo/default.nix
+++ b/pkgs/development/guile-modules/guile-cairo/default.nix
@@ -1,7 +1,8 @@
-{ fetchurl, stdenv, guile, pkgconfig, cairo, expat, guile_lib }:
+{ stdenv, fetchurl, pkgconfig, guile, guile-lib, cairo, expat }:
 
 stdenv.mkDerivation rec {
-  name = "guile-cairo-1.4.1";
+  name = "guile-cairo-${version}";
+  version = "1.4.1";
 
   src = fetchurl {
     url = "http://download.gna.org/guile-cairo/${name}.tar.gz";
@@ -9,30 +10,26 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ pkgconfig ];
+
   buildInputs = [ guile cairo expat ]
-    ++ stdenv.lib.optional doCheck guile_lib;
+    ++ stdenv.lib.optional doCheck guile-lib;
 
   doCheck = true;
 
-  meta = {
-    description = "Guile-Cairo, Cairo bindings for GNU Guile";
-
-    longDescription =
-      '' Guile-Cairo wraps the Cairo graphics library for Guile Scheme.
-
-         Guile-Cairo is complete, wrapping almost all of the Cairo API.  It
-         is API stable, providing a firm base on which to do graphics work.
-         Finally, and importantly, it is pleasant to use.  You get a powerful
-         and well-maintained graphics library with all of the benefits of
-         Scheme: memory management, exceptions, macros, and a dynamic
-         programming environment.
-      '';
-
-    license = stdenv.lib.licenses.lgpl3Plus;
-
-    homepage = http://home.gna.org/guile-cairo/;
-
-    maintainers = [ ];
-    platforms = stdenv.lib.platforms.linux;
+  meta = with stdenv.lib; {
+    description = "Cairo bindings for GNU Guile";
+    longDescription = ''
+      Guile-Cairo wraps the Cairo graphics library for Guile Scheme.
+
+      Guile-Cairo is complete, wrapping almost all of the Cairo API.  It is API
+      stable, providing a firm base on which to do graphics work.  Finally, and
+      importantly, it is pleasant to use.  You get a powerful and well
+      maintained graphics library with all of the benefits of Scheme: memory
+      management, exceptions, macros, and a dynamic programming environment.
+    '';
+    homepage = "http://home.gna.org/guile-cairo/";
+    license = licenses.lgpl3Plus;
+    maintainers = with maintainers; [ vyp ];
+    platforms = platforms.linux;
   };
 }
diff --git a/pkgs/development/guile-modules/guile-fibers/default.nix b/pkgs/development/guile-modules/guile-fibers/default.nix
new file mode 100644
index 00000000000..5f82a93c513
--- /dev/null
+++ b/pkgs/development/guile-modules/guile-fibers/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, guile, texinfo }:
+
+let
+  version = "1.0.0";
+  name = "guile-fibers-${version}";
+in stdenv.mkDerivation {
+  inherit name;
+
+  src = fetchFromGitHub {
+    owner = "wingo";
+    repo = "fibers";
+    rev = "v${version}";
+    sha256 = "1r47m1m112kxf23xny99f0qkqsk6626iyc5jp7vzndfiyp5yskwi";
+  };
+
+  nativeBuildInputs = [ autoreconfHook pkgconfig ];
+  buildInputs = [ guile texinfo ];
+
+  autoreconfPhase = "./autogen.sh";
+
+  meta = with stdenv.lib; {
+    description = "Concurrent ML-like concurrency for Guile";
+    homepage = https://github.com/wingo/fibers;
+    license = licenses.lgpl3Plus;
+    maintainers = with maintainers; [ vyp ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/development/guile-modules/guile-gnome/default.nix b/pkgs/development/guile-modules/guile-gnome/default.nix
index ec7723f5b7e..aae44e2f6d8 100644
--- a/pkgs/development/guile-modules/guile-gnome/default.nix
+++ b/pkgs/development/guile-modules/guile-gnome/default.nix
@@ -1,7 +1,7 @@
-{ fetchurl, stdenv, guile, guile_lib, gwrap
+{ fetchurl, stdenv, guile, guile-lib, gwrap
 , pkgconfig, gconf, glib, gnome_vfs, gtk2
 , libglade, libgnome, libgnomecanvas, libgnomeui
-, pango, guileCairo, autoconf, automake, texinfo }:
+, pango, guile-cairo, autoconf, automake, texinfo }:
 
 stdenv.mkDerivation rec {
   name = "guile-gnome-platform-2.16.4";
@@ -27,8 +27,8 @@ stdenv.mkDerivation rec {
     libgnomecanvas
     libgnomeui
     pango
-    guileCairo
-  ] ++ stdenv.lib.optional doCheck guile_lib;
+    guile-cairo
+  ] ++ stdenv.lib.optional doCheck guile-lib;
 
   preConfigure = ''
       ./autogen.sh
diff --git a/pkgs/development/guile-modules/guile-lib/default.nix b/pkgs/development/guile-modules/guile-lib/default.nix
index de456b4983a..95741e07600 100644
--- a/pkgs/development/guile-modules/guile-lib/default.nix
+++ b/pkgs/development/guile-modules/guile-lib/default.nix
@@ -1,38 +1,45 @@
-{stdenv, fetchurl, guile, texinfo}:
+{ stdenv, fetchurl, guile, texinfo, pkgconfig }:
 
 assert stdenv ? cc && stdenv.cc.isGNU;
 
-stdenv.mkDerivation rec {
-  name = "guile-lib-0.2.2";
+let
+  name = "guile-lib-${version}";
+  version = "0.2.2";
+in stdenv.mkDerivation {
+  inherit name;
 
   src = fetchurl {
     url = "mirror://savannah/guile-lib/${name}.tar.gz";
     sha256 = "1f9n2b5b5r75lzjinyk6zp6g20g60msa0jpfrk5hhg4j8cy0ih4b";
   };
 
-  buildInputs = [guile texinfo];
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ guile texinfo ];
+
+  # One test doesn't seem to be compatible with guile_2_2.
+  patchPhase = ''
+    sed -i -e '/sxml.ssax.scm/d' unit-tests/Makefile*
+  '';
 
   doCheck = true;
 
-  preCheck =
+  preCheck = ''
     # Make `libgcc_s.so' visible for `pthread_cancel'.
-    '' export LD_LIBRARY_PATH="$(dirname $(echo ${stdenv.cc.cc.lib}/lib*/libgcc_s.so)):$LD_LIBRARY_PATH"
+    export LD_LIBRARY_PATH=\
+    "$(dirname $(echo ${stdenv.cc.cc.lib}/lib*/libgcc_s.so)):$LD_LIBRARY_PATH"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A collection of useful Guile Scheme modules";
+    longDescription = ''
+      guile-lib is intended as an accumulation place for pure-scheme Guile
+      modules, allowing for people to cooperate integrating their generic Guile
+      modules into a coherent library.  Think "a down-scaled, limited-scope CPAN
+      for Guile".
     '';
-
-  meta = {
-    description = "Guile-Library, a collection of useful Guile Scheme modules";
-
-    longDescription =
-      '' guile-lib is intended as an accumulation place for pure-scheme Guile
-         modules, allowing for people to cooperate integrating their generic
-         Guile modules into a coherent library.  Think "a down-scaled,
-         limited-scope CPAN for Guile".
-      '';
-
-    homepage = http://www.nongnu.org/guile-lib/;
-    license = stdenv.lib.licenses.gpl3Plus;
-
-    maintainers = [ ];
-    platforms = stdenv.lib.platforms.gnu;  # arbitrary choice
+    homepage = "http://www.nongnu.org/guile-lib/";
+    license = licenses.gpl3Plus;
+    maintainers = with maintainers; [ vyp ];
+    platforms = platforms.gnu;
   };
 }
diff --git a/pkgs/development/guile-modules/guile-ncurses/default.nix b/pkgs/development/guile-modules/guile-ncurses/default.nix
index bd6d9075130..152a3488304 100644
--- a/pkgs/development/guile-modules/guile-ncurses/default.nix
+++ b/pkgs/development/guile-modules/guile-ncurses/default.nix
@@ -1,7 +1,10 @@
-{ fetchurl, stdenv, pkgconfig, guile, ncurses, libffi }:
+{ stdenv, fetchurl, pkgconfig, guile, ncurses, libffi }:
 
-stdenv.mkDerivation rec {
-  name = "guile-ncurses-1.7";
+let
+  name = "guile-ncurses-${version}";
+  version = "1.7";
+in stdenv.mkDerivation {
+  inherit name;
 
   src = fetchurl {
     url = "mirror://gnu/guile-ncurses/${name}.tar.gz";
@@ -11,31 +14,31 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ guile ncurses libffi ];
 
-  preConfigure =
-    '' configureFlags="$configureFlags --with-guilesitedir=$out/share/guile/site" '';
-
-  postFixup =
-    '' for f in $out/share/guile/site/ncurses/**.scm; do \
-           substituteInPlace $f \
-             --replace "libguile-ncurses" "$out/lib/libguile-ncurses"; \
-       done
+  preConfigure = ''
+    configureFlags="$configureFlags --with-guilesitedir=$out/share/guile/site"
+  '';
+
+  postFixup = ''
+    for f in $out/share/guile/site/ncurses/**.scm; do \
+      substituteInPlace $f \
+        --replace "libguile-ncurses" "$out/lib/libguile-ncurses"; \
+    done
+  '';
+
+  # XXX: 1 of 65 tests failed.
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    description = "Scheme interface to the NCurses libraries";
+    longDescription = ''
+      GNU Guile-Ncurses is a library for the Guile Scheme interpreter that
+      provides functions for creating text user interfaces.  The text user
+      interface functionality is built on the ncurses libraries: curses, form,
+      panel, and menu.
     '';
-
-  doCheck = false;  # XXX: 1 of 65 tests failed
-
-  meta = {
-    description = "GNU Guile-Ncurses, Scheme interface to the NCurses libraries";
-
-    longDescription =
-      '' GNU Guile-Ncurses is a library for the Guile Scheme interpreter that
-         provides functions for creating text user interfaces.  The text user
-         interface functionality is built on the ncurses libraries: curses,
-         form, panel, and menu.
-      '';
-
-    license = stdenv.lib.licenses.lgpl3Plus;
-
-    maintainers = [ ];
-    platforms = stdenv.lib.platforms.gnu;  # arbitrary choice
+    homepage = "https://www.gnu.org/software/guile-ncurses/";
+    license = licenses.lgpl3Plus;
+    maintainers = with maintainers; [ vyp ];
+    platforms = platforms.gnu;
   };
 }
diff --git a/pkgs/development/guile-modules/guile-opengl/default.nix b/pkgs/development/guile-modules/guile-opengl/default.nix
index c7704d87fad..f854c71c240 100644
--- a/pkgs/development/guile-modules/guile-opengl/default.nix
+++ b/pkgs/development/guile-modules/guile-opengl/default.nix
@@ -1,14 +1,10 @@
 { stdenv, fetchurl, pkgconfig, guile }:
 
-stdenv.mkDerivation rec {
-  name = "guile-opengl-0.1.0";
-
-  meta = with stdenv.lib; {
-    description = "Guile binding for the OpenGL graphics API";
-    homepage    = "http://gnu.org/s/guile-opengl";
-    license     = licenses.gpl3Plus;
-    platforms   = platforms.linux;
-  };
+let
+  name = "guile-opengl-${version}";
+  version = "0.1.0";
+in stdenv.mkDerivation {
+  inherit name;
 
   src = fetchurl {
     url = "mirror://gnu/guile-opengl/${name}.tar.gz";
@@ -16,4 +12,12 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ pkgconfig guile ];
+
+  meta = with stdenv.lib; {
+    description = "Guile bindings for the OpenGL graphics API";
+    homepage = "http://gnu.org/s/guile-opengl";
+    license = licenses.gpl3Plus;
+    maintainers = with maintainers; [ vyp ];
+    platforms = platforms.linux;
+  };
 }
diff --git a/pkgs/development/guile-modules/guile-sdl/default.nix b/pkgs/development/guile-modules/guile-sdl/default.nix
index e2bfe485c5b..a7f703028bb 100644
--- a/pkgs/development/guile-modules/guile-sdl/default.nix
+++ b/pkgs/development/guile-modules/guile-sdl/default.nix
@@ -3,14 +3,8 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "guile-sdl-0.5.1";
-
-  meta = with stdenv.lib; {
-    description = "Guile bindings for SDL";
-    homepage    = "http://gnu.org/s/guile-sdl";
-    license     = licenses.gpl3Plus;
-    platforms   = platforms.linux;
-  };
+  name = "guile-sdl-${version}";
+  version = "0.5.1";
 
   src = fetchurl {
     url = "mirror://gnu/guile-sdl/${name}.tar.xz";
@@ -19,9 +13,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkgconfig guile ];
 
-  buildInputs = [
-    SDL.dev SDL_image SDL_ttf SDL_mixer
-  ];
+  buildInputs = [ SDL.dev SDL_image SDL_ttf SDL_mixer ];
 
   GUILE_AUTO_COMPILE = 0;
 
@@ -31,4 +23,12 @@ stdenv.mkDerivation rec {
       paths = buildInputs;
     };
   in "SDLMINUSI=-I${sdl}/include/SDL";
+
+  meta = with stdenv.lib; {
+    description = "Guile bindings for SDL";
+    homepage = "http://gnu.org/s/guile-sdl";
+    license = licenses.gpl3Plus;
+    maintainers = with maintainers; [ vyp ];
+    platforms = platforms.linux;
+  };
 }
diff --git a/pkgs/development/guile-modules/guile-xcb/default.nix b/pkgs/development/guile-modules/guile-xcb/default.nix
index 92d17fbe0db..b08d8313930 100644
--- a/pkgs/development/guile-modules/guile-xcb/default.nix
+++ b/pkgs/development/guile-modules/guile-xcb/default.nix
@@ -1,17 +1,13 @@
 { stdenv, fetchurl, pkgconfig, guile, texinfo }:
 
-stdenv.mkDerivation {
-  name = "guile-xcb-1.3";
-
-  meta = with stdenv.lib; {
-    description = "XCB bindings for Guile";
-    homepage    = "http://www.markwitmer.com/guile-xcb/guile-xcb.html";
-    license     = licenses.gpl3Plus;
-    platforms   = platforms.linux;
-  };
+let
+  name = "guile-xcb-${version}";
+  version = "1.3";
+in stdenv.mkDerivation {
+  inherit name;
 
   src = fetchurl {
-    url = "http://www.markwitmer.com/dist/guile-xcb-1.3.tar.gz";
+    url = "http://www.markwitmer.com/dist/${name}.tar.gz";
     sha256 = "04dvbqdrrs67490gn4gkq9zk8mqy3mkls2818ha4p0ckhh0pm149";
   };
 
@@ -24,4 +20,12 @@ stdenv.mkDerivation {
       --with-guile-site-ccache-dir=$out/share/guile/site
     ";
   '';
+
+  meta = with stdenv.lib; {
+    description = "XCB bindings for Guile";
+    homepage = "http://www.markwitmer.com/guile-xcb/guile-xcb.html";
+    license = licenses.gpl3Plus;
+    maintainers = with maintainers; [ vyp ];
+    platforms = platforms.linux;
+  };
 }