From patchwork Sat Feb 11 09:59:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Lars-Dominik Braun X-Patchwork-Id: 1254 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 0270D1661A; Sat, 11 Feb 2023 10:00:20 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 914A9165F0 for ; Sat, 11 Feb 2023 10:00:19 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pQmfv-0001i3-Jg; Sat, 11 Feb 2023 05:00:07 -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 1pQmfr-0001h0-Ic for guix-patches@gnu.org; Sat, 11 Feb 2023 05:00:06 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pQmfr-0006d6-70 for guix-patches@gnu.org; Sat, 11 Feb 2023 05:00:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pQmfq-0003qq-Pi for guix-patches@gnu.org; Sat, 11 Feb 2023 05:00:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61420] [PATCH 00/31] Haskell upgrade to Stackage 20.5 Resent-From: Lars-Dominik Braun Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 11 Feb 2023 10:00:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 61420 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 61420@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.167610957514738 (code B ref -1); Sat, 11 Feb 2023 10:00:02 +0000 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 Message-ID: MIME-Version: 1.0 Content-Disposition: inline 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-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches 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