dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

zeroc-mcpp: remove with statements

Browse Source
This commit is contained in:
Philip Taron 2024-08-16 13:59:12 -07:00
parent 99219bdfbc
commit 11cddcd4ad
No known key found for this signature in database
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/development/libraries/zeroc-ice/default.nix
View File

@ -50,19 +50,19 @@ in stdenv.mkDerivation rec {
doCheck = true;
nativeCheckInputs = with python3.pkgs; [ passlib ];
checkPhase = with lib; let
checkPhase = let
# these tests require network access so we need to skip them.
brokenTests = map escapeRegex [
brokenTests = map lib.escapeRegex [
"Ice/udp" "Glacier2" "IceGrid/simple" "IceStorm" "IceDiscovery/simple"
# FIXME: certificate expired, remove for next release?
"IceSSL/configuration"
];
# matches CONFIGS flag in makeFlagsArray
configFlag = optionalString cpp11 "--config=cpp11-shared";
configFlag = lib.optionalString cpp11 "--config=cpp11-shared";
in ''
runHook preCheck
${python3.interpreter} ./cpp/allTests.py ${configFlag} --rfilter='${concatStringsSep "|" brokenTests}'
${python3.interpreter} ./cpp/allTests.py ${configFlag} --rfilter='${lib.concatStringsSep "|" brokenTests}'
runHook postCheck
'';