TakeV/guix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
16221 commits 103 branches 35 tags 487 MiB
Commit graph

60 commits

Author SHA1 Message Date
Hartmut Goebel
e7881f3db4
gnu: Fix python inputs, part 2: all inputs become native-inputs. 
This patch contains the changes where all [inputs] are changed to
[native-inputs].

* gnu/packages/python.scm (python-pytest, python-fixtures,
  python-testrepository, python-virtualenv): All [inputs] are changed to
  [native-inputs].
* gnu/packages/openstack.scm (python-bandit, python-debtcollector,
  python-hacking, python-tempest-lib, python-oslo.config, python-oslo.context,
  python-oslo.i18n, python-oslo.log, python-oslo.serialization,
  python-oslosphinx, python-oslotest, python-oslo.utils): Likewise.
 2016-11-15 22:31:03 +01:00
Hartmut Goebel
5c31f4aa7c
gnu: Remove python-setuptools and python2-setuptools from inputs (part 4a) 
This patch contains the changes for all modules beside python.scm where
setuptools are used in an inherited package and removing this input also
removes the need for inheriting the package. This is the case if adding
setuptools in the inherited package was the only change.

Change this to not inherit and remove the new needless call to
"strip-python2-variant (if applicable).

* gnu/packages/bioinformatics.scm (python-biopython, python2-biopython,
  python-twobitreader, python2-twobitreader,
  python-plastid, python2-plastid,
  python2-pybigwig,
  python2-screed,
  sra-tools): No longer "inherit" Python 2 packages
  inheriting from a Python 3 package if the sole reason for inheriting was
  adding python-setuptools respective python2-setuptools to [inputs],
  [native-inputs] or [propagated-inputs]. Remove now needless [properties]
  "python2-variant" where applicable.
* gnu/packages/django.scm (python-pytest-django, python2-pytest-django,
  python-django-filter, python2-django-filter): Likewise.
* gnu/packages/gnupg.scm (python2-pygpgme): Likewise.
* gnu/packages/mail.scm (python-mailmanclient, python2-mailmanclient):
  Likewise.
* gnu/packages/mpd.scm (python-msp, python2-mpd2): Likewise.
* gnu/packages/music.scm (python-pylast, python2-pylast): Likewise.
* gnu/packages/openstack.scm (python-requests-mock, python2-requests-mock,
  python2-git-review): Likewise.
* gnu/packages/password-utils.scm (python2-bcrypt): Likewise.
* gnu/packages/protobuf.scm (python-protobuf, python2-protobuf): Likewise.
* gnu/packages/statistics.scm (python-patsy, python2-patsy): Likewise.
* gnu/packages/web.scm (python2-feedparser): Likewise.
 2016-11-15 22:28:59 +01:00
Hartmut Goebel
f3b98f4fec
gnu: Remove python-setuptools and python2-setuptools from inputs (part 2) 
This patch contains the changes where removing setuptools from the inputs
affected some code-lines beside.

* gnu/packages/admin.scm (ansible): Remove all [inputs], [native-inputs] and
  [propagated-inputs] where python-setuptools or python2-setuptools are the
  sole entries. Remove python-setuptools and python2-setuptools listed on a
  line by its own from [inputs], [native-inputs] and [propagated-inputs].

* gnu/packages/backup.scm (duplicity): Likewise.
* gnu/packages/bioinformatics.scm (bamm, python2-pybedtools,
  python2-bx-python, python2-dendropy, python-pysam, python2-pysam, clipper,
  crossmap, cutadapt, deeptools, grit, idr, python2-warpedlmm,
  pbtranscript-tofu, seqmagick): Likewise.
* gnu/packages/docbook.scm (dblatex): Likewise.
* gnu/packages/freedesktop.scm (python-pyxdg, python2-pyxdg): Likewise.
* gnu/packages/lirc.scm (python2-lirc): Likewise.
* gnu/packages/mp3.scm (eyed3): Likewise.
* gnu/packages/nutrition.scm (gourmet): Likewise.
* gnu/packages/openstack.scm (python-hacking, python2-hacking,
  python-os-testr, python2-os-testr,
  python-stevedore, python2-stevedore,
  python-tempest-lib, python2-tempest-lib,
  python-oslo.log, python2-oslo.log,
  python-keystoneclient, python2-keystoneclient): Likewise.
