Received: (at 67921) by debbugs.gnu.org; 8 Jan 2024 07:09:36 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Mon Jan 08 02:09:36 2024 Received: from localhost ([127.0.0.1]:34869 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1rMjlQ-0004IN-96 for submit <at> debbugs.gnu.org; Mon, 08 Jan 2024 02:09:36 -0500 Received: from vmi571514.contaboserver.net ([75.119.130.101]:34782 helo=mail.laesvuori.fi) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <saku@HIDDEN>) id 1rMjlO-0004IF-Qm for 67921 <at> debbugs.gnu.org; Mon, 08 Jan 2024 02:09:35 -0500 Received: from X-kone (unknown [185.50.245.20]) by mail.laesvuori.fi (Postfix) with ESMTPSA id 26E72342FEF; Mon, 8 Jan 2024 08:09:43 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=laesvuori.fi; s=mail; t=1704697784; bh=YrzK82EnqHcC44Fx7FJMyho6kVGQ44LW0LY+y2zJpVI=; h=Date:From:To:Cc:Subject:References:In-Reply-To; b=uV4qW30Ch9ovPE7f9LEftZBYKDhONoeVhP5Z2egQB/SqQkjNLo1MJbrJt2KIavXZT 2T6Okx1YnVGDI/VhqKWsn23DP2wgGP9MB7W4+xowR5NE9+ROEdSOrXHhcQwCdpqWLD E8XvxMbnt0X5etomSvZax3zDwxHy/8Cw2PPDjcYg= Date: Mon, 8 Jan 2024 09:09:23 +0200 From: Saku Laesvuori <saku@HIDDEN> To: Lars-Dominik Braun <lars@HIDDEN> Subject: Re: [bug#67921] [PATCH haskell-team 3/3] guix: haskell-build-system: Hide dependecies from ghc's package db Message-ID: <vceyvgylkpftupwxlm4nc2555nvrg6kdeqsghv4lo722po57el@t5xc7wwn5b2r> References: <5cdfcf3aadfbe42655b941764d5a700b6d4bca88.1703056111.git.saku@HIDDEN> <6030eebe203e81a45acda76c95bcbfb064ff5e74.1703056111.git.saku@HIDDEN> <ZZmfF_c4kxUV0BZl@HIDDEN> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="cvspcsirzfuvcbyw" Content-Disposition: inline In-Reply-To: <ZZmfF_c4kxUV0BZl@HIDDEN> X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 67921 Cc: 67921 <at> debbugs.gnu.org X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.0 (-) --cvspcsirzfuvcbyw Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable > Hi, >=20 > > A Haskell package P contains information about all other haskell > > packages P_n it depends on. This commit hides the packages P_n in the > > package database stored in P, which enables being explicit about which > > haskell packages one wants to be visible in their profile. >=20 > oddly enough this patch causes the 'check phase of ghc-doctest to > not finish/hang. Any idea why? No idea, I'll look into it more when I get GHC 9.6 packaged. --cvspcsirzfuvcbyw Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEoMkZR3NPB29fCOn/JX0oSiodOjIFAmWbn6MACgkQJX0oSiod OjIKLhAAiQ5m3svlXkdRKUQsXAHjsDs8qA6CAOtegPMsvd/fEUn4GOaIJ6wYxF9T RDrxKYd03eJ3IcNeOftlGEE4lhaaP0mqotQKx640tzlxwH0yPt1E3GNYfcgay1Ti VKqz4eOyeCvustpykLh4MCx0pDKEYvCr8BV7UyRHx6O+g2X1xAUEvQL1SnJaa1Dj QUQbDR+4xIvbUqz8XqrJxO7bx+8ipP481vhciXbFbGkwJ4BFxuy1NRY1/dMwefEK NefZqKPgf9NWGLbdiS0S/1LNwOBs3vcbkh+Kr+MH4MY7XQ4tnjXTmRm9BHKjcZXZ Jc9BaCMjlwAulGE0QRsFg8C0yjYAiX8NAEnpJT0/dST/3WeFqjYEBvIbjLQd3ZfU nl4290VL13IIwNpYtYoNSIXbKbReYUmqcDK2O5/ndezCI7ceHwTJBW5JPfghc9Cg DgN49kIScevnaVt95cbsZfXYFilWS6NTye2hFT4uUk9eUwaIWmisX+a6HYkhpDfU B3wDdlKXqtvI+qYoHVZ8w5smmkhBcyRCh+GsPRfv/q/l6Ph17q42fIRuPnRweHJ8 wVv185A7e9B3tUIGyp7l+bTB/KpuN0xmIm1zAEWMosc4UaIjRUvBB8DtUX65EW8C lWgCvbiFEXB72Hws1lPCUuOUgCcortAY6jSQyA/jRLfCMUu/D8k= =tkO5 -----END PGP SIGNATURE----- --cvspcsirzfuvcbyw--
guix-patches@HIDDEN:bug#67921; Package guix-patches.
Full text available.Received: (at 67921) by debbugs.gnu.org; 6 Jan 2024 18:42:50 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Sat Jan 06 13:42:50 2024 Received: from localhost ([127.0.0.1]:60294 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1rMBdC-0003kt-IE for submit <at> debbugs.gnu.org; Sat, 06 Jan 2024 13:42:50 -0500 Received: from mout-p-101.mailbox.org ([2001:67c:2050:0:465::101]:51776) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <lars@HIDDEN>) id 1rMBdA-0003kf-Fq for 67921 <at> debbugs.gnu.org; Sat, 06 Jan 2024 13:42:49 -0500 Received: from smtp2.mailbox.org (smtp2.mailbox.org [IPv6:2001:67c:2050:b231:465::2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-101.mailbox.org (Postfix) with ESMTPS id 4T6q241d6zz9snR; Sat, 6 Jan 2024 19:42:36 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=6xq.net; s=MBO0001; t=1704566556; 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: in-reply-to:in-reply-to:references:references; bh=P3+CnzgoqiRXpzFEhu1Y/gfut22ywh+zEeWq8HxTmiw=; b=Z4zRbyc9RxWkEuWsNnVDCNjuGfYSpY0WfLNlQqHNmQyrSfXNEvl9x3rMpi5XSXSYGk7HOw 2/iF2EbS7/BUr480AzmTIzDQ3WECf6nn0uVUZpyyvD7CEd+7JIA+I2WZr/kE9eHW0epkBG 5Wx8U8hd+5vCsdJHmK0aSi4RJ4YacM15+mcaI0tovqByEp/7vhQLnC/AgJxGyvVffI/qDY T/aNYNWIuOmYGumrw4c4d2RwqohjbXpu4n+Pf9wRNEhSu3vJ8wtvIIlddzFyq1lMMHlHVo 3I3IjzkDi9cu+m06wZN/x1z6mGYd+Z5XGHuw3mQW5l9hluFQiq02aZyFWY1SVA== Date: Sat, 6 Jan 2024 19:42:31 +0100 From: Lars-Dominik Braun <lars@HIDDEN> To: Saku Laesvuori <saku@HIDDEN> Subject: Re: [bug#67921] [PATCH haskell-team 3/3] guix: haskell-build-system: Hide dependecies from ghc's package db Message-ID: <ZZmfF_c4kxUV0BZl@HIDDEN> References: <5cdfcf3aadfbe42655b941764d5a700b6d4bca88.1703056111.git.saku@HIDDEN> <6030eebe203e81a45acda76c95bcbfb064ff5e74.1703056111.git.saku@HIDDEN> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <6030eebe203e81a45acda76c95bcbfb064ff5e74.1703056111.git.saku@HIDDEN> X-Rspamd-Queue-Id: 4T6q241d6zz9snR X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 67921 Cc: 67921 <at> debbugs.gnu.org X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.7 (-) Hi, > A Haskell package P contains information about all other haskell > packages P_n it depends on. This commit hides the packages P_n in the > package database stored in P, which enables being explicit about which > haskell packages one wants to be visible in their profile. oddly enough this patch causes the 'check phase of ghc-doctest to not finish/hang. Any idea why? Cheers, Lars
guix-patches@HIDDEN:bug#67921; Package guix-patches.
Full text available.
Received: (at 67921) by debbugs.gnu.org; 22 Dec 2023 11:04:07 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Fri Dec 22 06:04:06 2023
Received: from localhost ([127.0.0.1]:46113 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1rGdK2-0000MR-Gm
for submit <at> debbugs.gnu.org; Fri, 22 Dec 2023 06:04:06 -0500
Received: from mout-p-101.mailbox.org ([2001:67c:2050:0:465::101]:54470)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <lars@HIDDEN>) id 1rGdK0-0000Lu-Dd
for 67921 <at> debbugs.gnu.org; Fri, 22 Dec 2023 06:04:05 -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 X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
(No client certificate requested)
by mout-p-101.mailbox.org (Postfix) with ESMTPS id 4SxPYg5Pdnz9snR;
Fri, 22 Dec 2023 12:03:51 +0100 (CET)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=6xq.net; s=MBO0001;
t=1703243031;
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=VQ3Lsqg3kZlm2qvS8Tp3qUAbBKrGpe8quQbqo7dtifY=;
b=z4RjWsdrKIRSB89/gKaAz8lq3uGOo2NrFkUMMT11/rDyKEBOQ6CBXV6dF4Ze3oLbeuyzWY
Bz4MHW2idgqzL7n9P0hEaPccxyo3BfwoqaGiNifPOAAfs640Nx63BhMM/pzjxU/L/e+pNe
Lj7o0Srsjwa6VyJDIcKCmO40zqyFZGpf+FmD2CyhJYthhbR3QeHoVaTwLzjkMKWEQG4y+S
BadfGwKhsl7lvuSNRQDFR+z0behk4xTzpPGmU6q9sqaMJEQnODIrxIZZwKlLt1SFL8D8mB
RmhN+VrcwMIlnuAEoJBSgq6lD2crxkjrF9pJ/bu1H7IzcoVjCUCh9+fI1V03Bw==
Date: Fri, 22 Dec 2023 12:03:49 +0100
From: Lars-Dominik Braun <lars@HIDDEN>
To: Saku Laesvuori <saku@HIDDEN>
Subject: Re: [bug#67921] [PATCH haskell-team 2/3] gnu: ghc: Use version 9.4.8
as the default
Message-ID: <ZYVtFfZ5DdWiYaHl@HIDDEN>
References: <5cdfcf3aadfbe42655b941764d5a700b6d4bca88.1703056111.git.saku@HIDDEN>
<c4f97924d832d52aa15366b4e2397568e2d96868.1703056111.git.saku@HIDDEN>
<ZYVfxTBW9lsUtMFW@HIDDEN>
<o22z5twrua57nzv5aqyldigbempxwglsa6xh2ytpxif4l2nacc@hgfkyqqcsbmt>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="U4w8i89Nmx6nxVXh"
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
In-Reply-To: <o22z5twrua57nzv5aqyldigbempxwglsa6xh2ytpxif4l2nacc@hgfkyqqcsbmt>
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 67921
Cc: 67921 <at> debbugs.gnu.org
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.7 (-)
--U4w8i89Nmx6nxVXh
Content-Type: text/plain; charset=utf-8
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Hi Saku,
> Because I wrote that patch when there wasn't yet a Stackage release for
> ghc 9.6. But if a stackage release for it has now been released I'll try
> updating it to 9.6.
oh, I see. I believe 9.6 drops the Makefile-based build-system, making
it a slightly more involved upgrade.
> Regarding the big upgrade, I have been wondering how could the cabal
> revisions be updated automatically.
I’ve been using the script attached, which basically overwrites the
entire package, except for synopsis and description.
> Is there some reason why the revision is not part of the package
> version?
I don’t know.
> Moving it there would probably be much easier than modifying
> guix refresh (but then again, if those modifications should be done
> anyway it doesn't really reduce the amount of work)
The thing is that we still need the cabal file hash somewhere and it
needs to be updated. My idea was to create a new HACKAGE-URI procedure,
which accepts package name, version, revision and cabal file hash and
add some black magic to combine the new cabal file with the tarball from
hackage. Code exists for this, but I’ve never been able to finalize it.
Lars
--U4w8i89Nmx6nxVXh
Content-Type: application/vnd.lotus-screencam
Content-Disposition: attachment; filename="haskell-update.scm"
Content-Transfer-Encoding: quoted-printable
(use-modules (guix import stackage)=0A (guix import hackage)=0A=
(guix packages)=0A (guix utils)=0A (gu=
ix read-print)=0A (guix build-system haskell)=0A (g=
uix diagnostics)=0A (gnu packages)=0A (ice-9 match)=
=0A (srfi srfi-1)=0A (srfi srfi-9 gnu))=0A=0A(defin=
e (package-sexp->properties package)=0A (match package=0A ((and expr ('=
package fields ...))=0A (match expr=0A ((path *** ('properties ('=
list sym ...)))=0A sym)=0A (_ '())))=0A (x=0A (pk 'nop=
e))))=0A=0A(define (replace-package-sexp-field package field after replacem=
ent)=0A "Replace PACKAGE=E2=80=99s FIELD with REPLACEMENT."=0A (match pac=
kage=0A ((and expr ('package fields ...))=0A `(package=0A ,@(=
fold (lambda (arg accum)=0A (match arg=0A =
((name args)=0A (if (eq? name field)=0A =
(append (list `((,field ,@replacement))) accum)=0A =
(append (list name args) accum)))=0A ((? com=
ment? comment) comment)=0A (_ (error "nope"))))=0A =
'() fields)))=0A (x=0A (pk 'nope))))=0A=0A(define (package=
-field-location* package field)=0A "Return the source code location of the=
definition of FIELD for PACKAGE, or=0A#f if it could not be determined."=
=0A (match (package-location package)=0A (($ <location> file line colum=
n)=0A (match (search-path %load-path file)=0A ((? string? file-fo=
und)=0A (catch 'system-error=0A (lambda ()=0A ;;=
In general we want to keep relative file names for modules.=0A =
(call-with-input-file file-found=0A (lambda (port)=0A =
(go-to-location port line column)=0A (match (read por=
t)=0A (('package inits ...)=0A (let ((fi=
eld (assoc field inits)))=0A (match field=0A =
((_ value)=0A (let ((loc (and=3D> (sourc=
e-properties field)=0A source-prop=
erties->location)))=0A (and loc=0A =
;; Preserve the original file name, which may be a=0A =
;; relative file name.=0A =
(set-field loc (location-file) file))))=0A (_=0A=
#f))))=0A (_=0A =
#f)))))=0A (lambda _=0A #f)))=0A (#f=0A ;;=
FILE could not be found in %LOAD-PATH.=0A #f)))=0A (_ #f)))=0A=
=0A(define (add-upstream-name package)=0A (let* ((location (package-field-=
location* package 'build-system))=0A (column (location-column locat=
ion))=0A (upstream-name (guix-package->hackage-name package))=0A =
(properties (package-properties package))=0A (existing-upstre=
am-name (assoc-ref properties 'upstream-name))=0A (properties-exist=
? (not (null? properties))))=0A (cond=0A ((not location) (format #t=
"No location for build-system, bailing on ~a~%" upstream-name))=0A (e=
xisting-upstream-name (format #t "Upstream name ~a exists for ~a~%" existin=
g-upstream-name upstream-name))=0A (properties-exist? (format #t "Prop=
erties exist for ~a, bailing. ~a~%" upstream-name properties))=0A (ups=
tream-name=0A (begin=0A (format #t "Adding upstream name ~a=
to ~a at ~a~%" upstream-name (package-name package) location)=0A =
(edit-expression=0A (location->source-properties location)=0A =
(lambda (str)=0A (let ((properties `(properties (quote (=
(upstream-name . ,upstream-name))))))=0A (string-append str "=
\n" (make-string column #\space) (object->string* properties column))))))))=
))=0A=0A(define (package-source-uri-location package)=0A "Return the sourc=
e code location of the definition of FIELD for PACKAGE, or=0A#f if it could=
not be determined."=0A (match (package-location package)=0A (($ <locat=
ion> file line column)=0A (match (search-path %load-path file)=0A =
((? string? file-found)=0A (catch 'system-error=0A (lambda=
()=0A ;; In general we want to keep relative file names for mod=
ules.=0A (call-with-input-file file-found=0A (lambd=
a (port)=0A (go-to-location port line column)=0A =
(match (read port)=0A ((path *** ('source source))=0A =
(match source=0A ((path *** ('uri u=
ri))=0A (let ((loc (and=3D> (source-properties uri)=
=0A source-properties->location)))=
=0A (and loc=0A ;; P=
reserve the original file name, which may be a=0A =
;; relative file name.=0A (set-field loc=
(location-file) file))))))=0A (m=0A (be=
gin=0A (format #t "Nothing found at ~a~%" m)=0A =
#f))))))=0A (lambda _=0A #f)))=0A (#f=
=0A ;; FILE could not be found in %LOAD-PATH.=0A #f)))=0A =
(_ #f)))=0A=0A(define (add-hackage-uri package)=0A (let* ((location (packa=
ge-source-uri-location package))=0A (column (and=3D> location locat=
ion-column))=0A (upstream-name (assq-ref (package-properties packag=
e) 'upstream-name))=0A (uri `(hackage-uri ,upstream-name version)))=
=0A (cond=0A ((not location) (format #t "Not adding uri ~a to ~a, n=
o location" uri (package-name package)))=0A ((not upstream-name) (form=
at #t "Not adding uri ~a to ~a, not hackage" uri (package-name package)))=
=0A (else=0A (format #t "Adding uri ~a to ~a at ~a~%" uri (pack=
age-name package) location)=0A (edit-expression=0A (location=
->source-properties location)=0A (lambda (str) (object->string* uri=
column)))))))=0A=0A(define (package-sexp->version package)=0A (match pack=
age=0A ((and expr ('package fields ...))=0A (match expr=0A ((p=
ath *** ('version version))=0A version)))=0A (x=0A (pk 'nope=
))))=0A=0A(define (package-sexp->arguments package)=0A (match package=0A =
((and expr ('package fields ...))=0A (match expr=0A ((path *** =
('arguments arguments))=0A arguments)=0A (_ #f)))=0A (x=0A=
(pk 'nope))))=0A=0A(define (replace-package-sexp-field package field r=
eplacement)=0A "Replace PACKAGE=E2=80=99s FIELD with REPLACEMENT."=0A (ma=
tch package=0A ((and expr ('package fields ...))=0A `(package ,@(map=
(lambda (x) (if (eq? (car x) field) `(,(car x) (,@replacement)) x)) fields=
)))=0A (x=0A (error (format #f "cannot replace sexp field ~a in ~a" =
field package)))))=0A=0A(define (update-package package)=0A (let* ((locati=
on (package-location package))=0A (column (and=3D> location locatio=
n-column))=0A (upstream-name (assq-ref (package-properties package)=
'upstream-name))=0A (old-version (package-version package))=0A =
(old-arguments (package-arguments package)))=0A (cond=0A ((not=
location) (format #t "Not updating ~a, because it has no location~%" (pack=
age-name package)))=0A ((not upstream-name) (format #t "Not updating ~=
a, because it has no upstream name~%" (package-name package)))=0A (els=
e=0A (let* ((new-package (with-exception-handler=0A =
(lambda (e) #f)=0A (lambda ()=
(stackage->guix-package upstream-name))=0A =
#:unwind? #t))=0A (new-version (package-sexp->version new-pac=
kage))=0A (new-arguments (package-sexp->arguments new-package=
)))=0A (cond=0A ((not new-package)=0A (form=
at #t "Not updating ~a, cannot import package.~%" (package-name package)))=
=0A ; XXX: also compare arguments=0A ((and (equal? old=
-version new-version) (eq? old-arguments new-arguments))=0A (fo=
rmat #t "Not updating ~a, same version.~%" (package-name package)))=0A =
(else=0A (begin=0A (format #t "Updating pack=
age ~a to ~a at ~a~%" (package-name package) new-version location)=0A =
(edit-expression=0A (location->source-properties loca=
tion)=0A (lambda (str) (object->string* (replace-package-sexp=
-field=0A (replace-package-sexp-field new-pac=
kage 'synopsis (package-synopsis package))=0A =
'description (package-description package))=0A =
column)))))))))))=0A=0A(match (program-arguments)=0A ((p=
rogname name)=0A (update-package (specification->package name))))=0A=0A
--U4w8i89Nmx6nxVXh--
guix-patches@HIDDEN:bug#67921; Package guix-patches.
Full text available.Received: (at 67921) by debbugs.gnu.org; 22 Dec 2023 10:33:33 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Fri Dec 22 05:33:33 2023 Received: from localhost ([127.0.0.1]:46105 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1rGcqS-0002i5-MT for submit <at> debbugs.gnu.org; Fri, 22 Dec 2023 05:33:33 -0500 Received: from vmi571514.contaboserver.net ([75.119.130.101]:55540 helo=mail.laesvuori.fi) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <saku@HIDDEN>) id 1rGcqQ-0002hv-5U for 67921 <at> debbugs.gnu.org; Fri, 22 Dec 2023 05:33:31 -0500 Received: from X-kone (unknown [130.233.144.183]) by mail.laesvuori.fi (Postfix) with ESMTPSA id BF09C34304F; Fri, 22 Dec 2023 11:33:31 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=laesvuori.fi; s=mail; t=1703241212; bh=u1NXcFONihi4nkq1NyIlcLY9iWKuBFvWxK59dY590DI=; h=Date:From:To:Cc:Subject:References:In-Reply-To; b=VG6EYQOdkB1FuwiPd/p1oWU7FKqmNag8wRogQ0XJN+j5yBLefPtg60HIYuVCs94zV WYI31NuVmsB9k9OLuDlFJLJ2eCGiluP4YIEGh23jf6mjS5j1q7aMYYpsnbnJYsGveC ZvywQx8J6v+rzNwsE1UBjttx/+JtTXcoHFtRwJ0Y= Date: Fri, 22 Dec 2023 12:33:21 +0200 From: Saku Laesvuori <saku@HIDDEN> To: Lars-Dominik Braun <lars@HIDDEN> Subject: Re: [bug#67921] [PATCH haskell-team 2/3] gnu: ghc: Use version 9.4.8 as the default Message-ID: <o22z5twrua57nzv5aqyldigbempxwglsa6xh2ytpxif4l2nacc@hgfkyqqcsbmt> References: <5cdfcf3aadfbe42655b941764d5a700b6d4bca88.1703056111.git.saku@HIDDEN> <c4f97924d832d52aa15366b4e2397568e2d96868.1703056111.git.saku@HIDDEN> <ZYVfxTBW9lsUtMFW@HIDDEN> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="obylmhjgscp5arsq" Content-Disposition: inline In-Reply-To: <ZYVfxTBW9lsUtMFW@HIDDEN> X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 67921 Cc: 67921 <at> debbugs.gnu.org X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.0 (-) --obylmhjgscp5arsq Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable > Hi, >=20 > > * gnu/packages/haskell.scm (ghc-9.4): Rename from ghc-next to ghc. >=20 > why 9.4 and not 9.6? Stackage 22.0 for 9.6 has just been released and > if we go for a big upgrade (you=E2=80=99ll have to update the entire Hask= ell > ecosystem if you update GHC), we might as well just make the jump to > GHC 9.6 and Stackage 22.0. Because I wrote that patch when there wasn't yet a Stackage release for ghc 9.6. But if a stackage release for it has now been released I'll try updating it to 9.6. Regarding the big upgrade, I have been wondering how could the cabal revisions be updated automatically. Is there a simpler way than to 1. include a procedure for editing the declaration in the <upstream-updater= >=20 2. refactor the entire updater code to use that procedure 3. implement completely new logic for adding fields to package definitions? That seems like a lot of work in code that I don't know all that well. Is there some reason why the revision is not part of the package version? Moving it there would probably be much easier than modifying guix refresh (but then again, if those modifications should be done anyway it doesn't really reduce the amount of work) - Saku --obylmhjgscp5arsq Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEoMkZR3NPB29fCOn/JX0oSiodOjIFAmWFZfEACgkQJX0oSiod OjL3EhAAkQSMY/WVBDEndRqbgCc1TMLpeeC6GXP1xFY6xmlkNG5CRPjVEpf7Yq2N YaMbQq1qAnLRRa4WHmq/hFvbpgaNXut6BiOruePQ+0LWl6Zay4ITd0OO8Bjq8weu gaNdBpLbCKBWw3mEBbZdVPpjFtI6xBWf/FZRMbLTvOUvfZPuDfTXpyRQMrUGNXzr NU/GkHuIktIMN3neP7Z5lQhojTBSA6WAaq+NrQGQb0zWocwVurxnGFF77/LfUOQ6 KgpqiyJRK+LPhiJQoU3M13LUXxiMHzzAojjJx6WHtRQtM4AAbD7PvQUZbo0soez9 XJm+KTWUMT1RYkvRdMtzhPmRkBQJ0fWOETFcFAardn18cKFdl9PLPz3QD4Wtl9yd 0vUp6CrNQl/4TM2A/05v6AQWv87lAFy27Q0CjfU4WKWiRLFPPEsCQQilWRrYl29e i40ce4t0MXNWIBCsrp2wivG6NVtxIAPbMG/d5v+ocyEF2LoVxRrxDbVg90Wyb4oJ KYRiIxT4a57q0iUMFuyaZLnQ0T6tK9SY8xTGLf02iMsYQk58iD/d+rW5guSvM8Dc ueHY+TMOp//VaMiTcPlPBOiw+IJmZ0AB6ivtKNUQZK9NVNGgGUrZU1BX8eL7tfr1 1SOCFpz6jwLbghbPYI/85zCxMEBTUWvsLGDDiqRjZXWJj093D8Q= =fZSa -----END PGP SIGNATURE----- --obylmhjgscp5arsq--
guix-patches@HIDDEN:bug#67921; Package guix-patches.
Full text available.Received: (at 67921) by debbugs.gnu.org; 22 Dec 2023 10:07:21 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Fri Dec 22 05:07:21 2023 Received: from localhost ([127.0.0.1]:46088 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1rGcR7-0005IK-Fk for submit <at> debbugs.gnu.org; Fri, 22 Dec 2023 05:07:21 -0500 Received: from mout-p-201.mailbox.org ([80.241.56.171]:47548) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <lars@HIDDEN>) id 1rGcR5-0005I2-5R for 67921 <at> debbugs.gnu.org; Fri, 22 Dec 2023 05:07:20 -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 X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-201.mailbox.org (Postfix) with ESMTPS id 4SxNJB0wXBz9sTb; Fri, 22 Dec 2023 11:07:06 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=6xq.net; s=MBO0001; t=1703239626; 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=6OOM46/PKiedOqT9vSQw6jLl56Vn8/YS5gwOny72MbE=; b=fYgNDFlYMzrMdtq4o7ayuqSPb19dX70pHtd8ZkZt5/nSXBTARY4mDF5a+vTnSJc/BWnEu/ D6Dmv93fESxC05fSYhRalwD+p6Qvi0T12TgNvofQXiRwhL7MYABSgauFXqr6MlpdEX2FN5 W+bSDmGfMQev/ydjYBkysJY55iknzR4QlOwo26BGg8X2nndmKp+0QkvXQB4MX7512PYH/v 6I+VTRB5EA7tKetW7iMTGp5yw6joGkVpYsWgmoSNOrgy/+14gIsh8Ijv0bvF3drdcsFOAD DFSNWpcWNywJSOmkFG6tYGzfwdRibJwy2saL/CG0S0yjf4ZKCYkBqwve3WliwQ== Date: Fri, 22 Dec 2023 11:07:01 +0100 From: Lars-Dominik Braun <lars@HIDDEN> To: Saku Laesvuori <saku@HIDDEN> Subject: Re: [bug#67921] [PATCH haskell-team 2/3] gnu: ghc: Use version 9.4.8 as the default Message-ID: <ZYVfxTBW9lsUtMFW@HIDDEN> References: <5cdfcf3aadfbe42655b941764d5a700b6d4bca88.1703056111.git.saku@HIDDEN> <c4f97924d832d52aa15366b4e2397568e2d96868.1703056111.git.saku@HIDDEN> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <c4f97924d832d52aa15366b4e2397568e2d96868.1703056111.git.saku@HIDDEN> X-Rspamd-Queue-Id: 4SxNJB0wXBz9sTb X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 67921 Cc: 67921 <at> debbugs.gnu.org X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.7 (-) Hi, > * gnu/packages/haskell.scm (ghc-9.4): Rename from ghc-next to ghc. why 9.4 and not 9.6? Stackage 22.0 for 9.6 has just been released and if we go for a big upgrade (you’ll have to update the entire Haskell ecosystem if you update GHC), we might as well just make the jump to GHC 9.6 and Stackage 22.0. Lars
guix-patches@HIDDEN:bug#67921; Package guix-patches.
Full text available.
Received: (at 67921) by debbugs.gnu.org; 20 Dec 2023 07:14:30 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Wed Dec 20 02:14:30 2023
Received: from localhost ([127.0.0.1]:38508 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1rFqmV-0007MH-C0
for submit <at> debbugs.gnu.org; Wed, 20 Dec 2023 02:14:30 -0500
Received: from vmi571514.contaboserver.net ([75.119.130.101]:34516
helo=mail.laesvuori.fi) by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <saku@HIDDEN>) id 1rFqmT-0007M9-ON
for 67921 <at> debbugs.gnu.org; Wed, 20 Dec 2023 02:14:14 -0500
Received: from X-kone.org.aalto.fi (unknown [130.233.144.71])
by mail.laesvuori.fi (Postfix) with ESMTPSA id 97009342FF8;
Wed, 20 Dec 2023 08:14:17 +0100 (CET)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=laesvuori.fi; s=mail;
t=1703056457; bh=5xtjy1kM0SzasnRjhA7wh6YdwKtdVavX9Tdb7hhWJmM=;
h=From:To:Cc:Subject:Date:In-Reply-To:References;
b=vxfxZ2zA9JKlIrnA8bm2z+3EwgRlrHekFM7kwsxLxt97llIf9wXbSzv4VIIeGje/z
s7ha5iJk+wjgI54jllBj25f+XKAgkn8eyAYoQixsFnxkzwF8X/G50XB668w2xo5D8s
9XCbt9HfFVoRMFmf7it9TosH8dCk5uUNwCht2u5c=
From: Saku Laesvuori <saku@HIDDEN>
To: 67921 <at> debbugs.gnu.org
Subject: [PATCH haskell-team 3/3] guix: haskell-build-system: Hide dependecies
from ghc's package db
Date: Wed, 20 Dec 2023 09:13:49 +0200
Message-ID: <6030eebe203e81a45acda76c95bcbfb064ff5e74.1703056111.git.saku@HIDDEN>
X-Mailer: git-send-email 2.41.0
In-Reply-To: <5cdfcf3aadfbe42655b941764d5a700b6d4bca88.1703056111.git.saku@HIDDEN>
References: <5cdfcf3aadfbe42655b941764d5a700b6d4bca88.1703056111.git.saku@HIDDEN>
MIME-Version: 1.0
X-Debbugs-Cc: Lars-Dominik Braun <lars@HIDDEN>
Content-Transfer-Encoding: 8bit
X-Spam-Score: -0.0 (/)
X-Debbugs-Envelope-To: 67921
Cc: Saku Laesvuori <saku@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
A Haskell package P contains information about all other haskell
packages P_n it depends on. This commit hides the packages P_n in the
package database stored in P, which enables being explicit about which
haskell packages one wants to be visible in their profile.
* guix/build/haskell-build-system.scm
(register)[install-transitive-deps]: Set the 'exposed' field to False in
the dependencies' .conf files. Remove a comment about symlinking because
the copied files are now modified.
Fixes: https://issues.guix.gnu.org/66347
Change-Id: I66332cd49e6036689873d9435036c9f876216f1b
---
guix/build/haskell-build-system.scm | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/guix/build/haskell-build-system.scm b/guix/build/haskell-build-system.scm
index 0e94cf59a5..83c742427a 100644
--- a/guix/build/haskell-build-system.scm
+++ b/guix/build/haskell-build-system.scm
@@ -214,7 +214,10 @@ (define* (register #:key name system inputs outputs #:allow-other-keys)
(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?
+ (copy-file dep-conf dep-conf*)
+ (substitute* dep-conf*
+ (("(exposed:[ \t]*)True" _ field)
+ (string-append field "False"))))
(loop (vhash-cons id #t seen) next-tail))
(loop seen tail))))))
--
2.41.0
lars@HIDDEN, guix-patches@HIDDEN:bug#67921; Package guix-patches.
Full text available.
Received: (at 67921) by debbugs.gnu.org; 20 Dec 2023 07:14:12 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Wed Dec 20 02:14:12 2023
Received: from localhost ([127.0.0.1]:38505 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1rFqmR-0007M0-Ve
for submit <at> debbugs.gnu.org; Wed, 20 Dec 2023 02:14:12 -0500
Received: from vmi571514.contaboserver.net ([75.119.130.101]:34506
helo=mail.laesvuori.fi) by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <saku@HIDDEN>) id 1rFqmP-0007Ls-NI
for 67921 <at> debbugs.gnu.org; Wed, 20 Dec 2023 02:14:10 -0500
Received: from X-kone.org.aalto.fi (unknown [130.233.144.71])
by mail.laesvuori.fi (Postfix) with ESMTPSA id F3DE9342FF8;
Wed, 20 Dec 2023 08:14:12 +0100 (CET)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=laesvuori.fi; s=mail;
t=1703056453; bh=g1gfZoGqKcop/o0dpKOpUWzX6UBtyOsPjLdt1nWcmZo=;
h=From:To:Cc:Subject:Date:In-Reply-To:References;
b=WabzRbKqwUrpQ5ZGIzRP1ZzqX7AwY773eEjRh8gWELS+3yZGRQmT3dP33hW8ramgC
d0/EMyBuhvYFQ7ZsRxQIj82JZ6OC8gTcN+1EUQNsH+XNCsJLzKq33ntzFnKwNWy6zA
XJPGUfaSWYnNK81ze45xNbmZNHS+c0O1vF+zCiz4=
From: Saku Laesvuori <saku@HIDDEN>
To: 67921 <at> debbugs.gnu.org
Subject: [PATCH haskell-team 2/3] gnu: ghc: Use version 9.4.8 as the default
Date: Wed, 20 Dec 2023 09:13:48 +0200
Message-ID: <c4f97924d832d52aa15366b4e2397568e2d96868.1703056111.git.saku@HIDDEN>
X-Mailer: git-send-email 2.41.0
In-Reply-To: <5cdfcf3aadfbe42655b941764d5a700b6d4bca88.1703056111.git.saku@HIDDEN>
References: <5cdfcf3aadfbe42655b941764d5a700b6d4bca88.1703056111.git.saku@HIDDEN>
MIME-Version: 1.0
X-Debbugs-Cc: Lars-Dominik Braun <lars@HIDDEN>
Content-Transfer-Encoding: 8bit
X-Spam-Score: -0.0 (/)
X-Debbugs-Envelope-To: 67921
Cc: Saku Laesvuori <saku@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
* gnu/packages/haskell.scm (ghc-9.4): Rename from ghc-next to ghc.
(ghc): Redefine as ghc-9.4 instead of ghc-9.2.
Change-Id: I5696907ea6e2fac656d21d68c2ac89d549767ec2
---
gnu/packages/haskell.scm | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm
index 88826fb31f..ebe5bc6dc8 100644
--- a/gnu/packages/haskell.scm
+++ b/gnu/packages/haskell.scm
@@ -1392,12 +1392,6 @@ (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)
@@ -1461,7 +1455,7 @@ (define-public ghc-9.4
(let ((base ghc-9.2))
(package
(inherit base)
- (name "ghc-next")
+ (name "ghc")
(version "9.4.8")
(source (origin
(method url-fetch)
@@ -1503,4 +1497,10 @@ (define-public ghc-9.4
(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.4)
+
;;; haskell.scm ends here
--
2.41.0
lars@HIDDEN, guix-patches@HIDDEN:bug#67921; Package guix-patches.
Full text available.
Received: (at submit) by debbugs.gnu.org; 20 Dec 2023 07:11:09 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Wed Dec 20 02:11:09 2023
Received: from localhost ([127.0.0.1]:38498 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1rFqjV-0007GT-02
for submit <at> debbugs.gnu.org; Wed, 20 Dec 2023 02:11:09 -0500
Received: from lists.gnu.org ([2001:470:142::17]:58098)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <saku@HIDDEN>) id 1rFqjS-0007Fw-Ld
for submit <at> debbugs.gnu.org; Wed, 20 Dec 2023 02:11: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 <saku@HIDDEN>) id 1rFqjJ-00043i-QW
for guix-patches@HIDDEN; Wed, 20 Dec 2023 02:10:57 -0500
Received: from vmi571514.contaboserver.net ([75.119.130.101]
helo=mail.laesvuori.fi)
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <saku@HIDDEN>) id 1rFqjH-0000g5-IL
for guix-patches@HIDDEN; Wed, 20 Dec 2023 02:10:57 -0500
Received: from X-kone.org.aalto.fi (unknown [130.233.144.71])
by mail.laesvuori.fi (Postfix) with ESMTPSA id A4B2E342FF8;
Wed, 20 Dec 2023 08:10:58 +0100 (CET)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=laesvuori.fi; s=mail;
t=1703056258; bh=eOUw8LOiNKRVvNCikUcvDsapxXdUk41tLLorzxNjXbw=;
h=From:To:Cc:Subject:Date;
b=PDurbtMZLNDZ4cY4bnX56y40pYUEu5PLiaRnVGi4mFmaFlbmmVLtTH6BmuwFhiE04
SEmjFsXP9nm7THecf0x1gdOol7WSDlaoyDRRP+/HqP5mziJlGW5HyI5Du6+3xXW6Rb
rUhy6k6P0N0EQM+S7NDx6PG02+BU3WbCSH94yAMM=
From: Saku Laesvuori <saku@HIDDEN>
To: guix-patches@HIDDEN
Subject: [PATCH haskell-team 1/3] gnu: ghc-next: Update to version 9.4.8
Date: Wed, 20 Dec 2023 09:10:38 +0200
Message-ID: <5cdfcf3aadfbe42655b941764d5a700b6d4bca88.1703056111.git.saku@HIDDEN>
X-Mailer: git-send-email 2.41.0
MIME-Version: 1.0
X-Debbugs-Cc: Lars-Dominik Braun <lars@HIDDEN>
Content-Transfer-Encoding: 8bit
Received-SPF: pass client-ip=75.119.130.101; envelope-from=saku@HIDDEN;
helo=mail.laesvuori.fi
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_PASS=-0.001,
SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no
X-Spam_action: no action
X-Spam-Score: 0.9 (/)
X-Debbugs-Envelope-To: submit
Cc: Saku Laesvuori <saku@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -0.1 (/)
* gnu/packages/haskell.scm (ghc-9.4): Update to version 9.4.8.
[native-inputs]<ghc-testsuite>: Add a patch to fix the testsuite.
(ghc-happy-bootstrap-for-9.4): Update to version 1.20.1.1.
* gnu/packages/patches/ghc-9.4-testsuite-fixes.patch: New patch.
Change-Id: I5ef72f83e5feed1defb706bafa934077fda1553c
---
gnu/packages/haskell.scm | 11 +-
.../patches/ghc-9.4-testsuite-fixes.patch | 119 ++++++++++++++++++
2 files changed, 125 insertions(+), 5 deletions(-)
create mode 100644 gnu/packages/patches/ghc-9.4-testsuite-fixes.patch
diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm
index 62815efbb1..88826fb31f 100644
--- a/gnu/packages/haskell.scm
+++ b/gnu/packages/haskell.scm
@@ -1437,14 +1437,14 @@ (define ghc-happy-bootstrap-for-9.4
(hidden-package
(package
(name "ghc-happy")
- (version "1.20.0")
+ (version "1.20.1.1")
(source
(origin
(method url-fetch)
(uri (hackage-uri "happy" version))
(sha256
(base32
- "1346r2x5ravs5fqma65bzjragqbb2g6v41wz9maknwm2jf7kl79v"))))
+ "06w8g3lfk2ynrfhqznhp1mnp8a5b64lj6qviixpndzf5lv2psklb"))))
(build-system haskell-build-system)
(arguments
(list #:haskell ghc-bootstrap-for-9.4
@@ -1462,14 +1462,14 @@ (define-public ghc-9.4
(package
(inherit base)
(name "ghc-next")
- (version "9.4.4")
+ (version "9.4.8")
(source (origin
(method url-fetch)
(uri (string-append "https://www.haskell.org/ghc/dist/" version
"/ghc-" version "-src.tar.xz"))
(sha256
(base32
- "1qk7rlqf02s3b6m6sqqngmjq1mxnrz88h159lz6k25gddmdg5kp8"))))
+ "0pmqg9846lanb0hcyxhgr9ipzq33rfldxj7ln0j3qgpyczmhgx0b"))))
(arguments
(substitute-keyword-arguments (package-arguments base)
((#:phases phases '%standard-phases)
@@ -1487,7 +1487,8 @@ (define-public ghc-9.4
version "/ghc-" version "-testsuite.tar.xz"))
(sha256
(base32
- "04p2lawxxg3nyv6frzhyjyh3arhqqyh5ka3alxa2pxhcd2hdcja3"))))
+ "159wsqnqpqb0pxa3zyhvyg07wxr2zz7v52h52wkplw4pn12dsidc"))
+ (patches (search-patches "ghc-9.4-testsuite-fixes.patch"))))
("ghc-alex" ,ghc-alex-bootstrap-for-9.4)
("ghc-happy" ,ghc-happy-bootstrap-for-9.4)
,@(filter (match-lambda
diff --git a/gnu/packages/patches/ghc-9.4-testsuite-fixes.patch b/gnu/packages/patches/ghc-9.4-testsuite-fixes.patch
new file mode 100644
index 0000000000..f394632add
--- /dev/null
+++ b/gnu/packages/patches/ghc-9.4-testsuite-fixes.patch
@@ -0,0 +1,119 @@
+From 3acd8aa948a27465cffc8e2ab56229485e2a5b98 Mon Sep 17 00:00:00 2001
+From: Saku Laesvuori <saku@HIDDEN>
+Date: Tue, 5 Dec 2023 22:49:45 +0200
+Subject: [PATCH] Fix tests
+
+* replaces egrep with grep -E
+* removes unnecessary escaping in some grep regular expressions
+* adds a missing include header to a makefile
+---
+ testsuite/tests/cabal/cabal01/Makefile | 2 +-
+ testsuite/tests/ghci/should_run/GHCiPrimCall/Makefile | 4 ++++
+ testsuite/tests/haddock/perf/Makefile | 8 ++++----
+ testsuite/tests/hsc2hs/Makefile | 4 ++--
+ testsuite/tests/numeric/should_run/T7014.primops | 4 ++--
+ testsuite/tests/simplCore/should_compile/Makefile | 4 ++--
+ 6 files changed, 15 insertions(+), 11 deletions(-)
+
+diff --git a/testsuite/tests/cabal/cabal01/Makefile b/testsuite/tests/cabal/cabal01/Makefile
+index 004e4c75..6ec499c9 100644
+--- a/testsuite/tests/cabal/cabal01/Makefile
++++ b/testsuite/tests/cabal/cabal01/Makefile
+@@ -5,7 +5,7 @@ include $(TOP)/mk/test.mk
+ # Find all the env variables starting with CI_ to unset them.
+ # Otherwise, we might run into environment length limitations on Windows.
+ # (See `xargs --show-limits`.)
+-VARS_TO_UNSET := $(shell env | grep ^CI_ | egrep -o '^[^=]+')
++VARS_TO_UNSET := $(shell env | grep ^CI_ | grep -E -o '^[^=]+')
+ unexport $(VARS_TO_UNSET)
+
+ clean:
+diff --git a/testsuite/tests/ghci/should_run/GHCiPrimCall/Makefile b/testsuite/tests/ghci/should_run/GHCiPrimCall/Makefile
+index fd64d23f..cb669db3 100644
+--- a/testsuite/tests/ghci/should_run/GHCiPrimCall/Makefile
++++ b/testsuite/tests/ghci/should_run/GHCiPrimCall/Makefile
+@@ -1,3 +1,7 @@
++TOP=../../../..
++include $(TOP)/mk/boilerplate.mk
++include $(TOP)/mk/test.mk
++
+ .PHONY: GHCiPrimCall
+ GHCiPrimCall:
+ '$(TEST_HC)' $(TEST_HC_OPTS) -fPIC -v0 -c GHCiPrimCall_cmm.cmm
+diff --git a/testsuite/tests/haddock/perf/Makefile b/testsuite/tests/haddock/perf/Makefile
+index b67b52f2..ff2f7ebb 100644
+--- a/testsuite/tests/haddock/perf/Makefile
++++ b/testsuite/tests/haddock/perf/Makefile
+@@ -4,12 +4,12 @@ include $(TOP)/mk/test.mk
+
+ # We accept a 5% increase in parser allocations due to -haddock
+ haddock_parser_perf :
+- WithHaddock=$(shell '$(TEST_HC)' $(TEST_HC_OPTS) -fno-code -fforce-recomp -Wno-all -ddump-timings -haddock -O0 Fold.hs 2>/dev/null | grep Parser | egrep -o 'alloc=[0-9]+' | cut -c7- ) ; \
+- WithoutHaddock=$(shell '$(TEST_HC)' $(TEST_HC_OPTS) -fno-code -fforce-recomp -Wno-all -ddump-timings -O0 Fold.hs 2>/dev/null | grep Parser | egrep -o 'alloc=[0-9]+' | cut -c7- ) ; \
++ WithHaddock=$(shell '$(TEST_HC)' $(TEST_HC_OPTS) -fno-code -fforce-recomp -Wno-all -ddump-timings -haddock -O0 Fold.hs 2>/dev/null | grep Parser | grep -E -o 'alloc=[0-9]+' | cut -c7- ) ; \
++ WithoutHaddock=$(shell '$(TEST_HC)' $(TEST_HC_OPTS) -fno-code -fforce-recomp -Wno-all -ddump-timings -O0 Fold.hs 2>/dev/null | grep Parser | grep -E -o 'alloc=[0-9]+' | cut -c7- ) ; \
+ awk "BEGIN { ratio = ($$WithHaddock / $$WithoutHaddock); if (ratio > 1.05) {print \"-haddock allocation ratio too high:\", ratio; exit 1} else {exit 0} }"
+
+ # Similarly for the renamer
+ haddock_renamer_perf :
+- WithoutHaddock=$(shell '$(TEST_HC)' $(TEST_HC_OPTS) -fno-code -fforce-recomp -Wno-all -ddump-timings -O0 Fold.hs 2>/dev/null | grep Renamer | egrep -o 'alloc=[0-9]+' | cut -c7- ) ; \
+- WithHaddock=$(shell '$(TEST_HC)' $(TEST_HC_OPTS) -fno-code -fforce-recomp -Wno-all -ddump-timings -haddock -O0 Fold.hs 2>/dev/null | grep Renamer | egrep -o 'alloc=[0-9]+' | cut -c7- ) ; \
++ WithoutHaddock=$(shell '$(TEST_HC)' $(TEST_HC_OPTS) -fno-code -fforce-recomp -Wno-all -ddump-timings -O0 Fold.hs 2>/dev/null | grep Renamer | grep -E -o 'alloc=[0-9]+' | cut -c7- ) ; \
++ WithHaddock=$(shell '$(TEST_HC)' $(TEST_HC_OPTS) -fno-code -fforce-recomp -Wno-all -ddump-timings -haddock -O0 Fold.hs 2>/dev/null | grep Renamer | grep -E -o 'alloc=[0-9]+' | cut -c7- ) ; \
+ awk "BEGIN { ratio = ($$WithHaddock / $$WithoutHaddock); if (ratio > 1.05) {print \"-haddock allocation ratio too high:\", ratio; exit 1} else {exit 0} }"
+diff --git a/testsuite/tests/hsc2hs/Makefile b/testsuite/tests/hsc2hs/Makefile
+index d0b2d249..95b011c8 100644
+--- a/testsuite/tests/hsc2hs/Makefile
++++ b/testsuite/tests/hsc2hs/Makefile
+@@ -52,9 +52,9 @@ T11004:
+ T12504:
+ '$(HSC2HS)' $(HSC2HS_OPTS) T12504/path/to/$@.hsc
+ ifeq "$(WINDOWS)" "YES"
+- grep '{-# LINE 1 \"T12504\\\\path\\\\to\\\\$@\.hsc\" #-}' T12504/path/to/$@.hs
++ grep '{-# LINE 1 "T12504\\\\path\\\\to\\\\$@\.hsc" #-}' T12504/path/to/$@.hs
+ else
+- grep '{-# LINE 1 \"T12504/path/to/$@\.hsc\" #-}' T12504/path/to/$@.hs
++ grep '{-# LINE 1 "T12504/path/to/$@\.hsc" #-}' T12504/path/to/$@.hs
+ endif
+
+ .PHONY: T15758
+diff --git a/testsuite/tests/numeric/should_run/T7014.primops b/testsuite/tests/numeric/should_run/T7014.primops
+index 3243666d..c807fb45 100644
+--- a/testsuite/tests/numeric/should_run/T7014.primops
++++ b/testsuite/tests/numeric/should_run/T7014.primops
+@@ -1,8 +1,8 @@
+ and#
+ or#
+ uncheckedShift.*#
+-\+#
+-\-#
+++#
++-#
+ \*#
+ quotInt#
+ remInt#
+diff --git a/testsuite/tests/simplCore/should_compile/Makefile b/testsuite/tests/simplCore/should_compile/Makefile
+index b5041800..c56e04f6 100644
+--- a/testsuite/tests/simplCore/should_compile/Makefile
++++ b/testsuite/tests/simplCore/should_compile/Makefile
+@@ -66,7 +66,7 @@ T13367:
+
+ T8832:
+ $(RM) -f T8832.o T8832.hi
+- '$(TEST_HC)' $(TEST_HC_OPTS) -O -c -ddump-simpl -dsuppress-ticks T8832.hs | egrep '^[a-zA-Z0-9]+ ='
++ '$(TEST_HC)' $(TEST_HC_OPTS) -O -c -ddump-simpl -dsuppress-ticks T8832.hs | grep -E '^[a-zA-Z0-9]+ ='
+
+ T12603:
+ $(RM) -f T12603.o T12603.hi
+@@ -259,7 +259,7 @@ str-rules:
+ # g should have been collapsed into one defininition by CSE.
+ .PHONY: T13340
+ T13340:
+- '$(TEST_HC)' $(TEST_HC_OPTS) -c -O T13340.hs -ddump-simpl -dsuppress-all | grep -c '\+#'
++ '$(TEST_HC)' $(TEST_HC_OPTS) -c -O T13340.hs -ddump-simpl -dsuppress-all | grep -c '+#'
+
+
+ # We expect to see all dictionaries specialized away.
+--
+2.41.0
+
base-commit: dc2b59ddc1e8f510935777db40e881896f7a0cab
--
2.41.0
Saku Laesvuori <saku@HIDDEN>:lars@HIDDEN, guix-patches@HIDDEN.
Full text available.lars@HIDDEN, guix-patches@HIDDEN:bug#67921; Package guix-patches.
Full text available.
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997 nCipher Corporation Ltd,
1994-97 Ian Jackson.