Age | Commit message (Collapse) | Author |
|
Most conflicts are from 6fd52309b8f52c9bb59fccffac53e029ce94b698.
|
|
* gnu/packages/python.scm (python-pytest-2.9.2): Replace with ...
(python-pytest-3.0): ... new variable.
(python2-pytest-3.0): New variable.
(python-cryptography, python2-cryptography, python-sphinx-1.5.3)[native-inputs]:
Replace python-pytest-2.9.2 with python-pytest-3.0.
* gnu/packages/backup.scm (borg)[native-inputs]: Likewise.
gnu/packages/calendar.scm (khal)[native-inputs]: Likewise.
|
|
|
|
* gnu/packages/backup.scm (obnam)[arguments]: Replace 'check' phase with
custom function.
Signed-off-by: Marius Bakke <mbakke@fastmail.com>
|
|
|
|
* gnu/packages/backup.scm (obnam): New variable.
Signed-off-by: Marius Bakke <mbakke@fastmail.com>
|
|
|
|
* gnu/packages/backup.scm (rsnapshot): New variable.
|
|
* gnu/packages/backup.scm: Remove unneeded (guix build utils) import.
* gnu/packages/finance.scm: Likewise.
|
|
|
|
|
|
* gnu/packages/backup.scm (duplicity)[native-inputs]: Add PAR2CMDLINE.
[arguments]: Move /bin/sh substitution to 'patch-source' phase and add one file.
|
|
* gnu/packages/backup.scm (borg): Update to 1.0.10.
|
|
|
|
* gnu/packages/backup.scm (duplicity): Update to 0.7.11.
[source]: Remove patches.
[inputs]: Add lftp, update gnupg, remove python-2, make python2-lockfile a
propagated input, make python2-mock a native-input.
[propagated-inputs]: Add python2-lockfile, python2-urllib3.
[native-inputs]: Add python2-pexpect, python2-mock.
[arguments]: Add build phase to embed gnupg store name.
* gnu/packages/patches/duplicity-piped-password.patch: Delete it.
* gnu/packages/patches/duplicity-test_selection-tmp.patch: Delete it.
* gnu/local.mk (dist_patch_DATA): Remove patches.
Signed-off-by: Marius Bakke <mbakke@fastmail.com>
|
|
|
|
* gnu/packages/backup.scm (wimlib): New variable.
|
|
* gnu/packages/backup.scm (borg): Update to 1.0.9.
[arguments]: Run the check phase in its own directory. Skip the test
'test_get_security_dir'.
|
|
* gnu/packages/backup.scm (duplicity)[arguments]: Use 'modify-phases'.
|
|
* gnu/packages/backup.scm (borg)[arguments]: Use
add-installed-pythonpath and disable tests related to FUSE.
|
|
* gnu/packages/backup.scm (libarchive): Update to 3.2.2.
[source]: Remove obsolete patches.
* gnu/packages/patches/libarchive-7zip-heap-overflow.patch,
gnu/packages/patches/libarchive-fix-filesystem-attacks.patch,
gnu/packages/patches/libarchive-fix-symlink-check.patch,
gnu/packages/patches/libarchive-safe_fprintf-buffer-overflow.patch:
Delete files.
* gnu/local.mk (dist_patch_DATA): Remove them.
|
|
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.
|
|
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.
|
|
* gnu/packages/backup.scm (borg)[native-inputs]: Use python-pytest-2.9.2.
|
|
|
|
* gnu/packages/backup.scm (borg): Update to 1.0.8.
|
|
|
|
* gnu/packages/backup.scm (borg)[arguments]: Install more documentation in
'install-doc' phase. Use (srfi srfi-26).
|
|
* gnu/packages/backup.scm (borg)[native-inputs]: Add python-pytest.
[arguments]: Invoke the tests with python-pytest after the install
phase. Set HOME=/tmp in the 'set-env' phase.
|
|
* gnu/packages/backup.scm (attic)[arguments]: Set #:tests? #f.
|
|
* gnu/packages/backup.scm (libarchive)[source]: Add patches from
libarchive/fixed.
[replacement]: Remove field.
(libarchive/fixed): Remove variable.
|
|
* gnu/packages/backup.scm (libarchive)[replacement]: New field.
(libarchive/fixed): New variable.
* gnu/packages/patches/libarchive-7zip-heap-overflow.patch,
gnu/packages/patches/libarchive-fix-symlink-check.patch,
gnu/packages/patches/libarchive-fix-filesystem-attacks.patch,
gnu/packages/patches/libarchive-safe_fprintf-buffer-overflow.patch: New files.
* gnu/local.mk (dist_patch_DATA): Add them.
|
|
* gnu/packages/backup.scm (attic)[properties]: New field.
|
|
* gnu/packages/backup.scm (par2cmdline): New variable.
|
|
* gnu/packages/backup.scm (borg)[source]: Remove generated '.c' files.
[native-inputs]: Add python-cython.
|
|
* gnu/packages/backup.scm (borg): Update to 1.0.7.
|
|
|
|
* gnu/packages/backup.scm (hdup)[source]: Update url.
|
|
|
|
* gnu/packages/backup.scm (borg): Update to 1.0.6.
[source]: Use pypi-uri.
|
|
* gnu/packages/backup.scm (libarchive): Update to 3.2.1.
[arguments]: Build with '-std=C99'.
|
|
|
|
* gnu/packages/backup.scm (borg): Update to 1.0.3.
[source]: Remove pypi-uri.
|
|
* gnu/packages/patches/libarchive-CVE-2013-0211.patch,
gnu/packages/patches/libarchive-CVE-2016-1541.patch,
gnu/packages/patches/libarchive-bsdtar-test.patch,
gnu/packages/patches/libarchive-fix-lzo-test-case.patch,
gnu/packages/patches/libarchive-mtree-filename-length-fix.patch: Delete files.
* gnu/local.mk (dist_patch_DATA): Remove them.
* gnu/packages/backup.scm (libarchive): Update to 3.2.0.
[source]: Remove deleted patches.
[replacement]: Remove.
(libarchive/fixed): Remove variable.
|
|
* gnu/packages/backup.scm (libarchive)[replacement]: New field.
(libarchive/fixed): New variable.
* gnu/packages/patches/libarchive-CVE-2016-1541.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
|
|
* gnu/packages/backup.scm (borg): Update to 1.0.2.
|
|
* gnu/packages/abiword.scm: Use 'search-patches' for 'patches' field.
* gnu/packages/acl.scm: Likewise.
* gnu/packages/admin.scm: Likewise.
* gnu/packages/algebra.scm: Likewise.
* gnu/packages/animation.scm: Likewise.
* gnu/packages/apr.scm: Likewise.
* gnu/packages/audacity.scm: Likewise.
* gnu/packages/audio.scm: Likewise.
* gnu/packages/autotools.scm: Likewise.
* gnu/packages/avahi.scm: Likewise.
* gnu/packages/backup.scm: Likewise.
* gnu/packages/base.scm: Likewise.
* gnu/packages/bash.scm: Likewise.
* gnu/packages/bioinformatics.scm: Likewise.
* gnu/packages/cdrom.scm: Likewise.
* gnu/packages/ci.scm: Likewise.
* gnu/packages/cmake.scm: Likewise.
* gnu/packages/cpio.scm: Likewise.
* gnu/packages/cross-base.scm: Likewise.
* gnu/packages/dico.scm: Likewise.
* gnu/packages/doxygen.scm: Likewise.
* gnu/packages/ebook.scm: Likewise.
* gnu/packages/elf.scm: Likewise.
* gnu/packages/emacs.scm: Likewise.
* gnu/packages/engineering.scm: Likewise.
* gnu/packages/firmware.scm: Likewise.
* gnu/packages/flashing-tools.scm: Likewise.
* gnu/packages/fltk.scm: Likewise.
* gnu/packages/ftp.scm: Likewise.
* gnu/packages/games.scm: Likewise.
* gnu/packages/gawk.scm: Likewise.
* gnu/packages/gcc.scm: Likewise.
* gnu/packages/gd.scm: Likewise.
* gnu/packages/ghostscript.scm: Likewise.
* gnu/packages/glib.scm: Likewise.
* gnu/packages/gnome.scm: Likewise.
* gnu/packages/gnucash.scm: Likewise.
* gnu/packages/gnunet.scm: Likewise.
* gnu/packages/gnupg.scm: Likewise.
* gnu/packages/gnuzilla.scm: Likewise.
* gnu/packages/graphics.scm: Likewise.
* gnu/packages/grub.scm: Likewise.
* gnu/packages/gtk.scm: Likewise.
* gnu/packages/guile.scm: Likewise.
* gnu/packages/icu4c.scm: Likewise.
* gnu/packages/idutils.scm: Likewise.
* gnu/packages/image.scm: Likewise.
* gnu/packages/imagemagick.scm: Likewise.
* gnu/packages/irc.scm: Likewise.
* gnu/packages/ldc.scm: Likewise.
* gnu/packages/libcanberra.scm: Likewise.
* gnu/packages/libevent.scm: Likewise.
* gnu/packages/libreoffice.scm: Likewise.
* gnu/packages/libunwind.scm: Likewise.
* gnu/packages/libusb.scm: Likewise.
* gnu/packages/linux.scm: Likewise.
* gnu/packages/lirc.scm: Likewise.
* gnu/packages/llvm.scm: Likewise.
* gnu/packages/lsh.scm: Likewise.
* gnu/packages/lua.scm: Likewise.
* gnu/packages/lxqt.scm: Likewise.
* gnu/packages/mail.scm: Likewise.
* gnu/packages/maths.scm: Likewise.
* gnu/packages/mcrypt.scm: Likewise.
* gnu/packages/messaging.scm: Likewise.
* gnu/packages/mit-krb5.scm: Likewise.
* gnu/packages/mp3.scm: Likewise.
* gnu/packages/multiprecision.scm: Likewise.
* gnu/packages/music.scm: Likewise.
* gnu/packages/ninja.scm: Likewise.
* gnu/packages/nvi.scm: Likewise.
* gnu/packages/ocaml.scm: Likewise.
* gnu/packages/orpheus.scm: Likewise.
* gnu/packages/ots.scm: Likewise.
* gnu/packages/parallel.scm: Likewise.
* gnu/packages/patchutils.scm: Likewise.
* gnu/packages/pcre.scm: Likewise.
* gnu/packages/pdf.scm: Likewise.
* gnu/packages/perl.scm: Likewise.
* gnu/packages/plotutils.scm: Likewise.
* gnu/packages/polkit.scm: Likewise.
* gnu/packages/pulseaudio.scm: Likewise.
* gnu/packages/python.scm: Likewise.
* gnu/packages/qemu.scm: Likewise.
* gnu/packages/qt.scm: Likewise.
* gnu/packages/ratpoison.scm: Likewise.
* gnu/packages/rdf.scm: Likewise.
* gnu/packages/readline.scm: Likewise.
* gnu/packages/rush.scm: Likewise.
* gnu/packages/scheme.scm: Likewise.
* gnu/packages/screen.scm: Likewise.
* gnu/packages/sdl.scm: Likewise.
* gnu/packages/slim.scm: Likewise.
* gnu/packages/ssh.scm: Likewise.
* gnu/packages/tcl.scm: Likewise.
* gnu/packages/tcsh.scm: Likewise.
* gnu/packages/texinfo.scm: Likewise.
* gnu/packages/tls.scm: Likewise.
* gnu/packages/tor.scm: Likewise.
* gnu/packages/tv.scm: Likewise.
* gnu/packages/valgrind.scm: Likewise.
* gnu/packages/version-control.scm: Likewise.
* gnu/packages/video.scm: Likewise.
* gnu/packages/vpn.scm: Likewise.
* gnu/packages/vtk.scm: Likewise.
* gnu/packages/w3m.scm: Likewise.
* gnu/packages/web.scm: Likewise.
* gnu/packages/wicd.scm: Likewise.
* gnu/packages/wm.scm: Likewise.
* gnu/packages/xdisorg.scm: Likewise.
* gnu/packages/xfce.scm: Likewise.
* gnu/packages/xiph.scm: Likewise.
* gnu/packages/xml.scm: Likewise.
* gnu/packages/xorg.scm: Likewise.
* gnu/packages/zip.scm: Likewise.
|
|
* gnu/packages/backup.scm (borg): Update to 1.0.1.
|
|
* gnu/packages/backup.scm (borg): New variable.
|
|
* gnu/packages/backup.scm (attic)[inputs]: Specify dependency on
python-llfuse-0.41.
|