[bug#74037] [PATCH 0/2] Remove outdated assimp-5.0 package.

[bug#74037] [PATCH 0/2] Remove outdated assimp-5.0 package.

[Nicolas Graves via Guix-patches via]

Nicolas Graves (2):
  gnu: sbcl-classimp: Update to 0.0.0-1.6c74f38.
  gnu: Remove assimp-5.0.

 gnu/packages/graphics.scm | 14 --------------
 gnu/packages/lisp-xyz.scm | 29 +++++++----------------------
 2 files changed, 7 insertions(+), 36 deletions(-)

-- 
2.46.0

[bug#74037] [PATCH 1/2] gnu: sbcl-classimp: Update to 0.0.0-1.6c74f38.

[Nicolas Graves via Guix-patches via]

* 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")
-- 
2.46.0

[bug#74037] [PATCH 2/2] gnu: Remove assimp-5.0.

[Nicolas Graves via Guix-patches via]

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")
-- 
2.46.0

bug#74037: Close

[Andreas Enge]

Patches applied by Zheng Junjie, closing issue.

Andreas