c4patino/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-07-06 17:13:24 -05:00
Code Issues Projects Releases Packages Wiki Activity

git-annex: remove tasty workaround (#520973)

Browse source
This commit is contained in:
Wolfgang Walther 2026-05-17 08:37:33 +00:00 • committed by GitHub
commit e9724bc92f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 2 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

7
pkgs/development/haskell-modules/configuration-common.nix
View file

@ -704,13 +704,6 @@ with haskellLib;
--replace-fail 'InstallDesktopFile $(PREFIX)/bin/git-annex' \
'InstallDesktopFile git-annex'
'';
# Work around race condition in test suite exposed by tasty-1.5.4
# TODO(@sternenseemann): make testFlags arg usable with git-annex
preCheck = ''
${drv.preCheck or ""}
appendToVar checkFlags -j1
'';
}))
];

2
pkgs/development/haskell-modules/configuration-nix.nix
View file

@ -1272,6 +1272,8 @@ builtins.intersectAttrs super {
ln -sf git-annex git-remote-tor-annex
PATH+=":$PWD"
checkFlagsArray+=("-J$NIX_BUILD_CORES")
echo checkFlags: $checkFlags ''${checkFlagsArray:+"''${checkFlagsArray[@]}"}
# Doesn't use Cabal's test mechanism