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

aspellDicts: add more dictionaries and some documentation #34798

Merged
merged 1 commit into from Feb 19, 2018

Conversation

oxij
Copy link
Member

@oxij oxij commented Feb 10, 2018

Motivation for this change

Jargon files.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Fits CONTRIBUTING.md.

fullName = "English Computer Jargon";

src = fetchurl {
url = https://mrsatterly.com/spelling_computer.txt;
Copy link
Member

Choose a reason for hiding this comment

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

this redirects

@oxij
Copy link
Member Author

oxij commented Feb 10, 2018 via email

@grahamc
Copy link
Member

grahamc commented Feb 10, 2018

@GrahamcOfBorg eval


langInputs = [ en ];

phases = [ "preBuild" "buildPhase" "installPhase" ];
Copy link
Member

Choose a reason for hiding this comment

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

In both cases you set phases, why? Should this be improved in buildDict?

@oxij
Copy link
Member Author

oxij commented Feb 10, 2018 via email

buildDict =
{langInputs ? [], ...}@args:
buildLang ({
propagatedUserEnvPackages = langInputs;
Copy link
Member

Choose a reason for hiding this comment

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

We should not be using propagatedUserEnvPackages


~~~~
environment.systemPackages = [
aspellDicts.en
Copy link
Member

Choose a reason for hiding this comment

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

and aspell itself?


with lib;

/* HOWTO:
Copy link
Member

Choose a reason for hiding this comment

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

This only considers the method where dicts are installed separate from aspell, and not aspellWithDicts. Perhaps there is a better place for this comment? Otherwise, it's good to have the explanation!

~~~~
master en_US
extra-dicts en-computers.rws
add-extra-dicts en_US-science.rws
Copy link
Member

Choose a reason for hiding this comment

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

Why are these needed? Should it not detect them?

shortName = "ca-2.1.5-1";
fullName = "Catalan";
src = fetchurl {
url = mirror://gnu/aspell/dict/ca/aspell6-ca-2.1.5-1.tar.bz2;
url = "mirror://gnu/aspell/dict/ca/aspell6-ca-2.1.5-1.tar.bz2";
Copy link
Member

Choose a reason for hiding this comment

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

Quotes are not needed, and until the policy changes, they should not be included either.

Copy link
Member

Choose a reason for hiding this comment

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

That's super annoying when upgrading a literal URL to a ${version} or ${name} one. Has this policy finally been written down somewhere?


ca = buildDict {
/* Function to compile txt dict files into Aspell dictionaries. */
buildDict =
Copy link
Member

@FRidh FRidh Feb 10, 2018

Choose a reason for hiding this comment

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

How about creating instead a src that can be consumed by the old buildDict? Any reason for not doing that?

build in the exact same way. */
buildDict =
Copy link
Member

Choose a reason for hiding this comment

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

Any motivation for changing the name?

@oxij
Copy link
Member Author

oxij commented Feb 10, 2018 via email

@oxij oxij force-pushed the pkgs/aspell-dicts branch 2 times, most recently from fe141f7 to 0f8fe1a Compare February 11, 2018 15:50
@oxij
Copy link
Member Author

oxij commented Feb 11, 2018

Well whatever, the last patch has gone to SLNOS.

To make my position clear: I see no policy behind #27809. What I see is somebody making a huge change to nixpkgs that goes backwards and you merging it without discussion.

@FRidh
Copy link
Member

FRidh commented Feb 11, 2018

Any suggestions with what to replace it with? You should have en_US in the
profile when installing en_US-science.

The closest would be aspellWithDicts, for installing individual packages there is nothing else.

The problem with aspellWithDicts is that it does --set ASPELL_CONF which breaks the above explanation.

See #34856.

You would need to implement aspellWithDictsAndConfig to make this work. This is outside of scope of this PR.

Agreed.

@oxij
Copy link
Member Author

oxij commented Feb 12, 2018 via email

@7c6f434c
Copy link
Member

OK, looks like this version is pure addition.

@7c6f434c 7c6f434c merged commit cfa3e7e into NixOS:master Feb 19, 2018
@oxij oxij deleted the pkgs/aspell-dicts branch September 8, 2018 22:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants