From patchwork Sat Feb 11 10:07:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lars-Dominik Braun X-Patchwork-Id: 46817 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 16B311661E; Sat, 11 Feb 2023 10:10:11 +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=unavailable 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 8601816615 for ; Sat, 11 Feb 2023 10:10:09 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pQmop-0004sj-4C; Sat, 11 Feb 2023 05:09:19 -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 1pQmoY-0004nF-T8 for guix-patches@gnu.org; Sat, 11 Feb 2023 05:09:02 -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 1pQmoY-00008c-Kg for guix-patches@gnu.org; Sat, 11 Feb 2023 05:09:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pQmoY-0004Br-HF for guix-patches@gnu.org; Sat, 11 Feb 2023 05:09:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61420] [PATCH 01/31] import: hackage: Allow version at the beginning of cabal file. References: In-Reply-To: Resent-From: Lars-Dominik Braun Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 11 Feb 2023 10:09: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.167611012715851 (code B ref 61420); Sat, 11 Feb 2023 10:09:02 +0000 Received: (at 61420) by debbugs.gnu.org; 11 Feb 2023 10:08:47 +0000 Received: from localhost ([127.0.0.1]:38824 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pQmoH-000472-V0 for submit@debbugs.gnu.org; Sat, 11 Feb 2023 05:08:47 -0500 Received: from mout-p-102.mailbox.org ([80.241.56.152]:57618) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pQmoG-00046J-2M for 61420@debbugs.gnu.org; Sat, 11 Feb 2023 05:08:45 -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-102.mailbox.org (Postfix) with ESMTPS id 4PDRBq1lH7z9sTS; Sat, 11 Feb 2023 11:08:35 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=6xq.net; s=MBO0001; t=1676110115; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=I6qko26I/iq5k8U8aBIo08sEGGTpyiqbw833ZyXWY+E=; b=FhdHdYCJT0ZbiGGO4Y6yH26UyRsD9qX9IvXgBBffsjDV/TV4X04bA0clYfDe1+2UFqU3cE 96ocgz0hUely/6TUdjhQS/N2JG46A/v3XYLNM33sk0ebCVvuxXFvwY4BFhS1Gf/oULMSmR UqEFruVnF5evbS0+sSUTIceTzK7DLEsNCSlCDL8Bj6ZH6yljpOrTE7oy2jQMwKRzv0W3Uw hzH+ciXAZIy8PjMZB5WzGFeqZsXZrAQTQ5ZsZCkoDLvyftWCIkmVAL7wkyxHoSNws4jX/j IkJO5aY6duesO3aeDy0qtgJzS+pkjHxd2wqx8CqnkCOuMBIzddwZqdtIMyaLEg== From: Lars-Dominik Braun Date: Sat, 11 Feb 2023 11:07:58 +0100 Message-Id: <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 Fix a corner case, uncovered by the hedgehog package, which has the version field at the beginning of its cabal file. This causes a pattern match failure. * guix/import/hackage.scm (latest-release): Match version at beginning of expression too. --- guix/import/hackage.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/guix/import/hackage.scm b/guix/import/hackage.scm index 7bc2908405..e915aac58d 100644 --- a/guix/import/hackage.scm +++ b/guix/import/hackage.scm @@ -378,7 +378,10 @@ (define* (latest-release package #:key (version #f)) "warning: failed to parse ~a~%" (hackage-cabal-url hackage-name)) #f) - ((_ *** ("version" (version))) + ;; Cabal files have no particular order and while usually the version + ;; as somewhere in the middle it can also be at the beginning, + ;; requiring two pattern. + ((or (_ *** ("version" (version))) (("version" (version)) _ ...)) (let ((url (hackage-uri hackage-name version))) (upstream-source (package (package-name package)) From patchwork Sat Feb 11 10:07:59 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: 46828 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 BB80816615; Sat, 11 Feb 2023 10:10:39 +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=unavailable 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 3395C165B0 for ; Sat, 11 Feb 2023 10:10:37 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pQmop-0004sn-E5; Sat, 11 Feb 2023 05:09:19 -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 1pQmoj-0004of-F3 for guix-patches@gnu.org; Sat, 11 Feb 2023 05:09:15 -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 1pQmob-00009U-72 for guix-patches@gnu.org; Sat, 11 Feb 2023 05:09:05 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pQmob-0004Cg-39 for guix-patches@gnu.org; Sat, 11 Feb 2023 05:09:05 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61420] [PATCH 02/31] build: haskell-build-system: Remove trailing #t. Resent-From: Lars-Dominik Braun Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 11 Feb 2023 10:09:05 +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 , zimoun Received: via spool by 61420-submit@debbugs.gnu.org id=B61420.167611013515990 (code B ref 61420); Sat, 11 Feb 2023 10:09:05 +0000 Received: (at 61420) by debbugs.gnu.org; 11 Feb 2023 10:08:55 +0000 Received: from localhost ([127.0.0.1]:38870 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pQmoQ-00049j-T0 for submit@debbugs.gnu.org; Sat, 11 Feb 2023 05:08:55 -0500 Received: from mout-p-103.mailbox.org ([80.241.56.161]:53322) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pQmoH-00046K-FJ for 61420@debbugs.gnu.org; Sat, 11 Feb 2023 05:08:47 -0500 Received: from smtp102.mailbox.org (smtp102.mailbox.org [IPv6:2001:67c:2050:b231:465::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-103.mailbox.org (Postfix) with ESMTPS id 4PDRBq62s6z9sTN; Sat, 11 Feb 2023 11:08:35 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=6xq.net; s=MBO0001; t=1676110115; 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=2u4zYgT+M/xK7vPRz8RVd6olpA5KbeKUhFgWLIKax2g=; b=IbbhUppAxBQSsHjxJzDtiQiTNbtnTjfoa76mr6bykcM7mhUsGWbYlQ0j+paiFJH7qAWHhy rTtdjO5zChqi1GLebb1WfacWYH9qc9sJ5L+2JBO890W1N6ph94M52Q8G7fIfNLy2DCGbGs 5I3n1LUlTMDXFVaqxs0vYfTkPZicjKaJ+d1/wt4DuOIORCr+UfYvz7tifm3Qrn8umlBd1X AKRqhzKzLf2woelcjkKwuN6Dhm2wcCFazArHlxaQdWIMCxkmJqrFgZ+E1MsBH1JBckoNt5 zjza3Bgxd4nf/RouOGk6iLyM8cM+3MdA+iU4Sa5l9OjtrpVrOhEuXLjuVgqWXA== From: Lars-Dominik Braun Date: Sat, 11 Feb 2023 11:07:59 +0100 Message-Id: <20230211100825.47971-2-lars@6xq.net> In-Reply-To: <20230211100825.47971-1-lars@6xq.net> References: <20230211100825.47971-1-lars@6xq.net> MIME-Version: 1.0 X-Rspamd-Queue-Id: 4PDRBq62s6z9sTN 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 From: zimoun * guix/build/haskell-build-system.scm (configure, install, setup-compiler, make-ghc-package-database, install-transitive-deps, check, haddock, patch-cabal-file, generate-setuphs): Delete trailing #t. Signed-off-by: Lars-Dominik Braun --- guix/build/haskell-build-system.scm | 25 +++++++++---------------- 1 file changed, 9 insertions(+), 16 deletions(-) diff --git a/guix/build/haskell-build-system.scm b/guix/build/haskell-build-system.scm index ef6cb316ee..e2e5904dce 100644 --- a/guix/build/haskell-build-system.scm +++ b/guix/build/haskell-build-system.scm @@ -5,6 +5,7 @@ ;;; Copyright © 2018, 2020 Ricardo Wurmus ;;; Copyright © 2018 Alex Vong ;;; Copyright © 2021 John Kehayias +;;; Copyright © 2022 Simon Tournier ;;; ;;; This file is part of GNU Guix. ;;; @@ -118,8 +119,7 @@ (define* (configure #:key outputs inputs tests? (configure-flags '()) (setenv "CONFIG_SHELL" "sh")) (run-setuphs "configure" params) - (setenv "GHC_PACKAGE_PATH" ghc-path) - #t)) + (setenv "GHC_PACKAGE_PATH" ghc-path))) (define* (build #:key parallel-build? #:allow-other-keys) "Build a given Haskell package." @@ -140,8 +140,7 @@ (define* (install #:key outputs #:allow-other-keys) (new (string-append static subdir))) (mkdir-p (dirname new)) (rename-file static-lib new))) - (find-files lib "\\.a$")))) - #t) + (find-files lib "\\.a$"))))) (define* (setup-compiler #:key system inputs outputs #:allow-other-keys) "Setup the compiler environment." @@ -175,8 +174,7 @@ (define (make-ghc-package-database system inputs outputs) conf-files) (invoke "ghc-pkg" (string-append "--package-db=" %tmp-db-dir) - "recache") - #t)) + "recache"))) (define* (register #:key name system inputs outputs #:allow-other-keys) "Generate the compiler registration and binary package database files for a @@ -273,21 +271,18 @@ (define (install-transitive-deps conf-file src dest) config-file-name+id ".conf")) (invoke "ghc-pkg" (string-append "--package-db=" config-dir) - "recache"))) - #t)) + "recache"))))) (define* (check #:key tests? test-target #:allow-other-keys) "Run the test suite of a given Haskell package." (if tests? (run-setuphs test-target '()) - (format #t "test suite not run~%")) - #t) + (format #t "test suite not run~%"))) (define* (haddock #:key outputs haddock? haddock-flags #:allow-other-keys) "Generate the Haddock documentation of a given Haskell package." (when haddock? - (run-setuphs "haddock" haddock-flags)) - #t) + (run-setuphs "haddock" haddock-flags))) (define* (patch-cabal-file #:key cabal-revision #:allow-other-keys) (when cabal-revision @@ -296,8 +291,7 @@ (define* (patch-cabal-file #:key cabal-revision #:allow-other-keys) ((original) (format #t "replacing ~s with ~s~%" original cabal-revision) (copy-file cabal-revision original)) - (_ (error "Could not find a Cabal file to patch.")))) - #t) + (_ (error "Could not find a Cabal file to patch."))))) (define* (generate-setuphs #:rest empty) "Generate a default Setup.hs if needed." @@ -307,8 +301,7 @@ (define* (generate-setuphs #:rest empty) (with-output-to-file "Setup.hs" (lambda () (format #t "import Distribution.Simple~%") - (format #t "main = defaultMain~%")))) - #t) + (format #t "main = defaultMain~%"))))) (define %standard-phases (modify-phases gnu:%standard-phases From patchwork Sat Feb 11 10:08:00 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: 46812 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 084271661B; Sat, 11 Feb 2023 10:09:42 +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=unavailable 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 A4730165B0 for ; Sat, 11 Feb 2023 10:09:40 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pQmoh-0004nv-LX; Sat, 11 Feb 2023 05:09:13 -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 1pQmoZ-0004nN-8c for guix-patches@gnu.org; Sat, 11 Feb 2023 05:09:03 -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 1pQmoZ-00008k-0N for guix-patches@gnu.org; Sat, 11 Feb 2023 05:09:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pQmoY-0004By-Sv for guix-patches@gnu.org; Sat, 11 Feb 2023 05:09:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61420] [PATCH 03/31] build: haskell-build-system: Support multiple libraries. Resent-From: Lars-Dominik Braun Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 11 Feb 2023 10:09: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: Philip Munksgaard , Lars-Dominik Braun , zimoun Received: via spool by 61420-submit@debbugs.gnu.org id=B61420.167611013215938 (code B ref 61420); Sat, 11 Feb 2023 10:09:02 +0000 Received: (at 61420) by debbugs.gnu.org; 11 Feb 2023 10:08:52 +0000 Received: from localhost ([127.0.0.1]:38854 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pQmoN-00048o-N2 for submit@debbugs.gnu.org; Sat, 11 Feb 2023 05:08:52 -0500 Received: from mout-p-201.mailbox.org ([80.241.56.171]:38634) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pQmoG-00046M-Fx for 61420@debbugs.gnu.org; Sat, 11 Feb 2023 05:08:45 -0500 Received: from smtp102.mailbox.org (smtp102.mailbox.org [IPv6:2001:67c:2050:b231:465::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 4PDRBr3DsLz9sbm; Sat, 11 Feb 2023 11:08:36 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=6xq.net; s=MBO0001; t=1676110116; 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=i6oKxw7+lmEtPvprwhr1Ir+f7Qn1xh4ofpU8yMdQ2hU=; b=OnecETHYXrnCSKyU/fQYzLt5lpYfleOxRxqgxuXuJtCQrVWm+BWfgY62srai4BnlBOYb61 RukMUOt3MZdFF1SCWsOjVngC/TgbsLZuxOMbw2XUnw9sA3E+tHdEiQ3/4bVGQdBcadd/gc A378B1YsB1eOUrhZ/5ATrmvJD8bORjnOhdG5/I5goFvdn8ErkfFFNtzJPWkcGyBy7I/vzf yd7LMybIlLCa4527+ntnvNjJCk5gsl8F9b8WQb0ibQVZvp/zfJVJcp9iVDeAP/jhq9OCFN 5oGvP5Rw1lhtGzU3rbF4SwrQukiUD/QWIlVvtTiwbxyyRreK4JMggF4PuCw30A== From: Lars-Dominik Braun Date: Sat, 11 Feb 2023 11:08:00 +0100 Message-Id: <20230211100825.47971-3-lars@6xq.net> In-Reply-To: <20230211100825.47971-1-lars@6xq.net> References: <20230211100825.47971-1-lars@6xq.net> MIME-Version: 1.0 X-Rspamd-Queue-Id: 4PDRBr3DsLz9sbm 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 From: Philip Munksgaard Fixes . The patch handles correctly the multiple registration of some package using their own internal sub-libraries. It allows to call 'install-transitive-deps' multiple times and deals with packages requiring a multiple registration. * guix/build/haskell-build-system.scm (register)[install-transitive-deps]: Guard also the destination direction. [install-config-file]: New procedure. Co-Authored-by: zimoun . Signed-off-by: Lars-Dominik Braun --- guix/build/haskell-build-system.scm | 87 ++++++++++++++++------------- 1 file changed, 49 insertions(+), 38 deletions(-) diff --git a/guix/build/haskell-build-system.scm b/guix/build/haskell-build-system.scm index e2e5904dce..fb4aba28ea 100644 --- a/guix/build/haskell-build-system.scm +++ b/guix/build/haskell-build-system.scm @@ -6,6 +6,7 @@ ;;; Copyright © 2018 Alex Vong ;;; Copyright © 2021 John Kehayias ;;; Copyright © 2022 Simon Tournier +;;; Copyright © 2022 Philip Munksgaard ;;; ;;; This file is part of GNU Guix. ;;; @@ -215,13 +216,50 @@ (define (install-transitive-deps conf-file src dest) (if (not (vhash-assoc id seen)) (let ((dep-conf (string-append src "/" id ".conf")) (dep-conf* (string-append dest "/" id ".conf"))) - (when (not (file-exists? dep-conf)) + (unless (file-exists? dep-conf*) + (unless (file-exists? dep-conf) (error (format #f "File ~a does not exist. This usually means the dependency ~a is missing. Was checking conf-file ~a." dep-conf id conf-file))) - (copy-file dep-conf dep-conf*) ;XXX: maybe symlink instead? - (loop (vhash-cons id #t seen) - (append lst (conf-depends dep-conf)))) + (copy-file dep-conf dep-conf*) ;XXX: maybe symlink instead? + (loop (vhash-cons id #t seen) + (append lst (conf-depends dep-conf))))) (loop seen tail)))))) + (define (install-config-file conf-file dest output:doc output:lib) + ;; Copy CONF-FILE to DEST removing reference to OUTPUT:DOC from + ;; OUTPUT:LIB and using install-transitive-deps. + (let* ((contents (call-with-input-file conf-file read-string)) + (id-rx (make-regexp "^id:[ \n\t]+([^ \t\n]+)$" regexp/newline)) + (config-file-name+id + (match:substring (first (list-matches id-rx contents)) 1))) + + (when (or + (and + (string? config-file-name+id) + (string-null? config-file-name+id)) + (not config-file-name+id)) + (error (format #f "The package id for ~a is empty. This is a bug." conf-file))) + + ;; Remove reference to "doc" output from "lib" (or "out") by rewriting the + ;; "haddock-interfaces" field and removing the optional "haddock-html" + ;; field in the generated .conf file. + (when output:doc + (substitute* conf-file + (("^haddock-html: .*") "\n") + (((format #f "^haddock-interfaces: ~a" output:doc)) + (string-append "haddock-interfaces: " output:lib))) + ;; Move the referenced file to the "lib" (or "out") output. + (match (find-files output:doc "\\.haddock$") + ((haddock-file . rest) + (let* ((subdir (string-drop haddock-file (string-length output:doc))) + (new (string-append output:lib subdir))) + (mkdir-p (dirname new)) + (rename-file haddock-file new))) + (_ #f))) + (install-transitive-deps conf-file %tmp-db-dir dest) + (rename-file conf-file + (string-append dest "/" + config-file-name+id ".conf")))) + (let* ((out (assoc-ref outputs "out")) (doc (assoc-ref outputs "doc")) (haskell (assoc-ref inputs "haskell")) @@ -231,7 +269,6 @@ (define (install-transitive-deps conf-file src dest) (config-dir (string-append lib "/ghc-" version "/" name ".conf.d")) - (id-rx (make-regexp "^id:[ \n\t]+([^ \t\n]+)$" regexp/newline)) (config-file (string-append out "/" name ".conf")) (params (list (string-append "--gen-pkg-config=" config-file)))) @@ -239,39 +276,13 @@ (define (install-transitive-deps conf-file src dest) ;; The conf file is created only when there is a library to register. (when (file-exists? config-file) (mkdir-p config-dir) - (let* ((contents (call-with-input-file config-file read-string)) - (config-file-name+id (match:substring (first (list-matches id-rx contents)) 1))) - - (when (or - (and - (string? config-file-name+id) - (string-null? config-file-name+id)) - (not config-file-name+id)) - (error (format #f "The package id for ~a is empty. This is a bug." config-file))) - - ;; Remove reference to "doc" output from "lib" (or "out") by rewriting the - ;; "haddock-interfaces" field and removing the optional "haddock-html" - ;; field in the generated .conf file. - (when doc - (substitute* config-file - (("^haddock-html: .*") "\n") - (((format #f "^haddock-interfaces: ~a" doc)) - (string-append "haddock-interfaces: " lib))) - ;; Move the referenced file to the "lib" (or "out") output. - (match (find-files doc "\\.haddock$") - ((haddock-file . rest) - (let* ((subdir (string-drop haddock-file (string-length doc))) - (new (string-append lib subdir))) - (mkdir-p (dirname new)) - (rename-file haddock-file new))) - (_ #f))) - (install-transitive-deps config-file %tmp-db-dir config-dir) - (rename-file config-file - (string-append config-dir "/" - config-file-name+id ".conf")) - (invoke "ghc-pkg" - (string-append "--package-db=" config-dir) - "recache"))))) + (if (file-is-directory? config-file) + (for-each (cut install-config-file <> config-dir doc lib) + (find-files config-file)) + (install-config-file config-file config-dir doc lib)) + (invoke "ghc-pkg" + (string-append "--package-db=" config-dir) + "recache")))) (define* (check #:key tests? test-target #:allow-other-keys) "Run the test suite of a given Haskell package." From patchwork Sat Feb 11 10:08:01 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: 46811 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 29DF41661A; Sat, 11 Feb 2023 10:09:29 +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 9F0A4165B0 for ; Sat, 11 Feb 2023 10:09:28 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pQmoh-0004nu-LD; Sat, 11 Feb 2023 05:09:11 -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 1pQmoZ-0004nV-Ku for guix-patches@gnu.org; Sat, 11 Feb 2023 05:09:03 -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 1pQmoZ-00008w-Cm for guix-patches@gnu.org; Sat, 11 Feb 2023 05:09:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pQmoZ-0004C6-82 for guix-patches@gnu.org; Sat, 11 Feb 2023 05:09:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61420] [PATCH 04/31] gnu: Switch default to GHC 9.2. Resent-From: Lars-Dominik Braun Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 11 Feb 2023 10:09:03 +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.167611013315952 (code B ref 61420); Sat, 11 Feb 2023 10:09:03 +0000 Received: (at 61420) by debbugs.gnu.org; 11 Feb 2023 10:08:53 +0000 Received: from localhost ([127.0.0.1]:38858 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pQmoO-000497-M8 for submit@debbugs.gnu.org; Sat, 11 Feb 2023 05:08:53 -0500 Received: from mout-p-202.mailbox.org ([80.241.56.172]:33998) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pQmoG-00046N-OF for 61420@debbugs.gnu.org; Sat, 11 Feb 2023 05:08:45 -0500 Received: from smtp102.mailbox.org (smtp102.mailbox.org [IPv6:2001:67c:2050:b231:465::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-202.mailbox.org (Postfix) with ESMTPS id 4PDRBr5M84z9scZ; Sat, 11 Feb 2023 11:08:36 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=6xq.net; s=MBO0001; t=1676110116; 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=jWdBxtDhC8F3joorxRN1n7gKUJrijJE7+k+mk3h47BY=; b=lsvnKH22h0YKSPKzYmOpnfmH5LMtWUw+FSs3XPzpuy9JqSSHPN601AF3THwKbPuEabFBlW QP0FhOUM8+b4NmjIIA6sQwjSZt119qTuAHL8vqsKvs1750pInVAknpGpklOzLyDP4n8BgR rg2uHe1PLZ2xvNH5zVYRQlb/f4MjqjXlJz1n1gU4IJPmkEsfbgQ2bg/7RhteGh7wjYGKzY W03EeM0IjkocyJVrGR4H3EK2STJZYpJ7rwKsqd/XH0Y5oc8J6BpndH802AD8GMBgHo88RJ uDPBBPm4pToKKi2+FQrIMrZbFWv1MaDFnrR0/3LRZkd82cOk+lSQB19pn/Oayg== From: Lars-Dominik Braun Date: Sat, 11 Feb 2023 11:08:01 +0100 Message-Id: <20230211100825.47971-4-lars@6xq.net> In-Reply-To: <20230211100825.47971-1-lars@6xq.net> References: <20230211100825.47971-1-lars@6xq.net> MIME-Version: 1.0 X-Rspamd-Queue-Id: 4PDRBr5M84z9scZ 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 * gnu/packages/haskell.scm (ghc-9.0): Rename to just “ghc”. (ghc-9.2): Ditto. (ghc): Use ghc-9.2. --- gnu/packages/haskell.scm | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 91610a1f2e..84071cb293 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -1235,19 +1235,12 @@ (define-public ghc-8.10 (file-pattern ".*\\.conf\\.d$") (file-type 'directory)))))) -;; Versions newer than ghc defined below (i.e. the compiler -;; haskell-build-system uses) should use ghc-next as their name to -;; ensure ghc (without version specification) and ghc-* packages are -;; always compatible. See https://issues.guix.gnu.org/issue/47335. - (define-public ghc-8 ghc-8.10) -(define-public ghc ghc-8) - (define-public ghc-9.0 (package (inherit ghc-8.10) - (name "ghc-next") + (name "ghc") (version "9.0.2") (source (origin (method url-fetch) @@ -1285,7 +1278,7 @@ (define-public ghc-9.2 (let ((base ghc-8.10)) (package (inherit base) - (name "ghc-next") + (name "ghc") (version "9.2.5") (source (origin (method url-fetch) @@ -1327,6 +1320,12 @@ (define-public ghc-9.2 (file-pattern ".*\\.conf\\.d$") (file-type 'directory))))))) +;; Versions newer than ghc defined below (i.e. the compiler +;; haskell-build-system uses) should use ghc-next as their name to +;; ensure ghc (without version specification) and ghc-* packages are +;; always compatible. See https://issues.guix.gnu.org/issue/47335. +(define-public ghc ghc-9.2) + ;; 9.4 is the last version to support the make-based build system, ;; but it boot with 9.2, only 9.0 is supported. (define ghc-bootstrap-for-9.4 ghc-9.0) From patchwork Sat Feb 11 10:08:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lars-Dominik Braun X-Patchwork-Id: 46829 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 DC65416615; Sat, 11 Feb 2023 10:10:44 +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=unavailable 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 51707165B0 for ; Sat, 11 Feb 2023 10:10:43 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pQmon-0004rn-LQ; Sat, 11 Feb 2023 05:09:17 -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 1pQmoa-0004nW-12 for guix-patches@gnu.org; Sat, 11 Feb 2023 05:09: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 1pQmoZ-000095-OP for guix-patches@gnu.org; Sat, 11 Feb 2023 05:09:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pQmoZ-0004CD-Kq for guix-patches@gnu.org; Sat, 11 Feb 2023 05:09:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61420] [PATCH 05/31] import: stackage: Update to release 20.5. Resent-From: Lars-Dominik Braun Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 11 Feb 2023 10:09:03 +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.167611013315960 (code B ref 61420); Sat, 11 Feb 2023 10:09:03 +0000 Received: (at 61420) by debbugs.gnu.org; 11 Feb 2023 10:08:53 +0000 Received: from localhost ([127.0.0.1]:38862 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pQmoP-00049B-5a for submit@debbugs.gnu.org; Sat, 11 Feb 2023 05:08:53 -0500 Received: from mout-p-103.mailbox.org ([80.241.56.161]:53332) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pQmoG-00046O-OW for 61420@debbugs.gnu.org; Sat, 11 Feb 2023 05:08:46 -0500 Received: from smtp102.mailbox.org (smtp102.mailbox.org [IPv6:2001:67c:2050:b231:465::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-103.mailbox.org (Postfix) with ESMTPS id 4PDRBs0LVnz9sZ5; Sat, 11 Feb 2023 11:08:37 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=6xq.net; s=MBO0001; t=1676110117; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=QqUdXegxakgHnO4hnerIBE72W6kjJMMh653q6aFjoqw=; b=pE+MJVffFI1CJJisCbi4ijTXO5JAweXE5BsQ3fxBsnUuQOY64yVA/GTGziNPZBgg7HaB9a OlfUaS7JgeaTcq13bj8PHXb6alZDdSKaNpgKYycVUbGTQ53HFp8f9jThEu+ceu8eG6su2t o9UIhGgeuMFShYfBpqWdkGNayrJ9qAJJwuk0yemG5ObnjKw9wFs25eCJq8MlEikGxM+il1 dV+IfOK7cASC2cUmDZTBj//Q+zULhxQGOrFcGIy7m3rDCgl0yq0iqyhuwRtuQxjT7EuKTC Y1fe0inlyhOaR26bg0vZzBYazVctm9PGKsUFsDJht0hN8npBI0obcxBcpcKBCA== From: Lars-Dominik Braun Date: Sat, 11 Feb 2023 11:08:02 +0100 Message-Id: <20230211100825.47971-5-lars@6xq.net> In-Reply-To: <20230211100825.47971-1-lars@6xq.net> References: <20230211100825.47971-1-lars@6xq.net> MIME-Version: 1.0 X-Rspamd-Queue-Id: 4PDRBs0LVnz9sZ5 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 * guix/import/stackage.scm (%default-lts-version): Update to 20.5. --- guix/import/stackage.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/guix/import/stackage.scm b/guix/import/stackage.scm index c0284e48a4..9462e70791 100644 --- a/guix/import/stackage.scm +++ b/guix/import/stackage.scm @@ -49,7 +49,7 @@ (define %stackage-url (make-parameter "https://www.stackage.org")) ;; Latest LTS version compatible with current GHC. -(define %default-lts-version "18.14") +(define %default-lts-version "20.5") (define-json-mapping make-stackage-lts stackage-lts? From patchwork Sat Feb 11 10:08:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lars-Dominik Braun X-Patchwork-Id: 46825 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 D56CD1661A; Sat, 11 Feb 2023 10:10:28 +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 482C3165B0 for ; Sat, 11 Feb 2023 10:10:28 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pQmop-0004so-EM; Sat, 11 Feb 2023 05:09:19 -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 1pQmob-0004np-Au for guix-patches@gnu.org; Sat, 11 Feb 2023 05:09:07 -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 1pQmoa-00009E-4A for guix-patches@gnu.org; Sat, 11 Feb 2023 05:09:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pQmoZ-0004CK-W8 for guix-patches@gnu.org; Sat, 11 Feb 2023 05:09:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61420] [PATCH 06/31] import: hackage: Add upstream-name property. Resent-From: Lars-Dominik Braun Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 11 Feb 2023 10:09:03 +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.167611013415968 (code B ref 61420); Sat, 11 Feb 2023 10:09:03 +0000 Received: (at 61420) by debbugs.gnu.org; 11 Feb 2023 10:08:54 +0000 Received: from localhost ([127.0.0.1]:38864 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pQmoP-00049N-KD for submit@debbugs.gnu.org; Sat, 11 Feb 2023 05:08:54 -0500 Received: from mout-p-102.mailbox.org ([80.241.56.152]:57624) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pQmoG-00046Q-T7 for 61420@debbugs.gnu.org; Sat, 11 Feb 2023 05:08:46 -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-102.mailbox.org (Postfix) with ESMTPS id 4PDRBs3DT7z9sW9; Sat, 11 Feb 2023 11:08:37 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=6xq.net; s=MBO0001; t=1676110117; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=o05D5AJhXVV7+YJM5jixmp53F7hKNr8EAozEV+S4/C0=; b=Tfz6aS9gEMIFAWHsjZj6EtMk35nUr7y7qIaisC7z82ypHGCqPVJrBq1qLlUbF2Md8yaBHt Mzg2GPdc0ljeSCdzaZ7Ue4C0Vr1Ksql6Qk70RVMIIjWkDbBMaqQQNwRKE3OLtIbFZrN8Op RgtY2EesQKT+lvqI/eI9c3YHK1VmD/5uAb/4gDnOaHQFI4a1bNvioocmTUeuFZ39iKy8Jf EJ9JqFTvr7LdvgZjK5rVSVeYFfbeiqaxzQlsctEC8zvXCQjOOx75hkOEU8ItXOMzKUt/hM ucKpA8fIT/+g3/zlzercB0TgxkEx5mk8utw6E97rqBafUNQYtq/VDOhdYpWhLA== From: Lars-Dominik Braun Date: Sat, 11 Feb 2023 11:08:03 +0100 Message-Id: <20230211100825.47971-6-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 * guix/import/hackage.scm (hackage-module->sexp): Add property upstream-name to imported package. * tests/hackage.scm (match-ghc-foo): Add upstream-name property. (match-ghc-foo-6): Ditto. (match-ghc-elif): Ditto. (match-ghc-foo-revision): Ditto. (match-ghc-foo-import): Ditto. --- guix/import/hackage.scm | 1 + tests/hackage.scm | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/guix/import/hackage.scm b/guix/import/hackage.scm index e915aac58d..9e305cf080 100644 --- a/guix/import/hackage.scm +++ b/guix/import/hackage.scm @@ -314,6 +314,7 @@ (define (maybe-arguments) (bytevector->nix-base32-string (file-sha256 tarball)) "failed to download tar archive"))))) (build-system haskell-build-system) + (properties '((upstream-name . ,name))) ,@(maybe-inputs 'inputs dependencies) ,@(maybe-inputs 'native-inputs native-dependencies) ,@(maybe-arguments) diff --git a/tests/hackage.scm b/tests/hackage.scm index ad2ee4b7f9..8eea818ebd 100644 --- a/tests/hackage.scm +++ b/tests/hackage.scm @@ -201,6 +201,7 @@ (define-package-matcher match-ghc-foo ('base32 (? string? hash))))) ('build-system 'haskell-build-system) + ('properties '(quote ((upstream-name . "foo")))) ('inputs ('list 'ghc-http)) ('home-page "http://test.org") ('synopsis (? string?)) @@ -241,6 +242,7 @@ (define-package-matcher match-ghc-foo-6 ('base32 (? string? hash))))) ('build-system 'haskell-build-system) + ('properties '(quote ((upstream-name . "foo")))) ('inputs ('list 'ghc-b 'ghc-http)) ('native-inputs ('list 'ghc-haskell-gi)) ('home-page "http://test.org") @@ -471,6 +473,7 @@ (define-package-matcher match-ghc-elif ('base32 (? string? hash))))) ('build-system 'haskell-build-system) + ('properties '(quote ((upstream-name . "foo")))) ('inputs ('list 'ghc-c)) ('home-page "http://test.org") ('synopsis (? string?)) @@ -520,6 +523,7 @@ (define-package-matcher match-ghc-foo-revision ('base32 (? string? hash))))) ('build-system 'haskell-build-system) + ('properties '(quote ((upstream-name . "foo")))) ('inputs ('list 'ghc-http)) ('arguments ('quasiquote @@ -610,6 +614,7 @@ (define-package-matcher match-ghc-foo-import ('base32 (? string? hash))))) ('build-system 'haskell-build-system) + ('properties '(quote ((upstream-name . "foo")))) ('inputs ('list 'ghc-http)) ('home-page "http://test.org") ('synopsis (? string?)) From patchwork Sat Feb 11 10:08:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lars-Dominik Braun X-Patchwork-Id: 46818 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 7C5AB16620; Sat, 11 Feb 2023 10:10:11 +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 3FB661661A for ; Sat, 11 Feb 2023 10:10:10 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pQmop-0004sk-6W; Sat, 11 Feb 2023 05:09:19 -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 1pQmob-0004nr-BP for guix-patches@gnu.org; Sat, 11 Feb 2023 05:09:08 -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 1pQmoa-00009G-F5 for guix-patches@gnu.org; Sat, 11 Feb 2023 05:09:05 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pQmoa-0004CS-BB for guix-patches@gnu.org; Sat, 11 Feb 2023 05:09:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61420] [PATCH 08/31] import: hackage: Use upstream-name property. Resent-From: Lars-Dominik Braun Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 11 Feb 2023 10:09:04 +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.167611013415975 (code B ref 61420); Sat, 11 Feb 2023 10:09:04 +0000 Received: (at 61420) by debbugs.gnu.org; 11 Feb 2023 10:08:54 +0000 Received: from localhost ([127.0.0.1]:38866 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pQmoQ-00049V-4r for submit@debbugs.gnu.org; Sat, 11 Feb 2023 05:08:54 -0500 Received: from mout-p-202.mailbox.org ([80.241.56.172]:34006) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pQmoH-00046S-6n for 61420@debbugs.gnu.org; Sat, 11 Feb 2023 05:08:46 -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-202.mailbox.org (Postfix) with ESMTPS id 4PDRBs5bPnz9sct; Sat, 11 Feb 2023 11:08:37 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=6xq.net; s=MBO0001; t=1676110117; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=C3HB5SFk4WX9OxVAJbPys7QyQzJJ3Jupv4d+mbJHNg8=; b=HS0Pbb/KnpV5LNHALMIY+w1ILBgTXBmmdVT6uDpDIqWYsErG1LPVvZUi9JKAft+6FqGc6W pSGvGjJyHMX4WCaApbiIbWVN21DDi9zAcYSnMAXHWKCIER0kBNMITHp6fQYute0NQeag1m IrMMPD+OuYAbEDGC++D3LCyWTnV82cS3qH2+Wag80eU3m8zxDUv1NGP9MOdgSzfYJ4BFPO BN8TJu0pqSCtw5mtekQEq3pCJze7Dl9336WcjOKHK7Yy1YGFWEbhKD+50KqJUzlblzZL8w xX5WQCLltWgU5a4zBMwzSxvxiTO7/ZJLXOUL5KmOswVQfp7rppgcGiDiW7UIYw== From: Lars-Dominik Braun Date: Sat, 11 Feb 2023 11:08:04 +0100 Message-Id: <20230211100825.47971-7-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 * guix/import/hackage.scm (guix-package->hackage-name): Removed. (latest-release): Use package-upstream-name* instead. * guix/import/stackage.scm (latest-lts-release): Ditto. (stackage-lts-package?): Ditto. --- guix/import/hackage.scm | 14 +------------- guix/import/stackage.scm | 4 ++-- 2 files changed, 3 insertions(+), 15 deletions(-) diff --git a/guix/import/hackage.scm b/guix/import/hackage.scm index 9e305cf080..2f901af47b 100644 --- a/guix/import/hackage.scm +++ b/guix/import/hackage.scm @@ -52,7 +52,6 @@ (define-module (guix import hackage) hackage-recursive-import %hackage-updater - guix-package->hackage-name hackage-name->package-name hackage-fetch hackage-source-url @@ -126,17 +125,6 @@ (define (hackage-name->package-name name) (string-downcase name) (string-append package-name-prefix (string-downcase name)))) -(define guix-package->hackage-name - (let ((uri-rx (make-regexp "(https?://hackage.haskell.org|mirror://hackage)/package/([^/]+)/.*")) - (name-rx (make-regexp "(.*)-[0-9\\.]+"))) - (lambda (package) - "Given a Guix package name, return the corresponding Hackage name." - (let* ((source-url (and=> (package-source package) origin-uri)) - (name (match:substring (regexp-exec uri-rx source-url) 2))) - (match (regexp-exec name-rx name) - (#f name) - (m (match:substring m 1))))))) - (define (read-cabal-and-hash port) "Read a Cabal file from PORT and return it and its hash in nix-base32 format as two values." @@ -371,7 +359,7 @@ (define* (latest-release package #:key (version #f)) (formatted-message (G_ "~a updater doesn't support updating to a specific version, sorry.") "hackage"))) - (let* ((hackage-name (guix-package->hackage-name package)) + (let* ((hackage-name (package-upstream-name* package)) (cabal-meta (hackage-fetch hackage-name))) (match cabal-meta (#f diff --git a/guix/import/stackage.scm b/guix/import/stackage.scm index 9462e70791..735eeb75f7 100644 --- a/guix/import/stackage.scm +++ b/guix/import/stackage.scm @@ -149,7 +149,7 @@ (define latest-lts-release (formatted-message (G_ "~a updater doesn't support updating to a specific version, sorry.") "stackage"))) - (let* ((hackage-name (guix-package->hackage-name pkg)) + (let* ((hackage-name (package-upstream-name* pkg)) (version (lts-package-version (packages) hackage-name)) (name-version (hackage-name-version hackage-name version))) (match (and=> name-version hackage-fetch) @@ -173,7 +173,7 @@ (define (stackage-lts-package? package) (false-if-networking-error (let ((packages (stackage-lts-packages (stackage-lts-info-fetch %default-lts-version))) - (hackage-name (guix-package->hackage-name package))) + (hackage-name (package-upstream-name* package))) (find (lambda (package) (string=? (stackage-package-name package) hackage-name)) packages))))) From patchwork Sat Feb 11 10:08:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lars-Dominik Braun X-Patchwork-Id: 46830 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 A2ED516615; Sat, 11 Feb 2023 10:10:47 +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=unavailable 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 E9FDC165B0 for ; Sat, 11 Feb 2023 10:10:45 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pQmon-0004rr-Uj; Sat, 11 Feb 2023 05:09:18 -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 1pQmob-0004nq-B3 for guix-patches@gnu.org; Sat, 11 Feb 2023 05:09:10 -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 1pQmoa-00009J-RO for guix-patches@gnu.org; Sat, 11 Feb 2023 05:09:05 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pQmoa-0004CZ-Mm for guix-patches@gnu.org; Sat, 11 Feb 2023 05:09:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61420] [PATCH 10/31] import: haskell: Add new internal library for GHC 9.2. Resent-From: Lars-Dominik Braun Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 11 Feb 2023 10:09:04 +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.167611013515982 (code B ref 61420); Sat, 11 Feb 2023 10:09:04 +0000 Received: (at 61420) by debbugs.gnu.org; 11 Feb 2023 10:08:55 +0000 Received: from localhost ([127.0.0.1]:38868 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pQmoQ-00049c-K4 for submit@debbugs.gnu.org; Sat, 11 Feb 2023 05:08:54 -0500 Received: from mout-p-201.mailbox.org ([80.241.56.171]:38638) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pQmoH-00046T-GV for 61420@debbugs.gnu.org; Sat, 11 Feb 2023 05:08:47 -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 4PDRBt0gZfz9sdK; Sat, 11 Feb 2023 11:08:38 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=6xq.net; s=MBO0001; t=1676110118; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=kqdHYiaREssfx+5sPRTuLa+5a6Ei6VuTCEbqFcOg7nM=; b=InpygtNpfFxCXzuTe1VpGvxHZXqKNKSNzkOAi0A8pG+Emic3zpkRZjq8qO2z04nRIvGP7s aIwHbnTKIm0ZM3HFEjN9Nnj6k0znrUHPoNU51nYbOhyc22jl3OJKx7FFXUVvyAys7+dsms zQ0ep2T0/RfGaMAAS2lHCDMc0yy3purHjPrXieda5nmZFkp0Hv5518bd9XVmXZhcjuxRae HL83Bno2e09W6Z5Wz14ryxn9B74+jPCWGhCyzgJ+D9ElJNkzyVjqUaGiuP/ywca1g+Ruqp aohRxuVPkkEJK0tT+6MK1yaraFeXhtT2FsPzlgMOzcPPs2DZnArMaG7ZYWC9Ag== From: Lars-Dominik Braun Date: Sat, 11 Feb 2023 11:08:05 +0100 Message-Id: <20230211100825.47971-8-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 * guix/import/hackage.scm (ghc-standard-libraries): Add ghc-bignum. --- guix/import/hackage.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/guix/import/hackage.scm b/guix/import/hackage.scm index 2f901af47b..83ad85f3fe 100644 --- a/guix/import/hackage.scm +++ b/guix/import/hackage.scm @@ -75,6 +75,7 @@ (define ghc-standard-libraries "exceptions" "filepath" "ghc" + "ghc-bignum" "ghc-boot" "ghc-boot-th" "ghc-compact" From patchwork Sat Feb 11 10:08:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lars-Dominik Braun X-Patchwork-Id: 46821 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 B399216615; Sat, 11 Feb 2023 10:10:14 +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=unavailable 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 55DB31661E for ; Sat, 11 Feb 2023 10:10:12 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pQmon-0004rp-TB; Sat, 11 Feb 2023 05:09:17 -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 1pQmoj-0004om-IT for guix-patches@gnu.org; Sat, 11 Feb 2023 05:09:15 -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 1pQmob-00009h-Um for guix-patches@gnu.org; Sat, 11 Feb 2023 05:09:10 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pQmob-0004Cv-QR for guix-patches@gnu.org; Sat, 11 Feb 2023 05:09:05 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61420] [PATCH 11/31] build: haskell-build-system: Process all transitive dependencies. Resent-From: Lars-Dominik Braun Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 11 Feb 2023 10:09:05 +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.167611013616004 (code B ref 61420); Sat, 11 Feb 2023 10:09:05 +0000 Received: (at 61420) by debbugs.gnu.org; 11 Feb 2023 10:08:56 +0000 Received: from localhost ([127.0.0.1]:38874 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pQmoR-00049y-Og for submit@debbugs.gnu.org; Sat, 11 Feb 2023 05:08:56 -0500 Received: from mout-p-202.mailbox.org ([80.241.56.172]:34014) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pQmoH-00046U-Tj for 61420@debbugs.gnu.org; Sat, 11 Feb 2023 05:08:48 -0500 Received: from smtp102.mailbox.org (smtp102.mailbox.org [IPv6:2001:67c:2050:b231:465::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-202.mailbox.org (Postfix) with ESMTPS id 4PDRBt3Rbtz9sd1; Sat, 11 Feb 2023 11:08:38 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=6xq.net; s=MBO0001; t=1676110118; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ah3AyQLvjUYJOVSsmqYABDJz9QOfK6ca01e3lM387Oc=; b=y4gNM7KnXvuLBOhD0INoJ/2mPxNFTLBMrfeqO9mGDfuyIOghOZZaASp8+TuBTvKsFw57rH 6i12l7ClqGvo6RFUMyOmPXqlFg65kfVmo5Pr4xKn4Y/0Ve0ZJBVlsxZpUF98acp3a70pBs Xp4bNXukh72YJHin6CXSy0BwKZyOHxEZUdEZZl9R3vJsjUIXZa1weow3hvA0bzCSaELaO5 l5GnzJ8YhnZxMbJAwI2+ctrpmKEDdovZ3rhxI8+fO2uswwNdIhilRGrHZDiBiipOFH8lfM OAtl9T8i3X5KpPFsNXSNma0wb/HFCnd9mj51UoNrIfTogXvWgQ3/1RYUQgOnmg== From: Lars-Dominik Braun Date: Sat, 11 Feb 2023 11:08:06 +0100 Message-Id: <20230211100825.47971-9-lars@6xq.net> In-Reply-To: <20230211100825.47971-1-lars@6xq.net> References: <20230211100825.47971-1-lars@6xq.net> MIME-Version: 1.0 X-Rspamd-Queue-Id: 4PDRBt3Rbtz9sd1 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 A bug caused install-transitive-deps to stop looping if a dependency file already existed in the target directory. For Haskell packages with multiple libraries (like attoparsec) this resulted in missing dependencies and error messages like this: The following packages are broken because other packages they depend on are missing. These broken packages must be rebuilt before they can be used. installed package attoparsec-0.14.4 is broken due to missing package scientific-0.3.7.0-9XG3zUjXOw970JFcruv0cZ See . * guix/build/haskell-build-system.scm (register): Unconditionally loop over all tails. --- guix/build/haskell-build-system.scm | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/guix/build/haskell-build-system.scm b/guix/build/haskell-build-system.scm index fb4aba28ea..72e12ba746 100644 --- a/guix/build/haskell-build-system.scm +++ b/guix/build/haskell-build-system.scm @@ -214,14 +214,16 @@ (define (install-transitive-deps conf-file src dest) (() #t) ;done ((id . tail) (if (not (vhash-assoc id seen)) - (let ((dep-conf (string-append src "/" id ".conf")) - (dep-conf* (string-append dest "/" id ".conf"))) - (unless (file-exists? dep-conf*) - (unless (file-exists? dep-conf) + (let* ((dep-conf (string-append src "/" id ".conf")) + (dep-conf* (string-append dest "/" id ".conf")) + (dep-conf-exists? (file-exists? dep-conf)) + (dep-conf*-exists? (file-exists? dep-conf*)) + (next-tail (append lst (if dep-conf-exists? (conf-depends dep-conf) '())))) + (unless dep-conf*-exists? + (unless dep-conf-exists? (error (format #f "File ~a does not exist. This usually means the dependency ~a is missing. Was checking conf-file ~a." dep-conf id conf-file))) - (copy-file dep-conf dep-conf*) ;XXX: maybe symlink instead? - (loop (vhash-cons id #t seen) - (append lst (conf-depends dep-conf))))) + (copy-file dep-conf dep-conf*)) ;XXX: maybe symlink instead? + (loop (vhash-cons id #t seen) next-tail)) (loop seen tail)))))) (define (install-config-file conf-file dest output:doc output:lib) From patchwork Sat Feb 11 10:08:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lars-Dominik Braun X-Patchwork-Id: 46823 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 3126916615; Sat, 11 Feb 2023 10:10:22 +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=unavailable 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 3486A165B0 for ; Sat, 11 Feb 2023 10:10:21 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pQmop-0004sv-NA; Sat, 11 Feb 2023 05:09:19 -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 1pQmoj-0004og-FS for guix-patches@gnu.org; Sat, 11 Feb 2023 05:09:15 -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 1pQmob-00009e-It for guix-patches@gnu.org; Sat, 11 Feb 2023 05:09:07 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pQmob-0004Co-FC for guix-patches@gnu.org; Sat, 11 Feb 2023 05:09:05 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61420] [PATCH 12/31] build: haskell-build-system: Remove unused linker flags. Resent-From: Lars-Dominik Braun Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 11 Feb 2023 10:09:05 +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.167611013515997 (code B ref 61420); Sat, 11 Feb 2023 10:09:05 +0000 Received: (at 61420) by debbugs.gnu.org; 11 Feb 2023 10:08:55 +0000 Received: from localhost ([127.0.0.1]:38872 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pQmoR-00049r-EZ for submit@debbugs.gnu.org; Sat, 11 Feb 2023 05:08:55 -0500 Received: from mout-p-201.mailbox.org ([80.241.56.171]:38642) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pQmoI-00046W-8T for 61420@debbugs.gnu.org; Sat, 11 Feb 2023 05:08:47 -0500 Received: from smtp102.mailbox.org (smtp102.mailbox.org [IPv6:2001:67c:2050:b231:465::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 4PDRBt5kq3z9sdL; Sat, 11 Feb 2023 11:08:38 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=6xq.net; s=MBO0001; t=1676110118; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=C0ScT+TGGN4u8n7rNN4NrwRuVhQqY2cdLf3TEWZA1DE=; b=nPADeZd0+i62FwfLnaZoze4rh7Cc05RaiT4Ejc5yQsV2vX3MqT4mM/v8+F13dMRRIPoyDp 3qNeH5TVQODJlMWHOjSNTTOdhrYJS7GjxOcSSYhGP4l+evrC/7oivrycxnG+IMnAvubQFG 73TMb112ymzkgw8psNMZyYUopkaKB8z1PvHmWrI1XZ2vmonMKuu8woIdMDzRz+z674hEpJ efBuvKWmlEhloJTSd7JhUpGL1YLPiKj60omfSB/N1RIrd+q6za1tpnDnh+dTggtnPKeGkj /GOiazuaQIS8+KIpyeNsBxB7+EzPhRxZ4NPhifmCZMpRDIXIzcIzyTuTeXW0KQ== From: Lars-Dominik Braun Date: Sat, 11 Feb 2023 11:08:07 +0100 Message-Id: <20230211100825.47971-10-lars@6xq.net> In-Reply-To: <20230211100825.47971-1-lars@6xq.net> References: <20230211100825.47971-1-lars@6xq.net> MIME-Version: 1.0 X-Rspamd-Queue-Id: 4PDRBt5kq3z9sdL 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 They were inserted as-is, without expandind variables into binaries. * guix/build/haskell-build-system.scm (configure): Remove --ghc-option. --- guix/build/haskell-build-system.scm | 2 -- 1 file changed, 2 deletions(-) diff --git a/guix/build/haskell-build-system.scm b/guix/build/haskell-build-system.scm index 72e12ba746..759d3c5d17 100644 --- a/guix/build/haskell-build-system.scm +++ b/guix/build/haskell-build-system.scm @@ -103,8 +103,6 @@ (define* (configure #:key outputs inputs tests? (configure-flags '()) "--enable-shared" "--enable-executable-dynamic" "--ghc-option=-fPIC" - ,(string-append "--ghc-option=-optl=-Wl,-rpath=" (or lib out) - "/lib/$compiler/$pkg-$version") ,@configure-flags))) ;; Cabal errors if GHC_PACKAGE_PATH is set during 'configure', so unset ;; and restore it. From patchwork Sat Feb 11 10:08:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lars-Dominik Braun X-Patchwork-Id: 46832 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 76F7B1661A; Sat, 11 Feb 2023 10:11:09 +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 75E0E165F0 for ; Sat, 11 Feb 2023 10:11:08 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pQmot-0004vl-6y; Sat, 11 Feb 2023 05:09:23 -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 1pQmoj-0004on-Io for guix-patches@gnu.org; Sat, 11 Feb 2023 05:09:15 -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 1pQmoc-00009l-Aq for guix-patches@gnu.org; Sat, 11 Feb 2023 05:09:10 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pQmoc-0004D2-6x for guix-patches@gnu.org; Sat, 11 Feb 2023 05:09:06 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61420] [PATCH 14/31] gnu: ghc-9.2: Increase make verbosity. Resent-From: Lars-Dominik Braun Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 11 Feb 2023 10:09:06 +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.167611013616013 (code B ref 61420); Sat, 11 Feb 2023 10:09:06 +0000 Received: (at 61420) by debbugs.gnu.org; 11 Feb 2023 10:08:56 +0000 Received: from localhost ([127.0.0.1]:38876 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pQmoS-0004A5-5O for submit@debbugs.gnu.org; Sat, 11 Feb 2023 05:08:56 -0500 Received: from mout-p-102.mailbox.org ([80.241.56.152]:57634) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pQmoI-00046X-GH for 61420@debbugs.gnu.org; Sat, 11 Feb 2023 05:08:48 -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-102.mailbox.org (Postfix) with ESMTPS id 4PDRBv0Y6vz9sm1; Sat, 11 Feb 2023 11:08:39 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=6xq.net; s=MBO0001; t=1676110119; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=40cYVTYJNnwyy7sRVb/CjtxKjfS294dw5HOAJWXHtVU=; b=D5JoGFryYpdLLaREWQKGB3B8ELU7hFy5ErSWEJn1Df9RoKaXzSbWX9WuW7NuGLUeXr6TDn dUzOaaTrYTzL47OhRyCy/HVNQpTPZ2y9bwz6vGQi5FCsRXAn8wnQjaGcPcc6U4gNhycJf8 NkuhbxHz9bz7hBYnwFcaZso7xRSpfzrJ8BMoCQPGItAtBnDY+X3N9LW0DdmIaRl+W33+ZK ThKnEiStWDT54l7PhoHQKV3p9oHzM2f3HJ/OEAWc0q4o7zsvZCCZTaFSoFTzdDZITyFfxD SESi5FjmHG0yeb0GciXIFCq0FEBGwdYyjr/6RaHEJeXpZUS5jEgPttznl5UWQw== From: Lars-Dominik Braun Date: Sat, 11 Feb 2023 11:08:08 +0100 Message-Id: <20230211100825.47971-11-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 Tests time out on ci.guix.gnu.org. * gnu/packages/haskell.scm (ghc-9.2)[arguments]: Modify #:make-flags. --- gnu/packages/haskell.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 84071cb293..60d846e841 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -1295,7 +1295,10 @@ (define-public ghc-9.2 (replace 'fix-cc-reference (lambda _ (substitute* "utils/hsc2hs/src/Common.hs" - (("\"cc\"") "\"gcc\"")))))))) + (("\"cc\"") "\"gcc\"")))))) + ;; Increase verbosity, so running the test suite does not time out on CI. + ((#:make-flags make-flags ''()) + #~(cons "VERBOSE=4" #$make-flags)))) (native-inputs `(;; GHC 9.2 must be built with GHC >= 8.6. ("ghc-bootstrap" ,base) From patchwork Sat Feb 11 10:08:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lars-Dominik Braun X-Patchwork-Id: 46824 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 992F61661A; Sat, 11 Feb 2023 10:10:23 +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 E8E61165F0 for ; Sat, 11 Feb 2023 10:10:22 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pQmoo-0004sC-CK; Sat, 11 Feb 2023 05:09:18 -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 1pQmok-0004os-Ur for guix-patches@gnu.org; Sat, 11 Feb 2023 05:09:15 -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 1pQmod-0000A2-IZ for guix-patches@gnu.org; Sat, 11 Feb 2023 05:09:11 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pQmod-0004DP-EF for guix-patches@gnu.org; Sat, 11 Feb 2023 05:09:07 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61420] [PATCH 15/31] gnu: Remove unused Haskell packages. Resent-From: Lars-Dominik Braun Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 11 Feb 2023 10:09:07 +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.167611013716035 (code B ref 61420); Sat, 11 Feb 2023 10:09:07 +0000 Received: (at 61420) by debbugs.gnu.org; 11 Feb 2023 10:08:57 +0000 Received: from localhost ([127.0.0.1]:38882 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pQmoT-0004AS-32 for submit@debbugs.gnu.org; Sat, 11 Feb 2023 05:08:57 -0500 Received: from mout-p-103.mailbox.org ([80.241.56.161]:53342) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pQmoI-00046Y-QU for 61420@debbugs.gnu.org; Sat, 11 Feb 2023 05:08:48 -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-103.mailbox.org (Postfix) with ESMTPS id 4PDRBv2zQgz9sjQ; Sat, 11 Feb 2023 11:08:39 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=6xq.net; s=MBO0001; t=1676110119; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=O1I4aubDeQrq4ztLNX8jQKZ2h6kB4c93rzkpUw/jyog=; b=n8K0z0q6xsKOrNiIKluRwqd3skR2G9p7tS0ayYv4ExZIMwW0mKk3peO283DaenGRDRx5Cn YNpVvt2eWRBdDQPzmHHgp+15J9lWMIXhgZEhPXA1KyCWz1c/nLIWFn5upspGMaZNaRrLlD 5gHtRGpaym7+jf200Cq5jTaVZw9eve2IBAp159jZGuJ49NvwzvJd6ert/n3pvvbASFMn/H mgOt4RqJ+3ZrKRFtTaJ3baLqgaurO0xrYX/fFTRpSnXloPOA1Iho7WnSl8n5einkJfNdgk 8RVY5c44vn9TrXXeZvtBGZ59jmk63Ame5nHVg878sp/DdgF1QK9wb/Q3Wd9TaA== From: Lars-Dominik Braun Date: Sat, 11 Feb 2023 11:08:09 +0100 Message-Id: <20230211100825.47971-12-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 * gnu/packages/haskell-xyz.scm (ghc-attoparsec-bootstrap): Remove variable. (ghc-integer-logarithms-bootstrap): Likewise. (ghc-scientific-bootstrap): Likewise. (ghc-wcwidth-bootstrap): Likewise. (ghc-optparse-applicative-0.15.1.0): Likewise. --- gnu/packages/haskell-xyz.scm | 59 ------------------------------------ 1 file changed, 59 deletions(-) diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 1f90cc6516..f320206c23 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -581,16 +581,6 @@ (define-public ghc-attoparsec complicated text/binary file formats.") (license license:bsd-3))) -(define-public ghc-attoparsec-bootstrap - (package - (inherit ghc-attoparsec) - (name "ghc-attoparsec-bootstrap") - (arguments `(#:tests? #f)) - (inputs - `(("ghc-scientific" ,ghc-scientific-bootstrap))) - (native-inputs '()) - (properties '((hidden? #t))))) - (define-public ghc-attoparsec-iso8601 (package (name "ghc-attoparsec-iso8601") @@ -5825,14 +5815,6 @@ (define-public ghc-integer-logarithms in migrated modules.") (license license:expat))) -(define-public ghc-integer-logarithms-bootstrap - (package - (inherit ghc-integer-logarithms) - (name "ghc-integer-logarithms-bootstrap") - (arguments `(#:tests? #f)) - (native-inputs '()) - (properties '((hidden? #t))))) - (define-public ghc-interpolate (package (name "ghc-interpolate") @@ -8051,27 +8033,6 @@ (define-public ghc-optparse-applicative command line options in Haskell.") (license license:bsd-3))) -(define-public ghc-optparse-applicative-0.15.1.0 - (package - (inherit ghc-optparse-applicative) - (name "ghc-optparse-applicative") - (version "0.15.1.0") - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/optparse-applicative/optparse-applicative-" - version - ".tar.gz")) - (sha256 - (base32 "1ws6y3b3f6hsgv0ff0yp6lw4hba1rps4dnvry3yllng0s5gngcsd")))) - (inputs - (list ghc-transformers-compat ghc-ansi-wl-pprint)) - (native-inputs (list ghc-quickcheck)) - (arguments - `(#:cabal-revision - ("1" "0zmhqkd96v2z1ilhqdkd9z4jgsnsxb8yi2479ind8m5zm9363zr9"))))) - (define-public ghc-jira-wiki-markup (package (name "ghc-jira-wiki-markup") @@ -10178,18 +10139,6 @@ (define-public ghc-scientific notation}.") (license license:bsd-3))) -(define-public ghc-scientific-bootstrap - (package - (inherit ghc-scientific) - (name "ghc-scientific-bootstrap") - (arguments `(#:tests? #f)) - (inputs - `(("ghc-integer-logarithms" ,ghc-integer-logarithms-bootstrap) - ("ghc-hashable" ,ghc-hashable) - ("ghc-primitive" ,ghc-primitive))) - (native-inputs '()) - (properties '((hidden? #t))))) - (define-public ghc-sdl (package (name "ghc-sdl") @@ -13422,14 +13371,6 @@ (define-public ghc-wcwidth widths to the Char type.") (license license:bsd-3))) -(define-public ghc-wcwidth-bootstrap - (package - (inherit ghc-wcwidth) - (name "ghc-wcwidth-bootstrap") - (inputs - (list ghc-setlocale ghc-utf8-string ghc-attoparsec-bootstrap)) - (properties '((hidden? #t))))) - (define-public ghc-weigh (package (name "ghc-weigh") From patchwork Sat Feb 11 10:08:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lars-Dominik Braun X-Patchwork-Id: 46826 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 3F2D016615; Sat, 11 Feb 2023 10:10:31 +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=unavailable 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 7E2F0165B0 for ; Sat, 11 Feb 2023 10:10:29 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pQmoo-0004si-T4; Sat, 11 Feb 2023 05:09:18 -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 1pQmok-0004ou-Vs for guix-patches@gnu.org; Sat, 11 Feb 2023 05:09:15 -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 1pQmod-00009w-4x for guix-patches@gnu.org; Sat, 11 Feb 2023 05:09:11 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pQmod-0004DI-0A for guix-patches@gnu.org; Sat, 11 Feb 2023 05:09:07 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61420] [PATCH 16/31] gnu: ghc-parsec: Update to 3.1.15.0. Resent-From: Lars-Dominik Braun Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 11 Feb 2023 10:09:06 +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.167611013716027 (code B ref 61420); Sat, 11 Feb 2023 10:09:06 +0000 Received: (at 61420) by debbugs.gnu.org; 11 Feb 2023 10:08:57 +0000 Received: from localhost ([127.0.0.1]:38880 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pQmoS-0004AL-PQ for submit@debbugs.gnu.org; Sat, 11 Feb 2023 05:08:57 -0500 Received: from mout-p-101.mailbox.org ([80.241.56.151]:59332) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pQmoJ-00046a-Fs for 61420@debbugs.gnu.org; Sat, 11 Feb 2023 05:08:48 -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-101.mailbox.org (Postfix) with ESMTPS id 4PDRBv5Bjlz9sZ1; Sat, 11 Feb 2023 11:08:39 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=6xq.net; s=MBO0001; t=1676110119; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=I2JER8FCQlDg6K7l/GTwWO9J4ItDRjape4znkV7OlW4=; b=QUnjhG8Yc0BTnoK0YVjhlCO43btG+mSHm8EzFDUUMhg8imY+n5ndztvonL7+ArqrZ3S7cd Ufnfto4JVhlrMYnn3rZMITlmCkjK7CkU8siLaGYalGbIy/Rq3/jNEC+5+rxFOPHrJpWl2/ cP1kOlVmmKdeztTVo0xDxHiFknjC5t0pB8sDmeoBJ3Mf0iB5l4Hqmynu+hHrhWbUvVjrqQ eqK7GrWahV3fsB/08Y9rPndMAQFhYEY8Ea4MkA2iT4CCwiQrduNeGHfLFFWms6ojbde4+Q rl8P+o2nB4GCsAX7T7xVUGGqp2N/2YX0THbhihlUbHadOHBgIwvB9CiubJrYaQ== From: Lars-Dominik Braun Date: Sat, 11 Feb 2023 11:08:10 +0100 Message-Id: <20230211100825.47971-13-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 Missed by automation. * gnu/packages/haskell-xyz.scm (ghc-parsec)[version]: Update to 3.1.15.0. [native-inputs]: Switch from HUnit to tasty. --- gnu/packages/haskell-xyz.scm | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index f320206c23..6d7fd5dc63 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -8341,18 +8341,15 @@ (define-public ghc-parallel (define-public ghc-parsec (package (name "ghc-parsec") - (version "3.1.14.0") + (version "3.1.15.0") (source (origin (method url-fetch) (uri (hackage-uri "parsec" version)) (sha256 (base32 - "132waj2cpn892midbhpkfmb74qq83v0zv29v885frlp1gvh94b67")))) + "1v8zs8zv1rk16lag2yqaxfwanjpgnh4gxw1vd70py0n04d20z0lq")))) (build-system haskell-build-system) - (native-inputs (list ghc-hunit ghc-test-framework ghc-test-framework-hunit)) - (arguments - `(#:cabal-revision - ("4" "0p65q054iaz2117a5qk1428dic4sb41acclys9k00zna24ks7iq3"))) + (native-inputs (list ghc-tasty ghc-tasty-hunit)) (home-page "https://github.com/haskell/parsec") (synopsis "Monadic parser combinators") (description "Parsec is designed from scratch as an industrial-strength From patchwork Sat Feb 11 10:08:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lars-Dominik Braun X-Patchwork-Id: 46834 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 3C7BF1661B; Sat, 11 Feb 2023 10:11:14 +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=unavailable 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 1592216615 for ; Sat, 11 Feb 2023 10:11:12 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pQmot-0004vm-7T; Sat, 11 Feb 2023 05:09:23 -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 1pQmol-0004ow-1U for guix-patches@gnu.org; Sat, 11 Feb 2023 05:09:15 -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 1pQmoc-00009n-Mc for guix-patches@gnu.org; Sat, 11 Feb 2023 05:09:11 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pQmoc-0004DA-IJ for guix-patches@gnu.org; Sat, 11 Feb 2023 05:09:06 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61420] [PATCH 17/31] gnu: idris: Fix overly zealous regular expression. Resent-From: Lars-Dominik Braun Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 11 Feb 2023 10:09:06 +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.167611013616020 (code B ref 61420); Sat, 11 Feb 2023 10:09:06 +0000 Received: (at 61420) by debbugs.gnu.org; 11 Feb 2023 10:08:56 +0000 Received: from localhost ([127.0.0.1]:38878 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pQmoS-0004AE-Ft for submit@debbugs.gnu.org; Sat, 11 Feb 2023 05:08:56 -0500 Received: from mout-p-101.mailbox.org ([80.241.56.151]:59338) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pQmoJ-00046b-HF for 61420@debbugs.gnu.org; Sat, 11 Feb 2023 05:08:48 -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-101.mailbox.org (Postfix) with ESMTPS id 4PDRBw0Kf7z9sZY; Sat, 11 Feb 2023 11:08:40 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=6xq.net; s=MBO0001; t=1676110120; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=NSR6JZEN4+NDrMjI6DniAAvDB36euSN8XEEPbUE2p1I=; b=J4Y0m93y2rO2hhwb40NI5eBwnTlNAuXl3bz3gPUJZFugYi0ptOnbbUkGlgb+DkwKB81/Kx IHEX6Htyny+eC6oLWVP/1Te/PNwVci/RO0lE64Fs3mhSpovn0gDUr4k0FoN9CPbXrANehQ LYDDsszxhxR/j9j3NLgOtFMEj4g6+2xuHPg5Lw57GA/TFFveiNHCkgmVzsblH1/rcDeA4g C9aMQN3tKZ+kiG/qraEt5dZWsTPaX0PWI/uBVxvZmDvex+hg72W/evx2zRI3mguKxCx3rQ ILS5vI560TKZ6td+RwpTtnGqRttjmMw8ShHJkZ9nGzYa5M/H2hCyYffQqJHPWA== From: Lars-Dominik Braun Date: Sat, 11 Feb 2023 11:08:11 +0100 Message-Id: <20230211100825.47971-14-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 * gnu/packages/idris.scm (idris)[arguments]: Limit characters matched after package name in cabal file substitutions. --- gnu/packages/idris.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/idris.scm b/gnu/packages/idris.scm index 5e4979edc3..2a5f63c174 100644 --- a/gnu/packages/idris.scm +++ b/gnu/packages/idris.scm @@ -99,7 +99,7 @@ (define-public idris (add-before 'configure 'update-constraints (lambda _ (substitute* "idris.cabal" - (("(aeson|ansi-terminal|bytestring|haskeline|libffi|megaparsec|network|optparse-applicative)\\s+[^,]+" all dep) + (("(aeson|ansi-terminal|bytestring|haskeline|libffi|megaparsec|network|optparse-applicative)\\s+[<>=0-9. &|]+" all dep) dep)))) (add-before 'configure 'set-cc-command (lambda _ From patchwork Sat Feb 11 10:08:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lars-Dominik Braun X-Patchwork-Id: 46815 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 DF65A1661A; Sat, 11 Feb 2023 10:09:49 +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 3FE44165B0 for ; Sat, 11 Feb 2023 10:09:48 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pQmop-0004tN-VT; Sat, 11 Feb 2023 05:09:19 -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 1pQmol-0004oy-23 for guix-patches@gnu.org; Sat, 11 Feb 2023 05:09:15 -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 1pQmof-0000AG-H9 for guix-patches@gnu.org; Sat, 11 Feb 2023 05:09:11 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pQmof-0004E1-BH for guix-patches@gnu.org; Sat, 11 Feb 2023 05:09:09 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61420] [PATCH 18/31] gnu: elm: Support GHC 9.2. Resent-From: Lars-Dominik Braun Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 11 Feb 2023 10:09:09 +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.167611014016072 (code B ref 61420); Sat, 11 Feb 2023 10:09:09 +0000 Received: (at 61420) by debbugs.gnu.org; 11 Feb 2023 10:09:00 +0000 Received: from localhost ([127.0.0.1]:38892 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pQmoV-0004B3-9k for submit@debbugs.gnu.org; Sat, 11 Feb 2023 05:08:59 -0500 Received: from mout-p-101.mailbox.org ([80.241.56.151]:59350) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pQmoJ-00046c-Ol for 61420@debbugs.gnu.org; Sat, 11 Feb 2023 05:08:50 -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-101.mailbox.org (Postfix) with ESMTPS id 4PDRBw2Sknz9sbx; Sat, 11 Feb 2023 11:08:40 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=6xq.net; s=MBO0001; t=1676110120; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ALKZUi48Ay9OJcrxa0OAkgN8e2dX5e+1SfKegOqSaj0=; b=p5iGyR3nmbbZrBvQa+In4+YlNDN0WnvSxPAL8x9npZ5Mh8D5CGG3pDG1BLMC0ppEXVAeQH EeBrvATwPSI/bM0DUJ3Yquug7hrYyH7EHtYO66OG816vbr+VBOWo05bMuwy4oScVLcvyus f0QKNYXdmHc4yYETbt4uDrcY9BKiYiC7emNNy4IzEOtEAh3Fb0hBtjFyA1bxw4rLJHM5qn 9+RFp5Bcx3gXR+/mYhttbIHBWfmISuxKTIUTwJnzSqpUoNp8bimTMttGSejLUyoV5GWK8y o8FAvVDI9Q3SYj7u0dhiRQdJDTeHtrIU525+n4ydU1P3W6W/tD7s+wwUpe82qw== From: Lars-Dominik Braun Date: Sat, 11 Feb 2023 11:08:12 +0100 Message-Id: <20230211100825.47971-15-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 * gnu/packages/elm.scm (elm-sans-reactor)[source]: Add patch to support GHC 9.2. * gnu/packages/patches/elm-ghc9.2.patch: This one. * gnu/local.mk: Add it. --- gnu/local.mk | 1 + gnu/packages/elm.scm | 3 +- gnu/packages/patches/elm-ghc9.2.patch | 187 ++++++++++++++++++++++++++ 3 files changed, 190 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/elm-ghc9.2.patch diff --git a/gnu/local.mk b/gnu/local.mk index 61e0598a5f..b6b44f7836 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1054,6 +1054,7 @@ dist_patch_DATA = \ %D%/packages/patches/einstein-build.patch \ %D%/packages/patches/elfutils-tests-ptrace.patch \ %D%/packages/patches/elixir-path-length.patch \ + %D%/packages/patches/elm-ghc9.2.patch \ %D%/packages/patches/elm-offline-package-registry.patch \ %D%/packages/patches/elm-reactor-static-files.patch \ %D%/packages/patches/elogind-revert-polkit-detection.patch \ diff --git a/gnu/packages/elm.scm b/gnu/packages/elm.scm index 6d301cf51c..a74d294ae5 100644 --- a/gnu/packages/elm.scm +++ b/gnu/packages/elm.scm @@ -56,7 +56,8 @@ (define-public elm-sans-reactor (base32 "1rdg3xp3js9xadclk3cdypkscm5wahgsfmm4ldcw3xswzhw6ri8w")) (patches (search-patches "elm-reactor-static-files.patch" - "elm-offline-package-registry.patch")))) + "elm-offline-package-registry.patch" + "elm-ghc9.2.patch")))) (build-system haskell-build-system) (arguments (list diff --git a/gnu/packages/patches/elm-ghc9.2.patch b/gnu/packages/patches/elm-ghc9.2.patch new file mode 100644 index 0000000000..7b1e653e80 --- /dev/null +++ b/gnu/packages/patches/elm-ghc9.2.patch @@ -0,0 +1,187 @@ +From f88043586337ba33cf3e852908003a71dfe493ec Mon Sep 17 00:00:00 2001 +From: vlkrs +Date: Sat, 7 May 2022 17:51:15 +0200 +Subject: [PATCH] Quick hack to build on ghc-9.2.2 + +Taken from +https://codeberg.org/vlkrs/elm-compiler/commit/f88043586337ba33cf3e852908003a71dfe493ec.patch + +diff --git a/compiler/src/Data/Name.hs b/compiler/src/Data/Name.hs +index beecf114..39b64029 100644 +--- a/compiler/src/Data/Name.hs ++++ b/compiler/src/Data/Name.hs +@@ -47,6 +47,7 @@ import qualified Data.Utf8 as Utf8 + import GHC.Exts + ( Int(I#), Ptr + , MutableByteArray# ++ , int8ToInt# + , isTrue# + , newByteArray# + , sizeofByteArray# +@@ -241,7 +242,7 @@ fromTypeVariable name@(Utf8.Utf8 ba#) index = + else + let + len# = sizeofByteArray# ba# +- end# = indexWord8Array# ba# (len# -# 1#) ++ end# = word8ToWord# (indexWord8Array# ba# (len# -# 1#)) + in + if isTrue# (leWord# 0x30## end#) && isTrue# (leWord# end# 0x39##) then + runST +@@ -316,11 +317,11 @@ fromManyNames names = + ST $ \s -> + case newByteArray# (len# +# 3#) s of + (# s, mba# #) -> +- case writeWord8Array# mba# 0# 0x5F## {-_-} s of ++ case writeWord8Array# mba# 0# (wordToWord8# 0x5F##) {-_-} s of + s -> +- case writeWord8Array# mba# 1# 0x4D## {-M-} s of ++ case writeWord8Array# mba# 1# (wordToWord8# 0x4D##) {-M-} s of + s -> +- case writeWord8Array# mba# 2# 0x24## {-$-} s of ++ case writeWord8Array# mba# 2# (wordToWord8# 0x24##) {-$-} s of + s -> + case copyByteArray# ba# 0# mba# 3# len# s of + s -> +diff --git a/compiler/src/Data/Utf8.hs b/compiler/src/Data/Utf8.hs +index e985aa64..472777df 100644 +--- a/compiler/src/Data/Utf8.hs ++++ b/compiler/src/Data/Utf8.hs +@@ -109,10 +109,10 @@ contains (W8# word#) (Utf8 ba#) = + containsHelp word# ba# 0# (sizeofByteArray# ba#) + + +-containsHelp :: Word# -> ByteArray# -> Int# -> Int# -> Bool ++containsHelp :: Word8# -> ByteArray# -> Int# -> Int# -> Bool + containsHelp word# ba# !offset# len# = + if isTrue# (offset# <# len#) then +- if isTrue# (eqWord# word# (indexWord8Array# ba# offset#)) ++ if isTrue# (eqWord8# word# (indexWord8Array# ba# offset#)) + then True + else containsHelp word# ba# (offset# +# 1#) len# + else +@@ -147,10 +147,10 @@ startsWithChar isGood bytes@(Utf8 ba#) = + let + !w# = indexWord8Array# ba# 0# + !char +- | isTrue# (ltWord# w# 0xC0##) = C# (chr# (word2Int# w#)) +- | isTrue# (ltWord# w# 0xE0##) = chr2 ba# 0# w# +- | isTrue# (ltWord# w# 0xF0##) = chr3 ba# 0# w# +- | True = chr4 ba# 0# w# ++ | isTrue# (ltWord8# w# (wordToWord8# 0xC0##)) = C# (chr# (int8ToInt# (word8ToInt8# w#))) ++ | isTrue# (ltWord8# w# (wordToWord8# 0xE0##)) = chr2 ba# 0# (word8ToWord# w#) ++ | isTrue# (ltWord8# w# (wordToWord8# 0xF0##)) = chr3 ba# 0# (word8ToWord# w#) ++ | True = chr4 ba# 0# (word8ToWord# w#) + in + isGood char + +@@ -164,7 +164,7 @@ endsWithWord8 (W8# w#) (Utf8 ba#) = + let len# = sizeofByteArray# ba# in + isTrue# (len# ># 0#) + && +- isTrue# (eqWord# w# (indexWord8Array# ba# (len# -# 1#))) ++ isTrue# (eqWord8# w# (indexWord8Array# ba# (len# -# 1#))) + + + +@@ -186,11 +186,11 @@ splitHelp str start offsets = + unsafeSlice str start offset : splitHelp str (offset + 1) offsets + + +-findDividers :: Word# -> ByteArray# -> Int# -> Int# -> [Int] -> [Int] ++findDividers :: Word8# -> ByteArray# -> Int# -> Int# -> [Int] -> [Int] + findDividers divider# ba# !offset# len# revOffsets = + if isTrue# (offset# <# len#) then + findDividers divider# ba# (offset# +# 1#) len# $ +- if isTrue# (eqWord# divider# (indexWord8Array# ba# offset#)) ++ if isTrue# (eqWord8# divider# (indexWord8Array# ba# offset#)) + then I# offset# : revOffsets + else revOffsets + else +@@ -353,10 +353,10 @@ toCharsHelp ba# offset# len# = + let + !w# = indexWord8Array# ba# offset# + !(# char, width# #) +- | isTrue# (ltWord# w# 0xC0##) = (# C# (chr# (word2Int# w#)), 1# #) +- | isTrue# (ltWord# w# 0xE0##) = (# chr2 ba# offset# w#, 2# #) +- | isTrue# (ltWord# w# 0xF0##) = (# chr3 ba# offset# w#, 3# #) +- | True = (# chr4 ba# offset# w#, 4# #) ++ | isTrue# (ltWord8# w# (wordToWord8# 0xC0##)) = (# C# (chr# (int8ToInt# (word8ToInt8# w#))), 1# #) ++ | isTrue# (ltWord8# w# (wordToWord8# 0xE0##)) = (# chr2 ba# offset# (word8ToWord# w#), 2# #) ++ | isTrue# (ltWord8# w# (wordToWord8# 0xF0##)) = (# chr3 ba# offset# (word8ToWord# w#), 3# #) ++ | True = (# chr4 ba# offset# (word8ToWord# w#), 4# #) + + !newOffset# = offset# +# width# + in +@@ -368,7 +368,7 @@ chr2 :: ByteArray# -> Int# -> Word# -> Char + chr2 ba# offset# firstWord# = + let + !i1# = word2Int# firstWord# +- !i2# = word2Int# (indexWord8Array# ba# (offset# +# 1#)) ++ !i2# = int8ToInt# (word8ToInt8# (indexWord8Array# ba# (offset# +# 1#))) + !c1# = uncheckedIShiftL# (i1# -# 0xC0#) 6# + !c2# = i2# -# 0x80# + in +@@ -380,8 +380,8 @@ chr3 :: ByteArray# -> Int# -> Word# -> Char + chr3 ba# offset# firstWord# = + let + !i1# = word2Int# firstWord# +- !i2# = word2Int# (indexWord8Array# ba# (offset# +# 1#)) +- !i3# = word2Int# (indexWord8Array# ba# (offset# +# 2#)) ++ !i2# = int8ToInt# (word8ToInt8# (indexWord8Array# ba# (offset# +# 1#))) ++ !i3# = int8ToInt# (word8ToInt8# (indexWord8Array# ba# (offset# +# 2#))) + !c1# = uncheckedIShiftL# (i1# -# 0xE0#) 12# + !c2# = uncheckedIShiftL# (i2# -# 0x80#) 6# + !c3# = i3# -# 0x80# +@@ -394,9 +394,9 @@ chr4 :: ByteArray# -> Int# -> Word# -> Char + chr4 ba# offset# firstWord# = + let + !i1# = word2Int# firstWord# +- !i2# = word2Int# (indexWord8Array# ba# (offset# +# 1#)) +- !i3# = word2Int# (indexWord8Array# ba# (offset# +# 2#)) +- !i4# = word2Int# (indexWord8Array# ba# (offset# +# 3#)) ++ !i2# = int8ToInt# (word8ToInt8# (indexWord8Array# ba# (offset# +# 1#))) ++ !i3# = int8ToInt# (word8ToInt8# (indexWord8Array# ba# (offset# +# 2#))) ++ !i4# = int8ToInt# (word8ToInt8# (indexWord8Array# ba# (offset# +# 3#))) + !c1# = uncheckedIShiftL# (i1# -# 0xF0#) 18# + !c2# = uncheckedIShiftL# (i2# -# 0x80#) 12# + !c3# = uncheckedIShiftL# (i3# -# 0x80#) 6# +@@ -471,7 +471,7 @@ toEscapedBuilderHelp before after !name@(Utf8 ba#) k = + escape :: Word8 -> Word8 -> Ptr a -> Utf8 t -> Int -> Int -> Int -> IO () + escape before@(W8# before#) after ptr name@(Utf8 ba#) offset@(I# offset#) len@(I# len#) i@(I# i#) = + if isTrue# (i# <# len#) then +- if isTrue# (eqWord# before# (indexWord8Array# ba# (offset# +# i#))) ++ if isTrue# (eqWord8# before# (indexWord8Array# ba# (offset# +# i#))) + then + do writeWordToPtr ptr i after + escape before after ptr name offset len (i + 1) +diff --git a/compiler/src/Parse/Primitives.hs b/compiler/src/Parse/Primitives.hs +index bb973193..3747cfac 100644 +--- a/compiler/src/Parse/Primitives.hs ++++ b/compiler/src/Parse/Primitives.hs +@@ -82,7 +82,7 @@ instance Functor (Parser x) where + + instance Applicative.Applicative (Parser x) where + {-# INLINE pure #-} +- pure = return ++ pure = pure + + {-# INLINE (<*>) #-} + (<*>) (Parser parserFunc) (Parser parserArg) = +diff --git a/compiler/src/Parse/Variable.hs b/compiler/src/Parse/Variable.hs +index f3d86145..5e0ea802 100644 +--- a/compiler/src/Parse/Variable.hs ++++ b/compiler/src/Parse/Variable.hs +@@ -22,6 +22,7 @@ import qualified Data.Set as Set + import Data.Word (Word8) + import Foreign.Ptr (Ptr, plusPtr) + import GHC.Exts (Char(C#), Int#, (+#), (-#), chr#, uncheckedIShiftL#, word2Int#) ++import GHC.Prim + import GHC.Word (Word8(W8#)) + + import qualified AST.Source as Src +@@ -384,4 +385,4 @@ chr4 pos firstWord = + + unpack :: Word8 -> Int# + unpack (W8# word#) = +- word2Int# word# ++ int8ToInt# (word8ToInt8# word#) From patchwork Sat Feb 11 10:08:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lars-Dominik Braun X-Patchwork-Id: 46831 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 330BD1661B; Sat, 11 Feb 2023 10:11:09 +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=unavailable 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 69C06165B0 for ; Sat, 11 Feb 2023 10:11:06 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pQmot-0004x9-N8; Sat, 11 Feb 2023 05:09:23 -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 1pQmok-0004ot-Ve for guix-patches@gnu.org; Sat, 11 Feb 2023 05:09:15 -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 1pQmof-0000AC-3b for guix-patches@gnu.org; Sat, 11 Feb 2023 05:09:11 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pQmoe-0004Du-W3 for guix-patches@gnu.org; Sat, 11 Feb 2023 05:09:09 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61420] [PATCH 19/31] build-system: haskell: Drop default "static" output. Resent-From: Lars-Dominik Braun Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 11 Feb 2023 10:09:08 +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.167611013916064 (code B ref 61420); Sat, 11 Feb 2023 10:09:08 +0000 Received: (at 61420) by debbugs.gnu.org; 11 Feb 2023 10:08:59 +0000 Received: from localhost ([127.0.0.1]:38890 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pQmoU-0004Aw-Lx for submit@debbugs.gnu.org; Sat, 11 Feb 2023 05:08:59 -0500 Received: from mout-p-103.mailbox.org ([80.241.56.161]:53344) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pQmoK-00046e-3q for 61420@debbugs.gnu.org; Sat, 11 Feb 2023 05:08:50 -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-103.mailbox.org (Postfix) with ESMTPS id 4PDRBw4zJYz9skp; Sat, 11 Feb 2023 11:08:40 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=6xq.net; s=MBO0001; t=1676110120; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=A8XttUtXVRYYcJsulKB8nSOMeofjCdxxXpXBc6xcFo0=; b=bGUzCPic01H0IbHz5CW7kIYIdmjd5PAw806Nx6VR6Nv/3P1RHhGfsxZ/CWx5OQ/GhhQ/oZ uW+nJ0aFRWYZiueKjAbUX2DeUdTUYAINuaE719DOYJek4PUxzbRd7LeQsbR0eNT5Kc59Ih +fOMqiOvYzhSVOGCIm2Cbtzy3FDPXbiHJ4TtwZANvrjtMkwACraM07P6i4NRA+jtQPO1Wh w0nhFJMW0SmLjxzAUfLkh7RglglpsOHYM9CYyaM+nhSBwgVG9EBhiwdNvZislFQus1y0GO PCpLN2w3ptXqbV5ZxfUqNiw+1Ta+qAU2KurwdWCgerd+yA0COntVz8fI9Q3gGQ== From: Lars-Dominik Braun Date: Sat, 11 Feb 2023 11:08:13 +0100 Message-Id: <20230211100825.47971-16-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 * guix/build-system/haskell.scm (lower): Pass outputs to lowered bag. * guix/build/haskell-build-system.scm (install): Remove static library moving code. * gnu/packages/haskell-check.scm (ghc-hunit): Remove "static" output. * gnu/packages/haskell-crypto.scm (ghc-crypto-api-tests): Likewise. * gnu/packages/haskell-xyz.scm (ghc-case-insensitive): Likewise. (ghc-cmdargs): Likewise. (ghc-conduit): Likewise. (ghc-fgl): Likewise. (ghc-haskell-src-exts): Likewise. (ghc-lib-parser): Likewise. (ghc-mono-traversable): Likewise. (ghc-parallel): Likewise. (ghc-paths): Likewise. (ghc-profunctors): Likewise. (ghc-tf-random): Likewise. (ghc-vector): Likewise. --- gnu/packages/haskell-check.scm | 2 +- gnu/packages/haskell-crypto.scm | 1 - gnu/packages/haskell-xyz.scm | 24 ++++++++++++------------ guix/build-system/haskell.scm | 5 +---- guix/build/haskell-build-system.scm | 12 +----------- 5 files changed, 15 insertions(+), 29 deletions(-) diff --git a/gnu/packages/haskell-check.scm b/gnu/packages/haskell-check.scm index 3174ac1a81..16b718827a 100644 --- a/gnu/packages/haskell-check.scm +++ b/gnu/packages/haskell-check.scm @@ -629,7 +629,7 @@ (define-public ghc-hunit (package (name "ghc-hunit") (version "1.6.2.0") - (outputs '("out" "static" "doc")) + (outputs '("out" "doc")) (source (origin (method url-fetch) diff --git a/gnu/packages/haskell-crypto.scm b/gnu/packages/haskell-crypto.scm index 0046e0481a..42e2a15709 100644 --- a/gnu/packages/haskell-crypto.scm +++ b/gnu/packages/haskell-crypto.scm @@ -141,7 +141,6 @@ (define-public ghc-crypto-api-tests "0w3j43jdrlj28jryp18hc6q84nkl2yf4vs1hhgrsk7gb9kfyqjpl")))) (build-system haskell-build-system) (properties '((upstream-name . "crypto-api-tests"))) - (outputs '("out" "static" "doc")) (inputs (list ghc-test-framework-quickcheck2 ghc-crypto-api ghc-cereal diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 6d7fd5dc63..3efde02932 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -1395,7 +1395,7 @@ (define-public ghc-case-insensitive (package (name "ghc-case-insensitive") (version "1.2.1.0") - (outputs '("out" "static" "doc")) + (outputs '("out" "doc")) (source (origin (method url-fetch) @@ -1993,7 +1993,7 @@ (define-public ghc-cmdargs "0xfabq187n1vqrnnm4ciprpl0dcjq97rksyjnpcniwva9rffmn7p")))) (build-system haskell-build-system) (properties '((upstream-name . "cmdargs"))) - (outputs '("out" "static" "doc")) + (outputs '("out" "doc")) (home-page "http://community.haskell.org/~ndm/cmdargs/") (synopsis "Command line argument processing") @@ -2171,7 +2171,7 @@ (define-public ghc-conduit "18izjgff4pmrknc8py06yvg3g6x27nx0rzmlwjxcflwm5v4szpw4")))) (build-system haskell-build-system) (properties '((upstream-name . "conduit"))) - (outputs '("out" "static" "doc")) + (outputs '("out" "doc")) (inputs (list ghc-exceptions ghc-lifted-base @@ -3855,7 +3855,7 @@ (define-public ghc-fgl (package (name "ghc-fgl") (version "5.7.0.3") - (outputs '("out" "static" "doc")) + (outputs '("out" "doc")) (source (origin (method url-fetch) @@ -4958,7 +4958,7 @@ (define-public ghc-haskell-src-exts "01bcrxs9af4yqpclw43aijmsd1g19qhyzb47blz7vzwz2r3k11b7")))) (build-system haskell-build-system) (properties '((upstream-name . "haskell-src-exts"))) - (outputs '("out" "static" "doc")) + (outputs '("out" "doc")) (inputs (list cpphs ghc-happy ghc-pretty-show)) (native-inputs @@ -6348,7 +6348,7 @@ (define-public ghc-lib-parser "1xh8rm5lwbh96g4v34whkcbb1yjsyvx3rwwycj30lrglhqk7f4c4")))) (build-system haskell-build-system) (properties '((upstream-name . "ghc-lib-parser"))) - (outputs '("out" "static" "doc")) ; documentation is 39M + (outputs '("out" "doc")) ; documentation is 39M (native-inputs (list ghc-alex ghc-happy)) (home-page "https://github.com/digital-asset/ghc-lib") (synopsis "The GHC API, decoupled from GHC versions") @@ -7313,7 +7313,7 @@ (define-public ghc-mono-traversable "1dvlp7r7r1lc3fxkwaz68f1nffg83240q8a989x24x1x67rj1clq")))) (build-system haskell-build-system) (properties '((upstream-name . "mono-traversable"))) - (outputs '("out" "static" "doc")) + (outputs '("out" "doc")) (inputs (list ghc-unordered-containers ghc-hashable ghc-vector ghc-vector-algorithms ghc-split)) (native-inputs (list ghc-hspec ghc-hunit ghc-quickcheck ghc-foldl)) @@ -8319,7 +8319,7 @@ (define-public ghc-parallel (package (name "ghc-parallel") (version "3.2.2.0") - (outputs '("out" "static" "doc")) + (outputs '("out" "doc")) (source (origin (method url-fetch) @@ -8479,7 +8479,7 @@ (define-public ghc-paths (package (name "ghc-paths") (version "0.1.0.12") - (outputs '("out" "static" "doc")) + (outputs '("out" "doc")) (source (origin (method url-fetch) @@ -9117,7 +9117,7 @@ (define-public ghc-profunctors "0an9v003ivxmjid0s51qznbjhd5fsa1dkcfsrhxllnjja1xmv5b5")))) (build-system haskell-build-system) (properties '((upstream-name . "profunctors"))) - (outputs '("out" "static" "doc")) + (outputs '("out" "doc")) (inputs (list ghc-base-orphans ghc-bifunctors @@ -11893,7 +11893,7 @@ (define-public ghc-tf-random (package (name "ghc-tf-random") (version "0.5") - (outputs '("out" "static" "doc")) + (outputs '("out" "doc")) (source (origin (method url-fetch) @@ -13161,7 +13161,7 @@ (define-public ghc-vector (package (name "ghc-vector") (version "0.12.3.1") - (outputs '("out" "static" "doc")) + (outputs '("out" "doc")) (source (origin (method url-fetch) diff --git a/guix/build-system/haskell.scm b/guix/build-system/haskell.scm index dc83512d30..a37b3a938c 100644 --- a/guix/build-system/haskell.scm +++ b/guix/build-system/haskell.scm @@ -109,10 +109,7 @@ (define (cabal-revision->origin cabal-revision) ,@(standard-packages))) (build-inputs `(("haskell" ,haskell) ,@native-inputs)) - ;; XXX: this is a hack to get around issue #41569. - (outputs (match outputs - (("out") (cons "static" outputs)) - (_ outputs))) + (outputs outputs) (build haskell-build) (arguments (substitute-keyword-arguments diff --git a/guix/build/haskell-build-system.scm b/guix/build/haskell-build-system.scm index 759d3c5d17..d77f55da19 100644 --- a/guix/build/haskell-build-system.scm +++ b/guix/build/haskell-build-system.scm @@ -129,17 +129,7 @@ (define* (build #:key parallel-build? #:allow-other-keys) (define* (install #:key outputs #:allow-other-keys) "Install a given Haskell package." - (run-setuphs "copy" '()) - (when (assoc-ref outputs "static") - (let ((static (assoc-ref outputs "static")) - (lib (or (assoc-ref outputs "lib") - (assoc-ref outputs "out")))) - (for-each (lambda (static-lib) - (let* ((subdir (string-drop static-lib (string-length lib))) - (new (string-append static subdir))) - (mkdir-p (dirname new)) - (rename-file static-lib new))) - (find-files lib "\\.a$"))))) + (run-setuphs "copy" '())) (define* (setup-compiler #:key system inputs outputs #:allow-other-keys) "Setup the compiler environment." From patchwork Sat Feb 11 10:08:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lars-Dominik Braun X-Patchwork-Id: 46827 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 529461661B; Sat, 11 Feb 2023 10:10:39 +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 056EE16615 for ; Sat, 11 Feb 2023 10:10:38 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pQmop-0004ss-KE; Sat, 11 Feb 2023 05:09:19 -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 1pQmok-0004or-Ud for guix-patches@gnu.org; Sat, 11 Feb 2023 05:09:15 -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 1pQmoe-0000AA-CC for guix-patches@gnu.org; Sat, 11 Feb 2023 05:09:11 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pQmoe-0004De-6A for guix-patches@gnu.org; Sat, 11 Feb 2023 05:09:08 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61420] [PATCH 20/31] gnu: ghc-9.2: Support static linking with glibc < 2.34. Resent-From: Lars-Dominik Braun Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 11 Feb 2023 10:09:08 +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.167611013816049 (code B ref 61420); Sat, 11 Feb 2023 10:09:08 +0000 Received: (at 61420) by debbugs.gnu.org; 11 Feb 2023 10:08:58 +0000 Received: from localhost ([127.0.0.1]:38886 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pQmoT-0004Ah-Qb for submit@debbugs.gnu.org; Sat, 11 Feb 2023 05:08:58 -0500 Received: from mout-p-201.mailbox.org ([80.241.56.171]:38656) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pQmoK-00046h-Hq for 61420@debbugs.gnu.org; Sat, 11 Feb 2023 05:08:50 -0500 Received: from smtp102.mailbox.org (smtp102.mailbox.org [IPv6:2001:67c:2050:b231:465::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 4PDRBx09Jcz9sW7; Sat, 11 Feb 2023 11:08:41 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=6xq.net; s=MBO0001; t=1676110121; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=mlMJEaqYJWb9Wl/e4GZ5Zog9fE/IFUQ8AF3PLEefDzY=; b=TMOkbRA5QBueqV0Rej8xSi9JfWblkPoR20LlB+fVgTnjYf8motCwjIVYjzOB7KrYWZNyrJ WCq1Uvm9Y1SqYJnGSK5gus5biXnhdSb7JeaP7WNBiEfG2izwyiUzyAIoK6hEpaf0MeH7hE cb0jpDIT2/A432NrFvX8+r4AvMe94SnIoqAdzeWu6a+nRPssgdtJeznJyt2DULVGLRo79F BrcbtCtEz58ohWQUihh0/mvcCGNmHt/Egb9ZRvoBYDIFqDcoRX2FTqw7/lF6p95ZxCeLGr 1a93wZ0H2zdz/Da12KOqX3qXtR0kRdSBTspdXlRah79yJppd5+gNccaWK5uqLg== From: Lars-Dominik Braun Date: Sat, 11 Feb 2023 11:08:14 +0100 Message-Id: <20230211100825.47971-17-lars@6xq.net> In-Reply-To: <20230211100825.47971-1-lars@6xq.net> References: <20230211100825.47971-1-lars@6xq.net> MIME-Version: 1.0 X-Rspamd-Queue-Id: 4PDRBx09Jcz9sW7 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 * 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. --- gnu/local.mk | 1 + gnu/packages/haskell.scm | 3 +- .../ghc-9.2-glibc-2.33-link-order.patch | 35 +++++++++++++++++++ 3 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/ghc-9.2-glibc-2.33-link-order.patch diff --git a/gnu/local.mk b/gnu/local.mk index b6b44f7836..5cb34a7b3b 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1195,6 +1195,7 @@ dist_patch_DATA = \ %D%/packages/patches/genimage-mke2fs-test.patch \ %D%/packages/patches/geoclue-config.patch \ %D%/packages/patches/ghc-8.0-fall-back-to-madv_dontneed.patch \ + %D%/packages/patches/ghc-9.2-glibc-2.33-link-order.patch \ %D%/packages/patches/ghc-testsuite-dlopen-pie.patch \ %D%/packages/patches/ghc-bloomfilter-ghc9.2.patch \ %D%/packages/patches/ghc-bytestring-handle-ghc9.patch \ diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 60d846e841..a2815814ed 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -1286,7 +1286,8 @@ (define-public ghc-9.2 "/ghc-" version "-src.tar.xz")) (sha256 (base32 - "07028i0hm74svvq9b3jpkczaj6lsdgn3hgr4wa7diqiq3dypj1h6")))) + "07028i0hm74svvq9b3jpkczaj6lsdgn3hgr4wa7diqiq3dypj1h6")) + (patches (search-patches "ghc-9.2-glibc-2.33-link-order.patch")))) (arguments (substitute-keyword-arguments (package-arguments base) ((#:phases phases '%standard-phases) diff --git a/gnu/packages/patches/ghc-9.2-glibc-2.33-link-order.patch b/gnu/packages/patches/ghc-9.2-glibc-2.33-link-order.patch new file mode 100644 index 0000000000..5d4afa28c1 --- /dev/null +++ b/gnu/packages/patches/ghc-9.2-glibc-2.33-link-order.patch @@ -0,0 +1,35 @@ +Slightly modified version of +https://gitlab.haskell.org/ghc/ghc/-/issues/19029#note_447989, required +for older, buggy glibc versions < 2.34. + +diff -Naur ghc-9.2.5/compiler/GHC/Linker/Unit.hs ghc-9.2.5.patched/compiler/GHC/Linker/Unit.hs +--- ghc-9.2.5/compiler/GHC/Linker/Unit.hs 2022-11-06 20:40:29.000000000 +0100 ++++ ghc-9.2.5.patched/compiler/GHC/Linker/Unit.hs 2023-01-15 14:52:57.511275338 +0100 +@@ -31,11 +31,26 @@ + ps <- mayThrowUnitErr $ preloadUnitsInfo' unit_env pkgs + return (collectLinkOpts dflags ps) + ++fixOrderLinkOpts :: [String] -> [String] ++fixOrderLinkOpts opts ++ | have_bad_glibc_version -- glibc version strictly less than 2.34 ++ , let (before, rest) = break (== libc) opts ++ , not (pthread `elem` before) ++ , pthread `elem` rest -- optional if we know pthread is definitely present ++ = before ++ pthread_and_deps ++ rest ++ | otherwise ++ = opts ++ where ++ pthread = "-lpthread" ++ libc = "-lc" ++ pthread_and_deps = [ "-lrt", pthread ] -- should depend on the environment ++ have_bad_glibc_version = True ++ + collectLinkOpts :: DynFlags -> [UnitInfo] -> ([String], [String], [String]) + collectLinkOpts dflags ps = + ( + concatMap (map ("-l" ++) . unitHsLibs (ghcNameVersion dflags) (ways dflags)) ps, +- concatMap (map ("-l" ++) . map ST.unpack . unitExtDepLibsSys) ps, ++ fixOrderLinkOpts $ concatMap (map ("-l" ++) . map ST.unpack . unitExtDepLibsSys) ps, + concatMap (map ST.unpack . unitLinkerOptions) ps + ) + From patchwork Sat Feb 11 10:08:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lars-Dominik Braun X-Patchwork-Id: 46816 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 4582E1661A; Sat, 11 Feb 2023 10:09:51 +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 8B2BC165B0 for ; Sat, 11 Feb 2023 10:09:50 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pQmop-0004su-Mv; Sat, 11 Feb 2023 05:09:19 -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 1pQmok-0004oq-UV for guix-patches@gnu.org; Sat, 11 Feb 2023 05:09:15 -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 1pQmoe-0000A5-0Q for guix-patches@gnu.org; Sat, 11 Feb 2023 05:09:11 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pQmod-0004DX-QL for guix-patches@gnu.org; Sat, 11 Feb 2023 05:09:07 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61420] [PATCH 21/31] gnu: ghc-lua: Disable symbol export. Resent-From: Lars-Dominik Braun Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 11 Feb 2023 10:09:07 +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.167611013816042 (code B ref 61420); Sat, 11 Feb 2023 10:09:07 +0000 Received: (at 61420) by debbugs.gnu.org; 11 Feb 2023 10:08:58 +0000 Received: from localhost ([127.0.0.1]:38884 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pQmoT-0004Aa-GV for submit@debbugs.gnu.org; Sat, 11 Feb 2023 05:08:57 -0500 Received: from mout-p-102.mailbox.org ([80.241.56.152]:57644) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pQmoK-00046i-NT for 61420@debbugs.gnu.org; Sat, 11 Feb 2023 05:08:49 -0500 Received: from smtp102.mailbox.org (smtp102.mailbox.org [IPv6:2001:67c:2050:b231:465::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-102.mailbox.org (Postfix) with ESMTPS id 4PDRBx2Fysz9srW; Sat, 11 Feb 2023 11:08:41 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=6xq.net; s=MBO0001; t=1676110121; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=90xsxEwJvxzhFBp6YsJFia2zP25R4VRsKU4WV2rw0t8=; b=BDNuN4DqVWNktNmRHp/zUPVqWniogbdFV3mukaqV1HsIyZWyI0zNbxGxJSVJLUxKzRQQ4r WJ9wGinZU8gpZN7+ty1ng3UvTxhR7/UXluItw76MuQamZVv0+ZLm8myCEVYGPAvJsMYHGq qlacxHJ7ceHCAfVfi2PrM863AUVMV2DO7ba4wWJoWvwKnyQW1YkhuvAgcLemOm+kqcosZc ggieCblM4mxTVvwnnQU6HJQd8FRsL9owSzNt8a/kqaQ/EYwkPL52rrHlczaNXaVDpGp7jT /sJGd2fQuXuS/yTipXZ3iRoL5BvbPqBdex864dCbZj/izrY0yu4JOjjDgU8p8A== From: Lars-Dominik Braun Date: Sat, 11 Feb 2023 11:08:15 +0100 Message-Id: <20230211100825.47971-18-lars@6xq.net> In-Reply-To: <20230211100825.47971-1-lars@6xq.net> References: <20230211100825.47971-1-lars@6xq.net> MIME-Version: 1.0 X-Rspamd-Queue-Id: 4PDRBx2Fysz9srW 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 This turns on the linker flag -Wl,-E for all libraries depending on it, resulting in large binaries, because --gc-sections cannot clean exported symbols. * gnu/packages/haskell-xyz.scm (ghc-lua)[arguments]: Disable export-dynamic feature. --- gnu/packages/haskell-xyz.scm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 3efde02932..0a6efedd29 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -15452,6 +15452,9 @@ (define-public ghc-lua "07wni3ji46ndqabwffgwzij2jk34dq2d66z15hcd6jg33sqnym45")))) (build-system haskell-build-system) (properties '((upstream-name . "lua"))) + (arguments + ;; Allow creating fully static binaries. Avoids issues with linking pandoc statically. + `(#:configure-flags (list "-f-export-dynamic"))) (native-inputs (list ghc-tasty ghc-tasty-hunit)) (home-page "https://hslua.org/") (synopsis "Lua, an embeddable scripting language") From patchwork Sat Feb 11 10:08:16 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: 46814 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 D31A9165F0; Sat, 11 Feb 2023 10:09:42 +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 EF47D16615 for ; Sat, 11 Feb 2023 10:09:40 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pQmoo-0004sV-Kq; Sat, 11 Feb 2023 05:09:18 -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 1pQmol-0004ox-22 for guix-patches@gnu.org; Sat, 11 Feb 2023 05:09:15 -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 1pQmoe-0000AB-O8 for guix-patches@gnu.org; Sat, 11 Feb 2023 05:09:11 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pQmoe-0004Dm-KH for guix-patches@gnu.org; Sat, 11 Feb 2023 05:09:08 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61420] [PATCH 22/31] build: haskell-build-system: Build static executables by default. Resent-From: Lars-Dominik Braun Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 11 Feb 2023 10:09:08 +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.167611013816057 (code B ref 61420); Sat, 11 Feb 2023 10:09:08 +0000 Received: (at 61420) by debbugs.gnu.org; 11 Feb 2023 10:08:58 +0000 Received: from localhost ([127.0.0.1]:38888 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pQmoU-0004Ap-B7 for submit@debbugs.gnu.org; Sat, 11 Feb 2023 05:08:58 -0500 Received: from mout-p-103.mailbox.org ([80.241.56.161]:53348) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pQmoL-00046j-4F for 61420@debbugs.gnu.org; Sat, 11 Feb 2023 05:08:50 -0500 Received: from smtp102.mailbox.org (smtp102.mailbox.org [IPv6:2001:67c:2050:b231:465::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-103.mailbox.org (Postfix) with ESMTPS id 4PDRBx4wWXz9slG; Sat, 11 Feb 2023 11:08:41 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=6xq.net; s=MBO0001; t=1676110121; 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=I/FQ9gxKYgIRObk7g/M3lPyJnAgHYZRSVC7lutAmKwg=; b=kTRU5WQqAXYTUy7GNw/WewtQsAlRRiqA4AJoCkF2Rp79tDPeiiFWSSK7aYkYECwa4xr9iq RY9X772ojcfF8Xh6y4spPC2zxJrl3VqU7cC/8MYX96Le5JSDIj+bls+H8n+99cY0Lc+dMe dUX+NmTWCQIgGk8KgpNmvuv/4WPYHkZBhl63apEO92E0VZN7neO7dThLGfbCIb5zeVi7r+ tbBtNXkthe5MQe9rl/Rf1ZRRc8AU808B6rN/NLAkgMjZx7SNWhdanQVS3FoTyUQL10+U61 uRz6SnK4KHRvKDpyg/Y6AGK3FV4w2bcr5wuYYuStECAMRebNP+xWofHgEeh2Hw== From: Lars-Dominik Braun Date: Sat, 11 Feb 2023 11:08:16 +0100 Message-Id: <20230211100825.47971-19-lars@6xq.net> In-Reply-To: <20230211100825.47971-1-lars@6xq.net> References: <20230211100825.47971-1-lars@6xq.net> MIME-Version: 1.0 X-Rspamd-Queue-Id: 4PDRBx4wWXz9slG 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 This is the only way to get reasonably small binaries that don’t pull in a ton of ghc-* packages. * guix/build/haskell-build-system.scm (configure): Explicitly add --enable-static and --disable-executable-dynamic, as well as -split-sections to configure flags. --- guix/build/haskell-build-system.scm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/guix/build/haskell-build-system.scm b/guix/build/haskell-build-system.scm index d77f55da19..0e94cf59a5 100644 --- a/guix/build/haskell-build-system.scm +++ b/guix/build/haskell-build-system.scm @@ -99,10 +99,14 @@ (define* (configure #:key outputs inputs tests? (configure-flags '()) ,@(if tests? '("--enable-tests") '()) - ;; Build and link with shared libraries + ;; Build static and shared libraries. "--enable-shared" - "--enable-executable-dynamic" + "--enable-static" + ;; Link executables statically by default. + "--disable-executable-dynamic" "--ghc-option=-fPIC" + ;; Ensure static libraries can be used with -Wl,--gc-sections for size. + "--ghc-option=-split-sections" ,@configure-flags))) ;; Cabal errors if GHC_PACKAGE_PATH is set during 'configure', so unset ;; and restore it. From patchwork Sat Feb 11 10:08:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lars-Dominik Braun X-Patchwork-Id: 46833 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 D222C1661D; Sat, 11 Feb 2023 10:11:13 +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=unavailable 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 0F9DD165B0 for ; Sat, 11 Feb 2023 10:11:12 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pQmot-0004vr-Ey; Sat, 11 Feb 2023 05:09:23 -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 1pQmok-0004ov-Vr for guix-patches@gnu.org; Sat, 11 Feb 2023 05:09:15 -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 1pQmof-0000AH-TO for guix-patches@gnu.org; Sat, 11 Feb 2023 05:09:11 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pQmof-0004E8-PF for guix-patches@gnu.org; Sat, 11 Feb 2023 05:09:09 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61420] [PATCH 23/31] gnu: ngless: Drop Haskell libraries and documentation. Resent-From: Lars-Dominik Braun Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 11 Feb 2023 10:09:09 +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.167611014016079 (code B ref 61420); Sat, 11 Feb 2023 10:09:09 +0000 Received: (at 61420) by debbugs.gnu.org; 11 Feb 2023 10:09:00 +0000 Received: from localhost ([127.0.0.1]:38894 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pQmoW-0004BB-0z for submit@debbugs.gnu.org; Sat, 11 Feb 2023 05:09:00 -0500 Received: from mout-p-202.mailbox.org ([80.241.56.172]:34020) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pQmoL-00046m-Dp for 61420@debbugs.gnu.org; Sat, 11 Feb 2023 05:08:50 -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-202.mailbox.org (Postfix) with ESMTPS id 4PDRBx6zYCz9sWt; Sat, 11 Feb 2023 11:08:41 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=6xq.net; s=MBO0001; t=1676110121; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=bsBkgIcuvltXORaJ9J0ImM3NpTGufXmDltfsgJvvc/E=; b=l/8sGXWqcFldOjBPF35fwDzWAE4yDvnUqNBA/C8JN77SfnR/7nmBbrJW1rD06/V8ViMq4T EU8pNLv/ySHdy3GgaF/ei0LTSZN3f3xTCP54wMVeRL4aNz+CwbT8sF027FzMC3nh54APam oRauEV7yebGOzglkAZlyUCtp5vLcbGv96ZvA/yy5DigIV/eCPTl63otYU814MWmm2o9dyz QgVCdF7FLUpvEaB54YDdPESXNp3BP5A6zD2w4aJFHX3j/Q1IuT0Y8pxIYnpiOiEUd4TfjW P2EDRv7ZPLZv97alImqFjnqhcv6jpoy27LEnPRv2+lLL+k/KczTo6OTs1GW5pA== From: Lars-Dominik Braun Date: Sat, 11 Feb 2023 11:08:17 +0100 Message-Id: <20230211100825.47971-20-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 * gnu/packages/bioinformatics.scm (ngless)[arguments]: Add 'remove-libraries phase and disable #:haddock?. --- gnu/packages/bioinformatics.scm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 3e2d1efc87..8eb164d24b 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -14316,7 +14316,8 @@ (define-public ngless "0pljyrlpr9r3cl5311dhgxdl8y40szyi4vprn34i3piy0qrldymi")))) (build-system haskell-build-system) (arguments - `(#:phases + `(#:haddock? #f + #:phases (modify-phases %standard-phases (add-before 'configure 'update-constraints (lambda _ @@ -14360,7 +14361,10 @@ (define-public ngless (add-after 'wrap-program 'check-install (lambda* (#:key outputs #:allow-other-keys) (let* ((ngless (string-append (assoc-ref outputs "out") "/bin/ngless"))) - (invoke ngless "--check-install"))))))) + (invoke ngless "--check-install")))) + (add-after 'register 'remove-libraries + (lambda* (#:key outputs #:allow-other-keys) + (delete-file-recursively (string-append (assoc-ref outputs "out") "/lib"))))))) (inputs (list prodigal bwa samtools From patchwork Sat Feb 11 10:08:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lars-Dominik Braun X-Patchwork-Id: 46837 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 896E116615; Sat, 11 Feb 2023 10:17:33 +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=unavailable 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 450A4165F0 for ; Sat, 11 Feb 2023 10:17:31 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pQmwK-0000L9-Jy; Sat, 11 Feb 2023 05:17:04 -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 1pQmwJ-0000KU-0k for guix-patches@gnu.org; Sat, 11 Feb 2023 05:17:03 -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 1pQmwI-0002K3-OF for guix-patches@gnu.org; Sat, 11 Feb 2023 05:17:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pQmwI-0004T2-JV for guix-patches@gnu.org; Sat, 11 Feb 2023 05:17:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61420] [PATCH 24/31] gnu: hledger: Drop Haskell libraries and documentation. Resent-From: Lars-Dominik Braun Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 11 Feb 2023 10:17: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.167611061817152 (code B ref 61420); Sat, 11 Feb 2023 10:17:02 +0000 Received: (at 61420) by debbugs.gnu.org; 11 Feb 2023 10:16:58 +0000 Received: from localhost ([127.0.0.1]:38952 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pQmwE-0004SZ-34 for submit@debbugs.gnu.org; Sat, 11 Feb 2023 05:16:58 -0500 Received: from mout-p-201.mailbox.org ([80.241.56.171]:55806) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pQmwC-0004SN-CP for 61420@debbugs.gnu.org; Sat, 11 Feb 2023 05:16:56 -0500 Received: from smtp102.mailbox.org (smtp102.mailbox.org [IPv6:2001:67c:2050:b231:465::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 4PDRBy2BX5z9sd9; Sat, 11 Feb 2023 11:08:42 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=6xq.net; s=MBO0001; t=1676110122; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=kQw6FCWTObduOlCz9HProApBD7ZU1ri+W8XCo7x7Qjw=; b=CkvWWcrcpgY1KDWeiCzOxH63xY+4JB3mMGh7AIbWq2h+ZAszWaoBHLWlDhyNiCZuSWNx29 5HpRcnmnvS+OelYsWv8uU1NEdYtYzalNJuFBn1APy/9fWPjzTbY/LoLgK2kbeCdkhXzgdb cHnfYivyeotZ1Wpnv1ik3CUTQNzK1+rnQ9Tm8goL3MR763bDT9sxyYRkHGqYK8T8TP3qa3 PPFC8bEXYdWxTt2oEXrMGZrrsXOVrrTX//yYDhkD3b1Wm2/M9un6oyqLRpQ+jsdZMBVkAR zwNC6WainmtoLgcjDW5jVLvjICV7hfI7vpLY8HSh/AtJMEwyv7JanCdoNMeHtg== From: Lars-Dominik Braun Date: Sat, 11 Feb 2023 11:08:18 +0100 Message-Id: <20230211100825.47971-21-lars@6xq.net> In-Reply-To: <20230211100825.47971-1-lars@6xq.net> References: <20230211100825.47971-1-lars@6xq.net> MIME-Version: 1.0 X-Rspamd-Queue-Id: 4PDRBy2BX5z9sd9 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 * gnu/packages/finance.scm (ghc-hledger): New variable. (hledger): Inherit from ghc-hledger and add 'remove-libraries phase and disable #:haddock?. --- gnu/packages/finance.scm | 48 ++++++++++++++++++++++++++-------------- 1 file changed, 31 insertions(+), 17 deletions(-) diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index d04cf465f4..28f9f67595 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -212,9 +212,9 @@ (define-public bitcoin-core-23.0 (define-public bitcoin-core bitcoin-core-23.0) -(define-public hledger +(define-public ghc-hledger (package - (name "hledger") + (name "ghc-hledger") (version "1.27.1") (source (origin (method url-fetch) @@ -223,14 +223,6 @@ (define-public hledger (base32 "0qdg87m7ys2ykqqq32p7h7aw827w4f5bcqx4dspxxq6zqlvzddqb")))) (build-system haskell-build-system) - (arguments - (list - #:phases - #~(modify-phases %standard-phases - (add-after 'install 'install-doc - (lambda _ - (install-file "hledger.info" (string-append #$output "/share/info")) - (install-file "hledger.1" (string-append #$output "/man/man1"))))))) (properties '((upstream-name . "hledger"))) (inputs (list ghc-decimal ghc-diff @@ -273,6 +265,23 @@ (define-public hledger Accounting.") (license license:gpl3))) +(define-public hledger + (package + (inherit ghc-hledger) + (name "hledger") + (arguments + (list + #:haddock? #f + #:phases + #~(modify-phases %standard-phases + (add-after 'install 'install-doc + (lambda _ + (install-file "hledger.info" (string-append #$output "/share/info")) + (install-file "hledger.1" (string-append #$output "/man/man1")))) + (add-after 'register 'remove-libraries + (lambda* (#:key outputs #:allow-other-keys) + (delete-file-recursively (string-append (assoc-ref outputs "out") "/lib"))))))))) + (define-public homebank (package (name "homebank") @@ -1988,7 +1997,7 @@ (define-public hledger-web ghc-data-default ghc-extra ghc-hjsmin - hledger + ghc-hledger ghc-hledger-lib ghc-hspec ghc-http-client @@ -2012,12 +2021,17 @@ (define-public hledger-web ghc-yesod-static ghc-yesod-test)) (arguments - (list #:phases - #~(modify-phases %standard-phases - ;; Tests write to $HOME. - (add-before 'check 'set-home - (lambda _ - (setenv "HOME" "/tmp")))))) + (list + #:haddock? #f + #:phases + #~(modify-phases %standard-phases + ;; Tests write to $HOME. + (add-before 'check 'set-home + (lambda _ + (setenv "HOME" "/tmp"))) + (add-after 'register 'remove-libraries + (lambda* (#:key outputs #:allow-other-keys) + (delete-file-recursively (string-append (assoc-ref outputs "out") "/lib"))))))) (home-page "http://hledger.org") (synopsis "Web-based user interface for the hledger accounting system") (description From patchwork Sat Feb 11 10:08:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lars-Dominik Braun X-Patchwork-Id: 46838 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 A086C1661A; Sat, 11 Feb 2023 10:18:16 +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 21DAB165B0 for ; Sat, 11 Feb 2023 10:18:16 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pQmxO-00018H-6b; Sat, 11 Feb 2023 05:18:10 -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 1pQmxH-000177-2s for guix-patches@gnu.org; Sat, 11 Feb 2023 05:18:05 -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 1pQmxG-0002So-A0 for guix-patches@gnu.org; Sat, 11 Feb 2023 05:18:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pQmxG-0004Uq-0j for guix-patches@gnu.org; Sat, 11 Feb 2023 05:18:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61420] [PATCH 25/31] gnu: darcs: Drop Haskell libraries and documentation. Resent-From: Lars-Dominik Braun Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 11 Feb 2023 10:18:01 +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.167611064517232 (code B ref 61420); Sat, 11 Feb 2023 10:18:01 +0000 Received: (at 61420) by debbugs.gnu.org; 11 Feb 2023 10:17:25 +0000 Received: from localhost ([127.0.0.1]:38960 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pQmwe-0004Tr-Ko for submit@debbugs.gnu.org; Sat, 11 Feb 2023 05:17:24 -0500 Received: from mout-p-103.mailbox.org ([80.241.56.161]:42968) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pQmwc-0004TY-N8 for 61420@debbugs.gnu.org; Sat, 11 Feb 2023 05:17:23 -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-103.mailbox.org (Postfix) with ESMTPS id 4PDRBy4Vxmz9slP; Sat, 11 Feb 2023 11:08:42 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=6xq.net; s=MBO0001; t=1676110122; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=MN+qtei4QUNG7oU3X4qlIlFBvSE1Q2qyi2outINtH3I=; b=MrMRoj4Qm0oj6xrBOx1g49kAEmMUJMwiYWR7kCcRiPVmR4AlMI9Il/zv5mknANIbBUHKTm rdmlwLtMxaN/gg2uQ+RcAzGnGZM6LOsSjvbrFviz4juE79IYu6xaHeneLfFPjQ4rLz9VMu i4iCRCboWQZ1Wnm153d2UXjslTTXd1syVo1nxv0A8YF/qIh0AJFPRHfFRwqArkS3eKq8F0 sec31ys5R4+nqjJM2PGF9Iyssvd5zgFwd5V94TdGmAkedEDMnceCXRk8POIo6sS5Ss+2Cm pvLrmfBDSKCqyHR03V9yBHThrOZKWDs8IwmzBzF02OSglduur2GaG5AYoeyOBw== From: Lars-Dominik Braun Date: Sat, 11 Feb 2023 11:08:19 +0100 Message-Id: <20230211100825.47971-22-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 * gnu/packages/haskell-apps.scm (darcs)[arguments]: Add 'remove-libraries phase and disable #:haddock?. --- gnu/packages/haskell-apps.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/gnu/packages/haskell-apps.scm b/gnu/packages/haskell-apps.scm index 3cae64a42e..7189d82ec1 100644 --- a/gnu/packages/haskell-apps.scm +++ b/gnu/packages/haskell-apps.scm @@ -187,6 +187,7 @@ (define-public darcs #:configure-flags '("-fpkgconfig" "-fcurl" "-flibiconv" "-fthreaded" "-fnetwork-uri" "-fhttp" "--flag=executable" "--flag=library") + #:haddock? #f #:phases (modify-phases %standard-phases (add-after 'patch-source-shebangs 'patch-sh @@ -198,7 +199,10 @@ (define-public darcs (lambda _ (substitute* "darcs.cabal" (("(attoparsec|base|bytestring|constraints|cryptonite|hashable|memory|regex-tdfa|time)\\s+[^,]+" all dep) - dep))))))) + dep)))) + (add-after 'register 'remove-libraries + (lambda* (#:key outputs #:allow-other-keys) + (delete-file-recursively (string-append (assoc-ref outputs "out") "/lib"))))))) (inputs (list ghc-regex-base ghc-regex-tdfa ghc-regex-applicative From patchwork Sat Feb 11 10:08:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lars-Dominik Braun X-Patchwork-Id: 46810 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 0FCB61661A; Sat, 11 Feb 2023 10:09:26 +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 DBA54165B0 for ; Sat, 11 Feb 2023 10:09:24 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pQmop-0004tO-Ve; Sat, 11 Feb 2023 05:09:19 -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 1pQmol-0004pZ-FJ for guix-patches@gnu.org; Sat, 11 Feb 2023 05:09:15 -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 1pQmog-0000AN-9C for guix-patches@gnu.org; Sat, 11 Feb 2023 05:09:13 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pQmog-0004EG-5b for guix-patches@gnu.org; Sat, 11 Feb 2023 05:09:10 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61420] [PATCH 26/31] gnu: git-annex: Drop Haskell documentation. Resent-From: Lars-Dominik Braun Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 11 Feb 2023 10:09:10 +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.167611014016086 (code B ref 61420); Sat, 11 Feb 2023 10:09:10 +0000 Received: (at 61420) by debbugs.gnu.org; 11 Feb 2023 10:09:00 +0000 Received: from localhost ([127.0.0.1]:38896 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pQmoW-0004BI-An for submit@debbugs.gnu.org; Sat, 11 Feb 2023 05:09:00 -0500 Received: from mout-p-101.mailbox.org ([80.241.56.151]:59356) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pQmoM-00046s-CC for 61420@debbugs.gnu.org; Sat, 11 Feb 2023 05:08:51 -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-101.mailbox.org (Postfix) with ESMTPS id 4PDRBy6bCtz9scW; Sat, 11 Feb 2023 11:08:42 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=6xq.net; s=MBO0001; t=1676110122; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=2a2TadFSi5sGlwmWUokLhDGAn0eoJzYmXMHXUf8Q8lU=; b=W2WVanP9ZG2Z1draRnkoFIGPG9+hwyQR5eg4/w1iAVl9j5+GMppYJ6YZSagLbLnl2qtd5v wBy1XgLGqEItFz968xyL26h5Zd2hsylYKEfCSQHFf8q7p49AJGMeeE+0Pyaet85i73YaBF uHXcFZZZZi++K+lgWVTCDghDX38ZVs70yTLhDmnfvMtvk0Z0VacgOK2dfnX9hc20OPL9UF lUueO/8zBrJmJzwT3sgbo5MZv4M65co0/zSBQ1i77Amj60TnPI7rFz0mENRrVlaFbrCVTw 09SMkq8/pXFI4h/sTCEgKpAkaeZVA9AY7u061uHNndJS05lsXWBCddMRMradaw== From: Lars-Dominik Braun Date: Sat, 11 Feb 2023 11:08:20 +0100 Message-Id: <20230211100825.47971-23-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 * gnu/packages/haskell-apps.scm (git-annex)[arguments]: Disable #:haddock?. --- gnu/packages/haskell-apps.scm | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/gnu/packages/haskell-apps.scm b/gnu/packages/haskell-apps.scm index 7189d82ec1..80abc99cb1 100644 --- a/gnu/packages/haskell-apps.scm +++ b/gnu/packages/haskell-apps.scm @@ -306,6 +306,7 @@ (define-public git-annex (arguments `(#:configure-flags '("--flags=-Android -Webapp") + #:haddock? #f #:phases (modify-phases %standard-phases (add-before 'configure 'patch-shell-for-tests @@ -386,17 +387,7 @@ (define-public git-annex (symlink (string-append bin "/git-annex") (string-append bin "/git-annex-shell")) (symlink (string-append bin "/git-annex") - (string-append bin "/git-remote-tor-annex"))))) - (add-after 'install 'touch-static-output - (lambda* (#:key outputs #:allow-other-keys) - ;; The Haskell build system adds a "static" output by - ;; default, and there is no way to override this until - ;; is fixed. Without - ;; this phase, the daemon complains because we do not - ;; create the "static" output. - (with-output-to-file (assoc-ref outputs "static") - (lambda () - (display "static output not used\n")))))))) + (string-append bin "/git-remote-tor-annex")))))))) (inputs (list curl ghc-aeson From patchwork Sat Feb 11 10:08:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lars-Dominik Braun X-Patchwork-Id: 46836 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 E83D01661A; Sat, 11 Feb 2023 10:16:24 +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 6668A165F0 for ; Sat, 11 Feb 2023 10:16:24 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pQmvL-0000BE-MX; Sat, 11 Feb 2023 05:16:03 -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 1pQmvK-0000AK-Ew for guix-patches@gnu.org; Sat, 11 Feb 2023 05:16:02 -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 1pQmvK-000278-6F for guix-patches@gnu.org; Sat, 11 Feb 2023 05:16:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pQmvJ-0004Qg-Op for guix-patches@gnu.org; Sat, 11 Feb 2023 05:16:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61420] [PATCH 27/31] gnu: shellcheck: Drop Haskell libraries. Resent-From: Lars-Dominik Braun Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 11 Feb 2023 10:16:01 +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.167611053116987 (code B ref 61420); Sat, 11 Feb 2023 10:16:01 +0000 Received: (at 61420) by debbugs.gnu.org; 11 Feb 2023 10:15:31 +0000 Received: from localhost ([127.0.0.1]:38944 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pQmup-0004Pv-Bx for submit@debbugs.gnu.org; Sat, 11 Feb 2023 05:15:31 -0500 Received: from mout-p-101.mailbox.org ([80.241.56.151]:36506) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pQmum-0004Pg-Kb for 61420@debbugs.gnu.org; Sat, 11 Feb 2023 05:15:29 -0500 Received: from smtp102.mailbox.org (smtp102.mailbox.org [IPv6:2001:67c:2050:b231:465::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-101.mailbox.org (Postfix) with ESMTPS id 4PDRBz1tn9z9scT; Sat, 11 Feb 2023 11:08:43 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=6xq.net; s=MBO0001; t=1676110123; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=aKfVqx7hdca9CXA+1BJcMrR2QMmE2qzAAMnEydhsSIE=; b=QeIKVdzfHEpktcBeUw2xjAVA8BvxPk4hEQeJn74gHxZatS8JK7CQutkL7MSR68/H1LbtTS 8qzzK4vHphXDXUNNWvOaZbfcUNsn9fl/6y8AiIywetAdTuKaQrJ84TZ3KvvPyexI3uiawm 83n+lPp8YFp0NUlS6R2GVarayeFyECNs6oSNHR+UNKONgCBzWEKtUp56MTSsWBRUHsT5kO +aIdnCMzn1YH2bflasHgdBiYdnbWQQRB1vcftzQGlntspflxmfbeeBr3QGbXB72rb5h3ji Ca1aVx2IvxPjOSkBKathsh+t9GLZQD2rTR9WoH94XFX4SyA0qTjzrR7dNtwUUQ== From: Lars-Dominik Braun Date: Sat, 11 Feb 2023 11:08:21 +0100 Message-Id: <20230211100825.47971-24-lars@6xq.net> In-Reply-To: <20230211100825.47971-1-lars@6xq.net> References: <20230211100825.47971-1-lars@6xq.net> MIME-Version: 1.0 X-Rspamd-Queue-Id: 4PDRBz1tn9z9scT 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 * gnu/packages/haskell-apps.scm (shellcheck)[arguments]: Add 'remove-libraries phase. --- gnu/packages/haskell-apps.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnu/packages/haskell-apps.scm b/gnu/packages/haskell-apps.scm index 80abc99cb1..35e369df3f 100644 --- a/gnu/packages/haskell-apps.scm +++ b/gnu/packages/haskell-apps.scm @@ -836,7 +836,10 @@ (define-public shellcheck (lambda* (#:key outputs #:allow-other-keys) (install-file "shellcheck.1" (string-append (assoc-ref outputs "out") - "/share/man/man1/"))))))) + "/share/man/man1/")))) + (add-after 'register 'remove-libraries + (lambda* (#:key outputs #:allow-other-keys) + (delete-file-recursively (string-append (assoc-ref outputs "out") "/lib"))))))) (native-inputs (list pandoc)) (inputs From patchwork Sat Feb 11 10:08:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lars-Dominik Braun X-Patchwork-Id: 46839 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 818D616615; Sat, 11 Feb 2023 10:18:30 +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=unavailable 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 BCC4D165B0 for ; Sat, 11 Feb 2023 10:18:28 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pQmxP-00018T-Fx; Sat, 11 Feb 2023 05:18:12 -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 1pQmxH-000176-2c for guix-patches@gnu.org; Sat, 11 Feb 2023 05:18:05 -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 1pQmxG-0002Sp-GO for guix-patches@gnu.org; Sat, 11 Feb 2023 05:18:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pQmxG-0004Uy-Bz for guix-patches@gnu.org; Sat, 11 Feb 2023 05:18:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61420] [PATCH 28/31] gnu: pandoc: Drop Haskell libraries and documentation. Resent-From: Lars-Dominik Braun Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 11 Feb 2023 10:18: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.167611064517240 (code B ref 61420); Sat, 11 Feb 2023 10:18:02 +0000 Received: (at 61420) by debbugs.gnu.org; 11 Feb 2023 10:17:25 +0000 Received: from localhost ([127.0.0.1]:38962 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pQmwe-0004Tt-Th for submit@debbugs.gnu.org; Sat, 11 Feb 2023 05:17:25 -0500 Received: from mout-p-103.mailbox.org ([80.241.56.161]:42976) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pQmwc-0004TZ-NP for 61420@debbugs.gnu.org; Sat, 11 Feb 2023 05:17:23 -0500 Received: from smtp102.mailbox.org (smtp102.mailbox.org [IPv6:2001:67c:2050:b231:465::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-103.mailbox.org (Postfix) with ESMTPS id 4PDRBz4gj2z9slW; Sat, 11 Feb 2023 11:08:43 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=6xq.net; s=MBO0001; t=1676110123; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=83Brfhr0qs17FyY93NykLUeSj4gSxoATRCABNNcGJ9k=; b=IE0pDH+2ygh0/BGBpsIpeXO93X+4BJ3FC8W7dOjYRq7iDvHqs0PlKg+00XjLOWK1jAZ3aB aE+EVJQHnnlj5WzcsDiKejy9YVsI+zacmpywjS2p/3sjOvoXKxGkvFpCppteIH53tGfmNd CbDwpIT1B7/6do8ngsgaVTOPkWvz2wyiWvtLm2zlb575IK7Rt8qTWdf9H5cjMV/+f9j8R0 pCUMLSNuWJ8neshGhdZnL++cGgv0J1+rhWEMPG/NkbHtk7NZkt1Zys8PHEqiSfsGAMLcFE f1ZAgk8KmoNd+zNGIyE7DC8EqddX5ZgxLAoguHL5oI22LDWkHmA7nijy74IE9g== From: Lars-Dominik Braun Date: Sat, 11 Feb 2023 11:08:22 +0100 Message-Id: <20230211100825.47971-25-lars@6xq.net> In-Reply-To: <20230211100825.47971-1-lars@6xq.net> References: <20230211100825.47971-1-lars@6xq.net> MIME-Version: 1.0 X-Rspamd-Queue-Id: 4PDRBz4gj2z9slW 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 * gnu/packages/haskell-xyz.scm (ghc-pandoc): Renamed from pandoc. (pandoc) [arguments]: Add 'remove-libraries phase and disable #:haddock?. --- gnu/packages/haskell-xyz.scm | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 0a6efedd29..7578065eb1 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -8188,9 +8188,9 @@ (define-public ghc-doclayout code. It was designed for use in @code{Pandoc}.") (license license:bsd-3))) -(define-public pandoc +(define-public ghc-pandoc (package - (name "pandoc") + (name "ghc-pandoc") (version "2.19.2") (source (origin (method url-fetch) @@ -8288,8 +8288,19 @@ (define-public pandoc provided for those who need a drop-in replacement for Markdown.pl.") (license license:gpl2+))) -(define-public ghc-pandoc - (deprecated-package "ghc-pandoc" pandoc)) +(define-public pandoc + (package + (inherit ghc-pandoc) + (name "pandoc") + (arguments + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'register 'remove-libraries + (lambda* (#:key outputs #:allow-other-keys) + (delete-file-recursively (string-append (assoc-ref outputs "out") "/lib"))))) + ;; Haddock documentation is for the library. + #:haddock? #f)))) (define-public ghc-pandoc-types (package From patchwork Sat Feb 11 10:08:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lars-Dominik Braun X-Patchwork-Id: 46820 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 D63E61661B; Sat, 11 Feb 2023 10:10:13 +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=unavailable 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 44ED216615 for ; Sat, 11 Feb 2023 10:10:11 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pQmos-0004vi-Sm; Sat, 11 Feb 2023 05:09:22 -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 1pQmol-0004pL-Dr for guix-patches@gnu.org; Sat, 11 Feb 2023 05:09:15 -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 1pQmog-0000AP-OE for guix-patches@gnu.org; Sat, 11 Feb 2023 05:09:13 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pQmog-0004EN-Jf for guix-patches@gnu.org; Sat, 11 Feb 2023 05:09:10 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61420] [PATCH 29/31] gnu: purescript: Drop Haskell libraries and documentation. Resent-From: Lars-Dominik Braun Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 11 Feb 2023 10:09:10 +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.167611014116094 (code B ref 61420); Sat, 11 Feb 2023 10:09:10 +0000 Received: (at 61420) by debbugs.gnu.org; 11 Feb 2023 10:09:01 +0000 Received: from localhost ([127.0.0.1]:38898 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pQmoW-0004BP-Ld for submit@debbugs.gnu.org; Sat, 11 Feb 2023 05:09:00 -0500 Received: from mout-p-201.mailbox.org ([80.241.56.171]:38674) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pQmoN-000478-Ce for 61420@debbugs.gnu.org; Sat, 11 Feb 2023 05:08:51 -0500 Received: from smtp102.mailbox.org (smtp102.mailbox.org [IPv6:2001:67c:2050:b231:465::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 4PDRBz6Rk6z9sgw; Sat, 11 Feb 2023 11:08:43 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=6xq.net; s=MBO0001; t=1676110123; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=SofoBCCDK1aTz7KlbdRTKDK7/Z7EqfjJs/wzyKcG8aI=; b=BNbZHGVMkzVk5QdMcuqcEKlQ0vMzDhssW7dx7uyQY8JHgOsac7hdA4VTcY3vP7Et2yuA8P /eFuI7CyQfYwMgQYrZqJA1KXvPJZzPAn6QaQ/0uQyQTks2Gc5IbQc5njKm179y/YfIBzSg sXZzcH5sSP5M+gXZpFj4XdvTMZ9bug7CuOxTCoMJmJqwFii3rLL9RoHlSVjcfTIz7Pc25E 2GT4uLjhSMER9WHjCSyZD9o/9qbLM5DxhoDyUt4cp/qcevb2moTs7K1RhC4HPqGYd9AXVP A+N/S/qG+7OqQPGvCdpW003Yuk3WEyTd3d4noD/QUNgQfAOZ8MMF4mg/nVh11Q== From: Lars-Dominik Braun Date: Sat, 11 Feb 2023 11:08:23 +0100 Message-Id: <20230211100825.47971-26-lars@6xq.net> In-Reply-To: <20230211100825.47971-1-lars@6xq.net> References: <20230211100825.47971-1-lars@6xq.net> MIME-Version: 1.0 X-Rspamd-Queue-Id: 4PDRBz6Rk6z9sgw 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 * gnu/packages/purescript.scm (purescript)[arguments]: Add 'remove-libraries phase and disable #:haddock?. --- gnu/packages/purescript.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/gnu/packages/purescript.scm b/gnu/packages/purescript.scm index d968a6f0e6..0a5eccc459 100644 --- a/gnu/packages/purescript.scm +++ b/gnu/packages/purescript.scm @@ -99,13 +99,17 @@ (define-public purescript `(;; Tests require npm #:tests? #f #:configure-flags '("--flags=release") + #:haddock? #f #:phases (modify-phases %standard-phases (add-before 'configure 'update-constraints (lambda _ (substitute* "purescript.cabal" (("\\b(language-javascript|process)\\s+[^,]+" all dep) - dep))))))) + dep)))) + (add-after 'register 'remove-libraries + (lambda* (#:key outputs #:allow-other-keys) + (delete-file-recursively (string-append (assoc-ref outputs "out") "/lib"))))))) (home-page "https://www.purescript.org/") (synopsis "Haskell inspired programming language compiling to JavaScript") (description From patchwork Sat Feb 11 10:08:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lars-Dominik Braun X-Patchwork-Id: 46813 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 55A4116615; Sat, 11 Feb 2023 10:09:44 +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=unavailable 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 34D08165B0 for ; Sat, 11 Feb 2023 10:09:43 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pQmou-0004yf-0t; Sat, 11 Feb 2023 05:09:24 -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 1pQmol-0004pX-Eu for guix-patches@gnu.org; Sat, 11 Feb 2023 05:09:15 -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 1pQmoh-0000AS-4p for guix-patches@gnu.org; Sat, 11 Feb 2023 05:09:13 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pQmoh-0004EV-1C for guix-patches@gnu.org; Sat, 11 Feb 2023 05:09:11 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61420] [PATCH 30/31] gnu: xmobar: Drop Haskell libraries and documentation. Resent-From: Lars-Dominik Braun Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 11 Feb 2023 10:09:10 +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.167611014116100 (code B ref 61420); Sat, 11 Feb 2023 10:09:10 +0000 Received: (at 61420) by debbugs.gnu.org; 11 Feb 2023 10:09:01 +0000 Received: from localhost ([127.0.0.1]:38900 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pQmoX-0004BX-1I for submit@debbugs.gnu.org; Sat, 11 Feb 2023 05:09:01 -0500 Received: from mout-p-202.mailbox.org ([80.241.56.172]:34036) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pQmoN-00047F-Mj for 61420@debbugs.gnu.org; Sat, 11 Feb 2023 05:08:52 -0500 Received: from smtp102.mailbox.org (smtp102.mailbox.org [IPv6:2001:67c:2050:b231:465::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-202.mailbox.org (Postfix) with ESMTPS id 4PDRC01cpzz9sWd; 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-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=EoBXlYx70PK1Ej1WPfbHM+5/yeN/YjhBPm5ZWxkgSIg=; b=Gb7B/QaJmQ5H66dp2UFUNZrA316S97hPSzxuZmcJxC5Aj+SczT9M/8AxAUaYusqcJ29CpL jiYA0lF8RjN5susEzUoqKLg9voO66CR5My1ov0+2PNS1n4ZTHu0VyBb8rdbboNblven0A+ 1WhNBoZcwZIShhj4YdFGKdXYrnfBpPabjYBURoUZv8ACH1O7AeUpbxMalu6PNd2PTPDGo5 E2wEvCDChEetfRqrtq0iUx58b8Wd+wPJQak0hbMpOQGdrHYR26ZSP/1DcvAOzHidPhJB1J 7nOug3YyKM07ZJB/SCYDYUimMAgJeK3Q4+7rm+7dwe6nbrXjzvwxXC6nscjXEQ== From: Lars-Dominik Braun Date: Sat, 11 Feb 2023 11:08:24 +0100 Message-Id: <20230211100825.47971-27-lars@6xq.net> In-Reply-To: <20230211100825.47971-1-lars@6xq.net> References: <20230211100825.47971-1-lars@6xq.net> MIME-Version: 1.0 X-Rspamd-Queue-Id: 4PDRC01cpzz9sWd 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 * gnu/packages/wm.scm (xmobar)[arguments]: Add 'remove-libraries phase and disable #:haddock?. --- gnu/packages/wm.scm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index 7d64cfe6ce..40b0ee2185 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -831,13 +831,17 @@ (define-public xmobar libxpm)) (arguments `(#:configure-flags (list "--flags=all_extensions") + ;; Haddock documentation is for the library. + #:haddock? #f #:phases (modify-phases %standard-phases + (add-after 'register 'remove-libraries + (lambda* (#:key outputs #:allow-other-keys) + (delete-file-recursively (string-append (assoc-ref outputs "out") "/lib")))) (add-before 'build 'patch-test-shebang (lambda* (#:key inputs #:allow-other-keys) (substitute* "test/Xmobar/Plugins/Monitors/AlsaSpec.hs" - (("/bin/bash") (which "bash"))) - #t))))) + (("/bin/bash") (which "bash")))))))) (home-page "https://xmobar.org") (synopsis "Minimalistic text based status bar") (description 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")