* gnu/packages/password-utils.scm (assword): Likewise.
* gnu/packages/python.scm (python-passlib, python2-passlib,
  python-babel, python2-babel,
  python-parse-type,
  python-pytest, python2-pytest,
  python-scripttest, python2-scripttest,
  python-testtools, python2-testtools,
  python-testscenarios, python2-testscenarios,
  python-subunit, python2-subunit,
  python-pbr-0.11,
  python-pbr, python2-pbr,
  python-testrepository, python2-testrepository,
  behave,
  python-wheel, python2-wheel,
  python-requests, python2-requests,
  python-jsonschema, python2-jsonschema,
  python-pyjwt, python2-pyjwt,
  python-virtualenv, python2-virtualenv,
  python-jinja2, python2-jinja2,
  python-joblib, python2-joblib,
  python-sphinx, python2-sphinx,
  python-feedgenerator, python2-feedgenerator,
  python-scikit-image, python2-scikit-image,
  python-redis, python2-redis,
  python2-fastlmm,
  python-numpydoc, python2-numpydoc,
  python-matplotlib, python2-matplotlib,
  python2-pysnptools,
  python-rpy2, python2-rpy2,
  python-pillow, python2-pillow,
  python-pycparser, python2-pycparser,
  python-cffi, python2-cffi,
  python-cairocffi, python2-cairocffi,
  python-drmaa, python2-drmaa,
  python-pathpy, python2-pathpy,
  python-simplegeneric, python2-simplegeneric,
  python-ipython, python2-ipython,
  python-apsw, python2-apsw,
  python-lxml, python2-lxml,
  python-networkx, python2-networkx,
  python-pyzmq, python2-pyzmq,
  python-mccabe, python2-mccabe,
  python-mccabe-0.2.1,
  python-flake8, python2-flake8,
  python-flake8-2.2.4,
  python-mistune, python2-mistune,
  python-ptyprocess, python2-ptyprocess,
  python-llfuse, python2-llfuse,
  python-webob, python2-webob,
  python-xlrd, python2-xlrd,
  python-tables, python2-tables,
  python-pip, python2-pip,
  python-libarchive-c, python2-libarchive-c,
  python-docopt, python2-docopt,
  python-pyrfc3339, python2-pyrfc3339,
  python-configobj, python2-configobj,
  python-clint, python2-clint,
  python-rply, python2-rply,
  python2-rpython,
  python-widgetsnbextension, python2-widgetsnbextension
  jupyter,
  python-jupyter-console, python2-jupyter-console,
  python-hy, python2-hy,
  python-urllib3, python2-urllib3,
  python-rsa, python2-rsa,
  python-tox, python2-tox,
  python2-hypothesis,
  python-paste, python2-paste,
  python-pastescript, python2-pastescript,
  python2-unicodecsv,
  python-pkgconfig, python2-pkgconfig,
  python2-rope,
  python-sqlparse, python2-sqlparse,
  python-gevent, python2-gevent,
  python-tabulate, python2-tabulate,
  python-arrow, python2-arrow,
  python-cleo, python2-cleo,
  python-fake-factory, python2-fake-factory,
  ptpython): Likewise.
* gnu/packages/rdf.scm (python-rdflib, python2-rdflib): Likewise.
* gnu/packages/terminals.scm (asciinema): Likewise.
* gnu/packages/version-control.scm (git-annex-remote-hubic): Likewise.
* gnu/packages/xdisorg.scm (arandr): Likewise.
 2016-11-15 22:27:31 +01:00
Hartmut Goebel
5d85493284
gnu: Remove python-setuptools and python2-setuptools from inputs (part 1b) 
This patch contains the changes in all modules beside python.scm where
removing setuptools from the inputs could be achieved by removing complete
lines.

* gnu/packages/admin.scm (graphios, thefuck): Remove all [inputs],
  [native-inputs] and [propagated-inputs] where python-setuptools or
  python2-setuptools are the sole entries. Remove python-setuptools and
  python2-setuptools listed on a line by its own from [inputs],
  [native-inputs] and [propagated-inputs].
* gnu/packages/backup.scm (rdiff-backup): Likewise.
* gnu/packages/bioinformatics.scm (htseq, macs, python2-pbcore, rseqc,
  multiqc): Likewise.
