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

frog: init at v0.13.7 #28036

Merged
merged 1 commit into from
Aug 26, 2017
Merged

frog: init at v0.13.7 #28036

merged 1 commit into from
Aug 26, 2017

Conversation

roberth
Copy link
Member

@roberth roberth commented Aug 8, 2017

Motivation for this change

frog is a natural language parser for dutch.
It depends on some other packages in the LanguageMachines organisation.
I have included an update script.

Things done

Please check what applies. Note that these are not hard requirements but merely serve as information for reviewers.

  • Tested using sandboxing
    (nix.useSandbox on NixOS,
    or option build-use-sandbox in nix.conf
    on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • Linux
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

@@ -8432,6 +8432,8 @@ with pkgs;
};
libkrb5 = krb5Full.override { type = "lib"; };

languageMachines = import ../development/libraries/languagemachines/packages.nix { inherit callPackage; };
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As it is not part of the main namespace, the packages will be not build by hydra. Are you ok with this?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's a very good point! I will make frog available at the top level. I don't think its dependencies are used a lot outside frog, so I think it doesn't make sense to put everything in the already big all-packages.nix.

Is there a way to also include my test without polluting all-packages.nix? (It's a simple runCommand derivation that makes sure frog works as expected without a mutable frog.out, lingering builder state, etc.)

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You can add it to checkPhase, so it will be run when the package is build.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As it is not part of the main namespace, the packages will be not build by hydra

Its possible to use recurseIntoAttrs

@roberth roberth force-pushed the frog branch 2 times, most recently from 410d6fc to 0f9347c Compare August 14, 2017 10:50
@roberth
Copy link
Member Author

roberth commented Aug 14, 2017

  • Added recurseIntoAttrs to also build test and any other languagemachines projects that may be added in the future
  • Rebased onto master

Thanks @Mic92 and @FRidh for the review and help!

Ready for merge, as far as I'm concerned.

@Mic92
Copy link
Member

Mic92 commented Aug 16, 2017

Your test seems to be not working:

$ nix-shell --keep-going -p languageMachines.test
bash: /nix/store/6jaydhdipi87z9i4p8czq46nj2ga04ni-frog-test: line 1: syntax error near unexpected token `('

@roberth
Copy link
Member Author

roberth commented Aug 16, 2017

I would expect Travis CI to catch that. I will look into it.

@roberth
Copy link
Member Author

roberth commented Aug 17, 2017

Alright, what happens is that nix-shell wants to run the output of the test. I have no idea why that happens, because for example

nix-shell --keep-going -p languageMachines.frog

does not run the executable. I did't expect nix-shell -p to try to run text files as scripts. (Did you?)

The following works and seems sufficient:

nix-build -A languageMachines.test '<nixpkgs>'

I think the nix-shell behaviour might be a bug.

@Mic92
Copy link
Member

Mic92 commented Aug 26, 2017

I guess it is ok then.

@Mic92 Mic92 merged commit 58dc4a8 into NixOS:master Aug 26, 2017
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.

3 participants