Small style fixups

In this commit, I modified some files, conforming them to a
idiosyncratic standard - mainly, a template for meta attribs.
This commit is contained in:
AndersonTorres 2014-09-10 15:59:54 -03:00
parent ff1b7aa332
commit b39e5ce957
18 changed files with 88 additions and 90 deletions

View File

@ -1,6 +1,5 @@
{ stdenv, fetchurl, pkgconfig, autoconf, automake, gettext { stdenv, fetchurl, pkgconfig, autoconf, automake, gettext
, fluxbox, bc, gtkmm, glibmm, libglademm, libsigcxx , fluxbox, bc, gtkmm, glibmm, libglademm, libsigcxx }:
}:
stdenv.mkDerivation rec{ stdenv.mkDerivation rec{
@ -18,7 +17,7 @@ stdenv.mkDerivation rec{
./autogen.sh ./autogen.sh
''; '';
meta = { meta = with stdenv.lib; {
description = "Editor for Fluxbox menus"; description = "Editor for Fluxbox menus";
longDescription = '' longDescription = ''
Fluxbox Menu Editor is a menu editor for the Window Manager Fluxbox written in C++ Fluxbox Menu Editor is a menu editor for the Window Manager Fluxbox written in C++
@ -27,8 +26,8 @@ stdenv.mkDerivation rec{
a row, a submenu, etc very easily. a row, a submenu, etc very easily.
''; '';
homepage = https://github.com/rdehouss/fme/; homepage = https://github.com/rdehouss/fme/;
license = stdenv.lib.licenses.gpl2; license = licenses.gpl2;
maintainers = [ stdenv.lib.maintainers.AndersonTorres ]; maintainers = [ maintainers.AndersonTorres ];
platforms = stdenv.lib.platforms.linux; platforms = platforms.linux;
}; };
} }

View File

@ -1,6 +1,5 @@
{ stdenv, fetchurl { stdenv, fetchurl
, intltool, pkgconfig, gtk , intltool, pkgconfig, gtk }:
}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -14,7 +13,7 @@ stdenv.mkDerivation rec {
buildInputs = [ intltool pkgconfig gtk ]; buildInputs = [ intltool pkgconfig gtk ];
meta = { meta = with stdenv.lib; {
description = "A GTK 2/3 algebraic and RPN calculator"; description = "A GTK 2/3 algebraic and RPN calculator";
longDescription = '' longDescription = ''
galculator is a GTK 2 / GTK 3 based calculator. Its main features include: galculator is a GTK 2 / GTK 3 based calculator. Its main features include:
@ -29,7 +28,8 @@ stdenv.mkDerivation rec {
- Quad-precision floating point arithmetic, and 112-bit binary arithmetic - Quad-precision floating point arithmetic, and 112-bit binary arithmetic
''; '';
homepage = http://galculator.sourceforge.net/; homepage = http://galculator.sourceforge.net/;
license = stdenv.lib.licenses.gpl2Plus; license = licenses.gpl2Plus;
maintainers = [ stdenv.lib.maintainers.AndersonTorres ]; maintainers = [ maintainers.AndersonTorres ];
platforms = platforms.linux;
}; };
} }

View File

@ -22,14 +22,14 @@ stdenv.mkDerivation rec {
--enable-safe-mode --enable-safe-mode
''; '';
meta = { meta = with stdenv; {
description = "A fast, lightweight terminal emulator"; description = "A fast, lightweight terminal emulator";
longDescription = '' longDescription = ''
LilyTerm is a terminal emulator based off of libvte that aims to be fast and lightweight. LilyTerm is a terminal emulator based off of libvte that aims to be fast and lightweight.
''; '';
homepage = http://lilyterm.luna.com.tw/; homepage = http://lilyterm.luna.com.tw/;
license = stdenv.lib.licenses.gpl3; license = licenses.gpl3;
maintainers = [ stdenv.lib.maintainers.AndersonTorres ]; maintainers = [ maintainers.AndersonTorres ];
platforms = stdenv.lib.platforms.linux; platforms = platforms.linux;
}; };
} }

View File

@ -1,8 +1,7 @@
{ stdenv, fetchurl, pkgconfig { stdenv, fetchurl, pkgconfig
, autoreconfHook, gettext, expat , autoreconfHook, gettext, expat
, confuse, vte, gtk , confuse, vte, gtk
, makeWrapper , makeWrapper }:
}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {

View File

@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
qmake PREFIX="$out" qmake PREFIX="$out"
''; '';
meta = { meta = with stdenv.lib; {
description = "A mind-mapping software"; description = "A mind-mapping software";
longDescription = '' longDescription = ''
VYM (View Your Mind) is a tool to generate and manipulate maps which show your thoughts. VYM (View Your Mind) is a tool to generate and manipulate maps which show your thoughts.
@ -28,8 +28,8 @@ stdenv.mkDerivation rec {
vym offers much more features to work with such maps. vym offers much more features to work with such maps.
''; '';
homepage = http://www.insilmaril.de/vym/; homepage = http://www.insilmaril.de/vym/;
license = stdenv.lib.licenses.gpl2; license = licenses.gpl2;
maintainer = [ stdenv.lib.maintainers.AndersonTorres ]; maintainer = [ maintainers.AndersonTorres ];
platforms = stdenv.lib.platforms.linux; platforms = platforms.linux;
}; };
} }

View File

@ -7,8 +7,7 @@
, libgsf, gconf , libgsf, gconf
, gtkhtml, libgtkhtml, libglade, scrollkeeper , gtkhtml, libgtkhtml, libglade, scrollkeeper
, webkitgtk , webkitgtk
, dbus_glib, enchant, isocodes, libuuid , dbus_glib, enchant, isocodes, libuuid }:
}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "xiphos-${version}"; name = "xiphos-${version}";
@ -42,16 +41,17 @@ stdenv.mkDerivation rec {
python waf install python waf install
''; '';
meta = { meta = with stdenv.lib; {
description = "A GTK Bible study tool"; description = "A GTK Bible study tool";
longDescription = '' longDescription = ''
Xiphos (formerly known as GnomeSword) is a Bible study tool written for Linux, UNIX, Xiphos (formerly known as GnomeSword) is a Bible study tool
and Windows using GTK, offering a rich and featureful environment for reading, study, written for Linux, UNIX, and Windows using GTK, offering a rich
and research using modules from The SWORD Project and elsewhere. and featureful environment for reading, study, and research using
modules from The SWORD Project and elsewhere.
''; '';
homepage = http://www.xiphos.org/; homepage = http://www.xiphos.org/;
license = stdenv.lib.licenses.gpl2Plus; license = licenses.gpl2Plus;
maintainers = [ stdenv.lib.maintainers.AndersonTorres ]; maintainers = [ maintainers.AndersonTorres ];
platforms = stdenv.lib.platforms.linux; platforms = platforms.linux;
}; };
} }