* gnu/packages/django.scm (python-django, python2-django,
  python-django-simple-math-captcha, python2-django-simple-math-captcha):
  Likewise.
* gnu/packages/docker.scm (python-docker-py, docker-compose): Likewise.
* gnu/packages/game-development.scm (python-pygame): Likewise.
* gnu/packages/key-mon.scm (key-mon): Likewise.
* gnu/packages/mail.scm (khard): Likewise.
* gnu/packages/music.scm (beets, python2-pyechonest): Likewise.
* gnu/packages/openstack.scm (python-bandit, python2-bandit,
  python-debtcollector, python2-debtcollector,
  python-mox3, python2-mox3,
  python-os-client-config, python2-os-client-config,
  python-oslo.config, python2-oslo.config,
  python-oslo.context, python2-oslo.context,
  python-oslo.i18n, python2-oslo.i18n,
  python-oslo.serialization, python2-oslo.serialization,
  python-oslosphinx, python2-oslosphinx,
  python-oslotest, python2-oslotest,
  python-oslo.utils, python2-oslo.utils,
  python-swiftclient, python2-swiftclient): Likewise.
* gnu/packages/pdf.scm (pdfposter): Likewise.
* gnu/packages/tls.scm (python-acme, python2-acme): Likewise.
 2016-11-15 21:58:44 +01:00
Ludovic Courtès
2cab1dd58b
Merge branch 'core-updates' 2016-11-13 00:34:16 +01:00
Marius Bakke
f0ad50af8c
gnu: python-tempest-lib: Update to 1.0.0. 
* gnu/packages/openstack.scm (python-tempest-lib): Update to 1.0.0.
[home-page]: Use HTTPS.
 2016-11-08 18:22:48 +00:00
Marius Bakke
43b53bbbf5
gnu: python-os-testr: Update to 0.8.0. 
* gnu/packages/openstack.scm (python-os-testr, python2-os-testr): Update
to 0.8.0.
[home-page]: Use HTTPS.
 2016-11-08 18:22:18 +00:00
Leo Famulari
964fc66936
gnu: python-requests-mock: Fix build failure with Python 3.5. 
* gnu/packages/openstack.scm (python-requests-mock,
python2-requests-mock)[native-inputs]: Add python-docutils.
 2016-10-16 11:43:30 -04:00
Clément Lassieur
381000d794
gnu: python-git-review: Wrap it so 'git', 'ssh' and 'scp' are found. 
* gnu/packages/openstack.scm (python-git-review)[arguments]: Add
'wrap-program' phase.
[inputs]: Add openssh.

Signed-off-by: Efraim Flashner <efraim@flashner.co.il>
 2016-09-11 10:01:18 +03:00
Clément Lassieur
d443199308
gnu: Add python-git-review. 
* gnu/packages/openstack.scm (python-git-review)
(python2-git-review): New variables.

Signed-off-by: Efraim Flashner <efraim@flashner.co.il>
 2016-09-08 20:28:16 +03:00
Efraim Flashner
d44a618384
gnu: python-requests-mock: Update to 1.0.0. 
* gnu/packages/openstack.scm (python-requests-mock): Update to 1.0.0.
[inputs]: Remove python-setuptools. Move python-mock ...
[native-inputs]: ... to here.  Add python-discover, python-fixtures,
python-sphinx, python-testrepostory, python-testtools.
[properties]: Add python2-variant.
(python2-requests-mock): inherit stripped variant.
[native-inputs]: Use python2-setuptools.
 2016-09-02 06:44:25 +03:00
David Craven
66e076642c
gnu: Remove trailing periods from synopsis. 
* gnu/packages/emacs.scm (emacs-smart-mode-line): Update synopsis.
* gnu/packages/gnustep.scm (wmfire): Update synopsis.
* gnu/packages/haskell.scm (ghc-socks): Update synopsis.
* gnu/packages/kde-frameworks.scm (oxygen-icons): Update synopsis.
* gnu/packages/openstack.scm (python-bandit): Update synopsis.
* gnu/packages/perl.scm (perl-test-trap): Update synopsis.
* gnu/packages/python.scm (python-backports-abc): Update synopsis.
* gnu/packages/ruby.scm (python-cryptography-vectors): Update synopsis.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
 2016-07-29 17:37:22 +02:00
