Merge branch 'staging' into core-updates.

2026-05-27 11:32:21 +02:00 · 2022-03-21 23:39:43 -04:00
parent f0136b36ae 49b350fafc
commit a9429c8f22
527 changed files with 357880 additions and 247173 deletions
@@ -73,7 +73,7 @@
 (define-public diffoscope
  (package
    (name "diffoscope")
-    (version "199")
+    (version "207")
    (source
     (origin
       (method git-fetch)
@@ -82,7 +82,7 @@
             (commit version)))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "0wy1nd52a4rzqhhdcdi3pfgrixz3w3q7qfc9mpc9zraq5cj94l7n"))
+        (base32 "0djpkq9fpw8dpiqaghbbg5dshl27xgkqrifalx9nq87dix5c1y6d"))
       (patches
        (search-patches "diffoscope-fix-llvm-test.patch"))))
    (build-system python-build-system)
@@ -180,7 +180,7 @@
             hdf5
             imagemagick
             libarchive
-             llvm
+             llvm-9
             lz4
             mono
             ocaml