diff options
author | Franz Pletz <fpletz@fnordicwalking.de> | 2017-07-28 16:08:30 +0200 |
---|---|---|
committer | Franz Pletz <fpletz@fnordicwalking.de> | 2017-07-28 16:08:30 +0200 |
commit | b116fa5ff2a832b24ffbc3ed3fa703ca6bf904ed (patch) | |
tree | ff5748c1ec96643e47dcdeaa5def1aa950a913ce /pkgs/top-level | |
parent | 9be40841ea4251a09ae7a1023abc1b6d191f61bb (diff) | |
parent | 20d2bfa4ff247a49f50fc0cf4d509fbd48723290 (diff) | |
download | nixlib-b116fa5ff2a832b24ffbc3ed3fa703ca6bf904ed.tar nixlib-b116fa5ff2a832b24ffbc3ed3fa703ca6bf904ed.tar.gz nixlib-b116fa5ff2a832b24ffbc3ed3fa703ca6bf904ed.tar.bz2 nixlib-b116fa5ff2a832b24ffbc3ed3fa703ca6bf904ed.tar.lz nixlib-b116fa5ff2a832b24ffbc3ed3fa703ca6bf904ed.tar.xz nixlib-b116fa5ff2a832b24ffbc3ed3fa703ca6bf904ed.tar.zst nixlib-b116fa5ff2a832b24ffbc3ed3fa703ca6bf904ed.zip |
Merge branch 'master' into staging
Diffstat (limited to 'pkgs/top-level')
-rw-r--r-- | pkgs/top-level/aliases.nix | 1 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 45 | ||||
-rw-r--r-- | pkgs/top-level/python-packages.nix | 327 |
3 files changed, 94 insertions, 279 deletions
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index c47e3fe325bf..49ba2d0ccdf8 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -129,6 +129,7 @@ mapAliases (rec { saneFrontends = sane-frontends; # added 2016-01-02 scim = sc-im; # added 2016-01-22 skrooge2 = skrooge; # added 2017-02-18 + skype = skypeforlinux; # added 2017-07-27 spaceOrbit = space-orbit; # addewd 2016-05-23 speedtest_cli = speedtest-cli; # added 2015-02-17 sqliteInteractive = sqlite-interactive; # added 2014-12-06 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1456c13da435..7daec9b18678 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -511,6 +511,8 @@ with pkgs; awless = callPackage ../tools/virtualization/awless { }; + aws-auth = callPackage ../tools/admin/aws-auth { }; + ec2_api_tools = callPackage ../tools/virtualization/ec2-api-tools { }; ec2_ami_tools = callPackage ../tools/virtualization/ec2-ami-tools { }; @@ -720,6 +722,8 @@ with pkgs; bochs = callPackage ../applications/virtualization/bochs { }; + bubblewrap = callPackage ../tools/admin/bubblewrap { }; + borgbackup = callPackage ../tools/backup/borg { python3Packages = python34Packages; }; @@ -987,6 +991,8 @@ with pkgs; esptool-ck = callPackage ../tools/misc/esptool-ck { }; + ephemeralpg = callPackage ../applications/misc/ephemeralpg {}; + f3 = callPackage ../tools/filesystems/f3 { }; facter = callPackage ../tools/system/facter { @@ -1250,6 +1256,8 @@ with pkgs; ori = callPackage ../tools/backup/ori { }; + anydesk = callPackage ../applications/networking/remote/anydesk { }; + atool = callPackage ../tools/archivers/atool { }; bsc = callPackage ../tools/compression/bsc { }; @@ -1329,6 +1337,10 @@ with pkgs; citrix_receiver = callPackage ../applications/networking/remote/citrix-receiver { }; + citra = libsForQt5.callPackage ../misc/emulators/citra { + boost = boost163; + }; + cmst = libsForQt5.callPackage ../tools/networking/cmst { }; colord = callPackage ../tools/misc/colord { }; @@ -3286,6 +3298,8 @@ with pkgs; nasty = callPackage ../tools/security/nasty { }; + nawk = callPackage ../tools/text/nawk { }; + nbd = callPackage ../tools/networking/nbd { }; ndjbdns = callPackage ../tools/networking/ndjbdns { }; @@ -4795,6 +4809,8 @@ with pkgs; xbrightness = callPackage ../tools/X11/xbrightness { }; + xkbvalidate = callPackage ../tools/X11/xkbvalidate { }; + xfstests = callPackage ../tools/misc/xfstests { }; xprintidle-ng = callPackage ../tools/X11/xprintidle-ng {}; @@ -7451,7 +7467,7 @@ with pkgs; beecrypt = callPackage ../development/libraries/beecrypt { }; beignet = callPackage ../development/libraries/beignet { - inherit (llvmPackages) llvm clang-unwrapped; + inherit (llvmPackages_39) llvm clang-unwrapped; }; belle-sip = callPackage ../development/libraries/belle-sip { }; @@ -12239,12 +12255,10 @@ with pkgs; sch_cake = callPackage ../os-specific/linux/sch_cake { }; - inherit (callPackage ../os-specific/linux/spl { + spl = callPackage ../os-specific/linux/spl { configFile = "kernel"; inherit kernel; - }) splStable splUnstable; - - spl = splStable; + }; sysdig = callPackage ../os-specific/linux/sysdig {}; @@ -12268,12 +12282,10 @@ with pkgs; x86_energy_perf_policy = callPackage ../os-specific/linux/x86_energy_perf_policy { }; - inherit (callPackage ../os-specific/linux/zfs { + zfs = callPackage ../os-specific/linux/zfs { configFile = "kernel"; inherit kernel spl; - }) zfsStable zfsUnstable; - - zfs = zfsStable; + }; }); # The current default kernel / kernel modules. @@ -12582,11 +12594,9 @@ with pkgs; statifier = callPackage ../os-specific/linux/statifier { }; - inherit (callPackage ../os-specific/linux/spl { + spl = callPackage ../os-specific/linux/spl { configFile = "user"; - }) splStable splUnstable; - - spl = splStable; + }; sysdig = callPackage ../os-specific/linux/sysdig { kernel = null; @@ -12791,11 +12801,9 @@ with pkgs; zd1211fw = callPackage ../os-specific/linux/firmware/zd1211 { }; - inherit (callPackage ../os-specific/linux/zfs { + zfs = callPackage ../os-specific/linux/zfs { configFile = "user"; - }) zfsStable zfsUnstable; - - zfs = zfsStable; + }; ### DATA @@ -15979,8 +15987,6 @@ with pkgs; siproxd = callPackage ../applications/networking/siproxd { }; - skype = callPackage_i686 ../applications/networking/instant-messengers/skype { }; - skypeforlinux = callPackage ../applications/networking/instant-messengers/skypeforlinux { }; skype4pidgin = callPackage ../applications/networking/instant-messengers/pidgin-plugins/skype4pidgin { }; @@ -18536,6 +18542,7 @@ with pkgs; dell-530cdn = callPackage ../misc/drivers/dell-530cdn {}; dosbox = callPackage ../misc/emulators/dosbox { }; + dosbox-unstable = callPackage ../misc/emulators/dosbox/unstable.nix { }; dpkg = callPackage ../tools/package-management/dpkg { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8743b9903dd3..1b97d88c045c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -194,24 +194,8 @@ in { pycryptodome = callPackage ../development/python-modules/pycryptodome { }; - PyChromecast = buildPythonPackage rec { - name = "PyChromecast-${version}"; - version = "0.8.1"; - - src = pkgs.fetchurl { - url = "mirror://pypi/p/pychromecast/${name}.tar.gz"; - sha256 = "05rlr2hjng0xg2a9k9vwmrlvd7vy9sjhxxfl96kx25xynlkq6yq6"; - }; - - propagatedBuildInputs = with self; [ requests six zeroconf protobuf3_2 ]; - - meta = { - description = "Library for Python 2 and 3 to communicate with the Google Chromecast"; - homepage = "https://github.com/balloob/pychromecast"; - license = licenses.mit; - maintainers = with maintainers; [ abbradar ]; - platforms = platforms.linux; - }; + PyChromecast = callPackage ../development/python-modules/pychromecast { + protobuf = self.protobuf3_2; }; pyexiv2 = if (!isPy3k) then callPackage ../development/python-modules/pyexiv2 {} else throw "pyexiv2 not supported for interpreter ${python.executable}"; @@ -559,22 +543,7 @@ in { }; - amqplib = buildPythonPackage rec { - name = "amqplib-0.6.1"; - - src = pkgs.fetchurl { - url = "http://py-amqplib.googlecode.com/files/${name}.tgz"; - sha256 = "0f2618b74d95cd360a6d46a309a3fb1c37d881a237e269ac195a69a34e0e2f62"; - }; - - # error: invalid command 'test' - doCheck = false; - - meta = { - homepage = http://code.google.com/p/py-amqplib/; - description = "Python client for the Advanced Message Queuing Procotol (AMQP)"; - }; - }; + amqplib = callPackage ../development/python-modules/amqplib {}; ansible = self.ansible2; ansible2 = self.ansible_2_3; @@ -583,26 +552,7 @@ in { ansible_2_2 = callPackage ../development/python-modules/ansible/2.2.nix {}; ansible_2_3 = callPackage ../development/python-modules/ansible/2.3.nix {}; - apipkg = buildPythonPackage rec { - name = "apipkg-1.4"; - - src = pkgs.fetchurl { - url = "mirror://pypi/a/apipkg/${name}.tar.gz"; - sha256 = "2e38399dbe842891fe85392601aab8f40a8f4cc5a9053c326de35a1cc0297ac6"; - }; - - buildInputs = with self; [ pytest ]; - - checkPhase = '' - py.test - ''; - - meta = { - description = "Namespace control and lazy-import mechanism"; - homepage = "http://bitbucket.org/hpk42/apipkg"; - license = licenses.mit; - }; - }; + apipkg = callPackage ../development/python-modules/apipkg {}; appdirs = callPackage ../development/python-modules/appdirs { }; @@ -638,42 +588,9 @@ in { }; }; - apsw = buildPythonPackage rec { - name = "apsw-3.7.6.2-r1"; - disabled = isPyPy; - - src = pkgs.fetchurl { - url = "http://apsw.googlecode.com/files/${name}.zip"; - sha256 = "cb121b2bce052609570a2f6def914c0aa526ede07b7096dddb78624d77f013eb"; - }; - - buildInputs = with self; [ pkgs.sqlite ]; - - # python: double free or corruption (fasttop): 0x0000000002fd4660 *** - doCheck = false; - - meta = { - description = "A Python wrapper for the SQLite embedded relational database engine"; - homepage = http://code.google.com/p/apsw/; - }; - }; - - astor = buildPythonPackage rec { - name = "astor-${version}"; - version = "0.5"; - - src = pkgs.fetchurl { - url = "mirror://pypi/a/astor/${name}.tar.gz"; - sha256 = "1fdafq5hkis1fxqlmhw0sn44zp2ar46nxhbc22cvwg7hsd8z5gsa"; - }; + apsw = callPackage ../development/python-modules/apsw {}; - meta = with pkgs.stdenv.lib; { - description = "Library for reading, writing and rewriting python AST"; - homepage = https://github.com/berkerpeksag/astor; - license = licenses.bsd3; - maintainers = with maintainers; [ nixy ]; - }; - }; + astor = callPackage ../development/python-modules/astor {}; asyncio = if (pythonAtLeast "3.3") then buildPythonPackage rec { name = "asyncio-${version}"; @@ -692,91 +609,19 @@ in { }; } else null; - funcsigs = buildPythonPackage rec { - name = "funcsigs-1.0.2"; - - src = pkgs.fetchurl { - url = "mirror://pypi/f/funcsigs/${name}.tar.gz"; - sha256 = "0l4g5818ffyfmfs1a924811azhjj8ax9xd1cffr1mzd3ycn0zfx7"; - }; - - buildInputs = with self; [ - unittest2 - ]; - - meta = with pkgs.stdenv.lib; { - description = "Python function signatures from PEP362 for Python 2.6, 2.7 and 3.2+"; - homepage = "https://github.com/aliles/funcsigs"; - maintainers = with maintainers; [ garbas ]; - license = licenses.asl20; - }; - }; + funcsigs = callPackage ../development/python-modules/funcsigs { }; APScheduler = callPackage ../development/python-modules/APScheduler { }; - args = buildPythonPackage rec { - name = "args-0.1.0"; - - src = pkgs.fetchurl { - url = "mirror://pypi/a/args/${name}.tar.gz"; - sha256 = "a785b8d837625e9b61c39108532d95b85274acd679693b71ebb5156848fcf814"; - }; - - meta = { - description = "Command Arguments for Humans"; - homepage = "https://github.com/kennethreitz/args"; - }; - }; + args = callPackage ../development/python-modules/args { }; argcomplete = callPackage ../development/python-modules/argcomplete { }; - area53 = buildPythonPackage (rec { - name = "Area53-0.94"; - - src = pkgs.fetchurl { - url = "mirror://pypi/A/Area53/${name}.tar.gz"; - sha256 = "0v9b7f8b6v21y410anx5sr52k2ac8jrzdf19q6m6p0zsdsf9vr42"; - }; - - # error: invalid command 'test' - doCheck = false; - - propagatedBuildInputs = with self; [ self.boto ]; - - }); - - chai = buildPythonPackage rec { - name = "chai-${version}"; - version = "1.1.1"; - - src = pkgs.fetchurl { - url = "mirror://pypi/c/chai/${name}.tar.gz"; - sha256 = "016kf3irrclpkpvcm7q0gmkfibq7jgy30a9v73pp42bq9h9a32bl"; - }; - - meta = { - description = "Mocking, stubbing and spying framework for python"; - }; - }; + area53 = callPackage ../development/python-modules/area53 { }; - chainmap = buildPythonPackage rec { - name = "chainmap-1.0.2"; + chai = callPackage ../development/python-modules/chai { }; - src = pkgs.fetchurl { - url = "mirror://pypi/c/chainmap/${name}.tar.gz"; - sha256 = "09h5gq43w516fqswlca0nhmd2q3v8hxq15z4wqrznfwix6ya6pa0"; - }; - - # Requires tox - doCheck = false; - - meta = { - description = "Backport/clone of ChainMap"; - homepage = "https://bitbucket.org/jeunice/chainmap"; - license = licenses.psfl; - maintainers = with maintainers; [ abbradar ]; - }; - }; + chainmap = callPackage ../development/python-modules/chainmap { }; arelle = callPackage ../development/python-modules/arelle { gui = true; @@ -805,27 +650,7 @@ in { async-timeout = callPackage ../development/python-modules/async_timeout { }; - asn1ate = buildPythonPackage rec { - pname = "asn1ate"; - date = "20160810"; - name = "${pname}-unstable-${date}"; - - src = pkgs.fetchFromGitHub { - sha256 = "04pddr1mh2v9qq8fg60czwvjny5qwh4nyxszr3qc4bipiiv2xk9w"; - rev = "c56104e8912400135509b584d84423ee05a5af6b"; - owner = "kimgr"; - repo = pname; - }; - - propagatedBuildInputs = with self; [ pyparsing ]; - - meta = with stdenv.lib; { - description = "Python library for translating ASN.1 into other forms"; - license = licenses.bsd3; - platforms = platforms.linux; - maintainers = with maintainers; [ leenaars ]; - }; -}; + asn1ate = callPackage ../development/python-modules/asn1ate { }; atomiclong = buildPythonPackage rec { version = "0.1.1"; @@ -8223,11 +8048,11 @@ in { python-axolotl = buildPythonPackage rec { name = "python-axolotl-${version}"; - version = "0.1.35"; + version = "0.1.39"; src = pkgs.fetchurl { url = "mirror://pypi/p/python-axolotl/${name}.tar.gz"; - sha256 = "0ch2d5wqfgxy22dkbxwzilq91wkqy9ficrjy39qhal8g8rdc4jr0"; + sha256 = "09bf5gfip9x2wr0ij43p39ac6z2iqzn7kgpi2jjbwpnhs0vwkycs"; }; propagatedBuildInputs = with self; [ python-axolotl-curve25519 protobuf3_0 pycrypto ]; @@ -8253,7 +8078,7 @@ in { }; meta = { - homepage = "https://github.com/tgalal/python-axolotl"; + homepage = "https://github.com/tgalal/python-axolotl-curve25519"; description = "Curve25519 with ed25519 signatures"; maintainers = with maintainers; [ abbradar ]; license = licenses.gpl3; @@ -8263,15 +8088,16 @@ in { pypolicyd-spf = buildPythonPackage rec { name = "pypolicyd-spf-${version}"; - majorVersion = "1.3"; - version = "${majorVersion}.2"; + majorVersion = "2.0"; + version = "${majorVersion}.1"; + disabled = !isPy3k; src = pkgs.fetchurl { url = "https://launchpad.net/pypolicyd-spf/${majorVersion}/${version}/+download/${name}.tar.gz"; - sha256 = "0ri9bdwn1k8xlyfhrgzns7wjvp5h08dq5fnxcq6mphy94rmc8x3i"; + sha256 = "09yi8y7pij5vzzrkc9sdw01x8w5n758d0qg7wv5hxd1l6if8c94i"; }; - propagatedBuildInputs = with self; [ pyspf pydns ipaddr ]; + propagatedBuildInputs = with self; [ pyspf ]; preBuild = '' substituteInPlace setup.py --replace "'/etc'" "'$out/etc'" @@ -8481,6 +8307,8 @@ in { sha256 = "18j1rmbmhih7q6y12grcj169q7sx1986qn4gmpla9y5gwfh1p8la"; }; + propagatedBuildInputs = with self; [ pydns ]; + meta = { homepage = "http://bmsi.com/python/milter.html"; description = "Python API for Sendmail Milters (SPF)"; @@ -9365,13 +9193,6 @@ in { gdal = self.gdal; }; - # TODO: Django 1.10 will be maintained until the end of the year. Therefore, - # it will be dropped before 17.09. - # https://github.com/NixOS/nixpkgs/issues/25375#issuecomment-298522597 - django_1_10 = callPackage ../development/python-modules/django/1_10.nix { - gdal = self.gdal; - }; - django_1_8 = buildPythonPackage rec { name = "Django-${version}"; version = "1.8.18"; @@ -11369,49 +11190,7 @@ in { propagatedBuildInputs = with self; [ requests webob ]; }; - hmmlearn = buildPythonPackage rec { - name = "hmmlearn-${version}"; - version = "0.2.0"; - - src = pkgs.fetchurl { - url = "mirror://pypi/h/hmmlearn/${name}.tar.gz"; - sha256 = "0qc3fkdyrgfg31y1a8jzs83dxkjw78pqkdm44lll1iib63w4cik9"; - }; - - propagatedBuildInputs = with self; [ numpy ]; - - doCheck = false; - - meta = { - description = "Hidden Markov Models in Python with scikit-learn like API"; - homepage = "https://github.com/hmmlearn/hmmlearn"; - license = licenses.bsd3; - maintainers = with maintainers; [ abbradar ]; - platforms = platforms.unix; - }; - }; - - sphfile = buildPythonPackage rec { - name = "sphfile-${version}"; - version = "1.0.0"; - - src = pkgs.fetchurl { - url = "mirror://pypi/s/sphfile/${name}.tar.gz"; - sha256 = "1ly9746xrzbiax9cxr5sxlg0wvf6fdxcrgwsqqxckk3wnqfypfrd"; - }; - - propagatedBuildInputs = with self; [ numpy ]; - - doCheck = false; - - meta = { - description = "Numpy-based NIST SPH audio-file reader"; - homepage = "https://github.com/mcfletch/sphfile"; - license = licenses.mit; - maintainers = with maintainers; [ abbradar ]; - platforms = platforms.unix; - }; - }; + hmmlearn = callPackage ../development/python-modules/hmmlearn { }; hcs_utils = buildPythonPackage rec { name = "hcs_utils-1.5"; @@ -11917,12 +11696,13 @@ in { ipywidgets = callPackage ../development/python-modules/ipywidgets { }; ipaddr = buildPythonPackage rec { - name = "ipaddr-2.1.10"; + name = "ipaddr-${version}"; + version = "2.1.11"; disabled = isPy3k; src = pkgs.fetchurl { url = "mirror://pypi/i/ipaddr/${name}.tar.gz"; - sha256 = "18ycwkfk3ypb1yd09wg20r7j7zq2a73d7j6j10qpgra7a7abzhyj"; + sha256 = "1dwq3ngsapjc93fw61rp17fvzggmab5x1drjzvd4y4q0i255nm8v"; }; meta = { @@ -14298,12 +14078,12 @@ in { }; netifaces = buildPythonPackage rec { - version = "0.10.5"; + version = "0.10.6"; name = "netifaces-${version}"; src = pkgs.fetchurl { url = "mirror://pypi/n/netifaces/${name}.tar.gz"; - sha256 = "12v2bm77dgaqjm9vmb8in0zpip2hn98mf5sycfvgq5iivm9avn2r"; + sha256 = "1q7bi5k2r955rlcpspx4salvkkpk28jky67fjbpz2dkdycisak8c"; }; meta = { @@ -18835,14 +18615,16 @@ in { }; PyICU = buildPythonPackage rec { - name = "PyICU-1.9.6"; + name = "PyICU-1.9.7"; src = pkgs.fetchurl { url = "mirror://pypi/P/PyICU/${name}.tar.gz"; - sha256 = "0l151zhhyiazzdz8skpxgrw1x4nqa9pq2cwni6d97anmg97i7hn5"; + sha256 = "0qavhngmn7c90fz25a8a2k50wd5gzp3vwwjq8v2pkf2hq4fcs9yv"; }; - buildInputs = [ pkgs.icu ]; + buildInputs = [ pkgs.icu self.pytest ]; + + propagatedBuildInputs = [ self.six ]; meta = { homepage = https://pypi.python.org/pypi/PyICU/; @@ -21915,6 +21697,8 @@ in { }; }; + sphfile = callPackage ../development/python-modules/sphfile { }; + sqlite3dbm = buildPythonPackage rec { name = "sqlite3dbm-0.1.4"; disabled = isPy3k; @@ -22231,18 +22015,41 @@ in { doCheck = false; }; - pydns = buildPythonPackage rec { - name = "pydns-2.3.6"; - disabled = isPy3k; + pydns = + let + py3 = buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "py3dns"; + version = "3.1.1a"; + + src = fetchPypi { + inherit pname version; + sha256 = "0z0qmx9j1ivpgg54gqqmh42ljnzxaychc5inz2gbgv0vls765smz"; + }; + + preConfigure = '' + sed -i \ + -e '/import DNS/d' \ + -e 's/DNS.__version__/"${version}"/g' \ + setup.py + ''; + + doCheck = false; + }; - src = pkgs.fetchurl { - url = "mirror://pypi/p/pydns/${name}.tar.gz"; - sha256 = "0qnv7i9824nb5h9psj0rwzjyprwgfiwh5s5raa9avbqazy5hv5pi"; - }; + py2 = buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "pydns"; + version = "2.3.6"; - doCheck = false; + src = fetchPypi { + inherit pname version; + sha256 = "0qnv7i9824nb5h9psj0rwzjyprwgfiwh5s5raa9avbqazy5hv5pi"; + }; - }; + doCheck = false; + }; + in if isPy3k then py3 else py2; pythondaemon = buildPythonPackage rec { name = "python-daemon-${version}"; |