diff options
| author | Mathieu Othacehe <othacehe@gnu.org> | 2021-10-12 16:50:47 +0000 |
|---|---|---|
| committer | Mathieu Othacehe <othacehe@gnu.org> | 2021-10-12 17:46:23 +0000 |
| commit | a1eca979fb8da842e73c42f4f53be29b169810f2 (patch) | |
| tree | 681c7283e412bb8a29c2531c4408b49c3e184764 /gnu/packages/idris.scm | |
| parent | 48d86a9ec6d8d2e97da2299ea41a03ef4cdaab83 (diff) | |
| parent | 371aa5777a3805a3886f3feea5f1960fe3fe4219 (diff) | |
| download | guix-patches-a1eca979fb8da842e73c42f4f53be29b169810f2.tar guix-patches-a1eca979fb8da842e73c42f4f53be29b169810f2.tar.gz | |
Merge remote-tracking branch 'origin/master' into core-updates-frozen.
Diffstat (limited to 'gnu/packages/idris.scm')
| -rw-r--r-- | gnu/packages/idris.scm | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/gnu/packages/idris.scm b/gnu/packages/idris.scm index ca2772b904..10ad154923 100644 --- a/gnu/packages/idris.scm +++ b/gnu/packages/idris.scm @@ -47,7 +47,9 @@ (sha256 (base32 "1pachwc6msw3n1mz2z1r1w6h518w9gbhdvbaa5vi1qp3cn3wm6q4")) - (patches (search-patches "idris-disable-test.patch")))) + (patches (search-patches "idris-disable-test.patch" + "idris-build-with-haskeline-0.8.patch" + "idris-build-with-megaparsec-9.patch")))) (build-system haskell-build-system) (native-inputs ;For tests `(("perl" ,perl) @@ -97,12 +99,11 @@ (lambda _ (setenv "LD_LIBRARY_PATH" (string-append (getcwd) "/dist/build")) #t)) - (add-after 'unpack 'update-constraints + (add-before 'configure 'update-constraints (lambda _ (substitute* "idris.cabal" - (("ansi-terminal < 0\\.9") "ansi-terminal < 0.10") - (("cheapskate >= 0\\.1\\.1\\.2 && < 0\\.2") "cheapskate >= 0.1.1.1 && < 0.2")) - #t)) + (("(aeson|ansi-terminal|haskeline|megaparsec|optparse-applicative)\\s+[^,]+" all dep) + dep)))) (add-before 'configure 'set-cc-command (lambda _ (setenv "CC" "gcc") |