From patchwork Sat Oct 26 22:46:07 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 69521 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 23F7A27BBEA; Sat, 26 Oct 2024 23:46:40 +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=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, 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 6BE7227BBE2 for ; Sat, 26 Oct 2024 23:46:39 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t4pYK-00029L-1G; Sat, 26 Oct 2024 18:46:36 -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 1t4pYE-00028A-MB for guix-patches@gnu.org; Sat, 26 Oct 2024 18:46:32 -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 1t4pYD-00081r-9G for guix-patches@gnu.org; Sat, 26 Oct 2024 18:46:30 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:From:To:In-Reply-To:References:Subject; bh=868OGtPL24K5kGRAvuJFKb5+27DHOFPErDWrLX2waf4=; b=g3LSzcaUBG6P4rprUfuErkpT5T4FgigQdrjgjno4+zkDqY/OfbJ7okyeb8NUTLLbjguJd3rGIeU2gkiGoceZi5tx2N/BEOZECb9AfGfT0PXdlN3rAW9NoPTv5LSqOTYMpez6WO+MoIvKtwb+TdPRgrhALmdMn301CfB28WaCG0FtfhEOhCsksJtpxOkAQZnzw1fhkp8VpDU/IVSms+tbn5lj1bY/evMLVT3Vgb3wNGQyhGvAvIpmlkJgDwDrhY1SqB7K34m3KMZYZeujNNaoObCc4B3FvQwaB9ggfbwI0hAf9W5F9glBM0yOIDBqvP7MyFh9TeS1uRt2ZP3KGQoEpw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1t4pYk-00071u-Ti for guix-patches@gnu.org; Sat, 26 Oct 2024 18:47:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#74037] [PATCH 1/2] gnu: sbcl-classimp: Update to 0.0.0-1.6c74f38. References: <20241026223524.27590-1-ngraves@ngraves.fr> In-Reply-To: <20241026223524.27590-1-ngraves@ngraves.fr> Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 26 Oct 2024 22:47:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74037 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74037@debbugs.gnu.org Cc: Nicolas Graves Received: via spool by 74037-submit@debbugs.gnu.org id=B74037.172998281526978 (code B ref 74037); Sat, 26 Oct 2024 22:47:02 +0000 Received: (at 74037) by debbugs.gnu.org; 26 Oct 2024 22:46:55 +0000 Received: from localhost ([127.0.0.1]:43124 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t4pYd-000713-7p for submit@debbugs.gnu.org; Sat, 26 Oct 2024 18:46:55 -0400 Received: from 4.mo560.mail-out.ovh.net ([87.98.172.75]:55541) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t4pYa-00070o-7t for 74037@debbugs.gnu.org; Sat, 26 Oct 2024 18:46:53 -0400 Received: from director9.ghost.mail-out.ovh.net (unknown [10.108.9.185]) by mo560.mail-out.ovh.net (Postfix) with ESMTP id 4XbZWY1JB9z1YkP for <74037@debbugs.gnu.org>; Sat, 26 Oct 2024 22:46:17 +0000 (UTC) Received: from ghost-submission-5b5ff79f4f-z9lq8 (unknown [10.110.188.251]) by director9.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 048011FD23; Sat, 26 Oct 2024 22:46:17 +0000 (UTC) Received: from ngraves.fr ([37.59.142.101]) by ghost-submission-5b5ff79f4f-z9lq8 with ESMTPSA id c0OJNThxHWfL+AMAuZL+2g (envelope-from ); Sat, 26 Oct 2024 22:46:17 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-101G004076be369-fc63-4669-a92c-c3f4a657d2a2, E6BF9B87AE7FBE7894246B3B643E76DCC103CD4C) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 86.246.19.221 Date: Sun, 27 Oct 2024 00:46:07 +0200 Message-ID: <20241026224613.32655-1-ngraves@ngraves.fr> X-Mailer: git-send-email 2.46.0 MIME-Version: 1.0 X-Ovh-Tracer-Id: 8158552201996722914 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeeftddrvdejhedgudegucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffoggfgsedtkeertdertddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepteeffefhfffhjeevleeuvdehgffgveekheeuhfekhfehuefgheffhedugfegleeinecuffhomhgrihhnpehgihhthhhusgdrtghomhenucfkphepuddvjedrtddrtddruddpkeeirddvgeeirdduledrvddvuddpfeejrdehledrudegvddruddtudenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdhnsggprhgtphhtthhopedupdhrtghpthhtohepjeegtdefjeesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheeitddpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=868OGtPL24K5kGRAvuJFKb5+27DHOFPErDWrLX2waf4=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1729982777; v=1; b=tdPBkhkQzE1Tdw3JtnLbGd99b/fAb8vEZi504v1JkYal7DmG+DHy/RY1obbI/o/6Eh46nPF4 9G4tGzkxd+2tL9c31FLxKSItgcXC1AtFGOkyxLBHJXS1Ve5TBQIbXdWwChwggXh7gORqnQDUpLp 20nhGYQb+0sahZXTPHTl3yj+lDxrbTsdkcXOi7kUQmVA2X8Oa6OUtcwCGPdpSO0pbHite/ubDi7 a+FAbb7OPEsdOm5+PAV+mtezK96gsTM90NPntOTe5vYOfHolumBYf6um6szw/qIBxm/jGuZAaLw 8rDWvL708HLQA6uqD/o78SFbDtkHGG07ojI8V8uNQZpSg== 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: , Reply-to: Nicolas Graves X-ACL-Warn: , Nicolas Graves via Guix-patches X-Patchwork-Original-From: Nicolas Graves via Guix-patches via From: Nicolas Graves 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/lisp-xyz.scm (sbcl-classimp): Update to 0.0.0-1.6c74f38. [inputs]: Replace assimp-5.0 by assimp. [arguments]<#:phases>: Adapt phase 'patch-assimp-lib-path. (cl-classimp): Simplify. (ecl-classimp): Simplify. --- gnu/packages/lisp-xyz.scm | 29 +++++++---------------------- 1 file changed, 7 insertions(+), 22 deletions(-) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 16b1b8d873..d93c67ca5d 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -10857,8 +10857,8 @@ (define-public ecl-class-options (sbcl-package->ecl-package sbcl-class-options)) (define-public sbcl-classimp - (let ((commit "d82a14c59bc733f89a1ea0b3447ebedddce5756e") - (revision "0")) + (let ((commit "6c74f3808e00781a2662f37ddc26ccbbf2687b6b") + (revision "1")) (package (name "sbcl-classimp") (version (git-version "0.0.0" revision commit)) @@ -10870,7 +10870,7 @@ (define-public sbcl-classimp (commit commit))) (file-name (git-file-name "cl-classimp" version)) (sha256 - (base32 "0pbnz6cf1zb2ayk4kbw0gphjb8nflnjns2rwhv86jz0kf0z1hqha")))) + (base32 "1sq34s5yrljh7fffllsscay7xi11lg03alrkyrh6xfwa2w7cnqmx")))) (build-system asdf-build-system/sbcl) (arguments (list @@ -10880,9 +10880,9 @@ (define-public sbcl-classimp (lambda* (#:key inputs #:allow-other-keys) (substitute* "library.lisp" (("libassimp.so.5" _) - (search-input-file inputs "/lib/libassimp.so.5.0.0")))))))) + (search-input-file inputs "/lib/libassimp.so.5")))))))) (inputs - (list assimp-5.0 + (list assimp sbcl-cffi sbcl-split-sequence)) (home-page "https://github.com/3b/classimp") @@ -10892,26 +10892,11 @@ (define-public sbcl-classimp Import} library for Common Lisp.") (license license:expat)))) -;; FIXME: The cl and ecl packages get the latest version of assimp as -;; dependency instead of the one specified in the sbcl package. Specifying -;; the dependencies explicitly works around the issue. (define-public cl-classimp - (let ((pkg (sbcl-package->cl-source-package sbcl-classimp))) - (package - (inherit pkg) - (inputs - (list assimp-5.0 - cl-cffi - cl-split-sequence))))) + (sbcl-package->cl-source-package sbcl-classimp)) (define-public ecl-classimp - (let ((pkg (sbcl-package->ecl-package sbcl-classimp))) - (package - (inherit pkg) - (inputs - (list assimp-5.0 - ecl-cffi - ecl-split-sequence))))) + (sbcl-package->ecl-package sbcl-classimp)) (define-public sbcl-clavier (let ((commit "9b1424eaad131e114a45b400784079124b5e2321") From patchwork Sat Oct 26 22:46:08 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 69522 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 0266327BBEA; Sat, 26 Oct 2024 23:46:51 +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=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, 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 BB8E527BBE2 for ; Sat, 26 Oct 2024 23:46:50 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t4pYM-0002AX-8q; Sat, 26 Oct 2024 18:46:38 -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 1t4pYE-00028B-MX for guix-patches@gnu.org; Sat, 26 Oct 2024 18:46:32 -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 1t4pYD-00081w-QU for guix-patches@gnu.org; Sat, 26 Oct 2024 18:46:30 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=nfXWw/JKru9JRfRCB9PGXRFico505SMFH9IjuMP8kSc=; b=ukg48skCibK2Ya1P+9ple0UqrcR1lMstpn/3s0FByAnUMNoerhUwRp9tBnyQ7z0wD+F8+/j4o5tpVboOlo4pcRNN2g7+iLNKtaKqXLDl23r1MTxhAfG11OKcUiykXJKdRM14+E+m1FEhdFYPZZwGVXhhWwAPqwNPw/g5yQ2OxWJ92dUk4ZeMg2Bq78vjQVpoNfPjaL2fbwvKzy8MTJD0+bqJCrhBzdEklCjm4+dlH2UvLQXwLkrRc0Hve4+TFCZvwH338w6Q8Yn5t9qrdII0jxbffU0Q//6SpsrVq5c4YZqUD5aRksjV6V1IImwU6ylbfi8PFNFcO2wR+c+OM+x37w==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1t4pYl-000722-Lj for guix-patches@gnu.org; Sat, 26 Oct 2024 18:47:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#74037] [PATCH 2/2] gnu: Remove assimp-5.0. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 26 Oct 2024 22:47:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74037 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74037@debbugs.gnu.org Cc: Nicolas Graves Received: via spool by 74037-submit@debbugs.gnu.org id=B74037.172998282026998 (code B ref 74037); Sat, 26 Oct 2024 22:47:03 +0000 Received: (at 74037) by debbugs.gnu.org; 26 Oct 2024 22:47:00 +0000 Received: from localhost ([127.0.0.1]:43126 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t4pYh-00071N-KQ for submit@debbugs.gnu.org; Sat, 26 Oct 2024 18:46:59 -0400 Received: from 5.mo575.mail-out.ovh.net ([46.105.62.179]:43989) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t4pYc-00070r-3I for 74037@debbugs.gnu.org; Sat, 26 Oct 2024 18:46:54 -0400 Received: from director1.ghost.mail-out.ovh.net (unknown [10.108.9.185]) by mo575.mail-out.ovh.net (Postfix) with ESMTP id 4XbZWb0hZ3z1jV7 for <74037@debbugs.gnu.org>; Sat, 26 Oct 2024 22:46:19 +0000 (UTC) Received: from ghost-submission-5b5ff79f4f-j8lkq (unknown [10.111.174.164]) by director1.ghost.mail-out.ovh.net (Postfix) with ESMTPS id DBE091FE07; Sat, 26 Oct 2024 22:46:18 +0000 (UTC) Received: from ngraves.fr ([37.59.142.102]) by ghost-submission-5b5ff79f4f-j8lkq with ESMTPSA id Qk0dITpxHWejGx4ABgfSDw (envelope-from ); Sat, 26 Oct 2024 22:46:18 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-102R004440b1e18-6a4c-4bab-8337-21f2cbc6a6d9, E6BF9B87AE7FBE7894246B3B643E76DCC103CD4C) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 86.246.19.221 Date: Sun, 27 Oct 2024 00:46:08 +0200 Message-ID: <20241026224613.32655-2-ngraves@ngraves.fr> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20241026224613.32655-1-ngraves@ngraves.fr> References: <20241026224613.32655-1-ngraves@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 8159115151031132898 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeeftddrvdejhedgudegucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepvdehleeiffehtedvlefhffffjeefgfduhfetkeevheeiteduiedugfekuedtheejnecuffhomhgrihhnpehgihhthhhusgdrtghomhenucfkphepuddvjedrtddrtddruddpkeeirddvgeeirdduledrvddvuddpfeejrdehledrudegvddruddtvdenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdhnsggprhgtphhtthhopedupdhrtghpthhtohepjeegtdefjeesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheejhedpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=nfXWw/JKru9JRfRCB9PGXRFico505SMFH9IjuMP8kSc=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1729982779; v=1; b=DNjM5DlfKeCe+V95PcyhM36vKsALvzeHrO/EVD9kwH8/63bhTn7imhpS7xomH8OHJrXOYzxj 2LqSLim8s3CCQOwyCmOU7vVN2u+bOoJIQ39fgt4vFfFMW85pc9fLxbOr+qA4XwGihKn6/zIGGyE ru5pkUhZpsApjcLDRQgI6LCQhPazDXJ/1FaGNdRp+6X1G4odz77KQENpVfpGfeDjRC2LPXl2lZr nGl3lqHOqOw60wm0S9ITCYd/7R9ric9AD7gMbiEZFV4mAaFJIJbCOGH6jm2dyckYJDcSoTCwKn8 mQ155obTsfmztkxV2IbCxS+85FlQRkduLFtIB/KNUEwWg== 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: , Reply-to: Nicolas Graves X-ACL-Warn: , Nicolas Graves via Guix-patches X-Patchwork-Original-From: Nicolas Graves via Guix-patches via From: Nicolas Graves 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 This package is outdated, not used anymore in Guix and has a CVE. * gnu/packages/graphics.scm (assimp-5.0): Delete variable. --- gnu/packages/graphics.scm | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index c12516383b..8686cac7f7 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -688,20 +688,6 @@ (define-public assimp more.") (license license:bsd-3))) -(define-public assimp-5.0 - (package - (inherit assimp) - (version "5.0.0") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/assimp/assimp") - (commit (string-append "v" version)))) - (file-name (git-file-name "assimp" version)) - (sha256 - (base32 - "1w2484lg823bql7lpfq84vnsfsnag5v65qrbphslj866z9ia68l7")))))) - (define-public mikktspace ;; The latest commit is used as there is no release. (let ((commit "3e895b49d05ea07e4c2133156cfa94369e19e409")