me
/
guix
Archived
1
0
Fork 0
Commit Graph

1130 Commits (436d9487da3dde2fa094e0c08e02749f61876fe7)

Author SHA1 Message Date
Christopher Baines 36cbd2654e
gnu: ghc-8.10: Fix build on i686-linux.
As one profiling test fails very repeatedly on the bordeaux build farm, but
ghc did seem to build successfully on other machines.

* gnu/packages/haskell.scm (ghc-8.10)[arguments]: Don't run the T11627a
profiling test on i686-linux.
2023-07-17 08:47:10 +01:00
Lars-Dominik Braun c354a345b9
gnu: ghc-8.10: Avoid testsuite timeouts on i686.
* gnu/packages/haskell.scm (ghc-8.10)[arguments]: Add new phase
'skip-failing-tests-i686-cuirass.
2023-04-25 16:54:57 +02:00
Lars-Dominik Braun dc9c09023a
gnu: ghc-9.0: Make testsuite compatible with Python 3.10.
* gnu/packages/haskell.scm (ghc-9.0)[native-inputs]: Add patch and
snippet to ghc-testsuite input.
2023-04-21 20:26:00 +02:00
Maxim Cournoyer e244ea2445
gnu: ghc-9.2: Make the skip-T21694-i686 phase unconditional.
* gnu/packages/haskell.scm (ghc-9.2) [arguments]: Remove match conditional for
the skip-T21694-i686 phase.
2023-04-14 23:37:04 -04:00
Lars-Dominik Braun ec79901a33
gnu: ghc-9.2: Adapt testsuite to grep 3.8.
Starting with version 3.8, grep emits warning messages when pattern
contain spurious slashes:

    grep '\+' /dev/null
    grep: warning: stray \ before +

GHC’s testsuite does not expect that and fails.

* gnu/packages/patches/ghc-9.2-grep-warnings.patch: New file.
* gnu/local.mk: Add it.
* gnu/packages/haskell.scm (ghc-9.2)[native-inputs]: Add patch.
2023-03-12 17:25:10 +01:00
Christopher Baines 7df09ee0ab
Merge remote-tracking branch 'savannah/master' into core-updates
Conflicts:
	gnu/local.mk
	gnu/packages/autotools.scm
	gnu/packages/cmake.scm
	gnu/packages/gnuzilla.scm
	gnu/packages/haskell.scm
	gnu/packages/pdf.scm
	gnu/packages/python-xyz.scm
	gnu/packages/samba.scm
	gnu/packages/tex.scm
	gnu/packages/tls.scm
	gnu/packages/wxwidgets.scm
2023-03-02 10:55:08 +00:00
Lars-Dominik Braun 3bb2078a12
gnu: ghc-9.2: Increase max-silent-time.
Times out on i686 CI, but not locally.

* gnu/packages/haskell.scm (ghc-9.2)[properties]: Add max-silent-time.
2023-02-28 09:29:43 +01:00
Lars-Dominik Braun 086e426d20
gnu: ghc: Disable failing test on i686
Conditionally, so we don’t rebuild GHC on amd64.

* gnu/packages/haskell.scm (ghc-9.2)[arguments]: Conditionally add phase
'skip-T21694-i686.
2023-02-27 19:49:31 +01:00
Lars-Dominik Braun 7df12c8ca6
gnu: ghc-9.2: Support static linking with glibc < 2.34.
* gnu/packages/patches/ghc-9.2-glibc-2.33-link-order.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register it.
* gnu/packages/haskell.scm (ghc-9.2)[origin]: Use it.
2023-02-26 10:26:15 +01:00
Lars-Dominik Braun d603946d38
gnu: ghc-9.2: Increase make verbosity.
Tests time out on ci.guix.gnu.org.

* gnu/packages/haskell.scm (ghc-9.2)[arguments]: Modify #:make-flags.
2023-02-26 10:26:14 +01:00
Lars-Dominik Braun f220509643
gnu: Switch default to GHC 9.2.
* gnu/packages/haskell.scm (ghc-9.0): Rename to just “ghc”.
(ghc-9.2): Ditto.
(ghc): Use ghc-9.2.
2023-02-26 10:19:35 +01:00
Simon Tournier 44f43603d3
gnu: Rename 'git-minimal/fixed' to 'git-minimal/pinned'.
* gnu/packages/version-control.scm: Rename variable 'git-minimal/fixed' to
'git-minimal/pinned', add depreciation.
* gnu/packages/erlang.scm (erlang-erlware-commons)[native-inputs]: Replace
'git-minimal/fixed' with 'git-minimal/pinned'.
(rebar3-git-vsn)[inputs]: Likewise.
* gnu/packages/gnome.scm (gnome-photos)[native-inputs]: Likewise.
* gnu/packages/gtk.scm (graphene)[native-inputs]: Likewise.
* gnu/packages/haskell.scm (ghc-8.8, ghc-8.10)[native-inputs]: Likewise.
* gnu/packages/julia-xyz.scm (julia-documenter)[native-inputs]: Likewise.
* gnu/packages/ocaml.scm (opam, ocamlformat)[native-inputs]: Likewise.
* gnu/packages/python-xyz.scm (python-check-manifest)[native-inputs]: Likewise.
(python-scikit-build)[native-inputs]: Likewise.