View File

@ -3,8 +3,7 @@
, openssl , openssl
, libjpeg, libpng , libjpeg, libpng
, perl , perl
, libXcursor, libXi, libXinerama , libXcursor, libXi, libXinerama }:
}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "3.0.4"; version = "3.0.4";
@ -22,10 +21,13 @@ stdenv.mkDerivation rec {
configureFlags = "--enable-ssl"; configureFlags = "--enable-ssl";
meta = { meta = with stdenv.lib; {
homepage = http://www.dillo.org/; homepage = http://www.dillo.org/;
description = "A fast graphical web browser with a small footprint"; description = "A fast graphical web browser with a small footprint";
maintainers = [ stdenv.lib.maintainers.AndersonTorres ]; longDescription = ''
platforms = stdenv.lib.platforms.linux; Dillo is a small, fast web browser, tailored for older machines.
'';
maintainers = [ maintainers.AndersonTorres ];
platforms = platforms.linux;
}; };
} }

View File

@ -10,8 +10,7 @@
, openalSupport ? false, openal ? null , openalSupport ? false, openal ? null
, alsaSupport ? true, alsaLib ? null , alsaSupport ? true, alsaLib ? null
, pulseaudioSupport ? true, pulseaudio ? null , pulseaudioSupport ? true, pulseaudio ? null
, portaudioSupport ? false, portaudio ? null , portaudioSupport ? false, portaudio ? null }:
}:
assert spellChecking -> (hunspell != null); assert spellChecking -> (hunspell != null);
assert automationSupport -> (lua != null); assert automationSupport -> (lua != null);
@ -62,6 +61,5 @@ stdenv.mkDerivation rec {
# - so the resulting program will be GPL # - so the resulting program will be GPL
maintainers = [ maintainers.AndersonTorres ]; maintainers = [ maintainers.AndersonTorres ];
platforms = platforms.linux; platforms = platforms.linux;
}; };
} }

View File

@ -22,8 +22,7 @@
# for Youtube support # for Youtube support
, quviSupport ? false, libquvi ? null , quviSupport ? false, libquvi ? null
, cacaSupport ? false, libcaca ? null , cacaSupport ? false, libcaca ? null
, vaapiSupport ? false, libva ? null , vaapiSupport ? false, libva ? null }:
}:
assert x11Support -> (libX11 != null && libXext != null && mesa != null && libXxf86vm != null); assert x11Support -> (libX11 != null && libXext != null && mesa != null && libXxf86vm != null);
assert xineramaSupport -> (libXinerama != null && x11Support); assert xineramaSupport -> (libXinerama != null && x11Support);
@ -114,15 +113,17 @@ stdenv.mkDerivation rec {
ln -s ${freefont_ttf}/share/fonts/truetype/FreeSans.ttf $out/share/mpv/subfont.ttf ln -s ${freefont_ttf}/share/fonts/truetype/FreeSans.ttf $out/share/mpv/subfont.ttf
''; '';
meta = { meta = with stdenv.lib;{
description = "A movie player that supports many video formats (MPlayer and mplayer2 fork)"; description = "A movie player that supports many video formats (MPlayer and mplayer2 fork)";
longDescription = '' longDescription = ''
mpv is a free and open-source general-purpose video player, based on the MPlayer and mplayer2 projects, with great improvements above both. mpv is a free and open-source general-purpose video player,
based on the MPlayer and mplayer2 projects, with great
improvements above both.
''; '';
homepage = "http://mpv.io"; homepage = http://mpv.io;
license = stdenv.lib.licenses.gpl2Plus; license = licenses.gpl2Plus;
maintainers = [ stdenv.lib.maintainers.AndersonTorres ]; maintainers = [ maintainers.AndersonTorres ];
platforms = stdenv.lib.platforms.linux; platforms = platforms.linux;
}; };
} }

View File

@ -9,8 +9,7 @@
, mjpegtools , mjpegtools
, alsaLib , alsaLib
, libv4l , libv4l
, cimg , cimg }:
}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -35,7 +34,7 @@ stdenv.mkDerivation rec {
make install prefix="$out" wxcamdocdir="$out/share/doc/wxcam" make install prefix="$out" wxcamdocdir="$out/share/doc/wxcam"
''; '';
meta = { meta = with stdenv.lib; {
description = "An open-source, wxGTK-based webcam app for Linux"; description = "An open-source, wxGTK-based webcam app for Linux";
longDescription = '' longDescription = ''
wxCam is a webcam application for linux. It supports video recording wxCam is a webcam application for linux. It supports video recording
@ -45,8 +44,8 @@ stdenv.mkDerivation rec {
so it should work on a very large number of devices. so it should work on a very large number of devices.
''; '';
homepage = http://wxcam.sourceforge.net/; homepage = http://wxcam.sourceforge.net/;
license = stdenv.lib.licenses.gpl3Plus; license = licenses.gpl3Plus;
maintainers = [ stdenv.lib.maintainers.AndersonTorres ]; maintainers = [ maintainers.AndersonTorres ];
platforms = stdenv.lib.platforms.linux; platforms = platforms.linux;
}; };
} }

View File

@ -1,7 +1,6 @@
{ stdenv, fetchurl { stdenv, fetchurl
, localBios ? true, nasm ? null , localBios ? true, nasm ? null
, sdlSupport ? true, SDL ? null , sdlSupport ? true, SDL ? null }:
}:
assert sdlSupport -> (SDL != null); assert sdlSupport -> (SDL != null);

View File

@ -5,8 +5,7 @@
, termSupport ? true , ncurses ? null, readline ? null , termSupport ? true , ncurses ? null, readline ? null
, wxSupport ? false, wxGTK ? null , wxSupport ? false, wxGTK ? null
, wgetSupport ? false, wget ? null , wgetSupport ? false, wget ? null
, curlSupport ? false, curl ? null , curlSupport ? false, curl ? null }:
}:
assert sdlSupport -> (SDL != null); assert sdlSupport -> (SDL != null);
assert termSupport -> (ncurses != null&& readline != null); assert termSupport -> (ncurses != null&& readline != null);
@ -52,15 +51,19 @@ stdenv.mkDerivation rec {
NIX_CFLAGS_COMPILE="-I${gtk}/include/gtk-2.0/"; NIX_CFLAGS_COMPILE="-I${gtk}/include/gtk-2.0/";
meta = { meta = with stdenv.lib; {
description = "An open-source IA-32 (x86) PC emulator"; description = "An open-source IA-32 (x86) PC emulator";
longDescription = '' longDescription = ''
Bochs is an open-source (LGPL), highly portable IA-32 PC emulator, written in C++, that runs on most popular platforms. It includes emulation of the Intel x86 CPU, common I/O devices, and a custom BIOS. Bochs is an open-source (LGPL), highly portable IA-32 PC emulator,
written in C++, that runs on most popular platforms. It includes
emulation of the Intel x86 CPU, common I/O devices, and a custom
BIOS.
''; '';
homepage = http://bochs.sourceforge.net/; homepage = http://bochs.sourceforge.net/;
license = stdenv.lib.licenses.lgpl2Plus; license = licenses.lgpl2Plus;
maintainers = [ stdenv.lib.maintainers.AndersonTorres ]; maintainers = [ maintainers.AndersonTorres ];
platforms = stdenv.lib.platforms.linux; platforms = platforms.linux;
}; };
} }
# TODO: study config.bochs.* implementation (like config.ffmpeg.* options) # TODO: study config.bochs.* implementation (like config.ffmpeg.* options)

View File

@ -2,8 +2,7 @@
, freetype, fribidi , freetype, fribidi
, libXext, libXft, libXpm, libXrandr, libXrender, xextproto , libXext, libXft, libXpm, libXrandr, libXrender, xextproto
, libXinerama , libXinerama
, imlib2 , imlib2 }:
}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -17,17 +16,19 @@ stdenv.mkDerivation rec {
sha256 = "164dd7bf59791d09a1e729a4fcd5e7347a1004ba675629860a5cf1a271c32983"; sha256 = "164dd7bf59791d09a1e729a4fcd5e7347a1004ba675629860a5cf1a271c32983";
}; };
meta = { meta = with stdenv.lib; {
description = "Full-featured, light-resource X window manager"; description = "Full-featured, light-resource X window manager";
longDescription = '' longDescription = ''
Fluxbox is a X window manager based on Blackbox 0.61.1 window manager sources. Fluxbox is a X window manager based on Blackbox 0.61.1 window
It is very light on resources and easy to handle but yet full of features to make an easy, manager sources. It is very light on resources and easy to
and extremely fast, desktop experience. It is written in C++ and licensed under MIT license. handle but yet full of features to make an easy, and extremely
fast, desktop experience. It is written in C++ and licensed
under MIT license.
''; '';
homepage = http://fluxbox.org/; homepage = http://fluxbox.org/;
license = stdenv.lib.licenses.mit; license = licenses.mit;
maintainers = [ stdenv.lib.maintainers.AndersonTorres ]; maintainers = [ maintainers.AndersonTorres ];
platforms = stdenv.lib.platforms.linux; platforms = platforms.linux;
}; };
} }
# Many thanks Jack Ryan from Nix-dev mailing list! # Many thanks Jack Ryan from Nix-dev mailing list!

View File

@ -1,6 +1,5 @@
{ stdenv, fetchurl { stdenv, fetchurl
, unzip , unzip }:
}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {

View File

@ -1,4 +1,4 @@
{stdenv, fetchurl, pkgconfig, icu, clucene_core, curl}: { stdenv, fetchurl, pkgconfig, icu, clucene_core, curl }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -19,12 +19,12 @@ stdenv.mkDerivation rec {
configureFlags = "--without-conf --enable-tests=no CXXFLAGS=-Wno-unused-but-set-variable"; configureFlags = "--without-conf --enable-tests=no CXXFLAGS=-Wno-unused-but-set-variable";
meta = { meta = with stdenv.lib; {
description = "A software framework that allows research manipulation of Biblical texts"; description = "A software framework that allows research manipulation of Biblical texts";
homepage = http://www.crosswire.org/sword/; homepage = http://www.crosswire.org/sword/;
platforms = stdenv.lib.platforms.linux; platforms = platforms.linux;
license = stdenv.lib.licenses.gpl2; license = licenses.gpl2;
maintainers = [ stdenv.lib.maintainers.piotr stdenv.lib.maintainers.AndersonTorres ]; maintainers = [ maintainers.piotr maintainers.AndersonTorres ];
}; };
} }

View File

@ -1,8 +1,7 @@
{ stdenv, fetchurl, pkgconfig { stdenv, fetchurl, pkgconfig
, libX11, mesa, freeglut , libX11, mesa, freeglut
, jack2, libcdio, libsndfile, libsamplerate , jack2, libcdio, libsndfile, libsamplerate
, SDL, SDL_net, zlib , SDL, SDL_net, zlib }:
}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -25,11 +24,11 @@ stdenv.mkDerivation rec {
install -m 644 -t $out/share/doc/$name *.css *.def *.html *.php *.png *.txt install -m 644 -t $out/share/doc/$name *.css *.def *.html *.php *.png *.txt
''; '';
meta = { meta = with stdenv.lib; {
description = "A portable, CLI-driven, SDL+OpenGL-based, multi-system emulator"; description = "A portable, CLI-driven, SDL+OpenGL-based, multi-system emulator";
homepage = http://mednafen.sourceforge.net/; homepage = http://mednafen.sourceforge.net/;
license = stdenv.lib.licenses.gpl2; license = licenses.gpl2;
maintainers = [ stdenv.lib.maintainers.AndersonTorres ]; maintainers = [ maintainers.AndersonTorres ];
platforms = stdenv.lib.platforms.linux; platforms = platforms.linux;
}; };
} }

View File

@ -15,11 +15,11 @@ stdenv.mkDerivation rec {
install -m 644 -t $out/share/$name standard.conf install -m 644 -t $out/share/$name standard.conf
''; '';
meta = { meta = with stdenv.lib; {
description = "Netplay server for Mednafen"; description = "Netplay server for Mednafen";
homepage = http://mednafen.sourceforge.net/; homepage = http://mednafen.sourceforge.net/;
license = stdenv.lib.licenses.gpl2; license = licenses.gpl2;
maintainers = [ stdenv.lib.maintainers.AndersonTorres ]; maintainers = [ maintainers.AndersonTorres ];
platforms = stdenv.lib.platforms.linux; platforms = platforms.linux;
}; };
} }

View File

@ -1,6 +1,5 @@
{ stdenv, fetchurl { stdenv, fetchurl, pkgconfig
, pkgconfig, SDL2 , SDL2 }:
}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {