all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Lars-Dominik Braun <lars@6xq.net>
To: 61420@debbugs.gnu.org
Cc: Lars-Dominik Braun <lars@6xq.net>
Subject: [bug#61420] [PATCH 31/31] gnu: idris: Adapt to changed haskell-build-system.
Date: Sat, 11 Feb 2023 11:08:25 +0100	[thread overview]
Message-ID: <20230211100825.47971-28-lars@6xq.net> (raw)
In-Reply-To: <20230211100825.47971-1-lars@6xq.net>

…which does not support the “static” output any more.

* gnu/packages/idris.scm (idris)[arguments]: Remove phase
restore-libidris_rts.
---
 gnu/packages/idris.scm | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/gnu/packages/idris.scm b/gnu/packages/idris.scm
index 2a5f63c174..85fb6cc2d2 100644
--- a/gnu/packages/idris.scm
+++ b/gnu/packages/idris.scm
@@ -122,17 +122,7 @@ (define-public idris
                (setenv "TASTY_NUM_THREADS" (number->string (parallel-job-count)))
                (setenv "IDRIS_CC" ,(cc-for-target)) ;Needed for creating executables
                (setenv "PATH" (string-append out "/bin:" (getenv "PATH")))
-               (apply (assoc-ref %standard-phases 'check) args))))
-         (add-before 'check 'restore-libidris_rts
-           (lambda* (#:key outputs #:allow-other-keys)
-             ;; The Haskell build system moves this library to the
-             ;; "static" output.  Idris only knows how to find it in the
-             ;; "out" output, so we restore it here.
-             (let ((out (assoc-ref outputs "out"))
-                   (static (assoc-ref outputs "static"))
-                   (filename "/lib/idris/rts/libidris_rts.a"))
-               (rename-file (string-append static filename)
-                            (string-append out filename))))))))
+               (apply (assoc-ref %standard-phases 'check) args)))))))
     (native-search-paths
      (list (search-path-specification
             (variable "IDRIS_LIBRARY_PATH")
-- 
2.38.2





  parent reply	other threads:[~2023-02-11 10:10 UTC|newest]

Thread overview: 40+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-02-11  9:59 [bug#61420] [PATCH 00/31] Haskell upgrade to Stackage 20.5 Lars-Dominik Braun
2023-02-11 10:07 ` [bug#61420] [PATCH 01/31] import: hackage: Allow version at the beginning of cabal file Lars-Dominik Braun
2023-02-11 10:07   ` [bug#61420] [PATCH 02/31] build: haskell-build-system: Remove trailing #t Lars-Dominik Braun
2023-02-11 10:08   ` [bug#61420] [PATCH 03/31] build: haskell-build-system: Support multiple libraries Lars-Dominik Braun
2023-02-11 10:08   ` [bug#61420] [PATCH 04/31] gnu: Switch default to GHC 9.2 Lars-Dominik Braun
2023-02-11 10:08   ` [bug#61420] [PATCH 05/31] import: stackage: Update to release 20.5 Lars-Dominik Braun
2023-02-11 10:08   ` [bug#61420] [PATCH 06/31] import: hackage: Add upstream-name property Lars-Dominik Braun
2023-02-11 10:08   ` [bug#61420] [PATCH 08/31] import: hackage: Use " Lars-Dominik Braun
2023-02-15 10:48     ` zimoun
2023-02-11 10:08   ` [bug#61420] [PATCH 10/31] import: haskell: Add new internal library for GHC 9.2 Lars-Dominik Braun
2023-02-11 10:08   ` [bug#61420] [PATCH 11/31] build: haskell-build-system: Process all transitive dependencies Lars-Dominik Braun
2023-02-11 10:08   ` [bug#61420] [PATCH 12/31] build: haskell-build-system: Remove unused linker flags Lars-Dominik Braun
2023-02-11 10:08   ` [bug#61420] [PATCH 14/31] gnu: ghc-9.2: Increase make verbosity Lars-Dominik Braun
2023-02-15 10:53     ` zimoun
2023-02-11 10:08   ` [bug#61420] [PATCH 15/31] gnu: Remove unused Haskell packages Lars-Dominik Braun
2023-02-11 10:08   ` [bug#61420] [PATCH 16/31] gnu: ghc-parsec: Update to 3.1.15.0 Lars-Dominik Braun
2023-02-11 10:08   ` [bug#61420] [PATCH 17/31] gnu: idris: Fix overly zealous regular expression Lars-Dominik Braun
2023-02-11 10:08   ` [bug#61420] [PATCH 18/31] gnu: elm: Support GHC 9.2 Lars-Dominik Braun
2023-02-11 10:08   ` [bug#61420] [PATCH 19/31] build-system: haskell: Drop default "static" output Lars-Dominik Braun
2023-02-15 10:55     ` zimoun
2023-02-11 10:08   ` [bug#61420] [PATCH 20/31] gnu: ghc-9.2: Support static linking with glibc < 2.34 Lars-Dominik Braun
2023-02-11 10:08   ` [bug#61420] [PATCH 21/31] gnu: ghc-lua: Disable symbol export Lars-Dominik Braun
2023-02-11 10:08   ` [bug#61420] [PATCH 22/31] build: haskell-build-system: Build static executables by default Lars-Dominik Braun
2023-02-11 10:08   ` [bug#61420] [PATCH 23/31] gnu: ngless: Drop Haskell libraries and documentation Lars-Dominik Braun
2023-02-11 10:08   ` [bug#61420] [PATCH 24/31] gnu: hledger: " Lars-Dominik Braun
2023-02-11 10:08   ` [bug#61420] [PATCH 25/31] gnu: darcs: " Lars-Dominik Braun
2023-02-11 10:08   ` [bug#61420] [PATCH 26/31] gnu: git-annex: Drop Haskell documentation Lars-Dominik Braun
2023-02-11 10:08   ` [bug#61420] [PATCH 27/31] gnu: shellcheck: Drop Haskell libraries Lars-Dominik Braun
2023-02-11 10:08   ` [bug#61420] [PATCH 28/31] gnu: pandoc: Drop Haskell libraries and documentation Lars-Dominik Braun
2023-02-11 10:08   ` [bug#61420] [PATCH 29/31] gnu: purescript: " Lars-Dominik Braun
2023-02-11 10:08   ` [bug#61420] [PATCH 30/31] gnu: xmobar: " Lars-Dominik Braun
2023-02-11 10:08   ` Lars-Dominik Braun [this message]
2023-02-14 19:27 ` [bug#61420] [PATCH 00/31] Haskell upgrade to Stackage 20.5 Simon Tournier
2023-02-15  8:45   ` Lars-Dominik Braun
2023-02-15  9:20     ` zimoun
2023-02-15 10:43 ` zimoun
2023-02-15 10:58   ` Lars-Dominik Braun
2023-02-15 11:10     ` Simon Tournier
2023-02-15 14:03     ` Christopher Baines
2023-02-26  9:47 ` bug#61420: " Lars-Dominik Braun

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230211100825.47971-28-lars@6xq.net \
    --to=lars@6xq.net \
    --cc=61420@debbugs.gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.