Skip to content

Commit de62247

Browse files
nixpkgs-ci[bot]nixpkgs-ci[bot]
authored
Merge master into staging-nixos
2 parents 575d45f + b7ecb71 commit de62247

File tree

19 files changed

+198
-54
lines changed

19 files changed

+198
-54
lines changed

‎doc/build-helpers/testers.chapter.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -421,6 +421,11 @@ Check that two paths have the same contents.
421421

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

424+
`checkMetadata` (boolean)
425+
426+
: Whether to fail on metadata differences, such as permissions or ownership.
427+
Defaults to `true`.
428+
424429
:::{.example #ex-testEqualContents-toyexample}
425430

426431
# Check that two paths have the same contents

‎pkgs/applications/editors/emacs/elisp-packages/elpa-common-overrides.nix‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ in
116116
})
117117
]
118118
else
119-
previousAttrs.patches or null;
119+
previousAttrs.patches or [ ];
120120
preBuild =
121121
if applyOrgRoamMissingPatch then
122122
previousAttrs.preBuild or ""
@@ -129,7 +129,7 @@ in
129129
popd
130130
''
131131
else
132-
previousAttrs.preBuild or null;
132+
previousAttrs.preBuild or "";
133133
}
134134
);
135135

‎pkgs/applications/editors/emacs/elisp-packages/lib-override-helper.nix‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ rec {
1818
if predicate finalAttrs previousAttrs then
1919
previousAttrs.packageRequires or [ ] ++ packageRequires
2020
else
21-
previousAttrs.packageRequires or null;
21+
previousAttrs.packageRequires or [ ];
2222
}
2323
);
2424

@@ -89,7 +89,7 @@ rec {
8989
if predicate finalAttrs previousAttrs then
9090
previousAttrs.nativeBuildInputs or [ ] ++ [ pkgs.writableTmpDirAsHomeHook ]
9191
else
92-
previousAttrs.nativeBuildInputs or null;
92+
previousAttrs.nativeBuildInputs or [ ];
9393
}
9494
);
9595
}

‎pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -830,7 +830,7 @@ let
830830
rm --recursive --verbose etc/elisp/screenshot
831831
''
832832
else
833-
previousAttrs.preBuild or null;
833+
previousAttrs.preBuild or "";
834834
}
835835
);
836836

@@ -897,7 +897,7 @@ let
897897
rm --verbose --force test-bpr.el
898898
''
899899
else
900-
previousAttrs;
900+
previousAttrs.preBuild or "";
901901
}
902902
);
903903

@@ -991,7 +991,7 @@ let
991991
})
992992
]
993993
else
994-
previousAttrs.patches or null;
994+
previousAttrs.patches or [ ];
995995
}
996996
)
997997
);
@@ -1055,7 +1055,7 @@ let
10551055
''
10561056
+ previousAttrs.preBuild or ""
10571057
else
1058-
previousAttrs.preBuild or null;
1058+
previousAttrs.preBuild or "";
10591059
}
10601060
);
10611061

@@ -1221,7 +1221,7 @@ let
12211221
rm --verbose packages/javascript/test-suppport.el
12221222
''
12231223
else
1224-
previousAttrs.preBuild or null;
1224+
previousAttrs.preBuild or "";
12251225
}
12261226
);
12271227

@@ -1392,7 +1392,7 @@ let
13921392
})
13931393
]
13941394
else
1395-
previousAttrs.patches or null;
1395+
previousAttrs.patches or [ ];
13961396
}
13971397
);
13981398

@@ -1543,7 +1543,7 @@ let
15431543
})
15441544
]
15451545
else
1546-
previousAttrs.patches or null;
1546+
previousAttrs.patches or [ ];
15471547
}
15481548
);
15491549

@@ -1561,7 +1561,7 @@ let
15611561
''
15621562
+ previousAttrs.preBuild or ""
15631563
else
1564-
previousAttrs.preBuild or null;
1564+
previousAttrs.preBuild or "";
15651565
}
15661566
);
15671567

