Merge staging-next-25.05 into staging-25.05

pkgs/applications/version-management/git/default.nix

@@ -496,6 +496,12 @@ stdenv.mkDerivation (finalAttrs: {
     disable_test t5319-multi-pack-index
     disable_test t6421-merge-partial-clone
     disable_test t7504-commit-msg-hook
+    disable_test t5515-fetch-merge-logic
+    disable_test t4104-apply-boundary
+    disable_test t7002-mv-sparse-checkout
+    disable_test t4122-apply-symlink-inside
+    disable_test t7513-interpret-trailers
+    disable_test t2200-add-update
 
     # Fails reproducibly on ZFS on Linux with formD normalization
     disable_test t0021-conversion

pkgs/by-name/li/libarchive/package.nix

@@ -57,6 +57,7 @@ stdenv.mkDerivation (finalAttrs: {
         # the filesystem does not necessarily have hardlink capabilities
         "libarchive/test/test_write_disk_hardlink.c"
         # access-time-related tests flakey on some systems
+        "libarchive/test/test_read_disk_directory_traversals.c"
         "cpio/test/test_option_a.c"
         "cpio/test/test_option_t.c"
         # fails tests on filesystems with 64-bit inode values:

pkgs/development/python-modules/markdown/default.nix

@@ -3,6 +3,7 @@
   buildPythonPackage,
   pythonOlder,
   fetchFromGitHub,
+  fetchpatch,
   importlib-metadata,
   pyyaml,
   setuptools,
@@ -11,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "markdown";
-  version = "3.7";
+  version = "3.8.2";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -20,9 +21,16 @@ buildPythonPackage rec {
     owner = "Python-Markdown";
     repo = "markdown";
     tag = version;
-    hash = "sha256-bIBen693MC56k4LZ+8vhbvP+E3myFXoaXpNHOlnIdG8=";
+    hash = "sha256-L5OTjllMUrpsKZbK+EHcqlua/6I4onJvRC3povbHgfY=";
   };
 
+  patches = [
+    (fetchpatch {
+      url = "https://github.com/Python-Markdown/markdown/commit/23c301de28e12426408656efdfa153b11d4ff558.patch";
+      hash = "sha256-85HP97iL1umG60jwUgfnHvKHYmws5FSL0xfgZF95aiQ=";
+    })
+  ];
+
   build-system = [ setuptools ];
 
   dependencies = lib.optionals (pythonOlder "3.10") [ importlib-metadata ];
@@ -35,7 +43,7 @@ buildPythonPackage rec {
   pythonImportsCheck = [ "markdown" ];
 
   meta = with lib; {
-    changelog = "https://github.com/Python-Markdown/markdown/blob/${src.rev}/docs/changelog.md";
+    changelog = "https://github.com/Python-Markdown/markdown/blob/${src.tag}/docs/changelog.md";
     description = "Python implementation of John Gruber's Markdown";
     mainProgram = "markdown_py";
     homepage = "https://github.com/Python-Markdown/markdown";