Skip to content

Commit

Permalink
update from oil 0.18 to 0.19
Browse files Browse the repository at this point in the history
Fairly clean, but for some reason the build/dev.sh "all"
build pattern was broken and I needed to change to directly
use build/py.sh "all". Also a param rename.
  • Loading branch information
abathur committed Feb 28, 2024
1 parent 25ece54 commit e59c8c6
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions nixpkgs/oildev.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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";

/*
Expand Down Expand Up @@ -110,7 +110,7 @@ rec {
doCheck = true;

preBuild = ''
build/dev.sh all
build/py.sh all
'';

postPatch = ''
Expand Down
2 changes: 1 addition & 1 deletion resholve
Original file line number Diff line number Diff line change
Expand Up @@ -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,
)

Expand Down

0 comments on commit e59c8c6

Please sign in to comment.