From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id wPwSA4UZ8V7RXAAA0tVLHw (envelope-from ) for ; Mon, 22 Jun 2020 20:50:13 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id ECluOoQZ8V6MSwAAbx9fmQ (envelope-from ) for ; Mon, 22 Jun 2020 20:50:12 +0000 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 5C78E94051C for ; Mon, 22 Jun 2020 20:50:12 +0000 (UTC) Received: from localhost ([::1]:52976 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jnTOL-00089S-MD for larch@yhetil.org; Mon, 22 Jun 2020 16:50:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56890) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jnTOE-000894-MU for guix-patches@gnu.org; Mon, 22 Jun 2020 16:50:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:51369) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jnTOE-0002m5-Bt for guix-patches@gnu.org; Mon, 22 Jun 2020 16:50:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jnTOE-0001zS-6U for guix-patches@gnu.org; Mon, 22 Jun 2020 16:50:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#41574] gnu: Add intel-xev. Resent-From: Marius Bakke Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 22 Jun 2020 20:50:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 41574 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: elaexuotee@wilsonb.com, 41574@debbugs.gnu.org Received: via spool by 41574-submit@debbugs.gnu.org id=B41574.15928589957633 (code B ref 41574); Mon, 22 Jun 2020 20:50:02 +0000 Received: (at 41574) by debbugs.gnu.org; 22 Jun 2020 20:49:55 +0000 Received: from localhost ([127.0.0.1]:34682 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jnTO5-0001yz-23 for submit@debbugs.gnu.org; Mon, 22 Jun 2020 16:49:55 -0400 Received: from eggs.gnu.org ([209.51.188.92]:42134) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jnTNy-0001yi-UC for 41574@debbugs.gnu.org; Mon, 22 Jun 2020 16:49:51 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:48805) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jnTNt-0002YM-Cu; Mon, 22 Jun 2020 16:49:41 -0400 Received: from ti0006q161-3115.bb.online.no ([88.95.106.80]:58602 helo=localhost) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1jnTNs-0005aW-UB; Mon, 22 Jun 2020 16:49:41 -0400 From: Marius Bakke In-Reply-To: <338KSVUXDSMM8.2HI3H62CJZAVU@wilsonb.com> References: <30SSS7KMH7STU.2VZS2NNFF6QOP@wilsonb.com> <338KSVUXDSMM8.2HI3H62CJZAVU@wilsonb.com> Date: Mon, 22 Jun 2020 22:49:38 +0200 Message-ID: <878sgebzbx.fsf@gnu.org> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -3.3 (---) 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" X-Scanner: scn0 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Spam-Score: -3.11 X-TUID: V1LIrc9rSrH4 --=-=-= Content-Type: text/plain elaexuotee--- via Guix-patches via writes: > This patch makes two main changes: > > 1) Fixes upstream's source of non-determinism! > 2) Renames packages from `xed` to `intel-xed`, > > along with a few other minor improvements. > > From 4e0d690a702fbfc983cf2d981d4f07f1eb79ede3 Mon Sep 17 00:00:00 2001 > From: "B. Wilson" > Date: Thu, 28 May 2020 07:32:28 +0900 > Subject: [PATCH] gnu: Add intel-xed. > To: guix-patches@gnu.org > > * gnu/packages/assembly.scm (intel-xed): New variable. > --- > gnu/local.mk | 1 + > gnu/packages/assembly.scm | 105 +++++++++++++++++- > .../intel-xed-fix-nondeterminism.patch | 100 +++++++++++++++++ > 3 files changed, 202 insertions(+), 4 deletions(-) > create mode 100644 gnu/packages/patches/intel-xed-fix-nondeterminism.patch [...] > @@ -149,14 +151,14 @@ to the clients.") > (define-public fasm > (package > (name "fasm") > - (version "1.73.24") > + (version "1.73.22") > (source > (origin > (method url-fetch) > (uri (string-append "https://flatassembler.net/fasm-" > version ".tgz")) > (sha256 > - (base32 "142vxhs8mh8isvlzq7ir0asmqda410phzxmk9gk9b43dldskkj7k")))) > + (base32 "1pb0rcfdsb0h89khjjrbikz5wjdllavj3ajim0rcyh7x12xr1hw5")))) > (build-system gnu-build-system) > (arguments > `(#:tests? #f ; no tests exist > @@ -347,14 +349,14 @@ Supported architectures are: > (define-public xa > (package > (name "xa") > - (version "2.3.11") > + (version "2.3.10") > (source (origin > (method url-fetch) > (uri (string-append "https://www.floodgap.com/retrotech/xa" > "/dists/xa-" version ".tar.gz")) > (sha256 > (base32 > - "0b81r7mvzqxgnbbmhixcnrf9nc72v1nqaw19k67221g3k561dwij")))) > + "0y5sd247g11jfk5msxy91hz2nhpy7smj125dzfyfhjsjnqk5nyw6")))) Were these two downgrades intended? I'm assuming no, since the new package don't appear to use them. [...] > +(define-public intel-xed > + (package > + (name "intel-xed") > + (version "11.2.0") > + (source > + (origin > + (method git-fetch) > + (uri (git-reference > + (url "https://github.com/intelxed/xed.git") > + (commit "40125558530137444b4ee6fd26b445bfa105b543"))) > + (sha256 (base32 "1jffayski2gpd54vaska7fmiwnnia8v3cka4nfyzjgl8xsky9v2s")) > + (file-name (git-file-name name version)) > + (patches (search-patches "intel-xed-fix-nondeterminism.patch")))) > + (build-system gnu-build-system) > + (native-inputs > + `(("python-2" ,python-2) > + ("python-3" ,python-3) Does it work to use 'python-wrapper' instead of providing both Python 2 and Python 3 here? > + (outputs '("out" "lib" "src")) Is the src output used for other things than documentation? If not, I think we can drop it and let users do 'guix build --source intel-xed' instead. The description should be modified accordingly. Apart from this the package LGTM. Probably it should have: (supported-systems '("x86_64-linux" "i686-linux")) too? [...] > diff --git a/gnu/packages/patches/intel-xed-fix-nondeterminism.patch b/gnu/packages/patches/intel-xed-fix-nondeterminism.patch > new file mode 100644 > index 0000000000..657f7e979d > --- /dev/null > +++ b/gnu/packages/patches/intel-xed-fix-nondeterminism.patch > @@ -0,0 +1,100 @@ > +diff --git a/pysrc/ild_codegen.py b/pysrc/ild_codegen.py Can you add a short description at the top of the patch file explaining what it does any why? Can you send an updated patch? Thanks! --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAl7xGWIACgkQoqBt8qM6 VPr2qwgAz/57Htntg3yLYdBPTQPmRv4l2L0wYrZf+qSn3cZFb/CthniyKjPUApS1 s/CB0XRf3EqmNizmn3aOeaStvupFylLUWBETpWBNpC/JqAhg02Bisv8hRoT5Wya/ kmZj601shRze2s9ikhqbWYkQjqfy5WqzpQgxjYydQM0MBU+FYoyiJCOKjAhR2W/O bM3xEDrohPvmkPHCtUQ9SiJtrn0QlVaUjcsDBoq2loVNSicq8S7lfCz83OlKtKLH +uEUku2rzR8rUYFylQKsMDTH6vVYQjm0/565qpx30pBT10le/NauZRWWz494YQP0 +H2Tfi3RIU20J7RPxjFpfvmeVxOyPw== =MUeP -----END PGP SIGNATURE----- --=-=-=--