Merge staging-next into staging (0f767d37) · Commits · nix / nixpkgs

doc/build-helpers/testers.chapter.md

+5 −0

Original line number	Diff line number	Diff line
		@@ -421,6 +421,11 @@ Check that two paths have the same contents.

		: A message that is printed last if the file system object contents at the two paths don't match exactly.

		`checkMetadata` (boolean)

		: Whether to fail on metadata differences, such as permissions or ownership.
		Defaults to `true`.

		:::{.example #ex-testEqualContents-toyexample}

		# Check that two paths have the same contents

+2 −2

Original line number	Diff line number	Diff line
		@@ -116,7 +116,7 @@ in
		})
		]
		else
		previousAttrs.patches or null;
		previousAttrs.patches or [ ];
		preBuild =
		if applyOrgRoamMissingPatch then
		previousAttrs.preBuild or ""
		@@ -129,7 +129,7 @@ in
		popd
		''
		else
		previousAttrs.preBuild or null;
		previousAttrs.preBuild or "";
		}
		);

+2 −2

Original line number	Diff line number	Diff line
		@@ -18,7 +18,7 @@ rec {
		if predicate finalAttrs previousAttrs then
		previousAttrs.packageRequires or [ ] ++ packageRequires
		else
		previousAttrs.packageRequires or null;
		previousAttrs.packageRequires or [ ];
		}
		);

		@@ -89,7 +89,7 @@ rec {
		if predicate finalAttrs previousAttrs then
		previousAttrs.nativeBuildInputs or [ ] ++ [ pkgs.writableTmpDirAsHomeHook ]
		else
		previousAttrs.nativeBuildInputs or null;
		previousAttrs.nativeBuildInputs or [ ];
		}
		);
		}

+8 −8

Original line number	Diff line number	Diff line
		@@ -830,7 +830,7 @@ let
		rm --recursive --verbose etc/elisp/screenshot
		''
		else
		previousAttrs.preBuild or null;
		previousAttrs.preBuild or "";
		}
		);

		@@ -897,7 +897,7 @@ let
		rm --verbose --force test-bpr.el
		''
		else
		previousAttrs;
		previousAttrs.preBuild or "";
		}
		);

		@@ -991,7 +991,7 @@ let
		})
		]
		else
		previousAttrs.patches or null;
		previousAttrs.patches or [ ];
		}
		)
		);
		@@ -1055,7 +1055,7 @@ let
		''
		+ previousAttrs.preBuild or ""
		else
		previousAttrs.preBuild or null;
		previousAttrs.preBuild or "";
		}
		);

		@@ -1221,7 +1221,7 @@ let
		rm --verbose packages/javascript/test-suppport.el
		''
		else
		previousAttrs.preBuild or null;
		previousAttrs.preBuild or "";
		}
		);

		@@ -1392,7 +1392,7 @@ let
		})
		]
		else
		previousAttrs.patches or null;
		previousAttrs.patches or [ ];
		}
		);

		@@ -1543,7 +1543,7 @@ let
		})
		]
		else
		previousAttrs.patches or null;
		previousAttrs.patches or [ ];
		}
		);

		@@ -1561,7 +1561,7 @@ let
		''
		+ previousAttrs.preBuild or ""
		else
		previousAttrs.preBuild or null;
		previousAttrs.preBuild or "";
		}
		);

+3 −3

Original line number	Diff line number	Diff line
		@@ -12,12 +12,12 @@
		pkgs,
		}:
		let
		version = "0.0.27-unstable-2025-10-12";
		version = "0.0.27-unstable-2025-10-18";
		src = fetchFromGitHub {
		owner = "yetone";
		repo = "avante.nvim";
		rev = "f092bb3ec0acf87b838e082209b6a7eddcbf5940";
		hash = "sha256-zKDp9It/VgUD8BN5ktTmfbQX0s3SBo20T8no8nwsyfY=";
		rev = "cc7a41262e4dc38003b7578c3553a75c0ec4b8d2";
		hash = "sha256-L6fOo3OPfMtClmyGW1Bn7YDJtuTKO6F66D1oYsii5so=";
		};
		avante-nvim-lib = rustPlatform.buildRustPackage {
		pname = "avante-nvim-lib";