Signed-off-by: Liliana Marie Prikler <liliana.prikler@gmail.com>
2023-02-05 06:56:42 +01:00
Efraim Flashner 4cf1acc7f3
Merge remote-tracking branch 'origin/master' into core-updates
Conflicts:
	doc/guix.texi
	gnu/local.mk
	gnu/packages/admin.scm
	gnu/packages/base.scm
	gnu/packages/chromium.scm
	gnu/packages/compression.scm
	gnu/packages/databases.scm
	gnu/packages/diffoscope.scm
	gnu/packages/freedesktop.scm
	gnu/packages/gnome.scm
	gnu/packages/gnupg.scm
	gnu/packages/guile.scm
	gnu/packages/inkscape.scm
	gnu/packages/llvm.scm
	gnu/packages/openldap.scm
	gnu/packages/pciutils.scm
	gnu/packages/ruby.scm
	gnu/packages/samba.scm
	gnu/packages/sqlite.scm
	gnu/packages/statistics.scm
	gnu/packages/syndication.scm
	gnu/packages/tex.scm
	gnu/packages/tls.scm
	gnu/packages/version-control.scm
	gnu/packages/xml.scm
	guix/build-system/copy.scm
	guix/scripts/home.scm
2023-01-30 12:39:40 +02:00
Lars-Dominik Braun db675db223
gnu: Add ghc-9.4.
* gnu/packages/haskell.scm (ghc-9.4): New variable.
(ghc-bootstrap-for-9.4): New variable.
(ghc-alex-bootstrap-for-9.4): New variable.
(ghc-happy-bootstrap-for-9.4): New variable.
2022-12-31 11:24:58 +01:00
Lars-Dominik Braun 1d7552697a
gnu: Add ghc-9.2.
* gnu/packages/haskell.scm (ghc-9.2): New variable.
2022-12-31 11:24:58 +01:00
Ricardo Wurmus 22c8783dff
gnu: Add ghc-6.10.
* gnu/packages/haskell.scm (ghc-6.10): New variable.
2022-10-31 19:51:40 +01:00
Ricardo Wurmus 26e1f3ec9a
gnu: ghc-6.6: Patch more references to /bin/sh.
* gnu/packages/haskell.scm (ghc-6.6)[arguments]: Patch references to /bin/sh
in Cabal and process internals.
2022-10-31 19:51:36 +01:00
Ricardo Wurmus 77a81280b2
gnu: Add ghc-6.6.
* gnu/packages/haskell.scm (ghc-6.6): New variable.
2022-10-28 15:00:21 +02:00
Ricardo Wurmus 171b729005
gnu: ghc-6.0: Adjust configuration.
* gnu/packages/haskell.scm (ghc-6.0)[arguments]: Pass --enable-src-tree-happy
option; remove --with-hc option because we use the same GHC for everything;
add --with-gcc option to embed absolute file name of GCC.
[native-inputs]: Remove unused python-2.
2022-10-28 15:00:21 +02:00
Ricardo Wurmus 65ad002ff1
gnu: ghc-4: Embed absolute file name of GCC in GHC.
* gnu/packages/haskell.scm (ghc-4)[arguments]: Pass "--with-gcc" option to
configure script.
2022-10-28 15:00:21 +02:00
Ricardo Wurmus be51ee7ced
gnu: Add ghc-6.0.
* gnu/packages/haskell.scm (ghc-6.0): New variable.
2022-10-27 13:25:15 +02:00
Ricardo Wurmus 82791af033
gnu: ghc-4: Build full compiler using provided *.hc files.
* gnu/packages/haskell.scm (ghc-4)[source]: Remove patch.
[arguments]: Change to build full compiler.
[native-inputs]: Remove default binutils and gcc; add tarball for hc files.
* gnu/packages/patches/ghc-4.patch: Delete patch.
* gnu/local.mk (dist_patch_DATA): Remove it.
2022-10-27 13:25:15 +02:00
Ricardo Wurmus 8488fa5df3
gnu: ghc-4: Use Perl 5.6
* gnu/packages/haskell.scm (ghc-4)[native-inputs]: Replace perl-5.14 with
perl-5.6.
2022-10-16 17:36:00 +02:00
Efraim Flashner 322917aeb8
Merge remote-tracking branch 'origin/master' into staging
Conflicts:
	gnu/packages/gnuzilla.scm
	gnu/packages/graphics.scm
	gnu/packages/gstreamer.scm
	gnu/packages/gtk.scm
	gnu/packages/kde-frameworks.scm
	gnu/packages/video.scm
