X-Loop: help-debbugs@HIDDEN Subject: [bug#54729] [PATCH] build: haskell-build-system: Support packages w. multiple libraries Resent-From: Philip Munksgaard <philip@HIDDEN> Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> Resent-CC: guix-patches@HIDDEN Resent-Date: Tue, 05 Apr 2022 15:16:01 +0000 Resent-Message-ID: <handler.54729.B.164917175110930 <at> debbugs.gnu.org> Resent-Sender: help-debbugs@HIDDEN X-GNU-PR-Message: report 54729 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 54729 <at> debbugs.gnu.org Cc: Philip Munksgaard <philip@HIDDEN> X-Debbugs-Original-To: guix-patches@HIDDEN Received: via spool by submit <at> debbugs.gnu.org id=B.164917175110930 (code B ref -1); Tue, 05 Apr 2022 15:16:01 +0000 Received: (at submit) by debbugs.gnu.org; 5 Apr 2022 15:15:51 +0000 Received: from localhost ([127.0.0.1]:55865 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1nbkuM-0002pp-AT for submit <at> debbugs.gnu.org; Tue, 05 Apr 2022 11:15:51 -0400 Received: from lists.gnu.org ([209.51.188.17]:47680) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <philip@HIDDEN>) id 1nbkuH-0002k1-9F for submit <at> debbugs.gnu.org; Tue, 05 Apr 2022 11:15:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48080) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <philip@HIDDEN>) id 1nbkuF-0000g3-FW for guix-patches@HIDDEN; Tue, 05 Apr 2022 11:15:45 -0400 Received: from wout4-smtp.messagingengine.com ([64.147.123.20]:36817) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <philip@HIDDEN>) id 1nbku9-0003Yo-DR for guix-patches@HIDDEN; Tue, 05 Apr 2022 11:15:39 -0400 Received: from compute2.internal (compute2.nyi.internal [10.202.2.46]) by mailout.west.internal (Postfix) with ESMTP id 804DA3201F94; Tue, 5 Apr 2022 11:15:33 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute2.internal (MEProxy); Tue, 05 Apr 2022 11:15:33 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=munksgaard.me; h=cc:cc:content-transfer-encoding:date:date:from:from :in-reply-to:message-id:mime-version:reply-to:sender:subject :subject:to:to; s=fm1; bh=TqaJK+0aFPwcav/bZEWojcBBg2eUcA1CH70sE1 Qwu4U=; b=pp0lYF7TtnWG6sSuLjT9R5VHlTe4z+I60ONRnWcwWDmv8vcRdlKGK7 bIBwS6qEPpGoyL3BiMJFh6Sn5RVI9yGkrU0a6io1rZrIJo/lGdMFN4pW2E1bUc0h YyNryJVUOVvDfego6vPL1iJ8L627xlNjWrAvCT3ABvyRA+DZkgPAmz0Mbpdrh2t/ NjXyVUzNzk/fdFZk17ufXrlG9cn7QnqlqEBFj9JqBasFoJyph+neq2P3Mx+vYzaW ELcT2DuB/SjyXhEIMi48/arTFhIG+TiICoWjXUnOpmKqvJBeD+CHdH88aqNGxmgE INvbl5Jozsanv+MagS+09Co/IurdIy8A== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding:date:date :from:from:in-reply-to:message-id:mime-version:reply-to:sender :subject:subject:to:to:x-me-proxy:x-me-proxy:x-me-sender :x-me-sender:x-sasl-enc; s=fm3; bh=TqaJK+0aFPwcav/bZEWojcBBg2eUc A1CH70sE1Qwu4U=; b=b3u8mXQx4jlabL03lc6/f+pPccsjWLkRsvMhub8R9j0jR fGcMO4+t7TiUevZnwQH4nc4CTXU9QfUv1kv2kypUmMxXVzUQNHVs98rf199n4iR3 Pb9icRqSKcZ/ENbGatiN/RDR4lXi8/Voanc/7pe1ly1tE6LmHb7TtwNpAHO7hUWF qkbqvoketaeVUlHrLsiGJAk+BSKJw9T/AyyFcZXFOpdsnjmqlZz/WLxKIyrCM0m+ uFNiMRDM3vEWEc2mzeIyU9dnoUvbyEFXOb56ITiWv85ZnyczYKBnQlADuFhnQi0K uYz3ve2sFHZeHNewnN4i0ArFavXi418qHpam/uV5Q== X-ME-Sender: <xms:FF1MYl_CicQHB233EVMXOpqYd1RD8c6GknEea8zdxl-3vzdxbbgrSw> <xme:FF1MYps400xQ3CRug_rYTIvu19Gy-LIPhz84fXLr-jLdf24N1w9HH7xd7J7rcBBPx rkXgqEK2Zb-tfwnRzo> X-ME-Received: <xmr:FF1MYjC0DgsRZZRV5_SZntoK-vtOkRxDbn9z7HxY2QqFsqsPG7Z5TdBlhAICgQmyx2LHUHxAPgo> X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvvddrudejgedgkeefucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvffufffkofgggfestdekredtre dttdenucfhrhhomheprfhhihhlihhpucfouhhnkhhsghgrrghrugcuoehphhhilhhiphes mhhunhhkshhgrggrrhgurdhmvgeqnecuggftrfgrthhtvghrnhepveevkefhuedvtdffhf ekffeljefhueevjeejteeiteetudfhueffjefggeefveelnecuffhomhgrihhnpehgnhhu rdhorhhgpdhhrghskhgvlhhlrdhorhhgnecuvehluhhsthgvrhfuihiivgeptdenucfrrg hrrghmpehmrghilhhfrhhomhepphhhihhlihhpsehmuhhnkhhsghgrrghrugdrmhgv X-ME-Proxy: <xmx:FF1MYpdESezPjSBUE0paSCOYcy3inyYFKsYuPTt8mLpI5RfNI0fAqQ> <xmx:FF1MYqOiSdjIyg3e2Uqm__waWvyCj7HxXAvQzwP1kT_mezZzRPpn1A> <xmx:FF1MYrlNowiHIwpOQtcR6MG0ZnL5C5jJqpiXVVmPmK14Qeprj72AxQ> <xmx:FV1MYkUnDJK7YSS2h0QJEaDwGyDEZewDzhv9bJxjPEt98wqI_mrIZw> Received: by mail.messagingengine.com (Postfix) with ESMTPA; Tue, 5 Apr 2022 11:15:31 -0400 (EDT) From: Philip Munksgaard <philip@HIDDEN> Date: Tue, 5 Apr 2022 17:15:29 +0200 Message-Id: <8a396a9803fc35ee63f01e608f87ffb16863bc6d.1649171729.git.philip@HIDDEN> X-Mailer: git-send-email 2.35.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=64.147.123.20; envelope-from=philip@HIDDEN; helo=wout4-smtp.messagingengine.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.6 (-) X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -2.7 (--) As discussed in #53655 [0], haskell-build-system.scm does not currently support packages which contain multiple libraries, such as attoparsec [1]. Such libraries are often used for internal or convenience libraries, as detailed in the documentation [2]. The current state of affairs means that attoparsec and any other libraries with similar structure cannot be built on guix, nor can any library or executable that depends on such a library. Instead of assuming that `runhaskell Setup.hs --gen-pkg-config=...` always outputs a single file, we detect whether the result was a directory. If so, we need to handle each file independently in lexicographic order by calling the new private function `install-from-config-file`. Because `install-transitive-deps` can now be called multiple times for each call to `register`, it has also been amended to support the files already installed. 0: https://issues.guix.gnu.org/53655 1: https://hackage.haskell.org/package/attoparsec-0.14.4/attoparsec.cabal 2: https://downloads.haskell.org/cabal/Cabal-3.0.0.0/doc/users-guide/installing-packages.html#cmdoption-setup-register-gen-pkg-config --- guix/build/haskell-build-system.scm | 34 ++++++++++++++++++----------- 1 file changed, 21 insertions(+), 13 deletions(-) diff --git a/guix/build/haskell-build-system.scm b/guix/build/haskell-build-system.scm index ef6cb316ee..e827e23aba 100644 --- a/guix/build/haskell-build-system.scm +++ b/guix/build/haskell-build-system.scm @@ -217,11 +217,13 @@ (define* (register #:key name system inputs outputs #:allow-other-keys) (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*) + (when (not (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)))))) (let* ((out (assoc-ref outputs "out")) @@ -234,13 +236,12 @@ (define* (register #:key name system inputs outputs #:allow-other-keys) "/ghc-" version "/" name ".conf.d")) (id-rx (make-regexp "^id:[ \n\t]+([^ \t\n]+)$" regexp/newline)) - (config-file (string-append out "/" name ".conf")) + (config-output (string-append out "/" name ".conf")) (params - (list (string-append "--gen-pkg-config=" config-file)))) + (list (string-append "--gen-pkg-config=" config-output)))) (run-setuphs "register" params) - ;; The conf file is created only when there is a library to register. - (when (file-exists? config-file) - (mkdir-p config-dir) + + (define (install-from-config-file config-file) (let* ((contents (call-with-input-file config-file read-string)) (config-file-name+id (match:substring (first (list-matches id-rx contents)) 1))) @@ -270,10 +271,17 @@ (define* (register #:key name system inputs outputs #:allow-other-keys) (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"))) + config-file-name+id ".conf")))) + + ;; The conf file is created only when there is a library to register. + (when (file-exists? config-output) + (mkdir-p config-dir) + (if (file-is-directory? config-output) + (for-each install-from-config-file (find-files config-output)) + (install-from-config-file config-output)) + (invoke "ghc-pkg" + (string-append "--package-db=" config-dir) + "recache")) #t)) (define* (check #:key tests? test-target #:allow-other-keys) -- 2.35.1
Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) Content-Type: text/plain; charset=utf-8 X-Loop: help-debbugs@HIDDEN From: help-debbugs@HIDDEN (GNU bug Tracking System) To: Philip Munksgaard <philip@HIDDEN> Subject: bug#54729: Acknowledgement ([PATCH] build: haskell-build-system: Support packages w. multiple libraries) Message-ID: <handler.54729.B.164917175110930.ack <at> debbugs.gnu.org> References: <8a396a9803fc35ee63f01e608f87ffb16863bc6d.1649171729.git.philip@HIDDEN> X-Gnu-PR-Message: ack 54729 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 54729 <at> debbugs.gnu.org Date: Tue, 05 Apr 2022 15:16:02 +0000 Thank you for filing a new bug report with debbugs.gnu.org. This is an automatically generated reply to let you know your message has been received. Your message is being forwarded to the package maintainers and other interested parties for their attention; they will reply in due course. Your message has been sent to the package maintainer(s): guix-patches@HIDDEN If you wish to submit further information on this problem, please send it to 54729 <at> debbugs.gnu.org. Please do not send mail to help-debbugs@HIDDEN unless you wish to report a problem with the Bug-tracking system. --=20 54729: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D54729 GNU Bug Tracking System Contact help-debbugs@HIDDEN with problems
X-Loop: help-debbugs@HIDDEN Subject: [bug#54729] [PATCH core-updates v2 1/2] build: haskell-build-system: Remove trailing #t. References: <8a396a9803fc35ee63f01e608f87ffb16863bc6d.1649171729.git.philip@HIDDEN> In-Reply-To: <8a396a9803fc35ee63f01e608f87ffb16863bc6d.1649171729.git.philip@HIDDEN> Resent-From: zimoun <zimon.toutoune@HIDDEN> Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> Resent-CC: guix-patches@HIDDEN Resent-Date: Wed, 06 Apr 2022 19:20:01 +0000 Resent-Message-ID: <handler.54729.B54729.164927276811117 <at> debbugs.gnu.org> Resent-Sender: help-debbugs@HIDDEN X-GNU-PR-Message: followup 54729 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 54729 <at> debbugs.gnu.org Cc: zimoun <zimon.toutoune@HIDDEN> Received: via spool by 54729-submit <at> debbugs.gnu.org id=B54729.164927276811117 (code B ref 54729); Wed, 06 Apr 2022 19:20:01 +0000 Received: (at 54729) by debbugs.gnu.org; 6 Apr 2022 19:19:28 +0000 Received: from localhost ([127.0.0.1]:59165 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1ncBBg-0002tE-Dd for submit <at> debbugs.gnu.org; Wed, 06 Apr 2022 15:19:28 -0400 Received: from mail-wr1-f49.google.com ([209.85.221.49]:38533) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <zimon.toutoune@HIDDEN>) id 1ncBBe-0002sq-Nv for 54729 <at> debbugs.gnu.org; Wed, 06 Apr 2022 15:19:27 -0400 Received: by mail-wr1-f49.google.com with SMTP id j12so4676838wrb.5 for <54729 <at> debbugs.gnu.org>; Wed, 06 Apr 2022 12:19:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=xZXE2N5vOvHKN5yXm5bcWpyYr4ZkLhwYjOSD6Z21NtM=; b=Xuqj73HGn5i8z8e0IpqxrbHXvdPrZR5575gkbixzw+yvZyZR0nY7MeLdBlkv7Xlv0m INa85OATR2fBRG5s1r/Zii8dumqZ7iUsxc7KPctxP9mID7VwtQqsxkG9bc9rJZc0zjpA hbb/oeDoR95sBqYOkVLYGpaWZ0htZYH6wyPI5bwnRo01YSUVXiT96/3J6Yap53/NmhK0 8e3dfBnPNjRu6Wk9oT5OcDOrjQLZAjiaQctQuWlsfxEfFWuXS6gHnxCNoh9+OlRVTDbT Z+2qYNYjy5iaXsYlU1/DNZ5Mvqk1wK4FTjUihanUZV/jr5R6qlDZHIc+iYO/N0YSxHv8 AMCw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=xZXE2N5vOvHKN5yXm5bcWpyYr4ZkLhwYjOSD6Z21NtM=; b=BFL+m11HGUh/sMRTp7GdnvybnTI59jdvwDr+OPU+F92UxxRzSupxfA/XHuC1HMw1XP gM4lBga8SSsoSjUptH+wOAEQGBHK33lXL2jM8uJKgDbJNHcQ2nEUEMZSPnp4hoXWA8i0 mNcZK4zBa/QkFILHo/oLI2iBcqDnfpn7yU7C4LKMVEW2Sir+YwgLnzQ9SyFZ6cY+G/vU khRbxGo/QCbgT9pxqj+f2ztbaxgpaFWlnIgK8nbEwxg0g5flQJzQwW8iAI8XdTg6IUbt /cI05815byTJ2O28TYOrTFdX4La2tc3lRz06p9WU8HDelg9E0pllB1DFGnMqU+09wNA3 pzTw== X-Gm-Message-State: AOAM5313MmiTxbNMK5A71MRozIrWhA/UeHHoNiu9A+DPAhhYUyjJeWv2 +LyT4osPuUipAtkK2ToMjTYHN7vvFyE= X-Google-Smtp-Source: ABdhPJy+dnNm4cRRlxfNUJOoIanymasw8sJRsnAwcBnJCj+qrb8CBBkH3lrlEXy7HEpdDa9jATb+Cw== X-Received: by 2002:a05:6000:2a8:b0:205:8817:8296 with SMTP id l8-20020a05600002a800b0020588178296mr7852023wry.309.1649272760755; Wed, 06 Apr 2022 12:19:20 -0700 (PDT) Received: from localhost.localdomain ([193.48.40.241]) by smtp.gmail.com with ESMTPSA id u12-20020a5d6dac000000b00204119d37d0sm15230647wrs.26.2022.04.06.12.19.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Apr 2022 12:19:20 -0700 (PDT) From: zimoun <zimon.toutoune@HIDDEN> Date: Wed, 6 Apr 2022 21:19:07 +0200 Message-Id: <20220406191908.2393054-1-zimon.toutoune@HIDDEN> X-Mailer: git-send-email 2.34.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.0 (-) * 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. --- 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 <rekado@HIDDEN> ;;; Copyright © 2018 Alex Vong <alexvong1995@HIDDEN> ;;; Copyright © 2021 John Kehayias <john.kehayias@HIDDEN> +;;; Copyright © 2022 Simon Tournier <zimon.toutoune@HIDDEN> ;;; ;;; 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 base-commit: e3e3381fdbc56f351063d9b4a49e99645b20d7d3 -- 2.34.0
X-Loop: help-debbugs@HIDDEN Subject: [bug#54729] [PATCH core-updates v2 2/2] build: haskell-build-system: Support multiple libraries. Resent-From: zimoun <zimon.toutoune@HIDDEN> Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> Resent-CC: guix-patches@HIDDEN Resent-Date: Wed, 06 Apr 2022 19:20:02 +0000 Resent-Message-ID: <handler.54729.B54729.164927277011127 <at> debbugs.gnu.org> Resent-Sender: help-debbugs@HIDDEN X-GNU-PR-Message: followup 54729 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 54729 <at> debbugs.gnu.org Cc: Philip Munksgaard <philip@HIDDEN>, zimoun <zimon.toutoune@HIDDEN> Received: via spool by 54729-submit <at> debbugs.gnu.org id=B54729.164927277011127 (code B ref 54729); Wed, 06 Apr 2022 19:20:02 +0000 Received: (at 54729) by debbugs.gnu.org; 6 Apr 2022 19:19:30 +0000 Received: from localhost ([127.0.0.1]:59167 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1ncBBh-0002tN-Q6 for submit <at> debbugs.gnu.org; Wed, 06 Apr 2022 15:19:30 -0400 Received: from mail-wr1-f42.google.com ([209.85.221.42]:36380) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <zimon.toutoune@HIDDEN>) id 1ncBBe-0002sr-Pg for 54729 <at> debbugs.gnu.org; Wed, 06 Apr 2022 15:19:27 -0400 Received: by mail-wr1-f42.google.com with SMTP id u3so4688556wrg.3 for <54729 <at> debbugs.gnu.org>; Wed, 06 Apr 2022 12:19:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=G/eDU2C54YUH9mTJCSxb2PuIDuSay4sTs+jgDyjAG/w=; b=qNYRVYQmhRTcX6a/NZcH+Si+PtBvkzznYo8psDwc1n2dUty/4AstiGbb+PAl/DVjOU NImh+ywErefI+eIIiT9TQMIk2Rr1dR9Tb8KtsGc9AQNd5ldg1NGBcmp6Lg5wUPqUDasA 6JnRPAkG9XZyg1lGxQ+xJSGs23DHQgK9w2KCGijGMtkHsiO9qA80UXm1l/Ru8Chbd0k/ 82j5nwFGkG7WAAX2PaqB0q+oPCVlVeOqW+kV0AnzQVqOe4pRhL0WEI1+S1llD3kwH9jX yXtypn7wZYX6ooRUymFMUFTqrTveF5RAYQ+9Q95m8o0FPNVpDjw4knC41PKsyFSiZ1eX POPQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=G/eDU2C54YUH9mTJCSxb2PuIDuSay4sTs+jgDyjAG/w=; b=v/uDudZ6Z/96VjTRXlRg48vl7lF0rZbce0iMs2/DG9Ty+IGMAcq2Hgl+JAIky/dcGs 21Y3WtIW3D1ea8xGhNF+WVqYgzaCPIJzDcvA3MDQA9D2WY2GHB6VRsZCcx8Fjs28gUoh mMlLwBjdxzLkKOTdtqwZLIy0KBqiuBBWj4hfqX7yqF/eRJpm33/G/1cVKHJ9LPv7r2zY zcwZG6fijZEeYegKhPvNAu9bSj5QWSQJUV796m7HRa16QoH6E1yiciRnj2IZ4iSQNNQu 6FpK0SF0SvCqaEj798W/g3taNBvwtc7KyXwpKNBHh59zcdL4XQI4IOPQUepMtnKD7Jq+ LoaA== X-Gm-Message-State: AOAM531Ln8CJFcVp9NHqlRcDagHFNgNrlT2NAhIHpmUqequzj3gzyXma 2/dUU6EmC+b2eERuUCeaDE2uLTzbyys= X-Google-Smtp-Source: ABdhPJzHtkMcl6H+spEDxvLugvbNh8rGwpug+J9P/laBIPnBc98yx/nDuh1ROq6pt2hIZt9GiqEf5w== X-Received: by 2002:a5d:49c9:0:b0:206:1327:5058 with SMTP id t9-20020a5d49c9000000b0020613275058mr7831013wrs.555.1649272761184; Wed, 06 Apr 2022 12:19:21 -0700 (PDT) Received: from localhost.localdomain ([193.48.40.241]) by smtp.gmail.com with ESMTPSA id u12-20020a5d6dac000000b00204119d37d0sm15230647wrs.26.2022.04.06.12.19.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Apr 2022 12:19:20 -0700 (PDT) From: zimoun <zimon.toutoune@HIDDEN> Date: Wed, 6 Apr 2022 21:19:08 +0200 Message-Id: <20220406191908.2393054-2-zimon.toutoune@HIDDEN> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20220406191908.2393054-1-zimon.toutoune@HIDDEN> References: <20220406191908.2393054-1-zimon.toutoune@HIDDEN> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.0 (-) From: Philip Munksgaard <philip@HIDDEN> Fixes <https://bugs.gnu.org/53655>. 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 <zimon.toutoune@HIDDEN>. --- 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 <alexvong1995@HIDDEN> ;;; Copyright © 2021 John Kehayias <john.kehayias@HIDDEN> ;;; Copyright © 2022 Simon Tournier <zimon.toutoune@HIDDEN> +;;; Copyright © 2022 Philip Munksgaard <philip@HIDDEN> ;;; ;;; 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." -- 2.34.0
X-Loop: help-debbugs@HIDDEN Subject: [bug#54729] [PATCH] build: haskell-build-system: Support packages w. multiple libraries Resent-From: zimoun <zimon.toutoune@HIDDEN> Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> Resent-CC: guix-patches@HIDDEN Resent-Date: Wed, 06 Apr 2022 19:29:03 +0000 Resent-Message-ID: <handler.54729.B54729.164927328812089 <at> debbugs.gnu.org> Resent-Sender: help-debbugs@HIDDEN X-GNU-PR-Message: followup 54729 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Philip Munksgaard <philip@HIDDEN>, rekado@HIDDEN, lars@HIDDEN Cc: 54729 <at> debbugs.gnu.org Received: via spool by 54729-submit <at> debbugs.gnu.org id=B54729.164927328812089 (code B ref 54729); Wed, 06 Apr 2022 19:29:03 +0000 Received: (at 54729) by debbugs.gnu.org; 6 Apr 2022 19:28:08 +0000 Received: from localhost ([127.0.0.1]:59189 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1ncBK4-00038i-DK for submit <at> debbugs.gnu.org; Wed, 06 Apr 2022 15:28:08 -0400 Received: from mail-wm1-f49.google.com ([209.85.128.49]:43986) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <zimon.toutoune@HIDDEN>) id 1ncBK3-000385-5W for 54729 <at> debbugs.gnu.org; Wed, 06 Apr 2022 15:28:07 -0400 Received: by mail-wm1-f49.google.com with SMTP id m67-20020a1ca346000000b0038e6a1b218aso2292937wme.2 for <54729 <at> debbugs.gnu.org>; Wed, 06 Apr 2022 12:28:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=Yjfxm8vg1hclVzSB6tdvfdNjR6MfBHEix7Fe/H014l4=; b=N1gYJVj/drfM4Al7WgBKW5UbrPTRWNWUIEPgJdxIbpWdFJ9SQ7n3yhqE3GEih2mjIK uwaADRB9DDIGU1vnbMdCivaNYTqrQI5KzVfxNphXqIvDDT9P16VQTaOgmptXVG35sQOy COs6nTjmrrKIcfS7kMQWkt+5UaIaF8XRvbkaJYPXZh5VEm/CVQv3N9w9DQlmrFVatSzR zcUfuT3GsXZA76J87w5AZ87RD0c3hIcfUTIbrUze9qzphgpFlVB/ToGR9Wx3vnS5P5pB go2nSfNJ3zK6FBP3CVkDTYjbR1G7J9Sru0TTpwpZeqqqJdj4hBqGSZj3SAgct5lHONY+ wqdQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version; bh=Yjfxm8vg1hclVzSB6tdvfdNjR6MfBHEix7Fe/H014l4=; b=avYfZh8b9tdxfmcK8tGDtYY/xdLsfUURfAQOWOYBUHyFAV2WlLChBqBig60gCbwfNO mrV4Vb3YfOcy9YW6XIEdpo2VxooRezd7xy53JOSif7B3SqjD9UbegaqHvUs9IuZhZUVs WGahBF3IHEFJG7Us27X59ch680fzbxzjf2trn/no1Y+Hwfej5ih+XtqZwzxFv2SJpplx k9jKv1pKgmIo91achxpIfUdvEr/YiGoWPZwnkJuL7LxTECUFWOVpT3CYG9n83Th5be1C 0UmjpEQOhIakqaW5P62K6IyLfj3boOcGRYjvAv8gd8ySCFN8h3hoT9sXqo3Qiv9tIUFc BCVw== X-Gm-Message-State: AOAM532XnatOe35pthwOfmTsXDrzezx+5FT5cotKZ9tiMvWhrXEEv4C7 Grk+xZ105JJ6d5DvaYfy1ZCTeSZH69A= X-Google-Smtp-Source: ABdhPJxYxUODtztBjHvN2Be3CzaAHJghljM4yRDnZyVxdrl62sH+YigxFQboXgqZabHC5/3pVVDkrg== X-Received: by 2002:a05:600c:a47:b0:37c:965:2b6f with SMTP id c7-20020a05600c0a4700b0037c09652b6fmr8886677wmq.31.1649273281555; Wed, 06 Apr 2022 12:28:01 -0700 (PDT) Received: from pfiuh07 ([193.48.40.241]) by smtp.gmail.com with ESMTPSA id p125-20020a1c2983000000b0038e6c62f527sm7999673wmp.14.2022.04.06.12.28.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Apr 2022 12:28:01 -0700 (PDT) From: zimoun <zimon.toutoune@HIDDEN> References: <8a396a9803fc35ee63f01e608f87ffb16863bc6d.1649171729.git.philip@HIDDEN> Date: Wed, 06 Apr 2022 21:23:44 +0200 In-Reply-To: <8a396a9803fc35ee63f01e608f87ffb16863bc6d.1649171729.git.philip@HIDDEN> (Philip Munksgaard's message of "Tue, 5 Apr 2022 17:15:29 +0200") Message-ID: <87zgkyow1r.fsf@HIDDEN> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.0 (-) Hi, Thanks for your patch. I have send a v2 ready for core-updates. Ricardo or Lars, can you push this v2 to core-updates? The simple test is to use attoparsec@HIDDEN from bug#53655 [1]. The rebuild of this package takes less than half hour. I have checked and rebuilt all the ghc- packages; nothing broken. 1: <https://issues.guix.gnu.org/53655> Cheers, simon
X-Loop: help-debbugs@HIDDEN Subject: [bug#54729] [PATCH] build: haskell-build-system: Support packages w. multiple libraries Resent-From: Lars-Dominik Braun <lars@HIDDEN> Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> Resent-CC: guix-patches@HIDDEN Resent-Date: Thu, 07 Apr 2022 06:09:02 +0000 Resent-Message-ID: <handler.54729.B54729.164931170010859 <at> debbugs.gnu.org> Resent-Sender: help-debbugs@HIDDEN X-GNU-PR-Message: followup 54729 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: zimoun <zimon.toutoune@HIDDEN> Cc: rekado@HIDDEN, Philip Munksgaard <philip@HIDDEN>, 54729 <at> debbugs.gnu.org Received: via spool by 54729-submit <at> debbugs.gnu.org id=B54729.164931170010859 (code B ref 54729); Thu, 07 Apr 2022 06:09:02 +0000 Received: (at 54729) by debbugs.gnu.org; 7 Apr 2022 06:08:20 +0000 Received: from localhost ([127.0.0.1]:59519 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1ncLJc-0002p5-A2 for submit <at> debbugs.gnu.org; Thu, 07 Apr 2022 02:08:20 -0400 Received: from mout-p-202.mailbox.org ([80.241.56.172]:47108) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <lars@HIDDEN>) id 1ncLJZ-0002oq-Gm for 54729 <at> debbugs.gnu.org; Thu, 07 Apr 2022 02:08:19 -0400 Received: from smtp202.mailbox.org (smtp202.mailbox.org [IPv6:2001:67c:2050:105:465:1:4:0]) (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 4KYrXW1VWZz9sRB; Thu, 7 Apr 2022 08:08:11 +0200 (CEST) Date: Thu, 7 Apr 2022 08:08:05 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=6xq.net; s=MBO0001; t=1649311689; 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=Z08GHTPI8GLKwBu5u3CTkHFRb7pf9NG+RmOo51ApYpg=; b=mPwq0fu6i1/6C+bXVf2w625jBhzMP5P/McPp1G+O4baIyxzULrKIimWlk+nmeq/alpjHOJ HyvWLVuBW++3tYcBXt2BSb6O4ZVAhKxGGPVJmQ1imXOq6qI6Mdf2Nmn5QE5tcZ7KXIknNB KLKTgH4ic4D9c+NaEpgOt26KIIHEMoCclPdrmqFWeMaGAPueX1G4We18ZDmP7hE9FSTwOk WNhIXlElxnS0w+QwQsiGc2SL6mCVBTgQiMH06MAbAeo/RmNn0xzalHfvN1/4ewxzrwL9qi zYJp34gQEZeUvMyfKqvLd7+v/a3VU3LQvOhYX+eGOzs1hfvK3RbnIA/K+59zpA== From: Lars-Dominik Braun <lars@HIDDEN> Message-ID: <Yk5/xeYW4K4yDnLJ@HIDDEN> References: <8a396a9803fc35ee63f01e608f87ffb16863bc6d.1649171729.git.philip@HIDDEN> <87zgkyow1r.fsf@HIDDEN> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <87zgkyow1r.fsf@HIDDEN> X-Spam-Score: -0.7 (/) X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.7 (-) Hi simon, > Ricardo or Lars, can you push this v2 to core-updates? I’d rather have this in a separate wip-haskell branch than let it sit on core-updates indefinitely. Stackage also has a new release[1] using GHC 9.0, which we could update to at the same time. Any other Haskell changes we can batch into that branch? Cheers, Lars [1] https://www.stackage.org/lts-19.2
X-Loop: help-debbugs@HIDDEN Subject: [bug#54729] [PATCH] build: haskell-build-system: Support packages w. multiple libraries Resent-From: "Philip Munksgaard" <philip@HIDDEN> Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> Resent-CC: guix-patches@HIDDEN Resent-Date: Thu, 07 Apr 2022 06:51:01 +0000 Resent-Message-ID: <handler.54729.B54729.164931421914884 <at> debbugs.gnu.org> Resent-Sender: help-debbugs@HIDDEN X-GNU-PR-Message: followup 54729 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: "Lars-Dominik Braun" <lars@HIDDEN>, zimoun <zimon.toutoune@HIDDEN> Cc: Ricardo Wurmus <rekado@HIDDEN>, 54729 <at> debbugs.gnu.org Received: via spool by 54729-submit <at> debbugs.gnu.org id=B54729.164931421914884 (code B ref 54729); Thu, 07 Apr 2022 06:51:01 +0000 Received: (at 54729) by debbugs.gnu.org; 7 Apr 2022 06:50:19 +0000 Received: from localhost ([127.0.0.1]:59559 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1ncLyF-0003s0-7V for submit <at> debbugs.gnu.org; Thu, 07 Apr 2022 02:50:19 -0400 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:43873) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <philip@HIDDEN>) id 1ncLyA-0003rb-KV for 54729 <at> debbugs.gnu.org; Thu, 07 Apr 2022 02:50:18 -0400 Received: from compute2.internal (compute2.nyi.internal [10.202.2.46]) by mailout.nyi.internal (Postfix) with ESMTP id 585455C019D; Thu, 7 Apr 2022 02:50:09 -0400 (EDT) Received: from imap43 ([10.202.2.93]) by compute2.internal (MEProxy); Thu, 07 Apr 2022 02:50:09 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=munksgaard.me; h=cc:cc:content-type:date:date:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:sender :subject:subject:to:to; s=fm1; bh=x7w6yA5gdFvFib2Z7C1nKjx82C6kQg +g0lPKkXPnm0M=; b=D8B8xV/7jK7qlOG3MsnFg0Afzy4XUYzelCVH6umppHcJP3 OTE1D2jGPYTeK/HozXbONfTaZjQrSF0OOrRI3fHY1vehGk8Te9vPgoxoDfvc/cJU +oC/k2e8ZDpZKOH9wflJUHPdUb8ZyP+ljq6vmIwj/eSprecTgcBfRVOWfzEsSn6M vcJ7p6IFtsh12YS1+XC1wor0cS37qenjtN3jijoLJnGOwsoRS1++ISXhUnrmndU1 TzpEhcIFm5fbIW7R6OQeStmiCiykYapRWbbMR4/N63GwuW2ug3Owbyca48jLw+n7 QfSYcoLqlsZQ5ZzG9EW+yesRwKm2Csi3Jl3gj3Cg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm3; bh=x7w6yA5gdFvFib2Z7 C1nKjx82C6kQg+g0lPKkXPnm0M=; b=KiBE5WAaGDEw9Hapy5nchsopJZHvLXkyX LS4ln0mwltrJ6HOGzkWowqt/nnJHWSOUceg0MbK83+M87oOhR1hC4W5VAxlfXX8V AkHKEQ27x0VvdoPMJIMUVk6ympyeWsaCNCuZQkm2w5djMvB9pMjtY3t/uZ/fbVAi cx6OAUJG7VmoYW/PHDuyf6DTJlwrkygBTVd6o6y9Or5OFcPknzknPM8b0p00d+kj U7mrccwAG4+tJba2+FYvlgVm7U2ur0tkOBAqORZFU79+XmeKgrWAx0NpYjO2ZTKy 255wW8PD+bfSgsT5bzHRErlPzIzuVKa8bwe6jtUn61C9UfLqXvzgg== X-ME-Sender: <xms:oYlOYrjIO8wPzMAEwBH30NZO04FyZBi3nuWROXDwrnbmf5jQy9h3lg> <xme:oYlOYoDiX41WNlOkDbeCdebmnax7J2OdKlCAWY7u3CXPx1YoGgkJTm2hhNBoIxoFC RyXNZd14TMQZCi5DPI> X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvvddrudejjedguddugecutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd enucfjughrpefofgggkfgjfhffhffvufgtsehttdertderredtnecuhfhrohhmpedfrfhh ihhlihhpucfouhhnkhhsghgrrghrugdfuceophhhihhlihhpsehmuhhnkhhsghgrrghrug drmhgvqeenucggtffrrghtthgvrhhnpefggeeuudejieefudffhfdvgfelgeeftddtjeet uefhveetteduveehteduleetvdenucffohhmrghinhepghhnuhdrohhrghenucevlhhush htvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehphhhilhhiphesmhhu nhhkshhgrggrrhgurdhmvg X-ME-Proxy: <xmx:oYlOYrHIshzByvD7xSlHGRFB8UN9oP-vDl-EnH_xeFhBsmGJOS81wQ> <xmx:oYlOYoTlfZ4uhC81okJAgY9xm3K8nHrRk7bA0InAIZZQsVdxc0PLnQ> <xmx:oYlOYowVw-HDbOYDN7NFx8coPQkd17Tlsu8cMI578UYNBT8t-agzrA> <xmx:oYlOYlqdMuNK9blGCtA6zEENCxjCWPmpK3_WXRMhB71aCir57kpIKA> Received: by mailuser.nyi.internal (Postfix, from userid 501) id 00051AC0EAD; Thu, 7 Apr 2022 02:50:08 -0400 (EDT) X-Mailer: MessagingEngine.com Webmail Interface User-Agent: Cyrus-JMAP/3.7.0-alpha0-386-g4174665229-fm-20220406.001-g41746652 Mime-Version: 1.0 Message-Id: <7108deb8-613a-4f74-a525-c4bf21ec9118@HIDDEN> In-Reply-To: <Yk5/xeYW4K4yDnLJ@HIDDEN> References: <8a396a9803fc35ee63f01e608f87ffb16863bc6d.1649171729.git.philip@HIDDEN> <87zgkyow1r.fsf@HIDDEN> <Yk5/xeYW4K4yDnLJ@HIDDEN> Date: Thu, 07 Apr 2022 08:49:48 +0200 From: "Philip Munksgaard" <philip@HIDDEN> Content-Type: text/plain X-Spam-Score: -0.7 (/) X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.7 (-) Hi Lars On Thu, 7 Apr 2022, at 08:08, Lars-Dominik Braun wrote: > Any other Haskell changes we can batch into that branch? I don't know of any finished patches, but there are some issues that would be nice to have fixed, like https://issues.guix.gnu.org/52152 (which also applies to attoparsec) and https://issues.guix.gnu.org/54752. However, I think it's more important to get this current patch merged. Best, Philip
X-Loop: help-debbugs@HIDDEN Subject: [bug#54729] [PATCH] build: haskell-build-system: Support packages w. multiple libraries Resent-From: zimoun <zimon.toutoune@HIDDEN> Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> Resent-CC: guix-patches@HIDDEN Resent-Date: Thu, 07 Apr 2022 07:44:02 +0000 Resent-Message-ID: <handler.54729.B54729.164931740919772 <at> debbugs.gnu.org> Resent-Sender: help-debbugs@HIDDEN X-GNU-PR-Message: followup 54729 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Lars-Dominik Braun <lars@HIDDEN> Cc: rekado@HIDDEN, Philip Munksgaard <philip@HIDDEN>, 54729 <at> debbugs.gnu.org Received: via spool by 54729-submit <at> debbugs.gnu.org id=B54729.164931740919772 (code B ref 54729); Thu, 07 Apr 2022 07:44:02 +0000 Received: (at 54729) by debbugs.gnu.org; 7 Apr 2022 07:43:29 +0000 Received: from localhost ([127.0.0.1]:59602 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1ncMnh-00058q-2a for submit <at> debbugs.gnu.org; Thu, 07 Apr 2022 03:43:29 -0400 Received: from mail-wr1-f54.google.com ([209.85.221.54]:39545) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <zimon.toutoune@HIDDEN>) id 1ncMne-00058d-Jp for 54729 <at> debbugs.gnu.org; Thu, 07 Apr 2022 03:43:27 -0400 Received: by mail-wr1-f54.google.com with SMTP id q19so6528399wrc.6 for <54729 <at> debbugs.gnu.org>; Thu, 07 Apr 2022 00:43:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:in-reply-to:references:date:message-id :mime-version:content-transfer-encoding; bh=mwT+ZSge5A1OPP4RjKR8+FeLM0KCd2p+etkiQgrRHEw=; b=MU8pSueei4jJGweGTV1YR3jRBW6qVyi0Tf6QUKnv6BerCKTUHFTccmrhDFE5S9elMh JjEncnwUMaigY+9wgm8N/8ojWJCE/btWn7OlNwNFtvCJuL8yfdVJZvk+Gv57Ah/9kTDZ HAFMiSZdQY6GLa0LpqrU3vTQq63uC1HOTkiwumX9rR7sZFPrkx9wONWKsNz6NACYgBqT 2iRM/KeEaaTDFCOU9QaODMg8ASvysqISx5CWWUnE1LyXQzGWtiSMHdzZtASn+1spgD0K GncOCWqCfVc5UcIrZMveW89Pm1q7d3i3FwUF4U3ao+Gk1mrsAqC1+f/jWMnD8FVDpwAw 5LqQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:in-reply-to:references:date :message-id:mime-version:content-transfer-encoding; bh=mwT+ZSge5A1OPP4RjKR8+FeLM0KCd2p+etkiQgrRHEw=; b=Jc7KCpVcG4d+2h3zd226LCSt26n1f6TFfBlVfRNZoTouLLkcWCJH0t+q3BCm08cuky NERQVlCYZDlRy4ciLbslKK5lGR4UZnofYn9xZXfUGExTqm3Rzl2jJvuhtvuEdZw0KnOi 9tBmj2vraTGjXFaASVDalYcaGUDcqSWi47RnhkKpHEIEu6CzzbsCEg4P3oTSNV5BTZFI 3xxvsZGPsDwXY+CnUgxjKyvHLnRahbMv5R6P9v5rlL6fGjtLR2U988Fc3Ksan65MZouj CD/HHrerqXwpuv3+M5uRzUGpDxF4jfaY1Aqtt9G18VRcJI7Cqd3K9neHBonWToJJoUwQ 1kQQ== X-Gm-Message-State: AOAM531TTO22S8NJM87YUdrgFMp70R+EtQPFpx85ArVx8+kteN/9Gg+r jEgPNEIDBmAlLoShCU6fvhLvT04WzBs= X-Google-Smtp-Source: ABdhPJxjuSvjsE4X+kf7nqwsZsfCseO2UiG2O5Qij7TFULQYbnhBu7Zrc8P9PLkTnCHWYAfIsO/XbQ== X-Received: by 2002:adf:f451:0:b0:206:15b6:5f32 with SMTP id f17-20020adff451000000b0020615b65f32mr9433366wrp.352.1649317400552; Thu, 07 Apr 2022 00:43:20 -0700 (PDT) Received: from lili ([2a01:e0a:59b:9120:65d2:2476:f637:db1e]) by smtp.gmail.com with ESMTPSA id c24-20020a7bc018000000b0038a18068cf5sm6673339wmb.15.2022.04.07.00.43.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Apr 2022 00:43:20 -0700 (PDT) From: zimoun <zimon.toutoune@HIDDEN> In-Reply-To: <Yk5/xeYW4K4yDnLJ@HIDDEN> References: <8a396a9803fc35ee63f01e608f87ffb16863bc6d.1649171729.git.philip@HIDDEN> <87zgkyow1r.fsf@HIDDEN> <Yk5/xeYW4K4yDnLJ@HIDDEN> Date: Thu, 07 Apr 2022 09:35:39 +0200 Message-ID: <86k0c14a7o.fsf@HIDDEN> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.0 (-) Hi Lars, On Thu, 07 Apr 2022 at 08:08, Lars-Dominik Braun <lars@HIDDEN> wrote: > I=E2=80=99d rather have this in a separate wip-haskell branch than let it= sit > on core-updates indefinitely. Stackage also has a new release[1] using > GHC 9.0, which we could update to at the same time. > > Any other Haskell changes we can batch into that branch? Ok, let=E2=80=99s do use this wip-haskell branch: fix the build system as t= his v2 is doing and update LTS. Currently, the wip-haskell is at: c1522b280137df2f670f47fa1e682e610406bb39 (Thu Sep 30 09:29:51 2021 +0200), so let me know once you have rebase it to the current master. Cheers, simon
X-Loop: help-debbugs@HIDDEN Subject: [bug#54729] [PATCH] build: haskell-build-system: Support packages w. multiple libraries Resent-From: "Philip Munksgaard" <philip@HIDDEN> Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> Resent-CC: guix-patches@HIDDEN Resent-Date: Thu, 07 Apr 2022 08:27:02 +0000 Resent-Message-ID: <handler.54729.B54729.164931997124199 <at> debbugs.gnu.org> Resent-Sender: help-debbugs@HIDDEN X-GNU-PR-Message: followup 54729 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: "Lars-Dominik Braun" <lars@HIDDEN>, zimoun <zimon.toutoune@HIDDEN> Cc: Ricardo Wurmus <rekado@HIDDEN>, 54729 <at> debbugs.gnu.org Received: via spool by 54729-submit <at> debbugs.gnu.org id=B54729.164931997124199 (code B ref 54729); Thu, 07 Apr 2022 08:27:02 +0000 Received: (at 54729) by debbugs.gnu.org; 7 Apr 2022 08:26:11 +0000 Received: from localhost ([127.0.0.1]:59739 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1ncNT1-0006IF-KS for submit <at> debbugs.gnu.org; Thu, 07 Apr 2022 04:26:11 -0400 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:50765) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <philip@HIDDEN>) id 1ncNSz-0006I1-Bt for 54729 <at> debbugs.gnu.org; Thu, 07 Apr 2022 04:26:09 -0400 Received: from compute2.internal (compute2.nyi.internal [10.202.2.46]) by mailout.nyi.internal (Postfix) with ESMTP id 4CEAA5C013A; Thu, 7 Apr 2022 04:26:04 -0400 (EDT) Received: from imap43 ([10.202.2.93]) by compute2.internal (MEProxy); Thu, 07 Apr 2022 04:26:04 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=munksgaard.me; h=cc:cc:content-type:date:date:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:sender :subject:subject:to:to; s=fm1; bh=YCDb1CYcEWR3HvdNJcwk9NMH4NGePF TM3z9/WF/BWZ0=; b=nSjsQdfgDJGhoW8ZrsUDjei3KH4G9LQyvRxolSqASqGT2N E4P1GWnLegBkDDeR0JZNzLYWi1/MZ9O/zDGGnX+T87Tfp6Ng+uP0GxyZ7nrc4+J6 fI2km3xBqKwlwrVchTt+aqzgqB5xJeQbHVD+MnQc51ve7D7auI2+zSHfS9wWPoE+ gRgcpU0wzPjOWyjrIM34rjKBszbwpdulRM5SZFSfks51MbpULz7JkwJvMbQJEfzG qIM9LsS+3+knRhE2PqxO0kxSsaSrrTSwrV6OoIX333Nl+hRnesXfI2x2afqPlVxK P1mVwv3qzr4ZvVURiOzbKXB313V07qpwwjpRDaWA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm3; bh=YCDb1CYcEWR3HvdNJ cwk9NMH4NGePFTM3z9/WF/BWZ0=; b=a5ppXWMF3a4n5ujmTHfCi3pfFnJKAqvCf uHc4Ex7+hlR6RHErPa9LiefDCxgD00hv4212sLLQWYBcOohzFPD0mkPHJLWohxA3 V1zUJ0Ax/Ip8ulnp9mLZ2EHfe3DgTal4Hkndo7geb26T/CSaciyQUPiim5BD843e EWiwFJPozc9KB9v1Yf8pBikdCZFYyBv3+5jgDBOOsc/VAWfqIHin4t4Csdrf79Mq AMsl/zDeKh4VtdYkjjrcBQvf5H498mW444B7NrsgOt2zbonFpzgy2gTE5Sk1qco8 V7em+WymvYSO6CrU9Gjr2eIbRCtC5Nu9m1NLocHA2stHFDlkxTaPg== X-ME-Sender: <xms:HKBOYr2QMe-21BGv7n4tP6-GXulal0IddTp79rnsY6jAJL0AxJN4Eg> <xme:HKBOYqGKVvxu0iQfV_woico-QGebHj86g9-CHt8awZopaPqMj7WhFda1_ROCAXo2J Hb0ddabuE2gssn-hU0> X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvvddrudejkedgtdegucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhepofgfggfkjghffffhvffutgesthdtredtreertdenucfhrhhomhepfdfrhhhi lhhiphcuofhunhhkshhgrggrrhgufdcuoehphhhilhhiphesmhhunhhkshhgrggrrhgurd hmvgeqnecuggftrfgrthhtvghrnhepgfeguedujeeifedufffhvdfgleegfedttdejteeu hfevteetudevheetudeltedvnecuffhomhgrihhnpehgnhhurdhorhhgnecuvehluhhsth gvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepphhhihhlihhpsehmuhhn khhsghgrrghrugdrmhgv X-ME-Proxy: <xmx:HKBOYr4EMpOD6O1qE52nmV-K8NcXauEOdfEnFoVV2CqXghD4eJDrsA> <xmx:HKBOYg0lmgSyplRWUh6O9Ti4sB-CDiMbWljg4DcmXcSWcB_d2b2tuw> <xmx:HKBOYuE4Kx1erj-WetpHPoQR7sAfR2ABNFwbl2R9yGX6os-qRg1VXw> <xmx:HKBOYgPlGd70ELJ87Khlu8ccV0cZX6AytN9fhyEVk_ygGxM4_cHmeg> Received: by mailuser.nyi.internal (Postfix, from userid 501) id EAF0FAC0EAD; Thu, 7 Apr 2022 04:26:03 -0400 (EDT) X-Mailer: MessagingEngine.com Webmail Interface User-Agent: Cyrus-JMAP/3.7.0-alpha0-386-g4174665229-fm-20220406.001-g41746652 Mime-Version: 1.0 Message-Id: <797b714d-4274-46eb-9858-a51a17550b0c@HIDDEN> In-Reply-To: <7108deb8-613a-4f74-a525-c4bf21ec9118@HIDDEN> References: <8a396a9803fc35ee63f01e608f87ffb16863bc6d.1649171729.git.philip@HIDDEN> <87zgkyow1r.fsf@HIDDEN> <Yk5/xeYW4K4yDnLJ@HIDDEN> <7108deb8-613a-4f74-a525-c4bf21ec9118@HIDDEN> Date: Thu, 07 Apr 2022 10:25:43 +0200 From: "Philip Munksgaard" <philip@HIDDEN> Content-Type: text/plain X-Spam-Score: -0.7 (/) X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.7 (-) Hi again On Thu, 7 Apr 2022, at 08:49, Philip Munksgaard wrote: > Hi Lars > > On Thu, 7 Apr 2022, at 08:08, Lars-Dominik Braun wrote: >> Any other Haskell changes we can batch into that branch? > > I don't know of any finished patches, but there are some issues that > would be nice to have fixed, like https://issues.guix.gnu.org/52152 > (which also applies to attoparsec) and > https://issues.guix.gnu.org/54752. However, I think it's more important > to get this current patch merged. I've also created a new issue for invalid dependencies generated by multiple libraries in one package: https://issues.guix.gnu.org/54760
X-Loop: help-debbugs@HIDDEN Subject: [bug#54729] [PATCH] build: haskell-build-system: Support packages w. multiple libraries Resent-From: "Philip Munksgaard" <philip@HIDDEN> Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> Resent-CC: guix-patches@HIDDEN Resent-Date: Wed, 13 Apr 2022 19:00:02 +0000 Resent-Message-ID: <handler.54729.B54729.164987638615261 <at> debbugs.gnu.org> Resent-Sender: help-debbugs@HIDDEN X-GNU-PR-Message: followup 54729 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: "Lars-Dominik Braun" <lars@HIDDEN>, zimoun <zimon.toutoune@HIDDEN> Cc: Ricardo Wurmus <rekado@HIDDEN>, 54729 <at> debbugs.gnu.org Received: via spool by 54729-submit <at> debbugs.gnu.org id=B54729.164987638615261 (code B ref 54729); Wed, 13 Apr 2022 19:00:02 +0000 Received: (at 54729) by debbugs.gnu.org; 13 Apr 2022 18:59:46 +0000 Received: from localhost ([127.0.0.1]:54044 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1neiDS-0003y5-09 for submit <at> debbugs.gnu.org; Wed, 13 Apr 2022 14:59:46 -0400 Received: from wout1-smtp.messagingengine.com ([64.147.123.24]:45615) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <philip@HIDDEN>) id 1neiDP-0003xp-Od for 54729 <at> debbugs.gnu.org; Wed, 13 Apr 2022 14:59:45 -0400 Received: from compute2.internal (compute2.nyi.internal [10.202.2.46]) by mailout.west.internal (Postfix) with ESMTP id 2D5FE320206D; Wed, 13 Apr 2022 14:59:37 -0400 (EDT) Received: from imap43 ([10.202.2.93]) by compute2.internal (MEProxy); Wed, 13 Apr 2022 14:59:37 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=munksgaard.me; h=cc:cc:content-transfer-encoding:content-type:date:date:from :from:in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to; s=fm1; t=1649876376; x= 1649962776; bh=M37EyBJS1JzyqXk+UtQVEajyDV2fAtROSp2eIBXWaSk=; b=t mel5nLjG57FjwLynzwyvRw9aaiRWrMpwgcSpmSB/Fg157/B8iOYXEtsY7d3Futdg GC3LdrrVXSn1VFLG3UaiuQl8AWvwSzTxqoyFvfJUewYG/G+z4quqm7uBWNpeFCyu VVA6HcdcWrh71zISmyqAwxqr92MyRDtmUuGqUje+8eQB9GKnc9yvxHP5/HqbZuR3 JGm9T+3N4eMyMzYd7JA4mP+lVfgjxV/tRu6632XkFeiRH/yvnw8/dhpEsHqvgFG5 6r2JNYyWdCJatb5OQaox0Dp2NVllbFF64WB1XgrWBxwZCCZ2gClwYlonQfw4Ac96 jJsD7C6i3EmQtRud3t3gQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:from:from:in-reply-to:in-reply-to :message-id:mime-version:references:reply-to:sender:subject :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm1; t=1649876376; x=1649962776; bh=M37EyBJS1Jzyq Xk+UtQVEajyDV2fAtROSp2eIBXWaSk=; b=qWjZ2aqV7ROcXEh8yFDyPWhtO2SSx Rr/oTVgS5SI+eHl54r/kGpER66m5tmxiaGgT54bI1EDsJuKKGJ9KIn0ICWzviIC/ eWWpREm6eBFcxe00S+pD+SlkMQKnFXPtbWyhKtol4xdVyJ/MtjIMgeO1ymOuOiYV tF7kxzxCVO8UOoHNPTp6oJodLMowziSF/D2jI/SX1UuKfunUdqDMRFuUOQ4MbdXr PQ429R3eg/NrS6FNq8VSmTFSnx/p5vUU73N/5t/pk/qma/UgCePkyEGTm/bFm9NY Tf4SwwKnlQxOZumfQuTXiOYAN+J78bqC6RJTLyM2+nUXiU78t0USQgKEw== X-ME-Sender: <xms:mB1XYgJu9XqmJPObpcDainlrZiIIrvXQPn77I7c4_QUoiJRm1yZKEA> <xme:mB1XYgK_I0nBuhIjIOPxMXrk0_wqyjbWdnl-UrFT_7mLAjOW7zk8-sDRoRJAB14TN Y0rrkAkwEf9rnGgrzA> X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvvddrudeluddguddthecutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd enucfjughrpefofgggkfgjfhffhffvufgtgfesthhqredtreerjeenucfhrhhomhepfdfr hhhilhhiphcuofhunhhkshhgrggrrhgufdcuoehphhhilhhiphesmhhunhhkshhgrggrrh gurdhmvgeqnecuggftrfgrthhtvghrnhepleeitedvvdevfeeiheffkefflefhgfeuueek fefhkeduvdfhleeuuedvgfffudeunecuffhomhgrihhnpehgnhhurdhorhhgnecuvehluh hsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepphhhihhlihhpsehm uhhnkhhsghgrrghrugdrmhgv X-ME-Proxy: <xmx:mB1XYgt4DAtZLG698M6CoTJz4zOb95NdSGDhtxyrZPnvzW67jnZ53w> <xmx:mB1XYtZqMGGl6kyq0tH_yKz0NJ3Kwfrkyd1aEplDjltYz8DTn1x-JA> <xmx:mB1XYnaFJS9u09qq9Y5X_don5Dh4nlB3I90Y0aZn7tkj7lgDfSO_qg> <xmx:mB1XYuy63Q-g75IEdGqqYjJ-GFOQu385GBodBQuPwsPXN8hkG18GRQ> Received: by mailuser.nyi.internal (Postfix, from userid 501) id 4EF44AC0E98; Wed, 13 Apr 2022 14:59:36 -0400 (EDT) X-Mailer: MessagingEngine.com Webmail Interface User-Agent: Cyrus-JMAP/3.7.0-alpha0-387-g7ea99c4045-fm-20220413.002-g7ea99c40 Mime-Version: 1.0 Message-Id: <f1fedb67-1fcd-4cb1-9536-46d94d5684ba@HIDDEN> In-Reply-To: <Yk5/xeYW4K4yDnLJ@HIDDEN> References: <8a396a9803fc35ee63f01e608f87ffb16863bc6d.1649171729.git.philip@HIDDEN> <87zgkyow1r.fsf@HIDDEN> <Yk5/xeYW4K4yDnLJ@HIDDEN> Date: Wed, 13 Apr 2022 20:59:15 +0200 From: "Philip Munksgaard" <philip@HIDDEN> Content-Type: text/plain;charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.7 (/) X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.7 (-) Hi again On Thu, 7 Apr 2022, at 08:08, Lars-Dominik Braun wrote: > I=E2=80=99d rather have this in a separate wip-haskell branch than let= it sit > on core-updates indefinitely. Stackage also has a new release[1] using > GHC 9.0, which we could update to at the same time. Any news on this? Was the branch created? I can't seem to find it on htt= ps://git.savannah.gnu.org, and the changes haven't made it into master, = as far as I can tell. Best, Philip
X-Loop: help-debbugs@HIDDEN Subject: [bug#54729] [PATCH] build: haskell-build-system: Support packages w. multiple libraries Resent-From: Lars-Dominik Braun <lars@HIDDEN> Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> Resent-CC: guix-patches@HIDDEN Resent-Date: Thu, 14 Apr 2022 18:22:01 +0000 Resent-Message-ID: <handler.54729.B54729.164996051029141 <at> debbugs.gnu.org> Resent-Sender: help-debbugs@HIDDEN X-GNU-PR-Message: followup 54729 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Philip Munksgaard <philip@HIDDEN> Cc: Ricardo Wurmus <rekado@HIDDEN>, 54729 <at> debbugs.gnu.org, zimoun <zimon.toutoune@HIDDEN> Received: via spool by 54729-submit <at> debbugs.gnu.org id=B54729.164996051029141 (code B ref 54729); Thu, 14 Apr 2022 18:22:01 +0000 Received: (at 54729) by debbugs.gnu.org; 14 Apr 2022 18:21:50 +0000 Received: from localhost ([127.0.0.1]:57346 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1nf46I-0007Zx-AH for submit <at> debbugs.gnu.org; Thu, 14 Apr 2022 14:21:50 -0400 Received: from mout-p-201.mailbox.org ([80.241.56.171]:38478) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <lars@HIDDEN>) id 1nf46F-0007Zc-Fq for 54729 <at> debbugs.gnu.org; Thu, 14 Apr 2022 14:21:48 -0400 Received: from smtp1.mailbox.org (smtp1.mailbox.org [IPv6:2001:67c:2050:105:465:1:1:0]) (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 4KfSTb68JLz9sS7; Thu, 14 Apr 2022 20:21:39 +0200 (CEST) Date: Thu, 14 Apr 2022 20:21:32 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=6xq.net; s=MBO0001; t=1649960496; 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=V05oO4qD2BQZZ1HGgEJaQmGuQVfOi2HVp1CInsRkmCw=; b=a9E8CaKmpW6gK2bcAKY4JauL4kk8yO5EfWIl92/dTw8fFbVXdY2fna0JbWbFfbOfytO0P6 Y8Smw/yQQ9VYLVYakQgvsSbJ9axKg1nEpXX38cvABulD8/i/zUnVeJbaTDm5cHW28d1zGU 0gqzk4ZQkbDllbezH/FmKbjVAlbUGqpLvYl2Ddx0KG9ofW035BzUJneQvBBHI/fPxMnA8d pVx4obnA1/XMg37CHpL0R1cmLgYM6GOXkITH9KbPOrZ5p8bWXxFOUVmMFIVhkBvRc+BrQq QliaB+IY54iCq47b2Q6eCJ9JhCffQx+j1ejY1nWhkfS/MPBMwj8BzWc5nF2dQw== From: Lars-Dominik Braun <lars@HIDDEN> Message-ID: <YlhmLNPFwROULK5v@HIDDEN> References: <8a396a9803fc35ee63f01e608f87ffb16863bc6d.1649171729.git.philip@HIDDEN> <87zgkyow1r.fsf@HIDDEN> <Yk5/xeYW4K4yDnLJ@HIDDEN> <f1fedb67-1fcd-4cb1-9536-46d94d5684ba@HIDDEN> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <f1fedb67-1fcd-4cb1-9536-46d94d5684ba@HIDDEN> X-Spam-Score: -0.7 (/) X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.7 (-) Hi Philip, > Any news on this? Was the branch created? I can't seem to find it on https://git.savannah.gnu.org, and the changes haven't made it into master, as far as I can tell. sorry, I’ve been busy rebasing my new python-build-system (PEP 517) on top of master. I created the branch wip-haskell and pushed zimoun’s v2 – I hope that’s alright with you Philip? (I didn’t check the patches thoroughly, just tried to build attoparsec.) Cheers, Lars
X-Loop: help-debbugs@HIDDEN Subject: [bug#54729] [PATCH] build: haskell-build-system: Support packages w. multiple libraries Resent-From: "Philip Munksgaard" <philip@HIDDEN> Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> Resent-CC: guix-patches@HIDDEN Resent-Date: Fri, 15 Apr 2022 08:21:02 +0000 Resent-Message-ID: <handler.54729.B54729.165001082528921 <at> debbugs.gnu.org> Resent-Sender: help-debbugs@HIDDEN X-GNU-PR-Message: followup 54729 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: "Lars-Dominik Braun" <lars@HIDDEN> Cc: Ricardo Wurmus <rekado@HIDDEN>, 54729 <at> debbugs.gnu.org, zimoun <zimon.toutoune@HIDDEN> Received: via spool by 54729-submit <at> debbugs.gnu.org id=B54729.165001082528921 (code B ref 54729); Fri, 15 Apr 2022 08:21:02 +0000 Received: (at 54729) by debbugs.gnu.org; 15 Apr 2022 08:20:25 +0000 Received: from localhost ([127.0.0.1]:58075 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1nfHBp-0007WP-4b for submit <at> debbugs.gnu.org; Fri, 15 Apr 2022 04:20:25 -0400 Received: from wout3-smtp.messagingengine.com ([64.147.123.19]:35073) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <philip@HIDDEN>) id 1nfHBm-0007W7-Lg for 54729 <at> debbugs.gnu.org; Fri, 15 Apr 2022 04:20:23 -0400 Received: from compute2.internal (compute2.nyi.internal [10.202.2.46]) by mailout.west.internal (Postfix) with ESMTP id 9106D32022E5; Fri, 15 Apr 2022 04:20:15 -0400 (EDT) Received: from imap43 ([10.202.2.93]) by compute2.internal (MEProxy); Fri, 15 Apr 2022 04:20:16 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=munksgaard.me; h=cc:cc:content-transfer-encoding:content-type:date:date:from :from:in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to; s=fm1; t=1650010815; x= 1650097215; bh=zji7KoD1JuxIpVM7mkSIqUgqdH6MI9YN3h4Vx1s68+g=; b=k 63Ir0KRYWHMU6a0a0lvB7E1U6C/fcK7dSzaIC7iuWdnWy9v6MmERcmE343B7PAOp 3+DaMvW5bCaJe/lVjLm9CYxkQ97cyr6uE3eXp7oozbYZAGrW3WKFpY4SjEqKm6Mk 8/E8v/yjDJWBwizIWFOtIuH9n/xXxesBkk4ZJ+/NVD7x//hA3QLPUA+tRSo+RDbD iSHp86AGQY3l1DFfWv+cB+jJDYiwyteAevBkVubciPtFVdnWPf1Blodr6yNxyl+z sAnCWxMdB9S3gNjYSqhUy+fpPV1RJJYfto7I1fl55PcLATFFMasSEByqCnUWuN0l 6KdPRcSsa7THzQaCBx4tw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:from:from:in-reply-to:in-reply-to :message-id:mime-version:references:reply-to:sender:subject :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm1; t=1650010815; x=1650097215; bh=zji7KoD1JuxIp VM7mkSIqUgqdH6MI9YN3h4Vx1s68+g=; b=DuW1b2royTcau+8KPN4C7kem0l0RD BqEKXh2xumzqOs4bThQ2aYTiFy12EgYlJ0mKXO8zHXgVTiOITwUQLDxsTbjGrbBE uT5Dhq2UTG2SdGF+kBhQkqQLEtofcwzXfGHw42DIg+3+SOKpJrUjq/jz3DfeChbP HfFpS01rdOgvRXll0XgYYBhpsip07x60CjUragoYtc5/+wHmmb81PtJfgdlcHOxu LSqZmiL47lxtk457C21Y+0GJ+ILxR7TAufaSHGshelyDORFYo79d1ehHwdos5EcT d59iGajbo9TrhWkSYjjtVM4N+kqeM+ehpO/sq/blBCiJhf1ZwTfbILiiQ== X-ME-Sender: <xms:vipZYtktUpY1UzLAXKyPea_KLU8XUdsjyjKGhob-cfTpFTkrW3bDqA> <xme:vipZYo2XMJABejNzkeVIavanqIiV1Z6LKqoI3SXAa9izA2tpZsKmF6pwHMs8pmpRI wQlU2IhumxXQolcLnY> X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvvddrudelhedgtdefucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhepofgfggfkjghffffhvffutgfgsehtqhertderreejnecuhfhrohhmpedfrfhh ihhlihhpucfouhhnkhhsghgrrghrugdfuceophhhihhlihhpsehmuhhnkhhsghgrrghrug drmhgvqeenucggtffrrghtthgvrhhnpeekvdefveegudeileefheetjeekueefffetvdei geeljefghffhtdejudfhgeekveenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmh epmhgrihhlfhhrohhmpehphhhilhhiphesmhhunhhkshhgrggrrhgurdhmvg X-ME-Proxy: <xmx:vipZYjqNNQArA2T54s-E0PD-gJa2Xp77MUHGdoVKdxBXrrYoB0D3wQ> <xmx:vipZYtmpCvbAAb9rdSwnsJXo5vWKo5iEHDKKId46ASkYwPPGjd4Wkw> <xmx:vipZYr0Lc1UhwxEY-i9Sek3ujigeY7GzZBeWaxe2YjNP74fMn4vHag> <xmx:vypZYk-3kcWjn3sbcgRqWpiEKIcxdisgrR0R0waGwsPttaGMpUjzUQ> Received: by mailuser.nyi.internal (Postfix, from userid 501) id 95058AC0E98; Fri, 15 Apr 2022 04:20:14 -0400 (EDT) X-Mailer: MessagingEngine.com Webmail Interface User-Agent: Cyrus-JMAP/3.7.0-alpha0-387-g7ea99c4045-fm-20220413.002-g7ea99c40 Mime-Version: 1.0 Message-Id: <4b2d1388-b5a1-4821-8ded-d75138352284@HIDDEN> In-Reply-To: <YlhmLNPFwROULK5v@HIDDEN> References: <8a396a9803fc35ee63f01e608f87ffb16863bc6d.1649171729.git.philip@HIDDEN> <87zgkyow1r.fsf@HIDDEN> <Yk5/xeYW4K4yDnLJ@HIDDEN> <f1fedb67-1fcd-4cb1-9536-46d94d5684ba@HIDDEN> <YlhmLNPFwROULK5v@HIDDEN> Date: Fri, 15 Apr 2022 10:19:53 +0200 From: "Philip Munksgaard" <philip@HIDDEN> Content-Type: text/plain;charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.7 (/) X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.7 (-) Hi Lars On Thu, 14 Apr 2022, at 20:21, Lars-Dominik Braun wrote: > sorry, I=E2=80=99ve been busy rebasing my new python-build-system (PEP= 517) on > top of master. No worries, I just wanted to make sure it wasn't forgotten :-) > I created the branch wip-haskell and pushed zimoun=E2=80=99s v2 =E2=80= =93 I > hope that=E2=80=99s alright with you Philip? (I didn=E2=80=99t check t= he patches > thoroughly, just tried to build attoparsec.) Yeah that sounds perfect. Best, Philip
X-Loop: help-debbugs@HIDDEN Subject: [bug#54729] [PATCH] build: haskell-build-system: Support packages w. multiple libraries Resent-From: itd <itd@HIDDEN> Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> Resent-CC: guix-patches@HIDDEN Resent-Date: Fri, 23 Sep 2022 09:43:02 +0000 Resent-Message-ID: <handler.54729.B54729.166392617623971 <at> debbugs.gnu.org> Resent-Sender: help-debbugs@HIDDEN X-GNU-PR-Message: followup 54729 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 54729 <at> debbugs.gnu.org Received: via spool by 54729-submit <at> debbugs.gnu.org id=B54729.166392617623971 (code B ref 54729); Fri, 23 Sep 2022 09:43:02 +0000 Received: (at 54729) by debbugs.gnu.org; 23 Sep 2022 09:42:56 +0000 Received: from localhost ([127.0.0.1]:39463 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1obfCx-0006EZ-TP for submit <at> debbugs.gnu.org; Fri, 23 Sep 2022 05:42:56 -0400 Received: from mailout3.rbg.tum.de ([131.159.0.8]:34673) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <itd@HIDDEN>) id 1obfCv-0006EK-1g for 54729 <at> debbugs.gnu.org; Fri, 23 Sep 2022 05:42:55 -0400 Received: from mailrelay1.rbg.tum.de (mailrelay1.in.tum.de [131.159.254.14]) by mailout3.rbg.tum.de (Postfix) with ESMTPS id CBDF3100131 for <54729 <at> debbugs.gnu.org>; Fri, 23 Sep 2022 11:42:46 +0200 (CEST) Received: by mailrelay1.rbg.tum.de (Postfix, from userid 112) id C77821A8; Fri, 23 Sep 2022 11:42:46 +0200 (CEST) Received: from mailrelay1.rbg.tum.de (localhost [127.0.0.1]) by mailrelay1.rbg.tum.de (Postfix) with ESMTP id 8F21C1A1 for <54729 <at> debbugs.gnu.org>; Fri, 23 Sep 2022 11:42:42 +0200 (CEST) Received: from mail.net.in.tum.de (mail.net.in.tum.de [131.159.15.233]) by mailrelay1.rbg.tum.de (Postfix) with ESMTP id 8D813CD for <54729 <at> debbugs.gnu.org>; Fri, 23 Sep 2022 11:42:42 +0200 (CEST) Received: from amnesix.net.in.tum.de (amnesix.net.in.tum.de [131.159.20.238]) by mail.net.in.tum.de (Postfix) with ESMTP id 68E7228C100B; Fri, 23 Sep 2022 11:42:42 +0200 (CEST) From: itd <itd@HIDDEN> In-Reply-To: <8a396a9803fc35ee63f01e608f87ffb16863bc6d.1649171729.git.philip@HIDDEN> References: <8a396a9803fc35ee63f01e608f87ffb16863bc6d.1649171729.git.philip@HIDDEN> Date: Fri, 23 Sep 2022 11:42:41 +0200 Message-ID: <877d1uifzi.fsf@localhost> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -3.3 (---) --=-=-= Content-Type: text/plain Hi, thanks for the patch! I applied it, tried it, and ran into some build issues. Maybe I missed something; here is (roughly) what I tried: $ # apply diff to current master $ git checkout a57c4eff6bbdcff79294fa15ecb95ab2b3c55bb4 $ git checkout origin/wip-haskell -- guix/build/haskell-build-system.scm $ # bump ghc-attoparsec version $ git diff gnu/packages/haskell-xyz.scm diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index db653f8c93..c4da66aa4a 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -589,7 +589,7 @@ (define-public ghc-atomic-write-0.2.0.7 (define-public ghc-attoparsec (package (name "ghc-attoparsec") - (version "0.13.2.5") + (version "0.14.4") (source (origin (method url-fetch) @@ -599,10 +599,12 @@ (define-public ghc-attoparsec ".tar.gz")) (sha256 (base32 - "0vv88m5m7ynjrg114psp4j4s69f1a5va3bvn293vymqrma7g7q11")))) + "0v4yjz4qi8bwhbyavqxlhsfb1iv07v10gxi64khmsmi4hvjpycrz")))) (build-system haskell-build-system) (arguments - `(#:phases + `(#:cabal-revision + ("2" "00jyrn2asz1kp698l3fyh19xxxz4npf1993y041x9b9cq239smn0") + #:phases (modify-phases %standard-phases (add-after 'unpack 'patch-for-newer-quickcheck (lambda _ $ # build ghc-attoparsec-iso8601 which depends on ghc-attoparsec $ guix shell -D guix help2man git strace --pure # & bootstrap & ... $ ./pre-inst-env guix build ghc-attoparsec-iso8601 After some time, this build failed with: > phase `setup-compiler' succeeded after 0.1 seconds > starting phase `configure' > running "runhaskell Setup.hs" with command "configure" and parameters ("--prefix=/gnu/store/70ddgy9ayd4239dp37b7kvcsdxkg5nrj-ghc-attoparsec-iso8601-1.0.2.0" "--libdir=/gnu/store/70ddgy9ayd4239dp37b7kvcsdxkg5nrj-ghc-attoparsec-iso8601-1.0.2.0/lib" "--docdir=/gnu/store/70ddgy9ayd4239dp37b7kvcsdxkg5nrj-ghc-attoparsec-iso8601-1.0.2.0/share/doc/ghc-attoparsec-iso8601-1.0.2.0" "--libsubdir=$compiler/$pkg-$version" "--package-db=/tmp/guix-build-ghc-attoparsec-iso8601-1.0.2.0.drv-0/package.conf.d" "--global" "--enable-tests" "--enable-shared" "--enable-executable-dynamic" "--ghc-option=-fPIC" "--ghc-option=-optl=-Wl,-rpath=/gnu/store/70ddgy9ayd4239dp37b7kvcsdxkg5nrj-ghc-attoparsec-iso8601-1.0.2.0/lib/$compiler/$pkg-$version") > Configuring attoparsec-iso8601-1.0.2.0... > Error: > 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 Ignorant of the patch provided here, I tried to build newer versions of ghc-attoparsec / its dependants and ended up with the attached patch. Using this patch, the build succeeds (but I am not sure if the patch's approach is sensible). --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=0001-WIP-update-haskell-build-system-for-newer-attoparsec.patch From 959dc9de2d4aa39b7490b4c90e28820edf0d00f9 Mon Sep 17 00:00:00 2001 From: itd <itd@HIDDEN> Date: Fri, 23 Sep 2022 10:58:09 +0200 Subject: [PATCH] WIP update haskell-build-system for newer attoparsec --- guix/build/haskell-build-system.scm | 86 +++++++++++++++++------------ 1 file changed, 51 insertions(+), 35 deletions(-) diff --git a/guix/build/haskell-build-system.scm b/guix/build/haskell-build-system.scm index ef6cb316ee..d4c4ed4c8c 100644 --- a/guix/build/haskell-build-system.scm +++ b/guix/build/haskell-build-system.scm @@ -219,7 +219,10 @@ (define* (register #:key name system inputs outputs #:allow-other-keys) (dep-conf* (string-append dest "/" id ".conf"))) (when (not (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? + ;; Different libraries of same package may share + ;; dependencies. Hence, file may exist already. + (when (not (file-exists? 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)))))) @@ -234,46 +237,59 @@ (define* (register #:key name system inputs outputs #:allow-other-keys) "/ghc-" version "/" name ".conf.d")) (id-rx (make-regexp "^id:[ \n\t]+([^ \t\n]+)$" regexp/newline)) - (config-file (string-append out "/" name ".conf")) + (maybe-config-file (string-append out "/" name ".conf")) (params - (list (string-append "--gen-pkg-config=" config-file)))) + (list (string-append "--gen-pkg-config=" maybe-config-file)))) (run-setuphs "register" params) ;; The conf file is created only when there is a library to register. - (when (file-exists? config-file) + (when (file-exists? maybe-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))) + ;; If more that one library is defined, they share conf file as + ;; parent directory. + (let* ((config-files (if (file-is-directory? maybe-config-file) + (find-files maybe-config-file) + (list maybe-config-file)))) + (map + (lambda (config-file) + (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))) + (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"))) + ;; 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) + ;; Make current conf file available for possible + ;; subsequent conf files. + (copy-file config-file + (string-append %tmp-db-dir "/" + config-file-name+id ".conf")) + (rename-file config-file + (string-append config-dir "/" + config-file-name+id ".conf")) + (invoke "ghc-pkg" + (string-append "--package-db=" config-dir) + "recache"))) + config-files))) #t)) (define* (check #:key tests? test-target #:allow-other-keys) base-commit: a57c4eff6bbdcff79294fa15ecb95ab2b3c55bb4 -- 2.37.3 --=-=-= Content-Type: text/plain Regards itd --=-=-=--
X-Loop: help-debbugs@HIDDEN Subject: [bug#54729] [PATCH] build: haskell-build-system: Support packages w. multiple libraries Resent-From: itd <itd@HIDDEN> Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> Resent-CC: guix-patches@HIDDEN Resent-Date: Wed, 21 Dec 2022 12:49:02 +0000 Resent-Message-ID: <handler.54729.B54729.16716269073469 <at> debbugs.gnu.org> Resent-Sender: help-debbugs@HIDDEN X-GNU-PR-Message: followup 54729 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Lars-Dominik Braun <lars@HIDDEN> Cc: Philip Munksgaard <philip@HIDDEN>, 54729 <at> debbugs.gnu.org, zimoun <zimon.toutoune@HIDDEN> Received: via spool by 54729-submit <at> debbugs.gnu.org id=B54729.16716269073469 (code B ref 54729); Wed, 21 Dec 2022 12:49:02 +0000 Received: (at 54729) by debbugs.gnu.org; 21 Dec 2022 12:48:27 +0000 Received: from localhost ([127.0.0.1]:51651 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1p7yWJ-0000tt-91 for submit <at> debbugs.gnu.org; Wed, 21 Dec 2022 07:48:27 -0500 Received: from mailout1.rbg.tum.de ([131.159.0.201]:38401) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <itd@HIDDEN>) id 1p7yWH-0000tm-Mz for 54729 <at> debbugs.gnu.org; Wed, 21 Dec 2022 07:48:26 -0500 Received: from mailrelay1.rbg.tum.de (mailrelay1.in.tum.de [IPv6:2a09:80c0:254::14]) by mailout1.rbg.tum.de (Postfix) with ESMTPS id DEC2A76; Wed, 21 Dec 2022 13:48:17 +0100 (CET) Received: by mailrelay1.rbg.tum.de (Postfix, from userid 112) id D6CA918C; Wed, 21 Dec 2022 13:48:17 +0100 (CET) Received: from mailrelay1.rbg.tum.de (localhost [127.0.0.1]) by mailrelay1.rbg.tum.de (Postfix) with ESMTP id B68DF110; Wed, 21 Dec 2022 13:48:16 +0100 (CET) Received: from mail.net.in.tum.de (mail.net.in.tum.de [IPv6:2001:4ca0:2001:14:216:3eff:fe52:ed14]) by mailrelay1.rbg.tum.de (Postfix) with ESMTP id A35608E; Wed, 21 Dec 2022 13:48:16 +0100 (CET) Received: from borderline.net.in.tum.de (borderline-1.net.in.tum.de [IPv6:2001:4ca0:2001:11:ec4:7aff:fe06:81ca]) by mail.net.in.tum.de (Postfix) with ESMTPS id 70DAE28220AF; Wed, 21 Dec 2022 13:48:16 +0100 (CET) From: itd <itd@HIDDEN> In-Reply-To: <877d1uifzi.fsf@localhost> References: <8a396a9803fc35ee63f01e608f87ffb16863bc6d.1649171729.git.philip@HIDDEN> <877d1uifzi.fsf@localhost> Date: Wed, 21 Dec 2022 13:48:12 +0100 Message-ID: <87cz8c2a9f.fsf@localhost> MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.0 (-) Dear Haskell team, dear all, itd <itd@HIDDEN> writes: > thanks for the patch! I applied it, tried it, and ran into some build > issues. [...] > Ignorant of the patch provided here, I tried to build newer versions of > ghc-attoparsec / its dependants and ended up with the attached patch. > Using this patch, the build succeeds (but I am not sure if the patch's > approach is sensible). [...] if possible, I'd appreciate feedback on my previous mail. E.g., does my attempt in using the originally proposed patch make sense? Any opinions on my patch? Thank you. Regards itd
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997 nCipher Corporation Ltd,
1994-97 Ian Jackson.