diff options
Diffstat (limited to 'pkgs/top-level')
-rw-r--r-- | pkgs/top-level/all-packages.nix | 40 | ||||
-rw-r--r-- | pkgs/top-level/python-packages.nix | 80 |
2 files changed, 90 insertions, 30 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1a560cdb97fd..66dc7b95a89e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -715,6 +715,9 @@ let brasero = callPackage ../tools/cd-dvd/brasero { }; + brltty = callPackage ../tools/misc/brltty { + alsaSupport = (!stdenv.isDarwin); + }; bro = callPackage ../applications/networking/ids/bro { }; bsod = callPackage ../misc/emulators/bsod { }; @@ -995,6 +998,7 @@ let clementine = callPackage ../applications/audio/clementine { boost = boost156; + gst_plugins = [ gst_plugins_base gst_plugins_good gst_plugins_ugly gst_ffmpeg ]; }; ciopfs = callPackage ../tools/filesystems/ciopfs { }; @@ -1557,6 +1561,11 @@ let grails = callPackage ../development/web/grails { jdk = null; }; + gprof2dot = callPackage ../development/tools/profiling/gprof2dot { + # Using pypy provides significant performance improvements (~2x) + pythonPackages = pypyPackages; + }; + graphviz = callPackage ../tools/graphics/graphviz { }; graphviz-nox = callPackage ../tools/graphics/graphviz { @@ -1769,6 +1778,7 @@ let isl = callPackage ../development/libraries/isl { }; isl_0_12 = callPackage ../development/libraries/isl/0.12.2.nix { }; + isl_0_14 = callPackage ../development/libraries/isl/0.14.1.nix { }; isync = callPackage ../tools/networking/isync { }; @@ -3369,6 +3379,7 @@ let ats = callPackage ../development/compilers/ats { }; ats2 = callPackage ../development/compilers/ats2 { }; + ats-extsolve = callPackage ../development/compilers/ats-extsolve { }; avra = callPackage ../development/compilers/avra { }; @@ -3615,6 +3626,25 @@ let else null; })); + gcc51 = lowPrio (wrapCC (callPackage ../development/compilers/gcc/5.1 { + inherit noSysDirs; + + # PGO seems to speed up compilation by gcc by ~10%, see #445 discussion + profiledCompiler = with stdenv; (!isDarwin && (isi686 || isx86_64)); + + # When building `gcc.crossDrv' (a "Canadian cross", with host == target + # and host != build), `cross' must be null but the cross-libc must still + # be passed. + cross = null; + libcCross = if crossSystem != null then libcCross else null; + libpthreadCross = + if crossSystem != null && crossSystem.config == "i586-pc-gnu" + then gnu.libpthreadCross + else null; + + isl = isl_0_14; + })); + gfortran = gfortran48; gfortran48 = wrapCC (gcc48.cc.override { @@ -7238,6 +7268,12 @@ let newt = callPackage ../development/libraries/newt { }; + nghttp2 = callPackage ../development/libraries/nghttp2 { }; + libnghttp2 = nghttp2.override { + prefix = "lib"; + fetchurl = fetchurlBoot; + }; + nix-plugins = callPackage ../development/libraries/nix-plugins { nix = pkgs.nixUnstable; }; @@ -9531,6 +9567,8 @@ let lvm2 = callPackage ../os-specific/linux/lvm2 { }; + mbpfan = callPackage ../os-specific/linux/mbpfan { }; + mdadm = callPackage ../os-specific/linux/mdadm { }; mingetty = callPackage ../os-specific/linux/mingetty { }; @@ -11593,6 +11631,8 @@ let pcmanfm = callPackage ../applications/misc/pcmanfm { }; + pig = callPackage ../applications/networking/cluster/pig { }; + shotcut = callPackage ../applications/video/shotcut { mlt = mlt-qt5; }; smplayer = callPackage ../applications/video/smplayer { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e241fc6fc6da..cf3d239cc025 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -493,11 +493,11 @@ let application = buildPythonPackage rec { name = "python-application-${version}"; - version = "1.4.1"; + version = "1.5.0"; src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/p/python-application/${name}.tar.gz"; - sha256 = "3ae188e9dfd4bd63c9b43aebbf1d9de5df03fb5ac01e72f3bff5b41007570275"; + sha256 = "9bc00c2c639bf633e2c5e08d4bf1bb5d7edaad6ccdd473692f0362df08f8aafc"; }; }; @@ -534,7 +534,7 @@ let }; meta = with pkgs.stdenv.lib; { - description = "Advanced Python Scheduler (APScheduler) is a Python library that lets you schedule your Python code to be executed"; + description = "A Python library that lets you schedule your Python code to be executed"; homepage = http://pypi.python.org/pypi/APScheduler/; license = licenses.mit; }; @@ -777,7 +777,7 @@ let buildInputs = [ pkgs.lzma ]; meta = { - describe = "Backport of Python 3.3's 'lzma' module for XZ/LZMA compressed files."; + describe = "Backport of Python 3.3's 'lzma' module for XZ/LZMA compressed files"; homepage = https://github.com/peterjc/backports.lzma; license = stdenv.lib.licenses.bsd3; }; @@ -915,7 +915,7 @@ let }; meta = { - description = "CalDAVCLientLibrary is a Python library and tool for CalDAV"; + description = "A Python library and tool for CalDAV"; longDescription = '' CalDAVCLientLibrary is a Python library and tool for CalDAV. @@ -1688,7 +1688,7 @@ let }; meta = with stdenv.lib; { - description = "This module implements a very fast JSON encoder/decoder for Python."; + description = "A very fast JSON encoder/decoder for Python"; homepage = "http://ag-projects.com/"; license = licenses.lgpl2; platforms = platforms.all; @@ -2920,17 +2920,17 @@ let eventlib = buildPythonPackage rec { name = "python-eventlib-${version}"; - version = "0.2.0"; + version = "0.2.1"; src = pkgs.fetchurl { url = "http://download.ag-projects.com/SipClient/${name}.tar.gz"; - sha256 = "0fld5lb85ql4a5bgc38sdxi5pgzqljysp1p8f7abxnd6vymh4rgi"; + sha256 = "25224794420f430946fe46932718b521a6264903fe8c0ed3563dfdb844c623e7"; }; propagatedBuildInputs = with self; [ greenlet ]; meta = with stdenv.lib; { - description = "Eventlib bindings for python."; + description = "Eventlib bindings for python"; homepage = "http://ag-projects.com/"; license = licenses.lgpl2; platforms = platforms.all; @@ -4685,7 +4685,7 @@ let buildInputs = with self; [ pkgs.git gevent geventhttpclient mock fastimport ]; meta = with stdenv.lib; { - description = "Simple Python implementation of the Git file formats and protocols."; + description = "Simple Python implementation of the Git file formats and protocols"; homepage = http://samba.org/~jelmer/dulwich/; license = licenses.gpl2Plus; maintainers = [ maintainers.koral ]; @@ -4705,7 +4705,7 @@ let propagatedBuildInputs = with self; [ pkgs.mercurial dulwich ]; meta = with stdenv.lib; { - description = "Push and pull from a Git server using Mercurial."; + description = "Push and pull from a Git server using Mercurial"; homepage = http://hg-git.github.com/; maintainers = [ maintainers.koral ]; }; @@ -6337,6 +6337,26 @@ let }; + le = buildPythonPackage rec { + name = "le-${version}"; + version = "1.4.13"; + + src = pkgs.fetchFromGitHub { + owner = "logentries"; + repo = "le"; + rev = "v${version}"; + sha256 = "12l6fqavykjinq286i9pgbbbrv5lq2mmiji91g0m05lfdx9pg4y1"; + }; + + propagatedBuildInputs = with self; [ simplejson ]; + + meta = { + homepage = "https://github.com/logentries/le"; + description = "Logentries agent"; + }; + }; + + libcloud = buildPythonPackage (rec { name = "libcloud-0.14.1"; @@ -6527,7 +6547,7 @@ let #''; meta = { - description = "python-magic is a python interface to the libmagic file type identification library"; + description = "A python interface to the libmagic file type identification library"; homepage = https://github.com/ahupp/python-magic; }; }; @@ -7059,11 +7079,11 @@ let msrplib = buildPythonPackage rec { name = "python-msrplib-${version}"; - version = "0.15.0"; + version = "0.17.0"; src = pkgs.fetchurl { - url = "http://download.ag-projects.com/SipClient/${name}.tar.gz"; - sha256 = "1sm03jcz663xkbhfmrk7rr5l3wlkydn8xs56fvqjxyapx0m5sw6f"; + url = "http://download.ag-projects.com/MSRP/${name}.tar.gz"; + sha256 = "fe6ee541fbb4380a5708d08f378724dbc93438ff35c0cd0400e31b070fce73c4"; }; propagatedBuildInputs = with self; [ eventlib application gnutls ]; @@ -9266,7 +9286,7 @@ let meta = { homepage = "https://launchpad.net/pygpgme"; - description = "A Python wrapper for the GPGME library."; + description = "A Python wrapper for the GPGME library"; license = licenses.lgpl21; maintainers = [ stdenv.lib.maintainers.garbas ]; }; @@ -9418,7 +9438,7 @@ let meta = with stdenv.lib; { description = "JSON Web Token implementation in Python"; - longDescription = "A Python implementation of JSON Web Token draft 01."; + longDescription = "A Python implementation of JSON Web Token draft 01"; homepage = https://github.com/progrium/pyjwt; downloadPage = https://github.com/progrium/pyjwt/releases; license = licenses.mit; @@ -9506,7 +9526,7 @@ let meta = { homepage = http://pyparsing.wikispaces.com/; - description = "The pyparsing module is an alternative approach to creating and executing simple grammars, vs. the traditional lex/yacc approach, or the use of regular expressions."; + description = "An alternative approach to creating and executing simple grammars, vs. the traditional lex/yacc approach, or the use of regular expressions"; }; }; @@ -11080,7 +11100,7 @@ let }; meta = { - description = "simplejson is a simple, fast, extensible JSON encoder/decoder for Python"; + description = "A simple, fast, extensible JSON encoder/decoder for Python"; longDescription = '' simplejson is compatible with Python 2.4 and later with no @@ -11451,14 +11471,14 @@ let sipsimple = buildPythonPackage rec { name = "sipsimple-${version}"; - version = "2.3.1"; + version = "2.4.0"; disabled = isPy3k; configurePhase = "find -name 'configure' -exec chmod a+x {} \\; ; find -name 'aconfigure' -exec chmod a+x {} \\; ; ${python}/bin/${python.executable} setup.py build_ext --pjsip-clean-compile"; src = pkgs.fetchurl { url = "http://download.ag-projects.com/SipClient/python-${name}.tar.gz"; - sha256 = "1n3g1zg3zgdybikdla0qdqvpa06vn1ka2asr61lb8kk6xbvqkljv"; + sha256 = "f66543c680f22aa3cf86f55373a01a2bb699366a1be5e257c417d018696b6840"; }; propagatedBuildInputs = with self; [ cython pkgs.openssl dns dateutil xcaplib msrplib lxml ]; @@ -13060,11 +13080,11 @@ let xcaplib = buildPythonPackage rec { name = "python-xcaplib-${version}"; - version = "1.0.17"; + version = "1.1.0"; src = pkgs.fetchurl { - url = "http://download.ag-projects.com/SipClient/${name}.tar.gz"; - sha256 = "1bf8n9ghmgxz8kjgnwy4y7ajijy5hi7viabgh0pvzkhz9gfvck86"; + url = "http://download.ag-projects.com/XCAP/${name}.tar.gz"; + sha256 = "2f8ea6fe7d005104ef1d854aa87bd8ee85ca242a70cde42f409f8e5557f864b3"; }; propagatedBuildInputs = with self; [ eventlib application ]; @@ -14351,7 +14371,7 @@ let LD_LIBRARY_PATH = "${pkgs.cairo}/lib"; meta = { - description = "Graphite-web, without the interface. Just the rendering HTTP API."; + description = "Graphite-web, without the interface. Just the rendering HTTP API"; homepage = https://github.com/brutasse/graphite-api; license = licenses.asl20; }; @@ -14604,7 +14624,7 @@ let buildInputs = with self; [ requests gevent ]; meta = { - description = "GRequests allows you to use Requests with Gevent to make asynchronous HTTP Requests easily."; + description = "Asynchronous HTTP requests"; homepage = https://github.com/kennethreitz/grequests; license = "bsd"; maintainers = [ stdenv.lib.maintainers.matejc ]; @@ -14715,7 +14735,7 @@ let ''; buildInputs = with self; [ pkgs.pkgconfig pkgs.e19.efl pkgs.e19.elementary ]; meta = { - description = "Python bindings for EFL and Elementary."; + description = "Python bindings for EFL and Elementary"; homepage = http://enlightenment.org/; maintainers = [ stdenv.lib.maintainers.matejc stdenv.lib.maintainers.tstrobel ]; platforms = stdenv.lib.platforms.linux; @@ -14996,7 +15016,7 @@ let }; meta = { - description = "Thumbor is a smart imaging service. It enables on-demand crop, resizing and flipping of images."; + description = "A smart imaging service"; homepage = https://github.com/globocom/thumbor/wiki; license = licenses.mit; }; @@ -15145,7 +15165,7 @@ let meta = { homepage = "https://github.com/erikrose/parsimonious"; - description = "Fast arbitrary-lookahead packrat parser written in pure Python."; + description = "Fast arbitrary-lookahead packrat parser written in pure Python"; license = licenses.mit; }; }; @@ -15163,7 +15183,7 @@ let meta = { homepage = "https://networkx.github.io/"; - description = "Library for the creation, manipulation, and study of the structure, dynamics, and functions of complex networks."; + description = "Library for the creation, manipulation, and study of the structure, dynamics, and functions of complex networks"; license = licenses.bsd3; }; }; |