From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id ELXVHiCXG2N6ewAAbAwnHQ (envelope-from ) for ; Fri, 09 Sep 2022 21:42:24 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id cHviHSCXG2MrsQAAG6o9tA (envelope-from ) for ; Fri, 09 Sep 2022 21:42:24 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 45D023E40A for ; Fri, 9 Sep 2022 21:42:24 +0200 (CEST) Received: from localhost ([::1]:36930 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oWjtO-0005Lm-Us for larch@yhetil.org; Fri, 09 Sep 2022 15:42:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49486) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oWjt4-0005LZ-MJ for guix-patches@gnu.org; Fri, 09 Sep 2022 15:42:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:46885) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oWjt4-0001h3-E1 for guix-patches@gnu.org; Fri, 09 Sep 2022 15:42:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oWjt4-0002hZ-9I for guix-patches@gnu.org; Fri, 09 Sep 2022 15:42:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#57710] [PATCH] gnu: ghc-alex: Use G-expressions. Resent-From: jgart Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 09 Sep 2022 19:42:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 57710 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 57710@debbugs.gnu.org Cc: jgart X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.166275250110354 (code B ref -1); Fri, 09 Sep 2022 19:42:02 +0000 Received: (at submit) by debbugs.gnu.org; 9 Sep 2022 19:41:41 +0000 Received: from localhost ([127.0.0.1]:35584 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oWjsi-0002gw-NB for submit@debbugs.gnu.org; Fri, 09 Sep 2022 15:41:41 -0400 Received: from lists.gnu.org ([209.51.188.17]:55592) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oWjsg-0002gn-1f for submit@debbugs.gnu.org; Fri, 09 Sep 2022 15:41:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35934) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oWjsf-0005K2-ST for guix-patches@gnu.org; Fri, 09 Sep 2022 15:41:37 -0400 Received: from mx1.dismail.de ([78.46.223.134]:41570) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oWjsS-0001dn-3S for guix-patches@gnu.org; Fri, 09 Sep 2022 15:41:37 -0400 Received: from mx1.dismail.de (localhost [127.0.0.1]) by mx1.dismail.de (OpenSMTPD) with ESMTP id 3816e282 for ; Fri, 9 Sep 2022 21:41:18 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=dismail.de; h=from:to:cc :subject:date:message-id:mime-version:content-type :content-transfer-encoding; s=20190914; bh=UGdDolu93lf995gZnwh7E ifxuM7bUcE1+1/wGEPGKmE=; b=Y5VVGFsXP9aAv6DOemeoEBeFgsELYHLCf08qc aJ4kejTiAuuypnjRqzNQ3TAuDmbzFCv79IPVh/MEHmmFy3j4ZMHVVgWjCoj/qlWq 37JEy9q+1b/XbvtNW2XnDI18oDaJxM+Sp6dDG865nxPhlWKJuY6/GB+qc+DDjfhH LhQGX1NRJ1m048wWKmx+drp9eUf97x8MQKFceUwC2V3yPr5gp8U/31Skv53rO4lY T0AVCr/nbJt2TcmfFmIJqr1z/y1MaFBK8NYjtcf2UdylAJwXzwCGeArosQ3Viy4t q5Te7Pek/dWiQEKcg37NOXhv5CVcfDhWdgqW6I0kSmge7bNgw== Received: from smtp2.dismail.de ( [10.240.26.12]) by mx1.dismail.de (OpenSMTPD) with ESMTP id 5ae84a70 for ; Fri, 9 Sep 2022 21:41:17 +0200 (CEST) Received: from smtp2.dismail.de (localhost [127.0.0.1]) by smtp2.dismail.de (OpenSMTPD) with ESMTP id 835730dc for ; Fri, 9 Sep 2022 21:41:17 +0200 (CEST) Received: by dismail.de (OpenSMTPD) with ESMTPSA id 0babb7de (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Fri, 9 Sep 2022 21:41:16 +0200 (CEST) Date: Fri, 9 Sep 2022 14:41:16 -0500 Message-Id: <20220909194116.10433-1-jgart@dismail.de> X-Mailer: git-send-email 2.37.3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=78.46.223.134; envelope-from=jgart@dismail.de; helo=mx1.dismail.de X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" Reply-to: jgart X-ACL-Warn: , jgart via Guix-patches From: jgart via Guix-patches via X-Migadu-Flow: FLOW_IN X-Migadu-To: larch@yhetil.org X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1662752544; h=from:from:sender:sender:reply-to: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:resent-cc: resent-from:resent-sender:resent-message-id:list-id:list-help: list-unsubscribe:list-subscribe:list-post:dkim-signature; bh=F0/hTeKTat99kI1Csm08Y4tLGTc+9h9cppG/tSq3VBk=; b=UL3uB2qSiyhM3gIxc8UCnCnpZRugERF4Hw2j3mbkVgpPlKFpN70RBBqTzQeS02BBs2c4SG SMqxtmdMmKWTA4c8OC80mCt/07po0ySUCqZWXzULjsmDZ3ONZiCXe+HeKCAHOPM1lyZxyi YDrHdD3Jd0HuyqM951hXII+pqQsSycmWFm2UoRUm9XRb+PV7sC1wUUBamMtMBqG2KTXrvx 7gZWAXRIjIciBRLyyxYDVQfnK/0dsFQk82ssWrmnaRXycZkgQUjhi2IoQNkI7Dxk6WezuW sfCufzbFYVRAsfeEeNUXpXj9KdD+sdpscnJooBlYQ4rSoRCSUr5ug7CBHbNWlA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1662752544; a=rsa-sha256; cv=none; b=INQBsDKSWNbAMgKCCr9IZztBh+TCb0BEeKumA63I79y3tRtILDba+AGFM+OidgbjzBfoQU +DLYm9I/oWo7C4riPRRr5AHVUfi81kSinR28Y0Mspc9pTMEsrOsaefcA/DJV7zHZwCkZ0c t1bMsYF8nCIZgmjid6P7krVpqD4pfSU/LijI98oNDjlSGzBdsROFCh1EhNK3bi/DNLu2tp kpAjdHQTSIFG7wbehGdAv46CsNvAnVEslCwEuI+Vi3q6f1IKFKhH7F9EgRQnMK5rdf+O4Q 5LRB9y1wFCYyiWqY7O6fCQ0FGKMRuI+quLycWJoa47WWt5hMjUGzch2Sl+Jl+g== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=dismail.de header.s=20190914 header.b=Y5VVGFsX; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: -2.60 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=dismail.de header.s=20190914 header.b=Y5VVGFsX; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: 45D023E40A X-Spam-Score: -2.60 X-Migadu-Scanner: scn0.migadu.com X-TUID: AmFVZcQhUzQ7 * gnu/packages/containers.scm (ghc-alex)[arguments]: Use G-expressions. [arguments]: Remove trailing booleans. --- gnu/packages/haskell-xyz.scm | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 85291896cc..9ebe3fd6ff 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -30,6 +30,7 @@ ;;; Copyright © 2020 Christine Lemmer-Webber ;;; Copyright © 2021, 2022 Alice BRENON ;;; Copyright © 2021 John Kehayias +;;; Copyright © 2022 jgart ;;; ;;; This file is part of GNU Guix. ;;; @@ -75,6 +76,7 @@ (define-module (gnu packages haskell-xyz) #:use-module (gnu packages xorg) #:use-module (guix build-system haskell) #:use-module (guix download) + #:use-module (guix gexp) #:use-module (guix git-download) #:use-module (guix utils) #:use-module ((guix licenses) #:prefix license:) @@ -297,14 +299,13 @@ (define-public ghc-alex "042lrkn0dbpjn5ivj6j26jzb1fwrj8c1aj18ykxja89isg0hiali")))) (build-system haskell-build-system) (arguments - `(#:phases - (modify-phases %standard-phases - (add-before 'check 'set-check-variables - (lambda _ - (setenv "PATH" (string-append (getcwd) "/dist/build/alex:" - (getenv "PATH"))) - (setenv "alex_datadir" (string-append (getcwd) "/data")) - #t))))) + (list #:phases + #~(modify-phases %standard-phases + (add-before 'check 'set-check-variables + (lambda _ + (setenv "PATH" (string-append (getcwd) "/dist/build/alex:" + (getenv "PATH"))) + (setenv "alex_datadir" (string-append (getcwd) "/data"))))))) (inputs (list ghc-quickcheck)) (native-inputs (list which)) -- 2.37.3