Age | Commit message (Collapse) | Author |
|
* gnu/packages/patches/gcc-13.2.0-libstdc++-docbook-xsl-uri.patch: New file.
* gnu/packages/patches/gcc-13.2.0-libstdc++-info-install-fix.patch: Ditto.
* gnu/packages/patches/gcc-5.5.0-libstdc++-xmlcatalog.patch: Ditto.
* gnu/local.mk: Register them.
* gnu/packages/gcc.scm
(gcc-5)[source]: Use gcc-5.5.0-libstdc++-xmlcatalog.patch,
gcc-13.2.0-libstdc++-docbook-xsl-uri.patch and
gcc-13.2.0-libstdc++-info-install-fix.patch.
(gcc-9)[source]: Use gcc-13.2.0-libstdc++-docbook-xsl-uri.patch and
gcc-13.2.0-libstdc++-info-install-fix.patch.
(make-libstdc++-doc)[arguments]<#:phases>: Remove 'set-xsl-directory.
Adjust 'build and 'install for info documentation and to respect make-flags.
[native-inputs]: Add docbook2x.
Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Change-Id: Ie3b9de0328a10efadb28d211c3fe03f9b7aaf87f
|
|
The xmlto error[1] was due to libsepol using an unversioned PUBLIC identifier
for DocBook 4.2.
[1]: <https://pagure.io/xmlto/blob/6fa6a0e07644f20abf2596f78a60112713e11cbe/f/FAQ>
* gnu/packages/patches/libsepol-versioned-docbook.patch: New file.
* gnu/local.mk: Register it.
* gnu/packages/selinux.scm (libsepol)[source]: Apply it.
(secilc)[arguments]: Drop xmlto workaround.
[native-inputs]: Add docbook-xml-4.2.
Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Change-Id: I152dd7a30b2a310ed6589133bc98f5eef8a190a1
|
|
The binaries for dblatex aren't provided by texlive-updmap.cfg but by
texlive-bin.
* gnu/packages/patches/dblatex-inkscape-1.0.patch: New file.
* gnu/local.mk: Register it.
* gnu/packages/docbook.scm (dblatex)[source]: Use dblatex-inkscape-1.0.patch.
[arguments]<#:tests?>: Enable tests.
<#:phases>: Rename 'set-path to 'wrap-dblatex. Wrap with texlive-bin rather
than texlive-updmap.cfg in PATH and wrap GUIX_TEXMF in 'wrap-dblatex. Add
'check-wrap phase.
[native-inputs]: Add docbook-mathml-1.0.
[inputs]: Restyle. Add texlive-bin. Replace inkscape/stable with inkscape.
Within texlive-updmap.cfg add previously missing: texlive-amsmath,
texlive-auxhook, texlive-bigintcalc, texlive-bin, texlive-bitset,
texlive-bookmark, texlive-colortbl, texlive-courier, texlive-eepic,
texlive-epstopdf-pkg, texlive-eso-pic, texlive-etexcmds, texlive-fancyhdr,
texlive-gettitlestring, texlive-graphics, texlive-graphics-cfg,
texlive-helvetic, texlive-hycolor, texlive-hyperref, texlive-infwarerr,
texlive-intcalc, texlive-kpathsea, texlive-kvdefinekeys, texlive-kvoptions,
texlive-kvsetkeys, texlive-l3backend, texlive-latex, texlive-latex-bin,
texlive-letltxmacro, texlive-ltxcmds, texlive-pdfescape, texlive-pdflscape,
texlive-pdftexcmds, texlive-psnfss, texlive-rerunfilecheck, texlive-symbol,
texlive-times, texlive-tools, texlive-uniquecounter, texlive-url and
texlive-zapfding. Add fig2dev.
(dblatex/stable)[inputs]: Replace inkscape with inkscape/stable.
Co-authored-by: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Change-Id: I4fb2e1f894b98a4e33a0438a1dda569eeb9eae81
|
|
* gnu/packages/docbook.scm (docbook2x)[source]: Import patches from
debian. Prefer patching in source over 'patch-sources phase. Drop docbook-xml
workaround.
[arguments]<#:phases>: Drop 'patch-sources.
[inputs]: Move after arguments. Remove docbook-xml-4.5.
[natine-inputs]: Add autoconf, automake and libtool.
* gnu/packages/patches/docbook2x-filename-handling.patch: New file.
* gnu/packages/patches/docbook2x-fix-synopsis.patch: Ditto.
* gnu/packages/patches/docbook2x-manpage-typo.patch: Ditto.
* gnu/packages/patches/docbook2x-preprocessor-declaration.patch: Ditto.
* gnu/packages/patches/docbook2x-static-datadir-evaluation.patch: Ditto.
* gnu/local.mk: Register it.
Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
|
|
* gnu/packages/docbook.scm (docbook-utils)[source]: Import patches from debian.
Drop snippet for patching OpenSP and OpenJade.
[native-inputs]: Add autoconf, automake and libtool.
* gnu/packages/patches/docbook-utils-documentation-edits.patch: New file.
* gnu/packages/patches/docbook-utils-escape-characters.patch: Ditto.
* gnu/packages/patches/docbook-utils-remove-jade-sp.patch: Ditto.
* gnu/packages/patches/docbook-utils-respect-refentry-for-name.patch: Ditto.
* gnu/packages/patches/docbook-utils-source-date-epoch.patch: Ditto.
* gnu/packages/patches/docbook-utils-use-date-element.patch: Ditto.
* gnu/local.mk: Register them.
Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
|
|
docbook-xsl patches are probably remnants from
1f7d94597f1e78776f854eeca46c03a3aded8466.
* gnu/packages/docbook.scm: Remove unused import.
* gnu/packages/patches/docbook-xsl-nonrecursive-string-subst.patch: Remove.
* gnu/packages/patches/docbook-xsl-support-old-url.patch: Ditto.
* gnu/local.mk: Unregister it.
* gnu/packages/moreutils.scm (moreutils)[native-inputs]: Drop obsolete
comment.
Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
|
|
* gnu/home/services/music.scm: New file.
* gnu/local.mk: Add this.
* doc/guix.texi: Document this.
Change-Id: Idc23a68276cb3fb07733bb38bc38b1c5a63c1d6a
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
|
|
* gnu/packages/patches/libgit2-uninitialized-proxy-settings.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
* gnu/packages/version-control.scm (libgit2-1.8)[source]: Use it.
Change-Id: I6b0f009d352ddadfcc57b945baea0dcc1bac0589
|
|
This is required to fix the build of cl-prevalence with cl-usocket-0.8.8.
* gnu/packages/patches/sbcl-s-sysdeps-bt2.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register it.
* gnu/packages/lisp-xyz.scm (sbcl-s-sysdeps)[source]: Use it.
Change-Id: I6addc042e16f71b55a2125c1f8eb313023ada411
|
|
Fixes <https://issues.guix.gnu.org/72693>.
* gnu/packages/patches/openscad-fix-boost-join.patch: New file.
* gnu/packages/patches/openscad-with-cgal-5.3.patch: New file.
* gnu/packages/patches/openscad-with-cgal-5.4.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register new patches.
* gnu/packages/engineering.scm (openscad)[source]: Use new patches.
[inputs, native-inputs]: Remove labels.
[arguments]: Disable a few more tests. Remove trailing booleans.
Change-Id: I3ce103afd8669dd68c95352a87d76994a3f08504
|
|
* gnu/packages/gps.scm (gpsbabel): Update to 1.9.0.
[build-system]: Use cmake-build-system.
[arguments]: Adjust for the new build system.
* gnu/packages/patches/gpsbabel-fix-i686-test.patch: Delete no longer
needed patch.
* gnu/local.mk: Delete patch line.
Signed-off-by: Christopher Baines <mail@cbaines.net>
|
|
* gnu/packages/mail.scm (isync): Update to 1.5.0.
[source]: Remove unneeded patch.
* gnu/packages/patches/isync-openssl3-fix.patch: Remove.
* gnu/local.mk (dist_patch_DATA): Unregister it.
Change-Id: Idf814371f94bdd2848aa06c5f4150d9ac8702f65
|
|
Icedove@115 does not properly work without this patch. See:
https://bugzilla.mozilla.org/show_bug.cgi?id=1843007
* gnu/packages/icu4c.scm (icu4c-73)[source]: Use patch.
* gnu/packages/patches/icu4c-icu-22132-fix-vtimezone.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register patch.
Change-Id: Ie64d1e33afedbaedbaafaeb607a201eb671ac7bd
Change-Id: I6d753eacc7daac5663128b20a550044d0fd0ddb7
|
|
* gnu/system/privilege.scm: New file.
* gnu/local.mk (GNU_SYSTEM_MODULES): Add it.
|
|
* gnu/packages/engineering.scm (prusa-slicer): Update to 2.7.4.
[source]: Remove "prusa-slicer-boost-fixes.patch" and
"prusa-slicer-with-cereal-1.3.1.patch". Move some part of the snippet code to
custom build phases.
[arguments] <configure-flags>: Add paths to external libraries. Add
"fix-include-paths" phase.
[native-inputs]: Add catch2.
[inputs]: Use prusa-wxwidgets instead of wxwidgets to fix segfaults. Add
qhull, nanosvg, heatshrink and prusa-libbgcode. Sort inputs aphabetically.
* gnu/packages/patches/prusa-slicer-boost-fixes.patch,
gnu/packages/patches/prusa-slicer-with-cereal-1.3.1.patch: Remove unused
patches.
* gnu/local.mk (dist_patch_DATA): De-register "prusa-slicer-boost-fixes.patch"
and "prusa-slicer-with-cereal-1.3.1.patch".
Change-Id: I15e85d63c9ad6c731c8040ef2d8ec8b2f31f2ab7
Signed-off-by: Sharlatan Hellseher <sharlatanus@gmail.com>
|
|
* gnu/packages/engineering.scm (prusa-wxwidgets): New variable.
* gnu/packages/patches/prusa-wxwidgets-makefile-fix.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register "prusa-wxwidgets-makefile-fix.patch".
Co-authored-by: Nikita Domnitskii <nikita@domnitskii.me>
Change-Id: I9043c2acc95986275ee24d9c5d944e5fe2702e99
Signed-off-by: Sharlatan Hellseher <sharlatanus@gmail.com>
|
|
* gnu/packages/compression.scm (heatshrink): New variable.
* gnu/packages/patches/heatshrink-add-cmake.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add "heatshrink-add-cmake.patch".
Change-Id: I0beccdcaed22e47ac6bfe522497e0759a315813d
Signed-off-by: Sharlatan Hellseher <sharlatanus@gmail.com>
|
|
* gnu/packages/xorg.scm (xpra): Update to 6.1.0.
[source](origin): Update patch file name.
* gnu/packages/patches/xpra-6.0-install_libs.patch: Delete.
* gnu/packages/patches/xpra-6.1-install_libs.patch: New file.
* gnu/local.mk: Unregister deleted file and register new file.
Change-Id: I38dab99fbb369ab7e8daf2795dc37aa1a36a63de
Signed-off-by: Christopher Baines <mail@cbaines.net>
|
|
* gnu/packages/mate.scm (libmateweather): Update to 1.28.0
* gnu/packages/patches/libmateweather-use-TZDIR.patch: Remove patch.
* gnu/local.mk (dist_patch_DATA): Unregister it.
Change-Id: I7432dd65bcf00e9f44d610fad337b629714fb3d2
Signed-off-by: 宋文武 <iyzsong@member.fsf.org>
|
|
Change-Id: Ib66e48c4cb84e9e97ebcec334ab0b9f3dbfb1457
|
|
* gnu/local.mk (GNU_SYSTEM_MODULES): Add erlang-xyz.scm.
Change-Id: I77df7f661e7a3ad57d0f22d4adad3c5c0d843249
|
|
* gnu/packages/linux.scm (ddcci-driver-linux): Update to 0.4.5.
[source]: Remove already upstream patch.
* gnu/packages/patches/ddcci-driver-linux-6.8.patch: Remove it.
* gnu/local.mk: Unregister it.
Change-Id: I1d4920ec84ea2a67554560181e99e9e2d535af2a
Signed-off-by: Zheng Junjie <zhengjunjie@iscas.ac.cn>
|
|
* gnu/packages/python-xyz.scm (python-waitress): Update to 3.0.0.
[build-system]: Use pyproject-build-system.
[arguments]: Disable failing test.
* gnu/packages/patches/python-waitress-fix-tests.patch: Delete no longer
needed patch.
* gnu/local.mk: Delete patch line.
Change-Id: I5397649e30098627de8c24f6afa2b74413d3446a
|
|
* gnu/packages/prometheus.scm: New file.
* gnu/local.mk: Add gnu/packages/prometheus.scm to the scope.
Change-Id: Ie291afe3b4470c1681d3d77e62ffe2ee090d3a54
|
|
* gnu/packages/patches/zathura-use-struct-initializers.patch: Remove patch.
* gnu/local.mk (dist_patch_DATA): Unregister it.
* gnu/packages/pdf.scm (zathura): Update to 0.5.6.
[source]: Remove patch.
Change-Id: Ibe49294891f1adccfcfb6996674602535c8bd842
|
|
* gnu/packages/haskell-xyz.scm (ghc-unique): New variable.
* gnu/packages/patches/ghc-unique-support-newer-hashable.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
Change-Id: Id9876b8018f5f8b3bcb82ab0bb13616ed298c31b
|
|
Change-Id: I412341ad7a8bb84c7fafeb69dea8182eade68d2f
|
|
This is a follow-up to f8364fabbd1dd9b3cfd098ddf8ea13b29c066866, adding the
new test to the Makefile.
* gnu/local.mk (GNU_SYSTEM_MODULES): Add %D%/tests/emacs.scm.
|
|
* gnu/packages/crates-web.scm (rust-poem-1): New variable.
* gnu/packages/patches/rust-poem-1-fewer-deps.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register it.
Change-Id: I7438bf627daef5d4bae39b51472cc91bfc9aa5a9
|
|
* gnu/packages/python-xyz.scm (python-xmp-toolkit): New variable.
* gnu/packages/patches/python-xmp-toolkit-add-missing-error-codes.patch:
New file.
* gnu/local.mk (dist_patch_DATA): Add it.
Change-Id: Ibce05155961eb5ba199754646e08acff2410f95d
Co-authored-by: Ludovic Courtès <ludo@gnu.org>
|
|
* gnu/packages/patches/freeimage-libraw-0.21-compat.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
* gnu/packages/image.scm (freeimage)[source](patches): Add it.
Change-Id: Ief930d50be3e1f44074cd772756fb813bbad4389
|
|
* gnu/packages/kde.scm (gwenview): Update to 24.05.2.
[inputs]: Remove kactivities, qtimageformats-5, qtsvg-5, qtwayland-5, and
qtx11extras; add plasma-activities, ki18n, libxkbcommon,
qtimageformats, qtsvg, and qtwayland.
[source]: Remove patches.
[arguments]: Set #:qtbase to qtbase.
* gnu/packages/patches/gwenview-kimageannotator.patch: Remove it.
* gnu/local.mk (dist_patch_DATA): Unregister it.
Change-Id: I962edcb3d59542eaf9eccd97c1e08d34ae7ab35b
|
|
* gnu/packages/kde-plasma.scm (libksysguard): Update to 6.1.2.
[source]: Remvoe patches.
[inputs]: Remove plasma-framework, qtbase-5, qtdeclarative-5, qtscript,
qtwebchannel-5, qtwebengine-5, and qtx11extras; add libplasma,
qtdeclarative, qtwebchannel, and qtwebengine.
[native-inputs]: Remove qttools-5; add qttools.
[arguments]: Set #:qtbase to qtbase.
* gnu/packages/patches/libksysguard-qdiriterator-follow-symlinks.patch: Remove it.
* gnu/local.mk (dist_patch_DATA): Unregister it.
Change-Id: Ic5b88315da7682dcd47ec19894b8ed88b87d6688
|
|
* gnu/packages/freedesktop.scm (appstream): Update to 1.0.3.
[source]: Remove patch.
[native-inputs]: Add gi-docgen.
(appstream-qt)[arguments]: Pass -Dqt-versions=5.
* gnu/packages/patches/appstream-force-reload-stemmer.patch: Delete it.
* gnu/local.mk (dist_patch_DATA): Unregister it.
Change-Id: I7037c0e1b6c8e0d4212506e9caac9fe64a762d96
|
|
* gnu/packages/patches/virt-manager-fix-gtk-cursor-theme-backtace.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register file.
* gnu/packages/virtualization.scm (virt-manager)[source]: Use it.
Change-Id: I4db2015a5d4ac3eca3cfa5d3eec20b357c2d3ff9
Signed-off-by: Leo Famulari <leo@famulari.name>
|
|
* gnu/packages/mingw.scm (make-mingw-w64): Update to 12.0.0.
* gnu/packages/patches/mingw-w64-6.0.0-gcc.patch: Delete patch.
* gnu/packages/patches/mingw-w64-dlltool-temp-prefix.patch: Delete patch.
* gnu/packages/patches/mingw-w64-reproducible-gendef.patch: Delete patch.
* gnu/local.mk: Unregister patches.
Change-Id: Id9d7d17926280b21016a7217da44004e06e436cd
Signed-off-by: Christopher Baines <mail@cbaines.net>
|
|
* gnu/packages/patches/python-angr-addition-type-error.patch:
New patch.
* gnu/packages/patches/python-angr-check-exec-deps.patch:
New patch.
* gnu/local.mk (dist_patch_DATA): Add them.
* gnu/packages/python-xyz.scm (python-angr): New variable.
Signed-off-by: jgart <jgart@dismail.de>
|
|
* gnu/packages/patches/python-pyvex-remove-angr-dependency.patch:
New patch.
* gnu/local.mk (dist_patch_DATA): Add it.
* gnu/packages/python-xyz.scm (python-pyvex): New variable.
Signed-off-by: jgart <jgart@dismail.de>
|
|
* gnu/packages/patches/python-pysmt-fix-pow-return-type.patch:
New patch.
* gnu/packages/patches/python-pysmt-fix-smtlib-serialization-test.patch:
New patch.
* gnu/local.mk (dist_patch_DATA): Add them.
* gnu/packages/python-xyz.scm (python-pysmt): New variable.
Signed-off-by: jgart <jgart@dismail.de>
|
|
* gnu/packages/patches/capstone-fix-python-constants.patch: New patch.
* gnu/local.mk (dist_patch_DATA): Add it.
* gnu/packages/engineering.scm (capstone): New patch.
Signed-off-by: jgart <jgart@dismail.de>
|
|
The backported commit fixes crashes when signals are delivered to
non-Scheme threads, including GC worker threads and threads
created by foreign libraries. This appears to have been the
cause of the intermittent test failures we have experienced.
* gnu/packages/patches/chez-scheme-backport-signal.patch: New patch.
* gnu/local.mk (dist_patch_DATA): Add it.
* gnu/packages/chez-scheme.scm (chez-scheme)[source]<patches>: Use it.
(chez-scheme-for-racket, chez-scheme): Enable tests.
Change-Id: Ifd87ca0d1707ef6ad067d883772a5b42803ead94
Signed-off-by: Efraim Flashner <efraim@flashner.co.il>
|
|
* gnu/packages/patches/racket-backport-8.12-chez-configure.patch: Delete
obsolete patch.
* gnu/local.mk (dist_patch_DATA): Remove it.
* gnu/packages/racket.scm (%racket-origin)[patches]: Likewise.
* gnu/packages/chez.scm (chez-scheme-for-racket): Update to
10.0.1-pre-release.1.
* gnu/packages/racket.scm (%racket-version): Update to 8.13.
(racket)[inputs]<data, deinprogramm, drracket, eopl, expeditor, gui>
<htdp, math, net-cookies, option-contract, pict, plai, plot, rackunit>
<redex, scribble, snip, typed-racket, srfi, web-server>: Update hashes.
Change-Id: I2d7b6e79a5a4e775d9b918b39fb688b484bb9f93
Signed-off-by: Efraim Flashner <efraim@flashner.co.il>
|
|
Clasp uses an interesting CRTP pattern to insert statically (i.e. compile-time)
generated numeric IDs into global fields. However, these templates are
instantiated once per shared library---thus, whenever a library is linked, new
IDs are generated, and the original intent (safely type-casting objects across
libraries) is lost. To help the linker out, we make sure that these IDs are
only instantiated in clasp and not when building other libraries.
* gnu/packages/patches/clasp-hide-event-ids.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register it here.
* gnu/packages/clasp.scm (source)[patches]: Add it here.
(clingo)[#:phases]: Drop ‘skip-failing-tests’.
(python-clorm)[#:phases]<fix-breaking-tests>: Adjust accordingly.
(python-clintest): Drop arguments.
|
|
* gnu/packages/python-science.scm (python-scikit-optimize): Update to 0.10.2.
[source]: Switch to maintained repository. Remove compatibility patches and
snippet.
* gnu/packages/patches/python-scikit-optimize-1148.patch,
gnu/packages/patches/python-scikit-optimize-1150.patch: Remove files.
* gnu/local.mk (dist_patch_DATA): Remove them.
Change-Id: I6c23c93d3c256b0b97166f80eaeab7f2c7282c5f
|
|
* gnu/packages/golang-maths.scm: New file.
* gnu/local.mk: Add gnu/packages/golang-maths.scm to the scope.
Change-Id: Iffa3f7735e2155ecdd46f5cdeda9143c9c823322
|
|
* gnu/packages/music (mixxx): Update to 2.4.1.
* gnu/packages/patches/mixxx-link-qtscriptbytearray-qtscript.patch,
gnu/packages/patches/mixxx-system-googletest-benchmark.patch: Remove
files.
* gnu/local.mk (dist_patch_DATA): Unregister patches.
Change-Id: I2ee0f2848dba7a917598a97a295d838bc0656716
Signed-off-by: Andreas Enge <andreas@enge.fr>
|
|
* gnu/local.mk (GNU_SYSTEM_MODULES): Rename mastodon.scm to fediverse.scm.
* gnu/packages/mastodon.scm: Rename to...
* gnu/packages/fediverse.scm: ...this.
Change-Id: I64d72d1ddea626dcebaab6ad50f7036934c1a1a5
Signed-off-by: Andreas Enge <andreas@enge.fr>
|
|
* gnu/packages/patches/mes-0.26.1-fixups.patch: Remove.
* gnu/local.mk (dist_patch_DATA): Unregister it.
* gnu/packages/mes.scm (mes): Update to 0.26.2.
[source]: Remove it.
Change-Id: I2cd401bd5df3f5d44d3749bf6aac472dbbeb70ca
|
|
* guix/import/stackage.scm (%default-lts-version): Upgrade to Stackage
20.26.
* gnu/packages/patches/ghc-aeson-encodeDouble.patch: New file.
* gnu/packages/patches/ghc-clock-realfrag.patch: New file.
* gnu/local.mk: Register them.
* gnu/packages/haskell-check.scm (ghc-tasty-hedgehog): Update.
(ghc-tasty-hspec): Update.
(ghc-tasty-expected-failure): Update.
(ghc-quickcheck-instances): Update.
(ghc-quickcheck-io): Update.
(ghc-hspec-contrib): Update.
* gnu/packages/haskell-crypto.scm (ghc-curve25519): Update.
(ghc-tls): Update.
* gnu/packages/haskell-web.scm (ghc-tagsoup): Update.
(ghc-http2): Update.
(ghc-wai-websockets): Update.
(ghc-aeson): Update.
(ghc-clientsession): Update.
(ghc-yesod-core): Update.
(ghc-yesod-persistent): Update.
(ghc-wai-cors): Update.
* gnu/packages/haskell-xyz.scm (ghc-abstract-par): Update.
(ghc-adjunctions): Update.
(ghc-aeson-diff): Update.
(ghc-base16-bytestring): Update.
(ghc-base-compat): Update.
(ghc-base-compat-batteries): Update.
(ghc-basement): Update.
(ghc-bencode): Update.
(ghc-bytestring-handle): Update.
(ghc-c2hs): Update.
(ghc-cassava-megaparsec): Update.
(ghc-cborg): Update.
(ghc-charset): Update.
(ghc-chasingbottoms): Update.
(ghc-clock): Update.
(ghc-cmark-gfm): Update.
(ghc-concurrent-extra): Update.
(ghc-concurrent-output): Update.
(ghc-conduit-extra): Update.
(ghc-constraints): Update.
(ghc-convertible): Update.
(ghc-csv): Update.
(ghc-data-accessor): Update.
(ghc-data-ordlist): Update.
(ghc-dense-linear-algebra): Update.
(ghc-diagrams-core): Update.
(ghc-diff): Update.
(ghc-dual-tree): Update.
(ghc-either): Update.
(ghc-errors): Update.
(ghc-esqueleto): Update.
(ghc-exactprint): Update.
(ghc-extensible-exceptions): Update.
(ghc-fail): Update.
(ghc-filepath-bytestring): Update.
(ghc-fingertree): Update.
(ghc-fmlist): Update.
(ghc-foldl): Update.
(ghc-free): Update.
(ghc-fsnotify): Update.
(ghc-generic-random): Update.
(ghc-genvalidity-property): Update.
(ghc-groups): Update.
(ghc-hackage-security): Update.
(ghc-half): Update.
(ghc-hashtables): Update.
(ghc-haskell-src): Update.
(ghc-haskell-src-exts-util): Update.
(ghc-hourglass): Update.
(ghc-hpack): Update.
(ghc-hslua): Update.
(ghc-hslua-module-system): Update.
(ghc-http-api-data): Update.
(ghc-ini): Update.
(ghc-inline-c): Update.
(ghc-inline-c-cpp): Update.
(ghc-interpolate): Update.
(ghc-intervals): Update.
(ghc-invariant): Update.
(ghc-io-streams): Update.
(ghc-ipynb): Update.
(ghc-kan-extensions): Update.
(ghc-lens): Update.
(ghc-libmpd): Update.
(ghc-libyaml): Update.
(ghc-lifted-async): Update.
(ghc-linear): Update.
(ghc-listlike): Update.
(ghc-logict): Update.
(ghc-lucid): Update.
(ghc-lzma-conduit): Update.
(ghc-magic): Update.
(ghc-microlens-ghc): Update.
(ghc-microlens-mtl): Update.
(ghc-microlens-platform): Update.
(ghc-missingh): Update.
(ghc-mmorph): Update.
(ghc-monad-control): Update.
(ghc-monad-logger): Update.
(ghc-monoid-extras): Update.
(ghc-murmur-hash): Update.
(ghc-ncurses): Update.
(ghc-network-info): Update.
(ghc-newtype-generics): Update.
(ghc-openglraw): Update.
(ghc-text-conversions): Update.
(ghc-text-icu): Update.
(ghc-text-short): Update.
(ghc-text-zipper): Update.
(ghc-parsers): Update.
(ghc-path): Update.
(ghc-peano): Update.
(ghc-persistent): Update.
(ghc-persistent-sqlite): Update.
(ghc-process-extras): Update.
(ghc-indexed-profunctors): Update.
(ghc-project-template): Update.
(ghc-psqueues): Update.
(ghc-random): Update.
(ghc-reducers): Update.
(ghc-refact): Update.
(ghc-regex-posix): Update.
(ghc-resourcet): Update.
(ghc-sdl): Update.
(ghc-sdl2-image): Update.
(ghc-sdl2-mixer): Update.
(ghc-sdl2-ttf): Update.
(ghc-sdl2-gfx): Update.
(ghc-semigroupoids): Update.
(ghc-semigroups): Update.
(ghc-shakespeare): Update.
(ghc-shelly): Update.
(ghc-simple-reflect): Update.
(ghc-size-based): Update.
(ghc-skylighting-format-latex): Update.
(ghc-skylighting-format-ansi): Update.
(ghc-skylighting): Update.
(ghc-sop-core): Update.
(ghc-split): Update.
(ghc-splitmix): Update.
(ghc-statevar): Update.
(ghc-statistics): Update.
(ghc-stm-conduit): Update.
(ghc-storable-complex): Update.
(ghc-storablevector): Update.
(ghc-svg-builder): Update.
(ghc-temporary-rc): Update.
(ghc-terminal-size): Update.
(ghc-text-manipulate): Update.
(ghc-th-abstraction): Update.
(ghc-th-expand-syns): Update.
(ghc-th-lift-instances): Update.
(ghc-th-orphans): Update.
(ghc-timezone-series): Update.
(ghc-timezone-olson): Update.
(ghc-tldr): Update.
(ghc-transformers-compat): Update.
(ghc-exception-transformers): Update.
(ghc-trifecta): Update.
(ghc-turtle): Update.
(ghc-unagi-chan): Update.
(ghc-unexceptionalio): Update.
(ghc-unicode-transforms): Update.
(ghc-unix-compat): Update.
(ghc-unix-time): Update.
(ghc-unliftio): Update.
(ghc-commutative-semigroups): Update.
(ghc-utf8-string): Update.
(ghc-void): Update.
(ghc-wl-pprint-text): Update.
(ghc-x11-xft): Update.
(ghc-xml): Update.
(ghc-xml-hamlet): Update.
(ghc-yaml): Update.
(ghc-zip-archive): Update.
(ghc-zlib): Update.
(ghc-zstd): Update.
(ghc-keys): Update.
(ghc-pointed): Update.
(ghc-lift-type): Update.
(ghc-unicode-collation): Update.
(ghc-citeproc): Update.
(ghc-commonmark): Update.
(ghc-commonmark-extensions): Update.
(ghc-genvalidity-hspec): Update.
(ghc-netlink): Update.
(ghc-doctest-driver-gen): Update.
(ghc-mysql): Update.
(ghc-persistent-qq): Update.
(ghc-persistent-mysql): Update.
(ghc-string-conversions): Update.
(ghc-postgresql-simple): Update.
(ghc-persistent-postgresql): Update.
(ghc-filtrable): Update.
(ghc-hsyaml-aeson): Update.
(ghc-singleton-bool): Update.
(ghc-git-lfs): Update.
(ghc-nothunks): Update.
(ghc-onetuple): Update.
(ghc-doctest-parallel): Update.
(ghc-ordered-containers): Update.
(ghc-hslua-marshalling): Update.
(ghc-gridtables): Update.
(ghc-should-not-typecheck): Update.
(ghc-servant-server): Update.
(ghc-recv): Update.
(ghc-glib): Update.
(ghc-pango): Update.
(ghc-monoidal-containers): Update.
(ghc-newtype): Update.
(ghc-random-shuffle): Update.
(ghc-ref-tf): Update.
* gnu/packages/irc.scm (glirc): Update.
* gnu/packages/purescript.scm (purescript): Update.
* gnu/packages/wm.scm (icewm): Update.
(ghc-xmobar): Update.
Change-Id: I26ef7c2ef06e3075eba3da21947f16708c437f98
|
|
**tl;dr** Applying this patch makes Cabal work in Guix environments
and ensures that Cabal picks up Haskell packages installed via Guix.
Guix makes heavy use of GHC_PACKAGE_PATH to make GHC pickup Haskell
packages installed via the Guix package manager. The environment
variable is set using native-search-paths from the GHC packages.
Unfortunately, upstream Cabal does presently not respect
GHC_PACKAGE_PATH. If this environment variable is set, `cabal build`
and other commands will terminate. For building packages, Guix does
not make much use of cabal-install hence this is not as big of an
issue. However, cabal-install does therefore presently not work
out-of-the-box in environments created by Guix. For example,
in `guix shell` environments. This makes it essentially impossible
to use Guix for setting up development environments for Haskell software.
Cabal upstream is aware of this issue and a patch exists to workaround
this problem. The patch is currently not merged upstream due to issues
related to reconfiguration (changing GHC_PACKAGE_PATH between `cabal
configure` and `cabal build`). However, I would argue that this edge
case is not that relevant for Guix and therefore propose including
this patch with the Cabal Guix package. As outlined above, cabal-install
is not usable by default presently, and I would therefore argue that
this is a major improvement over the current situation. I am willing to
work with Cabal upstream to have this issue fixed upstream eventually.
Note that this requires patching the GHC package instead of the
cabal-install package as Guix uses the version of the Cabal package
<https://hackage.haskell.org/package/Cabal> distributed with GHC.
See: https://github.com/haskell/cabal/issues/3728
* gnu/packages/haskell-apps.scm (cabal-install): Include patch
to support the GHC_PACKAGE_PATH environment variable.
Signed-off-by: Sören Tempel <soeren@soeren-tempel.net>
Signed-off-by: Lars-Dominik Braun <lars@6xq.net>
Change-Id: Ib77ffa937b878690d0e2d8964b534842b99da039
|