Efraim Flashner
939cf41c3f
gnu: python-oslosphinx: Update to 4.3.0. 
* gnu/packages/openstack.scm (python-oslosphinx): Update to 4.3.0.
 2016-07-07 06:54:06 +03:00
Efraim Flashner
f8f83e9d21 gnu: python-mox3: Update to 0.14.0. 
* gnu/packages/openstack.scm (python-mox3): Update to 0.14.0.
[inputs]: Move python-fixtures, python-pbr, python-setuptools,
python-six, python-testtools ...
[native-inputs]: ... to here.
 2016-04-20 16:18:58 +03:00
Efraim Flashner
4b42bd941b gnu: python-stevedore: Update to 1.12.0. 
* gnu/packages/openstack.scm (python-stevedore): Update to 1.12.0.
[inputs]: Move python-setuptools, python-docutils, python-mock,
python-oslotest, python-sphinx ...
[native-inputs]: ... to here.
 2016-04-20 16:18:58 +03:00
Ben Woodcroft
e25f017422 gnu: Remove duplicate python-pbr. 
This is a follow-up to commit 1ef09c0c75.

* gnu/packages/openstack.scm (python-pbr, python2-pbr): Move from here ...
* gnu/packages/python.scm: ... to here.
(python-pbr, python2-pbr): Delete duplicate packages.
 2016-04-03 21:09:17 +10:00
Mark H Weaver
b35461748b gnu: Fix misplaced commas (unquote). 
Fix many occurrences of comma (unquote) being placed immediately after the
previous list item, e.g. ("ncurses", ncurses) in the inputs.

* gnu/packages/base.scm (patch, gnu-make),
  gnu/packages/bioinformatics.scm (hmmer),
  gnu/packages/bittorrent.scm (aria2),
  gnu/packages/compression.scm (pbzip2),
  gnu/packages/databases.scm (recutils),
  gnu/packages/fonts.scm (font-terminus),
  gnu/packages/freedesktop.scm (xdg-utils, elogind),
  gnu/packages/games.scm (gnujump),
  gnu/packages/gnome.scm (libidl, gnumeric, eog, gedit),
  gnu/packages/gnunet.scm (gnunet),
  gnu/packages/gnuzilla.scm (mozjs, nspr),
  gnu/packages/gtk.scm (gtksourceview, gdk-pixbuf),
  gnu/packages/lua.scm (lua),
  gnu/packages/openstack.scm (python-swiftclient),
  gnu/packages/perl.scm (perl-json-any),
  gnu/packages/polkit.scm (polkit-qt),
  gnu/packages/python.scm (wrap-python3, python-oauthlib)
  (python-mccabe-0.2.1, python-contextlib2, python2-rauth),
  gnu/packages/qt.scm (qtkeychain),
  gnu/packages/ruby.scm (ruby-nokogiri),
  gnu/packages/screen.scm (screen),
  gnu/packages/ssh.scm (libssh),
  gnu/packages/video.scm (ffmpeg, mplayer),
  gnu/packages/vim.scm (vim),
  gnu/packages/xdisorg.scm (redshift),
  gnu/packages/xfce.scm (xfce4-panel, xfce4-settings),
  gnu/packages/xnee.scm (xnee),
  gnu/packages/xorg.scm (font-adobe100dpi, font-adobe75dpi),
  gnu/packages/zsh.scm (zsh): Fix misplaced commas (unquote).
 2016-02-27 08:49:26 -05:00
Leo Famulari
8ad4ae204f gnu: python-wheel: Define 'python2-variant'. 
* gnu/packages/python.scm (python-wheel)[properties]: New field.
(python2-wheel): Use 'strip-python2-variant'.
(python2-requests): Take the result of 'package-with-python2' directly.
* gnu/packages/openstack.scm (python2-requests-mock): Likewise.
(python2-oslosphinx): Likewise.
 2016-02-12 18:50:32 -05:00
Leo Famulari
a14600ecfa gnu: python-jsonschema: Define 'python2-variant'. 
* gnu/packages/python.scm (python-jsonschema)[properties]: New field.
(python2-jsonschema): Use 'strip-python2-variant'.
* gnu/packages/openstack.scm (python2-tempest-lib): Take the result of
'package-with-python2' directly.
 2016-02-12 18:50:32 -05:00