2022-10-12 14:36:44 +03:00
itd 2ac5da4b5a
gnu: Add ghc-9.0.
* gnu/packages/haskell.scm (ghc-9.0): New variable.

Signed-off-by: Efraim Flashner <efraim@flashner.co.il>
2022-10-02 15:16:18 +03:00
Marius Bakke 29e4955d0d
gnu: ghc@8.4: Adjust test suite for Python 3.10.
This applies the substitution added in 48718135e7
also for GHC@8.4.  Somehow this problem is not fatal there and went unnoticed.

* gnu/packages/haskell.scm (ghc-8.4)[native-inputs]: Patch the test driver for
Python 3.10 compatibility.
2022-09-18 10:35:37 +02:00
Marius Bakke b4693f4a58
gnu: GHC: Adjust tests for grep 3.8.
This fixes a test failure introduced in commit
c527b0ce23.

* gnu/packages/patches/ghc-testsuite-grep-compat.patch: New file.
* gnu/local.mk (dist_patch_DATA): Adjust accordingly.
* gnu/packages/haskell.scm (ghc-8.6, ghc-8.8, ghc-8.10)[native-inputs]: Patch
the 'ghc-testsuite' input.
2022-09-10 16:55:05 +02:00
Marius Bakke 48718135e7
gnu: GHC: Adjust for Python 3.10.
* gnu/packages/haskell.scm (ghc-8.6, ghc-8.8, ghc-8.10)[native-inputs]: Patch
the test suite for Python 3.10 compatibility.
2022-09-01 23:37:11 +02:00
Marius Bakke ad384816fe
Merge branch 'staging' into core-updates 2022-08-27 17:10:55 +02:00
Efraim Flashner 47316120b7
gnu: ghc-8.10: Build using ghc-8.6.
* gnu/packages/haskell.scm (ghc-8.10)[native-inputs]: Replace ghc-8.8
with ghc-8.6.
2022-08-23 16:37:35 +03:00
Efraim Flashner b4b7b236fa
gnu: ghc-8.10: Rewrite using G-exps.
* gnu/packages/haskell.scm (ghc-8.10)[arguments]: Rewrite using g-exps.
2022-08-23 16:37:34 +03:00
Efraim Flashner b94534adf0
gnu: ghc-8.10: Add phase unconditionally.
* gnu/packages/haskell.scm (ghc-8.10)[arguments]: Apply custom
'skip-failing-tests-i686 phase for all architectures.
2022-08-23 16:37:34 +03:00
Efraim Flashner 9e26302773
gnu: ghc-8.8: Rewrite using G-exps.
* gnu/packages/haskell.scm (ghc-8.8)[arguments]: Rewrite using g-exps.
Remove trailing #t from phases.
2022-08-23 16:37:34 +03:00
Efraim Flashner 279563ffe8
gnu: ghc-8.6: Rewrite using G-exps.
* gnu/packages/haskell.scm (ghc-8.6)[arguments]: Rewrite using g-exps.
Remove trailing #t from phases.
2022-08-23 16:37:34 +03:00
Efraim Flashner ab8c83dd48
gnu: ghc-8.4: Modernize package.
* gnu/packages/haskell.scm (ghc-8.4)[inputs]: Use inherited inputs.
[arguments]: Rewrite using g-exps. Adjust to use inherited package
arguments. Use inherited 'unpack-testsuite, 'fix environment phases.
Remove redundant 'fix-references phase.
(ghc-8.8)[arguments]: Adjust phases based on changed inherited phases.
2022-08-23 16:36:35 +03:00
Efraim Flashner 63e01d01b1
gnu: ghc-8.0: Modernize package.
* gnu/packages/haskell.scm (ghc-8.0)[arguments]: Rewrite using g-exps.
Unpack testsuite tarball from the store. Remove trailing #t from phases.
[inputs]: Remove input labels. Move ghc-testsuite ...
[native-inputs]: ... to here.
2022-08-23 16:31:45 +03:00
Efraim Flashner a8848b9311
gnu: ghc-7: Update to 7.10.3.
* gnu/packages/haskell.scm (ghc-7): Update to 7.10.3.
2022-08-23 16:25:20 +03:00
Efraim Flashner 0fc0ce2342
gnu: ghc-7: Unpack tarballs from the store.
* gnu/packages/haskell.scm (ghc-7)[arguments]: Adjust custom 'unpack-bin
and 'unpack-testsuite-and-fix-bins phases to unpack tarballs directly
from the store.
2022-08-21 12:49:34 +03:00
Efraim Flashner 7032e0bc8a
gnu: ghc-7: Rewrite arguments using G-expressions.
* gnu/packages/haskell.scm (ghc-7)[arguments]: Rewrite using
G-expressions. Remove trailing #t from phases.
2022-08-21 12:47:35 +03:00
Marius Bakke 4620080578
gnu: ghc: Use a LibFFI variant without static trampolines.
* gnu/packages/haskell.scm (ghc-7, ghc-8.0, ghc-8.4)[inputs]: Change from
LIBFFI to LIBFFI-SANS-STATIC-TRAMPOLINES.
* gnu/packages/libffi.scm (libffi-sans-static-trampolines): New variable.
2022-08-11 22:39:13 +02:00
Efraim Flashner 04ac1a248c
gnu: ghc@4: Replace config.sub using config package.
* gnu/packages/haskell.scm (ghc@4)[arguments]: Adjust custom 'bootstrap
phase to adjust replacement of config.sub.
[native-inputs]: Remove automake, add config.
2022-02-15 11:43:25 +02:00
Ludovic Courtès d9df65514c
gnu: ghc@4: Build without referring to packages in commencement.scm.
* gnu/packages/haskell.scm (ghc-4)[arguments]: Remove #:implicit-inputs?.
In 'bootstrap' phase, pass '-optc-D_GNU_SOURCE=1'.  Use
'search-input-file' to locate lib{bfd,iberty}.a, and 'which' for cpp.
Patch 'mk/config.mk.in'.  In 'configure' phase, emit "config.cache".
In 'make-boot' phase, replace "CLK_TCK" in 'nHandle.c'.
[native-inputs]: Remove now-implicit inputs; remove GLIBC-2.2.5,
GCC-MESBOOT0, and BINUTILS-MESBOOT.  Add GCC-2.95 and BINUTILS-2.33.
Remove input labels.
2022-02-14 15:52:35 +01:00
Ludovic Courtès 6ef0cd9ade
gnu: ghc@4: Use 'search-patches'.
* gnu/packages/haskell.scm (ghc-4)[source]: Use 'search-patches'.
2022-02-14 15:52:35 +01:00
Ludovic Courtès 4fa516474b
gnu: nhc98: Build with the current tool chain.
* gnu/packages/patches/nhc98-c-update.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
* gnu/packages/haskell.scm (nhc98)[source]: Use it.
[arguments]: Remove #:implicit-inputs?.
[native-inputs]: Remove.
2022-02-14 15:52:35 +01:00
Ricardo Wurmus ecea1a642f
gnu: Add nhc98.
* gnu/packages/haskell.scm (nhc98): New variable.
2022-02-07 14:02:26 +01:00
Ricardo Wurmus 3817ea91b7
gnu: Add ghc-4.
* gnu/packages/patches/ghc-4.patch: New file
* gnu/local.mk (dist_patch_DATA): Add it.
* gnu/packages/haskell.scm (ghc-4): New variable.
2022-02-07 14:02:26 +01:00
Ludovic Courtès 8394619bac
gnu: Simplify package inputs.
This commit was obtained by running:

  ./pre-inst-env guix style

without any additional argument.
2021-12-13 17:48:25 +01:00
zimoun afc4945d44
gnu: ghc: Fix build on i686-linux.
* gnu/packages/haskell.scm (ghc-8.10)[arguments]<#:phases>: Disable
failing test.

Signed-off-by: Lars-Dominik Braun <lars@6xq.net>
2021-11-30 16:53:28 +01:00
Ludovic Courtès 0154fac42a
gnu: ghc: Depend on 'git-minimal/fixed'.
* gnu/packages/haskell.scm (ghc-8.8): Replace GIT/FIXED by
GIT-MINIMAL/FIXED.
* gnu/packages/version-control.scm (git/fixed): Remove.
2021-11-21 18:37:50 +01:00
Ludovic Courtès 1db174a3ad
gnu: ghc: Rely on a fixed version of Git.
This makes the derivation of ghc equivalent to that found in
e55547bf70.

* gnu/packages/haskell.scm (ghc-8.8)[native-inputs]: Change GIT to
GIT/FIXED.
(ghc-8.10)[native-inputs]: Change GIT-MINIMAL to GIT-MINIMAL/FIXED.
* gnu/packages/version-control.scm (git/fixed): New variable.
2021-11-18 11:39:40 +01:00