nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-28 09:53:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

nixVersions.nix_2_10: add patch for flaky tests

Browse Source
This commit is contained in:
Nick Cao 2022-07-14 09:34:07 +08:00
parent 18c07ad150
commit f08a2bd566
No known key found for this signature in database
GPG Key ID: 068A56CEF48FA2C1
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkgs/tools/package-management/nix/default.nix
View File

@ -94,6 +94,7 @@ in lib.makeExtensible (self: {
nix_2_10 = common {
version = "2.10.2";
sha256 = "sha256-/8zlkXoZEZd+LgJq5xw8h+u2STqeKLrGTARZklE3CP8=";
patches = [ ./patches/flaky-tests.patch ];
};
stable = self.nix_2_9;

12
pkgs/tools/package-management/nix/patches/flaky-tests.patch Normal file
View File

@ -0,0 +1,12 @@
diff --git a/mk/run_test.sh b/mk/run_test.sh
index 7e95df2ac..58420c317 100755
--- a/mk/run_test.sh
+++ b/mk/run_test.sh
@@ -27,7 +27,6 @@ run_test "$1"
# appear randomly without anyone knowing why.
# See https://github.com/NixOS/nix/issues/3605 for more info
if [[ $status -ne 0 && $status -ne 99 && \
- "$(uname)" == "Darwin" && \
"$log" =~ "unexpected EOF reading a line" \
]]; then
echo "$post_run_msg [${yellow}FAIL$normal] (possibly flaky, so will be retried)"