Efraim Flashner
264ae686fa python2-jsonschema: Add python2-functools32 to inputs. 
* gnu/packages/python.scm (python2-jsonschema)[inputs]: Add
python2-functools32.
(python2-wheel)[native-inputs]: Specify python2-jsonschema. Add
python2-functools32.
(python2-requests)[propagated-inputs]: Specify python2-wheel.
(python2-ipython)[inputs]: Specify python2-jsonschema, python2-requests.
(python2-rauth)[propagated-inputs]: Specify python2-requests.
* gnu/packages/openstack.scm (python2-requests-mock)[propagated-inputs]:
Specify python2-requests.
(python2-tempest-lib)[propagated-inputs]: Specify python2-jsonschema.
(python2-oslosphinx)[propagated-inputs]: Specify python2-requests.
(python2-keystoneclient)[porpagated-inputs]: Specify python2-requests.
[native-inputs]: Specify python2-oslosphinx, python2-requests-mock,
python2-tempest-lib.
(python2-swiftclient)[propagated-inputs]: Specify python2-requests,
python2-oslosphinx.
 2016-01-18 17:23:37 +02:00
Efraim Flashner
8f0cc2ffce gnu: Add python-swiftclient. 
* gnu/packages/openstack.scm (python-swiftclient, python2-swiftclient):
New variables.
 2016-01-17 22:37:04 +02:00
Efraim Flashner
c9e330d001 gnu: Add python-keystoneclient. 
* gnu/packages/openstack.scm (python-keystoneclient)
(python2-keystoneclient): New variables.
 2016-01-17 22:37:04 +02:00
Efraim Flashner
34da7af4c1 gnu: python-mox3: Update to 0.13.0. 
* gnu/packages/openstack.scm (python-mox3): Update to 0.13.0.
 2015-12-30 23:16:09 +02:00
Efraim Flashner
ec89a25cad gnu: python-oslosphinx: Update to 4.2.0. 
* gnu/packages/openstack.scm (python-oslosphinx): Update to 4.2.0.
 2015-12-30 23:16:09 +02:00
Efraim Flashner
f66bb273de gnu: python-oslo.serialization: Update to 2.2.0. 
* gnu/packages/openstack.scm (python-oslo.serialization): Update to 2.2.0.
 2015-12-30 23:16:09 +02:00
Efraim Flashner
4768988887 gnu: python-os-testr: Update to 0.5.0. 
* gnu/packages/openstack.scm (python-os-testr): Update to 0.5.0.
 2015-12-30 23:16:09 +02:00
Efraim Flashner
45f4c28d80 gnu: python-stevedore: Update to 1.10.0. 
* gnu/packages/openstack.scm (python-stevedore): Update to 1.10.0.
 2015-12-30 23:16:09 +02:00
Efraim Flashner
622d21bba9 gnu: python-tempest-lib: Update to 0.12.0. 
* gnu/packages/openstack.scm (python-tempest-lib): Update to 0.12.0.
 2015-12-30 23:16:09 +02:00
Efraim Flashner
94ce6b4959 gnu: python-oslo.utils: Update to 3.0.0. 
* gnu/packages/openstack.scm (python-oslo.utils): Update to 3.0.0.
[source]: Change uri to pypi format.
 2015-12-01 19:52:08 +02:00
Efraim Flashner
278c0efd0a gnu: python-oslo.serialization: Update to 2.0.0. 
* gnu/packages/openstack.scm (python-oslo.serialization): Update to 2.0.0.
[source]: Change uri to pypi format.
 2015-12-01 19:13:25 +02:00
Efraim Flashner
5788b4b6d1 gnu: python-oslo.i18n: Update to 3.0.0. 
* gnu/packages/openstack.scm (python-oslo.i18n): Update to 3.0.0.
[source]: Change uri to pypi format.
 2015-12-01 18:14:56 +02:00
Efraim Flashner
e9af5adfd5 gnu: python-oslo.context: Update to 1.0.0. 
* gnu/packages/openstack.scm (python-oslo.context): Update to 1.0.0.
[source]: Change uri to pypi format.
 2015-12-01 17:33:29 +02:00
