From a0c91d66f1d63192a8145e5d0314eaa701542604 Mon Sep 17 00:00:00 2001 From: taku0 Date: Sun, 13 Jul 2014 15:46:34 +0900 Subject: uim, gtk-exe-env, qt-plugin-env: Add input method modules for GTK+ and Qt --- pkgs/tools/inputmethods/uim/default.nix | 44 +++++ pkgs/tools/inputmethods/uim/immodules_cache.patch | 231 ++++++++++++++++++++++ 2 files changed, 275 insertions(+) create mode 100644 pkgs/tools/inputmethods/uim/default.nix create mode 100644 pkgs/tools/inputmethods/uim/immodules_cache.patch (limited to 'pkgs/tools') diff --git a/pkgs/tools/inputmethods/uim/default.nix b/pkgs/tools/inputmethods/uim/default.nix new file mode 100644 index 00000000000..b8ee95fae92 --- /dev/null +++ b/pkgs/tools/inputmethods/uim/default.nix @@ -0,0 +1,44 @@ +{stdenv, fetchurl, intltool, pkgconfig, qt4, gtk2, gtk3, kdelibs, cmake, ... }: + +stdenv.mkDerivation rec { + version = "1.8.6"; + name = "uim-${version}"; + + buildInputs = [ + intltool + pkgconfig + qt4 + gtk2 + gtk3 + kdelibs + cmake + ]; + + patches = [ ./immodules_cache.patch ]; + + configureFlags = [ + "--with-gtk2" + "--with-gtk3" + "--enable-kde4-applet" + "--enable-notify=knotify4" + "--enable-pref" + "--with-qt4" + "--with-qt4-immodule" + "--with-skk" + "--with-x" + ]; + + dontUseCmakeConfigure = true; + + src = fetchurl { + url = "http://uim.googlecode.com/files/uim-${version}.tar.bz2"; + sha1 = "43b9dbdead6797880e6cfc9c032ecb2d37d42777"; + }; + + meta = { + homepage = "http://code.google.com/p/uim/"; + description = "A multilingual input method framework"; + license = stdenv.lib.licenses.bsd3; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/tools/inputmethods/uim/immodules_cache.patch b/pkgs/tools/inputmethods/uim/immodules_cache.patch new file mode 100644 index 00000000000..c2d08b661e3 --- /dev/null +++ b/pkgs/tools/inputmethods/uim/immodules_cache.patch @@ -0,0 +1,231 @@ +diff -ru -x '*~' uim-1.8.6.orig/gtk2/immodule/Makefile.am uim-1.8.6/gtk2/immodule/Makefile.am +--- uim-1.8.6.orig/gtk2/immodule/Makefile.am 2013-06-30 13:26:09.000000000 +0900 ++++ uim-1.8.6/gtk2/immodule/Makefile.am 2014-07-13 21:51:26.538400004 +0900 +@@ -1,5 +1,5 @@ + uim_gtk_im_module_path = $(libdir)/gtk-2.0 +-uim_gtk_im_module_file = $(DESTDIR)$(sysconfdir)/gtk-2.0/gtk.immodules ++uim_gtk_im_module_file = $(uim_gtk_im_module_path)/@GTK_BINARY_VERSION@/immodules.cache + + moduledir = $(uim_gtk_im_module_path)/@GTK_BINARY_VERSION@/immodules + +@@ -38,48 +38,12 @@ + + install-data-hook: gtk-rc-get-immodule-file + if test -z $(DESTDIR); then \ +- if test $(libdir) = $(GTK_LIBDIR); then \ +- if type $(QUERY_COMMAND) > /dev/null 2>&1; then \ +- $(QUERY_COMMAND) > `$(GTK_RC_GET_IMMODULE_FILE)`; \ +- echo "*** \"`$(GTK_RC_GET_IMMODULE_FILE)`\" is updated. ***"; \ +- else \ +- echo "********************** Warning ***********************"; \ +- echo " $(QUERY_COMMAND) not found"; \ +- echo " Please make sure to update"; \ +- echo " \"`$(GTK_RC_GET_IMMODULE_FILE)`\""; \ +- echo " manually."; \ +- echo "******************************************************"; \ +- fi \ +- else \ +- if type $(QUERY_COMMAND) > /dev/null 2>&1; then \ +- $(mkinstalldirs) $(sysconfdir)/gtk-2.0; \ +- GTK_PATH=$(uim_gtk_im_module_path) $(QUERY_COMMAND) > $(uim_gtk_im_module_file); \ +- echo "******************************************************"; \ +- echo " You need to set"; \ +- echo " GTK_IM_MODULE_FILE=$(uim_gtk_im_module_file)"; \ +- echo " environment variable to use this module."; \ +- echo "******************************************************"; \ +- else \ +- echo "********************** Warning ***********************"; \ +- echo " $(QUERY_COMMAND) not found"; \ +- echo " Please make sure to update"; \ +- echo " \"$(uim_gtk_im_module_file)\""; \ +- echo " manually, and set"; \ +- echo " GTK_IM_MODULE_FILE=$(uim_gtk_im_module_file)"; \ +- echo " environment variable to use this module."; \ +- echo "******************************************************"; \ +- fi \ +- fi \ ++ $(mkinstalldirs) $(uim_gtk_im_module_path)/@GTK_BINARY_VERSION@; \ ++ GTK_PATH=$(uim_gtk_im_module_path) $(QUERY_COMMAND) > $(uim_gtk_im_module_file); \ + fi + uninstall-hook: + if test -z $(DESTDIR); then \ +- if type $(QUERY_COMMAND) > /dev/null 2>&1; then \ +- if test $(libdir) = $(GTK_LIBDIR); then \ +- $(QUERY_COMMAND) > `$(GTK_RC_GET_IMMODULE_FILE)`; \ +- else \ +- GTK_PATH=$(uim_gtk_im_module_path) $(QUERY_COMMAND) > $(uim_gtk_im_module_file); \ +- fi \ +- fi \ ++ GTK_PATH=$(uim_gtk_im_module_path) $(QUERY_COMMAND) > $(uim_gtk_im_module_file); \ + fi + else + install-data-hook: +diff -ru -x '*~' uim-1.8.6.orig/gtk2/immodule/Makefile.in uim-1.8.6/gtk2/immodule/Makefile.in +--- uim-1.8.6.orig/gtk2/immodule/Makefile.in 2013-06-30 13:27:08.000000000 +0900 ++++ uim-1.8.6/gtk2/immodule/Makefile.in 2014-07-13 22:12:27.947595507 +0900 +@@ -434,7 +434,7 @@ + top_srcdir = @top_srcdir@ + uim_pixmapsdir = @uim_pixmapsdir@ + uim_gtk_im_module_path = $(libdir)/gtk-2.0 +-uim_gtk_im_module_file = $(DESTDIR)$(sysconfdir)/gtk-2.0/gtk.immodules ++uim_gtk_im_module_file = $(uim_gtk_im_module_path)/@GTK_BINARY_VERSION@/immodules.cache + moduledir = $(uim_gtk_im_module_path)/@GTK_BINARY_VERSION@/immodules + @GTK2_TRUE@im_uim_la = im-uim.la + @GTK2_TRUE@im_uim_la_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir) +@@ -875,48 +875,12 @@ + + @GTK2_TRUE@install-data-hook: gtk-rc-get-immodule-file + @GTK2_TRUE@ if test -z $(DESTDIR); then \ +-@GTK2_TRUE@ if test $(libdir) = $(GTK_LIBDIR); then \ +-@GTK2_TRUE@ if type $(QUERY_COMMAND) > /dev/null 2>&1; then \ +-@GTK2_TRUE@ $(QUERY_COMMAND) > `$(GTK_RC_GET_IMMODULE_FILE)`; \ +-@GTK2_TRUE@ echo "*** \"`$(GTK_RC_GET_IMMODULE_FILE)`\" is updated. ***"; \ +-@GTK2_TRUE@ else \ +-@GTK2_TRUE@ echo "********************** Warning ***********************"; \ +-@GTK2_TRUE@ echo " $(QUERY_COMMAND) not found"; \ +-@GTK2_TRUE@ echo " Please make sure to update"; \ +-@GTK2_TRUE@ echo " \"`$(GTK_RC_GET_IMMODULE_FILE)`\""; \ +-@GTK2_TRUE@ echo " manually."; \ +-@GTK2_TRUE@ echo "******************************************************"; \ +-@GTK2_TRUE@ fi \ +-@GTK2_TRUE@ else \ +-@GTK2_TRUE@ if type $(QUERY_COMMAND) > /dev/null 2>&1; then \ +-@GTK2_TRUE@ $(mkinstalldirs) $(sysconfdir)/gtk-2.0; \ +-@GTK2_TRUE@ GTK_PATH=$(uim_gtk_im_module_path) $(QUERY_COMMAND) > $(uim_gtk_im_module_file); \ +-@GTK2_TRUE@ echo "******************************************************"; \ +-@GTK2_TRUE@ echo " You need to set"; \ +-@GTK2_TRUE@ echo " GTK_IM_MODULE_FILE=$(uim_gtk_im_module_file)"; \ +-@GTK2_TRUE@ echo " environment variable to use this module."; \ +-@GTK2_TRUE@ echo "******************************************************"; \ +-@GTK2_TRUE@ else \ +-@GTK2_TRUE@ echo "********************** Warning ***********************"; \ +-@GTK2_TRUE@ echo " $(QUERY_COMMAND) not found"; \ +-@GTK2_TRUE@ echo " Please make sure to update"; \ +-@GTK2_TRUE@ echo " \"$(uim_gtk_im_module_file)\""; \ +-@GTK2_TRUE@ echo " manually, and set"; \ +-@GTK2_TRUE@ echo " GTK_IM_MODULE_FILE=$(uim_gtk_im_module_file)"; \ +-@GTK2_TRUE@ echo " environment variable to use this module."; \ +-@GTK2_TRUE@ echo "******************************************************"; \ +-@GTK2_TRUE@ fi \ +-@GTK2_TRUE@ fi \ ++@GTK2_TRUE@ $(mkinstalldirs) $(uim_gtk_im_module_path)/@GTK_BINARY_VERSION@; \ ++@GTK2_TRUE@ GTK_PATH=$(uim_gtk_im_module_path) $(QUERY_COMMAND) > $(uim_gtk_im_module_file); \ + @GTK2_TRUE@ fi + @GTK2_TRUE@uninstall-hook: + @GTK2_TRUE@ if test -z $(DESTDIR); then \ +-@GTK2_TRUE@ if type $(QUERY_COMMAND) > /dev/null 2>&1; then \ +-@GTK2_TRUE@ if test $(libdir) = $(GTK_LIBDIR); then \ +-@GTK2_TRUE@ $(QUERY_COMMAND) > `$(GTK_RC_GET_IMMODULE_FILE)`; \ +-@GTK2_TRUE@ else \ +-@GTK2_TRUE@ GTK_PATH=$(uim_gtk_im_module_path) $(QUERY_COMMAND) > $(uim_gtk_im_module_file); \ +-@GTK2_TRUE@ fi \ +-@GTK2_TRUE@ fi \ ++@GTK2_TRUE@ GTK_PATH=$(uim_gtk_im_module_path) $(QUERY_COMMAND) > $(uim_gtk_im_module_file); \ + @GTK2_TRUE@ fi + @GTK2_FALSE@install-data-hook: + +diff -ru -x '*~' uim-1.8.6.orig/gtk3/immodule/Makefile.am uim-1.8.6/gtk3/immodule/Makefile.am +--- uim-1.8.6.orig/gtk3/immodule/Makefile.am 2013-06-30 13:26:20.000000000 +0900 ++++ uim-1.8.6/gtk3/immodule/Makefile.am 2014-07-13 21:55:38.114246503 +0900 +@@ -45,42 +45,11 @@ + + install-data-hook: gtk3-rc-get-immodule-file + if test -z $(DESTDIR); then \ +- if test $(libdir) = $(GTK3_LIBDIR); then \ +- if type $(QUERY_COMMAND) > /dev/null 2>&1; then \ +- $(QUERY_COMMAND) --update-cache; \ +- echo "*** \"`$(GTK3_RC_GET_IMMODULE_FILE)`\" is updated. ***"; \ +- else \ +- echo "********************** Warning ***********************"; \ +- echo " $(QUERY_COMMAND) not found"; \ +- echo " Please make sure to update"; \ +- echo " \"`$(GTK3_RC_GET_IMMODULE_FILE)`\""; \ +- echo " manually."; \ +- echo "******************************************************"; \ +- fi \ +- else \ +- if type $(QUERY_COMMAND) > /dev/null 2>&1; then \ +- GTK_PATH=$(uim_gtk3_im_module_path) $(QUERY_COMMAND) --update-cache; \ +- else \ +- echo "********************** Warning ***********************"; \ +- echo " $(QUERY_COMMAND) not found"; \ +- echo " Please make sure to update"; \ +- echo " immodules.cache"; \ +- echo " manually, and set"; \ +- echo " GTK_IM_MODULE_FILE=PATH_TO/immodule.cache"; \ +- echo " environment variable to use this module."; \ +- echo "******************************************************"; \ +- fi \ +- fi \ ++ GTK_PATH=$(uim_gtk3_im_module_path) $(QUERY_COMMAND) > $(uim_gtk3_im_module_path)/@GTK3_BINARY_VERSION@/immodules.cache ; \ + fi + uninstall-hook: + if test -z $(DESTDIR); then \ +- if type $(QUERY_COMMAND) > /dev/null 2>&1; then \ +- if test $(libdir) = $(GTK3_LIBDIR); then \ +- $(QUERY_COMMAND) --update-cache; \ +- else \ +- GTK_PATH=$(uim_gtk3_im_module_path) $(QUERY_COMMAND) --update-cache; \ +- fi \ +- fi \ ++ GTK_PATH=$(uim_gtk3_im_module_path) $(QUERY_COMMAND) > $(uim_gtk3_im_module_path)/@GTK3_BINARY_VERSION@/immodules.cache ; \ + fi + else + install-data-hook: +diff -ru -x '*~' uim-1.8.6.orig/gtk3/immodule/Makefile.in uim-1.8.6/gtk3/immodule/Makefile.in +--- uim-1.8.6.orig/gtk3/immodule/Makefile.in 2013-06-30 13:27:08.000000000 +0900 ++++ uim-1.8.6/gtk3/immodule/Makefile.in 2014-07-13 21:56:11.531225832 +0900 +@@ -893,42 +893,11 @@ + + @GTK3_TRUE@install-data-hook: gtk3-rc-get-immodule-file + @GTK3_TRUE@ if test -z $(DESTDIR); then \ +-@GTK3_TRUE@ if test $(libdir) = $(GTK3_LIBDIR); then \ +-@GTK3_TRUE@ if type $(QUERY_COMMAND) > /dev/null 2>&1; then \ +-@GTK3_TRUE@ $(QUERY_COMMAND) --update-cache; \ +-@GTK3_TRUE@ echo "*** \"`$(GTK3_RC_GET_IMMODULE_FILE)`\" is updated. ***"; \ +-@GTK3_TRUE@ else \ +-@GTK3_TRUE@ echo "********************** Warning ***********************"; \ +-@GTK3_TRUE@ echo " $(QUERY_COMMAND) not found"; \ +-@GTK3_TRUE@ echo " Please make sure to update"; \ +-@GTK3_TRUE@ echo " \"`$(GTK3_RC_GET_IMMODULE_FILE)`\""; \ +-@GTK3_TRUE@ echo " manually."; \ +-@GTK3_TRUE@ echo "******************************************************"; \ +-@GTK3_TRUE@ fi \ +-@GTK3_TRUE@ else \ +-@GTK3_TRUE@ if type $(QUERY_COMMAND) > /dev/null 2>&1; then \ +-@GTK3_TRUE@ GTK_PATH=$(uim_gtk3_im_module_path) $(QUERY_COMMAND) --update-cache; \ +-@GTK3_TRUE@ else \ +-@GTK3_TRUE@ echo "********************** Warning ***********************"; \ +-@GTK3_TRUE@ echo " $(QUERY_COMMAND) not found"; \ +-@GTK3_TRUE@ echo " Please make sure to update"; \ +-@GTK3_TRUE@ echo " immodules.cache"; \ +-@GTK3_TRUE@ echo " manually, and set"; \ +-@GTK3_TRUE@ echo " GTK_IM_MODULE_FILE=PATH_TO/immodule.cache"; \ +-@GTK3_TRUE@ echo " environment variable to use this module."; \ +-@GTK3_TRUE@ echo "******************************************************"; \ +-@GTK3_TRUE@ fi \ +-@GTK3_TRUE@ fi \ ++@GTK3_TRUE@ GTK_PATH=$(uim_gtk3_im_module_path) $(QUERY_COMMAND) > $(uim_gtk3_im_module_path)/@GTK3_BINARY_VERSION@/immodules.cache ; \ + @GTK3_TRUE@ fi + @GTK3_TRUE@uninstall-hook: + @GTK3_TRUE@ if test -z $(DESTDIR); then \ +-@GTK3_TRUE@ if type $(QUERY_COMMAND) > /dev/null 2>&1; then \ +-@GTK3_TRUE@ if test $(libdir) = $(GTK3_LIBDIR); then \ +-@GTK3_TRUE@ $(QUERY_COMMAND) --update-cache; \ +-@GTK3_TRUE@ else \ +-@GTK3_TRUE@ GTK_PATH=$(uim_gtk3_im_module_path) $(QUERY_COMMAND) --update-cache; \ +-@GTK3_TRUE@ fi \ +-@GTK3_TRUE@ fi \ ++@GTK3_TRUE@ GTK_PATH=$(uim_gtk3_im_module_path) $(QUERY_COMMAND) > $(uim_gtk3_im_module_path)/@GTK3_BINARY_VERSION@/immodules.cache ; \ + @GTK3_TRUE@ fi + @GTK3_FALSE@install-data-hook: + +diff -ru -x '*~' uim-1.8.6.orig/qt4/immodule/quiminputcontextplugin.pro.in uim-1.8.6/qt4/immodule/quiminputcontextplugin.pro.in +--- uim-1.8.6.orig/qt4/immodule/quiminputcontextplugin.pro.in 2013-06-30 13:26:20.000000000 +0900 ++++ uim-1.8.6/qt4/immodule/quiminputcontextplugin.pro.in 2014-03-09 11:31:19.388085048 +0900 +@@ -35,4 +35,4 @@ + + TARGET = uiminputcontextplugin + +-target.path += @DESTDIR@$$[QT_INSTALL_PLUGINS]/inputmethods ++target.path += @DESTDIR@@exec_prefix@/lib/qt4/plugins/inputmethods -- cgit 1.4.1 From 8346343aa5e2f92fb75a71217cdd68a53efdf227 Mon Sep 17 00:00:00 2001 From: Andreas Herrmann Date: Tue, 1 Jul 2014 15:55:12 +0200 Subject: hdf5: Add mpi support Optionally, build the parallel version of hdf5. --- pkgs/tools/misc/hdf5/default.nix | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) (limited to 'pkgs/tools') diff --git a/pkgs/tools/misc/hdf5/default.nix b/pkgs/tools/misc/hdf5/default.nix index a7d03d1335f..43b3a3240e6 100644 --- a/pkgs/tools/misc/hdf5/default.nix +++ b/pkgs/tools/misc/hdf5/default.nix @@ -3,6 +3,7 @@ , fetchurl , zlib ? null , szip ? null +, mpi ? null }: stdenv.mkDerivation rec { version = "1.8.13"; @@ -12,11 +13,22 @@ stdenv.mkDerivation rec { sha256 = "1h9qdl321gzm3ihdhlijbl9sh9qcdrw94j7izg64yfqhxj7b7xl2"; }; + passthru = { + mpiSupport = (mpi != null); + inherit mpi; + }; + buildInputs = [] ++ stdenv.lib.optional (zlib != null) zlib ++ stdenv.lib.optional (szip != null) szip; - configureFlags = if szip != null then "--with-szlib=${szip}" else ""; + propagatedBuildInputs = [] + ++ stdenv.lib.optional (mpi != null) mpi; + + configureFlags = " + ${if szip != null then "--with-szlib=${szip}" else ""} + ${if mpi != null then "--enable-parallel" else ""} + "; patches = [./bin-mv.patch]; -- cgit 1.4.1 From 37b064fcc713ddd88e5c3dd297fabf12b7725c1f Mon Sep 17 00:00:00 2001 From: Andreas Herrmann Date: Wed, 2 Jul 2014 15:10:02 +0200 Subject: hdf5: Optional enableShared flag Required by h5py in mpi mode. --- pkgs/tools/misc/hdf5/default.nix | 2 ++ 1 file changed, 2 insertions(+) (limited to 'pkgs/tools') diff --git a/pkgs/tools/misc/hdf5/default.nix b/pkgs/tools/misc/hdf5/default.nix index 43b3a3240e6..5cdc468c2a5 100644 --- a/pkgs/tools/misc/hdf5/default.nix +++ b/pkgs/tools/misc/hdf5/default.nix @@ -4,6 +4,7 @@ , zlib ? null , szip ? null , mpi ? null +, enableShared ? true }: stdenv.mkDerivation rec { version = "1.8.13"; @@ -28,6 +29,7 @@ stdenv.mkDerivation rec { configureFlags = " ${if szip != null then "--with-szlib=${szip}" else ""} ${if mpi != null then "--enable-parallel" else ""} + ${if enableShared then "--enable-shared" else ""} "; patches = [./bin-mv.patch]; -- cgit 1.4.1 From 50c63f9b320a7016a670580dc5cbdc0bc0864138 Mon Sep 17 00:00:00 2001 From: Luke Clifton Date: Wed, 23 Jul 2014 20:49:43 +0800 Subject: Added abduco --- pkgs/tools/misc/abduco/default.nix | 28 ++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/tools/misc/abduco/default.nix (limited to 'pkgs/tools') diff --git a/pkgs/tools/misc/abduco/default.nix b/pkgs/tools/misc/abduco/default.nix new file mode 100644 index 00000000000..772c0b982a7 --- /dev/null +++ b/pkgs/tools/misc/abduco/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchurl, writeText, conf? null}: + +with stdenv.lib; + +stdenv.mkDerivation rec { + name = "abduco-0.1"; + + meta = { + homepage = http://brain-dump.org/projects/abduco; + license = "bsd"; + description = "Allows programs to be run independently from its controlling terminal"; + platforms = with platforms; linux; + }; + + src = fetchurl { + url = "http://www.brain-dump.org/projects/abduco/${name}.tar.gz"; + sha256 = "b4ef297cb7cc81170dc7edf75385cb1c55e024a52f90c1dd0bc0e9862e6f39b5"; + }; + + configFile = optionalString (conf!=null) (writeText "config.def.h" conf); + preBuild = optionalString (conf!=null) "cp ${configFile} config.def.h"; + + buildInputs = []; + + installPhase = '' + make PREFIX=$out install + ''; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 137f11b78e7..7810d0a7e9a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -427,6 +427,8 @@ let ### TOOLS + abduco = callPackage ../tools/misc/abduco { }; + acct = callPackage ../tools/system/acct { }; acoustidFingerprinter = callPackage ../tools/audio/acoustid-fingerprinter { -- cgit 1.4.1 From dcb226deb787df743e04677f3dcbf6fec4c51dfb Mon Sep 17 00:00:00 2001 From: Luke Clifton Date: Sat, 26 Jul 2014 08:39:14 +0800 Subject: Changed to correct license from licenses.* --- pkgs/tools/misc/abduco/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs/tools') diff --git a/pkgs/tools/misc/abduco/default.nix b/pkgs/tools/misc/abduco/default.nix index 772c0b982a7..a3f5c4a1d61 100644 --- a/pkgs/tools/misc/abduco/default.nix +++ b/pkgs/tools/misc/abduco/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://brain-dump.org/projects/abduco; - license = "bsd"; + license = licenses.isc; description = "Allows programs to be run independently from its controlling terminal"; platforms = with platforms; linux; }; -- cgit 1.4.1 From b63b8260b5e4acc48d6ee62531265e38eb7a2513 Mon Sep 17 00:00:00 2001 From: Thomas Strobel Date: Thu, 14 Aug 2014 02:17:55 +0200 Subject: Add thermald: Linux Thermal Daemon --- nixos/modules/services/hardware/thermald.nix | 40 ++++++++++++++++++++++++++++ pkgs/tools/system/thermald/default.nix | 36 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 78 insertions(+) create mode 100644 nixos/modules/services/hardware/thermald.nix create mode 100644 pkgs/tools/system/thermald/default.nix (limited to 'pkgs/tools') diff --git a/nixos/modules/services/hardware/thermald.nix b/nixos/modules/services/hardware/thermald.nix new file mode 100644 index 00000000000..d197c723d55 --- /dev/null +++ b/nixos/modules/services/hardware/thermald.nix @@ -0,0 +1,40 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.thermald; + +in { + + ###### interface + + options = { + + services.thermald = { + + enable = mkOption { + default = false; + description = '' + Whether to enable thermald, the temperature management daemon. + ''; + }; + + }; + + }; + + + ###### implementation + + config = mkIf cfg.enable { + + systemd.services.thermald = { + description = "Thermal Daemon Service"; + wantedBy = [ "multi-user.target" ]; + script = "exec ${pkgs.thermald}/sbin/thermald --no-daemon --dbus-enable"; + }; + + }; + +} diff --git a/pkgs/tools/system/thermald/default.nix b/pkgs/tools/system/thermald/default.nix new file mode 100644 index 00000000000..86d121f0c22 --- /dev/null +++ b/pkgs/tools/system/thermald/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchurl, unzip, autoconf, automake, libtool, pkgconfig, dbus_libs, dbus_glib, libxml2 }: + +stdenv.mkDerivation rec { + version = "1.3"; + name = "thermald-${version}"; + src = fetchurl { + url = "https://github.com/01org/thermal_daemon/archive/v${version}.zip"; + sha256 = "0jqxc8vvd4lx4z0kcdisk8lpdf823nysvjcfjxlr5wzla1xysqwc"; + }; + buildInputs = [ unzip autoconf automake libtool pkgconfig dbus_libs dbus_glib libxml2 ]; + + patchPhase = ''sed -e 's/upstartconfdir = \/etc\/init/upstartconfdir = $(out)\/etc\/init/' -i data/Makefile.am''; + + preConfigure = '' + export PKG_CONFIG_PATH="${dbus_libs}/lib/pkgconfig:$PKG_CONFIG_PATH" + ./autogen.sh #--prefix="$out" + ''; + + configureFlags = [ + "--sysconfdir=$(out)/etc" "--localstatedir=/var" + "--with-dbus-sys-dir=$(out)/etc/dbus-1/system.d" + "--with-systemdsystemunitdir=$(out)/etc/systemd/system" + ]; + + preInstall = "sysconfdir=$out/etc"; + + + meta = { + description = "Thermal Daemon"; + longDescription = '' + Thermal Daemon + ''; + homepage = https://01.org/linux-thermal-daemon; + license = stdenv.lib.licenses.gpl2; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8c0a5e545cf..98c59895c74 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11322,6 +11322,8 @@ let inherit texLive unzip; }; + thermald = callPackage ../tools/system/thermald { }; + thinkfan = callPackage ../tools/system/thinkfan { }; vice = callPackage ../misc/emulators/vice { -- cgit 1.4.1 From 9eea38285bfa28a70a6996c45c84e7c4aceb0bac Mon Sep 17 00:00:00 2001 From: Kosyrev Serge <_deepfire@feelingofgreen.ru> Date: Mon, 4 Aug 2014 13:03:49 +0400 Subject: chntpw: new expression --- .../chntpw/00-chntpw-build-arch-autodetect.patch | 25 +++++++++++++++++++ .../security/chntpw/01-chntpw-install-target.patch | 26 +++++++++++++++++++ pkgs/tools/security/chntpw/default.nix | 29 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 4 files changed, 82 insertions(+) create mode 100644 pkgs/tools/security/chntpw/00-chntpw-build-arch-autodetect.patch create mode 100644 pkgs/tools/security/chntpw/01-chntpw-install-target.patch create mode 100644 pkgs/tools/security/chntpw/default.nix (limited to 'pkgs/tools') diff --git a/pkgs/tools/security/chntpw/00-chntpw-build-arch-autodetect.patch b/pkgs/tools/security/chntpw/00-chntpw-build-arch-autodetect.patch new file mode 100644 index 00000000000..9c379adb7df --- /dev/null +++ b/pkgs/tools/security/chntpw/00-chntpw-build-arch-autodetect.patch @@ -0,0 +1,25 @@ +diff -urN chntpw-140201.orig/Makefile chntpw-140201/Makefile +--- chntpw-140201.orig/Makefile 2014-02-01 20:54:37.000000000 +0400 ++++ chntpw-140201/Makefile 2014-08-03 20:26:56.497161881 +0400 +@@ -12,14 +12,13 @@ + + CC=gcc + +-# Force 32 bit +-CFLAGS= -DUSEOPENSSL -g -I. -I$(OSSLINC) -Wall -m32 +-OSSLLIB=$(OSSLPATH)/lib +- +-# 64 bit if default for compiler setup +-#CFLAGS= -DUSEOPENSSL -g -I. -I$(OSSLINC) -Wall +-#OSSLLIB=$(OSSLPATH)/lib64 +- ++ifeq '$(shell gcc -dumpmachine)' 'x86_64-unknown-linux-gnu' ++ CFLAGS= -DUSEOPENSSL -g -I. -I$(OSSLINC) -Wall ++ OSSLLIB=$(OSSLPATH)/lib64 ++else ifeq '$(shell gcc -dumpmachine)' 'i686-unknown-linux-gnu' ++ CFLAGS= -DUSEOPENSSL -g -I. -I$(OSSLINC) -Wall -m32 ++ OSSLLIB=$(OSSLPATH)/lib ++endif + + # This is to link with whatever we have, SSL crypto lib we put in static + #LIBS=-L$(OSSLLIB) $(OSSLLIB)/libcrypto.a diff --git a/pkgs/tools/security/chntpw/01-chntpw-install-target.patch b/pkgs/tools/security/chntpw/01-chntpw-install-target.patch new file mode 100644 index 00000000000..d3163a026f9 --- /dev/null +++ b/pkgs/tools/security/chntpw/01-chntpw-install-target.patch @@ -0,0 +1,26 @@ +diff -urN chntpw-140201.orig/Makefile chntpw-140201/Makefile +--- chntpw-140201.orig/Makefile 2014-08-03 20:26:56.497161881 +0400 ++++ chntpw-140201/Makefile 2014-08-04 12:57:16.563818342 +0400 +@@ -10,6 +10,8 @@ + OSSLPATH=/usr + OSSLINC=$(OSSLPATH)/include + ++PREFIX ?= /usr ++ + CC=gcc + + ifeq '$(shell gcc -dumpmachine)' 'x86_64-unknown-linux-gnu' +@@ -24,8 +26,12 @@ + #LIBS=-L$(OSSLLIB) $(OSSLLIB)/libcrypto.a + LIBS=-L$(OSSLLIB) + ++BINARIES := chntpw chntpw.static cpnt reged reged.static samusrgrp samusrgrp.static sampasswd sampasswd.static + +-all: chntpw chntpw.static cpnt reged reged.static samusrgrp samusrgrp.static sampasswd sampasswd.static ++all: $(BINARIES) ++install: $(BINARIES) ++ mkdir -p $(PREFIX)/bin ++ cp $^ $(PREFIX)/bin + + chntpw: chntpw.o ntreg.o edlib.o libsam.o + $(CC) $(CFLAGS) -o chntpw chntpw.o ntreg.o edlib.o libsam.o $(LIBS) diff --git a/pkgs/tools/security/chntpw/default.nix b/pkgs/tools/security/chntpw/default.nix new file mode 100644 index 00000000000..a1aab355a3c --- /dev/null +++ b/pkgs/tools/security/chntpw/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchurl, unzip }: + +stdenv.mkDerivation rec { + name = "chntpw-${version}"; + + version = "140201"; + + src = fetchurl { + url = "http://pogostick.net/~pnh/ntpasswd/chntpw-source-${version}.zip"; + sha256 = "1k1cxsj0221dpsqi5yibq2hr7n8xywnicl8yyaicn91y8h2hkqln"; + }; + + buildInputs = [ unzip ]; + + patches = [ + ./00-chntpw-build-arch-autodetect.patch + ./01-chntpw-install-target.patch + ]; + + installPhase = '' + make install PREFIX=$out + ''; + + meta = with stdenv.lib; { + homepage = http://pogostick.net/~pnh/ntpasswd/; + description = "An utility to reset the password of any user that has a valid local account on a Windows system"; + license = licenses.gpl2; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 77d2fe85d59..2da8398619f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -604,6 +604,8 @@ let consul = callPackage ../servers/consul { }; consul_ui = callPackage ../servers/consul/ui.nix { }; + chntpw = callPackage ../tools/security/chntpw { }; + coprthr = callPackage ../development/libraries/coprthr { flex = flex_2_5_35; }; -- cgit 1.4.1 From 2815cdb8a77c632dacaa9d1d9228af8019d2e4d2 Mon Sep 17 00:00:00 2001 From: Boris Sukholitko Date: Fri, 15 Aug 2014 17:51:50 +0300 Subject: tigervnc: fix xkb configuration for Xvnc Without those fixes, Xvnc doesn't work at all. --- pkgs/tools/admin/tigervnc/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'pkgs/tools') diff --git a/pkgs/tools/admin/tigervnc/default.nix b/pkgs/tools/admin/tigervnc/default.nix index 3d5abd074d9..71e1f29cf1c 100644 --- a/pkgs/tools/admin/tigervnc/default.nix +++ b/pkgs/tools/admin/tigervnc/default.nix @@ -57,7 +57,12 @@ stdenv.mkDerivation rec { patch -p1 < $a done autoreconf -vfi - ./configure $configureFlags --disable-xinerama --disable-xvfb --disable-xnest --disable-xorg --disable-dmx --disable-dri --disable-dri2 --disable-glx --prefix="$out" --disable-unit-tests + ./configure $configureFlags --disable-xinerama --disable-xvfb --disable-xnest \ + --disable-xorg --disable-dmx --disable-dri --disable-dri2 --disable-glx \ + --prefix="$out" --disable-unit-tests \ + --with-xkb-path=${xkeyboard_config}/share/X11/xkb \ + --with-xkb-bin-directory=${xkbcomp}/bin \ + --with-xkb-output=$out/share/X11/xkb/compiled make TIGERVNC_SRCDIR=`pwd`/../.. popd ''; -- cgit 1.4.1 From cfbc0defdeffd5190e8cfdaaf3100184963cf406 Mon Sep 17 00:00:00 2001 From: Nathaniel Baxter Date: Fri, 8 Aug 2014 08:58:18 +1000 Subject: obconf: Added obconf - A gui configuration tool for openbox --- pkgs/tools/X11/obconf/default.nix | 26 ++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/tools/X11/obconf/default.nix (limited to 'pkgs/tools') diff --git a/pkgs/tools/X11/obconf/default.nix b/pkgs/tools/X11/obconf/default.nix new file mode 100644 index 00000000000..589b684e69b --- /dev/null +++ b/pkgs/tools/X11/obconf/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchurl, pkgconfig, gtk, libglade, openbox, + imlib2, libstartup_notification, makeWrapper }: + +stdenv.mkDerivation rec { + name = "obconf-${version}"; + version = "2.0.4"; + + src = fetchurl { + url = "http://openbox.org/dist/obconf/obconf-${version}.tar.gz"; + sha256 = "1fanjdmd8727kk74x5404vi8v7s4kpq48l583d12fsi4xvsfb8vi"; + }; + + buildInputs = [ + pkgconfig gtk libglade openbox imlib2 libstartup_notification makeWrapper + ]; + + postInstall = '' + wrapProgram $out/bin/obconf --prefix XDG_DATA_DIRS : ${openbox}/share/ + ''; + + meta = { + description = "GUI configuration tool for openbox"; + homepage = "http://openbox.org/wiki/ObConf"; + license = stdenv.lib.licenses.gpl2; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 312959fdb24..8712cce4985 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9391,6 +9391,10 @@ let nvpy = callPackage ../applications/editors/nvpy { }; + obconf = callPackage ../tools/X11/obconf { + inherit (gnome) libglade; + }; + ocrad = callPackage ../applications/graphics/ocrad { }; offrss = callPackage ../applications/networking/offrss { }; -- cgit 1.4.1 From f09f8adc0fe0ff19453ff519f86af91013899a56 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Thu, 21 Aug 2014 00:22:42 -0500 Subject: nixpkgs: stricat 20140609100300 Signed-off-by: Austin Seipp --- pkgs/tools/security/stricat/default.nix | 24 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/tools/security/stricat/default.nix (limited to 'pkgs/tools') diff --git a/pkgs/tools/security/stricat/default.nix b/pkgs/tools/security/stricat/default.nix new file mode 100644 index 00000000000..64ebb4c0ca2 --- /dev/null +++ b/pkgs/tools/security/stricat/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "stricat-${version}"; + version = "20140609100300"; + + src = fetchurl { + url = "http://www.stribob.com/dist/${name}.tgz"; + sha256 = "1axg8r4g5n5kdqj5013pgck80nni3z172xkg506vz4zx1zcmrm4r"; + }; + + installPhase = '' + mkdir -p $out/bin + mv stricat $out/bin + ''; + + meta = { + description = "multi-use cryptographic tool based on the STRIBOB algorithm"; + homepage = "https://www.stribob.com/stricat/"; + license = stdenv.lib.licenses.bsd3; + platforms = stdenv.lib.platforms.unix; + maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f2c8b83ada5..94c4888d7bb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2169,6 +2169,8 @@ let sitecopy = callPackage ../tools/networking/sitecopy { }; + stricat = callPackage ../tools/security/stricat { }; + privoxy = callPackage ../tools/networking/privoxy { }; t1utils = callPackage ../tools/misc/t1utils { }; -- cgit 1.4.1 From a9baea48dfd61f6650a9c72b9b106479329eaddf Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 21 Aug 2014 16:24:45 +0200 Subject: openjade: Use default perl --- pkgs/tools/text/sgml/openjade/default.nix | 2 ++ pkgs/tools/text/sgml/openjade/msggen.patch | 34 ++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +--- 3 files changed, 37 insertions(+), 3 deletions(-) create mode 100644 pkgs/tools/text/sgml/openjade/msggen.patch (limited to 'pkgs/tools') diff --git a/pkgs/tools/text/sgml/openjade/default.nix b/pkgs/tools/text/sgml/openjade/default.nix index a2920345afa..3427f62f15b 100644 --- a/pkgs/tools/text/sgml/openjade/default.nix +++ b/pkgs/tools/text/sgml/openjade/default.nix @@ -8,6 +8,8 @@ stdenv.mkDerivation rec { sha256 = "1l92sfvx1f0wmkbvzv1385y1gb3hh010xksi1iyviyclrjb7jb8x"; }; + patches = [ ./msggen.patch ]; + buildInputs = [ opensp perl ]; configureFlags = [ diff --git a/pkgs/tools/text/sgml/openjade/msggen.patch b/pkgs/tools/text/sgml/openjade/msggen.patch new file mode 100644 index 00000000000..d59573fa49c --- /dev/null +++ b/pkgs/tools/text/sgml/openjade/msggen.patch @@ -0,0 +1,34 @@ +http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/app-text/openjade/files/openjade-1.3.2-msggen.pl.patch?revision=1.2 + +Use Getopt::Std in place of getopts.pl. +https://bugs.gentoo.org/show_bug.cgi?id=420083 + +--- a/msggen.pl ++++ b/msggen.pl +@@ -4,6 +4,7 @@ + # See the file COPYING for copying permission. + + use POSIX; ++use Getopt::Std; + + # Package and version. + $package = 'openjade'; +@@ -18,8 +19,7 @@ + undef $opt_l; + undef $opt_p; + undef $opt_t; +-do 'getopts.pl'; +-&Getopts('l:p:t:'); ++getopts('l:p:t:'); + $module = $opt_l; + $pot_file = $opt_p; + +@@ -72,7 +72,7 @@ + else { + $field[0] =~ /^[IWQXE][0-9]$/ || &error("invalid first field");; + $type[$num] = substr($field[0], 0, 1); +- $argc = int(substr($field[0], 1, 1)); ++ $argc = substr($field[0], 1, 1); + } + $nargs[$num] = $argc; + $field[1] =~ /^[a-zA-Z_][a-zA-Z0-9_]+$/ || &error("invalid tag"); diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d77a615abae..6bcb5a7a9bf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1712,9 +1712,7 @@ let opendylan_bin = callPackage ../development/compilers/opendylan/bin.nix { }; - openjade = callPackage ../tools/text/sgml/openjade { - perl = perl510; - }; + openjade = callPackage ../tools/text/sgml/openjade { }; openobex = callPackage ../tools/bluetooth/openobex { }; -- cgit 1.4.1 From 07e130108513db4aaa24a89ff0a225d758046305 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 21 Aug 2014 18:04:56 +0200 Subject: nixUnstable: Update to 1.8pre3766_809ca33 --- pkgs/tools/package-management/nix/unstable.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs/tools') diff --git a/pkgs/tools/package-management/nix/unstable.nix b/pkgs/tools/package-management/nix/unstable.nix index 731965d9a7c..bba53b0002f 100644 --- a/pkgs/tools/package-management/nix/unstable.nix +++ b/pkgs/tools/package-management/nix/unstable.nix @@ -5,11 +5,11 @@ }: stdenv.mkDerivation rec { - name = "nix-1.8pre3748_02843ba"; + name = "nix-1.8pre3766_809ca33"; src = fetchurl { - url = "http://hydra.nixos.org/build/13483092/download/5/${name}.tar.xz"; - sha256 = "074k5spq07bz6ljbiiwfzsnnnpqlwssigxirkyrcamcyjmig4v34"; + url = "http://hydra.nixos.org/build/13584170/download/5/${name}.tar.xz"; + sha256 = "e6d91e73aabf8e8912f9701bf87b66089c197c5b8c8fbcc1707b888c88b96dfd"; }; nativeBuildInputs = [ perl pkgconfig ]; -- cgit 1.4.1 From ce6b86cc682f0150234a74a644b625e6b6973d83 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 22 Aug 2014 11:57:40 +0200 Subject: Fix various evaluation problems http://hydra.nixos.org/build/13616685 --- pkgs/applications/editors/idea/default.nix | 2 ++ pkgs/applications/ike/default.nix | 2 ++ pkgs/applications/science/logic/verifast/default.nix | 2 ++ pkgs/applications/science/logic/yices/default.nix | 2 ++ pkgs/development/compilers/cryptol/1.8.x.nix | 2 ++ pkgs/os-specific/linux/kernel/generic.nix | 1 + pkgs/servers/http/openresty/default.nix | 4 +++- pkgs/tools/security/hashcat/default.nix | 2 ++ 8 files changed, 16 insertions(+), 1 deletion(-) (limited to 'pkgs/tools') diff --git a/pkgs/applications/editors/idea/default.nix b/pkgs/applications/editors/idea/default.nix index e5cfbcdfe17..7cb99ae80cc 100644 --- a/pkgs/applications/editors/idea/default.nix +++ b/pkgs/applications/editors/idea/default.nix @@ -2,6 +2,8 @@ , coreutils, gnugrep, which, git }: +assert stdenv.isLinux; + let buildIdea = diff --git a/pkgs/applications/ike/default.nix b/pkgs/applications/ike/default.nix index 1414310ebf3..48f277ad4c9 100644 --- a/pkgs/applications/ike/default.nix +++ b/pkgs/applications/ike/default.nix @@ -1,6 +1,8 @@ { stdenv, fetchurl, cmake, openssl, libedit, flex, bison, qt4, makeWrapper , gcc, nettools, iproute, linuxHeaders }: +assert stdenv.isLinux; + # NOTE: use $out/etc/iked.conf as sample configuration and also set: dhcp_file "/etc/iked.dhcp"; # launch with "iked -f /etc/iked.conf" diff --git a/pkgs/applications/science/logic/verifast/default.nix b/pkgs/applications/science/logic/verifast/default.nix index 7ab08cf8799..2685f5e53d0 100644 --- a/pkgs/applications/science/logic/verifast/default.nix +++ b/pkgs/applications/science/logic/verifast/default.nix @@ -1,6 +1,8 @@ { stdenv, fetchurl, gtk, gdk_pixbuf, atk, pango, glib, cairo, freetype , fontconfig, libxml2, gnome2 }: +assert stdenv.isLinux; + let libPath = stdenv.lib.makeLibraryPath [ stdenv.gcc.libc stdenv.gcc.gcc gtk gdk_pixbuf atk pango glib cairo diff --git a/pkgs/applications/science/logic/yices/default.nix b/pkgs/applications/science/logic/yices/default.nix index 5a1a4ef1992..b6b34d96d15 100644 --- a/pkgs/applications/science/logic/yices/default.nix +++ b/pkgs/applications/science/logic/yices/default.nix @@ -1,5 +1,7 @@ { stdenv, fetchurl }: +assert stdenv.isLinux; + let libPath = stdenv.lib.makeLibraryPath [ stdenv.gcc.libc ]; in diff --git a/pkgs/development/compilers/cryptol/1.8.x.nix b/pkgs/development/compilers/cryptol/1.8.x.nix index 4cf00ad3806..17382ed9d56 100644 --- a/pkgs/development/compilers/cryptol/1.8.x.nix +++ b/pkgs/development/compilers/cryptol/1.8.x.nix @@ -1,5 +1,7 @@ { stdenv, requireFile, gmp4, ncurses, zlib, clang_33, makeWrapper }: +assert stdenv.isLinux; + let name = "cryptol-${version}-${rev}"; version = "1.8.27"; diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix index 08611e44856..13250e45494 100644 --- a/pkgs/os-specific/linux/kernel/generic.nix +++ b/pkgs/os-specific/linux/kernel/generic.nix @@ -28,6 +28,7 @@ }: assert stdenv.platform.name == "sheevaplug" -> stdenv.platform.uboot != null; +assert stdenv.isLinux; let diff --git a/pkgs/servers/http/openresty/default.nix b/pkgs/servers/http/openresty/default.nix index e301cc429b9..571cd215356 100644 --- a/pkgs/servers/http/openresty/default.nix +++ b/pkgs/servers/http/openresty/default.nix @@ -1,6 +1,8 @@ { stdenv, fetchurl, fetchgit, openssl, zlib, pcre, libxml2, libxslt, gd, geoip , perl }: +assert stdenv.isLinux; + with stdenv.lib; stdenv.mkDerivation rec { @@ -53,7 +55,7 @@ stdenv.mkDerivation rec { description = "A fast web application server built on Nginx"; homepage = http://openresty.org; license = licenses.bsd2; - platforms = platforms.all; + platforms = platforms.linux; maintainers = with maintainers; [ thoughtpolice ]; }; } diff --git a/pkgs/tools/security/hashcat/default.nix b/pkgs/tools/security/hashcat/default.nix index 5e173724190..699901ad59e 100644 --- a/pkgs/tools/security/hashcat/default.nix +++ b/pkgs/tools/security/hashcat/default.nix @@ -1,5 +1,7 @@ { stdenv, fetchurl, p7zip, patchelf }: +assert stdenv.isLinux; + let bits = if stdenv.system == "x86_64-linux" then "64" else "32"; libPath = stdenv.lib.makeLibraryPath [ stdenv.gcc.libc ]; -- cgit 1.4.1 From d8d7cd7ef222ed69258c84d54b95a4caaf2516f3 Mon Sep 17 00:00:00 2001 From: Patrick Mahoney Date: Fri, 22 Aug 2014 23:40:52 -0500 Subject: execline: new package Execline is a small scripting language, to be used in place of a shell in non-interactive scripts. --- pkgs/tools/misc/execline/default.nix | 54 ++++++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 56 insertions(+) create mode 100644 pkgs/tools/misc/execline/default.nix (limited to 'pkgs/tools') diff --git a/pkgs/tools/misc/execline/default.nix b/pkgs/tools/misc/execline/default.nix new file mode 100644 index 00000000000..ba0784138b3 --- /dev/null +++ b/pkgs/tools/misc/execline/default.nix @@ -0,0 +1,54 @@ +{stdenv, fetchurl, skalibs}: + +let + + version = "1.3.1.1"; + +in stdenv.mkDerivation rec { + + name = "execline-${version}"; + + src = fetchurl { + url = "http://skarnet.org/software/execline/${name}.tar.gz"; + sha256 = "1br3qzif166kbp4k813ljbyq058p7mfsp2lj88n8vi4dmj935nzg"; + }; + + buildInputs = [ skalibs ]; + + sourceRoot = "admin/${name}"; + + configurePhase = '' + pushd conf-compile + + printf "$out/bin" > conf-install-command + printf "$out/include" > conf-install-include + printf "$out/lib" > conf-install-library + printf "$out/lib" > conf-install-library.so + printf "$out/sysdeps" > conf-install-sysdeps + + printf "${skalibs}/sysdeps" > import + printf "${skalibs}/include" > path-include + printf "${skalibs}/lib" > path-library + + # let nix builder strip things, cross-platform + truncate --size 0 conf-stripbins + truncate --size 0 conf-striplibs + + rm -f flag-slashpackage + touch flag-allstatic + + popd + ''; + + preBuild = '' + patchShebangs src/sys + ''; + + meta = { + homepage = http://skarnet.org/software/execline/; + description = "A small scripting language, to be used in place of a shell in non-interactive scripts."; + platforms = stdenv.lib.platforms.all; + license = stdenv.lib.licenses.isc; + }; + +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6b90a705f1c..60a49c10ff4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -987,6 +987,8 @@ let exempi = callPackage ../development/libraries/exempi { }; + execline = callPackage ../tools/misc/execline { }; + exercism = callPackage ../development/tools/exercism { }; exif = callPackage ../tools/graphics/exif { }; -- cgit 1.4.1 From 33879427b7a334f29b0a61ab2bd4a9432f1f460e Mon Sep 17 00:00:00 2001 From: Nathaniel Baxter Date: Sun, 24 Aug 2014 12:36:37 +1000 Subject: maintainers: add myself as a maintainer to obconf and teamspeak_client --- lib/maintainers.nix | 1 + pkgs/applications/networking/instant-messengers/teamspeak/client.nix | 1 + pkgs/tools/X11/obconf/default.nix | 1 + 3 files changed, 3 insertions(+) (limited to 'pkgs/tools') diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 8c975b486f1..b55eb22a720 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -60,6 +60,7 @@ kkallio = "Karn Kallio "; ktosiek = "Tomasz Kontusz "; lethalman = "Luca Bruno "; + lhvwb = "Nathaniel Baxter "; linquize = "Linquize "; lovek323 = "Jason O'Conal "; ludo = "Ludovic Courtès "; diff --git a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix index eb052af1369..d7dc755e9ab 100644 --- a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix +++ b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix @@ -77,6 +77,7 @@ stdenv.mkDerivation rec { description = "The TeamSpeak voice communication tool"; homepage = http://teamspeak.com/; license = "http://www.teamspeak.com/?page=downloads&type=ts3_linux_client_latest"; + maintainers = [ stdenv.lib.maintainers.lhvwb ]; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/X11/obconf/default.nix b/pkgs/tools/X11/obconf/default.nix index 589b684e69b..e1a2e0dd496 100644 --- a/pkgs/tools/X11/obconf/default.nix +++ b/pkgs/tools/X11/obconf/default.nix @@ -22,5 +22,6 @@ stdenv.mkDerivation rec { description = "GUI configuration tool for openbox"; homepage = "http://openbox.org/wiki/ObConf"; license = stdenv.lib.licenses.gpl2; + maintainers = [ stdenv.lib.maintainers.lhvwb ]; }; } -- cgit 1.4.1 From 4da69cb7da731b2728edfa11ee758dff8f459b3e Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Sun, 24 Aug 2014 02:51:04 -0700 Subject: radvd: Upsate 1.8.1 -> 2.5 --- pkgs/tools/networking/radvd/default.nix | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) (limited to 'pkgs/tools') diff --git a/pkgs/tools/networking/radvd/default.nix b/pkgs/tools/networking/radvd/default.nix index 14d0d99119d..e74106ec67f 100644 --- a/pkgs/tools/networking/radvd/default.nix +++ b/pkgs/tools/networking/radvd/default.nix @@ -1,16 +1,20 @@ -{ stdenv, fetchurl, bison, flex }: +{ stdenv, fetchurl, pkgconfig, libdaemon, bison, flex, check }: stdenv.mkDerivation rec { - name = "radvd-1.8.1"; + name = "radvd-2.5"; src = fetchurl { - url = "http://www.litech.org/radvd/dist/${name}.tar.gz"; - sha256 = "1sg3halppbz3vwr88lbcdv7mndzwl4nkqnrafkyf2a248wwz2cbc"; + url = "http://www.litech.org/radvd/dist/${name}.tar.xz"; + sha256 = "0hsa647l236q9rhrwjb44xqmjfz4fxzcixlbf2chk4lzh8lzwjp0"; }; - buildInputs = [ bison flex ]; + buildInputs = [ pkgconfig libdaemon bison flex check ]; - meta.homepage = http://www.litech.org/radvd/; - meta.description = "IPv6 Router Advertisement Daemon"; - meta.platforms = stdenv.lib.platforms.linux; + meta = with stdenv.lib; { + homepage = http://www.litech.org/radvd/; + description = "IPv6 Router Advertisement Daemon"; + platforms = platforms.linux; + license = licenses.bsdOriginal; + maintainers = with maintainers; [ wkennington ]; + }; } -- cgit 1.4.1 From 2d6d43c02cd8f69668e961d7953b7bf1a9f63cf2 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sun, 24 Aug 2014 18:52:34 +0200 Subject: Fix tarball build --- pkgs/applications/networking/browsers/firefox-bin/default.nix | 2 ++ pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix | 2 ++ pkgs/development/compilers/go/1.3.nix | 2 ++ pkgs/development/compilers/rustc/0.11.nix | 2 ++ pkgs/development/compilers/rustc/head.nix | 2 ++ pkgs/development/libraries/glib/default.nix | 2 ++ pkgs/games/adom/default.nix | 2 ++ pkgs/servers/nosql/influxdb/default.nix | 2 ++ pkgs/tools/filesystems/yandex-disk/default.nix | 3 +++ 9 files changed, 19 insertions(+) (limited to 'pkgs/tools') diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix index 969ced923b3..56ba95c661f 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/default.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix @@ -37,6 +37,8 @@ , systemd }: +assert stdenv.isLinux; + let version = "31.0"; sources = [ diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix index 15acd5af8df..6add41edf7c 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix @@ -37,6 +37,8 @@ , pango }: +assert stdenv.isLinux; + let version = "31.0"; sources = [ diff --git a/pkgs/development/compilers/go/1.3.nix b/pkgs/development/compilers/go/1.3.nix index 06decd16190..1dcdd89b5bf 100644 --- a/pkgs/development/compilers/go/1.3.nix +++ b/pkgs/development/compilers/go/1.3.nix @@ -1,5 +1,7 @@ { stdenv, lib, fetchurl, bison, glibc, bash, coreutils, makeWrapper, tzdata, iana_etc }: +assert stdenv.gcc.gcc != null; + let loader386 = "${glibc}/lib/ld-linux.so.2"; loaderAmd64 = "${glibc}/lib/ld-linux-x86-64.so.2"; diff --git a/pkgs/development/compilers/rustc/0.11.nix b/pkgs/development/compilers/rustc/0.11.nix index 1c3b09b0985..a7246e44a73 100644 --- a/pkgs/development/compilers/rustc/0.11.nix +++ b/pkgs/development/compilers/rustc/0.11.nix @@ -1,5 +1,7 @@ {stdenv, fetchurl, which, file, perl, curl, python27, makeWrapper}: +assert stdenv.gcc.gcc != null; + /* Rust's build process has a few quirks : - It requires some patched in llvm that haven't landed upstream, so it diff --git a/pkgs/development/compilers/rustc/head.nix b/pkgs/development/compilers/rustc/head.nix index ad33906ae6e..4f512096a42 100644 --- a/pkgs/development/compilers/rustc/head.nix +++ b/pkgs/development/compilers/rustc/head.nix @@ -1,5 +1,7 @@ {stdenv, fetchurl, fetchgit, which, file, perl, curl, python27, makeWrapper}: +assert stdenv.gcc.gcc != null; + /* Rust's build process has a few quirks : - It requires some patched in llvm that haven't landed upstream, so it diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index f4157cdd8d0..4f7c6042f13 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -7,6 +7,8 @@ with stdenv.lib; +assert stdenv.gcc.gcc != null; + # TODO: # * Add gio-module-fam # Problem: cyclic dependency on gamin diff --git a/pkgs/games/adom/default.nix b/pkgs/games/adom/default.nix index e83f50df1b7..ef5aba96d09 100644 --- a/pkgs/games/adom/default.nix +++ b/pkgs/games/adom/default.nix @@ -1,6 +1,8 @@ { stdenv, patchelf, zlib, libmad, libpng12, libcaca, mesa, alsaLib, pulseaudio , xlibs, plowshare }: +assert stdenv.isLinux; + let inherit (xlibs) libXext libX11; diff --git a/pkgs/servers/nosql/influxdb/default.nix b/pkgs/servers/nosql/influxdb/default.nix index 77852b6d2ed..6c6fb213cb8 100644 --- a/pkgs/servers/nosql/influxdb/default.nix +++ b/pkgs/servers/nosql/influxdb/default.nix @@ -1,5 +1,7 @@ { stdenv, fetchurl, makeWrapper }: +assert stdenv.isLinux; + stdenv.mkDerivation rec { name = "influxdb-${version}"; version = "0.7.0"; diff --git a/pkgs/tools/filesystems/yandex-disk/default.nix b/pkgs/tools/filesystems/yandex-disk/default.nix index 24dbae08fab..c9078a0cb8b 100644 --- a/pkgs/tools/filesystems/yandex-disk/default.nix +++ b/pkgs/tools/filesystems/yandex-disk/default.nix @@ -1,4 +1,7 @@ { stdenv, fetchurl, writeText, zlib, rpm, cpio, patchelf, which }: + +assert stdenv.isLinux; + let p = if stdenv.is64bit then { arch = "x86_64"; -- cgit 1.4.1 From c9baba9212feb6e39151118647d45b34b029a6df Mon Sep 17 00:00:00 2001 From: Bjørn Forsman Date: Sun, 24 Aug 2014 16:21:08 +0200 Subject: Fix many package descriptions (My OCD kicked in today...) Remove repeated package names, capitalize first word, remove trailing periods and move overlong descriptions to longDescription. I also simplified some descriptions as well, when they were particularly long or technical, often based on Arch Linux' package descriptions. I've tried to stay away from generated expressions (and I think I succeeded). Some specifics worth mentioning: * cron, has "Vixie Cron" in its description. The "Vixie" part is not mentioned anywhere else. I kept it in a parenthesis at the end of the description. * ctags description started with "Exuberant Ctags ...", and the "exuberant" part is not mentioned elsewhere. Kept it in a parenthesis at the end of description. * nix has the description "The Nix Deployment System". Since that doesn't really say much what it is/does (especially after removing the package name!), I changed that to "Powerful package manager that makes package management reliable and reproducible" (borrowed from nixos.org). * Tons of "GNU Foo, Foo is a [the important bits]" descriptions is changed to just [the important bits]. If the package name doesn't contain GNU I don't think it's needed to say it in the description either. --- pkgs/applications/audio/beast/default.nix | 2 +- pkgs/applications/audio/cmus/default.nix | 2 +- pkgs/applications/audio/moc/default.nix | 2 +- pkgs/applications/audio/mp3info/default.nix | 2 +- pkgs/applications/audio/mpc123/default.nix | 2 +- pkgs/applications/audio/mpg321/default.nix | 2 +- pkgs/applications/audio/pamixer/default.nix | 2 +- pkgs/applications/audio/spotify/default.nix | 2 +- pkgs/applications/editors/ed/default.nix | 2 +- pkgs/applications/editors/mg/default.nix | 2 +- pkgs/applications/editors/texmacs/default.nix | 2 +- pkgs/applications/graphics/geeqie/default.nix | 2 +- pkgs/applications/graphics/grafx2/default.nix | 2 +- pkgs/applications/graphics/jbrout/default.nix | 2 +- pkgs/applications/graphics/ocrad/default.nix | 2 +- pkgs/applications/graphics/qiv/default.nix | 2 +- pkgs/applications/graphics/ufraw/default.nix | 2 +- pkgs/applications/graphics/viewnior/default.nix | 2 +- pkgs/applications/graphics/xaos/default.nix | 2 +- pkgs/applications/misc/bitcoin/default.nix | 2 +- pkgs/applications/misc/camlistore/default.nix | 2 +- pkgs/applications/misc/gpsbabel/default.nix | 2 +- pkgs/applications/misc/gv/default.nix | 2 +- pkgs/applications/misc/posterazor/default.nix | 2 +- pkgs/applications/misc/stardict/stardict.nix | 3 +-- pkgs/applications/misc/tangogps/default.nix | 2 +- pkgs/applications/misc/viking/default.nix | 2 +- pkgs/applications/misc/wordnet/default.nix | 2 +- pkgs/applications/misc/xfe/default.nix | 2 +- pkgs/applications/networking/browsers/firefox/default.nix | 2 +- pkgs/applications/networking/browsers/opera/default.nix | 2 +- pkgs/applications/networking/ids/snort/default.nix | 2 +- .../networking/instant-messengers/bitlbee/default.nix | 2 +- .../applications/networking/instant-messengers/carrier/2.5.0.nix | 2 +- .../applications/networking/instant-messengers/ekiga/default.nix | 2 +- pkgs/applications/networking/instant-messengers/fuze/default.nix | 2 +- .../networking/instant-messengers/hipchat/default.nix | 2 +- .../networking/instant-messengers/pidgin/default.nix | 2 +- pkgs/applications/networking/jmeter/default.nix | 2 +- pkgs/applications/networking/mailreaders/notmuch/default.nix | 3 +-- pkgs/applications/networking/newsreaders/slrn/default.nix | 2 +- pkgs/applications/networking/p2p/gnunet/default.nix | 2 +- pkgs/applications/networking/remote/rdesktop/default.nix | 2 +- pkgs/applications/networking/remote/remmina/default.nix | 2 +- pkgs/applications/networking/syncthing/default.nix | 2 +- pkgs/applications/office/gnucash/default.nix | 2 +- pkgs/applications/office/libreoffice/default.nix | 2 +- pkgs/applications/science/astronomy/gravit/default.nix | 2 +- pkgs/applications/science/biology/emboss/default.nix | 2 +- pkgs/applications/science/logic/alt-ergo/default.nix | 2 +- pkgs/applications/science/logic/coq/default.nix | 2 +- pkgs/applications/science/logic/matita/default.nix | 2 +- pkgs/applications/science/logic/prooftree/default.nix | 2 +- pkgs/applications/science/logic/twelf/default.nix | 2 +- pkgs/applications/science/math/fricas/default.nix | 2 +- pkgs/applications/science/math/glsurf/default.nix | 2 +- pkgs/applications/science/math/jags/default.nix | 2 +- pkgs/applications/science/math/maxima/default.nix | 2 +- pkgs/applications/science/misc/fityk/default.nix | 2 +- pkgs/applications/science/misc/simgrid/default.nix | 2 +- pkgs/applications/science/molecular-dynamics/gromacs/default.nix | 2 +- pkgs/applications/science/spyder/default.nix | 2 +- .../version-management/git-and-tools/git/default.nix | 2 +- pkgs/applications/version-management/rcs/default.nix | 2 +- pkgs/applications/video/gnash/default.nix | 2 +- pkgs/applications/video/kino/default.nix | 2 +- pkgs/applications/video/xbmc/default.nix | 2 +- pkgs/applications/window-managers/ratpoison/default.nix | 2 +- pkgs/desktops/e17/enlightenment/default.nix | 2 +- pkgs/development/compilers/bigloo/default.nix | 2 +- pkgs/development/compilers/gambit/default.nix | 2 +- pkgs/development/compilers/hugs/default.nix | 2 +- pkgs/development/compilers/ikarus/default.nix | 2 +- pkgs/development/compilers/mercury/default.nix | 2 +- pkgs/development/compilers/ocaml/3.10.0.nix | 2 +- pkgs/development/compilers/ocaml/3.11.2.nix | 2 +- pkgs/development/compilers/ocaml/3.12.1.nix | 2 +- pkgs/development/compilers/ocaml/4.00.1.nix | 2 +- pkgs/development/compilers/ocaml/4.01.0.nix | 2 +- pkgs/development/compilers/ocaml/ber-metaocaml-003.nix | 2 +- pkgs/development/compilers/qi/default.nix | 2 +- pkgs/development/compilers/rdmd/default.nix | 2 +- pkgs/development/compilers/scala/default.nix | 2 +- pkgs/development/compilers/tinycc/default.nix | 2 +- pkgs/development/interpreters/guile/default.nix | 2 +- pkgs/development/interpreters/maude/default.nix | 2 +- pkgs/development/interpreters/php/5.3.nix | 2 +- pkgs/development/interpreters/php/5.4.nix | 2 +- pkgs/development/interpreters/pypy/2.3/default.nix | 2 +- pkgs/development/libraries/boost/1.44.nix | 2 +- pkgs/development/libraries/boost/1.49.nix | 2 +- pkgs/development/libraries/boost/1.55.nix | 2 +- pkgs/development/libraries/ccrtp/default.nix | 2 +- pkgs/development/libraries/celt/default.nix | 2 +- pkgs/development/libraries/cfitsio/default.nix | 2 +- pkgs/development/libraries/check/default.nix | 2 +- pkgs/development/libraries/chipmunk/default.nix | 2 +- pkgs/development/libraries/cloog/default.nix | 2 +- pkgs/development/libraries/clutter-gst/default.nix | 2 +- pkgs/development/libraries/clutter/default.nix | 2 +- pkgs/development/libraries/fox/default.nix | 2 +- pkgs/development/libraries/gettext/default.nix | 2 +- pkgs/development/libraries/glib/default.nix | 2 +- pkgs/development/libraries/glog/default.nix | 2 +- pkgs/development/libraries/gmp/4.3.2.nix | 2 +- pkgs/development/libraries/gmp/5.0.5.nix | 2 +- pkgs/development/libraries/gmp/5.1.x.nix | 2 +- pkgs/development/libraries/gss/default.nix | 2 +- pkgs/development/libraries/gstreamer/legacy/gnonlin/default.nix | 2 +- .../development/libraries/gstreamer/legacy/gstreamer/default.nix | 2 +- pkgs/development/libraries/gtkimageview/default.nix | 2 +- pkgs/development/libraries/gtkmathview/default.nix | 2 +- pkgs/development/libraries/gupnp/default.nix | 2 +- pkgs/development/libraries/hwloc/default.nix | 2 +- pkgs/development/libraries/jasper/default.nix | 2 +- pkgs/development/libraries/java/classpath/default.nix | 2 +- pkgs/development/libraries/java/rhino/default.nix | 2 +- pkgs/development/libraries/libassuan/default.nix | 2 +- pkgs/development/libraries/libcddb/default.nix | 2 +- pkgs/development/libraries/libchamplain/default.nix | 2 +- pkgs/development/libraries/libchop/default.nix | 2 +- pkgs/development/libraries/libdaemon/default.nix | 2 +- pkgs/development/libraries/libdnet/default.nix | 2 +- pkgs/development/libraries/libelf/default.nix | 2 +- pkgs/development/libraries/libevent/default.nix | 2 +- pkgs/development/libraries/libextractor/default.nix | 2 +- pkgs/development/libraries/libgcrypt/default.nix | 2 +- pkgs/development/libraries/libiconv/default.nix | 2 +- pkgs/development/libraries/libidn/default.nix | 2 +- pkgs/development/libraries/libksba/default.nix | 2 +- pkgs/development/libraries/libmicrohttpd/default.nix | 2 +- pkgs/development/libraries/libofa/default.nix | 2 +- pkgs/development/libraries/libsigsegv/default.nix | 2 +- pkgs/development/libraries/libspectre/default.nix | 2 +- pkgs/development/libraries/libtasn1/default.nix | 2 +- pkgs/development/libraries/libunistring/default.nix | 2 +- pkgs/development/libraries/libxmi/default.nix | 2 +- pkgs/development/libraries/lightning/default.nix | 2 +- pkgs/development/libraries/ming/default.nix | 2 +- pkgs/development/libraries/mpc/default.nix | 2 +- pkgs/development/libraries/mpfr/default.nix | 2 +- pkgs/development/libraries/mpich2/default.nix | 2 +- pkgs/development/libraries/ncurses/default.nix | 2 +- pkgs/development/libraries/nettle/default.nix | 2 +- pkgs/development/libraries/oniguruma/default.nix | 2 +- pkgs/development/libraries/opal/default.nix | 2 +- pkgs/development/libraries/openal/default.nix | 2 +- pkgs/development/libraries/plib/default.nix | 2 +- pkgs/development/libraries/ppl/default.nix | 2 +- pkgs/development/libraries/readline/readline6.3.nix | 2 +- pkgs/development/libraries/readline/readline6.nix | 2 +- pkgs/development/libraries/science/biology/biolib/default.nix | 2 +- pkgs/development/libraries/szip/default.nix | 4 +--- pkgs/development/libraries/talloc/default.nix | 2 +- pkgs/development/libraries/tdb/default.nix | 2 +- pkgs/development/libraries/tecla/default.nix | 2 +- pkgs/development/libraries/ucommon/default.nix | 2 +- pkgs/development/libraries/v8/default.nix | 2 +- pkgs/development/libraries/xapian/default.nix | 2 +- pkgs/development/libraries/xbase/default.nix | 2 +- pkgs/development/libraries/xylib/default.nix | 2 +- pkgs/development/python-modules/ecdsa/default.nix | 4 ++-- pkgs/development/python-modules/numeric/default.nix | 4 ++-- pkgs/development/tools/analysis/lcov/default.nix | 2 +- pkgs/development/tools/analysis/sparse/default.nix | 2 +- pkgs/development/tools/analysis/valgrind/default.nix | 2 +- pkgs/development/tools/build-managers/gradle/default.nix | 2 +- pkgs/development/tools/documentation/doxygen/default.nix | 2 +- pkgs/development/tools/java/fastjar/default.nix | 2 +- pkgs/development/tools/misc/binutils/default.nix | 2 +- pkgs/development/tools/misc/cflow/default.nix | 2 +- pkgs/development/tools/misc/coccinelle/default.nix | 2 +- pkgs/development/tools/misc/complexity/default.nix | 2 +- pkgs/development/tools/misc/cppi/default.nix | 2 +- pkgs/development/tools/misc/cscope/default.nix | 2 +- pkgs/development/tools/misc/ctags/default.nix | 2 +- pkgs/development/tools/misc/gdb/default.nix | 2 +- pkgs/development/tools/misc/gengetopt/default.nix | 2 +- pkgs/development/tools/misc/global/default.nix | 2 +- pkgs/development/tools/misc/gperf/default.nix | 2 +- pkgs/development/tools/misc/help2man/default.nix | 2 +- pkgs/development/tools/misc/libtool/default.nix | 2 +- pkgs/development/tools/misc/sloccount/default.nix | 2 +- pkgs/development/tools/misc/swig/default.nix | 2 +- pkgs/development/tools/misc/texinfo/4.13a.nix | 2 +- pkgs/development/tools/misc/texinfo/5.2.nix | 2 +- pkgs/development/tools/ocaml/omake/default.nix | 2 +- pkgs/development/tools/parsing/bison/2.x.nix | 2 +- pkgs/development/tools/parsing/bison/3.x.nix | 2 +- pkgs/development/tools/profiling/oprofile/default.nix | 2 +- pkgs/development/tools/profiling/sysprof/default.nix | 2 +- pkgs/development/tools/sqsh/default.nix | 2 +- pkgs/games/banner/default.nix | 2 +- pkgs/games/chessdb/default.nix | 2 +- pkgs/games/construo/default.nix | 2 +- pkgs/games/crafty/default.nix | 2 +- pkgs/games/eboard/default.nix | 2 +- pkgs/games/openspades/default.nix | 2 +- pkgs/games/openttd/default.nix | 2 +- pkgs/games/opentyrian/default.nix | 2 +- pkgs/games/teeworlds/default.nix | 2 +- pkgs/misc/ghostscript/default.nix | 4 ++-- pkgs/misc/xosd/default.nix | 2 +- pkgs/os-specific/linux/conky/default.nix | 2 +- pkgs/servers/dico/default.nix | 2 +- pkgs/servers/dns/bind/default.nix | 2 +- pkgs/servers/felix/default.nix | 2 +- pkgs/servers/firebird/default.nix | 2 +- pkgs/servers/http/couchdb/default.nix | 2 +- pkgs/servers/http/jboss/default.nix | 2 +- pkgs/servers/pies/default.nix | 2 +- pkgs/servers/pulseaudio/default.nix | 2 +- pkgs/servers/shishi/default.nix | 2 +- pkgs/shells/rush/default.nix | 2 +- pkgs/tools/X11/hsetroot/default.nix | 2 +- pkgs/tools/X11/wmctrl/default.nix | 2 +- pkgs/tools/X11/xnee/default.nix | 2 +- pkgs/tools/X11/xtrace/default.nix | 2 +- pkgs/tools/admin/tightvnc/default.nix | 2 +- pkgs/tools/archivers/sharutils/default.nix | 2 +- pkgs/tools/backup/partclone/default.nix | 8 +++++++- pkgs/tools/cd-dvd/xorriso/default.nix | 2 +- pkgs/tools/compression/gzip/default.nix | 2 +- pkgs/tools/compression/rzip/default.nix | 2 +- pkgs/tools/filesystems/chunkfs/default.nix | 2 +- pkgs/tools/filesystems/encfs/default.nix | 2 +- pkgs/tools/filesystems/mtools/default.nix | 2 +- pkgs/tools/filesystems/svnfs/default.nix | 2 +- pkgs/tools/filesystems/wdfs/default.nix | 2 +- pkgs/tools/graphics/cuneiform/default.nix | 2 +- pkgs/tools/graphics/plotutils/default.nix | 2 +- pkgs/tools/misc/goaccess/default.nix | 2 +- pkgs/tools/misc/idutils/default.nix | 2 +- pkgs/tools/misc/lbdb/default.nix | 2 +- pkgs/tools/misc/ldapvi/default.nix | 6 +++++- pkgs/tools/misc/minicom/default.nix | 2 +- pkgs/tools/misc/most/default.nix | 3 ++- pkgs/tools/misc/parallel/default.nix | 2 +- pkgs/tools/misc/parted/default.nix | 2 +- pkgs/tools/misc/pg_top/default.nix | 2 +- pkgs/tools/misc/recutils/default.nix | 2 +- pkgs/tools/misc/time/default.nix | 2 +- pkgs/tools/misc/tmpwatch/default.nix | 2 +- pkgs/tools/misc/tmux/default.nix | 2 +- pkgs/tools/misc/yad/default.nix | 2 +- pkgs/tools/networking/cntlm/default.nix | 2 +- pkgs/tools/networking/connman/default.nix | 2 +- pkgs/tools/networking/flvstreamer/default.nix | 2 +- pkgs/tools/networking/host/default.nix | 2 +- pkgs/tools/networking/inetutils/default.nix | 2 +- pkgs/tools/networking/jnettop/default.nix | 2 +- pkgs/tools/networking/lsh/default.nix | 2 +- pkgs/tools/networking/mailutils/default.nix | 2 +- pkgs/tools/networking/minidlna/default.nix | 2 +- pkgs/tools/networking/tcpdump/default.nix | 2 +- pkgs/tools/networking/wget/default.nix | 2 +- pkgs/tools/package-management/nix/default.nix | 9 ++++++++- pkgs/tools/security/scrypt/default.nix | 2 +- pkgs/tools/security/steghide/default.nix | 2 +- pkgs/tools/security/tboot/default.nix | 4 +--- pkgs/tools/security/tor/default.nix | 2 +- pkgs/tools/security/tpm-tools/default.nix | 9 ++++++--- pkgs/tools/security/trousers/default.nix | 2 +- pkgs/tools/system/cron/default.nix | 2 +- pkgs/tools/system/freeipmi/default.nix | 2 +- pkgs/tools/system/hardlink/default.nix | 2 +- pkgs/tools/system/mcron/default.nix | 2 +- pkgs/tools/text/enscript/default.nix | 2 +- pkgs/tools/text/mpage/default.nix | 2 +- pkgs/tools/text/namazu/default.nix | 2 +- pkgs/tools/text/wdiff/default.nix | 2 +- pkgs/tools/typesetting/lout/default.nix | 2 +- pkgs/tools/typesetting/rubber/default.nix | 2 +- pkgs/tools/typesetting/xmlto/default.nix | 2 +- pkgs/tools/video/dvgrab/default.nix | 2 +- 275 files changed, 301 insertions(+), 286 deletions(-) (limited to 'pkgs/tools') diff --git a/pkgs/applications/audio/beast/default.nix b/pkgs/applications/audio/beast/default.nix index 61b11c05de7..340a83e7963 100644 --- a/pkgs/applications/audio/beast/default.nix +++ b/pkgs/applications/audio/beast/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation { ]; meta = { - description = "BEAST - the Bedevilled Sound Engine"; + description = "A music composition and modular synthesis application"; homepage = http://beast.gtk.org; license = ["GPL-2" "LGPL-2.1"]; }; diff --git a/pkgs/applications/audio/cmus/default.nix b/pkgs/applications/audio/cmus/default.nix index 2ea37e2bd23..4f9c491a3a5 100644 --- a/pkgs/applications/audio/cmus/default.nix +++ b/pkgs/applications/audio/cmus/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ ncurses pkgconfig alsaLib flac libmad ffmpeg libvorbis mpc mp4v2 ]; meta = { - description = "cmus is a small, fast and powerful console music player for Linux and *BSD"; + description = "Small, fast and powerful console music player for Linux and *BSD"; homepage = http://cmus.sourceforge.net; license = stdenv.lib.licenses.gpl2; }; diff --git a/pkgs/applications/audio/moc/default.nix b/pkgs/applications/audio/moc/default.nix index e5264f5c3d2..5c6a1d6ac54 100644 --- a/pkgs/applications/audio/moc/default.nix +++ b/pkgs/applications/audio/moc/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ]; meta = { - description = "MOC (music on console) is a console audio player for LINUX/UNIX designed to be powerful and easy to use."; + description = "An ncurses console audio player designed to be powerful and easy to use"; homepage = http://moc.daper.net/; license = stdenv.lib.licenses.gpl2; }; diff --git a/pkgs/applications/audio/mp3info/default.nix b/pkgs/applications/audio/mp3info/default.nix index 0f33726eaee..ede31ac9beb 100644 --- a/pkgs/applications/audio/mp3info/default.nix +++ b/pkgs/applications/audio/mp3info/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "MP3Info, an MP3 technical info viewer and ID3 1.x tag editor"; + description = "MP3 technical info viewer and ID3 1.x tag editor"; longDescription = '' MP3Info is a little utility used to read and modify the ID3 tags of diff --git a/pkgs/applications/audio/mpc123/default.nix b/pkgs/applications/audio/mpc123/default.nix index cd4343b1beb..ac945bee7f7 100644 --- a/pkgs/applications/audio/mpc123/default.nix +++ b/pkgs/applications/audio/mpc123/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://mpc123.sourceforge.net/; - description = "mpc123, a Musepack (.mpc) audio player"; + description = "A Musepack (.mpc) audio player"; license = stdenv.lib.licenses.gpl2Plus; diff --git a/pkgs/applications/audio/mpg321/default.nix b/pkgs/applications/audio/mpg321/default.nix index e58397350cb..939c9f79e4d 100644 --- a/pkgs/applications/audio/mpg321/default.nix +++ b/pkgs/applications/audio/mpg321/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [libao libid3tag libmad zlib]; meta = { - description = "mpg321, a command-line MP3 player"; + description = "Command-line MP3 player"; homepage = http://mpg321.sourceforge.net/; license = stdenv.lib.licenses.gpl2; maintainers = [ ]; diff --git a/pkgs/applications/audio/pamixer/default.nix b/pkgs/applications/audio/pamixer/default.nix index acdda1799d0..d273c238177 100644 --- a/pkgs/applications/audio/pamixer/default.nix +++ b/pkgs/applications/audio/pamixer/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "pamixer is like amixer but for pulseaudio."; + description = "Like amixer but for pulseaudio"; longDescription = "Features: - Get the current volume of the default sink, the default source or a selected one by his id - Set the volume for the default sink, the default source or any other device diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix index 59b82d155da..47919a7d7f8 100644 --- a/pkgs/applications/audio/spotify/default.nix +++ b/pkgs/applications/audio/spotify/default.nix @@ -148,7 +148,7 @@ stdenv.mkDerivation { meta = { homepage = https://www.spotify.com/; - description = "Spotify for Linux allows you to play music from the Spotify music service"; + description = "Play music from the Spotify music service"; license = stdenv.lib.licenses.unfree; maintainers = [ stdenv.lib.maintainers.eelco ]; }; diff --git a/pkgs/applications/editors/ed/default.nix b/pkgs/applications/editors/ed/default.nix index d3e9a4c4679..0c764fcf8f8 100644 --- a/pkgs/applications/editors/ed/default.nix +++ b/pkgs/applications/editors/ed/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { }; meta = { - description = "GNU ed, an implementation of the standard Unix editor"; + description = "An implementation of the standard Unix editor"; longDescription = '' GNU ed is a line-oriented text editor. It is used to create, diff --git a/pkgs/applications/editors/mg/default.nix b/pkgs/applications/editors/mg/default.nix index 058a54c45a7..6901aed774b 100644 --- a/pkgs/applications/editors/mg/default.nix +++ b/pkgs/applications/editors/mg/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://homepage.boetes.org/software/mg/; - description = "mg is Micro GNU/emacs, this is a portable version of the mg maintained by the OpenBSD team"; + description = "Micro GNU/emacs, a portable version of the mg maintained by the OpenBSD team"; license = "public domain"; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/applications/editors/texmacs/default.nix b/pkgs/applications/editors/texmacs/default.nix index ce863312251..a258b634105 100644 --- a/pkgs/applications/editors/texmacs/default.nix +++ b/pkgs/applications/editors/texmacs/default.nix @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { "${xmodmap}/bin:${which}/bin"; meta = { - description = "GNU TeXmacs, a free WYSIWYW editing platform with special features for scientists"; + description = "WYSIWYW editing platform with special features for scientists"; longDescription = '' GNU TeXmacs is a free wysiwyw (what you see is what you want) editing platform with special features for scientists. The software diff --git a/pkgs/applications/graphics/geeqie/default.nix b/pkgs/applications/graphics/geeqie/default.nix index b170b784aaa..de906e3d844 100644 --- a/pkgs/applications/graphics/geeqie/default.nix +++ b/pkgs/applications/graphics/geeqie/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "Geeqie, a lightweight GTK+ based image viewer"; + description = "Lightweight GTK+ based image viewer"; longDescription = '' diff --git a/pkgs/applications/graphics/grafx2/default.nix b/pkgs/applications/graphics/grafx2/default.nix index 6b7c9a27694..ee9df683c0a 100644 --- a/pkgs/applications/graphics/grafx2/default.nix +++ b/pkgs/applications/graphics/grafx2/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { installPhase = ''make install prefix="$out"''; meta = { - description = "GrafX2 is a bitmap paint program inspired by the Amiga programs Deluxe Paint and Brilliance."; + description = "Bitmap paint program inspired by the Amiga programs Deluxe Paint and Brilliance"; homepage = http://code.google.co/p/grafx2/; license = stdenv.lib.licenses.gpl2; platforms = [ "x86_64-linux" "i686-linux" ]; diff --git a/pkgs/applications/graphics/jbrout/default.nix b/pkgs/applications/graphics/jbrout/default.nix index 2207e8884f0..496078ffdb2 100644 --- a/pkgs/applications/graphics/jbrout/default.nix +++ b/pkgs/applications/graphics/jbrout/default.nix @@ -33,7 +33,7 @@ buildPythonPackage { buildInputs = [ python pyGtkGlade makeWrapper pyexiv2 lxml pil fbida which ]; meta = { homepage = "http://code.google.com/p/jbrout"; - description = "jBrout is a photo manager"; + description = "Photo manager"; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/graphics/ocrad/default.nix b/pkgs/applications/graphics/ocrad/default.nix index 4c20a41061a..201b59ad5e1 100644 --- a/pkgs/applications/graphics/ocrad/default.nix +++ b/pkgs/applications/graphics/ocrad/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = { - description = "GNU Ocrad, optical character recognition (OCR) program & library"; + description = "Optical character recognition (OCR) program & library"; longDescription = '' GNU Ocrad is an OCR (Optical Character Recognition) program based on diff --git a/pkgs/applications/graphics/qiv/default.nix b/pkgs/applications/graphics/qiv/default.nix index 86891f2cb93..01b0a1414a7 100644 --- a/pkgs/applications/graphics/qiv/default.nix +++ b/pkgs/applications/graphics/qiv/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation (rec { ''; meta = { - description = "qiv (quick image viewer)"; + description = "Quick image viewer"; homepage = http://spiegl.de/qiv/; inherit version; }; diff --git a/pkgs/applications/graphics/ufraw/default.nix b/pkgs/applications/graphics/ufraw/default.nix index 783832abd00..dbfda4e5819 100644 --- a/pkgs/applications/graphics/ufraw/default.nix +++ b/pkgs/applications/graphics/ufraw/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://ufraw.sourceforge.net/; - description = "UFRaw, a utility to read and manipulate raw images from digital cameras"; + description = "Utility to read and manipulate raw images from digital cameras"; longDescription = '' The Unidentified Flying Raw (UFRaw) is a utility to read and diff --git a/pkgs/applications/graphics/viewnior/default.nix b/pkgs/applications/graphics/viewnior/default.nix index dd8e01298ff..478553d2c00 100644 --- a/pkgs/applications/graphics/viewnior/default.nix +++ b/pkgs/applications/graphics/viewnior/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "Viewnior is a fast and simple image viewer for GNU/Linux"; + description = "Fast and simple image viewer"; longDescription = '' Viewnior is insipred by big projects like Eye of Gnome, because of it's usability and richness,and by GPicView, because of it's lightweight design and diff --git a/pkgs/applications/graphics/xaos/default.nix b/pkgs/applications/graphics/xaos/default.nix index 8387b3486d4..cacefc9bcc1 100644 --- a/pkgs/applications/graphics/xaos/default.nix +++ b/pkgs/applications/graphics/xaos/default.nix @@ -28,7 +28,7 @@ rec { name = "xaos-" + version; meta = { homepage = http://xaos.sourceforge.net/; - description = "XaoS - fractal viewer"; + description = "Fractal viewer"; license = a.stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/applications/misc/bitcoin/default.nix b/pkgs/applications/misc/bitcoin/default.nix index e38d427be8d..d7c1fbc487b 100644 --- a/pkgs/applications/misc/bitcoin/default.nix +++ b/pkgs/applications/misc/bitcoin/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = { - description = "Bitcoin is a peer-to-peer currency"; + description = "Peer-to-peer electronic cash system"; longDescription= '' Bitcoin is a free open source peer-to-peer electronic cash system that is completely decentralized, without the need for a central server or trusted diff --git a/pkgs/applications/misc/camlistore/default.nix b/pkgs/applications/misc/camlistore/default.nix index 56131425ab4..9adac335c0c 100644 --- a/pkgs/applications/misc/camlistore/default.nix +++ b/pkgs/applications/misc/camlistore/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "Camlistore is a way of storing, syncing, sharing, modelling and backing up content"; + description = "A way of storing, syncing, sharing, modelling and backing up content"; homepage = https://camlistore.org; license = licenses.asl20; maintainers = with maintainers; [ cstrahan ]; diff --git a/pkgs/applications/misc/gpsbabel/default.nix b/pkgs/applications/misc/gpsbabel/default.nix index bf44f91056d..5d4c2634952 100644 --- a/pkgs/applications/misc/gpsbabel/default.nix +++ b/pkgs/applications/misc/gpsbabel/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation { doCheck = true; meta = { - description = "GPSBabel, a tool to convert, upload and download data from GPS and Map programs"; + description = "Convert, upload and download data from GPS and Map programs"; longDescription = '' GPSBabel converts waypoints, tracks, and routes between popular diff --git a/pkgs/applications/misc/gv/default.nix b/pkgs/applications/misc/gv/default.nix index 4867bef1f71..3fad634b18b 100644 --- a/pkgs/applications/misc/gv/default.nix +++ b/pkgs/applications/misc/gv/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { meta = { homepage = http://www.gnu.org/software/gv/; - description = "GNU gv, a PostScript/PDF document viewer"; + description = "PostScript/PDF document viewer"; longDescription = '' GNU gv allows users to view and navigate through PostScript and diff --git a/pkgs/applications/misc/posterazor/default.nix b/pkgs/applications/misc/posterazor/default.nix index 0cad2fbd2cd..38fac21322c 100644 --- a/pkgs/applications/misc/posterazor/default.nix +++ b/pkgs/applications/misc/posterazor/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://posterazor.sourceforge.net/"; - description = "The PosteRazor cuts a raster image into pieces which can afterwards be printed out and assembled to a poster"; + description = "Cuts a raster image into pieces which can afterwards be printed out and assembled to a poster"; maintainers = [ stdenv.lib.maintainers.madjar ]; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/applications/misc/stardict/stardict.nix b/pkgs/applications/misc/stardict/stardict.nix index 1ca8ec045d6..d4c41edde30 100644 --- a/pkgs/applications/misc/stardict/stardict.nix +++ b/pkgs/applications/misc/stardict/stardict.nix @@ -37,8 +37,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "stardict"; - homepage = "A international dictionary supporting fuzzy and glob style matching"; + description = "An international dictionary supporting fuzzy and glob style matching"; license = stdenv.lib.licenses.lgpl3; maintainers = with stdenv.lib.maintainers; [qknight]; }; diff --git a/pkgs/applications/misc/tangogps/default.nix b/pkgs/applications/misc/tangogps/default.nix index aa1df2c9d1a..0a2c1c88c23 100644 --- a/pkgs/applications/misc/tangogps/default.nix +++ b/pkgs/applications/misc/tangogps/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "tangoGPS, a user friendly map and GPS user interface"; + description = "User friendly map and GPS user interface"; longDescription = '' tangoGPS is an easy to use, fast and lightweight mapping diff --git a/pkgs/applications/misc/viking/default.nix b/pkgs/applications/misc/viking/default.nix index 6508b12e1de..9afabe0372d 100644 --- a/pkgs/applications/misc/viking/default.nix +++ b/pkgs/applications/misc/viking/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation { doCheck = true; meta = { - description = "Viking, a GPS data editor and analyzer"; + description = "GPS data editor and analyzer"; longDescription = '' Viking is a free/open source program to manage GPS data. You diff --git a/pkgs/applications/misc/wordnet/default.nix b/pkgs/applications/misc/wordnet/default.nix index 7594014d769..6ead69db220 100644 --- a/pkgs/applications/misc/wordnet/default.nix +++ b/pkgs/applications/misc/wordnet/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { ''; meta = { - description = "WordNet, a lexical database for the English language"; + description = "Lexical database for the English language"; longDescription = '' WordNet® is a large lexical database of English. Nouns, verbs, diff --git a/pkgs/applications/misc/xfe/default.nix b/pkgs/applications/misc/xfe/default.nix index d09a899b897..e216b19fab5 100644 --- a/pkgs/applications/misc/xfe/default.nix +++ b/pkgs/applications/misc/xfe/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = { - description = "X File Explorer (Xfe) is an MS-Explorer like file manager for X"; + description = "MS-Explorer like file manager for X"; longDescription = '' X File Explorer (Xfe) is an MS-Explorer like file manager for X. It is based on the popular, but discontinued, X Win Commander, which was developed by Maxim Baranov. diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix index ad2ea75bd70..e23a6d94ec1 100644 --- a/pkgs/applications/networking/browsers/firefox/default.nix +++ b/pkgs/applications/networking/browsers/firefox/default.nix @@ -94,7 +94,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "Mozilla Firefox - the browser, reloaded"; + description = "Web browser"; homepage = http://www.mozilla.com/en-US/firefox/; maintainers = with lib.maintainers; [ eelco wizeman ]; platforms = lib.platforms.linux; diff --git a/pkgs/applications/networking/browsers/opera/default.nix b/pkgs/applications/networking/browsers/opera/default.nix index 80b09bcd8a8..201a6b947c1 100644 --- a/pkgs/applications/networking/browsers/opera/default.nix +++ b/pkgs/applications/networking/browsers/opera/default.nix @@ -81,6 +81,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.opera.com; - description = "The Opera web browser"; + description = "Web browser"; }; } diff --git a/pkgs/applications/networking/ids/snort/default.nix b/pkgs/applications/networking/ids/snort/default.nix index 858e99c245b..580591c18ad 100644 --- a/pkgs/applications/networking/ids/snort/default.nix +++ b/pkgs/applications/networking/ids/snort/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ libpcap pcre libdnet daq zlib flex bison ]; meta = { - description = "Snort is an open source network intrusion prevention and detection system (IDS/IPS)"; + description = "Network intrusion prevention and detection system (IDS/IPS)"; homepage = http://www.snort.org; license = stdenv.lib.licenses.gpl2; }; diff --git a/pkgs/applications/networking/instant-messengers/bitlbee/default.nix b/pkgs/applications/networking/instant-messengers/bitlbee/default.nix index ec614bf4b8c..cf10c1e6fe2 100644 --- a/pkgs/applications/networking/instant-messengers/bitlbee/default.nix +++ b/pkgs/applications/networking/instant-messengers/bitlbee/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = { - description = "BitlBee, an IRC to other chat networks gateway"; + description = "IRC instant messaging gateway"; longDescription = '' BitlBee brings IM (instant messaging) to IRC clients. It's a diff --git a/pkgs/applications/networking/instant-messengers/carrier/2.5.0.nix b/pkgs/applications/networking/instant-messengers/carrier/2.5.0.nix index 9cf2558ef32..909d6404193 100644 --- a/pkgs/applications/networking/instant-messengers/carrier/2.5.0.nix +++ b/pkgs/applications/networking/instant-messengers/carrier/2.5.0.nix @@ -41,7 +41,7 @@ rec { name = "carrier-2.5.0"; meta = { - description = "Carrier - PidginIM GUI fork with user-friendly development model"; + description = "PidginIM GUI fork with user-friendly development model"; homepage = http://funpidgin.sf.net; }; } // (if externalPurple2 then { diff --git a/pkgs/applications/networking/instant-messengers/ekiga/default.nix b/pkgs/applications/networking/instant-messengers/ekiga/default.nix index 07730a8c0ee..e46956f3cca 100644 --- a/pkgs/applications/networking/instant-messengers/ekiga/default.nix +++ b/pkgs/applications/networking/instant-messengers/ekiga/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "Ekiga SIP client"; + description = "VOIP/Videoconferencing app with full SIP and H.323 support"; maintainers = [ maintainers.raskin ]; platforms = platforms.linux; }; diff --git a/pkgs/applications/networking/instant-messengers/fuze/default.nix b/pkgs/applications/networking/instant-messengers/fuze/default.nix index 9ccada87fe2..41ffb421f8e 100644 --- a/pkgs/applications/networking/instant-messengers/fuze/default.nix +++ b/pkgs/applications/networking/instant-messengers/fuze/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation { ''; meta = { - description = "Fuze for Linux"; + description = "Internet and mobile based unified communications solutions (Linux client)"; homepage = http://www.fuzebox.com; license = "unknown"; }; diff --git a/pkgs/applications/networking/instant-messengers/hipchat/default.nix b/pkgs/applications/networking/instant-messengers/hipchat/default.nix index 6da12905f56..cf4c2e22ad6 100644 --- a/pkgs/applications/networking/instant-messengers/hipchat/default.nix +++ b/pkgs/applications/networking/instant-messengers/hipchat/default.nix @@ -94,7 +94,7 @@ stdenv.mkDerivation { ''; meta = { - description = "HipChat Desktop Client"; + description = "Desktop client for HipChat services"; homepage = http://www.hipchat.com; license = stdenv.lib.licenses.unfree; platforms = [ "i686-linux" "x86_64-linux" ]; diff --git a/pkgs/applications/networking/instant-messengers/pidgin/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/default.nix index 6e6fd6d0eb6..814a191c457 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { + (lib.optionalString (gnutls != null) " --enable-gnutls=yes --enable-nss=no") ; meta = with stdenv.lib; { - description = "Pidgin IM - XMPP(Jabber), AIM/ICQ, IRC, SIP etc client"; + description = "Multi-protocol instant messaging client"; homepage = http://pidgin.im; license = licenses.gpl2Plus; platforms = platforms.linux; diff --git a/pkgs/applications/networking/jmeter/default.nix b/pkgs/applications/networking/jmeter/default.nix index 2d5e6b66bf0..77aeb64478f 100644 --- a/pkgs/applications/networking/jmeter/default.nix +++ b/pkgs/applications/networking/jmeter/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "Apache JMeter is a 100% pure Java desktop application designed to load test functional behavior and measure performance."; + description = "A 100% pure Java desktop application designed to load test functional behavior and measure performance"; longDescription = '' The Apache JMeter desktop application is open source software, a 100% pure Java application designed to load test functional behavior and diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix index 7a1eddfa869..75ccb93ca95 100644 --- a/pkgs/applications/networking/mailreaders/notmuch/default.nix +++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix @@ -70,8 +70,7 @@ stdenv.mkDerivation rec { checkTarget = "test"; meta = { - description = "Notmuch -- The mail indexer"; - longDescription = ""; + description = "Mail indexer"; license = stdenv.lib.licenses.gpl3; maintainers = with stdenv.lib.maintainers; [ chaoflow garbas ]; platforms = stdenv.lib.platforms.gnu; diff --git a/pkgs/applications/networking/newsreaders/slrn/default.nix b/pkgs/applications/networking/newsreaders/slrn/default.nix index c933460af43..fe13c756bd7 100644 --- a/pkgs/applications/networking/newsreaders/slrn/default.nix +++ b/pkgs/applications/networking/newsreaders/slrn/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { buildInputs = [ slang ncurses ]; meta = { - description = "The slrn (S-Lang read news) newsreader"; + description = "Text-based newsreader"; homepage = http://slrn.sourceforge.net/index.html; license = stdenv.lib.licenses.gpl2; }; diff --git a/pkgs/applications/networking/p2p/gnunet/default.nix b/pkgs/applications/networking/p2p/gnunet/default.nix index 6c28840f7e5..052c5311253 100644 --- a/pkgs/applications/networking/p2p/gnunet/default.nix +++ b/pkgs/applications/networking/p2p/gnunet/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { */ meta = { - description = "GNUnet, GNU's decentralized anonymous and censorship-resistant P2P framework"; + description = "GNU's decentralized anonymous and censorship-resistant P2P framework"; longDescription = '' GNUnet is a framework for secure peer-to-peer networking that diff --git a/pkgs/applications/networking/remote/rdesktop/default.nix b/pkgs/applications/networking/remote/rdesktop/default.nix index 9ba9e3aa3fc..09c20618d66 100644 --- a/pkgs/applications/networking/remote/rdesktop/default.nix +++ b/pkgs/applications/networking/remote/rdesktop/default.nix @@ -19,6 +19,6 @@ stdenv.mkDerivation (rec { ]; meta = { - description = "rdesktop is an open source client for Windows Terminal Services"; + description = "Open source client for Windows Terminal Services"; }; }) diff --git a/pkgs/applications/networking/remote/remmina/default.nix b/pkgs/applications/networking/remote/remmina/default.nix index 8fb929d53e1..8304f6dc091 100644 --- a/pkgs/applications/networking/remote/remmina/default.nix +++ b/pkgs/applications/networking/remote/remmina/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { license = stdenv.lib.licenses.gpl2; homepage = "http://remmina.sourceforge.net/"; - description = "Remmina is a remote desktop client written in GTK+"; + description = "Remote desktop client written in GTK+"; maintainers = []; platforms = platforms.linux; }; diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix index 226b7f6d097..64bf287b44f 100644 --- a/pkgs/applications/networking/syncthing/default.nix +++ b/pkgs/applications/networking/syncthing/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://syncthing.net/; - description = "Syncthing replaces Dropbox and BitTorrent Sync with something open, trustworthy and decentralized"; + description = "Replaces Dropbox and BitTorrent Sync with something open, trustworthy and decentralized"; license = with stdenv.lib.licenses; mit; maintainers = with stdenv.lib.maintainers; [ matejc ]; platforms = with stdenv.lib.platforms; linux; diff --git a/pkgs/applications/office/gnucash/default.nix b/pkgs/applications/office/gnucash/default.nix index 9c255f493d3..8d6de404f98 100644 --- a/pkgs/applications/office/gnucash/default.nix +++ b/pkgs/applications/office/gnucash/default.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = { - description = "GnuCash, a personal and small-business financial-accounting application"; + description = "Personal and small-business financial-accounting application"; longDescription = '' GnuCash is personal and small-business financial-accounting software, diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index 41cf1ebc33d..63d4db20af3 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -252,7 +252,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - description = "LibreOffice is a comprehensive, professional-quality productivity suite, a variant of openoffice.org"; + description = "Comprehensive, professional-quality productivity suite, a variant of openoffice.org"; homepage = http://libreoffice.org/; license = licenses.lgpl3; maintainers = [ maintainers.viric maintainers.raskin ]; diff --git a/pkgs/applications/science/astronomy/gravit/default.nix b/pkgs/applications/science/astronomy/gravit/default.nix index 696890f95f1..1be1328da27 100644 --- a/pkgs/applications/science/astronomy/gravit/default.nix +++ b/pkgs/applications/science/astronomy/gravit/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://gravit.slowchop.com"; - description = "A beautiful OpenGL-based gravity simulator"; + description = "Beautiful OpenGL-based gravity simulator"; license = stdenv.lib.licenses.gpl2; longDescription = '' diff --git a/pkgs/applications/science/biology/emboss/default.nix b/pkgs/applications/science/biology/emboss/default.nix index 96181c8ee6c..c9974660da3 100644 --- a/pkgs/applications/science/biology/emboss/default.nix +++ b/pkgs/applications/science/biology/emboss/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { # ''; meta = { - description = "EMBOSS is 'The European Molecular Biology Open Software Suite'"; + description = "The European Molecular Biology Open Software Suite"; longDescription = ''EMBOSS is a free Open Source software analysis package specially developed for the needs of the molecular biology (e.g. EMBnet) user community, including libraries. The software automatically copes with diff --git a/pkgs/applications/science/logic/alt-ergo/default.nix b/pkgs/applications/science/logic/alt-ergo/default.nix index 2a95d0cd65b..62359baf2bc 100644 --- a/pkgs/applications/science/logic/alt-ergo/default.nix +++ b/pkgs/applications/science/logic/alt-ergo/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { [ ocaml findlib ocamlgraph zarith lablgtk gmp ]; meta = { - description = "Alt-Ergo is a high-performance theorem prover and SMT solver"; + description = "High-performance theorem prover and SMT solver"; homepage = "http://alt-ergo.ocamlpro.com/"; license = stdenv.lib.licenses.cecill-c; # LGPL-2 compatible platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix index 678ec6a4b04..da77a4c5a9a 100644 --- a/pkgs/applications/science/logic/coq/default.nix +++ b/pkgs/applications/science/logic/coq/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation { buildFlags = "revision coq coqide"; meta = { - description = "Coq proof assistant"; + description = "Formal proof management system"; longDescription = '' Coq is a formal proof management system. It provides a formal language to write mathematical definitions, executable algorithms and theorems diff --git a/pkgs/applications/science/logic/matita/default.nix b/pkgs/applications/science/logic/matita/default.nix index f601f97de62..0f393b419f1 100644 --- a/pkgs/applications/science/logic/matita/default.nix +++ b/pkgs/applications/science/logic/matita/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation { meta = { homepage = http://matita.cs.unibo.it/; - description = "Matita is an experimental, interactive theorem prover"; + description = "Experimental, interactive theorem prover"; license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.roconnor ]; }; diff --git a/pkgs/applications/science/logic/prooftree/default.nix b/pkgs/applications/science/logic/prooftree/default.nix index caaf4a94a1e..94b1d590762 100644 --- a/pkgs/applications/science/logic/prooftree/default.nix +++ b/pkgs/applications/science/logic/prooftree/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation (rec { configureFlags = [ "--prefix" "$(out)" ]; meta = { - description = "Prooftree is a program for proof-tree visualization"; + description = "A program for proof-tree visualization"; longDescription = '' Prooftree is a program for proof-tree visualization during interactive proof development in a theorem prover. It is currently being developed diff --git a/pkgs/applications/science/logic/twelf/default.nix b/pkgs/applications/science/logic/twelf/default.nix index c6c7e4d9c1a..f9680b47579 100644 --- a/pkgs/applications/science/logic/twelf/default.nix +++ b/pkgs/applications/science/logic/twelf/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "Twelf logic proof assistant"; + description = "Logic proof assistant"; longDescription = '' Twelf is a language used to specify, implement, and prove properties of deductive systems such as programming languages and logics. Large diff --git a/pkgs/applications/science/math/fricas/default.nix b/pkgs/applications/science/math/fricas/default.nix index 1817c43ed7b..6e187843404 100644 --- a/pkgs/applications/science/math/fricas/default.nix +++ b/pkgs/applications/science/math/fricas/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://fricas.sourceforge.net/; - description = "Fricas CAS"; + description = "An advanced computer algebra system"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/science/math/glsurf/default.nix b/pkgs/applications/science/math/glsurf/default.nix index c4352c46f92..1439d327d6e 100644 --- a/pkgs/applications/science/math/glsurf/default.nix +++ b/pkgs/applications/science/math/glsurf/default.nix @@ -26,6 +26,6 @@ stdenv.mkDerivation { meta = { homepage = http://www.lama.univ-savoie.fr/~raffalli/glsurf; - description = "GlSurf: a program to draw implicit surfaces and curves"; + description = "A program to draw implicit surfaces and curves"; }; } diff --git a/pkgs/applications/science/math/jags/default.nix b/pkgs/applications/science/math/jags/default.nix index a93386149bd..785c2460bb4 100644 --- a/pkgs/applications/science/math/jags/default.nix +++ b/pkgs/applications/science/math/jags/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { buildInputs = [gfortran liblapack blas]; meta = { - description = "JAGS: Just Another Gibbs Sampler"; + description = "Just Another Gibbs Sampler"; license = "GPL2"; homepage = http://www-ice.iarc.fr/~martyn/software/jags/; maintainers = [stdenv.lib.maintainers.andres]; diff --git a/pkgs/applications/science/math/maxima/default.nix b/pkgs/applications/science/math/maxima/default.nix index 096796a859d..3277d94d99b 100644 --- a/pkgs/applications/science/math/maxima/default.nix +++ b/pkgs/applications/science/math/maxima/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation { enableParallelBuilding = true; meta = { - description = "Maxima computer algebra system"; + description = "Computer algebra system"; homepage = "http://maxima.sourceforge.net"; license = stdenv.lib.licenses.gpl2; diff --git a/pkgs/applications/science/misc/fityk/default.nix b/pkgs/applications/science/misc/fityk/default.nix index db79839ba66..4c93eef2b1c 100644 --- a/pkgs/applications/science/misc/fityk/default.nix +++ b/pkgs/applications/science/misc/fityk/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { buildInputs = [wxGTK30 boost lua zlib bzip2 xylib readline gnuplot ]; meta = { - description = "Fityk -- curve fitting and peak fitting software"; + description = "Curve fitting and peak fitting software"; license = "GPL2"; homepage = http://fityk.nieto.pl/; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/science/misc/simgrid/default.nix b/pkgs/applications/science/misc/simgrid/default.nix index 29a7caf769b..7656668f056 100644 --- a/pkgs/applications/science/misc/simgrid/default.nix +++ b/pkgs/applications/science/misc/simgrid/default.nix @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { doCheck = false; meta = { - description = "SimGrid, a simulator for distributed applications in heterogeneous environments"; + description = "Simulator for distributed applications in heterogeneous environments"; longDescription = '' SimGrid is a toolkit that provides core functionalities for the diff --git a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix index b9abf7b55b4..879690bc91e 100644 --- a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix +++ b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { meta = { homepage = "http://www.gromacs.org"; license = "GPLv2"; - description = "The GROMACS molecular dynamics software package"; + description = "Molecular dynamics software package"; longDescription = '' GROMACS is a versatile package to perform molecular dynamics, i.e. simulate the Newtonian equations of motion for systems diff --git a/pkgs/applications/science/spyder/default.nix b/pkgs/applications/science/spyder/default.nix index 1079a153ca1..806d2f546cf 100644 --- a/pkgs/applications/science/spyder/default.nix +++ b/pkgs/applications/science/spyder/default.nix @@ -43,7 +43,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - description = "Scientific PYthon Development EnviRonment (SPYDER)"; + description = "Scientific python development environment"; longDescription = '' Spyder (previously known as Pydee) is a powerful interactive development environment for the Python language with advanced editing, interactive diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index a4d16e46060..877c65afccf 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -133,7 +133,7 @@ stdenv.mkDerivation { meta = { homepage = http://git-scm.com/; - description = "Git, a popular distributed version control system"; + description = "Distributed version control system"; license = stdenv.lib.licenses.gpl2Plus; longDescription = '' diff --git a/pkgs/applications/version-management/rcs/default.nix b/pkgs/applications/version-management/rcs/default.nix index e71d23132ac..823638669b6 100644 --- a/pkgs/applications/version-management/rcs/default.nix +++ b/pkgs/applications/version-management/rcs/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.gnu.org/software/rcs/; - description = "GNU RCS, a revision control system"; + description = "Revision control system"; longDescription = '' The GNU Revision Control System (RCS) manages multiple revisions of files. RCS automates the storing, retrieval, logging, diff --git a/pkgs/applications/video/gnash/default.nix b/pkgs/applications/video/gnash/default.nix index 06122619066..515e2591461 100644 --- a/pkgs/applications/video/gnash/default.nix +++ b/pkgs/applications/video/gnash/default.nix @@ -103,7 +103,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.gnu.org/software/gnash/; - description = "GNU Gnash, a libre SWF (Flash) movie player"; + description = "A libre SWF (Flash) movie player"; longDescription = '' Gnash is a GNU Flash movie player. Flash is an animation file format diff --git a/pkgs/applications/video/kino/default.nix b/pkgs/applications/video/kino/default.nix index 16bd57bef34..7dd089537b7 100644 --- a/pkgs/applications/video/kino/default.nix +++ b/pkgs/applications/video/kino/default.nix @@ -85,7 +85,7 @@ stdenv.mkDerivation { meta = { - description = "Kino is a non-linear DV editor for GNU/Linux"; + description = "Non-linear DV editor for GNU/Linux"; homepage = http://www.kinodv.org/; license = stdenv.lib.licenses.gpl2; }; diff --git a/pkgs/applications/video/xbmc/default.nix b/pkgs/applications/video/xbmc/default.nix index 26c54c537ae..875ed48c102 100644 --- a/pkgs/applications/video/xbmc/default.nix +++ b/pkgs/applications/video/xbmc/default.nix @@ -96,7 +96,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://xbmc.org/; - description = "XBMC Media Center"; + description = "Media center"; license = "GPLv2"; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.iElectric ]; diff --git a/pkgs/applications/window-managers/ratpoison/default.nix b/pkgs/applications/window-managers/ratpoison/default.nix index 65264c20db3..0eb28464e59 100644 --- a/pkgs/applications/window-managers/ratpoison/default.nix +++ b/pkgs/applications/window-managers/ratpoison/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.nongnu.org/ratpoison/"; - description = "Ratpoison, a simple mouse-free tiling window manager"; + description = "Simple mouse-free tiling window manager"; license = stdenv.lib.licenses.gpl2Plus; longDescription = '' diff --git a/pkgs/desktops/e17/enlightenment/default.nix b/pkgs/desktops/e17/enlightenment/default.nix index 1c3edb07ecf..953c90e8003 100644 --- a/pkgs/desktops/e17/enlightenment/default.nix +++ b/pkgs/desktops/e17/enlightenment/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { --disable-illume2 ''; meta = { - description = "Enlightenment, the window manager"; + description = "A window manager"; longDescription = '' The Enlightenment Desktop shell provides an efficient yet breathtaking window manager based on the Enlightenment diff --git a/pkgs/development/compilers/bigloo/default.nix b/pkgs/development/compilers/bigloo/default.nix index 16dfa580a19..8564175d363 100644 --- a/pkgs/development/compilers/bigloo/default.nix +++ b/pkgs/development/compilers/bigloo/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { checkTarget = "test"; meta = { - description = "Bigloo, an efficient Scheme compiler"; + description = "Efficient Scheme compiler"; longDescription = '' Bigloo is a Scheme implementation devoted to one goal: enabling diff --git a/pkgs/development/compilers/gambit/default.nix b/pkgs/development/compilers/gambit/default.nix index 265b08c1fbd..3d9f2596c96 100644 --- a/pkgs/development/compilers/gambit/default.nix +++ b/pkgs/development/compilers/gambit/default.nix @@ -18,7 +18,7 @@ rec { phaseNames = ["doConfigure" "doMakeInstall"]; meta = { - description = "Gambit Scheme to C compiler"; + description = "Scheme to C compiler"; maintainers = [ a.lib.maintainers.raskin ]; diff --git a/pkgs/development/compilers/hugs/default.nix b/pkgs/development/compilers/hugs/default.nix index c3f14826c8a..14751799795 100644 --- a/pkgs/development/compilers/hugs/default.nix +++ b/pkgs/development/compilers/hugs/default.nix @@ -47,7 +47,7 @@ composableDerivation.composableDerivation {} { meta = { license = "as-is"; # gentoo is calling it this way.. - description = "The HUGS 98 Haskell interpreter"; + description = "Haskell interpreter"; homepage = http://www.haskell.org/hugs; }; } diff --git a/pkgs/development/compilers/ikarus/default.nix b/pkgs/development/compilers/ikarus/default.nix index 070f29e16f6..e9bf6c8bb5b 100644 --- a/pkgs/development/compilers/ikarus/default.nix +++ b/pkgs/development/compilers/ikarus/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ gmp ]; meta = { - description = "Ikarus - a Scheme compiler, aiming at R6RS"; + description = "Scheme compiler, aiming at R6RS"; homepage = http://ikarus-scheme.org/; license = stdenv.lib.licenses.gpl3; }; diff --git a/pkgs/development/compilers/mercury/default.nix b/pkgs/development/compilers/mercury/default.nix index 21af582c594..de9b44a4414 100644 --- a/pkgs/development/compilers/mercury/default.nix +++ b/pkgs/development/compilers/mercury/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "Mercury is a pure logic programming language."; + description = "A pure logic programming language"; longDescription = '' Mercury is a logic/functional programming language which combines the clarity and expressiveness of declarative programming with advanced diff --git a/pkgs/development/compilers/ocaml/3.10.0.nix b/pkgs/development/compilers/ocaml/3.10.0.nix index 281aa1a9de6..1d68585d93a 100644 --- a/pkgs/development/compilers/ocaml/3.10.0.nix +++ b/pkgs/development/compilers/ocaml/3.10.0.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation (rec { meta = { homepage = http://caml.inria.fr/ocaml; license = "QPL, LGPL2 (library part)"; - desctiption = "Most popular variant of the Caml language"; + description = "Most popular variant of the Caml language"; }; }) diff --git a/pkgs/development/compilers/ocaml/3.11.2.nix b/pkgs/development/compilers/ocaml/3.11.2.nix index 64cf8a9f9f7..195e83e7313 100644 --- a/pkgs/development/compilers/ocaml/3.11.2.nix +++ b/pkgs/development/compilers/ocaml/3.11.2.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://caml.inria.fr/ocaml; license = [ "QPL" /* compiler */ "LGPLv2" /* library */ ]; - description = "Objective Caml, the most popular variant of the Caml language"; + description = "Most popular variant of the Caml language"; longDescription = '' Objective Caml is the most popular variant of the Caml language. diff --git a/pkgs/development/compilers/ocaml/3.12.1.nix b/pkgs/development/compilers/ocaml/3.12.1.nix index f916f5a7923..16c3cb1d787 100644 --- a/pkgs/development/compilers/ocaml/3.12.1.nix +++ b/pkgs/development/compilers/ocaml/3.12.1.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://caml.inria.fr/ocaml; license = [ "QPL" /* compiler */ "LGPLv2" /* library */ ]; - description = "OCaml, the most popular variant of the Caml language"; + description = "Most popular variant of the Caml language"; longDescription = '' diff --git a/pkgs/development/compilers/ocaml/4.00.1.nix b/pkgs/development/compilers/ocaml/4.00.1.nix index 8662db70c26..5b1e69b86b0 100644 --- a/pkgs/development/compilers/ocaml/4.00.1.nix +++ b/pkgs/development/compilers/ocaml/4.00.1.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://caml.inria.fr/ocaml; license = [ "QPL" /* compiler */ "LGPLv2" /* library */ ]; - description = "OCaml, the most popular variant of the Caml language"; + description = "Most popular variant of the Caml language"; longDescription = '' diff --git a/pkgs/development/compilers/ocaml/4.01.0.nix b/pkgs/development/compilers/ocaml/4.01.0.nix index 0f68014fad6..2876bce9caf 100644 --- a/pkgs/development/compilers/ocaml/4.01.0.nix +++ b/pkgs/development/compilers/ocaml/4.01.0.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://caml.inria.fr/ocaml; license = [ "QPL" /* compiler */ "LGPLv2" /* library */ ]; - description = "OCaml, the most popular variant of the Caml language"; + description = "Most popular variant of the Caml language"; longDescription = '' diff --git a/pkgs/development/compilers/ocaml/ber-metaocaml-003.nix b/pkgs/development/compilers/ocaml/ber-metaocaml-003.nix index 9c5fa3764ba..8b86c805c61 100644 --- a/pkgs/development/compilers/ocaml/ber-metaocaml-003.nix +++ b/pkgs/development/compilers/ocaml/ber-metaocaml-003.nix @@ -58,6 +58,6 @@ stdenv.mkDerivation rec { meta = { homepage = "http://okmij.org/ftp/ML/index.html#ber-metaocaml"; license = [ "QPL" /* compiler */ "LGPLv2" /* library */ ]; - description = "a conservative extension of OCaml with the primitive type of code values, and three basic multi-stage expression forms: Brackets, Escape, and Run"; + description = "A conservative extension of OCaml with the primitive type of code values, and three basic multi-stage expression forms: Brackets, Escape, and Run"; }; } diff --git a/pkgs/development/compilers/qi/default.nix b/pkgs/development/compilers/qi/default.nix index ecb022d942a..5665fc5da6c 100644 --- a/pkgs/development/compilers/qi/default.nix +++ b/pkgs/development/compilers/qi/default.nix @@ -31,6 +31,6 @@ stdenv.mkDerivation rec { builder = writeScript (name + "-builder") (textClosure localDefs [allBuild doForceShare doPropagate]); meta = { - description = "Qi - next generation on top of Common Lisp"; + description = "Functional programming language, built top of Common Lisp"; }; } diff --git a/pkgs/development/compilers/rdmd/default.nix b/pkgs/development/compilers/rdmd/default.nix index 9177ad5e25b..621ace195bb 100644 --- a/pkgs/development/compilers/rdmd/default.nix +++ b/pkgs/development/compilers/rdmd/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { ''; meta = { - description = "rdmd wrapper for D language compiler"; + description = "Wrapper for D language compiler"; homepage = http://dlang.org/rdmd.html; license = lib.licenses.boost; maintainers = with stdenv.lib.maintainers; [ vlstill ]; diff --git a/pkgs/development/compilers/scala/default.nix b/pkgs/development/compilers/scala/default.nix index bd81e4c055d..e299be9144e 100644 --- a/pkgs/development/compilers/scala/default.nix +++ b/pkgs/development/compilers/scala/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "Scala is a general purpose programming language"; + description = "General purpose programming language"; longDescription = '' Scala is a general purpose programming language designed to express common programming patterns in a concise, elegant, and type-safe way. diff --git a/pkgs/development/compilers/tinycc/default.nix b/pkgs/development/compilers/tinycc/default.nix index 1e82e03f16c..bd71ab7b27f 100644 --- a/pkgs/development/compilers/tinycc/default.nix +++ b/pkgs/development/compilers/tinycc/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { checkTarget = "test"; meta = { - description = "TinyCC, a small, fast, and embeddable C compiler and interpreter"; + description = "Small, fast, and embeddable C compiler and interpreter"; longDescription = '' TinyCC (aka TCC) is a small but hyper fast C compiler. Unlike diff --git a/pkgs/development/interpreters/guile/default.nix b/pkgs/development/interpreters/guile/default.nix index 6e4051ff46e..2ddad5cde67 100644 --- a/pkgs/development/interpreters/guile/default.nix +++ b/pkgs/development/interpreters/guile/default.nix @@ -65,7 +65,7 @@ meta = { - description = "GNU Guile 2.0, an embeddable Scheme implementation"; + description = "Embeddable Scheme implementation"; homepage = http://www.gnu.org/software/guile/; license = stdenv.lib.licenses.lgpl3Plus; maintainers = with stdenv.lib.maintainers; [ ludo lovek323 ]; diff --git a/pkgs/development/interpreters/maude/default.nix b/pkgs/development/interpreters/maude/default.nix index e112a5ae43d..e14132a8acf 100644 --- a/pkgs/development/interpreters/maude/default.nix +++ b/pkgs/development/interpreters/maude/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://maude.cs.uiuc.edu/"; - description = "Maude -- a high-level specification language"; + description = "High-level specification language"; license = stdenv.lib.licenses.gpl2; longDescription = '' diff --git a/pkgs/development/interpreters/php/5.3.nix b/pkgs/development/interpreters/php/5.3.nix index ed5feeacf61..c1d02064fe1 100644 --- a/pkgs/development/interpreters/php/5.3.nix +++ b/pkgs/development/interpreters/php/5.3.nix @@ -233,7 +233,7 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) }; meta = { - description = "The PHP language runtime engine"; + description = "An HTML-embedded scripting language"; homepage = http://www.php.net/; license = "PHP-3"; maintainers = with stdenv.lib.maintainers; [ lovek323 ]; diff --git a/pkgs/development/interpreters/php/5.4.nix b/pkgs/development/interpreters/php/5.4.nix index e5069fc2ae4..e39661b224a 100644 --- a/pkgs/development/interpreters/php/5.4.nix +++ b/pkgs/development/interpreters/php/5.4.nix @@ -253,7 +253,7 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) }; meta = { - description = "The PHP language runtime engine"; + description = "An HTML-embedded scripting language"; homepage = http://www.php.net/; license = "PHP-3"; }; diff --git a/pkgs/development/interpreters/pypy/2.3/default.nix b/pkgs/development/interpreters/pypy/2.3/default.nix index b45805ab241..626f56ccc46 100644 --- a/pkgs/development/interpreters/pypy/2.3/default.nix +++ b/pkgs/development/interpreters/pypy/2.3/default.nix @@ -91,7 +91,7 @@ let meta = with stdenv.lib; { homepage = "http://pypy.org/"; - description = "PyPy is a fast, compliant alternative implementation of the Python language (2.7.3)"; + description = "Fast, compliant alternative implementation of the Python language (2.7.3)"; license = licenses.mit; platforms = platforms.linux; maintainers = with maintainers; [ iElectric ]; diff --git a/pkgs/development/libraries/boost/1.44.nix b/pkgs/development/libraries/boost/1.44.nix index b188586e84f..c192acd23bd 100644 --- a/pkgs/development/libraries/boost/1.44.nix +++ b/pkgs/development/libraries/boost/1.44.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation { meta = { homepage = "http://boost.org/"; - description = "Boost C++ Library Collection"; + description = "Collection of C++ libraries"; license = "boost-license"; maintainers = [ stdenv.lib.maintainers.simons ]; diff --git a/pkgs/development/libraries/boost/1.49.nix b/pkgs/development/libraries/boost/1.49.nix index fca4249e963..9e61683238f 100644 --- a/pkgs/development/libraries/boost/1.49.nix +++ b/pkgs/development/libraries/boost/1.49.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation { meta = { homepage = "http://boost.org/"; - description = "Boost C++ Library Collection"; + description = "Collection of C++ libraries"; license = "boost-license"; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/libraries/boost/1.55.nix b/pkgs/development/libraries/boost/1.55.nix index bf355f7169c..1e9d2134d12 100644 --- a/pkgs/development/libraries/boost/1.55.nix +++ b/pkgs/development/libraries/boost/1.55.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation { meta = { homepage = "http://boost.org/"; - description = "Boost C++ Library Collection"; + description = "Collection of C++ libraries"; license = "boost-license"; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/libraries/ccrtp/default.nix b/pkgs/development/libraries/ccrtp/default.nix index 2111e1b4a55..3e75cb45a73 100644 --- a/pkgs/development/libraries/ccrtp/default.nix +++ b/pkgs/development/libraries/ccrtp/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { doCheck = true; meta = { - description = "GNU ccRTP, an implementation of the IETF real-time transport protocol (RTP)"; + description = "An implementation of the IETF real-time transport protocol (RTP)"; homepage = http://www.gnu.org/software/ccrtp/; license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [ marcweber ]; diff --git a/pkgs/development/libraries/celt/default.nix b/pkgs/development/libraries/celt/default.nix index 28e51efbc4b..ca25be90504 100644 --- a/pkgs/development/libraries/celt/default.nix +++ b/pkgs/development/libraries/celt/default.nix @@ -29,7 +29,7 @@ rec { phaseNames = ["doConfigure" "doMakeInstall"]; meta = { - description = "CELT - low-delay audio codec"; + description = "Low-delay audio codec"; maintainers = with a.lib.maintainers; [ raskin diff --git a/pkgs/development/libraries/cfitsio/default.nix b/pkgs/development/libraries/cfitsio/default.nix index 06f2deb3a7c..54e5988eda6 100644 --- a/pkgs/development/libraries/cfitsio/default.nix +++ b/pkgs/development/libraries/cfitsio/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { meta = { homepage = http://heasarc.gsfc.nasa.gov/fitsio/; - description = "CFITSIO, a library for reading and writing FITS data files"; + description = "Library for reading and writing FITS data files"; longDescription = '' CFITSIO is a library of C and Fortran subroutines for reading and diff --git a/pkgs/development/libraries/check/default.nix b/pkgs/development/libraries/check/default.nix index 4e75cda0c23..a782ff61e28 100644 --- a/pkgs/development/libraries/check/default.nix +++ b/pkgs/development/libraries/check/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { doCheck = false; meta = { - description = "Check, a unit testing framework for C"; + description = "Unit testing framework for C"; longDescription = '' Check is a unit testing framework for C. It features a simple diff --git a/pkgs/development/libraries/chipmunk/default.nix b/pkgs/development/libraries/chipmunk/default.nix index d148c4d829a..63c5959960a 100644 --- a/pkgs/development/libraries/chipmunk/default.nix +++ b/pkgs/development/libraries/chipmunk/default.nix @@ -34,6 +34,6 @@ rec { name = "chipmunk-" + version; meta = { - description = "Chipmunk 2D physics engine"; + description = "2D physics engine"; }; } diff --git a/pkgs/development/libraries/cloog/default.nix b/pkgs/development/libraries/cloog/default.nix index da4501285e1..7ea7e597d40 100644 --- a/pkgs/development/libraries/cloog/default.nix +++ b/pkgs/development/libraries/cloog/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = { - description = "CLooG, the Chunky Loop Generator"; + description = "Library that generates loops for scanning polyhedra"; longDescription = '' CLooG is a free software library to generate code for scanning diff --git a/pkgs/development/libraries/clutter-gst/default.nix b/pkgs/development/libraries/clutter-gst/default.nix index 59c64b0de9f..c73aac074e7 100644 --- a/pkgs/development/libraries/clutter-gst/default.nix +++ b/pkgs/development/libraries/clutter-gst/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { postBuild = "rm -rf $out/share/gtk-doc"; meta = { - description = "Clutter-GST"; + description = "GStreamer bindings for clutter"; homepage = http://www.clutter-project.org/; diff --git a/pkgs/development/libraries/clutter/default.nix b/pkgs/development/libraries/clutter/default.nix index 027b90d8e11..67de04050af 100644 --- a/pkgs/development/libraries/clutter/default.nix +++ b/pkgs/development/libraries/clutter/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { #doCheck = true; # no tests possible without a display meta = { - description = "Clutter, a library for creating fast, dynamic graphical user interfaces"; + description = "Library for creating fast, dynamic graphical user interfaces"; longDescription = '' Clutter is free software library for creating fast, compelling, diff --git a/pkgs/development/libraries/fox/default.nix b/pkgs/development/libraries/fox/default.nix index 63acc14521c..6d7d7a83879 100644 --- a/pkgs/development/libraries/fox/default.nix +++ b/pkgs/development/libraries/fox/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = { - description = "FOX is a C++ based class library for building Graphical User Interfaces"; + description = "C++ based class library for building Graphical User Interfaces"; longDescription = '' FOX stands for Free Objects for X. It is a C++ based class library for building Graphical User Interfaces. diff --git a/pkgs/development/libraries/gettext/default.nix b/pkgs/development/libraries/gettext/default.nix index 4d400a6ea7d..9d62472c27e 100644 --- a/pkgs/development/libraries/gettext/default.nix +++ b/pkgs/development/libraries/gettext/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation (rec { }; meta = { - description = "GNU gettext, a well integrated set of translation tools and documentation"; + description = "Well integrated set of translation tools and documentation"; longDescription = '' Usually, programs are written and documented in English, and use diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index 4f7c6042f13..93e96bef536 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -107,7 +107,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - description = "GLib, a C library of programming buildings blocks"; + description = "C library of programming buildings blocks"; homepage = http://www.gtk.org/; license = licenses.lgpl2Plus; maintainers = with maintainers; [ lovek323 raskin urkud ]; diff --git a/pkgs/development/libraries/glog/default.nix b/pkgs/development/libraries/glog/default.nix index 098643ae70f..d3f74f4043a 100644 --- a/pkgs/development/libraries/glog/default.nix +++ b/pkgs/development/libraries/glog/default.nix @@ -11,6 +11,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://code.google.com/p/google-glog/; license = "BSD"; - description = "The glog library implements application-level logging."; + description = "Library for application-level logging"; }; } diff --git a/pkgs/development/libraries/gmp/4.3.2.nix b/pkgs/development/libraries/gmp/4.3.2.nix index d0559c46795..e9cfda032b1 100644 --- a/pkgs/development/libraries/gmp/4.3.2.nix +++ b/pkgs/development/libraries/gmp/4.3.2.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { doCheck = false; meta = { - description = "GMP, the GNU multiple precision arithmetic library"; + description = "GNU multiple precision arithmetic library"; longDescription = '' GMP is a free library for arbitrary precision arithmetic, operating diff --git a/pkgs/development/libraries/gmp/5.0.5.nix b/pkgs/development/libraries/gmp/5.0.5.nix index c96c830e2f7..5f3690f67a9 100644 --- a/pkgs/development/libraries/gmp/5.0.5.nix +++ b/pkgs/development/libraries/gmp/5.0.5.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { }; meta = { - description = "GMP, the GNU multiple precision arithmetic library"; + description = "GNU multiple precision arithmetic library"; longDescription = '' GMP is a free library for arbitrary precision arithmetic, operating diff --git a/pkgs/development/libraries/gmp/5.1.x.nix b/pkgs/development/libraries/gmp/5.1.x.nix index 9e28334804b..14a6d34d932 100644 --- a/pkgs/development/libraries/gmp/5.1.x.nix +++ b/pkgs/development/libraries/gmp/5.1.x.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation (rec { meta = with stdenv.lib; { homepage = "http://gmplib.org/"; - description = "GMP, the GNU multiple precision arithmetic library"; + description = "GNU multiple precision arithmetic library"; license = licenses.gpl3Plus; longDescription = diff --git a/pkgs/development/libraries/gss/default.nix b/pkgs/development/libraries/gss/default.nix index 207b8248698..75ae4054592 100644 --- a/pkgs/development/libraries/gss/default.nix +++ b/pkgs/development/libraries/gss/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = { - description = "GNU GSS Generic Security Service"; + description = "Generic Security Service"; longDescription = '' GSS is an implementation of the Generic Security Service Application diff --git a/pkgs/development/libraries/gstreamer/legacy/gnonlin/default.nix b/pkgs/development/libraries/gstreamer/legacy/gnonlin/default.nix index ff26e727e9f..777f4a06313 100644 --- a/pkgs/development/libraries/gstreamer/legacy/gnonlin/default.nix +++ b/pkgs/development/libraries/gstreamer/legacy/gnonlin/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://gstreamer.freedesktop.org/modules/gnonlin.html"; - description = "http://gstreamer.freedesktop.org/modules/gnonlin.html"; + description = "Gstreamer Non-Linear Multimedia Editing Plugins"; license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/development/libraries/gstreamer/legacy/gstreamer/default.nix b/pkgs/development/libraries/gstreamer/legacy/gstreamer/default.nix index f781c624cea..b608f891533 100644 --- a/pkgs/development/libraries/gstreamer/legacy/gstreamer/default.nix +++ b/pkgs/development/libraries/gstreamer/legacy/gstreamer/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://gstreamer.freedesktop.org; - description = "GStreamer, a library for constructing graphs of media-handling components"; + description = "Library for constructing graphs of media-handling components"; longDescription = '' GStreamer is a library for constructing graphs of media-handling diff --git a/pkgs/development/libraries/gtkimageview/default.nix b/pkgs/development/libraries/gtkimageview/default.nix index 6905adcd71e..b57c91c4455 100644 --- a/pkgs/development/libraries/gtkimageview/default.nix +++ b/pkgs/development/libraries/gtkimageview/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://trac.bjourne.webfactional.com/; - description = "The GtkImageView image viewer widget for GTK+"; + description = "Image viewer widget for GTK+"; longDescription = '' GtkImageView is a simple image viewer widget for GTK+. Similar to diff --git a/pkgs/development/libraries/gtkmathview/default.nix b/pkgs/development/libraries/gtkmathview/default.nix index 2620d9cc120..8a6914cfcd3 100644 --- a/pkgs/development/libraries/gtkmathview/default.nix +++ b/pkgs/development/libraries/gtkmathview/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { meta = { homepage = http://helm.cs.unibo.it/mml-widget/; - description = "GtkMathView is a C++ rendering engine for MathML documents"; + description = "C++ rendering engine for MathML documents"; license = stdenv.lib.licenses.lgpl3Plus; maintainers = [ stdenv.lib.maintainers.roconnor ]; }; diff --git a/pkgs/development/libraries/gupnp/default.nix b/pkgs/development/libraries/gupnp/default.nix index bae0639a61c..e278980e1e1 100644 --- a/pkgs/development/libraries/gupnp/default.nix +++ b/pkgs/development/libraries/gupnp/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.gupnp.org/; - description = "GUPnP is an implementation of the UPnP specification."; + description = "An implementation of the UPnP specification"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/development/libraries/hwloc/default.nix b/pkgs/development/libraries/hwloc/default.nix index 3c5f198cea6..d4d9663441f 100644 --- a/pkgs/development/libraries/hwloc/default.nix +++ b/pkgs/development/libraries/hwloc/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { doCheck = !stdenv.isCygwin; meta = { - description = "hwloc, a portable abstraction of hierarchical architectures for high-performance computing"; + description = "Portable abstraction of hierarchical architectures for high-performance computing"; longDescription = '' hwloc provides a portable abstraction (across OS, diff --git a/pkgs/development/libraries/jasper/default.nix b/pkgs/development/libraries/jasper/default.nix index 4046c05f79e..ed51a0a2820 100644 --- a/pkgs/development/libraries/jasper/default.nix +++ b/pkgs/development/libraries/jasper/default.nix @@ -15,6 +15,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.ece.uvic.ca/~mdadams/jasper/; - description = "JasPer JPEG2000 Library"; + description = "JPEG2000 Library"; }; } diff --git a/pkgs/development/libraries/java/classpath/default.nix b/pkgs/development/libraries/java/classpath/default.nix index bbfc6ed38cc..eff52cc177b 100644 --- a/pkgs/development/libraries/java/classpath/default.nix +++ b/pkgs/development/libraries/java/classpath/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { configureFlags = "--disable-Werror --disable-plugin --with-antlr-jar=${antlr}/lib/antlr.jar"; meta = { - description = "GNU Classpath, essential libraries for Java"; + description = "Essential libraries for Java"; longDescription = '' GNU Classpath, Essential Libraries for Java, is a GNU project to create diff --git a/pkgs/development/libraries/java/rhino/default.nix b/pkgs/development/libraries/java/rhino/default.nix index 42bdba7567c..34aaded7cb4 100644 --- a/pkgs/development/libraries/java/rhino/default.nix +++ b/pkgs/development/libraries/java/rhino/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation { ''; meta = { - description = "Mozilla Rhino: JavaScript for Java"; + description = "An implementation of JavaScript written in Java"; longDescription = '' Rhino is an open-source implementation of JavaScript written diff --git a/pkgs/development/libraries/libassuan/default.nix b/pkgs/development/libraries/libassuan/default.nix index f5a3d92d3db..90ce4f970e3 100644 --- a/pkgs/development/libraries/libassuan/default.nix +++ b/pkgs/development/libraries/libassuan/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = { - description = "Libassuan, the IPC library used by GnuPG and related software"; + description = "IPC library used by GnuPG and related software"; longDescription = '' Libassuan is a small library implementing the so-called Assuan diff --git a/pkgs/development/libraries/libcddb/default.nix b/pkgs/development/libraries/libcddb/default.nix index b9823cefd2d..9a284d8988d 100644 --- a/pkgs/development/libraries/libcddb/default.nix +++ b/pkgs/development/libraries/libcddb/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; meta = { - description = "Libcddb is a C library to access data on a CDDB server (freedb.org)"; + description = "C library to access data on a CDDB server (freedb.org)"; license = stdenv.lib.licenses.lgpl2Plus; homepage = http://libcddb.sourceforge.net/; }; diff --git a/pkgs/development/libraries/libchamplain/default.nix b/pkgs/development/libraries/libchamplain/default.nix index 51b7f7e181d..9cdf9d411cc 100644 --- a/pkgs/development/libraries/libchamplain/default.nix +++ b/pkgs/development/libraries/libchamplain/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { homepage = http://projects.gnome.org/libchamplain/; license = stdenv.lib.licenses.lgpl2Plus; - description = "libchamplain, a C library providing a ClutterActor to display maps"; + description = "C library providing a ClutterActor to display maps"; longDescription = '' libchamplain is a C library providing a ClutterActor to display diff --git a/pkgs/development/libraries/libchop/default.nix b/pkgs/development/libraries/libchop/default.nix index f0d7fbfbeb6..37af9756724 100644 --- a/pkgs/development/libraries/libchop/default.nix +++ b/pkgs/development/libraries/libchop/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = { - description = "libchop, tools & library for data backup and distributed storage"; + description = "Tools & library for data backup and distributed storage"; longDescription = '' Libchop is a set of utilities and library for data backup and diff --git a/pkgs/development/libraries/libdaemon/default.nix b/pkgs/development/libraries/libdaemon/default.nix index ba7e3e47ff7..cb8d07fec90 100644 --- a/pkgs/development/libraries/libdaemon/default.nix +++ b/pkgs/development/libraries/libdaemon/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--disable-lynx" ]; meta = { - description = "libdaemon, a lightweight C library that eases the writing of UNIX daemons"; + description = "Lightweight C library that eases the writing of UNIX daemons"; homepage = http://0pointer.de/lennart/projects/libdaemon/; diff --git a/pkgs/development/libraries/libdnet/default.nix b/pkgs/development/libraries/libdnet/default.nix index 50bdaa1c4c0..acd930ddd01 100644 --- a/pkgs/development/libraries/libdnet/default.nix +++ b/pkgs/development/libraries/libdnet/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { ''; meta = { - description = "libdnet provides a simplified, portable interface to several low-level networking routines"; + description = "Provides a simplified, portable interface to several low-level networking routines"; homepage = http://code.google.com/p/libdnet/; license = "BSD"; # New BSD license maintainers = [stdenv.lib.maintainers.marcweber]; diff --git a/pkgs/development/libraries/libelf/default.nix b/pkgs/development/libraries/libelf/default.nix index d9436456d0d..407b367d6b7 100644 --- a/pkgs/development/libraries/libelf/default.nix +++ b/pkgs/development/libraries/libelf/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation (rec { doCheck = true; meta = { - description = "Libelf, an ELF object file access library"; + description = "ELF object file access library"; homepage = http://www.mr511.de/software/english.html; diff --git a/pkgs/development/libraries/libevent/default.nix b/pkgs/development/libraries/libevent/default.nix index bb854139b79..57cf1738342 100644 --- a/pkgs/development/libraries/libevent/default.nix +++ b/pkgs/development/libraries/libevent/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { ''; meta = { - description = "libevent, an event notification library"; + description = "Event notification library"; longDescription = '' The libevent API provides a mechanism to execute a callback function diff --git a/pkgs/development/libraries/libextractor/default.nix b/pkgs/development/libraries/libextractor/default.nix index 6df5ca683f1..18387c904f8 100644 --- a/pkgs/development/libraries/libextractor/default.nix +++ b/pkgs/development/libraries/libextractor/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { #postInstall = "make check"; meta = { - description = "GNU libextractor, a simple library for keyword extraction"; + description = "Simple library for keyword extraction"; longDescription = '' GNU libextractor is a library used to extract meta-data from files diff --git a/pkgs/development/libraries/libgcrypt/default.nix b/pkgs/development/libraries/libgcrypt/default.nix index ba3de49ede8..f47d3a62729 100644 --- a/pkgs/development/libraries/libgcrypt/default.nix +++ b/pkgs/development/libraries/libgcrypt/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation (rec { ''; meta = { - description = "GNU Libgcrypt, a general-pupose cryptographic library"; + description = "General-pupose cryptographic library"; longDescription = '' GNU Libgcrypt is a general purpose cryptographic library based on diff --git a/pkgs/development/libraries/libiconv/default.nix b/pkgs/development/libraries/libiconv/default.nix index 7b669cd780a..3bdb85a78eb 100644 --- a/pkgs/development/libraries/libiconv/default.nix +++ b/pkgs/development/libraries/libiconv/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { }; meta = { - description = "GNU libiconv, an iconv(3) implementation"; + description = "An iconv(3) implementation"; longDescription = '' Some programs, like mailers and web browsers, must be able to convert diff --git a/pkgs/development/libraries/libidn/default.nix b/pkgs/development/libraries/libidn/default.nix index 802ee9e3e88..37d19d10f29 100644 --- a/pkgs/development/libraries/libidn/default.nix +++ b/pkgs/development/libraries/libidn/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.gnu.org/software/libidn/; - description = "GNU Libidn library for internationalized domain names"; + description = "Library for internationalized domain names"; longDescription = '' GNU Libidn is a fully documented implementation of the diff --git a/pkgs/development/libraries/libksba/default.nix b/pkgs/development/libraries/libksba/default.nix index 5e038ad8572..dbd2516c059 100644 --- a/pkgs/development/libraries/libksba/default.nix +++ b/pkgs/development/libraries/libksba/default.nix @@ -12,6 +12,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.gnupg.org; - description = "Libksba is a CMS and X.509 access library under development"; + description = "CMS and X.509 access library under development"; }; } diff --git a/pkgs/development/libraries/libmicrohttpd/default.nix b/pkgs/development/libraries/libmicrohttpd/default.nix index 959dca47573..39795267a2c 100644 --- a/pkgs/development/libraries/libmicrohttpd/default.nix +++ b/pkgs/development/libraries/libmicrohttpd/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { doCheck = false; meta = { - description = "GNU libmicrohttpd, an embeddable HTTP server library"; + description = "Embeddable HTTP server library"; longDescription = '' GNU libmicrohttpd is a small C library that is supposed to make diff --git a/pkgs/development/libraries/libofa/default.nix b/pkgs/development/libraries/libofa/default.nix index 2e2640e8636..6ffef2140ec 100644 --- a/pkgs/development/libraries/libofa/default.nix +++ b/pkgs/development/libraries/libofa/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://code.google.com/musicip-libofa/; - description = "LibOFA - Library Open Fingerprint Architecture"; + description = "Library Open Fingerprint Architecture"; longDescription = '' LibOFA (Library Open Fingerprint Architecture) is an open-source audio fingerprint created and provided by MusicIP''; diff --git a/pkgs/development/libraries/libsigsegv/default.nix b/pkgs/development/libraries/libsigsegv/default.nix index ae6299286a1..b6be8d194c1 100644 --- a/pkgs/development/libraries/libsigsegv/default.nix +++ b/pkgs/development/libraries/libsigsegv/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.gnu.org/software/libsigsegv/; - description = "GNU libsigsegv, a library to handle page faults in user mode"; + description = "Library to handle page faults in user mode"; longDescription = '' GNU libsigsegv is a library for handling page faults in user mode. A diff --git a/pkgs/development/libraries/libspectre/default.nix b/pkgs/development/libraries/libspectre/default.nix index 7d46f9e32ce..0e5f976c122 100644 --- a/pkgs/development/libraries/libspectre/default.nix +++ b/pkgs/development/libraries/libspectre/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://libspectre.freedesktop.org/; - description = "libspectre, a PostScript rendering library"; + description = "PostScript rendering library"; longDescription = '' libspectre is a small library for rendering Postscript diff --git a/pkgs/development/libraries/libtasn1/default.nix b/pkgs/development/libraries/libtasn1/default.nix index bae22ef220f..5a2508a4506 100644 --- a/pkgs/development/libraries/libtasn1/default.nix +++ b/pkgs/development/libraries/libtasn1/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.gnu.org/software/libtasn1/; - description = "GNU Libtasn1, an ASN.1 library"; + description = "An ASN.1 library"; longDescription = '' Libtasn1 is the ASN.1 library used by GnuTLS, GNU Shishi and some diff --git a/pkgs/development/libraries/libunistring/default.nix b/pkgs/development/libraries/libunistring/default.nix index b578d895c5f..2a87d7a3249 100644 --- a/pkgs/development/libraries/libunistring/default.nix +++ b/pkgs/development/libraries/libunistring/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation (rec { meta = { homepage = http://www.gnu.org/software/libunistring/; - description = "GNU Libunistring, a Unicode string library"; + description = "Unicode string library"; longDescription = '' This library provides functions for manipulating Unicode strings diff --git a/pkgs/development/libraries/libxmi/default.nix b/pkgs/development/libraries/libxmi/default.nix index 85f0dbddb0b..42c427605c4 100644 --- a/pkgs/development/libraries/libxmi/default.nix +++ b/pkgs/development/libraries/libxmi/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { preConfigure = "cp ${libtool}/share/libtool/config/config.sub ."; meta = { - description = "GNU libxmi, a library for rasterizing 2-D vector graphics"; + description = "Library for rasterizing 2-D vector graphics"; homepage = http://www.gnu.org/software/libxmi/; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.gnu; # arbitrary choice diff --git a/pkgs/development/libraries/lightning/default.nix b/pkgs/development/libraries/lightning/default.nix index 951627c81c2..73d98023c84 100644 --- a/pkgs/development/libraries/lightning/default.nix +++ b/pkgs/development/libraries/lightning/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.gnu.org/software/lightning/; - description = "GNU lightning, a run-time code generation library"; + description = "Run-time code generation library"; longDescription = '' GNU lightning is a library that generates assembly language code diff --git a/pkgs/development/libraries/ming/default.nix b/pkgs/development/libraries/ming/default.nix index f9632dca9d2..a470f771561 100644 --- a/pkgs/development/libraries/ming/default.nix +++ b/pkgs/development/libraries/ming/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = { - description = "Ming, a library for generating Flash `.swf' files"; + description = "Library for generating Flash `.swf' files"; longDescription = '' Ming is a library for generating Macromedia Flash files (.swf), diff --git a/pkgs/development/libraries/mpc/default.nix b/pkgs/development/libraries/mpc/default.nix index 652227d47e8..3d05fa2e040 100644 --- a/pkgs/development/libraries/mpc/default.nix +++ b/pkgs/development/libraries/mpc/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = { - description = "GNU MPC, a library for multiprecision complex arithmetic with exact rounding"; + description = "Library for multiprecision complex arithmetic with exact rounding"; longDescription = '' GNU MPC is a C library for the arithmetic of complex numbers with diff --git a/pkgs/development/libraries/mpfr/default.nix b/pkgs/development/libraries/mpfr/default.nix index e3fbaececb9..653481aeccd 100644 --- a/pkgs/development/libraries/mpfr/default.nix +++ b/pkgs/development/libraries/mpfr/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.mpfr.org/; - description = "GNU MPFR, a library for multiple-precision floating-point arithmetic"; + description = "Library for multiple-precision floating-point arithmetic"; longDescription = '' The GNU MPFR library is a C library for multiple-precision diff --git a/pkgs/development/libraries/mpich2/default.nix b/pkgs/development/libraries/mpich2/default.nix index 5fba9c56418..b80d549931c 100644 --- a/pkgs/development/libraries/mpich2/default.nix +++ b/pkgs/development/libraries/mpich2/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation { ''; meta = { - description = "MPICH2, an implementation of the Message Passing Interface (MPI) standard"; + description = "Implementation of the Message Passing Interface (MPI) standard"; longDescription = '' MPICH2 is a free high-performance and portable implementation of diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix index 87953c1158d..631199bf87c 100644 --- a/pkgs/development/libraries/ncurses/default.nix +++ b/pkgs/development/libraries/ncurses/default.nix @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { postFixup = lib.optionalString stdenv.isDarwin "rm $out/lib/*.so"; meta = { - description = "GNU Ncurses, a free software emulation of curses in SVR4 and more"; + description = "Free software emulation of curses in SVR4 and more"; longDescription = '' The Ncurses (new curses) library is a free software emulation of diff --git a/pkgs/development/libraries/nettle/default.nix b/pkgs/development/libraries/nettle/default.nix index 57d3732fa6d..38d197c69ab 100644 --- a/pkgs/development/libraries/nettle/default.nix +++ b/pkgs/development/libraries/nettle/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation (rec { ./cygwin.patch; meta = { - description = "GNU Nettle, a cryptographic library"; + description = "Cryptographic library"; longDescription = '' Nettle is a cryptographic library that is designed to fit diff --git a/pkgs/development/libraries/oniguruma/default.nix b/pkgs/development/libraries/oniguruma/default.nix index 47a51b68d03..08069533713 100644 --- a/pkgs/development/libraries/oniguruma/default.nix +++ b/pkgs/development/libraries/oniguruma/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.geocities.jp/kosako3/oniguruma/; - description = "Oniguruma regular expressions library"; + description = "Regular expressions library"; license = "BSD"; }; } diff --git a/pkgs/development/libraries/opal/default.nix b/pkgs/development/libraries/opal/default.nix index 1f59c0c24a0..c79c3cbe4d6 100644 --- a/pkgs/development/libraries/opal/default.nix +++ b/pkgs/development/libraries/opal/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { patches = [ ./disable-samples-ftbfs.diff ./libav9.patch ./libav10.patch ]; meta = with stdenv.lib; { - description = "OPAL VoIP library"; + description = "VoIP library"; maintainers = [ maintainers.raskin ]; platforms = platforms.linux; }; diff --git a/pkgs/development/libraries/openal/default.nix b/pkgs/development/libraries/openal/default.nix index b5e390eafa8..5a935691ca5 100644 --- a/pkgs/development/libraries/openal/default.nix +++ b/pkgs/development/libraries/openal/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ cmake ] ++ stdenv.lib.optional (!stdenv.isDarwin) alsaLib; meta = { - description = "OpenAL, a cross-platform 3D audio API"; + description = "Cross-platform 3D audio API"; longDescription = '' OpenAL is a cross-platform 3D audio API appropriate for use with diff --git a/pkgs/development/libraries/plib/default.nix b/pkgs/development/libraries/plib/default.nix index 35262f797e9..4ab6fb3ad8b 100644 --- a/pkgs/development/libraries/plib/default.nix +++ b/pkgs/development/libraries/plib/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ]; meta = { - description = "PLIB: A Suite of Portable Game Libraries"; + description = "A suite of portable game libraries"; longDescription = '' PLIB includes sound effects, music, a complete 3D engine, font diff --git a/pkgs/development/libraries/ppl/default.nix b/pkgs/development/libraries/ppl/default.nix index f93eee674ff..9edef767481 100644 --- a/pkgs/development/libraries/ppl/default.nix +++ b/pkgs/development/libraries/ppl/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = { - description = "PPL: The Parma Polyhedra Library"; + description = "The Parma Polyhedra Library"; longDescription = '' The Parma Polyhedra Library (PPL) provides numerical abstractions diff --git a/pkgs/development/libraries/readline/readline6.3.nix b/pkgs/development/libraries/readline/readline6.3.nix index 9f5c9f7b581..17299e5f10d 100644 --- a/pkgs/development/libraries/readline/readline6.3.nix +++ b/pkgs/development/libraries/readline/readline6.3.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation (rec { ]; meta = { - description = "GNU Readline, a library for interactive line editing"; + description = "Library for interactive line editing"; longDescription = '' The GNU Readline library provides a set of functions for use by diff --git a/pkgs/development/libraries/readline/readline6.nix b/pkgs/development/libraries/readline/readline6.nix index 0559113285c..d72d6566bbc 100644 --- a/pkgs/development/libraries/readline/readline6.nix +++ b/pkgs/development/libraries/readline/readline6.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation (rec { import ./readline-6.2-patches.nix patch); meta = { - description = "GNU Readline, a library for interactive line editing"; + description = "Library for interactive line editing"; longDescription = '' The GNU Readline library provides a set of functions for use by diff --git a/pkgs/development/libraries/science/biology/biolib/default.nix b/pkgs/development/libraries/science/biology/biolib/default.nix index 0461e5ebcf5..7418bdb6dfe 100644 --- a/pkgs/development/libraries/science/biology/biolib/default.nix +++ b/pkgs/development/libraries/science/biology/biolib/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://biolib.open-bio.org/"; - description = "BioLib"; + description = "Shared libraries for the major Bio* languages"; license = stdenv.lib.licenses.gpl2; longDescription = '' BioLib brings together a set of opensource libraries written diff --git a/pkgs/development/libraries/szip/default.nix b/pkgs/development/libraries/szip/default.nix index 17f9c973fd0..2ad2ed55d7c 100644 --- a/pkgs/development/libraries/szip/default.nix +++ b/pkgs/development/libraries/szip/default.nix @@ -8,9 +8,7 @@ stdenv.mkDerivation { }; meta = { - description = " - Szip is a compression library that can be used with the hdf5 library. - "; + description = "Compression library that can be used with the hdf5 library"; homepage = http://www.hdfgroup.org/doc_resource/SZIP/; license = stdenv.lib.licenses.unfree; }; diff --git a/pkgs/development/libraries/talloc/default.nix b/pkgs/development/libraries/talloc/default.nix index e04363326d0..15e89d9210a 100644 --- a/pkgs/development/libraries/talloc/default.nix +++ b/pkgs/development/libraries/talloc/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { '' else ""; meta = { - description = "talloc is a hierarchical pool based memory allocator with destructors"; + description = "Hierarchical pool based memory allocator with destructors"; homepage = http://tdb.samba.org/; license = stdenv.lib.licenses.gpl3; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/development/libraries/tdb/default.nix b/pkgs/development/libraries/tdb/default.nix index d0eb8987ea0..c5331656435 100644 --- a/pkgs/development/libraries/tdb/default.nix +++ b/pkgs/development/libraries/tdb/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ libxslt libxml2 docbook_xsl ]; meta = { - description = "TDB, the trivial database"; + description = "The trivial database"; longDescription = '' TDB is a Trivial Database. In concept, it is very much like GDBM, and BSD's DB except that it allows multiple simultaneous writers and diff --git a/pkgs/development/libraries/tecla/default.nix b/pkgs/development/libraries/tecla/default.nix index 6cb20f4e356..f83b34e40d1 100644 --- a/pkgs/development/libraries/tecla/default.nix +++ b/pkgs/development/libraries/tecla/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.astro.caltech.edu/~mcs/tecla/"; - description = "Tecla command-line editing library"; + description = "Command-line editing library"; license = "as-is"; hydraPlatforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/libraries/ucommon/default.nix b/pkgs/development/libraries/ucommon/default.nix index f3ac325b5a1..0e8a95d5ac1 100644 --- a/pkgs/development/libraries/ucommon/default.nix +++ b/pkgs/development/libraries/ucommon/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = { - description = "GNU uCommon C++, C++ library to facilitate using C++ design patterns"; + description = "C++ library to facilitate using C++ design patterns"; homepage = http://www.gnu.org/software/commoncpp/; license = stdenv.lib.licenses.lgpl3Plus; diff --git a/pkgs/development/libraries/v8/default.nix b/pkgs/development/libraries/v8/default.nix index d3a2511c90c..4c86de7fb56 100644 --- a/pkgs/development/libraries/v8/default.nix +++ b/pkgs/development/libraries/v8/default.nix @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { '' else null; meta = with stdenv.lib; { - description = "V8 is Google's open source JavaScript engine"; + description = "Google's open source JavaScript engine"; platforms = platforms.linux ++ platforms.darwin; license = licenses.bsd3; }; diff --git a/pkgs/development/libraries/xapian/default.nix b/pkgs/development/libraries/xapian/default.nix index 99837974b1d..d74a85a9162 100644 --- a/pkgs/development/libraries/xapian/default.nix +++ b/pkgs/development/libraries/xapian/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { buildInputs = [ libuuid zlib ]; meta = { - description = "Xapian Probabilistic Information Retrieval library"; + description = "Search engine library"; homepage = "http://xapian.org"; license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.chaoflow ]; diff --git a/pkgs/development/libraries/xbase/default.nix b/pkgs/development/libraries/xbase/default.nix index 81447276db7..95ba2a05ad9 100644 --- a/pkgs/development/libraries/xbase/default.nix +++ b/pkgs/development/libraries/xbase/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { meta = { homepage = http://linux.techass.com/projects/xdb/; - description = "XBase compatible C++ class library formerly known as XDB"; + description = "C++ class library formerly known as XDB"; platforms = stdenv.lib.platforms.all; maintainers = [ stdenv.lib.maintainers.urkud ]; }; diff --git a/pkgs/development/libraries/xylib/default.nix b/pkgs/development/libraries/xylib/default.nix index 8fff5f39338..fe9b6c5c3ca 100644 --- a/pkgs/development/libraries/xylib/default.nix +++ b/pkgs/development/libraries/xylib/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { buildInputs = [boost zlib bzip2 ]; meta = { - description = "xylib is a portable library for reading files that contain x-y data from powder diffraction, spectroscopy and other experimental methods."; + description = "Portable library for reading files that contain x-y data from powder diffraction, spectroscopy and other experimental methods"; license = "LGPL"; homepage = http://xylib.sourceforge.net/; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/python-modules/ecdsa/default.nix b/pkgs/development/python-modules/ecdsa/default.nix index f668f3c6ac3..a07eceb45aa 100644 --- a/pkgs/development/python-modules/ecdsa/default.nix +++ b/pkgs/development/python-modules/ecdsa/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { meta = { homepage = "http://github.com/warner/python-ecdsa"; - description = "pure-python ECDSA signature/verification"; + description = "Pure-python ECDSA signature/verification"; license = stdenv.lib.licenses.mit; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/numeric/default.nix b/pkgs/development/python-modules/numeric/default.nix index e97b2a5f1a4..0d6d5b0ffed 100644 --- a/pkgs/development/python-modules/numeric/default.nix +++ b/pkgs/development/python-modules/numeric/default.nix @@ -23,7 +23,7 @@ let version = "24.2"; in # FIXME: Run the tests. meta = { - description = "Numeric, a Python module for high-performance, numeric computing"; + description = "A Python module for high-performance, numeric computing"; longDescription = '' Numeric is a Python module for high-performance, numeric @@ -37,4 +37,4 @@ let version = "24.2"; in homepage = http://people.csail.mit.edu/jrennie/python/numeric/; }; - } \ No newline at end of file + } diff --git a/pkgs/development/tools/analysis/lcov/default.nix b/pkgs/development/tools/analysis/lcov/default.nix index 89a17d28a1b..10cdf01103a 100644 --- a/pkgs/development/tools/analysis/lcov/default.nix +++ b/pkgs/development/tools/analysis/lcov/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "LCOV, a code coverage tool that enhances GNU gcov"; + description = "Code coverage tool that enhances GNU gcov"; longDescription = '' LCOV is an extension of GCOV, a GNU tool which provides information diff --git a/pkgs/development/tools/analysis/sparse/default.nix b/pkgs/development/tools/analysis/sparse/default.nix index 6d0e28f0ab2..6898b7eee54 100644 --- a/pkgs/development/tools/analysis/sparse/default.nix +++ b/pkgs/development/tools/analysis/sparse/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = { - description = "Sparse, a semantic parser for C"; + description = "Semantic parser for C"; homepage = "https://git.kernel.org/cgit/devel/sparse/sparse.git/"; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/tools/analysis/valgrind/default.nix b/pkgs/development/tools/analysis/valgrind/default.nix index 5ffc287d114..aaeee026d0a 100644 --- a/pkgs/development/tools/analysis/valgrind/default.nix +++ b/pkgs/development/tools/analysis/valgrind/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.valgrind.org/; - description = "Valgrind, a debugging and profiling tool suite"; + description = "Debugging and profiling tool suite"; longDescription = '' Valgrind is an award-winning instrumentation framework for diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix index b7316fc17c4..a4863d12b5c 100644 --- a/pkgs/development/tools/build-managers/gradle/default.nix +++ b/pkgs/development/tools/build-managers/gradle/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { buildInputs = [ unzip jdk makeWrapper ]; meta = { - description = "Gradle is an enterprise-grade build system"; + description = "Enterprise-grade build system"; longDescription = '' Gradle is a build system which offers you ease, power and freedom. You can choose the balance for yourself. It has powerful multi-project diff --git a/pkgs/development/tools/documentation/doxygen/default.nix b/pkgs/development/tools/documentation/doxygen/default.nix index 54509178b1a..50f2037b271 100644 --- a/pkgs/development/tools/documentation/doxygen/default.nix +++ b/pkgs/development/tools/documentation/doxygen/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation { meta = { license = stdenv.lib.licenses.gpl2Plus; homepage = "http://doxygen.org/"; - description = "Doxygen, a source code documentation generator tool"; + description = "Source code documentation generator tool"; longDescription = '' Doxygen is a documentation system for C++, C, Java, Objective-C, diff --git a/pkgs/development/tools/java/fastjar/default.nix b/pkgs/development/tools/java/fastjar/default.nix index c8bb94412ca..e5a9ca50ce9 100644 --- a/pkgs/development/tools/java/fastjar/default.nix +++ b/pkgs/development/tools/java/fastjar/default.nix @@ -14,7 +14,7 @@ let version = "0.94"; in doCheck = true; meta = { - description = "FastJar, a fast Java archiver written in C"; + description = "Fast Java archiver written in C"; longDescription = '' Fastjar is a version of Sun's `jar' utility, written entirely in C, and diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix index 8d8fc5d464e..fc48a4aabad 100644 --- a/pkgs/development/tools/misc/binutils/default.nix +++ b/pkgs/development/tools/misc/binutils/default.nix @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = { - description = "GNU Binutils, tools for manipulating binaries (linker, assembler, etc.)"; + description = "Tools for manipulating binaries (linker, assembler, etc.)"; longDescription = '' The GNU Binutils are a collection of binary tools. The main diff --git a/pkgs/development/tools/misc/cflow/default.nix b/pkgs/development/tools/misc/cflow/default.nix index 53bc8ed78c8..b1322d461ee 100644 --- a/pkgs/development/tools/misc/cflow/default.nix +++ b/pkgs/development/tools/misc/cflow/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = { - description = "GNU cflow, a tool to analyze the control flow of C programs"; + description = "Tool to analyze the control flow of C programs"; longDescription = '' GNU cflow analyzes a collection of C source files and prints a diff --git a/pkgs/development/tools/misc/coccinelle/default.nix b/pkgs/development/tools/misc/coccinelle/default.nix index 0bf5bbce692..51f5ed6091f 100644 --- a/pkgs/development/tools/misc/coccinelle/default.nix +++ b/pkgs/development/tools/misc/coccinelle/default.nix @@ -37,7 +37,7 @@ in stdenv.mkDerivation { configureFlags = "--enable-release"; meta = { - description = "Coccinelle, a program to apply C code semantic patches"; + description = "Program to apply semantic patches to C code"; longDescription = '' Coccinelle is a program matching and transformation engine which diff --git a/pkgs/development/tools/misc/complexity/default.nix b/pkgs/development/tools/misc/complexity/default.nix index 9f1eca0fa13..a7ae4d17ab1 100644 --- a/pkgs/development/tools/misc/complexity/default.nix +++ b/pkgs/development/tools/misc/complexity/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "GNU Complexity, C code complexity measurement tool"; + description = "C code complexity measurement tool"; longDescription = '' GNU Complexity is a tool designed for analyzing the complexity of C diff --git a/pkgs/development/tools/misc/cppi/default.nix b/pkgs/development/tools/misc/cppi/default.nix index 500129c7c9d..2942408de80 100644 --- a/pkgs/development/tools/misc/cppi/default.nix +++ b/pkgs/development/tools/misc/cppi/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://savannah.gnu.org/projects/cppi/; - description = "GNU cppi, a cpp directive indenter"; + description = "A C preprocessor directive indenter"; longDescription = '' GNU cppi indents C preprocessor directives to reflect their nesting diff --git a/pkgs/development/tools/misc/cscope/default.nix b/pkgs/development/tools/misc/cscope/default.nix index 3a83b1ba325..223f1968274 100644 --- a/pkgs/development/tools/misc/cscope/default.nix +++ b/pkgs/development/tools/misc/cscope/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { }; meta = { - description = "Cscope, a developer's tool for browsing source code"; + description = "A developer's tool for browsing source code"; longDescription = '' Cscope is a developer's tool for browsing source code. It has diff --git a/pkgs/development/tools/misc/ctags/default.nix b/pkgs/development/tools/misc/ctags/default.nix index 80def733cf8..bf13a5daa66 100644 --- a/pkgs/development/tools/misc/ctags/default.nix +++ b/pkgs/development/tools/misc/ctags/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://ctags.sourceforge.net/"; - description = "Exuberant Ctags, a tool for fast source code browsing"; + description = "A tool for fast source code browsing (exuberant ctags)"; license = stdenv.lib.licenses.gpl2Plus; longDescription = '' diff --git a/pkgs/development/tools/misc/gdb/default.nix b/pkgs/development/tools/misc/gdb/default.nix index 2b5ced78063..5ee0f64a4e4 100644 --- a/pkgs/development/tools/misc/gdb/default.nix +++ b/pkgs/development/tools/misc/gdb/default.nix @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { doCheck = false; meta = with stdenv.lib; { - description = "GDB, the GNU Project debugger"; + description = "The GNU Project debugger"; longDescription = '' GDB, the GNU Project debugger, allows you to see what is going diff --git a/pkgs/development/tools/misc/gengetopt/default.nix b/pkgs/development/tools/misc/gengetopt/default.nix index 9926dd6cd33..19e934f884f 100644 --- a/pkgs/development/tools/misc/gengetopt/default.nix +++ b/pkgs/development/tools/misc/gengetopt/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = { - description = "GNU Gengetopt, a command-line option parser generator"; + description = "Command-line option parser generator"; longDescription = '' GNU Gengetopt program generates a C function that uses getopt_long diff --git a/pkgs/development/tools/misc/global/default.nix b/pkgs/development/tools/misc/global/default.nix index d6abf8d10bd..b366feb304a 100644 --- a/pkgs/development/tools/misc/global/default.nix +++ b/pkgs/development/tools/misc/global/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "GNU GLOBAL source code tag system"; + description = "Source code tag system"; longDescription = '' GNU GLOBAL is a source code tagging system that works the same way diff --git a/pkgs/development/tools/misc/gperf/default.nix b/pkgs/development/tools/misc/gperf/default.nix index e25998e5420..f0fd081ec5f 100644 --- a/pkgs/development/tools/misc/gperf/default.nix +++ b/pkgs/development/tools/misc/gperf/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; meta = { - description = "GNU gperf, a perfect hash function generator"; + description = "Perfect hash function generator"; longDescription = '' GNU gperf is a perfect hash function generator. For a given diff --git a/pkgs/development/tools/misc/help2man/default.nix b/pkgs/development/tools/misc/help2man/default.nix index 23bd35c8739..c4ba7073889 100644 --- a/pkgs/development/tools/misc/help2man/default.nix +++ b/pkgs/development/tools/misc/help2man/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = { - description = "GNU help2man generates man pages from `--help' output"; + description = "Generate man pages from `--help' output"; longDescription = '' help2man produces simple manual pages from the ‘--help’ and diff --git a/pkgs/development/tools/misc/libtool/default.nix b/pkgs/development/tools/misc/libtool/default.nix index 5eee9ead5d6..262d8aad23b 100644 --- a/pkgs/development/tools/misc/libtool/default.nix +++ b/pkgs/development/tools/misc/libtool/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { dontPatchShebangs = true; meta = { - description = "GNU Libtool, a generic library support script"; + description = "Generic library support script"; longDescription = '' GNU libtool is a generic library support script. Libtool hides diff --git a/pkgs/development/tools/misc/sloccount/default.nix b/pkgs/development/tools/misc/sloccount/default.nix index 455305be749..1aa9a2c058d 100644 --- a/pkgs/development/tools/misc/sloccount/default.nix +++ b/pkgs/development/tools/misc/sloccount/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "SLOCCount, a set of tools for counting physical Source Lines of Code (SLOC)"; + description = "Set of tools for counting physical Source Lines of Code (SLOC)"; longDescription = '' This is the home page of "SLOCCount", a set of tools for diff --git a/pkgs/development/tools/misc/swig/default.nix b/pkgs/development/tools/misc/swig/default.nix index 09978b5ad65..66d6b65453e 100644 --- a/pkgs/development/tools/misc/swig/default.nix +++ b/pkgs/development/tools/misc/swig/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { configureFlags = stdenv.lib.optionalString stdenv.isDarwin "--disable-ccache"; meta = { - description = "SWIG, an interface compiler that connects C/C++ code to higher-level languages"; + description = "Interface compiler that connects C/C++ code to higher-level languages"; longDescription = '' SWIG is an interface compiler that connects programs written in C and diff --git a/pkgs/development/tools/misc/texinfo/4.13a.nix b/pkgs/development/tools/misc/texinfo/4.13a.nix index 5131d381412..a3155230514 100644 --- a/pkgs/development/tools/misc/texinfo/4.13a.nix +++ b/pkgs/development/tools/misc/texinfo/4.13a.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { #doCheck = true; meta = { - description = "GNU Texinfo, the GNU documentation system"; + description = "The GNU documentation system"; longDescription = '' Texinfo is the official documentation format of the GNU project. diff --git a/pkgs/development/tools/misc/texinfo/5.2.nix b/pkgs/development/tools/misc/texinfo/5.2.nix index 804e7a2527f..62e1ff62d1e 100644 --- a/pkgs/development/tools/misc/texinfo/5.2.nix +++ b/pkgs/development/tools/misc/texinfo/5.2.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.gnu.org/software/texinfo/"; - description = "GNU Texinfo, the GNU documentation system"; + description = "The GNU documentation system"; license = stdenv.lib.licenses.gpl3Plus; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/development/tools/ocaml/omake/default.nix b/pkgs/development/tools/ocaml/omake/default.nix index 22e0d71af4d..300cbbc0a0c 100644 --- a/pkgs/development/tools/ocaml/omake/default.nix +++ b/pkgs/development/tools/ocaml/omake/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation { # buildFlags = "world.opt"; meta = { - description = "Omake build system"; + description = "A build system designed for scalability and portability"; homepage = "${webpage}"; license = "GPL"; }; diff --git a/pkgs/development/tools/parsing/bison/2.x.nix b/pkgs/development/tools/parsing/bison/2.x.nix index 5bf5d7c2e8c..f89e7bca5a7 100644 --- a/pkgs/development/tools/parsing/bison/2.x.nix +++ b/pkgs/development/tools/parsing/bison/2.x.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.gnu.org/software/bison/"; - description = "GNU Bison, a Yacc-compatible parser generator"; + description = "Yacc-compatible parser generator"; license = stdenv.lib.licenses.gpl3Plus; longDescription = '' diff --git a/pkgs/development/tools/parsing/bison/3.x.nix b/pkgs/development/tools/parsing/bison/3.x.nix index 5947f85343c..49602a23201 100644 --- a/pkgs/development/tools/parsing/bison/3.x.nix +++ b/pkgs/development/tools/parsing/bison/3.x.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.gnu.org/software/bison/"; - description = "GNU Bison, a Yacc-compatible parser generator"; + description = "Yacc-compatible parser generator"; license = stdenv.lib.licenses.gpl3Plus; longDescription = '' diff --git a/pkgs/development/tools/profiling/oprofile/default.nix b/pkgs/development/tools/profiling/oprofile/default.nix index e301fe8431a..6c7b2a4d9ae 100644 --- a/pkgs/development/tools/profiling/oprofile/default.nix +++ b/pkgs/development/tools/profiling/oprofile/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "OProfile, a system-wide profiler for Linux"; + description = "System-wide profiler for Linux"; longDescription = '' OProfile is a system-wide profiler for Linux systems, capable of profiling all running code at low overhead. It consists of a diff --git a/pkgs/development/tools/profiling/sysprof/default.nix b/pkgs/development/tools/profiling/sysprof/default.nix index 457a5d1dcaa..826ca93aa7d 100644 --- a/pkgs/development/tools/profiling/sysprof/default.nix +++ b/pkgs/development/tools/profiling/sysprof/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://sysprof.com/; - description = "Sysprof, a system-wide profiler for Linux"; + description = "System-wide profiler for Linux"; license = stdenv.lib.licenses.gpl2Plus; longDescription = '' diff --git a/pkgs/development/tools/sqsh/default.nix b/pkgs/development/tools/sqsh/default.nix index a0f7922b1aa..15a6985b8bf 100644 --- a/pkgs/development/tools/sqsh/default.nix +++ b/pkgs/development/tools/sqsh/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ]; meta = { - description = "SQSH is command line tool for querying Sybase/MSSQL databases"; + description = "Command line tool for querying Sybase/MSSQL databases"; longDescription = '' Sqsh (pronounced skwish) is short for SQshelL (pronounced s-q-shell), diff --git a/pkgs/games/banner/default.nix b/pkgs/games/banner/default.nix index b4e61b6d1d1..b443a76b9a7 100644 --- a/pkgs/games/banner/default.nix +++ b/pkgs/games/banner/default.nix @@ -36,7 +36,7 @@ mkDerivation "banner-1.3.2" "0dc0ac0667b2e884a7f5ad3e467af68cd0fd5917f8c9aa19188 meta = { homepage = "http://shh.thathost.com/pub-unix/"; - description = "print large banners to ASCII terminals"; + description = "Print large banners to ASCII terminals"; license = stdenv.lib.licenses.gpl2; longDescription = '' diff --git a/pkgs/games/chessdb/default.nix b/pkgs/games/chessdb/default.nix index 381e35632a6..224eb6f594a 100644 --- a/pkgs/games/chessdb/default.nix +++ b/pkgs/games/chessdb/default.nix @@ -24,6 +24,6 @@ stdenv.mkDerivation { meta = { homepage = http://chessdb.sourceforge.net/; - description = "ChessDB is a free chess database"; + description = "A free chess database"; }; } diff --git a/pkgs/games/construo/default.nix b/pkgs/games/construo/default.nix index 57d055ed3d3..f94b489908e 100644 --- a/pkgs/games/construo/default.nix +++ b/pkgs/games/construo/default.nix @@ -24,6 +24,6 @@ stdenv.mkDerivation rec { builder = writeScript (name + "-builder") (textClosure localDefs ["preConfigure" "doConfigure" "doMakeInstall" "doForceShare" "doPropagate"]); meta = { - description = "Construo masses and springs simulation"; + description = "Masses and springs simulation game"; }; } diff --git a/pkgs/games/crafty/default.nix b/pkgs/games/crafty/default.nix index 0e2796df22d..351e25388e1 100644 --- a/pkgs/games/crafty/default.nix +++ b/pkgs/games/crafty/default.nix @@ -659,7 +659,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.craftychess.com/; - description = "Crafty is a free, open-source computer chess program developed by Dr. Robert M. Hyatt"; + description = "Chess program developed by Dr. Robert M. Hyatt"; license = stdenv.lib.licenses.unfree; platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.jwiegley ]; diff --git a/pkgs/games/eboard/default.nix b/pkgs/games/eboard/default.nix index 1decee4264a..8dd06fa6a28 100644 --- a/pkgs/games/eboard/default.nix +++ b/pkgs/games/eboard/default.nix @@ -14,6 +14,6 @@ stdenv.mkDerivation { meta = { homepage = http://www.bergo.eng.br/eboard/; - description = "eboard is a chess interface for Unix-like systems"; + description = "Chess interface for Unix-like systems"; }; } diff --git a/pkgs/games/openspades/default.nix b/pkgs/games/openspades/default.nix index 7f11fc82903..c2218d033d7 100644 --- a/pkgs/games/openspades/default.nix +++ b/pkgs/games/openspades/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { else null; meta = with stdenv.lib; { - description = "OpenSpades is a compatible client of Ace of Spades 0.75"; + description = "A compatible client of Ace of Spades 0.75"; homepage = "https://github.com/yvt/openspades/"; license = licenses.gpl3; platforms = platforms.linux; diff --git a/pkgs/games/openttd/default.nix b/pkgs/games/openttd/default.nix index 1b6b7f26a41..ff96622cb59 100644 --- a/pkgs/games/openttd/default.nix +++ b/pkgs/games/openttd/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = ''OpenTTD is an open source clone of the Microprose game "Transport Tycoon Deluxe"''; + description = ''Open source clone of the Microprose game "Transport Tycoon Deluxe"''; longDescription = '' OpenTTD is a transportation economics simulator. In single player mode, players control a transportation business, and use rail, road, sea, and air diff --git a/pkgs/games/opentyrian/default.nix b/pkgs/games/opentyrian/default.nix index cfae6a4bb3e..c435bbe5887 100644 --- a/pkgs/games/opentyrian/default.nix +++ b/pkgs/games/opentyrian/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { "; meta = { - description = ''OpenTyrian is an open source port of the game "Tyrian".''; + description = ''Open source port of the game "Tyrian"''; homepage = https://opentyrian.googlecode.com/; # This does not account of Tyrian data. # license = stdenv.lib.licenses.gpl2; diff --git a/pkgs/games/teeworlds/default.nix b/pkgs/games/teeworlds/default.nix index c685f11c4c1..5276ec4cc34 100644 --- a/pkgs/games/teeworlds/default.nix +++ b/pkgs/games/teeworlds/default.nix @@ -51,7 +51,7 @@ EOF ''; meta = { - description = "Teeworlds, a retro multiplayer shooter game"; + description = "Retro multiplayer shooter game"; longDescription = '' Teeworlds is a free online multiplayer game, available for all diff --git a/pkgs/misc/ghostscript/default.nix b/pkgs/misc/ghostscript/default.nix index 275b93e01b8..b8c879d598b 100644 --- a/pkgs/misc/ghostscript/default.nix +++ b/pkgs/misc/ghostscript/default.nix @@ -12,7 +12,7 @@ assert cupsSupport -> cups != null; let meta_common = { homepage = "http://www.gnu.org/software/ghostscript/"; - description = "GNU Ghostscript, a PostScript interpreter"; + description = "PostScript interpreter (GNU version)"; longDescription = '' Ghostscript is the name of a set of tools that provides (i) an @@ -48,7 +48,7 @@ let }; meta = meta_common // { homepage = "http://www.ghostscript.com/"; - description = "GPL Ghostscript, a PostScript interpreter"; + description = "PostScript interpreter (mainline version)"; }; preConfigure = '' diff --git a/pkgs/misc/xosd/default.nix b/pkgs/misc/xosd/default.nix index d6b73ed16fe..54538be84b4 100644 --- a/pkgs/misc/xosd/default.nix +++ b/pkgs/misc/xosd/default.nix @@ -14,6 +14,6 @@ stdenv.mkDerivation rec { buildInputs = [ libX11 libXext libXt xextproto xproto ]; meta = { - description = "XOSD displays text on your screen"; + description = "Displays text on your screen"; }; } diff --git a/pkgs/os-specific/linux/conky/default.nix b/pkgs/os-specific/linux/conky/default.nix index 92b97ffb592..52e5d95346e 100644 --- a/pkgs/os-specific/linux/conky/default.nix +++ b/pkgs/os-specific/linux/conky/default.nix @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://conky.sourceforge.net/; - description = "Conky is an advanced, highly configurable system monitor based on torsmo"; + description = "Advanced, highly configurable system monitor based on torsmo"; maintainers = [ stdenv.lib.maintainers.guibert ]; license = stdenv.lib.licenses.gpl3Plus; }; diff --git a/pkgs/servers/dico/default.nix b/pkgs/servers/dico/default.nix index ca4980f5a6c..f345fe71a34 100644 --- a/pkgs/servers/dico/default.nix +++ b/pkgs/servers/dico/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "GNU Dico, a flexible dictionary server and client implementing RFC 2229"; + description = "Flexible dictionary server and client implementing RFC 2229"; homepage = http://www.gnu.org/software/dico/; license = "GPLv3+"; maintainers = with maintainers; [ lovek323 ]; diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix index 921d8e907f1..50e71a74546 100644 --- a/pkgs/servers/dns/bind/default.nix +++ b/pkgs/servers/dns/bind/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.isc.org/software/bind"; - description = "ISC BIND: a domain name server"; + description = "Domain name server"; license = stdenv.lib.licenses.isc; maintainers = with stdenv.lib.maintainers; [viric simons]; diff --git a/pkgs/servers/felix/default.nix b/pkgs/servers/felix/default.nix index aa40365e8de..c1114232ea8 100644 --- a/pkgs/servers/felix/default.nix +++ b/pkgs/servers/felix/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { cp -av * $out ''; meta = { - description = "Apache Felix OSGi gateway"; + description = "An OSGi gateway"; homepage = http://felix.apache.org; license = "ASF"; maintainers = [ stdenv.lib.maintainers.sander ]; diff --git a/pkgs/servers/firebird/default.nix b/pkgs/servers/firebird/default.nix index 365af29595c..3e778317169 100644 --- a/pkgs/servers/firebird/default.nix +++ b/pkgs/servers/firebird/default.nix @@ -79,7 +79,7 @@ stdenv.mkDerivation rec { installPhase = ''cp -r gen/firebird $out''; meta = { - description = "firebird database engine"; + description = "SQL relational database management system"; homepage = http://www.firebirdnews.org; license = ["IDPL" "Interbase-1.0"]; maintainers = [stdenv.lib.maintainers.marcweber]; diff --git a/pkgs/servers/http/couchdb/default.nix b/pkgs/servers/http/couchdb/default.nix index 35d4ebbf89f..0b5244a5974 100644 --- a/pkgs/servers/http/couchdb/default.nix +++ b/pkgs/servers/http/couchdb/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "Apache CouchDB is a database that uses JSON for documents, JavaScript for MapReduce queries, and regular HTTP for an API"; + description = "A database that uses JSON for documents, JavaScript for MapReduce queries, and regular HTTP for an API"; homepage = "http://couchdb.apache.org"; license = stdenv.lib.licenses.asl20; maintainers = with stdenv.lib.maintainers; [ viric garbas ]; diff --git a/pkgs/servers/http/jboss/default.nix b/pkgs/servers/http/jboss/default.nix index d5768da4c82..86d37189887 100644 --- a/pkgs/servers/http/jboss/default.nix +++ b/pkgs/servers/http/jboss/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { meta = { homepage = "http://www.jboss.org/"; - description = "JBoss, Open Source J2EE application server"; + description = "Open Source J2EE application server"; license = "GPL/LGPL"; maintainers = [ lib.maintainers.sander ]; }; diff --git a/pkgs/servers/pies/default.nix b/pkgs/servers/pies/default.nix index 958578138bc..56c7da5caed 100644 --- a/pkgs/servers/pies/default.nix +++ b/pkgs/servers/pies/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = { - description = "GNU Pies, a program invocation and execution supervisor"; + description = "A program invocation and execution supervisor"; longDescription = '' The name Pies (pronounced "p-yes") stands for Program Invocation and diff --git a/pkgs/servers/pulseaudio/default.nix b/pkgs/servers/pulseaudio/default.nix index 2c6f6c10493..a918007b47c 100644 --- a/pkgs/servers/pulseaudio/default.nix +++ b/pkgs/servers/pulseaudio/default.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { installFlags = "sysconfdir=$(out)/etc pulseconfdir=$(out)/etc/pulse"; meta = with stdenv.lib; { - description = "PulseAudio, a sound server for POSIX and Win32 systems"; + description = "Sound server for POSIX and Win32 systems"; homepage = http://www.pulseaudio.org/; # Note: Practically, the server is under the GPL due to the # dependency on `libsamplerate'. See `LICENSE' for details. diff --git a/pkgs/servers/shishi/default.nix b/pkgs/servers/shishi/default.nix index 2e0a4e84f6c..a41915e5be8 100644 --- a/pkgs/servers/shishi/default.nix +++ b/pkgs/servers/shishi/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = { - description = "GNU Shishi, free implementation of the Kerberos 5 network security system"; + description = "An implementation of the Kerberos 5 network security system"; homepage = http://www.gnu.org/software/shishi/; license = stdenv.lib.licenses.gpl3Plus; maintainers = with stdenv.lib.maintainers; [ bjg lovek323 ]; diff --git a/pkgs/shells/rush/default.nix b/pkgs/shells/rush/default.nix index e9d0c61ee08..3232caf5848 100644 --- a/pkgs/shells/rush/default.nix +++ b/pkgs/shells/rush/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = { - description = "GNU Rush, Restricted User Shell"; + description = "Restricted User Shell"; longDescription = '' GNU Rush is a Restricted User Shell, designed for sites diff --git a/pkgs/tools/X11/hsetroot/default.nix b/pkgs/tools/X11/hsetroot/default.nix index d91f4bfdf65..e226f1f93c4 100644 --- a/pkgs/tools/X11/hsetroot/default.nix +++ b/pkgs/tools/X11/hsetroot/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { buildInputs = [ imlib2 libX11 libXext ]; meta = { - description = "hsetroot allows you to compose wallpapers ('root pixmaps') for X"; + description = "Allows you to compose wallpapers ('root pixmaps') for X"; homepage = http://thegraveyard.org/hsetroot.html; license = stdenv.lib.licenses.gpl2Plus; }; diff --git a/pkgs/tools/X11/wmctrl/default.nix b/pkgs/tools/X11/wmctrl/default.nix index 3f691b8ecd4..2e23e7bd4de 100644 --- a/pkgs/tools/X11/wmctrl/default.nix +++ b/pkgs/tools/X11/wmctrl/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://tomas.styblo.name/wmctrl/; - description = "wmctrl is a UNIX/Linux command line tool to interact with an EWMH/NetWM compatible X Window Manager"; + description = "Command line tool to interact with an EWMH/NetWM compatible X Window Manager"; license = stdenv.lib.licenses.gpl2; platforms = with stdenv.lib.platforms; all; }; diff --git a/pkgs/tools/X11/xnee/default.nix b/pkgs/tools/X11/xnee/default.nix index 0e92021b62c..35c4ca06c6c 100644 --- a/pkgs/tools/X11/xnee/default.nix +++ b/pkgs/tools/X11/xnee/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = { - description = "GNU Xnee, an X11 event recording and replay tool"; + description = "X11 event recording and replay tool"; longDescription = '' Xnee is a suite of programs that can record, replay and distribute diff --git a/pkgs/tools/X11/xtrace/default.nix b/pkgs/tools/X11/xtrace/default.nix index efc0647f5db..c3c9c70fe92 100644 --- a/pkgs/tools/X11/xtrace/default.nix +++ b/pkgs/tools/X11/xtrace/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { meta = { homepage = http://xtrace.alioth.debian.org/; - description = "xtrace, a tool to trace X11 protocol connections"; + description = "Tool to trace X11 protocol connections"; license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; diff --git a/pkgs/tools/admin/tightvnc/default.nix b/pkgs/tools/admin/tightvnc/default.nix index acb8708ec14..407242cf2d9 100644 --- a/pkgs/tools/admin/tightvnc/default.nix +++ b/pkgs/tools/admin/tightvnc/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { meta = { license = stdenv.lib.licenses.gpl2Plus; homepage = "http://vnc-tight.sourceforge.net/"; - description = "TightVNC is an improved version of VNC"; + description = "Improved version of VNC"; longDescription = '' TightVNC is an improved version of VNC, the great free diff --git a/pkgs/tools/archivers/sharutils/default.nix b/pkgs/tools/archivers/sharutils/default.nix index afd734fbae0..f19564e4ad9 100644 --- a/pkgs/tools/archivers/sharutils/default.nix +++ b/pkgs/tools/archivers/sharutils/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { }; meta = { - description = "GNU Sharutils, tools for remote synchronization and `shell archives'"; + description = "Tools for remote synchronization and `shell archives'"; longDescription = '' GNU shar makes so-called shell archives out of many files, preparing diff --git a/pkgs/tools/backup/partclone/default.nix b/pkgs/tools/backup/partclone/default.nix index b446b06f987..fe2b9e00aaa 100644 --- a/pkgs/tools/backup/partclone/default.nix +++ b/pkgs/tools/backup/partclone/default.nix @@ -17,7 +17,13 @@ stdenv.mkDerivation { installPhase = ''make INSTPREFIX=$out install''; meta = { - description = "Partclone provides utilities to save and restore used blocks on a partition and is designed for higher compatibility of the file system by using existing libraries, e.g. e2fslibs is used to read and write the ext2 partition"; + description = "Utilities to save and restore used blocks on a partition"; + longDescription = '' + Partclone provides utilities to save and restore used blocks on a + partition and is designed for higher compatibility of the file system by + using existing libraries, e.g. e2fslibs is used to read and write the + ext2 partition. + ''; homepage = http://partclone.org; license = stdenv.lib.licenses.gpl2; maintainers = [stdenv.lib.maintainers.marcweber]; diff --git a/pkgs/tools/cd-dvd/xorriso/default.nix b/pkgs/tools/cd-dvd/xorriso/default.nix index 88cca66efb1..218ea9a1e7f 100644 --- a/pkgs/tools/cd-dvd/xorriso/default.nix +++ b/pkgs/tools/cd-dvd/xorriso/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional stdenv.isLinux acl; meta = { - description = "GNU xorriso, an ISO 9660 Rock Ridge file system manipulator"; + description = "ISO 9660 Rock Ridge file system manipulator"; longDescription = '' GNU xorriso copies file objects from POSIX compliant filesystems diff --git a/pkgs/tools/compression/gzip/default.nix b/pkgs/tools/compression/gzip/default.nix index b7bf9c59f49..cc304d9aa1e 100644 --- a/pkgs/tools/compression/gzip/default.nix +++ b/pkgs/tools/compression/gzip/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.gnu.org/software/gzip/; - description = "Gzip, the GNU zip compression program"; + description = "GNU zip compression program"; longDescription = ''gzip (GNU zip) is a popular data compression program written by diff --git a/pkgs/tools/compression/rzip/default.nix b/pkgs/tools/compression/rzip/default.nix index ca8d356abb3..4460ae6edf3 100644 --- a/pkgs/tools/compression/rzip/default.nix +++ b/pkgs/tools/compression/rzip/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { meta = { homepage = http://rzip.samba.org/; - description = "The RZIP compression program"; + description = "Compression program"; license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/tools/filesystems/chunkfs/default.nix b/pkgs/tools/filesystems/chunkfs/default.nix index d91525e348f..f8c6942bad0 100644 --- a/pkgs/tools/filesystems/chunkfs/default.nix +++ b/pkgs/tools/filesystems/chunkfs/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "(Un)ChunkFS is a pair of FUSE filesystems for viewing chunksync-style directory trees as a block device and vice versa."; + description = "FUSE filesystems for viewing chunksync-style directory trees as a block device and vice versa"; homepage = "http://chunkfs.florz.de/"; license = stdenv.lib.licenses.gpl2; platforms = with stdenv.lib.platforms; linux; diff --git a/pkgs/tools/filesystems/encfs/default.nix b/pkgs/tools/filesystems/encfs/default.nix index 9ebab38984b..ea96001a421 100644 --- a/pkgs/tools/filesystems/encfs/default.nix +++ b/pkgs/tools/filesystems/encfs/default.nix @@ -14,6 +14,6 @@ stdenv.mkDerivation { meta = { homepage = http://www.arg0.net/encfs; - description = "EncFS provides an encrypted filesystem in user-space via FUSE"; + description = "Provides an encrypted filesystem in user-space via FUSE"; }; } diff --git a/pkgs/tools/filesystems/mtools/default.nix b/pkgs/tools/filesystems/mtools/default.nix index 0b666f38942..6b9631bfccf 100644 --- a/pkgs/tools/filesystems/mtools/default.nix +++ b/pkgs/tools/filesystems/mtools/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.gnu.org/software/mtools/; - description = "GNU mtools, utilities to access MS-DOS disks"; + description = "Utilities to access MS-DOS disks"; platforms = stdenv.lib.platforms.gnu; # arbitrary choice maintainers = [ ]; }; diff --git a/pkgs/tools/filesystems/svnfs/default.nix b/pkgs/tools/filesystems/svnfs/default.nix index b6a296e6bc7..fba066d0f4c 100644 --- a/pkgs/tools/filesystems/svnfs/default.nix +++ b/pkgs/tools/filesystems/svnfs/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { NIX_LDFLAGS="-lsvn_client-1"; meta = { - description = "SvnFs is a filesystem written using FUSE for accessing Subversion repositories"; + description = "FUSE filesystem for accessing Subversion repositories"; homepage = http://www.jmadden.eu/index.php/svnfs/; license = stdenv.lib.licenses.gpl2; maintainers = [stdenv.lib.maintainers.marcweber]; diff --git a/pkgs/tools/filesystems/wdfs/default.nix b/pkgs/tools/filesystems/wdfs/default.nix index 68d978a2a55..a28d5394fc1 100644 --- a/pkgs/tools/filesystems/wdfs/default.nix +++ b/pkgs/tools/filesystems/wdfs/default.nix @@ -10,6 +10,6 @@ stdenv.mkDerivation rec buildInputs = [fuse glib neon pkgconfig]; meta = { homepage = "http://noedler.de/projekte/wdfs/"; - description = "wdfs a user-space filesystem that allows to mount a webdav share"; + description = "User-space filesystem that allows to mount a webdav share"; }; } diff --git a/pkgs/tools/graphics/cuneiform/default.nix b/pkgs/tools/graphics/cuneiform/default.nix index 2638594903a..0e94571503c 100644 --- a/pkgs/tools/graphics/cuneiform/default.nix +++ b/pkgs/tools/graphics/cuneiform/default.nix @@ -37,6 +37,6 @@ rec { name = "cuneiform-" + version; meta = { inherit version; - description = "Cuneiform OCR"; + description = "Multi-language OCR system"; }; } diff --git a/pkgs/tools/graphics/plotutils/default.nix b/pkgs/tools/graphics/plotutils/default.nix index ae0c4d19731..0f67de3c3ea 100644 --- a/pkgs/tools/graphics/plotutils/default.nix +++ b/pkgs/tools/graphics/plotutils/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = { - description = "GNU Plotutils, a powerful C/C++ library for exporting 2D vector graphics"; + description = "Powerful C/C++ library for exporting 2D vector graphics"; longDescription = '' The GNU plotutils package contains software for both programmers and diff --git a/pkgs/tools/misc/goaccess/default.nix b/pkgs/tools/misc/goaccess/default.nix index 56e18227d66..0f8f82acaed 100644 --- a/pkgs/tools/misc/goaccess/default.nix +++ b/pkgs/tools/misc/goaccess/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ]; meta = { - description = "GoAccess is an open source real-time web log analyzer and interactive viewer that runs in a terminal in *nix systems."; + description = "Real-time web log analyzer and interactive viewer that runs in a terminal in *nix systems"; homepage = http://goaccess.prosoftcorp.com; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; diff --git a/pkgs/tools/misc/idutils/default.nix b/pkgs/tools/misc/idutils/default.nix index 2b2f3aeaca3..503beefa15a 100644 --- a/pkgs/tools/misc/idutils/default.nix +++ b/pkgs/tools/misc/idutils/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { patches = [ ./nix-mapping.patch ]; meta = { - description = "GNU Idutils, a text searching utility"; + description = "Text searching utility"; longDescription = '' An "ID database" is a binary file containing a list of file diff --git a/pkgs/tools/misc/lbdb/default.nix b/pkgs/tools/misc/lbdb/default.nix index 20830bad6bf..6d03b09c588 100644 --- a/pkgs/tools/misc/lbdb/default.nix +++ b/pkgs/tools/misc/lbdb/default.nix @@ -17,6 +17,6 @@ stdenv.mkDerivation { homepage = "http://www.spinnaker.de/lbdb/"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.all; - description = "The Little Brother's Database (lbdb)"; + description = "The Little Brother's Database"; }; } diff --git a/pkgs/tools/misc/ldapvi/default.nix b/pkgs/tools/misc/ldapvi/default.nix index 28d9b4863d4..6dba834e8be 100644 --- a/pkgs/tools/misc/ldapvi/default.nix +++ b/pkgs/tools/misc/ldapvi/default.nix @@ -21,7 +21,11 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "ldapvi is an interactive LDAP client for Unix terminals. Using it, you can update LDAP entries with a text editor"; + description = "Interactive LDAP client for Unix terminals"; + longDescription = '' + ldapvi is an interactive LDAP client for Unix terminals. Using it, you + can update LDAP entries with a text editor. + ''; homepage = http://www.lichteblau.com/ldapvi/; license = licenses.gpl2; maintainers = with maintainers; [ iElectric ]; diff --git a/pkgs/tools/misc/minicom/default.nix b/pkgs/tools/misc/minicom/default.nix index 8ede3aa918b..d731e856790 100644 --- a/pkgs/tools/misc/minicom/default.nix +++ b/pkgs/tools/misc/minicom/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "Minicom, a modem control and terminal emulation program"; + description = "Modem control and terminal emulation program"; homepage = http://alioth.debian.org/projects/minicom/; longDescription = diff --git a/pkgs/tools/misc/most/default.nix b/pkgs/tools/misc/most/default.nix index b7f7842680f..b97d8f0b719 100644 --- a/pkgs/tools/misc/most/default.nix +++ b/pkgs/tools/misc/most/default.nix @@ -20,7 +20,8 @@ stdenv.mkDerivation { buildInputs = [ slang ncurses ]; meta = { - description = '' + description = "A terminal pager similar to 'more' and 'less'"; + longDescription = '' MOST is a powerful paging program for Unix, VMS, MSDOS, and win32 systems. Unlike other well-known paging programs most supports multiple windows and can scroll left and right. Why settle for less? diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/tools/misc/parallel/default.nix index df360bb9804..4b0332c7506 100644 --- a/pkgs/tools/misc/parallel/default.nix +++ b/pkgs/tools/misc/parallel/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = { - description = "GNU Parallel, a shell tool for executing jobs in parallel"; + description = "Shell tool for executing jobs in parallel"; longDescription = '' GNU Parallel is a shell tool for executing jobs in parallel. A job diff --git a/pkgs/tools/misc/parted/default.nix b/pkgs/tools/misc/parted/default.nix index 108d4d5e040..01b9f391a44 100644 --- a/pkgs/tools/misc/parted/default.nix +++ b/pkgs/tools/misc/parted/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { "export PATH=\"${utillinux}/sbin:$PATH\""; meta = { - description = "GNU Parted, a tool to create, destroy, resize, check, and copy partitions"; + description = "Create, destroy, resize, check, and copy partitions"; longDescription = '' GNU Parted is an industrial-strength package for creating, destroying, diff --git a/pkgs/tools/misc/pg_top/default.nix b/pkgs/tools/misc/pg_top/default.nix index 392fcbcc8ff..0d379cd11d4 100644 --- a/pkgs/tools/misc/pg_top/default.nix +++ b/pkgs/tools/misc/pg_top/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { buildInputs = [ncurses postgresql]; meta = { - description = "pg_top is 'top' for PostgreSQL"; + description = "A 'top' like tool for PostgreSQL"; longDescription = '' pg_top allows you to: diff --git a/pkgs/tools/misc/recutils/default.nix b/pkgs/tools/misc/recutils/default.nix index f2f5f37ebe4..4d6829e99a4 100644 --- a/pkgs/tools/misc/recutils/default.nix +++ b/pkgs/tools/misc/recutils/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ curl emacs ] ++ (stdenv.lib.optionals doCheck [ check bc ]); meta = { - description = "GNU Recutils, tools and libraries to access human-editable, text-based databases"; + description = "Tools and libraries to access human-editable, text-based databases"; longDescription = '' GNU Recutils is a set of tools and libraries to access diff --git a/pkgs/tools/misc/time/default.nix b/pkgs/tools/misc/time/default.nix index 3a35e9a9f1c..737ba244fe8 100644 --- a/pkgs/tools/misc/time/default.nix +++ b/pkgs/tools/misc/time/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { patches = [ ./max-resident.patch ]; meta = { - description = "GNU Time, a tool that runs programs and summarizes the system resources they use"; + description = "Tool that runs programs and summarizes the system resources they use"; longDescription = '' The `time' command runs another program, then displays diff --git a/pkgs/tools/misc/tmpwatch/default.nix b/pkgs/tools/misc/tmpwatch/default.nix index c19d58b9816..760f56726fa 100644 --- a/pkgs/tools/misc/tmpwatch/default.nix +++ b/pkgs/tools/misc/tmpwatch/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://fedorahosted.org/tmpwatch/; - description = "The tmpwatch utility recursively searches through specified directories and removes files which have not been accessed in a specified period of time."; + description = "Recursively searches through specified directories and removes files which have not been accessed in a specified period of time"; license = licenses.gpl2; maintainers = with maintainers; [ vlstill ]; platforms = platforms.unix; diff --git a/pkgs/tools/misc/tmux/default.nix b/pkgs/tools/misc/tmux/default.nix index 4acbabb50f9..32f681dabeb 100644 --- a/pkgs/tools/misc/tmux/default.nix +++ b/pkgs/tools/misc/tmux/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://tmux.sourceforge.net/; - description = "tmux is a terminal multiplexer"; + description = "Terminal multiplexer"; longDescription = '' tmux is intended to be a modern, BSD-licensed alternative to programs such as GNU screen. Major features include: diff --git a/pkgs/tools/misc/yad/default.nix b/pkgs/tools/misc/yad/default.nix index fcdf5095d70..d884d48f521 100644 --- a/pkgs/tools/misc/yad/default.nix +++ b/pkgs/tools/misc/yad/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://code.google.com/p/yad/"; - description = "Yad (yet another dialog) is a GUI dialog tool for shell scripts"; + description = "GUI dialog tool for shell scripts"; longDescription = '' Yad (yet another dialog) is a GUI dialog tool for shell scripts. It is a fork of Zenity with many improvements, such as custom buttons, additional diff --git a/pkgs/tools/networking/cntlm/default.nix b/pkgs/tools/networking/cntlm/default.nix index cd3ae12a11b..f890bdddb69 100644 --- a/pkgs/tools/networking/cntlm/default.nix +++ b/pkgs/tools/networking/cntlm/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { ''; meta = { - description = "Cntlm is an NTLM/NTLMv2 authenticating HTTP proxy"; + description = "NTLM/NTLMv2 authenticating HTTP proxy"; homepage = http://cntlm.sourceforge.net/; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.qknight ]; diff --git a/pkgs/tools/networking/connman/default.nix b/pkgs/tools/networking/connman/default.nix index c99af220a56..7d955b44950 100644 --- a/pkgs/tools/networking/connman/default.nix +++ b/pkgs/tools/networking/connman/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation { ''; meta = { - description = "The ConnMan project provides a daemon for managing internet connections"; + description = "Provides a daemon for managing internet connections"; homepage = "https://connman.net/"; maintainers = [ stdenv.lib.maintainers.matejc ]; # tested only on linux, might work on others also diff --git a/pkgs/tools/networking/flvstreamer/default.nix b/pkgs/tools/networking/flvstreamer/default.nix index f9322129612..ab8e14fddd0 100644 --- a/pkgs/tools/networking/flvstreamer/default.nix +++ b/pkgs/tools/networking/flvstreamer/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "flvstreamer is an command-line RTMP client"; + description = "Command-line RTMP client"; longDescription = '' flvstreamer is an open source command-line RTMP client intended to diff --git a/pkgs/tools/networking/host/default.nix b/pkgs/tools/networking/host/default.nix index c74dbe52829..54cb8b21aaf 100644 --- a/pkgs/tools/networking/host/default.nix +++ b/pkgs/tools/networking/host/default.nix @@ -18,7 +18,7 @@ let version = "20000331"; in installTargets = "install man"; meta = { - description = "`host', a DNS resolution utility"; + description = "DNS resolution utility"; license = "BSD-style"; }; } diff --git a/pkgs/tools/networking/inetutils/default.nix b/pkgs/tools/networking/inetutils/default.nix index 20ee6da8a30..a6a921f6f58 100644 --- a/pkgs/tools/networking/inetutils/default.nix +++ b/pkgs/tools/networking/inetutils/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "GNU Inetutils, a collection of common network programs"; + description = "Collection of common network programs"; longDescription = '' The GNU network utilities suite provides the diff --git a/pkgs/tools/networking/jnettop/default.nix b/pkgs/tools/networking/jnettop/default.nix index 49753d189d6..cfeaf47fdf2 100644 --- a/pkgs/tools/networking/jnettop/default.nix +++ b/pkgs/tools/networking/jnettop/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { preConfigure = '' autoconf ''; meta = { - description = "Jnettop, a network traffic visualizer"; + description = "Network traffic visualizer"; longDescription = '' Jnettop is a traffic visualiser, which captures traffic going diff --git a/pkgs/tools/networking/lsh/default.nix b/pkgs/tools/networking/lsh/default.nix index 6be4119469e..c86dba91f5e 100644 --- a/pkgs/tools/networking/lsh/default.nix +++ b/pkgs/tools/networking/lsh/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { buildInputs = [ gperf guile gmp zlib liboop readline gnum4 pam ]; meta = { - description = "GNU lsh, a GPL'd implementation of the SSH protocol"; + description = "GPL'd implementation of the SSH protocol"; longDescription = '' lsh is a free implementation (in the GNU sense) of the ssh diff --git a/pkgs/tools/networking/mailutils/default.nix b/pkgs/tools/networking/mailutils/default.nix index 4c1001310ae..0ee49032704 100755 --- a/pkgs/tools/networking/mailutils/default.nix +++ b/pkgs/tools/networking/mailutils/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { doCheck = false; meta = { - description = "GNU Mailutils is a rich and powerful protocol-independent mail framework"; + description = "Rich and powerful protocol-independent mail framework"; longDescription = '' GNU Mailutils is a rich and powerful protocol-independent mail diff --git a/pkgs/tools/networking/minidlna/default.nix b/pkgs/tools/networking/minidlna/default.nix index 02013d8ede6..9db42f09d81 100644 --- a/pkgs/tools/networking/minidlna/default.nix +++ b/pkgs/tools/networking/minidlna/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { buildInputs = [ ffmpeg flac libvorbis libogg libid3tag libexif libjpeg sqlite ]; meta = { - description = "MiniDLNA Media Server"; + description = "Media server software"; longDescription = '' MiniDLNA (aka ReadyDLNA) is server software with the aim of being fully compliant with DLNA/UPnP-AV clients. diff --git a/pkgs/tools/networking/tcpdump/default.nix b/pkgs/tools/networking/tcpdump/default.nix index 2e27c2b2dc3..ed295e95a38 100644 --- a/pkgs/tools/networking/tcpdump/default.nix +++ b/pkgs/tools/networking/tcpdump/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { }; meta = { - description = "tcpdump, a famous network sniffer"; + description = "Network sniffer"; homepage = http://www.tcpdump.org/; license = "BSD-style"; maintainers = stdenv.lib.maintainers.mornfall; diff --git a/pkgs/tools/networking/wget/default.nix b/pkgs/tools/networking/wget/default.nix index 6ff5439c4bc..27d7fe2572a 100644 --- a/pkgs/tools/networking/wget/default.nix +++ b/pkgs/tools/networking/wget/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { doCheck = (perl != null); meta = { - description = "GNU Wget, a tool for retrieving files using HTTP, HTTPS, and FTP"; + description = "Tool for retrieving files using HTTP, HTTPS, and FTP"; longDescription = '' GNU Wget is a free software package for retrieving files using HTTP, diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index b2e86935b50..6631214f39a 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -66,7 +66,14 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = { - description = "The Nix Deployment System"; + description = "Powerful package manager that makes package management reliable and reproducible"; + longDescription = '' + Nix is a powerful package manager for Linux and other Unix systems that + makes package management reliable and reproducible. It provides atomic + upgrades and rollbacks, side-by-side installation of multiple versions of + a package, multi-user package management and easy setup of build + environments. + ''; homepage = http://nixos.org/; license = stdenv.lib.licenses.lgpl2Plus; maintainers = [ stdenv.lib.maintainers.eelco ]; diff --git a/pkgs/tools/security/scrypt/default.nix b/pkgs/tools/security/scrypt/default.nix index fe2a19491d9..668a7605115 100644 --- a/pkgs/tools/security/scrypt/default.nix +++ b/pkgs/tools/security/scrypt/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ openssl ]; meta = { - description = "The scrypt encryption utility"; + description = "Encryption utility"; homepage = https://www.tarsnap.com/scrypt.html; license = stdenv.lib.licenses.bsd2; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/tools/security/steghide/default.nix b/pkgs/tools/security/steghide/default.nix index bc87c091a58..03e8c727022 100644 --- a/pkgs/tools/security/steghide/default.nix +++ b/pkgs/tools/security/steghide/default.nix @@ -7,7 +7,7 @@ meta = with stdenv.lib; { homepage = http://steghide.sourceforge.net/; - description = "Steghide is a steganography program that is able to hide data in various kinds of image- and audio-files."; + description = "Steganography program that is able to hide data in various kinds of image- and audio-files"; license = licenses.gpl2; }; diff --git a/pkgs/tools/security/tboot/default.nix b/pkgs/tools/security/tboot/default.nix index 1c9967edc47..854f67f2aee 100644 --- a/pkgs/tools/security/tboot/default.nix +++ b/pkgs/tools/security/tboot/default.nix @@ -21,9 +21,7 @@ stdenv.mkDerivation rec { installFlags = "DESTDIR=$(out)"; meta = with stdenv.lib; { - description = ''Trusted Boot (tboot) is an open source, pre-kernel/VMM module that uses - Intel(R) Trusted Execution Technology (Intel(R) TXT) to perform a measured - and verified launch of an OS kernel/VMM.''; + description = "A pre-kernel/VMM module that uses Intel(R) TXT to perform a measured and verified launch of an OS kernel/VMM"; homepage = http://sourceforge.net/projects/tboot/; license = licenses.bsd3; maintainers = [ maintainers.ak ]; diff --git a/pkgs/tools/security/tor/default.nix b/pkgs/tools/security/tor/default.nix index d71bbd891f9..3318d0c1102 100644 --- a/pkgs/tools/security/tor/default.nix +++ b/pkgs/tools/security/tor/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.torproject.org/; repositories.git = https://git.torproject.org/git/tor; - description = "Tor, an anonymous network router to improve privacy on the Internet"; + description = "Anonymous network router to improve privacy on the Internet"; longDescription='' Tor protects you by bouncing your communications around a distributed diff --git a/pkgs/tools/security/tpm-tools/default.nix b/pkgs/tools/security/tpm-tools/default.nix index 95b3b6b51f7..6e7ff75a6a4 100644 --- a/pkgs/tools/security/tpm-tools/default.nix +++ b/pkgs/tools/security/tpm-tools/default.nix @@ -14,9 +14,12 @@ stdenv.mkDerivation rec { buildInputs = [ trousers openssl ]; meta = with stdenv.lib; { - description = ''tpm-tools is an open-source package designed to enable user and application - enablement of Trusted Computing using a Trusted Platform Module (TPM), - similar to a smart card environment.''; + description = "Management tools for TPM hardware"; + longDescription = '' + tpm-tools is an open-source package designed to enable user and + application enablement of Trusted Computing using a Trusted Platform + Module (TPM), similar to a smart card environment. + ''; homepage = http://sourceforge.net/projects/trousers/files/tpm-tools/; license = licenses.cpl10; maintainers = [ maintainers.ak ]; diff --git a/pkgs/tools/security/trousers/default.nix b/pkgs/tools/security/trousers/default.nix index 4c2af359b96..fe797291f9e 100644 --- a/pkgs/tools/security/trousers/default.nix +++ b/pkgs/tools/security/trousers/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { NIX_LDFLAGS = "-lgcc_s"; meta = with stdenv.lib; { - description = "TrouSerS is an CPL (Common Public License) licensed Trusted Computing Software Stack."; + description = "Trusted computing software stack"; homepage = http://trousers.sourceforge.net/; license = licenses.cpl10; maintainers = [ maintainers.ak ]; diff --git a/pkgs/tools/system/cron/default.nix b/pkgs/tools/system/cron/default.nix index 6132abc0879..0cf29a67b9d 100644 --- a/pkgs/tools/system/cron/default.nix +++ b/pkgs/tools/system/cron/default.nix @@ -22,6 +22,6 @@ stdenv.mkDerivation { preInstall = "mkdir -p $out/bin $out/sbin $out/share/man/man1 $out/share/man/man5 $out/share/man/man8"; meta = { - description = "Vixie Cron, a daemon for running commands at specific times"; + description = "Daemon for running commands at specific times (Vixie Cron)"; }; } diff --git a/pkgs/tools/system/freeipmi/default.nix b/pkgs/tools/system/freeipmi/default.nix index 21a67dba305..48562adffeb 100644 --- a/pkgs/tools/system/freeipmi/default.nix +++ b/pkgs/tools/system/freeipmi/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = { - description = "GNU FreeIPMI, an implementation of the Intelligent Platform Management Interface"; + description = "Implementation of the Intelligent Platform Management Interface"; longDescription = '' GNU FreeIPMI provides in-band and out-of-band IPMI software based on diff --git a/pkgs/tools/system/hardlink/default.nix b/pkgs/tools/system/hardlink/default.nix index 982aac3c990..6ae92b685cc 100644 --- a/pkgs/tools/system/hardlink/default.nix +++ b/pkgs/tools/system/hardlink/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { meta = { homepage = "http://pkgs.fedoraproject.org/cgit/hardlink.git/"; - description = "consolidate duplicate files via hardlinks"; + description = "Consolidate duplicate files via hardlinks"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/tools/system/mcron/default.nix b/pkgs/tools/system/mcron/default.nix index 4bf95895996..842529c573f 100644 --- a/pkgs/tools/system/mcron/default.nix +++ b/pkgs/tools/system/mcron/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = { - description = "GNU mcron, a flexible implementation of `cron' in Guile"; + description = "Flexible implementation of `cron' in Guile"; longDescription = '' The GNU package mcron (Mellor's cron) is a 100% compatible diff --git a/pkgs/tools/text/enscript/default.nix b/pkgs/tools/text/enscript/default.nix index fe11ec59246..797f5b8b692 100644 --- a/pkgs/tools/text/enscript/default.nix +++ b/pkgs/tools/text/enscript/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = { - description = "GNU Enscript, a converter from ASCII to PostScript, HTML, or RTF"; + description = "Converter from ASCII to PostScript, HTML, or RTF"; longDescription = '' GNU Enscript converts ASCII files to PostScript, HTML, or RTF and diff --git a/pkgs/tools/text/mpage/default.nix b/pkgs/tools/text/mpage/default.nix index 5b95c37c732..c147b3ea301 100644 --- a/pkgs/tools/text/mpage/default.nix +++ b/pkgs/tools/text/mpage/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "Mpage, many-to-one page printing utility"; + description = "Many-to-one page printing utility"; longDescription = '' Mpage reads plain text files or PostScript documents and prints diff --git a/pkgs/tools/text/namazu/default.nix b/pkgs/tools/text/namazu/default.nix index fba52b69fba..72caa7ba5cb 100644 --- a/pkgs/tools/text/namazu/default.nix +++ b/pkgs/tools/text/namazu/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { doCheck = !stdenv.isLinux; meta = { - description = "Namazu, a full-text search engine"; + description = "Full-text search engine"; longDescription = '' Namazu is a full-text search engine intended for easy use. Not diff --git a/pkgs/tools/text/wdiff/default.nix b/pkgs/tools/text/wdiff/default.nix index e6fc3510cd4..c07caad15a3 100644 --- a/pkgs/tools/text/wdiff/default.nix +++ b/pkgs/tools/text/wdiff/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.gnu.org/software/wdiff/; - description = "GNU wdiff, comparing files on a word by word basis"; + description = "Comparing files on a word by word basis"; license = stdenv.lib.licenses.gpl3Plus; maintainers = [ stdenv.lib.maintainers.eelco ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/tools/typesetting/lout/default.nix b/pkgs/tools/typesetting/lout/default.nix index c0fc4336297..a2ebfa0a9fd 100644 --- a/pkgs/tools/typesetting/lout/default.nix +++ b/pkgs/tools/typesetting/lout/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { builder = ./builder.sh; meta = { - description = "Lout, a document layout system similar in style to LaTeX"; + description = "Document layout system similar in style to LaTeX"; longDescription = '' The Lout document formatting system is now reads a high-level diff --git a/pkgs/tools/typesetting/rubber/default.nix b/pkgs/tools/typesetting/rubber/default.nix index 8344735606c..32545abaff2 100644 --- a/pkgs/tools/typesetting/rubber/default.nix +++ b/pkgs/tools/typesetting/rubber/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { patchPhase = "substituteInPlace configure --replace which \"type -P\""; meta = { - description = "Rubber, a wrapper for LaTeX and friends"; + description = "Wrapper for LaTeX and friends"; longDescription = '' Rubber is a program whose purpose is to handle all tasks related diff --git a/pkgs/tools/typesetting/xmlto/default.nix b/pkgs/tools/typesetting/xmlto/default.nix index 1b0602063e9..a1eee51b34d 100644 --- a/pkgs/tools/typesetting/xmlto/default.nix +++ b/pkgs/tools/typesetting/xmlto/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "xmlto, a front-end to an XSL toolchain"; + description = "Front-end to an XSL toolchain"; longDescription = '' xmlto is a front-end to an XSL toolchain. It chooses an diff --git a/pkgs/tools/video/dvgrab/default.nix b/pkgs/tools/video/dvgrab/default.nix index faaea6aaffc..73986b5be05 100644 --- a/pkgs/tools/video/dvgrab/default.nix +++ b/pkgs/tools/video/dvgrab/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { ]; meta = { - description = "dvgrab, receive and store audio & video over IEEE1394"; + description = "Receive and store audio & video over IEEE1394"; longDescription = '' dvgrab receives audio and video data from a digital camcorder via an -- cgit 1.4.1 From 2053c7d8bea4a5acce6699ff56508889c10174df Mon Sep 17 00:00:00 2001 From: Markus Kohlhase Date: Sun, 24 Aug 2014 22:16:24 +0200 Subject: added xinput_calibrator v0.7.5 --- pkgs/tools/X11/xinput_calibrator/default.nix | 21 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/tools/X11/xinput_calibrator/default.nix (limited to 'pkgs/tools') diff --git a/pkgs/tools/X11/xinput_calibrator/default.nix b/pkgs/tools/X11/xinput_calibrator/default.nix new file mode 100644 index 00000000000..8f21f6558ff --- /dev/null +++ b/pkgs/tools/X11/xinput_calibrator/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchurl, libXi, inputproto, autoconf, automake, libtool, m4, x11, pkgconfig }: + +stdenv.mkDerivation rec { + version = "0.7.5"; + name = "xinput_calibrator"; + src = fetchurl { + url = "https://github.com/tias/${name}/archive/v${version}.tar.gz"; + sha256 = "d8edbf84523d60f52311d086a1e3ad0f3536f448360063dd8029bf6290aa65e9"; + }; + + preConfigure = "./autogen.sh --with-gui=X11"; + + buildInputs = [ inputproto libXi autoconf automake libtool m4 x11 pkgconfig ]; + + meta = { + homepage = https://github.com/tias/xinput_calibrator; + description = "A generic touchscreen calibration program for X.Org"; + license = stdenv.lib.licenses.mit; + maintainers = [ stdenv.lib.maintainers.flosse ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8f7723fde9f..668bd590c27 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11474,6 +11474,10 @@ let xboxdrv = callPackage ../misc/drivers/xboxdrv { }; + xinput_calibrator = callPackage ../tools/X11/xinput_calibrator { + inherit (xlibs) libXi inputproto; + }; + xosd = callPackage ../misc/xosd { }; xsane = callPackage ../applications/graphics/sane/xsane.nix { -- cgit 1.4.1 From 21a4539698909165b10d54d09dcff09d1a286037 Mon Sep 17 00:00:00 2001 From: Philip Horger Date: Sun, 24 Aug 2014 03:47:29 +0200 Subject: Initial packaging for pnmixer --- pkgs/tools/audio/pnmixer/default.nix | 32 ++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/tools/audio/pnmixer/default.nix (limited to 'pkgs/tools') diff --git a/pkgs/tools/audio/pnmixer/default.nix b/pkgs/tools/audio/pnmixer/default.nix new file mode 100644 index 00000000000..e12a0dfc891 --- /dev/null +++ b/pkgs/tools/audio/pnmixer/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchgit, alsaLib, pkgconfig, gtk3, glibc, autoconf, automake, libnotify, libX11, gettext }: + +stdenv.mkDerivation rec { + name = "pa-applet"; + + src = fetchgit { + url = "git://github.com/nicklan/pnmixer.git"; + rev = "1e09a075c0c63d8b161b13ea92528a798bdb464a"; + sha256 = "15k689xycpc6pvq9vgg9ak92b9sg09dh4yrh83kjcaws63alrzl5"; + }; + + buildInputs = [ + alsaLib pkgconfig gtk3 glibc autoconf automake libnotify libX11 gettext + ]; + + preConfigure = '' + ./autogen.sh + ''; + + # work around a problem related to gtk3 updates + NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations"; + + postInstall = '' + ''; + + meta = with stdenv.lib; { + description = ""; + license = licenses.gpl3; + maintainers = with maintainers; [ iElectric ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 668bd590c27..a66d8a4618a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1643,6 +1643,8 @@ let pa_applet = callPackage ../tools/audio/pa-applet { }; + pnmixer = callPackage ../tools/audio/pnmixer { }; + nifskope = callPackage ../tools/graphics/nifskope { }; nilfs_utils = callPackage ../tools/filesystems/nilfs-utils {}; -- cgit 1.4.1 From 83c5a3d22d3a4cb4e99f5efcbeb20010a635c7b0 Mon Sep 17 00:00:00 2001 From: Philip Horger Date: Sun, 24 Aug 2014 03:57:00 +0200 Subject: pnmixer: Add maintainer and fix name --- lib/maintainers.nix | 1 + pkgs/tools/audio/pnmixer/default.nix | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'pkgs/tools') diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 6fadaa10952..67936416ae8 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -30,6 +30,7 @@ bodil = "Bodil Stokke "; bosu = "Boris Sukholitko "; calrama = "Moritz Maxeiner "; + campadrenalin = "Philip Horger "; cfouche = "Chaddaï Fouché "; chaoflow = "Florian Friesdorf "; coconnor = "Corey O'Connor "; diff --git a/pkgs/tools/audio/pnmixer/default.nix b/pkgs/tools/audio/pnmixer/default.nix index e12a0dfc891..c32f39eec08 100644 --- a/pkgs/tools/audio/pnmixer/default.nix +++ b/pkgs/tools/audio/pnmixer/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit, alsaLib, pkgconfig, gtk3, glibc, autoconf, automake, libnotify, libX11, gettext }: stdenv.mkDerivation rec { - name = "pa-applet"; + name = "pnmixer"; src = fetchgit { url = "git://github.com/nicklan/pnmixer.git"; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = ""; license = licenses.gpl3; - maintainers = with maintainers; [ iElectric ]; + maintainers = with maintainers; [ campadrenalin ]; platforms = platforms.linux; }; } -- cgit 1.4.1 From e29311297609caf2d37327df699fd07f7992f1ae Mon Sep 17 00:00:00 2001 From: Philip Horger Date: Sun, 24 Aug 2014 18:56:29 -0700 Subject: pnmixer: Add description field --- pkgs/tools/audio/pnmixer/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs/tools') diff --git a/pkgs/tools/audio/pnmixer/default.nix b/pkgs/tools/audio/pnmixer/default.nix index c32f39eec08..4d966eb5e97 100644 --- a/pkgs/tools/audio/pnmixer/default.nix +++ b/pkgs/tools/audio/pnmixer/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = ""; + description = "ALSA mixer for the system tray."; license = licenses.gpl3; maintainers = with maintainers; [ campadrenalin ]; platforms = platforms.linux; -- cgit 1.4.1 From e3fe98044c2f9359ff9af2fa265751ec9118d10a Mon Sep 17 00:00:00 2001 From: Domen Kožar Date: Mon, 25 Aug 2014 10:04:49 +0200 Subject: pnmixer: cleanup --- pkgs/tools/audio/pnmixer/default.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'pkgs/tools') diff --git a/pkgs/tools/audio/pnmixer/default.nix b/pkgs/tools/audio/pnmixer/default.nix index 4d966eb5e97..d7964c0961c 100644 --- a/pkgs/tools/audio/pnmixer/default.nix +++ b/pkgs/tools/audio/pnmixer/default.nix @@ -20,11 +20,8 @@ stdenv.mkDerivation rec { # work around a problem related to gtk3 updates NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations"; - postInstall = '' - ''; - meta = with stdenv.lib; { - description = "ALSA mixer for the system tray."; + description = "ALSA mixer for the system tray"; license = licenses.gpl3; maintainers = with maintainers; [ campadrenalin ]; platforms = platforms.linux; -- cgit 1.4.1 From fbecc676e595e31c41c4ecf0347104d2378b7989 Mon Sep 17 00:00:00 2001 From: Domen Kožar Date: Mon, 25 Aug 2014 11:38:48 +0200 Subject: wgetpaste: 2.23 -> 2.25 --- pkgs/tools/text/wgetpaste/default.nix | 51 ++++++++++++++++++----------------- 1 file changed, 26 insertions(+), 25 deletions(-) (limited to 'pkgs/tools') diff --git a/pkgs/tools/text/wgetpaste/default.nix b/pkgs/tools/text/wgetpaste/default.nix index 7635e042499..3c0af0157a5 100644 --- a/pkgs/tools/text/wgetpaste/default.nix +++ b/pkgs/tools/text/wgetpaste/default.nix @@ -1,28 +1,29 @@ -{stdenv, fetchurl, wget, bash, coreutils}: - stdenv.mkDerivation rec { - version = "2.23"; - name = "wgetpaste-${version}"; - src = fetchurl { - url = "http://wgetpaste.zlin.dk/${name}.tar.bz2"; - sha256 = "1xam745f5pmqi16br72a866117hnmcfwjyvsw1jhg3npbdnm9x6n"; - }; - # currently zsh-autocompletion support is not installed +{ stdenv, fetchurl, wget, bash, coreutils }: - prePatch = '' - substituteInPlace wgetpaste --replace "/usr/bin/env bash" "${bash}/bin/bash" - substituteInPlace wgetpaste --replace "LC_ALL=C wget" "LC_ALL=C ${wget}/bin/wget" - ''; +stdenv.mkDerivation rec { + version = "2.25"; + name = "wgetpaste-${version}"; + src = fetchurl { + url = "http://wgetpaste.zlin.dk/${name}.tar.bz2"; + sha256 = "1x209j85mryp3hxmv1gfsbvw03k306k5fa65ky0zxx07cs70fzka"; + }; + # currently zsh-autocompletion support is not installed - installPhase = '' - mkdir -p $out/bin; - cp wgetpaste $out/bin; - ''; + prePatch = '' + substituteInPlace wgetpaste --replace "/usr/bin/env bash" "${bash}/bin/bash" + substituteInPlace wgetpaste --replace "LC_ALL=C wget" "LC_ALL=C ${wget}/bin/wget" + ''; - meta = { - description = "Command-line interface to various pastebins"; - homepage = http://wgetpaste.zlin.dk/; - license = "publicDomain"; - maintainers = with stdenv.lib.maintainers; [qknight]; - platforms = stdenv.lib.platforms.all; - }; - } + installPhase = '' + mkdir -p $out/bin; + cp wgetpaste $out/bin; + ''; + + meta = { + description = "Command-line interface to various pastebins"; + homepage = http://wgetpaste.zlin.dk/; + license = "publicDomain"; + maintainers = with stdenv.lib.maintainers; [ qknight iElectric ]; + platforms = stdenv.lib.platforms.all; + }; +} -- cgit 1.4.1 From 6bda0b00e0bfc971162ffdc1900d64eddcdd425c Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 24 Aug 2014 07:19:55 -0500 Subject: atftp: new expression for version 0.7.1 --- pkgs/tools/networking/atftp/default.nix | 72 +++++++++------------------------ 1 file changed, 20 insertions(+), 52 deletions(-) (limited to 'pkgs/tools') diff --git a/pkgs/tools/networking/atftp/default.nix b/pkgs/tools/networking/atftp/default.nix index 225c3c04f7a..acd71ea893d 100644 --- a/pkgs/tools/networking/atftp/default.nix +++ b/pkgs/tools/networking/atftp/default.nix @@ -1,59 +1,27 @@ -x@{builderDefsPackage - , readline, tcp_wrappers, pcre, runCommand - , ...}: -builderDefsPackage -(a : -let - helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ - []; +{ stdenv, fetchurl, pcre, readline }: - buildInputs = map (n: builtins.getAttr n x) - (builtins.attrNames (builtins.removeAttrs x helperArgNames)); - sourceInfo = rec { - baseName="atftp"; - version="0.7"; - name="${baseName}-${version}"; - url="mirror://debian/pool/main/a/atftp/atftp_${version}.dfsg.orig.tar.gz"; - hash="0nd5dl14d6z5abgcbxcn41rfn3syza6s57bbgh4aq3r9cxdmz08q"; - }; -in -rec { - src = a.fetchurl { - url = sourceInfo.url; - sha256 = sourceInfo.hash; - }; - - inherit (sourceInfo) name version; - inherit buildInputs; +stdenv.mkDerivation { + name = "atftp-0.7.1"; - /* doConfigure should be removed if not needed */ - phaseNames = ["doPatch" "doConfigure" "doMakeInstall"]; - - debianPatchGz = a.fetchurl { - url = ftp://ftp.ru.debian.org/pub/debian/pool/main/a/atftp/atftp_0.7.dfsg-11.diff.gz; - sha256 = "07g4qbmp0lnscg2dkj6nsj657jaghibvfysdm1cdxcn215n3zwqd"; + src = fetchurl { + url = "mirror://sourceforge/atftp/atftp-0.7.1.tar.gz"; + sha256 = "0bgr31gbnr3qx4ixf8hz47l58sh3367xhcnfqd8233fvr84nyk5f"; }; - debianPatch = a.runCommand "atftp-0.7.dfsg-11" {} '' - gunzip < "${debianPatchGz}" > "$out" - ''; + buildInputs = [ pcre readline ]; - patches = [debianPatch]; + NIX_LDFLAGS = "-lgcc_s"; # for pthread_cancel - meta = { - description = "Advanced tftp tools"; - maintainers = with a.lib.maintainers; - [ - raskin - ]; - platforms = with a.lib.platforms; - linux; - license = a.lib.licenses.gpl2Plus; - }; - passthru = { - updateInfo = { - downloadPage = "http://packages.debian.org/source/sid/atftp"; - }; - }; -}) x + configureFlags = [ + "--enable-libreadline" + "--enable-libpcre" + "--enable-mtftp" + ]; + meta = with stdenv.lib; { + description = "Advanced TFTP server and client"; + homepage = http://sourceforge.net/projects/atftp/; + license = licenses.gpl2Plus; + platforms = platforms.linux; + }; +} -- cgit 1.4.1 From 963b97088fb8451c53485577873c40e067a0554d Mon Sep 17 00:00:00 2001 From: William Roe Date: Tue, 29 Jul 2014 14:10:25 +0100 Subject: Logstash-forwarder requires Go-1.1/1.2 The SSL stuff in it doesn't work right with Go 1.3 yet. 1.2 doesn't have a derivation for darwin, so go 1.1 should work for everyone --- pkgs/tools/misc/logstash-forwarder/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/tools') diff --git a/pkgs/tools/misc/logstash-forwarder/default.nix b/pkgs/tools/misc/logstash-forwarder/default.nix index 52180c75c98..4edaed35f64 100644 --- a/pkgs/tools/misc/logstash-forwarder/default.nix +++ b/pkgs/tools/misc/logstash-forwarder/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, go }: +{ stdenv, fetchgit, go_1_1 }: stdenv.mkDerivation { name = "logstash-forwarder-20140410"; src = fetchgit { @@ -6,7 +6,7 @@ stdenv.mkDerivation { rev = "ec504792108ab6536b45bcf6dff6d26a6b56fef3"; sha256 = "309545ceaec171bee997cad260bef1433e041b9f3bfe617d475bcf79924f943d"; }; - buildInputs = [ go ]; + buildInputs = [ go_1_1 ]; installPhase = '' mkdir -p $out/bin cp build/bin/logstash-forwarder $out/bin -- cgit 1.4.1 From 8b98d7dc08d37a6a64d67bd3378f755d8289cb21 Mon Sep 17 00:00:00 2001 From: Domen Kožar Date: Mon, 25 Aug 2014 14:50:25 +0200 Subject: logstash_forwarder: specify platforms --- pkgs/tools/misc/logstash-forwarder/default.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'pkgs/tools') diff --git a/pkgs/tools/misc/logstash-forwarder/default.nix b/pkgs/tools/misc/logstash-forwarder/default.nix index 4edaed35f64..961dbc08335 100644 --- a/pkgs/tools/misc/logstash-forwarder/default.nix +++ b/pkgs/tools/misc/logstash-forwarder/default.nix @@ -15,5 +15,6 @@ stdenv.mkDerivation { meta = { license = stdenv.lib.licenses.asl20; homepage = https://github.com/elasticsearch/logstash-forwarder; + platforms = stdenv.lib.platforms.linux; }; } -- cgit 1.4.1 From c063a8d9a52d6dc7001db71fead698f88b29f4ca Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Sat, 23 Aug 2014 16:15:51 -0700 Subject: docbook2x: Add platforms so that it builds on hydra --- pkgs/tools/typesetting/docbook2x/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'pkgs/tools') diff --git a/pkgs/tools/typesetting/docbook2x/default.nix b/pkgs/tools/typesetting/docbook2x/default.nix index 78dac0c6aa4..b31c64e6936 100644 --- a/pkgs/tools/typesetting/docbook2x/default.nix +++ b/pkgs/tools/typesetting/docbook2x/default.nix @@ -46,13 +46,14 @@ stdenv.mkDerivation rec { "${gnused}/bin" ''; - meta = { + meta = with stdenv.lib; { longDescription = '' docbook2X is a software package that converts DocBook documents into the traditional Unix man page format and the GNU Texinfo format. ''; - license = stdenv.lib.licenses.mit; + license = licenses.mit; homepage = http://docbook2x.sourceforge.net/; + platforms = platforms.all; }; } -- cgit 1.4.1 From 08f24b85c2526ccc4312db9831213f9c928353d7 Mon Sep 17 00:00:00 2001 From: Moritz Ulrich Date: Mon, 25 Aug 2014 19:45:55 +0200 Subject: GnuPG: Bump to 2.0.26 --- pkgs/tools/security/gnupg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/tools') diff --git a/pkgs/tools/security/gnupg/default.nix b/pkgs/tools/security/gnupg/default.nix index 9b8d33b6b69..64e2be90d30 100644 --- a/pkgs/tools/security/gnupg/default.nix +++ b/pkgs/tools/security/gnupg/default.nix @@ -13,11 +13,11 @@ assert useUsb -> (libusb != null); assert useCurl -> (curl != null); stdenv.mkDerivation rec { - name = "gnupg-2.0.24"; + name = "gnupg-2.0.26"; src = fetchurl { url = "mirror://gnupg/gnupg/${name}.tar.bz2"; - sha256 = "0ch2hbindk832cy7ca00a7whw84ndm0nhqrl24a5fw4ldkca2x6r"; + sha256 = "1q5qcl5panrvcvpwvz6nl9gayl5a6vwvfhgdcxqpmbl2qc6y6n3p"; }; buildInputs -- cgit 1.4.1 From 12c3f65173258d4cbe5a42a0585923c6eed32869 Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Tue, 26 Aug 2014 01:22:08 +0200 Subject: Add mfcuk, tool for hacking mifare classic cards --- pkgs/tools/security/mfcuk/default.nix | 21 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 23 insertions(+) create mode 100644 pkgs/tools/security/mfcuk/default.nix (limited to 'pkgs/tools') diff --git a/pkgs/tools/security/mfcuk/default.nix b/pkgs/tools/security/mfcuk/default.nix new file mode 100644 index 00000000000..9d92482f68f --- /dev/null +++ b/pkgs/tools/security/mfcuk/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchurl, pkgconfig, libnfc }: + +stdenv.mkDerivation rec { + name = "mfcuk-${version}"; + version = "0.3.8"; + + src = fetchurl { + url = "http://mfcuk.googlecode.com/files/mfcuk-0.3.8.tar.gz"; + sha256 = "0m9sy61rsbw63xk05jrrmnyc3xda0c3m1s8pg3sf8ijbbdv9axcp"; + }; + + buildInputs = [ pkgconfig libnfc ]; + + meta = with stdenv.lib; { + description = "MiFare Classic Universal toolKit"; + license = licenses.gpl2; + homepage = http://code.google.com/p/mfcuk/; + maintainers = with maintainers; [ offline ]; + platforms = with platforms; unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e0430579d72..bb109e380d9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1500,6 +1500,8 @@ let megatools = callPackage ../tools/networking/megatools { }; + mfcuk = callPackage ../tools/security/mfcuk { }; + minecraft = callPackage ../games/minecraft { }; minecraft-server = callPackage ../games/minecraft-server { }; -- cgit 1.4.1 From 8fc3bedb5a9b1d17afce4d43e00695bfcaae54d0 Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Tue, 26 Aug 2014 11:22:05 +0200 Subject: Fix ntopng build --- pkgs/tools/networking/ntopng/default.nix | 47 ++++++++++++++++++++++---------- 1 file changed, 33 insertions(+), 14 deletions(-) (limited to 'pkgs/tools') diff --git a/pkgs/tools/networking/ntopng/default.nix b/pkgs/tools/networking/ntopng/default.nix index 3c33da1b661..52554209d59 100644 --- a/pkgs/tools/networking/ntopng/default.nix +++ b/pkgs/tools/networking/ntopng/default.nix @@ -1,16 +1,36 @@ { stdenv, fetchurl, libpcap, gnutls, libgcrypt, libxml2, glib, geoip, sqlite -, which +, which, autoreconfHook, subversion, pkgconfig, groff }: # ntopng includes LuaJIT, mongoose, rrdtool and zeromq in its third-party/ # directory. stdenv.mkDerivation rec { - name = "ntopng-1.1_6932"; + name = "ntopng-1.2.0_r8116"; + + geoLiteCity = fetchurl { + url = "http://geolite.maxmind.com/download/geoip/database/GeoLiteCity.dat.gz"; + sha256 = "1rv5yx5xgz04ymicx9pilidm19wh01ql2klwjcdakv558ndxdzd5"; + }; + + geoLiteCityV6 = fetchurl { + url = "http://geolite.maxmind.com/download/geoip/database/GeoLiteCityv6-beta/GeoLiteCityv6.dat.gz"; + sha256 = "0j974qpi92wwnibq46h16vxpcz7yy8bbqc4k8kmby1yx994k33v4"; + }; + + geoIPASNum = fetchurl { + url = "http://geolite.maxmind.com/download/geoip/database/asnum/GeoIPASNum.dat.gz"; + sha256 = "1msnbls66npq001nmf1wmkrh6vyacgi8g5phfm1c34cz7vqnh683"; + }; + + geoIPASNumV6 = fetchurl { + url = "http://geolite.maxmind.com/download/geoip/database/asnum/GeoIPASNumv6.dat.gz"; + sha256 = "126syia75mkxs6xfinfp70xcfq6a3rgfmh673pzzkwxya393lbdn"; + }; src = fetchurl { url = "mirror://sourceforge/project/ntop/ntopng/${name}.tgz"; - sha256 = "0cdbmrsjp3bb7xzci0vfnnkmbyxwxbf47l4kbnk4ydd7xwhwdnzr"; + sha256 = "0y7xc0l77k2qi2qalwfqiw2z361hdypirfv4k5gi652pb20jc9j6"; }; patches = [ @@ -18,19 +38,13 @@ stdenv.mkDerivation rec { ./0002-Remove-requirement-to-have-writeable-callback-dir.patch ]; - buildInputs = [ libpcap gnutls libgcrypt libxml2 glib geoip sqlite which ]; - - preBuild = '' - sed -e "s|^SHELL=.*|SHELL=${stdenv.shell}|" \ - -e "s|/usr/local|$out|g" \ - -e "s|/bin/rm|rm|g" \ - -i Makefile + buildInputs = [ libpcap gnutls libgcrypt libxml2 glib geoip sqlite which autoreconfHook subversion pkgconfig groff ]; - sed -e "s|^SHELL=.*|SHELL=${stdenv.shell}|" \ - -e "s|/usr/local|$out|g" \ - -e "s|/opt/local|/non-existing-dir|g" \ - -i configure + preConfigure = '' + find . -name Makefile.in | xargs sed -i "s|/bin/rm|rm|" + ''; + preBuild = '' sed -e "s|/usr/local|$out|g" \ -i Ntop.cpp @@ -40,6 +54,11 @@ stdenv.mkDerivation rec { -e "s|\(#define CONST_DEFAULT_CALLBACKS_DIR\).*|\1 \"$out/share/ntopng/scripts/callbacks\"|g" \ -e "s|\(#define CONST_DEFAULT_INSTALL_DIR\).*|\1 \"$out/share/ntopng\"|g" \ -i ntop_defines.h + + gunzip -c $geoLiteCity > httpdocs/geoip/GeoLiteCity.dat + gunzip -c $geoLiteCityV6 > httpdocs/geoip/GeoLiteCityv6.dat + gunzip -c $geoIPASNum > httpdocs/geoip/GeoIPASNum.dat + gunzip -c $geoIPASNumV6 > httpdocs/geoip/GeoIPASNumv6.dat ''; meta = with stdenv.lib; { -- cgit 1.4.1 From 7573763e8972040ea68370bc6e992b1f3f184c2e Mon Sep 17 00:00:00 2001 From: Domen Kožar Date: Tue, 26 Aug 2014 12:11:22 +0200 Subject: netboot: simplify, build only on 64bit --- pkgs/tools/networking/netboot/default.nix | 53 +++++++------------------------ 1 file changed, 12 insertions(+), 41 deletions(-) (limited to 'pkgs/tools') diff --git a/pkgs/tools/networking/netboot/default.nix b/pkgs/tools/networking/netboot/default.nix index ec49770d269..dbf393094c8 100644 --- a/pkgs/tools/networking/netboot/default.nix +++ b/pkgs/tools/networking/netboot/default.nix @@ -1,47 +1,18 @@ -x@{builderDefsPackage - , fetchurl, yacc, bison, ...}: -builderDefsPackage -(a : -let - helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ - []; +{ stdenv, fetchurl, yacc, lzo, db4 }: - buildInputs = map (n: builtins.getAttr n x) - (builtins.attrNames (builtins.removeAttrs x helperArgNames)); - sourceInfo = rec { - version="0.10.2"; - baseName="netboot"; - name="${baseName}-${version}"; - url="mirror://sourceforge/netboot/${name}.tar.gz"; - hash="09w09bvwgb0xzn8hjz5rhi3aibysdadbg693ahn8rylnqfq4hwg0"; +stdenv.mkDerivation rec { + name = "netboot-0.10.2"; + src = fetchurl { + url = "mirror://sourceforge/netboot/${name}.tar.gz"; + sha256 = "09w09bvwgb0xzn8hjz5rhi3aibysdadbg693ahn8rylnqfq4hwg0"; }; -in -rec { - src = a.fetchurl { - url = sourceInfo.url; - sha256 = sourceInfo.hash; - }; - - inherit (sourceInfo) name version; - inherit buildInputs; - - /* doConfigure should be removed if not needed */ - phaseNames = ["doUnpack" "doConfigure" "doMakeInstall"]; + + buildInputs = [ yacc lzo db4 ]; - meta = { + meta = with stdenv.lib; { description = "Mini PXE server"; - maintainers = with a.lib.maintainers; - [ - raskin - ]; - platforms = with a.lib.platforms; - linux; + maintainers = [ maintainers.raskin ]; + platforms = ["x86_64-linux"]; license = "free-noncopyleft"; }; - passthru = { - updateInfo = { - downloadPage = "https://github.com/ITikhonov/netboot"; - }; - }; -}) x - +} \ No newline at end of file -- cgit 1.4.1 From a3800db3d2e85f08395dec16abb2aa732e3fe22f Mon Sep 17 00:00:00 2001 From: 宋文武 Date: Wed, 27 Aug 2014 15:39:34 +0800 Subject: add anthy, Japanese input method --- pkgs/tools/inputmethods/anthy/default.nix | 18 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 20 insertions(+) create mode 100644 pkgs/tools/inputmethods/anthy/default.nix (limited to 'pkgs/tools') diff --git a/pkgs/tools/inputmethods/anthy/default.nix b/pkgs/tools/inputmethods/anthy/default.nix new file mode 100644 index 00000000000..34ffa1568b9 --- /dev/null +++ b/pkgs/tools/inputmethods/anthy/default.nix @@ -0,0 +1,18 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation { + name = "anthy-9100h"; + + meta = with stdenv.lib; { + description = "Hiragana text to Kana Kanji mixed text Japanese input method"; + homepace = http://sourceforge.jp/projects/anthy/; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ iyzsong ]; + }; + + src = fetchurl { + url = "http://dl.sourceforge.jp/anthy/37536/anthy-9100h.tar.gz"; + sha256 = "0ism4zibcsa5nl77wwi12vdsfjys3waxcphn1p5s7d0qy1sz0mnj"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fa205e71133..fb8f6e5bdca 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -801,6 +801,8 @@ let usb_modeswitch = callPackage ../development/tools/misc/usb-modeswitch { }; + anthy = callPackage ../tools/inputmethods/anthy { }; + biosdevname = callPackage ../tools/networking/biosdevname { }; clamav = callPackage ../tools/security/clamav { }; -- cgit 1.4.1 From ea7c41236825d14bc2a86e25dd951154f1c4e6e5 Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Sun, 29 Jun 2014 00:05:39 -0400 Subject: cpuminer-multi: initial expression --- pkgs/tools/misc/cpuminer-multi/default.nix | 31 ++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/tools/misc/cpuminer-multi/default.nix (limited to 'pkgs/tools') diff --git a/pkgs/tools/misc/cpuminer-multi/default.nix b/pkgs/tools/misc/cpuminer-multi/default.nix new file mode 100644 index 00000000000..c61e0ff00b3 --- /dev/null +++ b/pkgs/tools/misc/cpuminer-multi/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchgit, curl, jansson, autoconf, automake, openssl +, aesni ? true }: + +let + rev = "4230012da5d1cc491976c6f5e45da36db6d9f576"; + date = "20140619"; +in +stdenv.mkDerivation rec { + name = "cpuminer-multi-${date}-${stdenv.lib.strings.substring 0 7 rev}"; + + src = fetchgit { + inherit rev; + url = https://github.com/wolf9466/cpuminer-multi.git; + sha256 = "c19a5dd1bfdbbaec3729f61248e858a5d8701424fffe67fdabf8179ced9c110b"; + }; + + buildInputs = [ autoconf automake curl jansson openssl ]; + + preConfigure = '' + ./autogen.sh + ''; + + configureFlags = if aesni then [ "--disable-aes-ni" ] else [ ]; + + meta = with stdenv.lib; { + description = "Multi-algo CPUMiner"; + homepage = https://github.com/wolf9466/cpuminer-multi; + license = licenses.gpl2; + maintainers = [ maintainers.emery ]; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8ff0a9d043f..9b6da45fe5d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -793,6 +793,8 @@ let cpuminer = callPackage ../tools/misc/cpuminer { }; + cpuminer-multi = callPackage ../tools/misc/cpuminer-multi { }; + cuetools = callPackage ../tools/cd-dvd/cuetools { }; unifdef = callPackage ../development/tools/misc/unifdef { }; -- cgit 1.4.1 From d5ea3b1e4491482e21efafc32ac91822d3ee9b55 Mon Sep 17 00:00:00 2001 From: Rüdiger Sonderfeld Date: Thu, 28 Aug 2014 12:55:34 +0200 Subject: parallel: Update to 20140822. https://savannah.gnu.org/forum/forum.php?forum_id=8067 --- pkgs/tools/misc/parallel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/tools') diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/tools/misc/parallel/default.nix index 4b0332c7506..727657ca6e8 100644 --- a/pkgs/tools/misc/parallel/default.nix +++ b/pkgs/tools/misc/parallel/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, perl }: stdenv.mkDerivation rec { - name = "parallel-20140222"; + name = "parallel-20140822"; src = fetchurl { url = "mirror://gnu/parallel/${name}.tar.bz2"; - sha256 = "0zb3hg92br6a53jn0pzfl16ffc1hfw81jk7nzw5spkshsdrcqx3y"; + sha256 = "8a146a59bc71218921d561f2c801b85e06fe3a21571083b58e6e0966dd397fd4"; }; patchPhase = -- cgit 1.4.1 From e07b5c95af31c5ef970097dc160562c1439caf25 Mon Sep 17 00:00:00 2001 From: Michael Fellinger Date: Thu, 28 Aug 2014 14:16:11 +0200 Subject: Add di package --- lib/maintainers.nix | 3 ++- pkgs/tools/system/di/default.nix | 20 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 pkgs/tools/system/di/default.nix (limited to 'pkgs/tools') diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 67936416ae8..d3d46fc6862 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -66,14 +66,15 @@ lovek323 = "Jason O'Conal "; ludo = "Ludovic Courtès "; madjar = "Georges Dubus "; + manveru = "Michael Fellinger "; marcweber = "Marc Weber "; matejc = "Matej Cotman "; meisternu = "Matt Miemiec "; modulistic = "Pablo Costa "; mornfall = "Petr Ročkai "; + MP2E = "Cray Elliott "; msackman = "Matthew Sackman "; nathan-gs = "Nathan Bijnens "; - MP2E = "Cray Elliott "; notthemessiah = "Brian Cohen "; ocharles = "Oliver Charles "; offline = "Jaka Hudoklin "; diff --git a/pkgs/tools/system/di/default.nix b/pkgs/tools/system/di/default.nix new file mode 100644 index 00000000000..dc15ce13bcc --- /dev/null +++ b/pkgs/tools/system/di/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "di-4.35"; + + src = fetchurl { + url = "http://gentoo.com/di/${name}.tar.gz"; + sha256 = "1lkiggvdm6wi14xy8845w6mqqr50j2q7g0i2rdcs7qw5gb7gmprc"; + }; + + makeFlags = "INSTALL_DIR=$(out)"; + + meta = with stdenv.lib; { + description = "A disk information utility, displaying everything (and more) that your 'df' command does"; + homepage = http://www.gentoo.com/di/; + license = licenses.zlib; + maintainers = with maintainers; [ manveru ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0a97c43463d..212b185bbff 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -901,6 +901,8 @@ let dhcpcd = callPackage ../tools/networking/dhcpcd { }; + di = callPackage ../tools/system/di { }; + diffstat = callPackage ../tools/text/diffstat { }; diffutils = callPackage ../tools/text/diffutils { }; -- cgit 1.4.1 From adbb9ff7966c1c17588100d6afddda66eafc9453 Mon Sep 17 00:00:00 2001 From: Paul Colomiets Date: Thu, 3 Jul 2014 01:59:35 +0300 Subject: dnsmasq: upgrade to 2.71, fixed dnsmasq module * The module now has systemd config * Add resolveLocalQueries option which sets up it as a dns server for local host (including reasonable setup of resolvconf) * Add "dnsmasq" user for running daemon * Enabled dbus and dnssec support for the package Conflicts: nixos/modules/misc/ids.nix --- nixos/modules/config/networking.nix | 8 ++++- nixos/modules/misc/ids.nix | 1 + nixos/modules/services/networking/dnsmasq.nix | 45 +++++++++++++++++++++------ pkgs/tools/networking/dnsmasq/default.nix | 24 +++++++++++++- 4 files changed, 67 insertions(+), 11 deletions(-) (limited to 'pkgs/tools') diff --git a/nixos/modules/config/networking.nix b/nixos/modules/config/networking.nix index fd1e55f673a..136a5bda745 100644 --- a/nixos/modules/config/networking.nix +++ b/nixos/modules/config/networking.nix @@ -7,6 +7,9 @@ with lib; let cfg = config.networking; + dnsmasqResolve = config.services.dnsmasq.enable && + config.services.dnsmasq.resolveLocalQueries; + hasLocalResolver = config.services.bind.enable || dnsmasqResolve; in @@ -74,9 +77,12 @@ in '' + optionalString cfg.dnsSingleRequest '' # only send one DNS request at a time resolv_conf_options='single-request' - '' + optionalString config.services.bind.enable '' + '' + optionalString hasLocalResolver '' # This hosts runs a full-blown DNS resolver. name_servers='127.0.0.1' + '' + optionalString dnsmasqResolve '' + dnsmasq_conf=/etc/dnsmasq-conf.conf + dnsmasq_resolv=/etc/dnsmasq-resolv.conf ''; }; diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index 92ab241deaa..513da5d50a1 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -148,6 +148,7 @@ riemanndash = 138; radvd = 139; zookeeper = 140; + dnsmasq = 141; # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399! diff --git a/nixos/modules/services/networking/dnsmasq.nix b/nixos/modules/services/networking/dnsmasq.nix index 8e38b9d017a..d2a8af6ac8b 100644 --- a/nixos/modules/services/networking/dnsmasq.nix +++ b/nixos/modules/services/networking/dnsmasq.nix @@ -6,10 +6,12 @@ let cfg = config.services.dnsmasq; dnsmasq = pkgs.dnsmasq; - serversParam = concatMapStrings (s: "-S ${s} ") cfg.servers; - dnsmasqConf = pkgs.writeText "dnsmasq.conf" '' - ${cfg.extraConfig} + ${optionalString cfg.resolveLocalQueries '' + conf-file=/etc/dnsmasq-conf.conf + resolv-file=/etc/dnsmasq-resolv.conf + ''} + ${cfg.extraConfig} ''; in @@ -29,6 +31,14 @@ in ''; }; + resolveLocalQueries = mkOption { + default = true; + description = '' + Whether dnsmasq should resolve local queries (i.e. add 127.0.0.1 to + /etc/resolv.conf) + ''; + }; + servers = mkOption { default = []; example = [ "8.8.8.8" "8.8.4.4" ]; @@ -37,6 +47,8 @@ in ''; }; + + extraConfig = mkOption { type = types.string; default = ""; @@ -55,16 +67,31 @@ in config = mkIf config.services.dnsmasq.enable { - jobs.dnsmasq = - { description = "dnsmasq daemon"; - - startOn = "ip-up"; + environment.systemPackages = [ dnsmasq ] + ++ (if cfg.resolveLocalQueries then [ pkgs.openresolv ] else []); - daemonType = "daemon"; + services.dbus.packages = [ dnsmasq ]; - exec = "${dnsmasq}/bin/dnsmasq -R ${serversParam} -o -C ${dnsmasqConf}"; + users.extraUsers = singleton + { name = "dnsmasq"; + uid = config.ids.uids.dnsmasq; + description = "Dnsmasq daemon user"; + home = "/var/empty"; }; + systemd.services.dnsmasq = { + description = "dnsmasq daemon"; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + Type = "dbus"; + BusName = "uk.org.thekelleys.dnsmasq"; + ExecStartPre = "${dnsmasq}/bin/dnsmasq --test"; + ExecStart = "${dnsmasq}/bin/dnsmasq -k --enable-dbus --user=dnsmasq -C ${dnsmasqConf}"; + ExecReload = "${dnsmasq}/bin/kill -HUP $MAINPID"; + }; + }; + }; } diff --git a/pkgs/tools/networking/dnsmasq/default.nix b/pkgs/tools/networking/dnsmasq/default.nix index cec4057a284..ba59071d0ce 100644 --- a/pkgs/tools/networking/dnsmasq/default.nix +++ b/pkgs/tools/networking/dnsmasq/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ pkgconfig, dbus_libs, nettle, stdenv, fetchurl }: stdenv.mkDerivation rec { name = "dnsmasq-2.71"; @@ -8,8 +8,30 @@ stdenv.mkDerivation rec { sha256 = "1fpzpzja7qr8b4kfdhh4i4sijp62c634yf0xvq2n4p7d5xbzn6a9"; }; + # Can't rely on make flags because of space in one of the parameters + buildPhase = '' + make COPTS="-DHAVE_DNSSEC -DHAVE_DBUS" + ''; + + # make flags used for installation only makeFlags = "DESTDIR= BINDIR=$(out)/bin MANDIR=$(out)/man LOCALEDIR=$(out)/share/locale"; + postInstall = '' + install -Dm644 dbus/dnsmasq.conf $out/etc/dbus-1/system.d/dnsmasq.conf + install -Dm644 trust-anchors.conf $out/share/dnsmasq/trust-anchors.conf + + ensureDir $out/share/dbus-1/system-services + cat < $out/share/dbus-1/system-services/uk.org.thekelleys.dnsmasq.service + [D-BUS Service] + Name=uk.org.thekelleys.dnsmasq + Exec=$out/sbin/dnsmasq -k -1 + User=root + SystemdService=dnsmasq.service + END + ''; + + buildInputs = [ pkgconfig dbus_libs nettle ]; + meta = { description = "An integrated DNS, DHCP and TFTP server for small networks"; homepage = http://www.thekelleys.org.uk/dnsmasq/doc.html; -- cgit 1.4.1 From 9194f69e73aface9ad039a428710ee669b6d3204 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Mon, 11 Aug 2014 15:48:36 -0500 Subject: dnsmasq: Meta Update --- pkgs/tools/networking/dnsmasq/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'pkgs/tools') diff --git a/pkgs/tools/networking/dnsmasq/default.nix b/pkgs/tools/networking/dnsmasq/default.nix index ba59071d0ce..02f24ce4c00 100644 --- a/pkgs/tools/networking/dnsmasq/default.nix +++ b/pkgs/tools/networking/dnsmasq/default.nix @@ -32,11 +32,11 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig dbus_libs nettle ]; - meta = { + meta = with stdenv.lib; { description = "An integrated DNS, DHCP and TFTP server for small networks"; homepage = http://www.thekelleys.org.uk/dnsmasq/doc.html; - license = "GPL"; - platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; - maintainers = [ stdenv.lib.maintainers.eelco ]; + license = licenses.gpl2; + platforms = with platforms; linux ++ darwin; + maintainers = with maintainers; [ eelco ]; }; } -- cgit 1.4.1 From 792afca11318aaac0715f343d7454ea4933a932a Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Thu, 28 Aug 2014 15:26:32 -0500 Subject: spiped: 1.3.1 -> 1.4.0 Signed-off-by: Austin Seipp --- pkgs/tools/networking/spiped/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/tools') diff --git a/pkgs/tools/networking/spiped/default.nix b/pkgs/tools/networking/spiped/default.nix index ac2736ffb19..f854b92b87e 100644 --- a/pkgs/tools/networking/spiped/default.nix +++ b/pkgs/tools/networking/spiped/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "spiped-${version}"; - version = "1.3.1"; + version = "1.4.0"; src = fetchurl { url = "http://www.tarsnap.com/spiped/${name}.tgz"; - sha256 = "1viglk61v1v2ga1n31r0h8rvib5gy2h02lhhbbnqh2s6ps1sjn4a"; + sha256 = "0pyg1llnqgfx7n7mi3dq4ra9xg3vkxlf01z5jzn7ncq5d6ii7ynq"; }; buildInputs = [ openssl ]; -- cgit 1.4.1 From f2bef62716b4c5853ea16465f31182569dbb80ef Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Mon, 21 Oct 2013 05:09:02 -0500 Subject: Update grub 2.00 to 2.02-beta2 --- pkgs/tools/misc/grub/2.0x.nix | 40 ++++++++++++++++++++++------------------ pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 23 insertions(+), 19 deletions(-) (limited to 'pkgs/tools') diff --git a/pkgs/tools/misc/grub/2.0x.nix b/pkgs/tools/misc/grub/2.0x.nix index b1877bdcf98..59658e47a08 100644 --- a/pkgs/tools/misc/grub/2.0x.nix +++ b/pkgs/tools/misc/grub/2.0x.nix @@ -1,11 +1,17 @@ -{ fetchurl, stdenv, flex, bison, gettext, ncurses, libusb, freetype, qemu -, devicemapper, EFIsupport ? false }: +{ fetchurl, stdenv, autogen, flex, bison, python, autoconf, automake +, gettext, ncurses, libusb, freetype, qemu, devicemapper +, linuxPackages ? null +, EFIsupport ? false +, zfsSupport ? false +}: + +assert zfsSupport -> linuxPackages != null && linuxPackages.zfs != null; let prefix = "grub${if EFIsupport then "-efi" else ""}"; - version = "2.00"; + version = "2.02-beta2"; unifont_bdf = fetchurl { url = "http://unifoundry.com/unifont-5.1.20080820.bdf.gz"; @@ -18,13 +24,14 @@ stdenv.mkDerivation rec { name = "${prefix}-${version}"; src = fetchurl { - url = "mirror://gnu/grub/grub-${version}.tar.xz"; - sha256 = "0n64hpmsccvicagvr0c6v0kgp2yw0kgnd3jvsyd26cnwgs7c6kkq"; + url = "http://git.savannah.gnu.org/cgit/grub.git/snapshot/grub-2.02-beta2.tar.gz"; + sha256 = "1n2l7k76lqqaavz12615vx5kca0kl8g13bkimc7xsd9s7c1ir5lr"; }; - nativeBuildInputs = [ flex bison ]; + nativeBuildInputs = [ autogen flex bison python autoconf automake ]; buildInputs = [ ncurses libusb freetype gettext devicemapper ] - ++ stdenv.lib.optional doCheck qemu; + ++ stdenv.lib.optional doCheck qemu + ++ stdenv.lib.optional zfsSupport linuxPackages.zfs; preConfigure = '' for i in "tests/util/"*.in @@ -43,14 +50,11 @@ stdenv.mkDerivation rec { # See . sed -i "tests/util/grub-shell.in" \ -e's/qemu-system-i386/qemu-system-x86_64 -nodefaults/g' - - # Fix for building on Glibc 2.16. Won't be needed once the - # gnulib in grub is updated. - sed -i '/gets is a security hole/d' grub-core/gnulib/stdio.in.h ''; prePatch = - '' gunzip < "${unifont_bdf}" > "unifont.bdf" + '' sh autogen.sh + gunzip < "${unifont_bdf}" > "unifont.bdf" sed -i "configure" \ -e "s|/usr/src/unifont.bdf|$PWD/unifont.bdf|g" ''; @@ -61,8 +65,8 @@ stdenv.mkDerivation rec { let arch = if stdenv.system == "i686-linux" then "i386" else if stdenv.system == "x86_64-linux" then "x86_64" else throw "unsupported EFI firmware architecture"; - in - stdenv.lib.optionals EFIsupport + in stdenv.lib.optional zfsSupport "--enable-libzfs" + ++ stdenv.lib.optionals EFIsupport [ "--with-platform=efi" "--target=${arch}" "--program-prefix=" ]; doCheck = false; @@ -72,7 +76,7 @@ stdenv.mkDerivation rec { paxmark pms $out/sbin/grub-{probe,bios-setup} ''; - meta = { + meta = with stdenv.lib; { description = "GNU GRUB, the Grand Unified Boot Loader (2.x beta)"; longDescription = @@ -87,13 +91,13 @@ stdenv.mkDerivation rec { operating system (e.g., GNU). ''; - homepage = http://www.gnu.org/software/grub/; + homepage = http://wwwp.gnu.org/software/grub/; - license = stdenv.lib.licenses.gpl3Plus; + license = licenses.gpl3Plus; platforms = if EFIsupport then [ "i686-linux" "x86_64-linux" ] else - stdenv.lib.platforms.gnu; + platforms.gnu; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a8540bdb1f6..c5b511df9c0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1218,7 +1218,7 @@ let buggyBiosCDSupport = config.grub.buggyBiosCDSupport or true; }; - grub2 = callPackage ../tools/misc/grub/2.0x.nix { libusb = libusb1; flex = flex_2_5_35; }; + grub2 = callPackage ../tools/misc/grub/2.0x.nix { }; grub2_efi = grub2.override { EFIsupport = true; }; -- cgit 1.4.1 From 1f460e00efb99a1450f5b5806d68ff6633641ad8 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 30 Apr 2014 18:04:45 -0500 Subject: grub: Build grub2 from git instead of using the unpredictable generated tarball --- pkgs/tools/misc/grub/2.0x.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'pkgs/tools') diff --git a/pkgs/tools/misc/grub/2.0x.nix b/pkgs/tools/misc/grub/2.0x.nix index 59658e47a08..04971b68a84 100644 --- a/pkgs/tools/misc/grub/2.0x.nix +++ b/pkgs/tools/misc/grub/2.0x.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, autogen, flex, bison, python, autoconf, automake +{ stdenv, fetchurl, fetchgit, autogen, flex, bison, python, autoconf, automake , gettext, ncurses, libusb, freetype, qemu, devicemapper , linuxPackages ? null , EFIsupport ? false @@ -23,9 +23,10 @@ in stdenv.mkDerivation rec { name = "${prefix}-${version}"; - src = fetchurl { - url = "http://git.savannah.gnu.org/cgit/grub.git/snapshot/grub-2.02-beta2.tar.gz"; - sha256 = "1n2l7k76lqqaavz12615vx5kca0kl8g13bkimc7xsd9s7c1ir5lr"; + src = fetchgit { + url = "git://git.sv.gnu.org/grub.git"; + rev = "refs/tags/grub-2.02-beta2"; + sha256 = "157bknkcxibmvq19pagphlwfxd9xny7002gcanfzhjzcjpfz4scy"; }; nativeBuildInputs = [ autogen flex bison python autoconf automake ]; -- cgit 1.4.1 From 2ea1433b77755b954df979307525fa6578f241b8 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Fri, 2 May 2014 09:17:54 -0500 Subject: grub: Fetch from alpha.gnu.org instead of git --- pkgs/tools/misc/grub/2.0x.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'pkgs/tools') diff --git a/pkgs/tools/misc/grub/2.0x.nix b/pkgs/tools/misc/grub/2.0x.nix index 04971b68a84..2c150f8ec96 100644 --- a/pkgs/tools/misc/grub/2.0x.nix +++ b/pkgs/tools/misc/grub/2.0x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchgit, autogen, flex, bison, python, autoconf, automake +{ stdenv, fetchurl, autogen, flex, bison, python, autoconf, automake , gettext, ncurses, libusb, freetype, qemu, devicemapper , linuxPackages ? null , EFIsupport ? false @@ -23,10 +23,10 @@ in stdenv.mkDerivation rec { name = "${prefix}-${version}"; - src = fetchgit { - url = "git://git.sv.gnu.org/grub.git"; - rev = "refs/tags/grub-2.02-beta2"; - sha256 = "157bknkcxibmvq19pagphlwfxd9xny7002gcanfzhjzcjpfz4scy"; + src = fetchurl { + name = "grub-2.02-beta2.tar.xz"; + url = "http://alpha.gnu.org/gnu/grub/grub-2.02~beta2.tar.xz"; + sha256 = "13a13fhc0wf473dn73zhga15mjvkg6vqp4h25dxg4n7am2r05izn"; }; nativeBuildInputs = [ autogen flex bison python autoconf automake ]; -- cgit 1.4.1 From dd18e67cfb27515791620a0e69e4e427b77e2670 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Sat, 3 May 2014 19:59:47 -0500 Subject: grub: Cleanup efi support --- pkgs/tools/misc/grub/2.0x.nix | 37 ++++++++++++++++++------------------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 19 insertions(+), 20 deletions(-) (limited to 'pkgs/tools') diff --git a/pkgs/tools/misc/grub/2.0x.nix b/pkgs/tools/misc/grub/2.0x.nix index 2c150f8ec96..028ec565752 100644 --- a/pkgs/tools/misc/grub/2.0x.nix +++ b/pkgs/tools/misc/grub/2.0x.nix @@ -1,15 +1,20 @@ { stdenv, fetchurl, autogen, flex, bison, python, autoconf, automake , gettext, ncurses, libusb, freetype, qemu, devicemapper , linuxPackages ? null -, EFIsupport ? false +, efiSupport ? false , zfsSupport ? false }: -assert zfsSupport -> linuxPackages != null && linuxPackages.zfs != null; - +with stdenv.lib; let + efiSystems = { + "i686-linux".target = "i386"; + "x86_64-linux".target = "x86_64"; + }; - prefix = "grub${if EFIsupport then "-efi" else ""}"; + canEfi = any (system: stdenv.system == system) (mapAttrsToList (name: _: name) efiSystems); + + prefix = "grub${if efiSupport then "-efi" else ""}"; version = "2.02-beta2"; @@ -17,8 +22,10 @@ let url = "http://unifoundry.com/unifont-5.1.20080820.bdf.gz"; sha256 = "0s0qfff6n6282q28nwwblp5x295zd6n71kl43xj40vgvdqxv0fxx"; }; +in ( -in +assert efiSupport -> canEfi; +assert zfsSupport -> linuxPackages != null && linuxPackages.zfs != null; stdenv.mkDerivation rec { name = "${prefix}-${version}"; @@ -31,8 +38,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autogen flex bison python autoconf automake ]; buildInputs = [ ncurses libusb freetype gettext devicemapper ] - ++ stdenv.lib.optional doCheck qemu - ++ stdenv.lib.optional zfsSupport linuxPackages.zfs; + ++ optional doCheck qemu + ++ optional zfsSupport linuxPackages.zfs; preConfigure = '' for i in "tests/util/"*.in @@ -62,13 +69,8 @@ stdenv.mkDerivation rec { patches = [ ./fix-bash-completion.patch ]; - configureFlags = - let arch = if stdenv.system == "i686-linux" then "i386" - else if stdenv.system == "x86_64-linux" then "x86_64" - else throw "unsupported EFI firmware architecture"; - in stdenv.lib.optional zfsSupport "--enable-libzfs" - ++ stdenv.lib.optionals EFIsupport - [ "--with-platform=efi" "--target=${arch}" "--program-prefix=" ]; + configureFlags = optional zfsSupport "--enable-libzfs" + ++ optionals efiSupport [ "--with-platform=efi" "--target=${efiSystems.${stdenv.system}.target}" "--program-prefix=" ]; doCheck = false; enableParallelBuilding = true; @@ -96,9 +98,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; - platforms = if EFIsupport then - [ "i686-linux" "x86_64-linux" ] - else - platforms.gnu; + platforms = platforms.gnu; }; -} +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2dc957cb3db..3d2350b661e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1220,7 +1220,7 @@ let grub2 = callPackage ../tools/misc/grub/2.0x.nix { }; - grub2_efi = grub2.override { EFIsupport = true; }; + grub2_efi = grub2.override { efiSupport = true; }; grub2_zfs = grub2.override { zfsSupport = true; }; -- cgit 1.4.1 From 0fdbc444113a80c1bd0477676a33ab1fb27bae1a Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Thu, 28 Aug 2014 13:36:41 -0700 Subject: grub: Fix typo --- pkgs/tools/misc/grub/2.0x.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs/tools') diff --git a/pkgs/tools/misc/grub/2.0x.nix b/pkgs/tools/misc/grub/2.0x.nix index 028ec565752..e3c07af759c 100644 --- a/pkgs/tools/misc/grub/2.0x.nix +++ b/pkgs/tools/misc/grub/2.0x.nix @@ -94,7 +94,7 @@ stdenv.mkDerivation rec { operating system (e.g., GNU). ''; - homepage = http://wwwp.gnu.org/software/grub/; + homepage = http://www.gnu.org/software/grub/; license = licenses.gpl3Plus; -- cgit 1.4.1 From 121050046dc870df9015a700e0c01809974f928f Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Fri, 29 Aug 2014 01:27:28 +0400 Subject: Adding flashrom BIOS update utility. Patch by Edward O'Callaghan --- lib/maintainers.nix | 1 + pkgs/tools/misc/flashrom/default.nix | 23 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 26 insertions(+) create mode 100644 pkgs/tools/misc/flashrom/default.nix (limited to 'pkgs/tools') diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 35e53664bbc..3de82db1cd9 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -45,6 +45,7 @@ ertes = "Ertugrul Söylemez "; falsifian = "James Cook "; flosse = "Markus Kohlhase "; + funfunctor = "Edward O'Callaghan "; fuuzetsu = "Mateusz Kowalczyk "; garbas = "Rok Garbas "; goibhniu = "Cillian de Róiste "; diff --git a/pkgs/tools/misc/flashrom/default.nix b/pkgs/tools/misc/flashrom/default.nix new file mode 100644 index 00000000000..c4e74359b15 --- /dev/null +++ b/pkgs/tools/misc/flashrom/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchurl, pkgconfig, libftdi, pciutils }: + +let version = "0.9.7"; in +stdenv.mkDerivation rec { + name = "flashrom-${version}"; + + src = fetchurl { + url = "http://download.flashrom.org/releases/${name}.tar.bz2"; + sha256 = "5a55212d00791981a9a1cb0cdca9d9e58bea6d399864251e7b410b4d3d6137e9"; + }; + + buildInputs = [ pkgconfig libftdi pciutils ]; + + makeFlags = ["PREFIX=$out"]; + + meta = { + homepage = "http://www.flashrom.org"; + description = "Utility for reading, writing, erasing and verifying flash ROM chips"; + license = "GPLv2"; + maintainers = [ stdenv.lib.maintainers.funfunctor ]; + platforms = with stdenv.lib.platforms; linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index af7443a056a..851bf546dcd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1049,6 +1049,8 @@ let platformTools = androidenv.platformTools; }; + flashrom = callPackage ../tools/misc/flashrom { }; + flpsed = callPackage ../applications/editors/flpsed { }; flvstreamer = callPackage ../tools/networking/flvstreamer { }; -- cgit 1.4.1