aboutsummaryrefslogtreecommitdiff
path: root/gnu/packages
Commit message (Collapse)AuthorAge
...
| * | | | | | | | | | gnu: dune-istl: Fix build failure.Marius Bakke2020-04-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * gnu/packages/maths.scm (dune-istl)[arguments]: Add phase 'hide-gfortran'.
| * | | | | | | | | | gnu: qgis: Do not use the deprecated sqlite-with-column-metadata.Marius Bakke2020-04-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * gnu/packages/geo.scm (qgis)[inputs]: Change from SQLITE-WITH-COLUMN-METADATA to SQLITE.
| * | | | | | | | | | gnu: icu4c: Remove redundant icu4c-66.1 variable.Marius Bakke2020-04-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * gnu/packages/icu4c.scm (icu4c-66.1): Remove variable. * gnu/packages/chromium.scm (ungoogled-chromium)[inputs]: Change from ICU4C-66.1 to ICU4C.
| * | | | | | | | | | Merge branch 'master' into core-updatesMarius Bakke2020-04-13
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | gnu: autogen: Disable parallel tests.Marius Bakke2020-04-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * gnu/packages/autogen.scm (autogen)[arguments]: Add #:parallel-tests?.
| * | | | | | | | | | | gnu: python2-backports-shutil-get-terminal-size: Fix test failure.Marius Bakke2020-04-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * gnu/packages/python-xyz.scm (python2-backports-shutil-get-terminal-size)[arguments]: In the check phase, set PYTHONPATH before running the tests.
| * | | | | | | | | | | gnu: perl-ev: Update to 4.31.Marius Bakke2020-04-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * gnu/packages/libevent.scm (perl-ev): Update to 4.31.
| * | | | | | | | | | | gnu: moarvm: Propagate libffi.Marius Bakke2020-04-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * gnu/packages/perl6.scm (moarvm)[inputs]: Move LIBFFI ... [propagated-inputs]: ... here.
| * | | | | | | | | | | gnu: pcmanfm-qt: Remove obsolete workaround.Marius Bakke2020-04-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * gnu/packages/lxqt.scm (pcmanfm-qt)[inputs]: Remove GLIB:BIN. [arguments]: Remove phase 'wrap-glib'.
| * | | | | | | | | | | gnu: gnutls-3.6.13: Cross-build fix.Jan (janneke) Nieuwenhuizen2020-04-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * gnu/packages/patches/gnutls-cross.patch: New file. * gnu/packages/tls.scm (gnutls-3.6.13)[source]: Use it. [native-inputs]: If cross-compiling, add native guile-3.0. This actually cross compiles .go modules.
| * | | | | | | | | | | gnu: guile-json: Cross-build fix.Jan (janneke) Nieuwenhuizen2020-04-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * gnu/packages/patches/guile-json-cross.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/guile.scm (guile-json-3)[source]: Use it. [arguments]: Remove configure to trigger bootstrap phase.
| * | | | | | | | | | | gnu: openssh: Build fix for the Hurd.Jan (janneke) Nieuwenhuizen2020-04-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * gnu/packages/patches/openssh-hurd.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/ssh.scm (openssh)[source]: Use it. [inputs]: If hurd-target? is true, omit xauth.
| * | | | | | | | | | | gnu: openssl: Support cross-compilation to the Hurd.Jan (janneke) Nieuwenhuizen2020-04-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * gnu/packages/tls.scm (openssl)[arguments]: Add `i586' => hurd-x86 platform setting.
| * | | | | | | | | | | gnu: hurd: "/libexec/rc" spawns the console client.Ludovic Courtès2020-04-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * gnu/packages/hurd.scm (hurd-rc-script): Start the console client.
| * | | | | | | | | | | gnu: guile@3: Disable JIT on GNU/Hurd.Ludovic Courtès2020-04-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * gnu/packages/guile.scm (guile-3.0)[arguments]: New field.
| * | | | | | | | | | | gnu: cross-libc: Add patch to allow 'gettyent' reading store file names.Jan (janneke) Nieuwenhuizen2020-04-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * gnu/packages/patches/glibc-hurd-gettyent.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/cross-base.scm (cross-libc): Add it in 'patch-libc/hurd' phase when 'hurd-target?' is true.
| * | | | | | | | | | | gnu: hurd: Install a BDF font.Ludovic Courtès2020-04-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * gnu/packages/hurd.scm (unifont): New variable. (hurd)[arguments]: In 'install-goodies' phase, install OUT/share/hurd/vga-system.bdf. [inputs]: Add UNIFONT.
| * | | | | | | | | | | gnu: hurd: Add dependency on libdaemon.Ludovic Courtès2020-04-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * gnu/packages/hurd.scm (hurd)[inputs]: Add dependency on libdaemon. [native-inputs]: Add PKG-CONFIG.
| * | | | | | | | | | | gnu: libdaemon: Cross-build with --localstatedir=/var.Ludovic Courtès2020-04-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * gnu/packages/libdaemon.scm (libdaemon)[arguments]: Add "--localstatedir=/var" when (%current-target-system) is true.
| * | | | | | | | | | | gnu: libdaemon: Allow cross-compilation.Ludovic Courtès2020-04-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * gnu/packages/libdaemon.scm (libdaemon)[arguments]: New field.
| * | | | | | | | | | | gnu: hurd: Add dependency on libgcrypt.Ludovic Courtès2020-04-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * gnu/packages/hurd.scm (hurd)[inputs]: Add LIBGCRYPT. [native-inputs]: Likewise.
| * | | | | | | | | | | gnu: libgcrypt: Fix cross-compilation.Jan (janneke) Nieuwenhuizen2020-04-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This works around /gnu/store/pwcp239kjf7lnj5i4lkdzcfcxwcfyk72-bash-minimal-5.0.16/bin/bash ../libtool --tag=CC --mode=link i586-pc-gnu-gcc -I/gnu/store/8x9dhckldm6iy1digklfanmvdaizq11f-libgpg-error-1.37/include -g -O2 -fvisibility=hidden -fno-delete-null-pointer-checks -Wall -o mpicalc mpicalc-mpicalc.o libgcrypt.la -L/gnu/store/8x9dhckldm6iy1digklfanmvdaizq11f-libgpg-error-1.37/lib -lgpg-error i586-pc-gnu-ld: ./.libs/libgcrypt.so: undefined reference to `_gcry_mpih_lshift' i586-pc-gnu-ld: ./.libs/libgcrypt.so: undefined reference to `_gcry_mpih_add_n' i586-pc-gnu-ld: ./.libs/libgcrypt.so: undefined reference to `_gcry_mpih_addmul_1' i586-pc-gnu-ld: ./.libs/libgcrypt.so: undefined reference to `_gcry_mpih_submul_1' i586-pc-gnu-ld: ./.libs/libgcrypt.so: undefined reference to `_gcry_mpih_mul_1' i586-pc-gnu-ld: ./.libs/libgcrypt.so: undefined reference to `_gcry_mpih_sub_n' i586-pc-gnu-ld: ./.libs/libgcrypt.so: undefined reference to `_gcry_mpih_rshift' * gnu/packages/gnupg.scm (libgcrypt)[arguments]: Disable assembly when cross-compiling.
| * | | | | | | | | | | gnu: hurd: Install the UTF-8 motd.Ludovic Courtès2020-04-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * gnu/packages/hurd.scm (hurd)[arguments]: Add 'install-goodies' phase.
| * | | | | | | | | | | gnu: hurd: Ensure startup scripts refer to the right programs.Ludovic Courtès2020-04-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * gnu/packages/hurd.scm (hurd)[arguments]: In 'set-file-names' phase, patch startup.c, init.c, login.c, and daemons/runsystem/*. Add 'patch-libexec-shebangs' phase. Subtitute /libexec and /sbin, so that we may run RC. [inputs]: Add BASH-MINIMAL, COREUTILS, SED, GREP, and UTIL-LINUX.
| * | | | | | | | | | | gnu: hurd: Record the right file name of 'login'.Ludovic Courtès2020-04-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * gnu/packages/hurd.scm (hurd)[arguments]: Add 'set-file-names' phase.
| * | | | | | | | | | | gnu: hurd: Use a 32-bit MiG when cross-compiling.Ludovic Courtès2020-04-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * gnu/packages/hurd.scm (hurd)[native-inputs]: When '%current-target-system' is true, pass #:system "i686-linux" to 'mig'.
| * | | | | | | | | | | gnu: cross-libc: Add patch to add 'mach_print' symbol on GNU/Hurd.Ludovic Courtès2020-04-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * gnu/packages/patches/glibc-hurd-mach-print.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/cross-base.scm (cross-libc): Add 'patch-libc/hurd' phase when 'hurd-target?' is true.
| * | | | | | | | | | | gnu: hurd: Provide our own /libexec/rc script.Ludovic Courtès2020-04-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * gnu/packages/hurd.scm (hurd-rc-script): New procedure. (hurd)[inputs]: Add (hurd-rc-script).
| * | | | | | | | | | | gnu: gnumach: Enable kernel debugger (kbd).Ludovic Courtès2020-04-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * gnu/packages/hurd.scm (gnumach)[arguments]: Add "--enable-kdb".
| * | | | | | | | | | | gnu: sbcl-burgled-batteries3: Fix build with Python 3.8.Marius Bakke2020-04-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * gnu/packages/lisp-xyz.scm (sbcl-burgled-batteries3)[arguments]: Remove "m" suffix from Python include directory. Add phase to remove deprecated Python API binding.
| * | | | | | | | | | | Merge branch 'master' into core-updatesMarius Bakke2020-04-11
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | gnu: python-pycrypto: Fix build with Python 3.8.Marius Bakke2020-04-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * gnu/packages/patches/python-pycrypto-time-clock.patch: New file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/python-crypto.scm (python-pycrypto)[source](patches): Add it.
| * | | | | | | | | | | | gnu: gRPC@1.16: Fix build with glibc 2.30 and later.Marius Bakke2020-04-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * gnu/packages/rpc.scm (grpc-1.16.1)[arguments]: Add phase to rename custom gettid() function.
| * | | | | | | | | | | | gnu: python-gevent: Update to 1.5.0.Marius Bakke2020-04-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * gnu/packages/python-xyz.scm (python-gevent): Update to 1.5.0. [arguments]: Split the unbundling and include path adjustments intwo two phases. Enable previously failing test; disable two others. Use a format string instead of DISPLAY when writing skipped_tests.txt.
| * | | | | | | | | | | | gnu: spandsp: Add comment.Marius Bakke2020-04-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * gnu/packages/telephony.scm (spandsp)[native-inputs]: Note that the LIBJPEG-TURBO dependency comes via LIBTIFF.
| * | | | | | | | | | | | gnu: Add linphoneqt.Raghav Gururajan2020-04-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * gnu/packages/linphone.scm (linphoneqt): New variable. Signed-off-by: Danny Milosavljevic <dannym@scratchpost.org>
| * | | | | | | | | | | | gnu: spandsp: Fix build failure.Danny Milosavljevic2020-04-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * gnu/packages/telephony.scm (spandsp)[native-inputs]: Add libjpeg-turbo.
| * | | | | | | | | | | | gnu: liblinphone: Fix build failure.Raghav Gururajan2020-04-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * gnu/packages/linphone.scm (liblinphone)[arguments]<#:configure-flags]: Add -DENABLE_STRICT=NO. Signed-off-by: Danny Milosavljevic <dannym@scratchpost.org>
| * | | | | | | | | | | | gnu: commencement: Memoize packages as a function of the system.Ludovic Courtès2020-04-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previous, things like 'ld-wrapper-boot0' would be memoized with (mlambda () …). However, the definition of 'ld-wrapper-boot0' depends on the result of (%boot0-inputs), which is itself a function of (%current-system). Thus, if one first calls: (parameterize ((%current-system "x86_64-linux")) (ld-wrapper-boot0)) then, in all subsequent calls to 'ld-wrapper-boot0', the value of (%current-system) would be ignored because the result is already memoized. Concretely, 'ld-wrapper-boot0' would always have the dependencies it has on x86_64-linux, even though they are different than those on armhf-linux, say ("bash-mesboot" vs. "bootstrap-binaries"). Fixes <https://bugs.gnu.org/40482>. Reported by Marius Bakke <mbakke@fastmail.com>. * gnu/packages/commencement.scm (define/system-dependent): New macro. (linux-libre-headers-boot0, hurd-core-headers-boot0, ld-wrapper-boot0) (gcc-boot0-intermediate-wrapped, gcc-boot0-wrapped, ld-wrapper-boot3): Define using 'define/system-dependent' instead of 'define' + 'mlambda'. Adjust users so they no longer look like procedure calls. * tests/guix-build.sh: Add test.
| * | | | | | | | | | | | Merge branch 'master' into core-updatesMarius Bakke2020-04-11
| |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | gnu: mariadb: Fix build on armhf-linux.Marius Bakke2020-04-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * gnu/packages/databases.scm (mariadb)[arguments]: When building for armhf-linux, add phase 'hide-default-gcc'. [native-inputs]: Distinguish GCC-5.
| * | | | | | | | | | | | | gnu: aegisub: Fix build with Make 4.3.Marius Bakke2020-04-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * gnu/packages/patches/aegisub-make43.patch: New file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/video.scm (aegisub)[source](patches): Add it.
| * | | | | | | | | | | | | gnu: spice-gtk: Add an absolute reference for libjpeg in the .la files.Marius Bakke2020-04-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * gnu/packages/spice.scm (spice-gtk)[arguments]: Add phase 'patch-la-files.
| * | | | | | | | | | | | | gnu: python-cython: The i686 python2 workaround is needed for 32-bit ARM too.Marius Bakke2020-04-09
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * gnu/packages/python-xyz.scm (python-cython)[arguments]: In the check phase, disable parallel test execution for all 32-bit systems. * gnu/packages/python-xyz.scm (python2-cython)[arguments]: Remove similar i686 workaround.
| * | | | | | | | | | | | | gnu: qtwebengine: Fix build with Ninja >= 1.10.Marius Bakke2020-04-08
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * gnu/packages/qt.scm (qtwebengine)[arguments]: Add phase 'patch-ninja-version-check'.
| * | | | | | | | | | | | | gnu: python-pyjwt: Remove dependency on old version of 'pytest-runner'.Marius Bakke2020-04-08
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * gnu/packages/python-xyz.scm (python-pyjwt)[arguments]: New field. [native-inputs]: Remove PYTHON-PYTEST-RUNNER.
| * | | | | | | | | | | | | gnu: perl-gd: Do not rely on 'libgd-config'.Marius Bakke2020-04-08
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * gnu/packages/gd.scm (perl-gd)[native-inputs]: Add PERL-EXTUTILS-PKGCONFIG.
| * | | | | | | | | | | | | gnu: ecl: Fix build with LibFFI >= 3.3.Marius Bakke2020-04-08
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * gnu/packages/lisp.scm (ecl)[source](modules, snippet): New fields.
| * | | | | | | | | | | | | gnu: ruby-sqlite3: Remove obsolete workaround.Marius Bakke2020-04-08
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * gnu/packages/ruby.scm (ruby-sqlite3)[arguments]: Remove phase 'adjust-failing-test'.
| * | | | | | | | | | | | | Merge branch 'master' into core-updatesMarius Bakke2020-04-08
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: etc/news.scm gnu/local.mk gnu/packages/check.scm gnu/packages/cross-base.scm gnu/packages/gimp.scm gnu/packages/java.scm gnu/packages/mail.scm gnu/packages/sdl.scm gnu/packages/texinfo.scm gnu/packages/tls.scm gnu/packages/version-control.scm