Hey,
Here’s an ungrafting patch that was still valid a couple of weeks ago,
if it helps. :-)
Ludo’.
diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index 697b083a334..95212210a82 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -1009,9 +1009,8 @@ (define-public gtk+-2
(define-public gtk+
(package
(inherit gtk+-2)
- (replacement gtk+/fixed)
(name "gtk+")
- (version "3.24.49")
+ (version "3.24.51")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -1020,7 +1019,7 @@ (define-public gtk+
(file-name (git-file-name name version))
(sha256
(base32
- "0flsnh3f0l9v3y2hmnxz1h15nw1l12ixmiwcpiy1ywplrlgq4j00"))
+ "07vw0rani9d65px36fzzj7sprv5r48shyjdgzipkihzqaldd98yh"))
(patches (search-patches
"gtk3-respect-GUIX_GTK3_PATH.patch"
"gtk3-respect-GUIX_GTK3_IM_MODULE_FILE.patch"))))
@@ -1141,23 +1140,6 @@ (define-public gtk+
(variable "GUIX_GTK3_PATH")
(files '("lib/gtk-3.0")))))))
-(define-public gtk+/fixed
- (let* ((base gtk+)
- (source (package-source base)))
- (package
- (inherit base)
- (version "3.24.51")
- (source
- (origin
- (inherit source)
- (uri (git-reference
- (inherit (origin-uri source))
- (commit version)))
- (file-name (git-file-name (package-name base) version))
- (sha256
- (base32
- "07vw0rani9d65px36fzzj7sprv5r48shyjdgzipkihzqaldd98yh")))))))
-
(define-public gtk
(package
(name "gtk")
diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 881fc6364cf..36894cd38c1 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -677,8 +677,7 @@ (define-public python-3.11
(package
(inherit python-3.10)
(name "python")
- (version "3.11.11")
- (replacement python-3.11/fixed)
+ (version "3.11.14")
(source (origin
(method url-fetch)
(uri (string-append "https://www.python.org/ftp/python/";
@@ -690,7 +689,7 @@ (define-public python-3.11
"python-3-search-paths.patch"))
(sha256
(base32
- "1qrvsxg5g0b0pgz2iigxic2j3g6b2c59iva46vins8ydl33j169a"))
+ "0y4v42qm66nvizjxbnixh59283a54nki51jmbrgwkhc8bkndhgld"))
(modules '((guix build utils)))
(snippet
'(begin
@@ -1081,16 +1080,6 @@ (define-public python-3.11
(variable "PYTHONTZPATH")
(files (list "share/zoneinfo")))))))
-(define-public python-3.11/fixed
- (package/inherit python-3.11
- (version "3.11.14")
- (source (origin
- (inherit (package-source python-3.11))
- (uri (string-append "https://www.python.org/ftp/python/"; version
- "/Python-" version ".tar.xz"))
- (sha256 (base32
- "0y4v42qm66nvizjxbnixh59283a54nki51jmbrgwkhc8bkndhgld"))))))
-
(define-public python-3.12
(package
(name "python-next")
