From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:306:2d92::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id +MwsCRW97GSVRQAA9RJhRA:P1 (envelope-from ) for ; Mon, 28 Aug 2023 17:28:21 +0200 Received: from aspmx1.migadu.com ([2001:41d0:306:2d92::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id +MwsCRW97GSVRQAA9RJhRA (envelope-from ) for ; Mon, 28 Aug 2023 17:28:21 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id DE1595CFE5 for ; Mon, 28 Aug 2023 17:28:20 +0200 (CEST) Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20221208 header.b=IgXfMkgF; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none) ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1693236501; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:resent-cc:resent-from:resent-sender: resent-message-id:in-reply-to:in-reply-to:references:references: list-id:list-help:list-unsubscribe:list-subscribe:list-post: dkim-signature; bh=6i3B8CZVFE7tmg6y6khQC5nFkcIz0wYe+BCvWuOlDZY=; b=OmGG/DCuKTZ9p77jjFrQQjprNKmtyV5TQSJ4ND8UsrnTV0D7Af94JopgKF69aBhRo4xtnK 1EmMR6qUrzY822LB5T31wqz4Moq/qV/Gv4keh8RTYzBvTM3mzMRcIf9eleExejwSpN8tTP g6Dk0FT1uponDaDeWxXx8kYJlcP322yfou202AmsLZ+YI3rPM/UECbTQli7D/5QgovPhYU pcsjGh0xT2jNPHpaidmSHlEHYkMJiKPwAigzF5z6HbQVZb+TTk+fOUpUpZtrGC8rYKSgOB 9ergF8eAJinUtjF7RV9D23bEhrcgmiS25Hnqa7GhFEUzcX78B6v7oVeKl33PRg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20221208 header.b=IgXfMkgF; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none) ARC-Seal: i=1; s=key1; d=yhetil.org; t=1693236501; a=rsa-sha256; cv=none; b=aJspMZheMNLNX25kSVQPd7k+BDIplpNZ7fsmQAZzvynKpY2PqQLgu6XHfEqyeWdraKy2Ki tSLj7l23oNynkWoukbl8kTmfSpWSR5Tv5ItIFrMeGr0XctAj8uX0zYMMMBJSrqMUSA44nz YJQCz2EFA441+OhiUuOXP4Lc7CYOcoBiUQdzcpI5HhrqVgflkZhn97PnjyPCPK6FeZnNZ2 6AZg9hg+o0zMa4CpZteS4uOvE917k8F0LOq3L1IZ/X2a+i8NBe41iPaKVFz6ZPfzUmvuSL 6E/Jgm/q0+I1FEkX1aX/KMbNh9gOO5A9OQvvUj6OIEReKlaA+5AYLNTM7tJBvA== Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qae9n-0000Cv-Nt; Mon, 28 Aug 2023 11:27:59 -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 1qae9k-0000Ce-Hc for guix-patches@gnu.org; Mon, 28 Aug 2023 11:27:56 -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 1qae9k-000089-9N for guix-patches@gnu.org; Mon, 28 Aug 2023 11:27:56 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qae9q-0000V9-F7 for guix-patches@gnu.org; Mon, 28 Aug 2023 11:28:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#60571] [PATCH v2 1/4] gnu: Add spirv-headers-for-skia. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 28 Aug 2023 15:28:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60571 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: Nicolas Graves Cc: 60571@debbugs.gnu.org Received: via spool by 60571-submit@debbugs.gnu.org id=B60571.16932364791914 (code B ref 60571); Mon, 28 Aug 2023 15:28:02 +0000 Received: (at 60571) by debbugs.gnu.org; 28 Aug 2023 15:27:59 +0000 Received: from localhost ([127.0.0.1]:48799 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qae9m-0000Uo-Jv for submit@debbugs.gnu.org; Mon, 28 Aug 2023 11:27:58 -0400 Received: from mail-qk1-x729.google.com ([2607:f8b0:4864:20::729]:47508) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qae9k-0000Ub-ET for 60571@debbugs.gnu.org; Mon, 28 Aug 2023 11:27:57 -0400 Received: by mail-qk1-x729.google.com with SMTP id af79cd13be357-76da239ba16so228882285a.3 for <60571@debbugs.gnu.org>; Mon, 28 Aug 2023 08:27:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1693236464; x=1693841264; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=6i3B8CZVFE7tmg6y6khQC5nFkcIz0wYe+BCvWuOlDZY=; b=IgXfMkgFmWGopCgsX9yHwRREbdiqVojXRLJPCknqX4CPa/ZD16J1CzeifOfSoNhNrm gthxSZCFmu1Mni2wytkvZ4lOyDHWtIcKsDbgUN50TC4QmpiMi4ujyhLSlU+NDDtTAlL3 mUEgNsuW5URGmwJ649evR5miKqiA1IJcFkmlyhSqFqQlIIXt3W/H1YlKD8HVjnkkkahB hTFf+jGbj3nIy2+aCeascy0q1wKqr1dxbZ68XwqHGhPg6EIX5gMtSKx6tV/kWQv5Yr+P qXnXnqicS+AsvCBk4ghEfsgkcQ+LjRFLfthYKYqZJe9pbSE+4a9aWCs8l923BR9lNjtA UFGg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693236464; x=1693841264; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=6i3B8CZVFE7tmg6y6khQC5nFkcIz0wYe+BCvWuOlDZY=; b=fIuQf8tKl6ykZXrSF1WhWxJQtsCEw/RDJRp1VuKATbP5Oz4GT9EHcjPtpEISJKhti+ MvBQgw/0zYNFYiajY4/Lu9uDLvlXNzraSju7NkyVJ7jMw+w/hghB/5VOvYT4LnjeSZy6 2APTGVaIR9WUg8kkCYfERmhRB9fuGy4vKKex1r+On9lBgNV+Kn2Sj71bUYHGXDjJG/TQ HKK/dxTDRQzv5nZDLmZzVEWONqfOYb3YdkNWUoWxQFYV1at5zrjuH7eS9jFMLKVaUMPo 9pfnLpDmlpMlqCdSO1ZwnLOJfKuQsUHLnYSm5yKona515uSISkKsPkJqayhonk6s6HHX pJgQ== X-Gm-Message-State: AOJu0YwCY/ZFh7xyasfQ2lotctxWxouuHX20nMihH2/w6ckZGTYfOqdb ctgKuLzjSDZ5dBCM9zKVj7Jd+o9rJS8= X-Google-Smtp-Source: AGHT+IGvUs2UQRuHlV+zbDcIAXDE31aGn9r4ibpg8nc4MpnM0zyGVuapcWyWw1VU1veibo3Uub8h3w== X-Received: by 2002:ad4:4252:0:b0:647:2bd2:a49 with SMTP id l18-20020ad44252000000b006472bd20a49mr27019381qvq.39.1693236464091; Mon, 28 Aug 2023 08:27:44 -0700 (PDT) Received: from hurd (dsl-10-132-204.b2b2c.ca. [72.10.132.204]) by smtp.gmail.com with ESMTPSA id t18-20020a0cb712000000b0063f78bd525asm2630435qvd.144.2023.08.28.08.27.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Aug 2023 08:27:43 -0700 (PDT) From: Maxim Cournoyer References: Date: Mon, 28 Aug 2023 11:27:42 -0400 In-Reply-To: (Nicolas Graves's message of "Sun, 27 Aug 2023 14:53:39 +0200") Message-ID: <87edjngpap.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN X-Migadu-Scanner: mx2.migadu.com X-Migadu-Spam-Score: 2.78 X-Spam-Score: 2.78 X-Migadu-Queue-Id: DE1595CFE5 X-TUID: Vcsr8Odou4U8 Hi, Nicolas Graves writes: > * gnu/packages/vulkan.scm (spirv-headers-for-skia): New variable. > (%vulkan-sdk-skia-version): New variable. > --- > gnu/packages/vulkan.scm | 18 ++++++++++++++++++ > 1 file changed, 18 insertions(+) > > diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm > index 1d2e58f1d4..da83417dba 100644 > --- a/gnu/packages/vulkan.scm > +++ b/gnu/packages/vulkan.scm > @@ -46,6 +46,9 @@ (define-module (gnu packages vulkan) > > ;; Note: Remember to change vulkan-loader version when bumping this. > (define %vulkan-sdk-version "sdk-1.3.231.1") > +;; Note: The current skia version is lagging behind vulkan's. > +;; Use this variable until it has catched up. "caught up". > +(define %vulkan-sdk-skia-version "sdk-1.2.198.0") > > (define-public spirv-headers > (package > @@ -79,6 +82,21 @@ (define-public spirv-headers > (string-append "https://github.com/KhronosGroup/SPIRV-Headers/blob/" > version "/LICENSE"))))) > > +(define-public spirv-headers-for-skia > + (package > + (inherit spirv-headers) > + (name "spirv-headers-for-skia") > + (version %vulkan-sdk-skia-version) > + (source > + (origin > + (method git-fetch) > + (uri (git-reference > + (url "https://skia.googlesource.com/external/github.com/KhronosGroup/SPIRV-Headers.git") > + (commit version))) This like busts the 80 characters limit. You can break it with a backslash (\) followed by a newline, e.g. --8<---------------cut here---------------start------------->8--- (url "https://skia.googlesource.com/external/github.com\ /KhronosGroup/SPIRV-Headers.git") --8<---------------cut here---------------end--------------->8--- I think 'guix lint' warns about this. -- Thanks, Maxim