From b39e5ce957175d939a8f4d20bca406d8880dc1af Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Wed, 10 Sep 2014 15:59:54 -0300 Subject: 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 +++++++++--------- 6 files changed, 28 insertions(+), 30 deletions(-) (limited to 'pkgs/applications/misc') 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; }; } -- cgit 1.4.1