diff options
| author | Christopher Baines <mail@cbaines.net> | 2024-04-20 11:47:50 +0100 |
|---|---|---|
| committer | Christopher Baines <mail@cbaines.net> | 2024-04-20 11:47:50 +0100 |
| commit | da77ea23daa0bfa4a73290dff99b22d6825ff80b (patch) | |
| tree | 748d24e62b93c8ab8f999d6415d9f65c3d317da2 /gnu/packages/patchutils.scm | |
| parent | 4eeb6922449285f9bce615f6e4ffe4375fa0233f (diff) | |
| parent | 949f97f7f98ac74306b9de79c93790337d804e32 (diff) | |
| download | guix-chris-core-updates-no-duplicates-attempt.tar guix-chris-core-updates-no-duplicates-attempt.tar.gz | |
Merge commit '949f97f7f9' into core-update-new-2chris-core-updates-no-duplicates-attempt
Change-Id: Ibbd851541da42cc052ba58195fee033daadd57e5
Conflicts:
gnu/local.mk
gnu/packages/bioinformatics.scm
gnu/packages/dictionaries.scm
gnu/packages/display-managers.scm
gnu/packages/engineering.scm
gnu/packages/geo.scm
gnu/packages/gl.scm
gnu/packages/glib.scm
gnu/packages/gnome-xyz.scm
gnu/packages/gnome.scm
gnu/packages/gtk.scm
gnu/packages/image-processing.scm
gnu/packages/linux.scm
gnu/packages/llvm.scm
gnu/packages/mail.scm
gnu/packages/patches/eudev-rules-directory.patch
gnu/packages/plotutils.scm
gnu/packages/sdl.scm
gnu/packages/syndication.scm
Diffstat (limited to 'gnu/packages/patchutils.scm')
| -rw-r--r-- | gnu/packages/patchutils.scm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gnu/packages/patchutils.scm b/gnu/packages/patchutils.scm index 963cba8c2b..eb1066e4b6 100644 --- a/gnu/packages/patchutils.scm +++ b/gnu/packages/patchutils.scm @@ -301,7 +301,7 @@ GiB).") (define-public meld (package (name "meld") - (version "3.22.1") + (version "3.22.2") (source (origin (method url-fetch) @@ -309,7 +309,7 @@ GiB).") (version-major+minor version) "/meld-" version ".tar.xz")) (sha256 - (base32 "0dk8j27jlqhxcjrkc8pa3rl7fz7pfwvrbyrhfsx1ld6lvcrbvlvd")))) + (base32 "1vqn4glv32dxrzm5hxj64ac5q9ffr1bhf7ks6wxia6ydzc9sg826")))) (build-system meson-build-system) (native-inputs (list desktop-file-utils |