From patchwork Fri Mar 22 07:33:17 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: aurtzy X-Patchwork-Id: 62119 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 9E7B127BBE9; Fri, 22 Mar 2024 07:37:37 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, SPF_HELO_PASS autolearn=unavailable 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 B30B627BBE2 for ; Fri, 22 Mar 2024 07:37:35 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rnZSt-0005BM-QZ; Fri, 22 Mar 2024 03:37:23 -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 1rnZSs-0005Ar-QC for guix-patches@gnu.org; Fri, 22 Mar 2024 03:37:22 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rnZSs-0001lF-Hm for guix-patches@gnu.org; Fri, 22 Mar 2024 03:37:22 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rnZTW-0005Jk-H9 for guix-patches@gnu.org; Fri, 22 Mar 2024 03:38:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#69637] [PATCH mesa-updates v2 1/5] gnu: Add meson-1.3. Resent-From: aurtzy Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 22 Mar 2024 07:38:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 69637 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 69637@debbugs.gnu.org Cc: john.kehayias@protonmail.com, aurtzy , efraim@flashner.co.il Received: via spool by 69637-submit@debbugs.gnu.org id=B69637.171109306220331 (code B ref 69637); Fri, 22 Mar 2024 07:38:02 +0000 Received: (at 69637) by debbugs.gnu.org; 22 Mar 2024 07:37:42 +0000 Received: from localhost ([127.0.0.1]:56118 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rnZTB-0005Hp-Jm for submit@debbugs.gnu.org; Fri, 22 Mar 2024 03:37:41 -0400 Received: from mail-yw1-f171.google.com ([209.85.128.171]:60472) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rnZT8-0005HS-PV for 69637@debbugs.gnu.org; Fri, 22 Mar 2024 03:37:39 -0400 Received: by mail-yw1-f171.google.com with SMTP id 00721157ae682-609f060cbafso23038957b3.0 for <69637@debbugs.gnu.org>; Fri, 22 Mar 2024 00:36:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1711092952; x=1711697752; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=BDLLJ1s1p+qiCUbLUcPFLPm8K/Tszug6A/5puu/IdgE=; b=VfNqGg9fqmSsLVmMuJY+cRBmNDq8wRCPOlN2yybhGN1OzJGouzTC+isRMhtmTcTXI3 zmV0cwRz/AkoYe7VdSN35jQStw1EiIqPvcRUgn4mpYfV8Thqn5ME/k5FoOFVSBX0x2Q/ kAfv+tMLbxQymSR9hH919yTNzeQhbfNek6dIyOfga32qAdiMtGMDC8DKB7YqlEenGgHV MhntxxCYZsrRecL7Im5CTh7lG6TVjVWitnIaEEslIxoYaKDJt0DIXho5kaIo3HnTeYXZ h17eo5xMntbC4YMqQF+Nx1I0RvDW9Ysg+tAeC+viFeTEHKkDaXvby77x3VygkLOV6/DC dIDg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711092952; x=1711697752; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=BDLLJ1s1p+qiCUbLUcPFLPm8K/Tszug6A/5puu/IdgE=; b=tQQvvzJltAtkJ5417ZoNATwrhy/cNatuiLjO6GRc9vaLMTgPxPZd9ncV+8M3QTpo0Y Fpvg/5Q6MtbC67jP/STlLjlTSSazJ0dDqktzywB0wxqCOZoJfGRLAiB3gLJJoudwG0N4 Y7lKAkKgPT6+FbQPVuGiPaZ/RsNjWxIl1ueeLCgNSF9rqMAGOm3M1+/myqGgfGhQq5ZZ KpCEM05cyG3YAcqsM6B80rijej7I+tx6SjJ0cQVXpLWcY4DnzZ1Za8BpOVbe12G6AxJi RCpusrd9H25wgzTgI7VCKTj0EV7oVE2UGHiqF+2F56m9Gej7M/POU30ByMbwXam08UwV /XCA== X-Gm-Message-State: AOJu0Yw3Tn84BsO2neL8uNu3DFPZP5rubfxOqvUwa8r6o4B+2T3K8lOI wIwoutJ9MUgeIiYL1m9lzLAmsVQGWJnYPKHj7eLU9CkCITiOFS4We94n+7gh X-Google-Smtp-Source: AGHT+IFx8kknq6H7polWRhaE9uAzDj9QtW4+2ml84Sc66JA5t4kGI4nq/5H2LKkyr2t3rVVBgbO4ZQ== X-Received: by 2002:a0d:fa43:0:b0:610:e457:a7a7 with SMTP id k64-20020a0dfa43000000b00610e457a7a7mr1365907ywf.14.1711092951805; Fri, 22 Mar 2024 00:35:51 -0700 (PDT) Received: from localhost.localdomain (ool-18bb63f6.dyn.optonline.net. [24.187.99.246]) by smtp.gmail.com with ESMTPSA id jz9-20020a05622a81c900b00430bf59ebccsm648013qtb.11.2024.03.22.00.35.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Mar 2024 00:35:51 -0700 (PDT) From: aurtzy Date: Fri, 22 Mar 2024 03:33:17 -0400 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: 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 * gnu/packages/build-tools.scm (meson-1.3): New variable. Change-Id: I3c280851d0ecd116572e982db7a0e90045bcd682 --- gnu/packages/build-tools.scm | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/gnu/packages/build-tools.scm b/gnu/packages/build-tools.scm index 15d88ded80..e25266820f 100644 --- a/gnu/packages/build-tools.scm +++ b/gnu/packages/build-tools.scm @@ -15,6 +15,7 @@ ;;; Copyright © 2021 qblade ;;; Copyright © 2021, 2023 Maxim Cournoyer ;;; Copyright © 2022, 2023 Juliana Sims +;;; Copyright © 2024 aurtzy ;;; ;;; This file is part of GNU Guix. ;;; @@ -343,6 +344,19 @@ (define-public meson/newer (base32 "073vf8059nzs6p5aaqr5wva4pgl81540szdb5yw9yhyajwgm8jyh")))))) +(define-public meson-1.3 + (package + (inherit meson/newer) + (version "1.3.2") + (source (origin + (method url-fetch) + (uri (string-append "https://github.com/mesonbuild/meson/" + "releases/download/" version "/meson-" + version ".tar.gz")) + (sha256 + (base32 + "1ajvkcyly1nsxwjc2vly1vlvfjrwpfnza5prfr104wxhr18b8bj9")))))) + (define-public meson-python (package (name "meson-python") From patchwork Fri Mar 22 07:33:18 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: aurtzy X-Patchwork-Id: 62121 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 15FA327BBEA; Fri, 22 Mar 2024 07:37:59 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, SPF_HELO_PASS 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 EF28D27BBE2 for ; Fri, 22 Mar 2024 07:37:54 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rnZSv-0005CU-H5; Fri, 22 Mar 2024 03:37:25 -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 1rnZSt-0005BH-Mz for guix-patches@gnu.org; Fri, 22 Mar 2024 03:37:23 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rnZSt-0001lW-EK for guix-patches@gnu.org; Fri, 22 Mar 2024 03:37:23 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rnZTX-0005Jw-89; Fri, 22 Mar 2024 03:38:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#69637] [PATCH mesa-updates v2 2/5] gnu: Add rust-syn-2.0.39. Resent-From: aurtzy Original-Sender: "Debbugs-submit" Resent-CC: efraim@flashner.co.il, guix-patches@gnu.org Resent-Date: Fri, 22 Mar 2024 07:38:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 69637 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 69637@debbugs.gnu.org Cc: john.kehayias@protonmail.com, aurtzy , efraim@flashner.co.il, Efraim Flashner X-Debbugs-Original-Xcc: Efraim Flashner Received: via spool by 69637-submit@debbugs.gnu.org id=B69637.171109307520388 (code B ref 69637); Fri, 22 Mar 2024 07:38:03 +0000 Received: (at 69637) by debbugs.gnu.org; 22 Mar 2024 07:37:55 +0000 Received: from localhost ([127.0.0.1]:56134 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rnZTP-0005Il-2F for submit@debbugs.gnu.org; Fri, 22 Mar 2024 03:37:55 -0400 Received: from mail-qt1-f176.google.com ([209.85.160.176]:51332) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rnZTM-0005IH-N6 for 69637@debbugs.gnu.org; Fri, 22 Mar 2024 03:37:53 -0400 Received: by mail-qt1-f176.google.com with SMTP id d75a77b69052e-430ccb3d65eso13444561cf.2 for <69637@debbugs.gnu.org>; Fri, 22 Mar 2024 00:37:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1711092966; x=1711697766; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=3dGPo/am28etvSQcoWGbCv+sEQp95cunyQLnV5FK+tM=; b=W2z2AF2JuSy9DTU+W6sfFqKTnnBkYOif0ClyToP/uAo8AJSn3ZfO/AWfwnmvOEq2dK vEdkNFAl1lDweftQVbRbMw/CFSzUBYfdfQ9tVfyEUQMLhmWhVcUmpwIa1efFOji+D9of d1kBavqCAvMcKj/+nntMggbh/Vru2I0ztIK3hd4O23MwikDbBwmKbB1rrU4LgyhZ6NWu 3PHN6r+fOs35jAR4yQupB/yChQfQjgpN2409l7iibjnMjkU0IjUBAfMoOjWQpJ3JoBL3 LFssJeKvep48IvMWhcpdTn4z5grU+imvlP8Vdmwpuhm5wSA6H2avGUb6sB8NxZXIR/W4 1MtQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711092966; x=1711697766; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=3dGPo/am28etvSQcoWGbCv+sEQp95cunyQLnV5FK+tM=; b=Hd2ZSv3NeXfsHdAyRK2TIA9PPW9H7b5KUITVispQHXWW/GbeSjubgrpMAexu9QWOTL ugi54G/WDqyB6MYe989oSdVsPPMeeG8GcLZQnSE2W+t69KFrFv0w9ks4El5JkYuZgHGR uktnjerk2M1Z7AdAGD+wWCSKbnfruNtDCZuWyAxUDotpv9w/Tjp9UIlUdagB37KaG1A/ ViAYHSInslrWPNaTAhvXkXkfcoSgIZZq51Z5fERU5QRJ6PT8/ZRWp9Jj5Q535o5pPqnM RAlsKgWRhyflyFIoFJkZ85zPSa1d0Pjf3qJEfSrsndrSW8jMVjIRGNYbwIODiiYkZOHk aFUQ== X-Gm-Message-State: AOJu0Yza7EVi6Wqu352mRe6F9uEJwSwTFM0kbijtvEC8HIqXLjm3Ds4h MN93K+6/3ifcSgVnhefWDZECNXRQzDk3YO7oQPoDHbrSMlBvQy5inokBozHo X-Google-Smtp-Source: AGHT+IGKrSB1XWikRDrg35ZXMAZNmeD0UdFJnHgmYImhvdbgW8m27WchquL6tOTjuwhJl1+7pi1SEw== X-Received: by 2002:a05:622a:251:b0:430:a3d6:a8f0 with SMTP id c17-20020a05622a025100b00430a3d6a8f0mr1590106qtx.37.1711092965798; Fri, 22 Mar 2024 00:36:05 -0700 (PDT) Received: from localhost.localdomain (ool-18bb63f6.dyn.optonline.net. [24.187.99.246]) by smtp.gmail.com with ESMTPSA id jz9-20020a05622a81c900b00430bf59ebccsm648013qtb.11.2024.03.22.00.36.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Mar 2024 00:36:05 -0700 (PDT) From: aurtzy Date: Fri, 22 Mar 2024 03:33:18 -0400 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: 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 * gnu/packages/crates-io.scm (rust-syn-2.0.39): New variable. Change-Id: I148a87e6927adb897da410c29edec28cc0d5687d --- gnu/packages/crates-io.scm | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index a67d3d74bb..be33ea973f 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -42,6 +42,7 @@ ;;; Copyright © 2024 Herman Rimm ;;; Copyright © 2024 Tomas Volf <~@wolfsden.cz> ;;; Copyright © 2024 Suhail Singh +;;; Copyright © 2024 aurtzy ;;; ;;; This file is part of GNU Guix. ;;; @@ -66818,6 +66819,20 @@ (define-public rust-syn-2 a syntax tree of Rust source code.") (license (list license:expat license:asl2.0)))) +(define-public rust-syn-2.0.39 + (package + (inherit rust-syn-2) + (name "rust-syn") + (version "2.0.39") + (source + (origin + (method url-fetch) + (uri (crate-uri "syn" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0ymyhxnk1yi4pzf72qk3lrdm9lgjwcrcwci0hhz5vx7wya88prr3")))))) + (define-public rust-syn-1 (package (name "rust-syn") From patchwork Fri Mar 22 07:33:19 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: aurtzy X-Patchwork-Id: 62120 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 6E05627BBE9; Fri, 22 Mar 2024 07:37:49 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, SPF_HELO_PASS autolearn=unavailable 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 A941727BBE2 for ; Fri, 22 Mar 2024 07:37:47 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rnZSv-0005Bz-1l; Fri, 22 Mar 2024 03:37:25 -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 1rnZSt-0005BG-MU for guix-patches@gnu.org; Fri, 22 Mar 2024 03:37:23 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rnZSt-0001lV-EC for guix-patches@gnu.org; Fri, 22 Mar 2024 03:37:23 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rnZTX-0005K2-M6; Fri, 22 Mar 2024 03:38:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#69637] [PATCH mesa-updates v2 3/5] gnu: Add rust-proc-macro2-1.0.70. Resent-From: aurtzy Original-Sender: "Debbugs-submit" Resent-CC: efraim@flashner.co.il, guix-patches@gnu.org Resent-Date: Fri, 22 Mar 2024 07:38:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 69637 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 69637@debbugs.gnu.org Cc: john.kehayias@protonmail.com, aurtzy , efraim@flashner.co.il, Efraim Flashner X-Debbugs-Original-Xcc: Efraim Flashner Received: via spool by 69637-submit@debbugs.gnu.org id=B69637.171109307820409 (code B ref 69637); Fri, 22 Mar 2024 07:38:03 +0000 Received: (at 69637) by debbugs.gnu.org; 22 Mar 2024 07:37:58 +0000 Received: from localhost ([127.0.0.1]:56138 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rnZTS-0005J6-DQ for submit@debbugs.gnu.org; Fri, 22 Mar 2024 03:37:58 -0400 Received: from mail-yw1-f177.google.com ([209.85.128.177]:50498) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rnZTN-0005IL-Tm for 69637@debbugs.gnu.org; Fri, 22 Mar 2024 03:37:54 -0400 Received: by mail-yw1-f177.google.com with SMTP id 00721157ae682-609ff069a40so20536857b3.1 for <69637@debbugs.gnu.org>; Fri, 22 Mar 2024 00:37:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1711092967; x=1711697767; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=H395THGTjOy7TSmXZXRqRMub9pb0jtNVfueiPRgej6U=; b=cGsrmWo+TvwEpkhF5LjR37SdLld4Gcfi/F+jtTyjdaV+nqaB+b9qFQG7U7NmTRstEB t0JyN2KwrrDTIEsYcQnZ9kPU3BBhRslWbljoONYYHPqjYjZ/olVzibWM1i/gn43elLLJ bUfK78TEha9OjruXcG3m08lGKxxqE97uZvTBYOTnQ2anHGhoFK4aIzJTbdZDPXMlOCCR YR5dT3bAdu+Y/xNIpIjBFC9w4cMdN9swaZg8/QDZ2L6jhrSOgVjAfziBukmJ5zGfU363 Ddy81oUMttAQewwS4JxTqKC86NbcWtiQ5PmwiJZePNAZluxKoL1gc6V82TmGEUtYU8BQ 6Lwg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711092967; x=1711697767; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=H395THGTjOy7TSmXZXRqRMub9pb0jtNVfueiPRgej6U=; b=C6TVlFx7eNCkJ4L9skk3oY4ROpLIohcY0lAkd+cZcnvN6A9v+Q7d/kBK+LhwXM1FCA yhFiVKLYSedVCDtc9igHPlLSDPzHU7xMAaCSfngVtI/v+z+OKmp/Dp6vBj1B/st9QJpC mdW7qt89LF4vC7F9gsbm4zx6YdTBicfdOGTYn2QvO7CUdCa1PPA5a834NSFhN1VAl/8u xmoKcYyUEpNmNG2qzrvAZIX6rrUXOYeygSDGXiFfnsuRzDYdKy85nLFUow/3zRlwJ0mW OiQSMQndePD1kEoSNwY4sCDYsvgV9CzbmJ43Ih98SISUlbNqJ8QAPkRM2w0rcFNI3+Ad nqkQ== X-Gm-Message-State: AOJu0Yze7x60XbpAiQwCNgQXZyNOTO42VyliAK85XMBF5MG8dqp50O21 0GwHGsAcbDoJLpEpsquI1hXAMA6gRq1NeAseZUEEV+Vo+geB0DPNwFNiyhBx X-Google-Smtp-Source: AGHT+IGjTYDuNjLE/NHKpmcvsgg345Na/eL/UJAnmruauuyzF9Ko01qXWxSekCGWsQ+GLA6w3fQI6Q== X-Received: by 2002:a0d:c704:0:b0:611:bdd:4534 with SMTP id j4-20020a0dc704000000b006110bdd4534mr1580804ywd.3.1711092967113; Fri, 22 Mar 2024 00:36:07 -0700 (PDT) Received: from localhost.localdomain (ool-18bb63f6.dyn.optonline.net. [24.187.99.246]) by smtp.gmail.com with ESMTPSA id jz9-20020a05622a81c900b00430bf59ebccsm648013qtb.11.2024.03.22.00.36.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Mar 2024 00:36:06 -0700 (PDT) From: aurtzy Date: Fri, 22 Mar 2024 03:33:19 -0400 Message-ID: <419ca69cd489680104483785562757be1672bfdc.1711091869.git.aurtzy@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: 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 * gnu/packages/crates-io.scm (rust-proc-macro2-1.0.70): New variable. Change-Id: I4b567bee92c789cb189df2a6e022c2cdcd11bcdb --- gnu/packages/crates-io.scm | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index be33ea973f..c5aff774b3 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -49652,6 +49652,20 @@ (define-public rust-proc-macro2-1 in terms of the upstream unstable API.") (license (list license:asl2.0 license:expat)))) +(define-public rust-proc-macro2-1.0.70 + (package + (inherit rust-proc-macro2-1) + (name "rust-proc-macro2") + (version "1.0.70") + (source + (origin + (method url-fetch) + (uri (crate-uri "proc-macro2" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0fzxg3dkrjy101vv5b6llc8mh74xz1vhhsaiwrn68kzvynxqy9rr")))))) + (define-public rust-proc-macro2-0.4 (package (inherit rust-proc-macro2-1) From patchwork Fri Mar 22 07:33:20 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: aurtzy X-Patchwork-Id: 62122 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 A2F9227BBE9; Fri, 22 Mar 2024 07:38:05 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, SPF_HELO_PASS autolearn=unavailable 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 D786027BBE2 for ; Fri, 22 Mar 2024 07:38:00 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rnZSv-0005CP-Fq; Fri, 22 Mar 2024 03:37:25 -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 1rnZSu-0005Bm-5p for guix-patches@gnu.org; Fri, 22 Mar 2024 03:37:24 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rnZSt-0001lj-To for guix-patches@gnu.org; Fri, 22 Mar 2024 03:37:23 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rnZTY-0005KD-7i; Fri, 22 Mar 2024 03:38:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#69637] [PATCH mesa-updates v2 4/5] gnu: Add rust-quote-1.0.33. Resent-From: aurtzy Original-Sender: "Debbugs-submit" Resent-CC: efraim@flashner.co.il, guix-patches@gnu.org Resent-Date: Fri, 22 Mar 2024 07:38:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 69637 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 69637@debbugs.gnu.org Cc: john.kehayias@protonmail.com, aurtzy , efraim@flashner.co.il, Efraim Flashner X-Debbugs-Original-Xcc: Efraim Flashner Received: via spool by 69637-submit@debbugs.gnu.org id=B69637.171109307920416 (code B ref 69637); Fri, 22 Mar 2024 07:38:04 +0000 Received: (at 69637) by debbugs.gnu.org; 22 Mar 2024 07:37:59 +0000 Received: from localhost ([127.0.0.1]:56140 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rnZTS-0005JD-PN for submit@debbugs.gnu.org; Fri, 22 Mar 2024 03:37:59 -0400 Received: from mail-yw1-f178.google.com ([209.85.128.178]:50500) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rnZTP-0005IP-DA for 69637@debbugs.gnu.org; Fri, 22 Mar 2024 03:37:55 -0400 Received: by mail-yw1-f178.google.com with SMTP id 00721157ae682-609ff069a40so20537077b3.1 for <69637@debbugs.gnu.org>; Fri, 22 Mar 2024 00:37:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1711092968; x=1711697768; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=3ujYDJ68loif295e/CUJHMianed4D6Dt0KBu4/UQjTs=; b=X1vVLEnB9U/iJFuw2lEinT+CS9gR/oq69VeZHthHV3Pw2aeaiox8idYuk2+xTGA8T5 tlT/fpGMghkxxlSQwpVR9eTTelrPuTRoMEc7zuVw2Dpcpgkt/yZOMg+qKX48XbUvobj1 IiXBOOY7+Snj9+V9uoCktfQ48p0wcEf9r2h1h2HGHQUHShrIrjzXQ53mplxHk6OC7J2x O82xlTYpAU2mp0aLKx1g7+W2mEsu5/g0Ubbgkh82CuarImbHkl7Uiy5or+2ZUrBH68sB xt4Nwds61Tsu4AOih5xvw7sJsawADnc5UNo2QkAn+/yYGA7ygh7ACuHBZ1ell8S8VZWU Vc2w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711092968; x=1711697768; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=3ujYDJ68loif295e/CUJHMianed4D6Dt0KBu4/UQjTs=; b=PmOHgDFalqo8CMFJEXCGB7xKunxHvoG+drzSkwfko2rJwI0++ZXf/EJOFtz3BIQ79J c9Y/Dvle4plTGWmZyqQiEy8WyK0K9GXJe/y7KcknHMWAljua/KY/KEwk0MVIPBbZ3OQb Gc3X9jkeZBvhHfc3MavbLYpJQqErBi2wFi1iheripZB8yWEjAtG8FLM+768e86awRTgf iihqa9+xIITmpSapKHcqqr/RcBzI6rgm2GGlZ3owD7baErFoNHpdgxx3DhKvDgZDMqmW MzCmDFj64eZEI+84Y8L+O+LOkV4kuLodfs9EIC47jRTMRQ0R/G4Z1ccvmRivxZZ3Z+ur pY8A== X-Gm-Message-State: AOJu0YyOKKrxVbZueYvGIdccPjecUDhai014rSv+PlCIdmiE2t7igLR4 mKoGD2UGsRIxTn2DytT+8kg9I9ha9sJIzObXtNL+ixNI/NGIkTej0Mjj1++a X-Google-Smtp-Source: AGHT+IEq7EOpNzry50eiYJst6kL+uphRFULPrayT9s/5fLgT1LbMTFFgjqE6VyasUK359W19meGAsA== X-Received: by 2002:a0d:f106:0:b0:611:1737:2f62 with SMTP id a6-20020a0df106000000b0061117372f62mr1343528ywf.35.1711092968517; Fri, 22 Mar 2024 00:36:08 -0700 (PDT) Received: from localhost.localdomain (ool-18bb63f6.dyn.optonline.net. [24.187.99.246]) by smtp.gmail.com with ESMTPSA id jz9-20020a05622a81c900b00430bf59ebccsm648013qtb.11.2024.03.22.00.36.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Mar 2024 00:36:07 -0700 (PDT) From: aurtzy Date: Fri, 22 Mar 2024 03:33:20 -0400 Message-ID: <85034c7fb34fb078a10e8f2db41708ec533ae8e4.1711091869.git.aurtzy@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: 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 * gnu/packages/crates-io.scm (rust-quote-1.0.33): New variable. Change-Id: I45591530fe0644ded11bd0048519ac59de82eec9 --- gnu/packages/crates-io.scm | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index c5aff774b3..0a788fc5ef 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -52525,6 +52525,19 @@ (define-public rust-quote-1 (description "Quasi-quoting macro quote!(...)") (license (list license:asl2.0 license:expat)))) +(define-public rust-quote-1.0.33 + (package + (inherit rust-quote-1) + (name "rust-quote") + (version "1.0.33") + (source (origin + (method url-fetch) + (uri (crate-uri "quote" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1biw54hbbr12wdwjac55z1m2x2rylciw83qnjn564a3096jgqrsj")))))) + (define-public rust-quote-0.6 (package (inherit rust-quote-1) From patchwork Fri Mar 22 07:33:21 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: aurtzy X-Patchwork-Id: 62123 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 41B2127BBEA; Fri, 22 Mar 2024 07:40:32 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, 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 3539E27BBE2 for ; Fri, 22 Mar 2024 07:40:31 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rnZVn-0005hl-0Q; Fri, 22 Mar 2024 03:40:23 -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 1rnZVm-0005hP-3c for guix-patches@gnu.org; Fri, 22 Mar 2024 03:40:22 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rnZVl-0002NA-Qy for guix-patches@gnu.org; Fri, 22 Mar 2024 03:40:21 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rnZWQ-0005T2-6D for guix-patches@gnu.org; Fri, 22 Mar 2024 03:41:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#69637] [PATCH mesa-updates v2 5/5] gnu: mesa: Update to 24.0.3. Resent-From: aurtzy Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 22 Mar 2024 07:41:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 69637 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 69637@debbugs.gnu.org Cc: john.kehayias@protonmail.com, aurtzy , efraim@flashner.co.il Received: via spool by 69637-submit@debbugs.gnu.org id=B69637.171109322320906 (code B ref 69637); Fri, 22 Mar 2024 07:41:02 +0000 Received: (at 69637) by debbugs.gnu.org; 22 Mar 2024 07:40:23 +0000 Received: from localhost ([127.0.0.1]:56336 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rnZVm-0005R5-B9 for submit@debbugs.gnu.org; Fri, 22 Mar 2024 03:40:23 -0400 Received: from mail-qt1-f182.google.com ([209.85.160.182]:46505) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rnZTQ-0005IS-B2 for 69637@debbugs.gnu.org; Fri, 22 Mar 2024 03:38:02 -0400 Received: by mail-qt1-f182.google.com with SMTP id d75a77b69052e-430ad286ab8so10906481cf.1 for <69637@debbugs.gnu.org>; Fri, 22 Mar 2024 00:37:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1711092970; x=1711697770; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=DqpIGbkg3h9RQTnaz/Zt0dHzLz5GIMo/7ter5JUwc/o=; b=cJpAk/rfVJYGWfrR5t8PM3wo6INKnTe0HiNVxDhMxVqMFLgm4sdeTG65Itma0y3Pzu dDZeEZ/V/ZYoNE+hZ/sXJeqstFVul8uu8CGZ16851t8FseLpQZujrVcvqLq5LUw74rC4 S+vN7RKwcwRFcbgdAz84PHLJ1TuTnPOJrLKW3tCM5hEKZ7yEun7Tqr/7mOzuhOf9/NAj NkpcY24goGbtwfuJ+maQ55CRnE4GRy1plwssMUDgW6o+zP5vr4qaBARfc1WdjhgkIM8D A1Q/ZE5fd4hsccNULi21AyBMzod4787LL6vXZVfaN1OH69qWd9dmhdxiMYBpwXJu/7Va lOsw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711092970; x=1711697770; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=DqpIGbkg3h9RQTnaz/Zt0dHzLz5GIMo/7ter5JUwc/o=; b=h4K21bYUXA/yiiBHGxf6wIk4VazFUrblbSoQRCDkUc4lxWyNOlzPA7ogMQLJd62NSP PJ3Zna/bGDNpme5HW/SY6zCnJWN36Qr2jjtj1bLArL1oqfl4zkTTO2BIP+2zmkyV5iGF HU975lvRiQdNU2SKi6j1Hip/lyaHkF3R840XOrpE5YMfFaYNptooUcHcUf5ENs+/24OY A5W3KCmKFXm76/fn+amnE+wmT9p8eejsZPHO/4SF1f74iUFn7jUgvPbSGRQ0CxHgM7pt aTdRMR/iME4ZpnhFy6n/pUJdaZyeQJFyAPdwOCSCBOZ9Zic1SnxZ8OziTAGlUTZow8NN guXQ== X-Gm-Message-State: AOJu0Yzd2F52QUipfJJVGOZEfTzwb3uUSHe6OOhr5lo13d4UZHiU6Y/l QIggM/7ygnUhqxTWChvSyPpxhw+dxqUZq4vlb3aDXqFeJc2b8pCFLFEOYhsc X-Google-Smtp-Source: AGHT+IFoxM/meSkdWatiJsjwxS2qc71xuKe97mxa11vwFve0CgHJ9IYbpQbIVie6qCoiTQ1d8qqZLQ== X-Received: by 2002:a05:622a:196:b0:431:435:20fb with SMTP id s22-20020a05622a019600b00431043520fbmr1502539qtw.64.1711092970055; Fri, 22 Mar 2024 00:36:10 -0700 (PDT) Received: from localhost.localdomain (ool-18bb63f6.dyn.optonline.net. [24.187.99.246]) by smtp.gmail.com with ESMTPSA id jz9-20020a05622a81c900b00430bf59ebccsm648013qtb.11.2024.03.22.00.36.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Mar 2024 00:36:09 -0700 (PDT) From: aurtzy Date: Fri, 22 Mar 2024 03:33:21 -0400 Message-ID: <06ab73253d226155792ae2817c74d0f8d790db14.1711091869.git.aurtzy@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: 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 * gnu/packages/gl.scm (mesa): Update to 24.0.3. Change-Id: Ic4176f8a747bcb4c5210af6ccb4569589192e4a7 --- gnu/packages/gl.scm | 80 +++++++++++++++++++++++++++++++++++---------- 1 file changed, 62 insertions(+), 18 deletions(-) diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index f8dc8c1d9d..0265716ac0 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -20,6 +20,7 @@ ;;; Copyright © 2023 Kaelyn Takata ;;; Copyright © 2023, 2024 Zheng Junjie <873216071@qq.com> ;;; Copyright © 2024 Liliana Marie Prikler +;;; Copyright © 2024 aurtzy ;;; ;;; This file is part of GNU Guix. ;;; @@ -40,8 +41,10 @@ (define-module (gnu packages gl) #:use-module (gnu packages) #:use-module (gnu packages autotools) #:use-module (gnu packages bison) + #:use-module (gnu packages build-tools) #:use-module (gnu packages check) #:use-module (gnu packages compression) + #:use-module (gnu packages crates-io) #:use-module (gnu packages documentation) #:use-module (gnu packages elf) #:use-module (gnu packages flex) @@ -55,6 +58,8 @@ (define-module (gnu packages gl) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) #:use-module (gnu packages python-xyz) + #:use-module (gnu packages rust) + #:use-module (gnu packages rust-apps) #:use-module (gnu packages tls) #:use-module (gnu packages video) #:use-module (gnu packages vulkan) @@ -297,17 +302,17 @@ (define libva-without-mesa (define-public mesa (package (name "mesa") - (version "23.3.2") + (version "24.0.3") (source - (origin - (method url-fetch) - (uri (list (string-append "https://archive.mesa3d.org/" - "mesa-" version ".tar.xz") - (string-append "ftp://ftp.freedesktop.org/pub/mesa/" - "mesa-" version ".tar.xz"))) - (sha256 - (base32 - "1p4swrbmz3kb1805kdj973hf8virgmix4m9qprmcb2bgl4gviz1w")))) + (origin + (method url-fetch) + (uri (list (string-append "https://archive.mesa3d.org/" + "mesa-" version ".tar.xz") + (string-append "ftp://ftp.freedesktop.org/pub/mesa/" + "mesa-" version ".tar.xz"))) + (sha256 + (base32 + "1gpx3glifdvyw2fxigiannrxkdfhag6b6h0nxab3azbvlfickbkp")))) (build-system meson-build-system) (propagated-inputs ;; The following are in the Requires.private field of gl.pc. @@ -340,15 +345,23 @@ (define-public mesa python-mako python-wrapper (@ (gnu packages base) which) - (if (%current-target-system) - (list cmake-minimal-cross - pkg-config-for-build - wayland - wayland-protocols) - '()))) + (append + (if (%current-target-system) + (list cmake-minimal-cross + pkg-config-for-build + wayland + wayland-protocols) + '()) + ;; NVK-specific inputs + (if (target-x86-64?) + (list clang-15 + rust-bindgen-cli + rust) + '())))) (outputs '("out" "bin")) (arguments (list + #:meson meson-1.3 #:configure-flags #~(list #$@(cond @@ -379,9 +392,12 @@ (define-public mesa "-Dgbm=enabled" "-Dshared-glapi=enabled" - ;; Explicitly enable Vulkan on some architectures. + ;; Explicitly enable Vulkan on some architectures. TODO: Identify other + ;; architectures where nouveau (NVK) works and enable it for them #$@(cond - ((or (target-x86-32?) (target-x86-64?)) + ((target-x86-64?) + '("-Dvulkan-drivers=intel,intel_hasvk,amd,swrast,nouveau-experimental")) + ((target-x86-32?) '("-Dvulkan-drivers=intel,intel_hasvk,amd,swrast")) ((or (target-ppc64le?) (target-ppc32?)) '("-Dvulkan-drivers=amd,swrast")) @@ -478,6 +494,34 @@ (define-public mesa (("'lp_test_arit', ") "")))) (_ '((display "No tests to disable on this architecture.\n")))))) + #$@(if (target-x86-64?) + #~((add-after 'unpack 'change-subproject-sources + ;; Patch subproject source URLs to point to the store, which lets + ;; meson correctly identify rust inputs and avoid an attempt to + ;; download them mid-build. + (lambda _ + (for-each + (match-lambda + ((file input) + (substitute* file + (("source_url = .*$") + "") + (("source_hash = .*$") + "") + (("(source_filename = ).*$" all assign) + (string-append assign input "\n"))))) + ;; TODO: Patch mesa to allow for using sources with different + ;; versions so we don't have to package these crates + ;; specifically for mesa. + '(("subprojects/syn.wrap" + #$(package-source rust-syn-2.0.39)) + ("subprojects/unicode-ident.wrap" + #$(package-source rust-unicode-ident-1)) + ("subprojects/quote.wrap" + #$(package-source rust-quote-1.0.33)) + ("subprojects/proc-macro2.wrap" + #$(package-source rust-proc-macro2-1.0.70))))))) + #~()) (add-before 'configure 'fix-dlopen-libnames (lambda _ (let ((out #$output))