diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2024-02-25 00:13:49 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-02-25 00:13:49 +0000 |
| commit | 257171f024023815158819b0cb35b5958f1b4975 (patch) | |
| tree | 91f9a728162c7e67be0ebf5602148377f1841da1 /pkgs/development/misc | |
| parent | 57bbe4245f80b90b4b48079750f91bdc0437c66e (diff) | |
| parent | 7794d8a78570335f10b0f97ae72b14b33c6addc2 (diff) | |
Merge master into haskell-updates
Diffstat (limited to 'pkgs/development/misc')
| -rw-r--r-- | pkgs/development/misc/resholve/oildev.nix | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/pkgs/development/misc/resholve/oildev.nix b/pkgs/development/misc/resholve/oildev.nix index 4e7cdb5e60438..2098ec80f5ae7 100644 --- a/pkgs/development/misc/resholve/oildev.nix +++ b/pkgs/development/misc/resholve/oildev.nix @@ -120,7 +120,6 @@ rec { rm cpp/stdlib.h # keep modules from finding the wrong stdlib? # work around hard parse failure documented in oilshell/oil#1468 substituteInPlace osh/cmd_parse.py --replace 'elif self.c_id == Id.Op_LParen' 'elif False' - '' + lib.optionalString (!stdenv.hostPlatform.isGnu && !stdenv.hostPlatform.isDarwin) '' # disable fragile libc tests substituteInPlace build/py.sh --replace "py-ext-test pyext/libc_test.py" "#py-ext-test pyext/libc_test.py" ''; |