lilyp pushed a commit to branch master
in repository guix.

commit 1d78e3ef12252503cac81d44c90597479e58776b
Author: Liliana Marie Prikler <[email protected]>
AuthorDate: Sat Apr 5 23:44:58 2025 +0200

    gnu: Make GIMP 3 the new gimp.
    
    * gnu/packages/gimp.scm (gimp-2, gimp-3): New variables.
    (gimp): Move old definition to gimp-2, point to gimp-3.
    (gimp-next): Deprecate in favor of gimp-3.
---
 gnu/packages/gimp.scm | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/gimp.scm b/gnu/packages/gimp.scm
index 6e4916600f..ef03992f2d 100644
--- a/gnu/packages/gimp.scm
+++ b/gnu/packages/gimp.scm
@@ -335,7 +335,7 @@ buffers.")
      (modify-inputs (package-propagated-inputs gegl)
        (replace "babl" babl-0.1.96)))))
 
-(define-public gimp
+(define-public gimp-2
   (package
     (name "gimp")
     (version "2.10.38")
@@ -421,10 +421,10 @@ as well as specialized ones.  It features a highly 
customizable interface
 that is extensible via a plugin system.")
     (license license:gpl3+))) ; some files are lgplv3
 
-(define-public gimp-next
+(define-public gimp-3
   (package
-    (inherit gimp)
-    (name "gimp-next")
+    (inherit gimp-2)
+    (name "gimp")
     (version "3.0.0")
     (source
      (origin
@@ -455,16 +455,20 @@ that is extensible via a plugin system.")
                    (mkdir-p (string-append #$output:doc "/share"))
                    (rename-file (string-append #$output "/share/doc")
                                 (string-append #$output:doc "/share/doc")))))))
-    (inputs (modify-inputs (package-inputs gimp)
+    (inputs (modify-inputs (package-inputs gimp-2)
               (replace "gtk+" gtk+)
               (prepend libxmu libxt)
               (prepend python python-pygobject gjs)
               (prepend libxslt)))
-    (native-inputs (modify-inputs (package-native-inputs gimp)
+    (native-inputs (modify-inputs (package-native-inputs gimp-2)
                      (prepend appstream-glib
                               gi-docgen
                               libarchive)))))
 
+(define-public gimp gimp-3)
+(define-public gimp-next
+  (deprecated-package "gimp-next" gimp-3))
+
 (define-public gimp-fourier
   (package
     (name "gimp-fourier")

Reply via email to