From unknown Fri Sep 12 12:20:27 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#61420 <61420@debbugs.gnu.org> To: bug#61420 <61420@debbugs.gnu.org> Subject: Status: [PATCH 00/31] Haskell upgrade to Stackage 20.5 Reply-To: bug#61420 <61420@debbugs.gnu.org> Date: Fri, 12 Sep 2025 19:20:27 +0000 retitle 61420 [PATCH 00/31] Haskell upgrade to Stackage 20.5 reassign 61420 guix-patches submitter 61420 Lars-Dominik Braun severity 61420 normal tag 61420 patch thanks From debbugs-submit-bounces@debbugs.gnu.org Sat Feb 11 04:59:35 2023 Received: (at submit) by debbugs.gnu.org; 11 Feb 2023 09:59:35 +0000 Received: from localhost ([127.0.0.1]:38783 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pQmfO-0003pe-MR for submit@debbugs.gnu.org; Sat, 11 Feb 2023 04:59:35 -0500 Received: from lists.gnu.org ([209.51.188.17]:57734) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pQmfM-0003pV-0W for submit@debbugs.gnu.org; Sat, 11 Feb 2023 04:59:32 -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 1pQmfL-0001ZR-Np for guix-patches@gnu.org; Sat, 11 Feb 2023 04:59:31 -0500 Received: from mout-p-201.mailbox.org ([2001:67c:2050:0:465::201]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_CHACHA20_POLY1305:256) (Exim 4.90_1) (envelope-from ) id 1pQmfI-0006Yh-Tf for guix-patches@gnu.org; Sat, 11 Feb 2023 04:59:31 -0500 Received: from smtp202.mailbox.org (smtp202.mailbox.org [IPv6:2001:67c:2050:b231:465::202]) (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 4PDR0B0JDTz9sbm for ; Sat, 11 Feb 2023 10:59:22 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=6xq.net; s=MBO0001; t=1676109562; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fyuSGtzCocwf8kEDtICUqdir3l93TWfL+YWHoFKALa4=; b=0ku4bHdH3Y0M7xseaie3XYBMqDyZNLf4dFq5VjdR0h1mnUvQnbyDHeXNn/L6geYGAF2qX3 xeG7QkHJkmw7/436EUT1go3tzvnJFu1vsrEBwEzrw69p5jqCRpNz3z4OSMf7jnv/+Pc/ti sgNqn5prJO9+17Oga//yHHFW7YgxkR5+slrKTXMTL8gdsQNbJT4xR+qaiocPPa48lBsBq+ k1uLPE9GNAWy3FkAxws3AZQ4SCl+yq6JL6oPVJqu2RSF5xg8UMSqSDQdg5bGW4hAEKRkIM ripLNDFu6/uwLBYrR9y52A2RX0JfubKncwNgadxMSUsV3lxpne7FApdYRdBlVw== Date: Sat, 11 Feb 2023 10:59:17 +0100 From: Lars-Dominik Braun To: guix-patches@gnu.org Subject: [PATCH 00/31] Haskell upgrade to Stackage 20.5 Message-ID: MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 4PDR0B0JDTz9sbm Received-SPF: pass client-ip=2001:67c:2050:0:465::201; envelope-from=lars@6xq.net; helo=mout-p-201.mailbox.org 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_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.6 (-) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.6 (--) Hi, these patches (also found in the wip-haskell branch) lift Haskell to the Stackage release 20.5, which is based on GHC 9.2. Apart from the upgrade, I also made a few fixes to haskell-build-system and the importer such as - Support for multiple Haskell libraries in one package (see #54729). - Add an upstream-name property to all packages and use it in the updater. - Use hackage-uri instead of string-append to build URLs. - Build binaries statically by default and remove extra static output from haskell-build-system (this reduces pandoc’s size even further by ~100MB without the need to resort to weird input rewriting hacks). I’m not including the big, automated changes here – please check the branch. Cheers, Lars Lars-Dominik Braun (29): import: hackage: Allow version at the beginning of cabal file. gnu: Switch default to GHC 9.2. import: stackage: Update to release 20.5. import: hackage: Add upstream-name property. gnu: Add upstream-name property to Haskell packages. import: hackage: Use upstream-name property. gnu: Use HACKAGE-URI for packages from Hackage. import: haskell: Add new internal library for GHC 9.2. build: haskell-build-system: Process all transitive dependencies. build: haskell-build-system: Remove unused linker flags. Upgrade Haskell packages. gnu: ghc-9.2: Increase make verbosity. gnu: Remove unused Haskell packages. gnu: ghc-parsec: Update to 3.1.15.0. gnu: idris: Fix overly zealous regular expression. gnu: elm: Support GHC 9.2. build-system: haskell: Drop default "static" output. gnu: ghc-9.2: Support static linking with glibc < 2.34. gnu: ghc-lua: Disable symbol export. build: haskell-build-system: Build static executables by default. gnu: ngless: Drop Haskell libraries and documentation. gnu: hledger: Drop Haskell libraries and documentation. gnu: darcs: Drop Haskell libraries and documentation. gnu: git-annex: Drop Haskell documentation. gnu: shellcheck: Drop Haskell libraries. gnu: pandoc: Drop Haskell libraries and documentation. gnu: purescript: Drop Haskell libraries and documentation. gnu: xmobar: Drop Haskell libraries and documentation. gnu: idris: Adapt to changed haskell-build-system. Philip Munksgaard (1): build: haskell-build-system: Support multiple libraries. zimoun (1): build: haskell-build-system: Remove trailing #t. gnu/local.mk | 8 +- gnu/packages/agda.scm | 5 +- gnu/packages/bioinformatics.scm | 215 +- gnu/packages/dhall.scm | 168 +- gnu/packages/elm.scm | 5 +- gnu/packages/finance.scm | 213 +- gnu/packages/haskell-apps.scm | 613 +- gnu/packages/haskell-check.scm | 782 +- gnu/packages/haskell-crypto.scm | 352 +- gnu/packages/haskell-web.scm | 1453 +- gnu/packages/haskell-xyz.scm | 11569 ++++++++-------- gnu/packages/haskell.scm | 25 +- gnu/packages/idris.scm | 14 +- gnu/packages/lisp.scm | 127 +- .../cabal-install-base16-bytestring1.0.patch | 29 - .../patches/cabal-install-ghc8.10.patch | 393 - gnu/packages/patches/elm-ghc9.2.patch | 187 + .../ghc-9.2-glibc-2.33-link-order.patch | 35 + .../patches/ghc-bloomfilter-ghc9.2.patch | 303 + .../patches/ghc-bytestring-handle-ghc9.patch | 67 + gnu/packages/patches/ngless-unliftio.patch | 66 - .../patches/xmonad-dynamic-linking.patch | 24 +- .../patches/xmonad-next-dynamic-linking.patch | 16 - gnu/packages/purescript.scm | 172 +- gnu/packages/wm.scm | 136 +- guix/build-system/haskell.scm | 5 +- guix/build/haskell-build-system.scm | 136 +- guix/import/hackage.scm | 21 +- guix/import/stackage.scm | 6 +- tests/hackage.scm | 5 + 30 files changed, 8449 insertions(+), 8701 deletions(-) delete mode 100644 gnu/packages/patches/cabal-install-base16-bytestring1.0.patch delete mode 100644 gnu/packages/patches/cabal-install-ghc8.10.patch create mode 100644 gnu/packages/patches/elm-ghc9.2.patch create mode 100644 gnu/packages/patches/ghc-9.2-glibc-2.33-link-order.patch create mode 100644 gnu/packages/patches/ghc-bloomfilter-ghc9.2.patch create mode 100644 gnu/packages/patches/ghc-bytestring-handle-ghc9.patch delete mode 100644 gnu/packages/patches/ngless-unliftio.patch delete mode 100644 gnu/packages/patches/xmonad-next-dynamic-linking.patch base-commit: 900d33527c9286a811f064d4bb8f4a9b18d1db0b -- 2.38.2 From debbugs-submit-bounces@debbugs.gnu.org Sat Feb 11 05:08:47 2023 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 To: 61420@debbugs.gnu.org Subject: [PATCH 01/31] import: hackage: Allow version at the beginning of cabal file. Date: Sat, 11 Feb 2023 11:07:58 +0100 Message-Id: <20230211100825.47971-1-lars@6xq.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 61420 Cc: Lars-Dominik Braun X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) 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)) -- 2.38.2 From debbugs-submit-bounces@debbugs.gnu.org Sat Feb 11 05:08:52 2023 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 To: 61420@debbugs.gnu.org Subject: [PATCH 03/31] build: haskell-build-system: Support multiple libraries. 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 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 4PDRBr3DsLz9sbm X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 61420 Cc: Philip Munksgaard , Lars-Dominik Braun , zimoun X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) 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." -- 2.38.2 From debbugs-submit-bounces@debbugs.gnu.org Sat Feb 11 05:08:53 2023 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 To: 61420@debbugs.gnu.org Subject: [PATCH 04/31] gnu: Switch default to GHC 9.2. 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 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 4PDRBr5M84z9scZ X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 61420 Cc: Lars-Dominik Braun X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * 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) -- 2.38.2 From debbugs-submit-bounces@debbugs.gnu.org Sat Feb 11 05:08:53 2023 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 To: 61420@debbugs.gnu.org Subject: [PATCH 05/31] import: stackage: Update to release 20.5. 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 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 4PDRBs0LVnz9sZ5 X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 61420 Cc: Lars-Dominik Braun X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * 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? -- 2.38.2 From debbugs-submit-bounces@debbugs.gnu.org Sat Feb 11 05:08:54 2023 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 To: 61420@debbugs.gnu.org Subject: [PATCH 06/31] import: hackage: Add upstream-name property. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 61420 Cc: Lars-Dominik Braun X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * 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?)) -- 2.38.2 From debbugs-submit-bounces@debbugs.gnu.org Sat Feb 11 05:08:54 2023 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 To: 61420@debbugs.gnu.org Subject: [PATCH 08/31] import: hackage: Use upstream-name property. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 61420 Cc: Lars-Dominik Braun X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * 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))))) -- 2.38.2 From debbugs-submit-bounces@debbugs.gnu.org Sat Feb 11 05:08:54 2023 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 To: 61420@debbugs.gnu.org Subject: [PATCH 10/31] import: haskell: Add new internal library for GHC 9.2. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 61420 Cc: Lars-Dominik Braun X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * 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" -- 2.38.2 From debbugs-submit-bounces@debbugs.gnu.org Sat Feb 11 05:08:55 2023 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 To: 61420@debbugs.gnu.org Subject: [PATCH 02/31] build: haskell-build-system: Remove trailing #t. 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 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 4PDRBq62s6z9sTN X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 61420 Cc: Lars-Dominik Braun , zimoun X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) 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 -- 2.38.2 From debbugs-submit-bounces@debbugs.gnu.org Sat Feb 11 05:08:55 2023 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 To: 61420@debbugs.gnu.org Subject: [PATCH 12/31] build: haskell-build-system: Remove unused linker flags. 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 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 4PDRBt5kq3z9sdL X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 61420 Cc: Lars-Dominik Braun X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) 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. -- 2.38.2 From debbugs-submit-bounces@debbugs.gnu.org Sat Feb 11 05:08:56 2023 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 To: 61420@debbugs.gnu.org Subject: [PATCH 11/31] build: haskell-build-system: Process all transitive dependencies. 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 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 4PDRBt3Rbtz9sd1 X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 61420 Cc: Lars-Dominik Braun X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) 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) -- 2.38.2 From debbugs-submit-bounces@debbugs.gnu.org Sat Feb 11 05:08:56 2023 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 To: 61420@debbugs.gnu.org Subject: [PATCH 14/31] gnu: ghc-9.2: Increase make verbosity. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 61420 Cc: Lars-Dominik Braun X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) 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) -- 2.38.2 From debbugs-submit-bounces@debbugs.gnu.org Sat Feb 11 05:08:56 2023 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 To: 61420@debbugs.gnu.org Subject: [PATCH 17/31] gnu: idris: Fix overly zealous regular expression. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 61420 Cc: Lars-Dominik Braun X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * 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 _ -- 2.38.2 From debbugs-submit-bounces@debbugs.gnu.org Sat Feb 11 05:08:57 2023 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 To: 61420@debbugs.gnu.org Subject: [PATCH 16/31] gnu: ghc-parsec: Update to 3.1.15.0. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 61420 Cc: Lars-Dominik Braun X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) 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 -- 2.38.2 From debbugs-submit-bounces@debbugs.gnu.org Sat Feb 11 05:08:57 2023 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 To: 61420@debbugs.gnu.org Subject: [PATCH 15/31] gnu: Remove unused Haskell packages. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 61420 Cc: Lars-Dominik Braun X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * 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") -- 2.38.2 From debbugs-submit-bounces@debbugs.gnu.org Sat Feb 11 05:08:57 2023 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 To: 61420@debbugs.gnu.org Subject: [PATCH 21/31] gnu: ghc-lua: Disable symbol export. 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 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 4PDRBx2Fysz9srW X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 61420 Cc: Lars-Dominik Braun X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) 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") -- 2.38.2 From debbugs-submit-bounces@debbugs.gnu.org Sat Feb 11 05:08:58 2023 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 To: 61420@debbugs.gnu.org Subject: [PATCH 20/31] gnu: ghc-9.2: Support static linking with glibc < 2.34. 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 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 4PDRBx09Jcz9sW7 X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 61420 Cc: Lars-Dominik Braun X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * 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 + ) + -- 2.38.2 From debbugs-submit-bounces@debbugs.gnu.org Sat Feb 11 05:08:58 2023 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 To: 61420@debbugs.gnu.org Subject: [PATCH 22/31] build: haskell-build-system: Build static executables by default. 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 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 4PDRBx4wWXz9slG X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 61420 Cc: Lars-Dominik Braun X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) 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. -- 2.38.2 From debbugs-submit-bounces@debbugs.gnu.org Sat Feb 11 05:08:59 2023 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 To: 61420@debbugs.gnu.org Subject: [PATCH 19/31] build-system: haskell: Drop default "static" output. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 61420 Cc: Lars-Dominik Braun X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * 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." -- 2.38.2 From debbugs-submit-bounces@debbugs.gnu.org Sat Feb 11 05:09:00 2023 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 To: 61420@debbugs.gnu.org Subject: [PATCH 18/31] gnu: elm: Support GHC 9.2. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 61420 Cc: Lars-Dominik Braun X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * 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#) -- 2.38.2 From debbugs-submit-bounces@debbugs.gnu.org Sat Feb 11 05:09:00 2023 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 To: 61420@debbugs.gnu.org Subject: [PATCH 23/31] gnu: ngless: Drop Haskell libraries and documentation. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 61420 Cc: Lars-Dominik Braun X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * 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 -- 2.38.2 From debbugs-submit-bounces@debbugs.gnu.org Sat Feb 11 05:09:00 2023 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 To: 61420@debbugs.gnu.org Subject: [PATCH 26/31] gnu: git-annex: Drop Haskell documentation. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 61420 Cc: Lars-Dominik Braun X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * 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 -- 2.38.2 From debbugs-submit-bounces@debbugs.gnu.org Sat Feb 11 05:09:01 2023 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 To: 61420@debbugs.gnu.org Subject: [PATCH 29/31] gnu: purescript: Drop Haskell libraries and documentation. 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 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 4PDRBz6Rk6z9sgw X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 61420 Cc: Lars-Dominik Braun X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * 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 -- 2.38.2 From debbugs-submit-bounces@debbugs.gnu.org Sat Feb 11 05:09:01 2023 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 To: 61420@debbugs.gnu.org Subject: [PATCH 30/31] gnu: xmobar: Drop Haskell libraries and documentation. 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 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 4PDRC01cpzz9sWd X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 61420 Cc: Lars-Dominik Braun X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * 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 -- 2.38.2 From debbugs-submit-bounces@debbugs.gnu.org Sat Feb 11 05:09:22 2023 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 To: 61420@debbugs.gnu.org Subject: [PATCH 31/31] gnu: idris: Adapt to changed haskell-build-system. 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 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 61420 Cc: Lars-Dominik Braun X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) …which does not support the “static” output any more. * gnu/packages/idris.scm (idris)[arguments]: Remove phase restore-libidris_rts. --- gnu/packages/idris.scm | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/gnu/packages/idris.scm b/gnu/packages/idris.scm index 2a5f63c174..85fb6cc2d2 100644 --- a/gnu/packages/idris.scm +++ b/gnu/packages/idris.scm @@ -122,17 +122,7 @@ (define-public idris (setenv "TASTY_NUM_THREADS" (number->string (parallel-job-count))) (setenv "IDRIS_CC" ,(cc-for-target)) ;Needed for creating executables (setenv "PATH" (string-append out "/bin:" (getenv "PATH"))) - (apply (assoc-ref %standard-phases 'check) args)))) - (add-before 'check 'restore-libidris_rts - (lambda* (#:key outputs #:allow-other-keys) - ;; The Haskell build system moves this library to the - ;; "static" output. Idris only knows how to find it in the - ;; "out" output, so we restore it here. - (let ((out (assoc-ref outputs "out")) - (static (assoc-ref outputs "static")) - (filename "/lib/idris/rts/libidris_rts.a")) - (rename-file (string-append static filename) - (string-append out filename)))))))) + (apply (assoc-ref %standard-phases 'check) args))))))) (native-search-paths (list (search-path-specification (variable "IDRIS_LIBRARY_PATH") -- 2.38.2 From debbugs-submit-bounces@debbugs.gnu.org Sat Feb 11 05:15:31 2023 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 To: 61420@debbugs.gnu.org Subject: [PATCH 27/31] gnu: shellcheck: Drop Haskell libraries. 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 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 4PDRBz1tn9z9scT X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 61420 Cc: Lars-Dominik Braun X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * 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 -- 2.38.2 From debbugs-submit-bounces@debbugs.gnu.org Sat Feb 11 05:16:58 2023 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 To: 61420@debbugs.gnu.org Subject: [PATCH 24/31] gnu: hledger: Drop Haskell libraries and documentation. 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 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 4PDRBy2BX5z9sd9 X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 61420 Cc: Lars-Dominik Braun X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * 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 -- 2.38.2 From debbugs-submit-bounces@debbugs.gnu.org Sat Feb 11 05:17:24 2023 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 To: 61420@debbugs.gnu.org Subject: [PATCH 25/31] gnu: darcs: Drop Haskell libraries and documentation. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 61420 Cc: Lars-Dominik Braun X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * 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 -- 2.38.2 From debbugs-submit-bounces@debbugs.gnu.org Sat Feb 11 05:17:25 2023 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 To: 61420@debbugs.gnu.org Subject: [PATCH 28/31] gnu: pandoc: Drop Haskell libraries and documentation. 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 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 4PDRBz4gj2z9slW X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 61420 Cc: Lars-Dominik Braun X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * 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 -- 2.38.2 From debbugs-submit-bounces@debbugs.gnu.org Tue Feb 14 14:27:13 2023 Received: (at 61420) by debbugs.gnu.org; 14 Feb 2023 19:27:13 +0000 Received: from localhost ([127.0.0.1]:57042 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pS0xN-0002Yf-Cv for submit@debbugs.gnu.org; Tue, 14 Feb 2023 14:27:13 -0500 Received: from mail-wm1-f53.google.com ([209.85.128.53]:39871) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pS0xL-0002YO-Ai for 61420@debbugs.gnu.org; Tue, 14 Feb 2023 14:27:12 -0500 Received: by mail-wm1-f53.google.com with SMTP id hg24-20020a05600c539800b003e1f5f2a29cso1993392wmb.4 for <61420@debbugs.gnu.org>; Tue, 14 Feb 2023 11:27:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1676402825; h=content-transfer-encoding:mime-version:message-id:date:references :in-reply-to:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=OQNpy+cKg/7gIbM431mLbRdvO9b8qyVhS6nQVyQVyQI=; b=Otnde5QjpRQFMCN9FbPSTl0by5UmNsJsQuelFqXOrF85Lfx6Re5rFMUytR8vjkBIfB BTau3M3F/VTGTPFbQeR8YxYSpH/tQU8kvUtbwrD07OQ0XQnIx7XApahNCg6lf4bq+Lvh mM1HGrN+OXMmuJM1VJWz4DdllCAk9QLh3FgeQEc9mEDl3MEYycVag3wunSmu0QAj3yGN BHSNADh1SHyHDOnFYUWecSM/oEAPrdwMwF53wcKwntKZDlUDRG3/DcE2UXiwl3gcRuop tXnUAroqHvs9UMCgQQMJE1Ku5lbfCC85OzZLQdkBqwKxcvHZz3cv06T2Ht5s/q4QJ2qM IIpQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1676402825; h=content-transfer-encoding:mime-version:message-id:date:references :in-reply-to:subject:to:from:x-gm-message-state:from:to:cc:subject :date:message-id:reply-to; bh=OQNpy+cKg/7gIbM431mLbRdvO9b8qyVhS6nQVyQVyQI=; b=CABIbygykK0BchG+92CLfOfFNeaImxyQQOQ/zKuQEHzfqYdJl0WsSBdR0YFRqq7kUl MXKIUvBxNCBiYmwKXJ6q8TSet5F9SEjtwtzZW94D72Qiz5vn62pBys+hNhAuXEvPiz4B 2mCIb/kLHttY88bonNY9yvL2sYHsVZg8GLVWCjMBJ+A7FisL3ls6VzPneRT4k/kuCY1k +y/XaBfIQkbaYhxnr6lCuRsdGSWYV9hlcni2U/T80N6FpEdKq+jCsaikGU3BPAA5/Oyi uoARTpLx1OECx+lcXuaxAysCiGcsitMncNMdWWL9VjcdDb+K0g0adZancFkVaUjiXlG4 6ZLw== X-Gm-Message-State: AO0yUKXFhSqCBWgnnrfkJL0B7AJjtCIBvyTTk4UliNyYdC9lgxll+dsx 5w5fzFYOCB3Ea5bwsKKdLB0FIIy1e7g= X-Google-Smtp-Source: AK7set/iJYXyGJF0LYJLQXHGMDb6bgdtHD9ZDDVsO/tYCibc8wWWOW+mgS14pPFBueIW4eserKBHxA== X-Received: by 2002:a1c:ed12:0:b0:3dd:1cd3:5d75 with SMTP id l18-20020a1ced12000000b003dd1cd35d75mr90012wmh.0.1676402825733; Tue, 14 Feb 2023 11:27:05 -0800 (PST) Received: from pfiuh07 ([193.48.40.241]) by smtp.gmail.com with ESMTPSA id c15-20020adffb4f000000b002c5441dae62sm12434380wrs.17.2023.02.14.11.27.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Feb 2023 11:27:05 -0800 (PST) From: Simon Tournier To: Lars-Dominik Braun , 61420@debbugs.gnu.org Subject: Re: [bug#61420] [PATCH 00/31] Haskell upgrade to Stackage 20.5 In-Reply-To: References: Date: Tue, 14 Feb 2023 20:27:03 +0100 Message-ID: <87sff8xd2w.fsf@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 61420 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi Lars, On sam., 11 f=C3=A9vr. 2023 at 10:59, Lars-Dominik Braun wro= te: > these patches (also found in the wip-haskell branch) lift Haskell to > the Stackage release 20.5, which is based on GHC 9.2. >From the CI dashboard https://ci.guix.gnu.org/eval/183093/dashboard all seem green. Well, it is hard to know but giving a look at the various evaluations, https://ci.guix.gnu.org/eval/183093 https://ci.guix.gnu.org/eval/154817?status=3Dfailed for instance, https://ci.guix.gnu.org/build/373800/log/raw reports that =E2=80=99opencv=E2=80=99 is failing but it is unrelated to this branch =E2= =80=93 =E2=80=9Cguix weather=E2=80=9D reports it is broken on master for Berlin but not Bordeaux. https://ci.guix.gnu.org/build/420612/details Similarly for the other broken packages in this wip-haskell branch. However, python-pypandoc seems broken on wip-haskell but not in master. Idem for ganeti I have locally rebased wip-haskell on the top of master (4501a50bbd) and these 2 packages (python-pypandoc and ganeti) are still failing (once the series is applied) but not in master (before the series is applied, i.e., commit 4501a50bbd). Well, I have not carefully checked yet each commit but they appear good to me; except maybe =C2=AB Upgrade Haskell packages. =C2=BB but it is too m= uch work for improving, IMHO. :-) Cheers, simon From debbugs-submit-bounces@debbugs.gnu.org Wed Feb 15 03:45:48 2023 Received: (at 61420) by debbugs.gnu.org; 15 Feb 2023 08:45:48 +0000 Received: from localhost ([127.0.0.1]:57696 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pSDQC-0004HM-0L for submit@debbugs.gnu.org; Wed, 15 Feb 2023 03:45:48 -0500 Received: from mout-p-201.mailbox.org ([80.241.56.171]:37808) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pSDQ9-0004H1-6l for 61420@debbugs.gnu.org; Wed, 15 Feb 2023 03:45:46 -0500 Received: from smtp202.mailbox.org (smtp202.mailbox.org [10.196.197.202]) (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 4PGs9D4Mf8z9t4Y; Wed, 15 Feb 2023 09:45:36 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=6xq.net; s=MBO0001; t=1676450736; 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=0rgipjZnHSFoJm6wp4u8Jl/gMzRZHERS7dVSja6FXVg=; b=AM4+OzwGcptczlPLCG5HuQRi70I+sOglDjcfIbr3xgtcHlfmgjwx1d4J94LaqPleUZF87R Kn7fxzNLq3CKTKoPoH0yyZMIOIB7Q4s3yv9DGIFu7BySO4FFeV5hmgqk+Xu4j27+r9BkMl NpE4vB9hIoxSA9HV1GIiMglPmXKsEZAfohmv3CukTxXeqW2IWVPEh7niH0H/Lsiebc8q3r BJRivLZNNNCSS33FByVQUpnQ92baLtaa/Ki3yzETYUwqP4dWOQBbfMNnkRq19VOQOfX8kE Gqh+pCmWkleI1zPQ97LE40wWSaAyi7Ij6BhGuvEHmRZvlZ6VUjXrkKSE6QllDA== Date: Wed, 15 Feb 2023 09:45:33 +0100 From: Lars-Dominik Braun To: Simon Tournier Subject: Re: [bug#61420] [PATCH 00/31] Haskell upgrade to Stackage 20.5 Message-ID: References: <87sff8xd2w.fsf@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <87sff8xd2w.fsf@gmail.com> X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 61420 Cc: 61420@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) Hi, > However, python-pypandoc seems broken on wip-haskell but not in master. > Idem for ganeti yeah, python-pypandoc and ganeti are known to be broken. Ganeti does not support GHC 9.2 (and there don’t seem to be any patches fixing this anywhere) and pypandoc fails even more tests when upgrading it to v1.10 – not sure what to do. > except maybe « Upgrade Haskell packages. » but it is too much > work for improving, IMHO. :-) Well, I know that this is not what the policy requires, but it is a deliberate choice. There is no functional/working intermediate state here. You can only have all of the changes or none. Creating >700 commits “just because” seems wrong. Cheers, Lars From debbugs-submit-bounces@debbugs.gnu.org Wed Feb 15 04:51:09 2023 Received: (at 61420) by debbugs.gnu.org; 15 Feb 2023 09:51:09 +0000 Received: from localhost ([127.0.0.1]:57812 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pSERQ-000680-Oj for submit@debbugs.gnu.org; Wed, 15 Feb 2023 04:51:09 -0500 Received: from mail-wm1-f51.google.com ([209.85.128.51]:38601) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pSERO-00067M-Ji for 61420@debbugs.gnu.org; Wed, 15 Feb 2023 04:51:07 -0500 Received: by mail-wm1-f51.google.com with SMTP id f47-20020a05600c492f00b003dc584a7b7eso1051813wmp.3 for <61420@debbugs.gnu.org>; Wed, 15 Feb 2023 01:51:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1676454661; h=content-transfer-encoding:mime-version:message-id:date:references :in-reply-to:subject:cc:to:from:from:to:cc:subject:date:message-id :reply-to; bh=kvateijI1TrLdDUYgAJ5/biIPtbzsj9s0hq8N7EBW2k=; b=H7VWPXT1ROlm5umnk1rrsEkWOsfYz8nADPu4qum0L1SYeRZtsfqVOWCJ7+6U0rwPS5 UX8tPktRdWe1eDWrmJ1qHTFSlW/qUT8RkZiiiKQILqjTXaMzzrkbSWZN9NegVQSQ8WUU 9Iu3o3Kv8sE5oUClt5bLGlNv/VcTmLzi//aBj5Ck1FHdmtdNfLKhHhnDFly2j8hxHuOk Z2Tp3XFvq/hslCVfPyFiRmuAjgk3Esqd81ZOE7yNGjw7izxuCKY/69ACXauW70P/+Y3W WrpVMJaAvltz5gdvNJaWIvXykBwM+ihtrpKcOeCa0av2x1vY5tGrYvTBvbJplKyG1cwG pBDQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1676454661; h=content-transfer-encoding:mime-version:message-id:date:references :in-reply-to:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=kvateijI1TrLdDUYgAJ5/biIPtbzsj9s0hq8N7EBW2k=; b=0dobXtbt1gXcKBXzxmIJoBAR7l5pm6wE6ELN1i+7rEiAVoiCrkCEH4eDgfsLJ+Y3GF Kzso4xAbOLtXfrdNZA1bm+S5X9rXcygzaz7iW2C0foqk23vXRXHvdoNuSUK1GNAh0bjP GBsQSGtLJPp+ePe+qF5P+hwv5HOi8pOxaBwt23W9LS3RXCsq0VCq42QD0+oI7Vu4RiSe 3QnzgK3+xYC9Vfe+IS75wMlPSBbU6noe7YqeurUlEy4jAqCkOJj3MfOCBazHQxYC0t/l EqgttZCuZ5dr9KZtTwrrYz7ZqAD6RrHS0ywrPcxy7Wj6lDKX6N8/Hm0n/Fd/CS0uNwiN iehA== X-Gm-Message-State: AO0yUKWgzVvv+hiBKrDg9uSEo7YFCC7wGdYmLqAMFSc5GHpCKeKnmVtT IITKqmi6CTJFBNn5gadns/ybp1oCkuA= X-Google-Smtp-Source: AK7set/LnEoAZ4mzi57fJUmKyW+0svQ8FQNp8nQM36OGpChHazgz7ggin+ec+pcw2YVHLM5A6laIRQ== X-Received: by 2002:a05:600c:b87:b0:3e2:415:f09f with SMTP id fl7-20020a05600c0b8700b003e20415f09fmr979994wmb.3.1676454660871; Wed, 15 Feb 2023 01:51:00 -0800 (PST) Received: from lili ([2a01:e0a:59b:9120:65d2:2476:f637:db1e]) by smtp.gmail.com with ESMTPSA id s9-20020a05600c45c900b003db06224953sm1625725wmo.41.2023.02.15.01.51.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Feb 2023 01:51:00 -0800 (PST) From: zimoun To: Lars-Dominik Braun Subject: Re: [bug#61420] [PATCH 00/31] Haskell upgrade to Stackage 20.5 In-Reply-To: References: <87sff8xd2w.fsf@gmail.com> Date: Wed, 15 Feb 2023 10:20:44 +0100 Message-ID: <86y1ozffo3.fsf@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 61420 Cc: 61420@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi, On Wed, 15 Feb 2023 at 09:45, Lars-Dominik Braun wrote: >> However, python-pypandoc seems broken on wip-haskell but not in master. >> Idem for ganeti > yeah, python-pypandoc and ganeti are known to be broken. Ganeti does > not support GHC 9.2 (and there don=E2=80=99t seem to be any patches fixing > this anywhere) and pypandoc fails even more tests when upgrading it to > v1.10 =E2=80=93 not sure what to do. About ganeti, does it make sense to build it with a transformation and use an older GHC version (that it is still available).=E2=80=98 About python-pypandoc, if there is no solution for fixing it and it will be broken, I propose to remove it. WDYT? Cheers, simon From debbugs-submit-bounces@debbugs.gnu.org Wed Feb 15 05:44:04 2023 Received: (at 61420) by debbugs.gnu.org; 15 Feb 2023 10:44:04 +0000 Received: from localhost ([127.0.0.1]:57913 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pSFGe-0007Xo-8V for submit@debbugs.gnu.org; Wed, 15 Feb 2023 05:44:04 -0500 Received: from mail-wm1-f45.google.com ([209.85.128.45]:42704) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pSFGb-0007XA-Pa for 61420@debbugs.gnu.org; Wed, 15 Feb 2023 05:44:02 -0500 Received: by mail-wm1-f45.google.com with SMTP id j29-20020a05600c1c1d00b003dc52fed235so1194503wms.1 for <61420@debbugs.gnu.org>; Wed, 15 Feb 2023 02:44:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1676457835; h=mime-version:message-id:date:references:in-reply-to:subject:to:from :from:to:cc:subject:date:message-id:reply-to; bh=BwvnMf8yurY9OEt04rzRdI6Kb/3v+MxeQgGVYNJjcUU=; b=JpRy6AFRanmjiW/BJp0PTXwCI0XXQjYZnUfUCnt7e/VpDJNKKEw44hTkMZgqdmEdNq i864KobWp3BiaQaVIqdjxMJ7AojFv4ZVenuoAGGsGafrsUJyOxWImjQHVg6ruFxByiLZ iz7QhZaTY8dF93nnBJEg6na8v59vjXjvJBGwa64X0d2MUpbcjie4qdYHb+iuvtuLz61k LtimD8670OWNBFgE9GuOsBiLpLWztw3jSPUy1tvgDFsyGJ/iwqzAc1CRTcTI2X1DpcrP uqrNxiB9c6SR7Cdf5dNsf4ybRh9fObd4yyCp8FdAZOrfIglGKaSR3AYlCL/4ar/qXhwa mW+Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1676457835; h=mime-version:message-id:date:references:in-reply-to:subject:to:from :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=BwvnMf8yurY9OEt04rzRdI6Kb/3v+MxeQgGVYNJjcUU=; b=BxXsM19XeLStrdL+Yy0emG1TWeq5aGnyTGQwxdw0Db2oRrkWG/k4VgvTOe2MKwZup6 H1ujAuLhmlyMTXd2qv5Jt4n039g0oyFDWgqch2XJcWr6bzbUx8+IDRNv7TKHGt5CELy2 PsocnjRNTaGvB/VkYItuKe+ywvYWyV6NyVct3Ttx0LmEWr9U0Sa3ItK30wIgIewQMYki 32lzh24yKokY5Tpiwf1dhuQs7YVZlClxnWKxkg+9bqW81IATWmBDV3172CL5jY/6qtFR ulrveCNy3iMeFiGZ5ZPJaF5qfn4HQ4xp6OGX87jJKM+0ba96SwvKQYH67ImgfR7B9pmp 67vQ== X-Gm-Message-State: AO0yUKWnKuiR4yfZcf/JlFZnOpC6Rh5glk0w+4eD/3h7a+JDAK0IhJkZ IcCMi7L23geB5iMyhGeaIjSGDDql3MQ= X-Google-Smtp-Source: AK7set8tgC0Ke34MEWB7iGf9S2IjGYIjYtb63noJtOG6kaNLcrTm9ONg6oIFMFdUD5myep1i3kJVKQ== X-Received: by 2002:a05:600c:1e15:b0:3dc:3398:cf65 with SMTP id ay21-20020a05600c1e1500b003dc3398cf65mr1783154wmb.2.1676457835459; Wed, 15 Feb 2023 02:43:55 -0800 (PST) Received: from lili ([2a01:e0a:59b:9120:65d2:2476:f637:db1e]) by smtp.gmail.com with ESMTPSA id q9-20020a05600c46c900b003dc434900e1sm1735741wmo.34.2023.02.15.02.43.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Feb 2023 02:43:55 -0800 (PST) From: zimoun To: Lars-Dominik Braun , 61420@debbugs.gnu.org Subject: Re: [bug#61420] [PATCH 00/31] Haskell upgrade to Stackage 20.5 In-Reply-To: References: Date: Wed, 15 Feb 2023 11:43:41 +0100 Message-ID: <86cz6bfbtu.fsf@gmail.com> MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 61420 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi Lars, On Sat, 11 Feb 2023 at 10:59, Lars-Dominik Braun wrote: > Lars-Dominik Braun (29): > import: hackage: Allow version at the beginning of cabal file. > gnu: Switch default to GHC 9.2. > import: stackage: Update to release 20.5. > import: hackage: Add upstream-name property. > gnu: Add upstream-name property to Haskell packages. > import: hackage: Use upstream-name property. > gnu: Use HACKAGE-URI for packages from Hackage. > import: haskell: Add new internal library for GHC 9.2. > build: haskell-build-system: Process all transitive dependencies. > build: haskell-build-system: Remove unused linker flags. > Upgrade Haskell packages. > gnu: ghc-9.2: Increase make verbosity. > gnu: Remove unused Haskell packages. > gnu: ghc-parsec: Update to 3.1.15.0. > gnu: idris: Fix overly zealous regular expression. > gnu: elm: Support GHC 9.2. > build-system: haskell: Drop default "static" output. > gnu: ghc-9.2: Support static linking with glibc < 2.34. > gnu: ghc-lua: Disable symbol export. > build: haskell-build-system: Build static executables by default. > gnu: ngless: Drop Haskell libraries and documentation. > gnu: hledger: Drop Haskell libraries and documentation. > gnu: darcs: Drop Haskell libraries and documentation. > gnu: git-annex: Drop Haskell documentation. > gnu: shellcheck: Drop Haskell libraries. > gnu: pandoc: Drop Haskell libraries and documentation. > gnu: purescript: Drop Haskell libraries and documentation. > gnu: xmobar: Drop Haskell libraries and documentation. > gnu: idris: Adapt to changed haskell-build-system. > > Philip Munksgaard (1): > build: haskell-build-system: Support multiple libraries. > > zimoun (1): > build: haskell-build-system: Remove trailing #t. >From this series, I do not see [PATCH 07/31], neither 09/31 or 13/31. Is it expected? [PATCH 00/31] Haskell upgrade to Stackage 20.5 (Guix Guix::review? list::guix-patches replied) [PATCH 01/31] import: hackage: Allow version at the beginning of cabal file. (Guix list::guix-patches unread) [PATCH 02/31] build: haskell-build-system: Remove trailing #t. (Guix inbox list::guix-patches unread) [PATCH 03/31] build: haskell-build-system: Support multiple libraries. (Guix inbox list::guix-patches unread) [PATCH 04/31] gnu: Switch default to GHC 9.2. (Guix Guix::review? list::guix-patches unread) [PATCH 05/31] import: stackage: Update to release 20.5. (Guix list::guix-patches unread) [PATCH 06/31] import: hackage: Add upstream-name property. (Guix list::guix-patches unread) [PATCH 08/31] import: hackage: Use upstream-name property. (Guix list::guix-patches unread) [PATCH 10/31] import: haskell: Add new internal library for GHC 9.2. (Guix list::guix-patches unread) [PATCH 11/31] build: haskell-build-system: Process all transitive dependencies. (Guix list::guix-patches unread) [PATCH 12/31] build: haskell-build-system: Remove unused linker flags. (Guix list::guix-patches unread) [PATCH 14/31] gnu: ghc-9.2: Increase make verbosity. (Guix Guix::review? list::guix-patches unread) [PATCH 15/31] gnu: Remove unused Haskell packages. (Guix Guix::review? list::guix-patches unread) [PATCH 16/31] gnu: ghc-parsec: Update to 3.1.15.0. (Guix Guix::review? list::guix-patches unread) [PATCH 17/31] gnu: idris: Fix overly zealous regular expression. (Guix list::guix-patches unread) [PATCH 18/31] gnu: elm: Support GHC 9.2. (Guix list::guix-patches unread) [PATCH 19/31] build-system: haskell: Drop default "static" output. (Guix Guix::review? list::guix-patches unread) [PATCH 20/31] gnu: ghc-9.2: Support static linking with glibc < 2.34. (Guix Guix::review? list::guix-patches unread) [PATCH 21/31] gnu: ghc-lua: Disable symbol export. (Guix Guix::review? list::guix-patches unread) [PATCH 22/31] build: haskell-build-system: Build static executables by default. (Guix list::guix-patches unread) [PATCH 23/31] gnu: ngless: Drop Haskell libraries and documentation. (Guix Guix::review? list::guix-patches unread) [PATCH 24/31] gnu: hledger: Drop Haskell libraries and documentation. (Guix list::guix-patches unread) [PATCH 25/31] gnu: darcs: Drop Haskell libraries and documentation. (Guix Guix::review? list::guix-patches unread) [PATCH 26/31] gnu: git-annex: Drop Haskell documentation. (Guix Guix::review? list::guix-patches unread) [PATCH 27/31] gnu: shellcheck: Drop Haskell libraries. (Guix Guix::review? list::guix-patches unread) [PATCH 28/31] gnu: pandoc: Drop Haskell libraries and documentation. (Guix Guix::review? list::guix-patches unread) [PATCH 29/31] gnu: purescript: Drop Haskell libraries and documentation. (Guix list::guix-patches unread) [PATCH 30/31] gnu: xmobar: Drop Haskell libraries and documentation. (Guix list::guix-patches unread) [PATCH 31/31] gnu: idris: Adapt to changed haskell-build-system. (Guix list::guix-patches unread) Cheers, simon From debbugs-submit-bounces@debbugs.gnu.org Wed Feb 15 05:58:51 2023 Received: (at 61420) by debbugs.gnu.org; 15 Feb 2023 10:58:51 +0000 Received: from localhost ([127.0.0.1]:57953 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pSFUw-0007zX-Vy for submit@debbugs.gnu.org; Wed, 15 Feb 2023 05:58:51 -0500 Received: from mout-p-202.mailbox.org ([80.241.56.172]:56048) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pSFUu-0007zG-7v for 61420@debbugs.gnu.org; Wed, 15 Feb 2023 05:58:49 -0500 Received: from smtp2.mailbox.org (smtp2.mailbox.org [10.196.197.2]) (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 4PGw6m1QV8z9slg; Wed, 15 Feb 2023 11:58:40 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=6xq.net; s=MBO0001; t=1676458720; 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=GQp58Bg0RUwTLsx27qglL/cC74VcF78RseBJDgGZkTw=; b=pMkH8MN0IdXNtZSRyvSihrSo+WyVeVS6J9Dyl8eBeP6KlrblXp6ggZ/Dg45W4QKfoJQtEo 9BkPQrYs0oxjY2IIFKDuN3DwqJSxF3rXDLJVllsZZUoIEM5v1TcdZbmSgS2IsvVenUEu3r 55o9Cj6ASbw8TFhVjdVZriWVcjsrpRlY4wIgq2XMeK0W89RmJimnfdTWOvP+33pwZ2I55Y gG41fSBMLobqyBC4xsDpINevAiGiHz2GA+VmuIskUB4Zhmz19CRRcLoNcHqfUKDv8vz1Q1 dCu1dh7DSSBKjC5H8HdN2rkctg1kOb2/Pu7Oi72y6A60pMiVuBb+25sHrf7nhQ== Date: Wed, 15 Feb 2023 11:58:36 +0100 From: Lars-Dominik Braun To: zimoun Subject: Re: [bug#61420] [PATCH 00/31] Haskell upgrade to Stackage 20.5 Message-ID: References: <86cz6bfbtu.fsf@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <86cz6bfbtu.fsf@gmail.com> X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 61420 Cc: 61420@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) Hi, > From this series, I do not see [PATCH 07/31], neither 09/31 or 13/31. > Is it expected? yes, they’re a few hundred kilobytes with thousands of lines each. Please have a look at the branch instead. Lars From debbugs-submit-bounces@debbugs.gnu.org Wed Feb 15 06:07:13 2023 Received: (at 61420) by debbugs.gnu.org; 15 Feb 2023 11:07:14 +0000 Received: from localhost ([127.0.0.1]:57969 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pSFd3-0008EO-H7 for submit@debbugs.gnu.org; Wed, 15 Feb 2023 06:07:13 -0500 Received: from mail-wr1-f42.google.com ([209.85.221.42]:41781) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pSFd0-0008E2-OG for 61420@debbugs.gnu.org; Wed, 15 Feb 2023 06:07:12 -0500 Received: by mail-wr1-f42.google.com with SMTP id bu23so18708000wrb.8 for <61420@debbugs.gnu.org>; Wed, 15 Feb 2023 03:07:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1676459225; h=content-transfer-encoding:mime-version:message-id:date:references :in-reply-to:subject:cc:to:from:from:to:cc:subject:date:message-id :reply-to; bh=4UWfX97gCjtanYer9ubf6Yb9unEv7KlXeUi3VO6yE6A=; b=pwdi5JwDZZgaKLPMKlqd1RAKPnxJteOkFw1TRobnzzAQJ9lyT3wJhSHWZH0VE4wjjo tbG9hqKHqqIFm0dpU0S/Un93sprBsqdYPXUh8oRZsiwkNltBnzXAhcmjsqztgGvmDaiD ePjC5HwiJ3WVjECoSDjKv1vEpFCkpNpd1lVG33DknifqUlVVKahoxXDAaGn8FFicNwC1 IKiA6d8pNJOntY7mhux8BM54wBulZEMkbtbU+fwxWnIJEdEhUTc41DtNJRwlktYJtAEB 2lRAU7A/3RCsEtCl0ughC1tuMm+/I9mnKzzQC4Xv4NMXuP/tE8vwmT39Rm/v4MEbuvms 3AvA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1676459225; h=content-transfer-encoding:mime-version:message-id:date:references :in-reply-to:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=4UWfX97gCjtanYer9ubf6Yb9unEv7KlXeUi3VO6yE6A=; b=EbCnQBAbrMlGIuJ4Kk8sHSOz4G4htBTY0X8Nmaw3dUo8mklQVj46OP/OHcAjzxgA36 uGj+jpJD/dqv7/gcy1oBPzU3dU4Kx2O33iav203WzWgt3BgjUuMyveahhUmLr1kZzuAB oD9fYQDCjlEfYHAqs+nRFQLvxgoXv45rnbLPzvw4XAUN6Yre8hpFY4GdsPUb4xwliMJS ZwmuQSj/vkbKbzO6NXgxjsOYOZQhGNH9JEY066zRlB+NDjKLDc22apI37ayzzaobQ4rH FblXMopQ5DLASt79co8Ce2tKnSj2wzFY+1Ugi+VFfg+jRQAPfJdEXJ9OGMZtxIrN/+DE 24/A== X-Gm-Message-State: AO0yUKXfnHXNYx3WB8CFxoy0pn3U6Js2iB4PXm4LVFAuDOfY0plr3df1 A3Dd8DFx44mg0+G5jUXBKMU= X-Google-Smtp-Source: AK7set9zP1p44O3u5wDM5LBOENcznD6qd5TMTJUxk7ktiUqsV/5VbrBEMotVnb2i8/OrSWFbQpa36A== X-Received: by 2002:adf:dd82:0:b0:2c3:d296:7a94 with SMTP id x2-20020adfdd82000000b002c3d2967a94mr934221wrl.3.1676459224839; Wed, 15 Feb 2023 03:07:04 -0800 (PST) Received: from lili ([2a01:e0a:59b:9120:65d2:2476:f637:db1e]) by smtp.gmail.com with ESMTPSA id v15-20020adfebcf000000b002c3f81c51b6sm15291619wrn.90.2023.02.15.03.07.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Feb 2023 03:07:04 -0800 (PST) From: zimoun To: Lars-Dominik Braun , 61420@debbugs.gnu.org Subject: Re: [bug#61420] [PATCH 08/31] import: hackage: Use upstream-name property. In-Reply-To: <20230211100825.47971-7-lars@6xq.net> References: <20230211100825.47971-1-lars@6xq.net> <20230211100825.47971-7-lars@6xq.net> Date: Wed, 15 Feb 2023 11:48:00 +0100 Message-ID: <867cwjfbmn.fsf@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 61420 Cc: Lars-Dominik Braun X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi, On Sat, 11 Feb 2023 at 11:08, Lars-Dominik Braun wrote: > * 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. > -(define guix-package->hackage-name > - (let ((uri-rx (make-regexp "(https?://hackage.haskell.org|mirror://hac= kage)/package/([^/]+)/.*")) > - (name-rx (make-regexp "(.*)-[0-9\\.]+"))) > - (lambda (package) > - "Given a Guix package name, return the corresponding Hackage name." > - (let* ((source-url (and=3D> (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))))))) Why not just do a drop-in replacement of the implement of =E2=80=99guix-package->hackage-name=E2=80=99 by the implementation of =E2=80=99package-upstream-name*=E2=80=99? Other said, avoid to introduce a new procedure and remove another; and instead just replace the implementation of the old by the new. > - (let* ((hackage-name (guix-package->hackage-name package)) > + (let* ((hackage-name (package-upstream-name* package)) It would avoid all these kind of replacement, no? Cheers, simon From debbugs-submit-bounces@debbugs.gnu.org Wed Feb 15 06:07:18 2023 Received: (at 61420) by debbugs.gnu.org; 15 Feb 2023 11:07:18 +0000 Received: from localhost ([127.0.0.1]:57972 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pSFd7-0008Eh-Th for submit@debbugs.gnu.org; Wed, 15 Feb 2023 06:07:18 -0500 Received: from mail-wm1-f50.google.com ([209.85.128.50]:46924) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pSFd1-0008E4-Uh for 61420@debbugs.gnu.org; Wed, 15 Feb 2023 06:07:13 -0500 Received: by mail-wm1-f50.google.com with SMTP id bg5-20020a05600c3c8500b003e00c739ce4so1239825wmb.5 for <61420@debbugs.gnu.org>; Wed, 15 Feb 2023 03:07:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1676459226; h=mime-version:message-id:date:references:in-reply-to:subject:cc:to :from:from:to:cc:subject:date:message-id:reply-to; bh=VAijwCdZxeQz9oI8abAE1XzQTM5mgOPChqzpgWA81cU=; b=EFRZYh8APdLJlOY3e6SN5Hmfa4baw2SmoEl8b+KPNkKbVW4CRuJ366/NMgX2j1OCmZ VkJPU4Crzfy36Wu4QXsy0l08JWFz5Rf8k8zyr4jJLpydBBSCL2f4kK2vtHnBeyl6BE/b 7jrPbOUHTQBiCK9vAt7EtluG/kEUqu3VSXoe2mupQNCEd/29Lmrv0emhPa2eAqsclfDZ kY8+suef3qbWiWs6v7JyOz4d7QZyfyfVTRjmTMds+PDUIw8AGAWXPWky8u3042FzVF87 DrZbrM8zmXGgKw+TCGkVYzPEgz53Y9xQSv1sBi6tPr8Jxvk7lZ8uxDNxPIK/M1DxdMCL qHlw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1676459226; h=mime-version:message-id:date:references:in-reply-to:subject:cc:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=VAijwCdZxeQz9oI8abAE1XzQTM5mgOPChqzpgWA81cU=; b=kgBAKiSLJMjlLq0/Cfavp6nHe7XiUZyiIz7YzwEpK5GQx9P8fFqczoVOZbYQT/X0+Y Er405Y40N8I7MsGUSUsJHtQkBDdlpBEo3LaFfDSL4lft6JPwK6Y/AZfB4w8EDMP3qPyj NXNkQt+bIqmlJ5DCjp9AAttwiCe9xECygb/myiUw/AGPjo8JXZEstTPJoRtowYp3xfP1 JwgSwD8zx+o5gMKZ1grzuEFihjwk6xbYezD8f3TyCevSI0DjPocyBTVvfZqd9FIn1XtH Lkl/1mCGqraQMursQ09UDguNN4x3H2Tb1dvvrb7HvoIh+Xvl4uyNo0aoTwDtvXBTVLD9 XK7A== X-Gm-Message-State: AO0yUKVgW3w2kBSioIAtg60713NqBZvA/q4FOeBcKwrSjTS5vmfAHmZ3 ob2rzcOdCyY4q3FozeUftcQ= X-Google-Smtp-Source: AK7set8L1PW+kCn8/c/DkGGGpoQBpOKmTibm7PEpDPJdzkcjfBOGMwXfvXa4L1IX9Z4wfRFKlHLVVA== X-Received: by 2002:a05:600c:1e15:b0:3dc:3398:cf65 with SMTP id ay21-20020a05600c1e1500b003dc3398cf65mr1842432wmb.2.1676459226118; Wed, 15 Feb 2023 03:07:06 -0800 (PST) Received: from lili ([2a01:e0a:59b:9120:65d2:2476:f637:db1e]) by smtp.gmail.com with ESMTPSA id l19-20020a05600c2cd300b003dfefe115b9sm2004196wmc.0.2023.02.15.03.07.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Feb 2023 03:07:05 -0800 (PST) From: zimoun To: Lars-Dominik Braun , 61420@debbugs.gnu.org Subject: Re: [bug#61420] [PATCH 14/31] gnu: ghc-9.2: Increase make verbosity. In-Reply-To: <20230211100825.47971-11-lars@6xq.net> References: <20230211100825.47971-1-lars@6xq.net> <20230211100825.47971-11-lars@6xq.net> Date: Wed, 15 Feb 2023 11:53:13 +0100 Message-ID: <861qmrfbdy.fsf@gmail.com> MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 61420 Cc: Lars-Dominik Braun X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi, On Sat, 11 Feb 2023 at 11:08, Lars-Dominik Braun wrote: > Tests time out on ci.guix.gnu.org. [...] > + ;; Increase verbosity, so running the test suite does not time out on CI. Hehe! Well, I think there is variable for that. Something like: (properties `((max-silent-time . 36000))) Well, one is not exclusive with the other. :-) Cheers, simon From debbugs-submit-bounces@debbugs.gnu.org Wed Feb 15 06:07:18 2023 Received: (at 61420) by debbugs.gnu.org; 15 Feb 2023 11:07:18 +0000 Received: from localhost ([127.0.0.1]:57974 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pSFd8-0008Ek-9y for submit@debbugs.gnu.org; Wed, 15 Feb 2023 06:07:18 -0500 Received: from mail-wm1-f48.google.com ([209.85.128.48]:44764) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pSFd3-0008E7-KL for 61420@debbugs.gnu.org; Wed, 15 Feb 2023 06:07:15 -0500 Received: by mail-wm1-f48.google.com with SMTP id s13-20020a05600c45cd00b003ddca7a2bcbso1247911wmo.3 for <61420@debbugs.gnu.org>; Wed, 15 Feb 2023 03:07:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:references :in-reply-to:subject:cc:to:from:from:to:cc:subject:date:message-id :reply-to; bh=gsVcgI9eGJB+lEo53x9U8/tTx6pjoxVWgn4rFvdJ5FA=; b=Qahdedp7CzqOD5T/8sWd/eBy1f6CD9gsFQ9r2fhjITfoQN31Bf1ikil1XoWgodRKxJ NoaFBF78R+jMQLrCsBYmafJflKsrME1a6fFIBxZJamnqq2JoSWOnWLj5sP3Wc4o8x8gt Btxg0K5PtpbFcYdIpLCZVBRgiQD/w6Iq9LwpjVLL0CBbuD6SAlhbI4zjl1PgC3QiiNGa nJSaWNchuC4iIUQWuLP7BfE39dTZ16tZDE7KOx0lDph9oDT7nP7GsOp8B3OIKcGbhG+S geaQr7K6Kt5/gIS1C0SPhuXli/tAZRddm0obAXQefJjxsA/88SR6I9BI4w5sA4gmg3DW Ua6w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:references :in-reply-to:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=gsVcgI9eGJB+lEo53x9U8/tTx6pjoxVWgn4rFvdJ5FA=; b=Yqf692A+N8Wcmf+w5a9WzcjhiQPEBh6mnAbnwB2Qp98KzBRyIW2fgu9hdbg0fBYNYK b5yj8SuIU46aF821rrRVjJfhdznrqgVczfK7wNb9AftRfNVPv8+re+OC0RBnWhbq8Lb+ 5Xp1vHSQ3GP6L90qUYe0PogJRTFxrEhzuHekx8bJ7+0WsTH8zVx6+bUcPjtCuv8++6mC oYwUk6WvHUEvdY9Yu9eE2nVveNFNNcxvPtATX3xx4o4EdQiYnRwkE3l61D3AvOQaJRjF GHMa1NQ5Gu5EbW9sOhRmUmfP2Q7MlKKkY/t9QRDpbW+nl6hwdgLIgayocPzX4RZFbO3Y mH5A== X-Gm-Message-State: AO0yUKX6rEQuhHjqdJdiJgW7iboRspHfXOo+rZS2VbwpWjcX2vMDBcn7 aBrcOSVLwfq68ndUsCogyrm93Bk2ei0= X-Google-Smtp-Source: AK7set+nBs0QGCpjwPjm+UDy1ONUv32w2fqMCvWX0+JthVr2scqvoDg1hPs/xbDkX+e2rNU0LV++dw== X-Received: by 2002:a05:600c:1c9f:b0:3dc:5b88:e706 with SMTP id k31-20020a05600c1c9f00b003dc5b88e706mr2044990wms.1.1676459227932; Wed, 15 Feb 2023 03:07:07 -0800 (PST) Received: from lili ([2a01:e0a:59b:9120:65d2:2476:f637:db1e]) by smtp.gmail.com with ESMTPSA id s9-20020a05600c45c900b003db06224953sm1866047wmo.41.2023.02.15.03.07.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Feb 2023 03:07:07 -0800 (PST) From: zimoun To: Lars-Dominik Braun , 61420@debbugs.gnu.org Subject: Re: [bug#61420] [PATCH 19/31] build-system: haskell: Drop default "static" output. In-Reply-To: <20230211100825.47971-16-lars@6xq.net> References: <20230211100825.47971-1-lars@6xq.net> <20230211100825.47971-16-lars@6xq.net> Date: Wed, 15 Feb 2023 11:55:30 +0100 Message-ID: <86v8k3dwpp.fsf@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 61420 Cc: Lars-Dominik Braun X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi, On Sat, 11 Feb 2023 at 11:08, Lars-Dominik Braun wrote: > * 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. This change could be announced with =E2=80=99--news=E2=80=99, WDYT? Cheers, simon From debbugs-submit-bounces@debbugs.gnu.org Wed Feb 15 09:10:46 2023 Received: (at submit) by debbugs.gnu.org; 15 Feb 2023 14:10:46 +0000 Received: from localhost ([127.0.0.1]:58328 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pSIUf-0004JQ-SF for submit@debbugs.gnu.org; Wed, 15 Feb 2023 09:10:46 -0500 Received: from lists.gnu.org ([209.51.188.17]:48148) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pSIUX-0004J5-VB for submit@debbugs.gnu.org; Wed, 15 Feb 2023 09:10:38 -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 1pSIUX-0000kM-L0 for guix-patches@gnu.org; Wed, 15 Feb 2023 09:10:37 -0500 Received: from mira.cbaines.net ([212.71.252.8]) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pSIUW-0001nU-0w for guix-patches@gnu.org; Wed, 15 Feb 2023 09:10:37 -0500 Received: from localhost (unknown [IPv6:2a02:8010:68c1:0:3a91:a0a4:ecee:f157]) by mira.cbaines.net (Postfix) with ESMTPSA id 4AB4916743; Wed, 15 Feb 2023 14:10:31 +0000 (GMT) Received: from felis (localhost [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id 74dffc21; Wed, 15 Feb 2023 14:10:30 +0000 (UTC) References: <86cz6bfbtu.fsf@gmail.com> User-agent: mu4e 1.8.11; emacs 28.2 From: Christopher Baines To: Lars-Dominik Braun Subject: Re: [bug#61420] [PATCH 00/31] Haskell upgrade to Stackage 20.5 Date: Wed, 15 Feb 2023 14:03:13 +0000 In-reply-to: Message-ID: <87lekznhnw.fsf@cbaines.net> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" Received-SPF: pass client-ip=212.71.252.8; envelope-from=mail@cbaines.net; helo=mira.cbaines.net X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.4 (-) X-Debbugs-Envelope-To: submit Cc: 61420@debbugs.gnu.org, guix-patches@gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.4 (--) --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Lars-Dominik Braun writes: >> From this series, I do not see [PATCH 07/31], neither 09/31 or 13/31. >> Is it expected? > yes, they=E2=80=99re a few hundred kilobytes with thousands of lines > each. Please have a look at the branch instead. I ended up also looking at these missing patches, since that explains why the testing for https://qa.guix.gnu.org/issue/61420 hasn't happened. I've been sent these large diffs anyway since that happened when you pushed to the branch, so I wouldn't hesitate to send large patches to guix-patches, since that's helpful to have the testing happen automatically. --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQKlBAEBCgCPFiEEPonu50WOcg2XVOCyXiijOwuE9XcFAmPs59NfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNF ODlFRUU3NDU4RTcyMEQ5NzU0RTBCMjVFMjhBMzNCMEI4NEY1NzcRHG1haWxAY2Jh aW5lcy5uZXQACgkQXiijOwuE9XeXWg/+OB824EEMGdChen+oPLgAJoGpHsQfRCpI A7GBjdAWK+ihh1KeYr/3IMer0yD+GY2sSaMrLp9EGFABft1EuWibbLyZ+TBUMlsb vk6/VC1U4BmvtTZHN3AbWQWp42GArNo9RMs5tYzEfVDdIkZ4/cRK9n/kEnwEyQFL JjQWJAs0hKJVc4judpN3RSvCJSyLdKPUPMoknExGuC5xEfJy9CJKQc9Qajuj2YKW 1Nfk3P9ZYLkozXtR0X4Xno5TvhO2pYH3Gr5uWqJkFbIn51pjW3/JfcW/0JW/jsYR ZkKC2MibAL8OvvZw3VM24Nw56eMwOYRPok39sNrLGu3N13yyzQA5NVMoB27ERgLZ b4mmPKQDznigYfjeVqw40bE/UQNn4saQ7DeNg7UmXdm2vuGFOzKhAVWcRBCDeGpp KD2BYvc7S5QP/l2P6MDWH/d+ErjGL9KwE5yZtaU/+vuZv4VMToveySNAYk07CupY XOC1C95+6Kf7t0tU93tHp9eBWFANj2ComRoDYnoyfLa4GAX0zU2/quYHgDQUtdhw Sb4mXkknMefLMEQy33oho/1Pi1BnMCHXX6ARp/k8sb5NHQy3T6j+zfVYdQzirwsN aukZbTjDUbNk/8pElKSYIGLwIgEadae9WNO5OjTCexTsGPZGdYI0rLZ+dWIyHWtx 6l84aigSbkA= =79I8 -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Wed Feb 15 10:58:36 2023 Received: (at 61420) by debbugs.gnu.org; 15 Feb 2023 15:58:36 +0000 Received: from localhost ([127.0.0.1]:33699 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pSKB1-00007T-Co for submit@debbugs.gnu.org; Wed, 15 Feb 2023 10:58:36 -0500 Received: from mail-wm1-f42.google.com ([209.85.128.42]:35350) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pSKAz-000078-Bs for 61420@debbugs.gnu.org; Wed, 15 Feb 2023 10:58:34 -0500 Received: by mail-wm1-f42.google.com with SMTP id k8-20020a05600c1c8800b003dc57ea0dfeso1976890wms.0 for <61420@debbugs.gnu.org>; Wed, 15 Feb 2023 07:58:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:references :in-reply-to:subject:cc:to:from:from:to:cc:subject:date:message-id :reply-to; bh=BGrPDpyfB3+Ge3MwM7GcokJ+BtkiXwDA7Rt6nDcH6us=; b=NFJ8yX/42NcNA62YJ69hOWwOxF+E86nPL6mRLXY32KJsUmQXkCoSNduUfovEVUUmcV btTc/kz3O2UZQ2He32FPpcLlQYZ2PuGdMQv5p0F66euOjx0VD3AdHKbpGJOd+UYqbpd4 kCRxUJ8e0WxN9+8wN0lPniG1GY51Tt75jUx64oVjJolCcNWeSw5E61+j3l+IhPEpg2ds tD3ZAuhX9MG/3upNdYlTBleHxnLy/5+lqGFlGvX4GTN2QPmpgvoZbMeOSOwilufhZlI6 8fVONolR2iU9qJ5fS4YOm5l3Uccl7Q0Su7AuHu0EhF2OSt/0tbVC55CMK/8Q8lzJbXfE K9cg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:references :in-reply-to:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=BGrPDpyfB3+Ge3MwM7GcokJ+BtkiXwDA7Rt6nDcH6us=; b=skh4VCcs3khYU6I/hVbfPRclrav+6sZMD9K4503TSkvNLZslVSjUdftbujFHQM0jRU 3H9FtmbRJ11Q1PleKJt1g0VskQDJS6C32nJLOOLAVDlfEnrO7esRwQpoBZJbpKweNuWN pX0UEu2PQNAo+5SIR+uYzywkI+JvOIvC+uXVMFrhhV0o0GG2wtmNTaodtqKmgrlzSFI6 d0K4a9pfUqBCT98XDhEy8xyV0ijEHZP/stZcu03l6d75ipouWgB7q4r018M90mr1zNh9 eTz7UskTDV+md6+XkK/OQVTx1w9EkWaMdyHGBYRuRlowInW5t+qWBXfR/8l9AGitCD39 xNUA== X-Gm-Message-State: AO0yUKX6AAAWeW6bIeqqiZtGG2cpUqAzyDfGkyuK4A3cIV+TMQrluWOy b2PNXN8kqCY4lOL4Fdxn+rjM976w7LM= X-Google-Smtp-Source: AK7set8mtJiI2ciK44kwQLIFjrqrU8l59SMEtzUbdYNFJlE+v8mq5+VJjWpiPrhef+6jzW4ipuk0qQ== X-Received: by 2002:a05:600c:1c2a:b0:3dc:5032:2895 with SMTP id j42-20020a05600c1c2a00b003dc50322895mr2903146wms.0.1676476707524; Wed, 15 Feb 2023 07:58:27 -0800 (PST) Received: from lili ([2a01:e0a:59b:9120:65d2:2476:f637:db1e]) by smtp.gmail.com with ESMTPSA id a4-20020a05600c348400b003df5be8987esm2519224wmq.20.2023.02.15.07.58.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Feb 2023 07:58:27 -0800 (PST) From: Simon Tournier To: Lars-Dominik Braun Subject: Re: [bug#61420] [PATCH 00/31] Haskell upgrade to Stackage 20.5 In-Reply-To: References: <86cz6bfbtu.fsf@gmail.com> Date: Wed, 15 Feb 2023 12:10:55 +0100 Message-ID: <86o7pvdw00.fsf@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 1.1 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Hi, On Wed, 15 Feb 2023 at 11:58, Lars-Dominik Braun wrote: > yes, they’re a few hundred kilobytes with thousands of lines > each. Please have a look at the branch instead. Content analysis details: (1.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (zimon.toutoune[at]gmail.com) 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record 1.1 DATE_IN_PAST_03_06 Date: is 3 to 6 hours before Received: date -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [209.85.128.42 listed in wl.mailspike.net] -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.128.42 listed in list.dnswl.org] X-Debbugs-Envelope-To: 61420 Cc: 61420@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.1 (/) Hi, On Wed, 15 Feb 2023 at 11:58, Lars-Dominik Braun wrote: > yes, they=E2=80=99re a few hundred kilobytes with thousands of lines > each. Please have a look at the branch instead. All LGTM. Some minor comments that can be addressed later, IMHO. Thank you for this hard work! Cheers, simon From debbugs-submit-bounces@debbugs.gnu.org Sun Feb 26 04:47:17 2023 Received: (at 61420-done) by debbugs.gnu.org; 26 Feb 2023 09:47:17 +0000 Received: from localhost ([127.0.0.1]:42365 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pWDcj-0007Pc-6I for submit@debbugs.gnu.org; Sun, 26 Feb 2023 04:47:17 -0500 Received: from mout-p-202.mailbox.org ([80.241.56.172]:39572) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pWDcg-0007PJ-AS for 61420-done@debbugs.gnu.org; Sun, 26 Feb 2023 04:47:15 -0500 Received: from smtp1.mailbox.org (smtp1.mailbox.org [10.196.197.1]) (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 4PPf1611NPz9sby for <61420-done@debbugs.gnu.org>; Sun, 26 Feb 2023 10:47:06 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=6xq.net; s=MBO0001; t=1677404826; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=NxWVv666IpEnIWbqqxYS8pNhGDCQiwTvuDX5Yumru34=; b=wR42RhTq/kGKwcYToFZ11te5SWgPzCG4U4lElqrqUzQi0o8VywLCdMInBfD+ezWMSWMj8Z TR2FZbERJYrezeVR70EqVhQVouc85ecwsGk0oHYUUUAv8lEu1+NI1oO8Zr1wgo3wcxPaja tC7A8kWgHMbZVGdl1V20j/l1Sv7qb1X1Mm5HMP3t9bzUOYybKurKRMkDHxJMBlk6V4SpHO fVP+hyjAAm1W+EyfIkQvegIOHUUe30NzHtSvHcV7/ycNxzzIwenwgOeTKIPP8QEdn7HtXi 3gogpYQebzpj5nx1s2QjKdAocwMLx7UQHFBnBkybqFrXt3wROeLhxifBsLueSw== Date: Sun, 26 Feb 2023 10:47:03 +0100 From: Lars-Dominik Braun To: 61420-done@debbugs.gnu.org Subject: Re: [PATCH 00/31] Haskell upgrade to Stackage 20.5 Message-ID: References: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 61420-done X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) Hi, the branch wip-haskell has been merged. Lars From unknown Fri Sep 12 12:20:27 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Sun, 26 Mar 2023 11:24:05 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator