diff options
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 19 | ||||
| -rw-r--r-- | pkgs/top-level/emacs-packages.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/lua-packages.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 90 |
4 files changed, 64 insertions, 49 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f8bc26dbb18d..60beb8eae28d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -710,6 +710,8 @@ in contacts = callPackage ../tools/misc/contacts { }; + coturn = callPackage ../servers/coturn { }; + daemontools = callPackage ../tools/admin/daemontools { }; datamash = callPackage ../tools/misc/datamash { }; @@ -3425,6 +3427,8 @@ in ssdeep = callPackage ../tools/security/ssdeep { }; + ssh-ident = callPackage ../tools/networking/ssh-ident { }; + sshpass = callPackage ../tools/networking/sshpass { }; sslscan = callPackage ../tools/security/sslscan { }; @@ -12629,6 +12633,8 @@ in fvwm = callPackage ../applications/window-managers/fvwm { }; + ganttproject-bin = callPackage ../applications/misc/ganttproject-bin { }; + geany = callPackage ../applications/editors/geany { }; geany-with-vte = callPackage ../applications/editors/geany/with-vte.nix { }; @@ -12647,7 +12653,7 @@ in gnuradio-osmosdr = callPackage ../applications/misc/gnuradio-osmosdr { }; - goldendict = callPackage ../applications/misc/goldendict { }; + goldendict = qt55.callPackage ../applications/misc/goldendict { }; google-drive-ocamlfuse = callPackage ../applications/networking/google-drive-ocamlfuse { }; @@ -13288,7 +13294,9 @@ in librecad = callPackage ../applications/misc/librecad { }; librecad2 = self.librecad; # backwards compatibility alias, added 2015-10 - libreoffice = callPackage ../applications/office/libreoffice { + libreoffice = hiPrio libreoffice-still; + + libreoffice-fresh = lowPrio (callPackage ../applications/office/libreoffice { inherit (perlPackages) ArchiveZip CompressZlib; inherit (gnome) GConf ORBit2 gnome_vfs; inherit (gnome3) gsettings_desktop_schemas defaultIconTheme; @@ -13305,7 +13313,7 @@ in harfbuzz = harfbuzz.override { withIcu = true; withGraphite2 = true; }; - }; + }); libreoffice-still = lowPrio (callPackage ../applications/office/libreoffice/still.nix { inherit (perlPackages) ArchiveZip CompressZlib; @@ -16120,6 +16128,8 @@ in alt-ergo = callPackage ../applications/science/logic/alt-ergo {}; + aspino = callPackage ../applications/science/logic/aspino {}; + coq = callPackage ../applications/science/logic/coq { inherit (ocamlPackages_4_01_0) ocaml findlib lablgtk; camlp5 = ocamlPackages_4_01_0.camlp5_transitional; @@ -16226,6 +16236,9 @@ in ginac = callPackage ../applications/science/math/ginac { }; + glucose = callPackage ../applications/science/logic/glucose { }; + glucose-syrup = callPackage ../applications/science/logic/glucose/syrup.nix { }; + hol = callPackage ../applications/science/logic/hol { }; hol_light = callPackage ../applications/science/logic/hol_light { diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix index 0878a6adeb8b..1bf3b4c0e61b 100644 --- a/pkgs/top-level/emacs-packages.nix +++ b/pkgs/top-level/emacs-packages.nix @@ -395,7 +395,7 @@ let }; packageRequires = [ company ghc-mod ]; meta = { - description = "company-mode completion backend for haskell-mode via ghc-mod"; + description = "Company-mode completion backend for haskell-mode via ghc-mod"; license = gpl3Plus; }; }; diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix index 5f38fdf42aa7..e652bf2d5901 100644 --- a/pkgs/top-level/lua-packages.nix +++ b/pkgs/top-level/lua-packages.nix @@ -427,7 +427,7 @@ let }; meta = with stdenv.lib; { - description = "vicious widgets for window managers"; + description = "Vicious widgets for window managers"; homepage = http://git.sysphere.org/vicious/; license = licenses.gpl2; maintainers = with maintainers; [ makefu ]; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 84412b6370bc..8ba9e066b439 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -597,7 +597,7 @@ in modules // { meta = { homepage = https://github.com/bitprophet/alabaster; - description = "a Sphinx theme"; + description = "A Sphinx theme"; license = licenses.bsd3; }; }; @@ -887,7 +887,7 @@ in modules // { buildInputs = with self; [ pytest ]; meta = { - description = "namespace control and lazy-import mechanism"; + description = "Namespace control and lazy-import mechanism"; homepage = "http://bitbucket.org/hpk42/apipkg"; license = licenses.mit; }; @@ -971,7 +971,7 @@ in modules // { }; meta = { - description = "reference implementation of PEP 3156"; + description = "Reference implementation of PEP 3156"; homepage = http://www.python.org/dev/peps/pep-3156; license = licenses.free; }; @@ -3813,7 +3813,7 @@ in modules // { sha256 = "4a14c67d520fda9d42b0da6134638578caae1d374b9bb462d8de00587dba764c"; }; meta = { - description = "plugin core for use by pytest-cov, nose-cov and nose2-cov"; + description = "Plugin core for use by pytest-cov, nose-cov and nose2-cov"; }; propagatedBuildInputs = with self; [ self.coverage ]; }; @@ -4606,7 +4606,7 @@ in modules // { buildInputs = with self; [ covCore pytest ]; meta = { - description = "plugin for coverage reporting with support for both centralised and distributed testing, including subprocesses and multiprocessing"; + description = "Plugin for coverage reporting with support for both centralised and distributed testing, including subprocesses and multiprocessing"; homepage = https://github.com/schlamar/pytest-cov; license = licenses.mit; }; @@ -4694,7 +4694,7 @@ in modules // { TINYCSS_SKIP_SPEEDUPS_TESTS = optional isPyPy true; meta = { - description = "complete yet simple CSS parser for Python"; + description = "Complete yet simple CSS parser for Python"; license = licenses.bsd3; homepage = http://pythonhosted.org/tinycss/; }; @@ -5315,7 +5315,7 @@ in modules // { ''; meta = { - description = "integrates an Android device into a desktop"; + description = "Integrates an Android device into a desktop"; homepage = https://github.com/screenfreeze/deskcon-desktop; license = licenses.gpl3; }; @@ -5838,7 +5838,7 @@ in modules // { meta = { homepage = "http://python-eve.org/"; - description = "open source Python REST API framework designed for human beings"; + description = "Open source Python REST API framework designed for human beings"; license = licenses.bsd3; }; }; @@ -5932,7 +5932,7 @@ in modules // { doCheck = !isPy3k; # failures.. meta = { - description = "rapid multi-Python deployment"; + description = "Rapid multi-Python deployment"; license = licenses.gpl2; }; }; @@ -6559,7 +6559,7 @@ in modules // { doCheck = false; meta = { - description = "python humanize utilities"; + description = "Python humanize utilities"; homepage = https://github.com/jmoiron/humanize; license = licenses.mit; maintainers = with maintainers; [ matthiasbeyer ]; @@ -6665,7 +6665,7 @@ in modules // { }; meta = { - description = "helpers to pass trusted data to untrusted environments and back"; + description = "Helpers to pass trusted data to untrusted environments and back"; homepage = "https://pypi.python.org/pypi/itsdangerous/"; }; }; @@ -6707,7 +6707,7 @@ in modules // { doCheck = false; meta = { - description = "tools for i3 users and developers"; + description = "Tools for i3 users and developers"; homepage = "https://github.com/ziberna/i3-py"; license = licenses.gpl3; platforms = platforms.linux; @@ -7109,7 +7109,7 @@ in modules // { }; meta = { - description = "dependencies for mwlib markup"; + description = "Dependencies for mwlib markup"; homepage = "http://pediapress.com/code/"; license = licenses.bsd3; }; @@ -7132,7 +7132,7 @@ in modules // { ]; meta = { - description = "generate pdfs from mediawiki markup"; + description = "Generate pdfs from mediawiki markup"; homepage = "http://pediapress.com/code/"; license = licenses.bsd3; }; @@ -7223,7 +7223,7 @@ in modules // { JPEG_DIR="${pkgs.libjpeg.dev}"; meta = { - description = "interface to netCDF library (versions 3 and 4)"; + description = "Interface to netCDF library (versions 3 and 4)"; homepage = https://pypi.python.org/pypi/netCDF4; license = licenses.free; # Mix of license (all MIT* like) }; @@ -10478,7 +10478,7 @@ in modules // { buildInputs = with self; [ pkgs.setuptools ] ++ (optional isPy26 argparse); meta = { - description = "automatically generated zsh completion function for Python's option parser modules"; + description = "Automatically generated zsh completion function for Python's option parser modules"; license = "BSD"; }; }; @@ -14221,7 +14221,7 @@ in modules // { meta = { homepage = "https://github.com/simplegeo/python-oauth2"; - description = "library for OAuth version 1.0"; + description = "Library for OAuth version 1.0"; license = licenses.mit; maintainers = with maintainers; [ garbas ]; platforms = platforms.linux; @@ -14286,7 +14286,7 @@ in modules // { [ pyptlib argparse twisted pycrypto pyyaml ]; meta = { - description = "a pluggable transport proxy"; + description = "A pluggable transport proxy"; homepage = https://www.torproject.org/projects/obfsproxy; repositories.git = https://git.torproject.org/pluggable-transports/obfsproxy.git; maintainers = with maintainers; [ phreedom thoughtpolice ]; @@ -16373,6 +16373,7 @@ in modules // { pgcli = buildPythonPackage rec { name = "pgcli-${version}"; version = "0.20.1"; + disabled = isPy35; src = pkgs.fetchFromGitHub { sha256 = "0f1ff1a1x1qrcv4ygfh29yyknx8hgwck7rp020zz0jrq9dibhjp7"; @@ -16425,6 +16426,7 @@ in modules // { mycli = buildPythonPackage rec { name = "mycli-${version}"; version = "1.6.0"; + disabled = isPy35; src = pkgs.fetchFromGitHub { sha256 = "0vvl36gxawa0h36v119j47fdylj8k73ak6hv04s5cjqn5adcjjbh"; @@ -16891,8 +16893,8 @@ in modules // { rm prompt_toolkit/win32_types.py ''; - buildInputs = with self; [ jedi ipython pygments ]; - propagatedBuildInputs = with self; [ docopt six wcwidth ]; + buildInputs = with self; [ jedi ipython ]; + propagatedBuildInputs = with self; [ docopt six wcwidth pygments ]; meta = { description = "Python library for building powerful interactive command lines"; @@ -18927,7 +18929,7 @@ in modules // { meta = { homepage = "https://github.com/asweigart/pyperclip"; license = licenses.bsdOriginal; - description = "cross-platform clipboard module"; + description = "Cross-platform clipboard module"; }; }; @@ -19499,7 +19501,7 @@ in modules // { buildInputs = with self; [ ]; meta = { - description = "job queue server"; + description = "Job queue server"; homepage = "https://github.com/pediapress/qserve"; license = licenses.bsd3; }; @@ -19696,7 +19698,7 @@ in modules // { doCheck = false; meta = with stdenv.lib; { - description = "readme"; + description = "Readme"; homepage = "https://github.com/pypa/readme"; }; }; @@ -20039,7 +20041,7 @@ in modules // { }; meta = { - description = "python refactoring library"; + description = "Python refactoring library"; homepage = http://rope.sf.net; maintainers = with maintainers; [ goibhniu ]; license = licenses.gpl2; @@ -20058,7 +20060,7 @@ in modules // { propagatedBuildInputs = with self; [ ropemode ]; meta = { - description = "a plugin for performing python refactorings in emacs"; + description = "A plugin for performing python refactorings in emacs"; homepage = http://rope.sf.net/ropemacs.html; maintainers = with maintainers; [ goibhniu ]; license = licenses.gpl2; @@ -20077,7 +20079,7 @@ in modules // { propagatedBuildInputs = with self; [ rope ]; meta = { - description = "a plugin for performing python refactorings in emacs"; + description = "A plugin for performing python refactorings in emacs"; homepage = http://rope.sf.net; maintainers = with maintainers; [ goibhniu ]; license = licenses.gpl2; @@ -20203,7 +20205,7 @@ in modules // { }; meta = { - description = "common routines for ruamel packages"; + description = "Common routines for ruamel packages"; homepage = https://bitbucket.org/ruamel/base; license = licenses.mit; }; @@ -20220,7 +20222,7 @@ in modules // { }; meta = { - description = "a version of dict that keeps keys in insertion resp. sorted order"; + description = "A version of dict that keeps keys in insertion resp. sorted order"; homepage = https://bitbucket.org/ruamel/ordereddict; license = licenses.mit; }; @@ -20521,7 +20523,7 @@ in modules // { doCheck = false; meta = { - description = "statisitical data visualization"; + description = "Statisitical data visualization"; homepage = "http://stanford.edu/~mwaskom/software/seaborn/"; license = "BSD"; maintainers = with maintainers; [ fridh ]; @@ -20628,7 +20630,7 @@ in modules // { propagatedBuildInputs = with self; [ twisted ]; meta = { - description = "setuptools plug-in that helps run unit tests built with the \"Trial\" framework (from Twisted)"; + description = "Setuptools plug-in that helps run unit tests built with the \"Trial\" framework (from Twisted)"; homepage = http://allmydata.org/trac/setuptools_trial; @@ -21108,7 +21110,7 @@ in modules // { buildInputs = with self; [ ]; meta = { - description = "parse english textual date descriptions"; + description = "Parse english textual date descriptions"; homepage = "https://github.com/pediapress/timelib/"; license = licenses.zlib; }; @@ -22393,7 +22395,7 @@ in modules // { propagatedBuildInputs = with self; [ testtools ]; meta = { - description = "a pyunit extension for dependency injection"; + description = "A pyunit extension for dependency injection"; homepage = https://pypi.python.org/pypi/testscenarios; license = licenses.asl20; }; @@ -22713,7 +22715,7 @@ in modules // { propagatedBuildInputs = with self; [ numpy ]; meta = { - description = "explicitly typed attributes for Python"; + description = "Explicitly typed attributes for Python"; homepage = http://pypi.python.org/pypi/traits; license = "BSD"; }; @@ -23249,7 +23251,7 @@ in modules // { }; meta = { - description = "python wrapper for Xvfb, Xephyr and Xvnc"; + description = "Python wrapper for Xvfb, Xephyr and Xvnc"; homepage = "https://github.com/ponty/pyvirtualdisplay"; license = licenses.bsdOriginal; maintainers = with maintainers; [ layus ]; @@ -23274,7 +23276,7 @@ in modules // { doCheck = false; meta = { - description = "a tool to create isolated Python environments"; + description = "A tool to create isolated Python environments"; homepage = http://www.virtualenv.org; license = licenses.mit; maintainers = with maintainers; [ goibhniu ]; @@ -24008,7 +24010,7 @@ in modules // { patches = [ ../development/python-modules/btrees-py35.patch ]; meta = { - description = "scalable persistent components"; + description = "Scalable persistent components"; homepage = http://packages.python.org/BTrees; }; }; @@ -24025,7 +24027,7 @@ in modules // { }; meta = { - description = "automatic persistence for Python objects"; + description = "Automatic persistence for Python objects"; homepage = http://www.zope.org/Products/ZODB; }; }; @@ -24583,7 +24585,7 @@ in modules // { meta = { homepage = http://liw.fi/cmdtest/; - description = "black box tests Unix command line tools"; + description = "Black box tests Unix command line tools"; }; }; @@ -25562,7 +25564,7 @@ in modules // { }; meta = { - description = "implements a lazy string for python useful for use with gettext"; + description = "Implements a lazy string for python useful for use with gettext"; homepage = https://github.com/mitsuhiko/speaklater; license = "bsd"; maintainers = with maintainers; [ matejc ]; @@ -27055,7 +27057,7 @@ in modules // { meta = { homepage = http://github.com/bepasty/bepasty-server; - description = "binary pastebin server"; + description = "Binary pastebin server"; license = licenses.mit; maintainers = [ maintainers.makefu ]; }; @@ -27112,7 +27114,7 @@ in modules // { }; meta = { homepage = http://bitbucket.org/thomaswaldmann/xstatic; - description = "base packaged static files for python"; + description = "Base packaged static files for python"; license = licenses.mit; maintainers = [ maintainers.makefu ]; }; @@ -27127,7 +27129,7 @@ in modules // { }; meta = { homepage = https://github.com/bitprophet/alabaster; - description = "convert xlsx to csv"; + description = "Convert xlsx to csv"; license = licenses.bsd3; maintainers = with maintainers; [ jb55 ]; }; @@ -27426,7 +27428,7 @@ in modules // { }; meta = { - description = "console colouring for python"; + description = "Console colouring for python"; homepage = "https://pypi.python.org/pypi/python-termstyle/0.1.10"; license = licenses.bsdOriginal; }; @@ -27445,7 +27447,7 @@ in modules // { buildInputs = with self; [ mock ]; meta = { - description = "python test runner"; + description = "Python test runner"; homepage = "https://github.com/CleanCut/green"; licence = licenses.mit; }; |