Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Nom #124

Merged
merged 3 commits into from May 9, 2018
Merged

Nom #124

merged 3 commits into from May 9, 2018

Conversation

Ekleog
Copy link
Member

@Ekleog Ekleog commented Mar 16, 2018

This mostly rewrites the comment parser to use nom.

I've also added the nixos-test alias for test, and bumped Cargo.lock on my way there. If you want me to separate one of these modifications to a separate PR, just tell me!

Also, currently the dependency on nom is on its master branch: on my way there I hit a bug in nom, that will have to wait for 4.0.0-beta3 to be released before it's available on crates.io.

@grahamc
Copy link
Member

grahamc commented May 4, 2018

I'd like to merge this, but:

  1. please rebase against next
  2. update the carnix file with ./nix/update-carnix.sh
  3. please drop the nixos-test command for now

@Ekleog
Copy link
Member Author

Ekleog commented May 4, 2018

Done, thanks for the ./nix/update-carnix.sh hint!

I've checked after the rebase, and nix-build in <root>/ofborg manages to build, and cargo test in the same directory fails no additional tests compared to the ones currently failing on next.

@grahamc
Copy link
Member

grahamc commented May 4, 2018

LGTM I will merge this in the next couple days. I'm going to be traveling starting in 10min so I don't want to deeploy it now :)

@Ekleog
Copy link
Member Author

Ekleog commented May 4, 2018

Great, thanks! Have a nice trip :)

@grahamc grahamc merged commit 70d8093 into NixOS:next May 9, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants