From b39e5ce957175d939a8f4d20bca406d8880dc1af Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Wed, 10 Sep 2014 15:59:54 -0300 Subject: [PATCH] Small style fixups In this commit, I modified some files, conforming them to a idiosyncratic standard - mainly, a template for meta attribs. --- pkgs/applications/misc/fme/default.nix | 11 +++++------ pkgs/applications/misc/galculator/default.nix | 10 +++++----- pkgs/applications/misc/lilyterm/default.nix | 8 ++++---- pkgs/applications/misc/tilda/default.nix | 3 +-- pkgs/applications/misc/vym/default.nix | 8 ++++---- pkgs/applications/misc/xiphos/default.nix | 18 +++++++++--------- .../networking/browsers/dillo/default.nix | 12 +++++++----- pkgs/applications/video/aegisub/default.nix | 4 +--- pkgs/applications/video/mpv/default.nix | 17 +++++++++-------- pkgs/applications/video/wxcam/default.nix | 11 +++++------ .../virtualization/8086tiny/default.nix | 3 +-- .../virtualization/bochs/default.nix | 17 ++++++++++------- .../window-managers/fluxbox/default.nix | 19 ++++++++++--------- pkgs/development/libraries/cimg/default.nix | 3 +-- pkgs/development/libraries/sword/default.nix | 10 +++++----- pkgs/misc/emulators/mednafen/default.nix | 11 +++++------ pkgs/misc/emulators/mednafen/server.nix | 8 ++++---- pkgs/misc/emulators/stella/default.nix | 5 ++--- 18 files changed, 88 insertions(+), 90 deletions(-) diff --git a/pkgs/applications/misc/fme/default.nix b/pkgs/applications/misc/fme/default.nix index 93abd13da0ca..685c0ecb4ede 100644 --- a/pkgs/applications/misc/fme/default.nix +++ b/pkgs/applications/misc/fme/default.nix @@ -1,6 +1,5 @@ { stdenv, fetchurl, pkgconfig, autoconf, automake, gettext -, fluxbox, bc, gtkmm, glibmm, libglademm, libsigcxx -}: +, fluxbox, bc, gtkmm, glibmm, libglademm, libsigcxx }: stdenv.mkDerivation rec{ @@ -18,7 +17,7 @@ stdenv.mkDerivation rec{ ./autogen.sh ''; - meta = { + meta = with stdenv.lib; { description = "Editor for Fluxbox menus"; longDescription = '' 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. ''; homepage = https://github.com/rdehouss/fme/; - license = stdenv.lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.AndersonTorres ]; - platforms = stdenv.lib.platforms.linux; + license = licenses.gpl2; + maintainers = [ maintainers.AndersonTorres ]; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/misc/galculator/default.nix b/pkgs/applications/misc/galculator/default.nix index 010f75a575e6..5dcee439ef91 100644 --- a/pkgs/applications/misc/galculator/default.nix +++ b/pkgs/applications/misc/galculator/default.nix @@ -1,6 +1,5 @@ { stdenv, fetchurl -, intltool, pkgconfig, gtk - }: +, intltool, pkgconfig, gtk }: stdenv.mkDerivation rec { @@ -14,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ intltool pkgconfig gtk ]; - meta = { + meta = with stdenv.lib; { description = "A GTK 2/3 algebraic and RPN calculator"; longDescription = '' 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 ''; homepage = http://galculator.sourceforge.net/; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = [ stdenv.lib.maintainers.AndersonTorres ]; + license = licenses.gpl2Plus; + maintainers = [ maintainers.AndersonTorres ]; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/misc/lilyterm/default.nix b/pkgs/applications/misc/lilyterm/default.nix index c87b6a8bc0a1..31a409e1ba68 100644 --- a/pkgs/applications/misc/lilyterm/default.nix +++ b/pkgs/applications/misc/lilyterm/default.nix @@ -22,14 +22,14 @@ stdenv.mkDerivation rec { --enable-safe-mode ''; - meta = { + meta = with stdenv; { description = "A fast, lightweight terminal emulator"; longDescription = '' LilyTerm is a terminal emulator based off of libvte that aims to be fast and lightweight. ''; homepage = http://lilyterm.luna.com.tw/; - license = stdenv.lib.licenses.gpl3; - maintainers = [ stdenv.lib.maintainers.AndersonTorres ]; - platforms = stdenv.lib.platforms.linux; + license = licenses.gpl3; + maintainers = [ maintainers.AndersonTorres ]; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/misc/tilda/default.nix b/pkgs/applications/misc/tilda/default.nix index 50c4184c91e9..bfaca1731fc0 100644 --- a/pkgs/applications/misc/tilda/default.nix +++ b/pkgs/applications/misc/tilda/default.nix @@ -1,8 +1,7 @@ { stdenv, fetchurl, pkgconfig , autoreconfHook, gettext, expat , confuse, vte, gtk -, makeWrapper -}: +, makeWrapper }: stdenv.mkDerivation rec { diff --git a/pkgs/applications/misc/vym/default.nix b/pkgs/applications/misc/vym/default.nix index c2dc9aed44a8..f53d3012b1e6 100644 --- a/pkgs/applications/misc/vym/default.nix +++ b/pkgs/applications/misc/vym/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { qmake PREFIX="$out" ''; - meta = { + meta = with stdenv.lib; { description = "A mind-mapping software"; longDescription = '' 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. ''; homepage = http://www.insilmaril.de/vym/; - license = stdenv.lib.licenses.gpl2; - maintainer = [ stdenv.lib.maintainers.AndersonTorres ]; - platforms = stdenv.lib.platforms.linux; + license = licenses.gpl2; + maintainer = [ maintainers.AndersonTorres ]; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/misc/xiphos/default.nix b/pkgs/applications/misc/xiphos/default.nix index b8cd2ff25840..8dcef600f959 100644 --- a/pkgs/applications/misc/xiphos/default.nix +++ b/pkgs/applications/misc/xiphos/default.nix @@ -7,8 +7,7 @@ , libgsf, gconf , gtkhtml, libgtkhtml, libglade, scrollkeeper , webkitgtk -, dbus_glib, enchant, isocodes, libuuid -}: +, dbus_glib, enchant, isocodes, libuuid }: stdenv.mkDerivation rec { name = "xiphos-${version}"; @@ -42,16 +41,17 @@ stdenv.mkDerivation rec { python waf install ''; - meta = { + meta = with stdenv.lib; { description = "A GTK Bible study tool"; longDescription = '' - Xiphos (formerly known as GnomeSword) is a Bible study tool written for Linux, UNIX, - and Windows using GTK, offering a rich and featureful environment for reading, study, - and research using modules from The SWORD Project and elsewhere. + Xiphos (formerly known as GnomeSword) is a Bible study tool + written for Linux, UNIX, and Windows using GTK, offering a rich + and featureful environment for reading, study, and research using + modules from The SWORD Project and elsewhere. ''; homepage = http://www.xiphos.org/; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = [ stdenv.lib.maintainers.AndersonTorres ]; - platforms = stdenv.lib.platforms.linux; + license = licenses.gpl2Plus; + maintainers = [ maintainers.AndersonTorres ]; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/networking/browsers/dillo/default.nix b/pkgs/applications/networking/browsers/dillo/default.nix index 0cf23f38b0f0..c6c862638889 100644 --- a/pkgs/applications/networking/browsers/dillo/default.nix +++ b/pkgs/applications/networking/browsers/dillo/default.nix @@ -3,8 +3,7 @@ , openssl , libjpeg, libpng , perl -, libXcursor, libXi, libXinerama -}: +, libXcursor, libXi, libXinerama }: stdenv.mkDerivation rec { version = "3.0.4"; @@ -22,10 +21,13 @@ stdenv.mkDerivation rec { configureFlags = "--enable-ssl"; - meta = { + meta = with stdenv.lib; { homepage = http://www.dillo.org/; description = "A fast graphical web browser with a small footprint"; - maintainers = [ stdenv.lib.maintainers.AndersonTorres ]; - platforms = stdenv.lib.platforms.linux; + longDescription = '' + Dillo is a small, fast web browser, tailored for older machines. + ''; + maintainers = [ maintainers.AndersonTorres ]; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/video/aegisub/default.nix b/pkgs/applications/video/aegisub/default.nix index c06aa0a036cd..a2089e04e70e 100644 --- a/pkgs/applications/video/aegisub/default.nix +++ b/pkgs/applications/video/aegisub/default.nix @@ -10,8 +10,7 @@ , openalSupport ? false, openal ? null , alsaSupport ? true, alsaLib ? null , pulseaudioSupport ? true, pulseaudio ? null -, portaudioSupport ? false, portaudio ? null -}: +, portaudioSupport ? false, portaudio ? null }: assert spellChecking -> (hunspell != null); assert automationSupport -> (lua != null); @@ -62,6 +61,5 @@ stdenv.mkDerivation rec { # - so the resulting program will be GPL maintainers = [ maintainers.AndersonTorres ]; platforms = platforms.linux; - }; } diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index db1ced49166e..a9f9c78d332f 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/pkgs/applications/video/mpv/default.nix @@ -22,8 +22,7 @@ # for Youtube support , quviSupport ? false, libquvi ? null , cacaSupport ? false, libcaca ? null -, vaapiSupport ? false, libva ? null -}: +, vaapiSupport ? false, libva ? null }: assert x11Support -> (libX11 != null && libXext != null && mesa != null && libXxf86vm != null); 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 ''; - meta = { + meta = with stdenv.lib;{ description = "A movie player that supports many video formats (MPlayer and mplayer2 fork)"; 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"; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = [ stdenv.lib.maintainers.AndersonTorres ]; - platforms = stdenv.lib.platforms.linux; + homepage = http://mpv.io; + license = licenses.gpl2Plus; + maintainers = [ maintainers.AndersonTorres ]; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/video/wxcam/default.nix b/pkgs/applications/video/wxcam/default.nix index 1f66d9a589b0..561ab1516821 100644 --- a/pkgs/applications/video/wxcam/default.nix +++ b/pkgs/applications/video/wxcam/default.nix @@ -9,8 +9,7 @@ , mjpegtools , alsaLib , libv4l -, cimg -}: +, cimg }: stdenv.mkDerivation rec { @@ -35,7 +34,7 @@ stdenv.mkDerivation rec { make install prefix="$out" wxcamdocdir="$out/share/doc/wxcam" ''; - meta = { + meta = with stdenv.lib; { description = "An open-source, wxGTK-based webcam app for Linux"; longDescription = '' 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. ''; homepage = http://wxcam.sourceforge.net/; - license = stdenv.lib.licenses.gpl3Plus; - maintainers = [ stdenv.lib.maintainers.AndersonTorres ]; - platforms = stdenv.lib.platforms.linux; + license = licenses.gpl3Plus; + maintainers = [ maintainers.AndersonTorres ]; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/virtualization/8086tiny/default.nix b/pkgs/applications/virtualization/8086tiny/default.nix index a16f052f622f..15d98dc9be50 100644 --- a/pkgs/applications/virtualization/8086tiny/default.nix +++ b/pkgs/applications/virtualization/8086tiny/default.nix @@ -1,7 +1,6 @@ { stdenv, fetchurl , localBios ? true, nasm ? null -, sdlSupport ? true, SDL ? null -}: +, sdlSupport ? true, SDL ? null }: assert sdlSupport -> (SDL != null); diff --git a/pkgs/applications/virtualization/bochs/default.nix b/pkgs/applications/virtualization/bochs/default.nix index 74ce7bdfcaa6..95db0dd67a1c 100644 --- a/pkgs/applications/virtualization/bochs/default.nix +++ b/pkgs/applications/virtualization/bochs/default.nix @@ -5,8 +5,7 @@ , termSupport ? true , ncurses ? null, readline ? null , wxSupport ? false, wxGTK ? null , wgetSupport ? false, wget ? null -, curlSupport ? false, curl ? null -}: +, curlSupport ? false, curl ? null }: assert sdlSupport -> (SDL != null); assert termSupport -> (ncurses != null&& readline != null); @@ -52,15 +51,19 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE="-I${gtk}/include/gtk-2.0/"; - meta = { + meta = with stdenv.lib; { description = "An open-source IA-32 (x86) PC emulator"; 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/; - license = stdenv.lib.licenses.lgpl2Plus; - maintainers = [ stdenv.lib.maintainers.AndersonTorres ]; - platforms = stdenv.lib.platforms.linux; + license = licenses.lgpl2Plus; + maintainers = [ maintainers.AndersonTorres ]; + platforms = platforms.linux; }; } + # TODO: study config.bochs.* implementation (like config.ffmpeg.* options) diff --git a/pkgs/applications/window-managers/fluxbox/default.nix b/pkgs/applications/window-managers/fluxbox/default.nix index af6545b61515..b46864b9c2e4 100644 --- a/pkgs/applications/window-managers/fluxbox/default.nix +++ b/pkgs/applications/window-managers/fluxbox/default.nix @@ -2,8 +2,7 @@ , freetype, fribidi , libXext, libXft, libXpm, libXrandr, libXrender, xextproto , libXinerama -, imlib2 -}: +, imlib2 }: stdenv.mkDerivation rec { @@ -17,17 +16,19 @@ stdenv.mkDerivation rec { sha256 = "164dd7bf59791d09a1e729a4fcd5e7347a1004ba675629860a5cf1a271c32983"; }; - meta = { + meta = with stdenv.lib; { description = "Full-featured, light-resource X window manager"; longDescription = '' - Fluxbox is a X window manager based on Blackbox 0.61.1 window manager sources. - It is very light on resources and easy to 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. + Fluxbox is a X window manager based on Blackbox 0.61.1 window + manager sources. It is very light on resources and easy to + 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/; - license = stdenv.lib.licenses.mit; - maintainers = [ stdenv.lib.maintainers.AndersonTorres ]; - platforms = stdenv.lib.platforms.linux; + license = licenses.mit; + maintainers = [ maintainers.AndersonTorres ]; + platforms = platforms.linux; }; } # Many thanks Jack Ryan from Nix-dev mailing list! diff --git a/pkgs/development/libraries/cimg/default.nix b/pkgs/development/libraries/cimg/default.nix index 17b18e8f0be8..049938e1f459 100644 --- a/pkgs/development/libraries/cimg/default.nix +++ b/pkgs/development/libraries/cimg/default.nix @@ -1,6 +1,5 @@ { stdenv, fetchurl -, unzip -}: +, unzip }: stdenv.mkDerivation rec { diff --git a/pkgs/development/libraries/sword/default.nix b/pkgs/development/libraries/sword/default.nix index 5c276ead23aa..6faf2224b0cf 100644 --- a/pkgs/development/libraries/sword/default.nix +++ b/pkgs/development/libraries/sword/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, pkgconfig, icu, clucene_core, curl}: +{ stdenv, fetchurl, pkgconfig, icu, clucene_core, curl }: stdenv.mkDerivation rec { @@ -19,12 +19,12 @@ stdenv.mkDerivation rec { 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"; homepage = http://www.crosswire.org/sword/; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.piotr stdenv.lib.maintainers.AndersonTorres ]; + platforms = platforms.linux; + license = licenses.gpl2; + maintainers = [ maintainers.piotr maintainers.AndersonTorres ]; }; } diff --git a/pkgs/misc/emulators/mednafen/default.nix b/pkgs/misc/emulators/mednafen/default.nix index e3bb3965739b..407d96a2bb92 100644 --- a/pkgs/misc/emulators/mednafen/default.nix +++ b/pkgs/misc/emulators/mednafen/default.nix @@ -1,8 +1,7 @@ { stdenv, fetchurl, pkgconfig , libX11, mesa, freeglut , jack2, libcdio, libsndfile, libsamplerate -, SDL, SDL_net, zlib -}: +, SDL, SDL_net, zlib }: stdenv.mkDerivation rec { @@ -25,11 +24,11 @@ stdenv.mkDerivation rec { 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"; homepage = http://mednafen.sourceforge.net/; - license = stdenv.lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.AndersonTorres ]; - platforms = stdenv.lib.platforms.linux; + license = licenses.gpl2; + maintainers = [ maintainers.AndersonTorres ]; + platforms = platforms.linux; }; } diff --git a/pkgs/misc/emulators/mednafen/server.nix b/pkgs/misc/emulators/mednafen/server.nix index d4515b7db031..ce361ef9fbcc 100644 --- a/pkgs/misc/emulators/mednafen/server.nix +++ b/pkgs/misc/emulators/mednafen/server.nix @@ -15,11 +15,11 @@ stdenv.mkDerivation rec { install -m 644 -t $out/share/$name standard.conf ''; - meta = { + meta = with stdenv.lib; { description = "Netplay server for Mednafen"; homepage = http://mednafen.sourceforge.net/; - license = stdenv.lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.AndersonTorres ]; - platforms = stdenv.lib.platforms.linux; + license = licenses.gpl2; + maintainers = [ maintainers.AndersonTorres ]; + platforms = platforms.linux; }; } diff --git a/pkgs/misc/emulators/stella/default.nix b/pkgs/misc/emulators/stella/default.nix index 3f10d7afb6e3..768d018ba51b 100644 --- a/pkgs/misc/emulators/stella/default.nix +++ b/pkgs/misc/emulators/stella/default.nix @@ -1,6 +1,5 @@ -{ stdenv, fetchurl -, pkgconfig, SDL2 -}: +{ stdenv, fetchurl, pkgconfig +, SDL2 }: stdenv.mkDerivation rec {