From e7c1fa4718e942c1cd58b6bd101f3d07c7f81a2b Mon Sep 17 00:00:00 2001 From: Artemis Tosini Date: Sun, 30 Mar 2025 17:29:32 +0000 Subject: [PATCH 1/4] libarchve: disable another atime test This test relies on atime of files and fails inconsistently on FreeBSD. (cherry picked from commit cb9fd5faaafee327379fbb4ec0a7763d5d48cae5) Right now we experience this test failing on *-darwin: https://hydra.nixos.org/build/310854511/nixlog/2/tail https://hydra.nixos.org/build/310854515/nixlog/2/tail --- pkgs/by-name/li/libarchive/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/li/libarchive/package.nix b/pkgs/by-name/li/libarchive/package.nix index ef3e31b26e34..899b51934a18 100644 --- a/pkgs/by-name/li/libarchive/package.nix +++ b/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: From ed542fe4b1f7855c5c1dcb066684928cb496f402 Mon Sep 17 00:00:00 2001 From: Tristan Ross Date: Mon, 15 Sep 2025 12:34:49 -0700 Subject: [PATCH 2/4] git: disable more flaky tests (cherry picked from commit 2fefb13dbb1671aba0ca5cdbca8e3f5f5047bed1) https://hydra.nixos.org/build/310807526#tabs-buildsteps --- pkgs/applications/version-management/git/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/applications/version-management/git/default.nix b/pkgs/applications/version-management/git/default.nix index 2f9d7d8153ff..965a083cfdb9 100644 --- a/pkgs/applications/version-management/git/default.nix +++ b/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 From bf79f77e17b8cdc0a4ec5c076e07b9fdd39de347 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 11 Apr 2025 11:48:40 -0700 Subject: [PATCH 3/4] python313Packages.markdown: 3.7 -> 3.8 Diff: https://github.com/Python-Markdown/markdown/compare/refs/tags/3.7...3.8 Changelog: https://github.com/Python-Markdown/markdown/blob/refs/tags/3.8/docs/changelog.md (cherry picked from commit 2ee6323b5372b147669c7211eed5a8412ec16fcc) --- pkgs/development/python-modules/markdown/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/markdown/default.nix b/pkgs/development/python-modules/markdown/default.nix index cf1170242375..87020cb9e10f 100644 --- a/pkgs/development/python-modules/markdown/default.nix +++ b/pkgs/development/python-modules/markdown/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "markdown"; - version = "3.7"; + version = "3.8"; pyproject = true; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "Python-Markdown"; repo = "markdown"; tag = version; - hash = "sha256-bIBen693MC56k4LZ+8vhbvP+E3myFXoaXpNHOlnIdG8="; + hash = "sha256-H1xvDM2ShiPbfcpW+XGrxCxtaRFVaquuMuGg1RhjeNA="; }; build-system = [ setuptools ]; @@ -35,7 +35,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"; From 433b61be65794fa9c19572929cacd18831b6c6c0 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 5 Aug 2025 04:41:08 +0200 Subject: [PATCH 4/4] python3Packages.markdown: 3.8 -> 3.8.2 https://github.com/Python-Markdown/markdown/blob/3.8.2/docs/changelog.md This commit was automatically generated using update-python-libraries. (cherry picked from commit 72f93808a868e40c7430d2737aa3b5a8a22b3fa1) Picking this and the parent commit to fix https://hydra.nixos.org/build/310933981/nixlog/2/tail --- pkgs/development/python-modules/markdown/default.nix | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/markdown/default.nix b/pkgs/development/python-modules/markdown/default.nix index 87020cb9e10f..39f3dda5f21e 100644 --- a/pkgs/development/python-modules/markdown/default.nix +++ b/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.8"; + 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-H1xvDM2ShiPbfcpW+XGrxCxtaRFVaquuMuGg1RhjeNA="; + 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 ];