diff --git a/nixpkgs/oildev.nix b/nixpkgs/oildev.nix index 57c4648..a7ee93b 100644 --- a/nixpkgs/oildev.nix +++ b/nixpkgs/oildev.nix @@ -62,8 +62,8 @@ rec { src = fetchFromGitHub { owner = "oilshell"; repo = "oil"; - # rev == present HEAD of release/0.18.0 - rev = "bd7ba38a2c04459cf21352b4ba60da3c334c40b1"; + # rev == present HEAD of release/0.19.0 + rev = "4d56470f97da2f55f33ad9e4d89d103c3b9436ee"; hash = "sha256-TODO-via-fixup"; /* @@ -110,7 +110,7 @@ rec { doCheck = true; preBuild = '' - build/dev.sh all + build/py.sh all ''; postPatch = '' diff --git a/resholve b/resholve index eec555a..6452ce6 100755 --- a/resholve +++ b/resholve @@ -4307,7 +4307,7 @@ class ResolvedScript(RecordCommandlike): arena=arena, parse_opts=optview.Parse(state.InitOpts(), NO_OPTIONS_OVERLAY), aliases={}, # dummy - oil_grammar=None, + ysh_grammar=None, one_pass_parse=True, )