Efraim Flashner
3bc810a89b gnu: python-tempest-lib: Update to 0.11.0. 
* gnu/packages/openstack.scm (python-tempest-lib): Update to 0.11.0.
 2015-12-01 16:19:58 +02:00
Efraim Flashner
2d531d4efd gnu: python-stevedore: Update to 1.9.0. 
* gnu/packages/openstack.scm (python-stevedore): Update to 1.9.0.
[source]: Change uri to pypi format.
 2015-12-01 16:19:58 +02:00
Efraim Flashner
bd52842d3d gnu: python-requests-mock: Update to 0.7.0. 
* gnu/packages/openstack.scm (python-requests-mock): Update to 0.7.0.
[source]: Change uri to pypi format.
 2015-12-01 16:19:58 +02:00
Efraim Flashner
a5ff52f8a6 gnu: python-os-client-config: Update to 1.12.0. 
* gnu/packages/openstack.scm (python-os-client-config): Update to 1.12.0.
[source]: Change uri to pypi format.
 2015-12-01 16:19:53 +02:00
Efraim Flashner
56c7ead2f8 gnu: python-debtcollector: Update to 1.0.0. 
* gnu/packages/openstack.scm (python-debtcollector): Update to 1.0.0.
[source]: Change uri to pypi format.
 2015-12-01 16:19:22 +02:00
Efraim Flashner
d4e817b1db gnu: python-mox3: Update to 0.12.0. 
* gnu/packages/openstack.scm (python-mox3): Update to 0.12.0.
[source]: Change uri to pypi format.
 2015-12-01 16:19:16 +02:00
Efraim Flashner
ccd20fcb7d gnu: python-pbr: Update to 1.8.1. 
* gnu/packages/openstack.scm (python-pbr): Update to 1.8.1.
 2015-11-30 23:20:35 +02:00
Cyril Roelandt
465b61fcd6 gnu: Add python-tempest-lib. 
* gnu/packages/openstack.scm (python-tempest-lib,
  python2-tempest-lib): New variables.
 2015-11-03 21:38:13 +01:00
Cyril Roelandt
39d3f2edce gnu: python-oslotest: move mox3 to the propagated-inputs 
* gnu/packages/openstack.scm (python-oslotest): move mox3 to the propagated
  inputs.
 2015-11-03 21:38:13 +01:00
Cyril Roelandt
aee6412ad8 gnu: Add python-oslo.log. 
* gnu/packages/openstack.scm (python-oslo.log,
  python2-oslo.log): New variables.
 2015-11-03 21:38:13 +01:00
Cyril Roelandt
2931f46454 gnu: Add python-os-testr. 
* gnu/packages/openstack.scm (python-ostestr,
  python2-ostestr): New variables.
 2015-11-03 21:38:13 +01:00
Cyril Roelandt
f4c7dc5582 gnu: Add python-oslosphinx. 
* gnu/packages/openstack.scm (python-oslosphinx,
  python2-oslosphinx): New variables.
 2015-11-03 21:38:13 +01:00
Cyril Roelandt
2ac9ba6a29 gnu: Add python-hacking. 
* gnu/packages/openstack.scm (python-hacking,
  python2-hacking): New variables.
 2015-11-03 21:38:13 +01:00
Cyril Roelandt
f5a21dc4cf gnu: Add python-bandit. 
* gnu/packages/openstack.scm (python-bandit, python2-bandit): New variables.
 2015-10-10 03:20:49 +02:00
Cyril Roelandt
2c9d96767a gnu: Add python-requests-mock. 
* gnu/packages/openstack.scm (python-requests-mock,
  python2-requests-mock): New variables.
 2015-09-16 22:53:36 +02:00
Cyril Roelandt
c7c7a93621 gnu: Add python-oslo.context. 
* gnu/packages/openstack.scm (python-oslo.context,
  python2-oslo.context): New variables.
 2015-09-16 22:53:36 +02:00
Cyril Roelandt
5702efe3e9 gnu: Add python-oslo.serialization. 
* gnu/packages/openstack.scm (python-oslo.serialization,
  python2-oslo.serialization): New variables.
 2015-09-16 22:53:36 +02:00
Cyril Roelandt
27cc9f2544 gnu: Add python-oslo.utils. 
* gnu/packages/openstack.scm (python-oslo.utils, python2-oslo.utils): New variables.
 2015-09-14 00:14:56 +02:00