From patchwork Tue May 23 12:17:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 50248 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 B187327BBEA; Tue, 23 May 2023 13:18:31 +0100 (BST) 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 A16CA27BBE2 for ; Tue, 23 May 2023 13:18:28 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q1Qxt-0004Ik-Uv; Tue, 23 May 2023 08:18:11 -0400 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 1q1Qxm-0004HB-D0 for guix-patches@gnu.org; Tue, 23 May 2023 08:18:03 -0400 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 1q1Qxm-0005Mg-4E for guix-patches@gnu.org; Tue, 23 May 2023 08:18:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1q1Qxm-0002Rz-0R for guix-patches@gnu.org; Tue, 23 May 2023 08:18:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63641] [PATCH 7/8] gnu: mig: Update to 04bfe7a91223ba15d868f7165e49328b1c6e86c3. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 23 May 2023 12:18:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63641 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Josselin Poiret Cc: 63641@debbugs.gnu.org Received: via spool by 63641-submit@debbugs.gnu.org id=B63641.16848442699391 (code B ref 63641); Tue, 23 May 2023 12:18:01 +0000 Received: (at 63641) by debbugs.gnu.org; 23 May 2023 12:17:49 +0000 Received: from localhost ([127.0.0.1]:38476 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q1QxZ-0002RO-9M for submit@debbugs.gnu.org; Tue, 23 May 2023 08:17:49 -0400 Received: from eggs.gnu.org ([209.51.188.92]:43712) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q1QxX-0002RC-DU for 63641@debbugs.gnu.org; Tue, 23 May 2023 08:17:48 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q1QxI-0005EX-1Z; Tue, 23 May 2023 08:17:41 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:In-Reply-To:Date:References:Subject:To: From; bh=biLYAUq6GiCCUioy2VR+769YGEtLhTaU1FBE9b63XHo=; b=c17Qv+F0i7SfAl5/hhms sm7+jdUfO6sv+S70t7mNXJ51AtsNmCc5PzUrVT1vF6Ba0VXVHmrPbfFblSsfWh5ZYalMI8UaLIyJg ErnZPnJsHi7jEXOsK75eSoZK5Dcln9oG3+TL8Pzmh/Ux3o+golenyOB9nS7c7S4Izxss7nXDjgoQq Od6LvS/xUKiRw+6TjvKSWJcMhvE0HMxR0yKWuFydZ1IFcr/ll9UAq5WXIl07kcycZwjhMzTI5YzAe F/szDSppc1/ZkNd1erDJLPq4u83vdGOpMRqIVWLK2jWK2MD7aTzHJazFekXhWxa2b5LIpCO46QWAS LI7VqA7DMppTLg==; Received: from 2a02-a462-da03-1-2701-7f81-a736-4607.fixed6.kpn.net ([2a02:a462:da03:1:2701:7f81:a736:4607] helo=drakenpad.janneke.lilypond.org) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q1QxH-0007qX-Io; Tue, 23 May 2023 08:17:31 -0400 From: Janneke Nieuwenhuizen Organization: AvatarAcademy.nl References: <84209beabc07d273034f85ce97841519188daa1c.1684745752.git.dev@jpoiret.xyz> X-Url: http://AvatarAcademy.nl Date: Tue, 23 May 2023 14:17:28 +0200 In-Reply-To: <84209beabc07d273034f85ce97841519188daa1c.1684745752.git.dev@jpoiret.xyz> (Josselin Poiret via Guix-patches via's message of "Mon, 22 May 2023 11:04:17 +0200") Message-ID: <87h6s344yv.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 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 Josselin Poiret via Guix-patches via writes: Hi, > From: Josselin Poiret > > * gnu/packages/hurd.scm (mig): Update to > 04bfe7a91223ba15d868f7165e49328b1c6e86c3. Did you have a specific reason not to use v1.8+git20230520, or was that tagged after you created the patch set? I've tested with that version (see https://gitlab.com/janneke/guix/-/tree/wip-hurd22) and it seems to work fine (see attached). Greetings, Janneke diff --git a/gnu/packages/hurd.scm b/gnu/packages/hurd.scm index ae8aff3760..5479940326 100644 --- a/gnu/packages/hurd.scm +++ b/gnu/packages/hurd.scm @@ -100,47 +100,45 @@ (define-public gnumach-headers (license gpl2+))) (define-public mig - (let ((revision "1") - (commit "04bfe7a91223ba15d868f7165e49328b1c6e86c3")) - (package - (name "mig") - (version (git-version "1.8" revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://git.savannah.gnu.org/git/hurd/mig.git") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0zw2w3hnz76f9602znshciqabylmvavx0h04y01qjlmhd9wh8iw5")))) - (build-system gnu-build-system) - ;; Flex is needed both at build and run time. - (inputs (list gnumach-headers flex)) - (native-inputs (list autoconf automake flex bison)) - (arguments - (list #:tests? #f - #:phases - #~(modify-phases %standard-phases - (add-after 'install 'avoid-perl-dependency - (lambda* (#:key build inputs outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (bin (string-append out "/bin"))) - ;; By default 'mig' (or 'TARGET-mig') uses Perl to - ;; compute 'libexecdir_rel'. Avoid it. - (substitute* (find-files bin "mig$") - (("^libexecdir_rel=.*") - "libexecdir_rel=../libexec\n")))))))) - (home-page "https://www.gnu.org/software/hurd/microkernel/mach/mig/gnu_mig.html") - (synopsis "Mach 3.0 interface generator for the Hurd") - (description - "GNU MIG is the GNU distribution of the Mach 3.0 interface generator + (package + (name "mig") + (version "1.8+git20230520") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://git.savannah.gnu.org/git/hurd/mig.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "10r0fdjqjzqsy6ajb21rifvhw0wpjvrw6a1zdyliqlzqny5k0qlz")))) + (build-system gnu-build-system) + ;; Flex is needed both at build and run time. + (inputs (list gnumach-headers flex)) + (native-inputs (list autoconf automake flex bison)) + (arguments + (list #:tests? #f + #:phases + #~(modify-phases %standard-phases + (add-after 'install 'avoid-perl-dependency + (lambda* (#:key build inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin"))) + ;; By default 'mig' (or 'TARGET-mig') uses Perl to + ;; compute 'libexecdir_rel'. Avoid it. + (substitute* (find-files bin "mig$") + (("^libexecdir_rel=.*") + "libexecdir_rel=../libexec\n")))))))) + (home-page "https://www.gnu.org/software/hurd/microkernel/mach/mig/gnu_mig.html") + (synopsis "Mach 3.0 interface generator for the Hurd") + (description + "GNU MIG is the GNU distribution of the Mach 3.0 interface generator MIG, as maintained by the GNU Hurd developers for the GNU project. You need this tool to compile the GNU Mach and GNU Hurd distributions, and to compile the GNU C library for the Hurd. Also, you will need it for other software in the GNU system that uses Mach-based inter-process communication.") - (license gpl2+)))) + (license gpl2+))) (define-public hurd-headers ;; This commit is now slightly behind 0.9.git20220818 as this one needs a