swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-27 07:30:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #29732 from vyp/maintain-guile-modules

Browse source 
guile-modules: add vyp as maintainer to unmaintained guile modules
This commit is contained in:
Jörg Thalheim 2017-09-24 15:16:51 +01:00 committed by GitHub
parent d20bd77c93 662478bbef
commit 5fa6b341fb
10 changed files with 125 additions and 113 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
pkgs/development/guile-modules/guile-cairo/default.nix
View file

@ -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,29 +10,24 @@ stdenv.mkDerivation rec {
};
buildInputs = [ guile pkgconfig 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";
meta = with stdenv.lib; {
description = "Cairo bindings for GNU Guile";
longDescription = ''
Guile-Cairo wraps the Cairo graphics library for Guile Scheme.
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;
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;
};
}

8
pkgs/development/guile-modules/guile-gnome/default.nix
View file

@ -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

49
pkgs/development/guile-modules/guile-lib/default.nix
View file

@ -1,44 +1,45 @@
{stdenv, fetchurl, guile, texinfo, pkgconfig}:
{ 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";
};
nativeBuildInputs = [pkgconfig];
buildInputs = [guile texinfo];
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ guile texinfo ];
# One test doesn't seem to be compatible with guile_2_2
# 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;
};
}

57
pkgs/development/guile-modules/guile-ncurses/default.nix
View file

@ -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" '';
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
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;
};
}

22
pkgs/development/guile-modules/guile-opengl/default.nix
View file

@ -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;
};
}

22
pkgs/development/guile-modules/guile-sdl/default.nix
View file

@ -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;
};
}

24
pkgs/development/guile-modules/guile-xcb/default.nix
View file

@ -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";
};
@ -23,4 +19,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;
};
}

4
pkgs/development/tools/guile/g-wrap/default.nix
View file

@ -1,4 +1,4 @@
{ fetchurl, stdenv, guile, libffi, pkgconfig, glib, guile_lib }:
{ fetchurl, stdenv, guile, libffi, pkgconfig, glib, guile-lib }:
stdenv.mkDerivation rec {
name = "g-wrap-1.9.15";
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
# Note: Glib support is optional, but it's quite useful (e.g., it's
# used by Guile-GNOME).
buildInputs = [ guile pkgconfig glib guile_lib ];
buildInputs = [ guile pkgconfig glib guile-lib ];
propagatedBuildInputs = [ libffi ];

4
pkgs/top-level/aliases.nix
View file

@ -66,6 +66,10 @@ mapAliases (rec {
gst_plugins_bad = gst-plugins-bad; # added 2017-02
gst_plugins_ugly = gst-plugins-ugly; # added 2017-02
gst_python = gst-python; # added 2017-02
guileCairo = guile-cairo; # added 2017-09-24
guileGnome = guile-gnome; # added 2017-09-24
guile_lib = guile-lib; # added 2017-09-24
guile_ncurses = guile-ncurses; # added 2017-09-24
gupnptools = gupnp-tools; # added 2015-12-19
gnustep-make = gnustep.make; # added 2016-7-6
htmlTidy = html-tidy; # added 2014-12-06

8
pkgs/top-level/all-packages.nix
View file

@ -6708,18 +6708,18 @@ with pkgs;
jython = callPackage ../development/interpreters/jython {};
guileCairo = callPackage ../development/guile-modules/guile-cairo { };
guile-cairo = callPackage ../development/guile-modules/guile-cairo { };
guile-fibers = callPackage ../development/guile-modules/guile-fibers { };
guileGnome = callPackage ../development/guile-modules/guile-gnome {
guile-gnome = callPackage ../development/guile-modules/guile-gnome {
gconf = gnome2.GConf;
inherit (gnome2) gnome_vfs libglade libgnome libgnomecanvas libgnomeui;
};
guile_lib = callPackage ../development/guile-modules/guile-lib { };
guile-lib = callPackage ../development/guile-modules/guile-lib { };
guile_ncurses = callPackage ../development/guile-modules/guile-ncurses { };
guile-ncurses = callPackage ../development/guile-modules/guile-ncurses { };
guile-opengl = callPackage ../development/guile-modules/guile-opengl { };