From patchwork Sat Feb 11 10:08:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Lars-Dominik Braun X-Patchwork-Id: 46822 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id DCC531661A; Sat, 11 Feb 2023 10:10:18 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 6C537165B0 for ; Sat, 11 Feb 2023 10:10:18 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pQmpa-0005Ql-3m; Sat, 11 Feb 2023 05:10:06 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pQmpX-0005Q3-8y for guix-patches@gnu.org; Sat, 11 Feb 2023 05:10:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pQmpX-0000SC-0H for guix-patches@gnu.org; Sat, 11 Feb 2023 05:10:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pQmpW-0004GH-Rp for guix-patches@gnu.org; Sat, 11 Feb 2023 05:10:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61420] [PATCH 31/31] gnu: idris: Adapt to changed haskell-build-system. Resent-From: Lars-Dominik Braun Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 11 Feb 2023 10:10:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 61420 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 61420@debbugs.gnu.org Cc: Lars-Dominik Braun Received: via spool by 61420-submit@debbugs.gnu.org id=B61420.167611016216307 (code B ref 61420); Sat, 11 Feb 2023 10:10:02 +0000 Received: (at 61420) by debbugs.gnu.org; 11 Feb 2023 10:09:22 +0000 Received: from localhost ([127.0.0.1]:38925 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pQmos-0004Ex-Ea for submit@debbugs.gnu.org; Sat, 11 Feb 2023 05:09:22 -0500 Received: from mout-p-201.mailbox.org ([80.241.56.171]:38678) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pQmoO-00047a-JL for 61420@debbugs.gnu.org; Sat, 11 Feb 2023 05:08:53 -0500 Received: from smtp102.mailbox.org (smtp102.mailbox.org [10.196.197.102]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-201.mailbox.org (Postfix) with ESMTPS id 4PDRC03knvz9shG; Sat, 11 Feb 2023 11:08:44 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=6xq.net; s=MBO0001; t=1676110124; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=lMBdYeByB5h5q66xTgPn5YaseEv8qVNH9uYPbOP2wmc=; b=BUBUDhM+/mPI4gJLclCjKZjF+941rQPfVK4e+v9vXEqEhbvP12eDnpjf7kNoN7PbqLARst wPZ7eOLuR3uQQ4Pg2LXQH+aTbo9pHpEMZZALrC6yRuazJuSI+cwALvK7sznD3Lg428H7bW ubpgf7f/lZSNn9XWQG+/90yDEuHakRLhX84MTPXnVK3WpYdmysVS2lSXeiStHM95kE+SB/ T9J0McOs50k/XN7AMsvZ3FqElGN6CXE/gGg3v1XfNz8lpfJ569Hq4kxrIzFl6X8y6VBDsP vSw+QpBKSpd/80k857cyQPVwI8874DR3pk/Rhj81D//HKS71P9uOmq6xzYc9Dw== From: Lars-Dominik Braun Date: Sat, 11 Feb 2023 11:08:25 +0100 Message-Id: <20230211100825.47971-28-lars@6xq.net> In-Reply-To: <20230211100825.47971-1-lars@6xq.net> References: <20230211100825.47971-1-lars@6xq.net> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches …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")