‎pkgs/applications/editors/vim/plugins/non-generated/avante-nvim/default.nix‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@
1212
pkgs,
1313
}:
1414
let
15-
version = "0.0.27-unstable-2025-10-12";
15+
version = "0.0.27-unstable-2025-10-18";
1616
src = fetchFromGitHub {
1717
owner = "yetone";
1818
repo = "avante.nvim";
19-
rev = "f092bb3ec0acf87b838e082209b6a7eddcbf5940";
20-
hash = "sha256-zKDp9It/VgUD8BN5ktTmfbQX0s3SBo20T8no8nwsyfY=";
19+
rev = "cc7a41262e4dc38003b7578c3553a75c0ec4b8d2";
20+
hash = "sha256-L6fOo3OPfMtClmyGW1Bn7YDJtuTKO6F66D1oYsii5so=";
2121
};
2222
avante-nvim-lib = rustPlatform.buildRustPackage {
2323
pname = "avante-nvim-lib";

‎pkgs/applications/misc/fetchmail/default.nix‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@
99

1010
stdenv.mkDerivation rec {
1111
pname = "fetchmail";
12-
version = "6.5.6";
12+
version = "6.5.7";
1313

1414
src = fetchurl {
1515
url = "mirror://sourceforge/fetchmail/fetchmail-${version}.tar.xz";
16-
hash = "sha256-7BDg4OqkFzE1WTee3nbHRhR2bYOLOUcLZkdIY6ppDas=";
16+
hash = "sha256-c+trHUIbWYaGatSmt3fBFAo5AFKYxjv4R95TeXbL+9s=";
1717
};
1818

1919
buildInputs = [

‎pkgs/build-support/testers/default.nix‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@
5757
actual,
5858
expected,
5959
postFailureMessage ? null,
60+
checkMetadata ? true,
6061
}:
6162
runCommand "equal-contents-${lib.strings.toLower assertion}"
6263
{
@@ -66,12 +67,13 @@
6667
expected
6768
postFailureMessage
6869
;
70+
excludeMetadata = if checkMetadata then "no" else "yes";
6971
nativeBuildInputs = [ diffoscopeMinimal ];
7072
}
7173
''
7274
echo "Checking:"
7375
printf '%s\n' "$assertion"
74-
if ! diffoscope --no-progress --text-color=always --exclude-directory-metadata=no -- "$actual" "$expected"
76+
if ! diffoscope --no-progress --text-color=always --exclude-directory-metadata="$excludeMetadata" -- "$actual" "$expected"
7577
then
7678
echo
7779
echo 'Contents must be equal, but were not!'

‎pkgs/by-name/de/deltachat-desktop/package.nix‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,37 +19,37 @@
1919

2020
let
2121
deltachat-rpc-server' = deltachat-rpc-server.overrideAttrs rec {
22-
version = "2.20.0";
22+
version = "2.22.0";
2323
src = fetchFromGitHub {
2424
owner = "chatmail";
2525
repo = "core";
2626
tag = "v${version}";
27-
hash = "sha256-QPKy88c/GLeazGCjNYHj5kOxwiuvjJ/+pM4SQ4TZ1sw=";
27+
hash = "sha256-DKqqdcG3C7/RF/wz2SqaiPUjZ/7vMFJTR5DIGTXjoTY=";
2828
};
2929
cargoDeps = rustPlatform.fetchCargoVendor {
3030
pname = "chatmail-core";
3131
inherit version src;
32-
hash = "sha256-2Js4VQsXf1ApRq9Vf1xwX/1BXiFUQgykvofb2ykOdcc=";
32+
hash = "sha256-x71vytk9ytIhHlRR0lDhDcIaDNJGDdPwb6fkB1SI+NQ=";
3333
};
3434
};
3535
electron = electron_37;
3636
pnpm = pnpm_9;
3737
in
3838
stdenv.mkDerivation (finalAttrs: {
3939
pname = "deltachat-desktop";
40-
version = "2.20.0";
40+
version = "2.22.0";
4141

4242
src = fetchFromGitHub {
4343
owner = "deltachat";
4444
repo = "deltachat-desktop";
4545
tag = "v${finalAttrs.version}";
46-
hash = "sha256-tzRk4IwMm3qDzQtGKezkiRbnNSF7EabMYMHXMrrDW8w=";
46+
hash = "sha256-IEYfdA1rGg452pZVWW/XuIsNffyhAlI9qyGwcnksgAs=";
4747
};
4848

4949
pnpmDeps = pnpm.fetchDeps {
5050
inherit (finalAttrs) pname version src;
5151
fetcherVersion = 1;
52-
hash = "sha256-423I4ZXekDyqIY39hEUo7/hLthb3gjnvQHnVknZQFnI=";
52+
hash = "sha256-fEzp+nrfLakmtUsPef0HG6tZGn5/q+271YwVyBkFKJw=";
5353
};
5454

5555
nativeBuildInputs = [

‎pkgs/by-name/fi/files-cli/package.nix‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,16 @@
88

99
buildGoModule rec {
1010
pname = "files-cli";
11-
version = "2.15.111";
11+
version = "2.15.121";
1212

1313
src = fetchFromGitHub {
1414
repo = "files-cli";
1515
owner = "files-com";
1616
rev = "v${version}";
17-
hash = "sha256-M6SVLloMn/6AmIpfZ0Ib0yUQ33hC9MFjbFTxOlN7kqs=";
17+
hash = "sha256-Lf+kWLmCMbP0FIPxmtroakv1RayqTqMrFhYpVBoHqiA=";
1818
};
1919

20-
vendorHash = "sha256-fxh9YOO0xnYo04HwJyctspipSXgWcDoUu40UwhDf8Uk=";
20+
vendorHash = "sha256-GygNBB7ydaq11vU2wY9i/ZHmmLomMDKr4cJSdpcEoxk=";
2121

2222
ldflags = [
2323
"-s"

‎pkgs/by-name/gd/gdu/package.nix‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,14 @@ buildGoModule (finalAttrs: {
4242

4343
doCheck = !stdenv.hostPlatform.isDarwin;
4444

45-
checkFlags = [
46-
# https://github.com/dundee/gdu/issues/371
47-
"-skip=TestStoredAnalyzer"
48-
"-skip=TestAnalyzePathWithIgnoring"
49-
];
45+
checkFlags =
46+
let
47+
skippedTests = [
48+
"TestStoredAnalyzer" # https://github.com/dundee/gdu/issues/371
49+
"TestAnalyzePathWithIgnoring"
50+
];
51+
in
52+
[ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ];
5053

5154
doInstallCheck = true;
5255

0 commit comments

Comments
 (0)