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

Pr scala out dir cleaned #78042

Merged
merged 3 commits into from Jan 24, 2020
Merged

Pr scala out dir cleaned #78042

merged 3 commits into from Jan 24, 2020

Conversation

jm-g
Copy link

@jm-g jm-g commented Jan 19, 2020

Motivation for this change

The changed scala packages put text files like LICENCSE and NOTICE into their root directory. They should not be there to avoid clashes between packages.

Things done

Changed the install phase of scala, scala_2_12, and scala_2_11 to move those files to $out/share/doc/scala. scala_2_10 is unchanged since it has way more files in $out which should not be there imho. And I am not sure where to put them.

  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • 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 nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

Jean-Marie Gaillourdet added 3 commits January 19, 2020 19:32
Before, this package installed files called LICENSE and NOTICE at the
profile root directory. Which conflicts with other packages with the
same issue. Those files reside now in $out/share/doc/scala/.
Before, this package installed files called LICENSE and NOTICE at the
profile root directory. Which conflicts with other packages with the
same issue. Those files reside now in $out/share/doc/scala/.
Before, this package installed files called LICENSE and NOTICE at the
profile root directory. Which conflicts with other packages with the
same issue. Those files reside now in $out/share/doc/scala/.
@jm-g
Copy link
Author

jm-g commented Jan 24, 2020

Is there anything else I can do to simplify merging or reviewing that PR for others?

@Mic92 Mic92 merged commit e013793 into NixOS:master Jan 24, 2020
@Mic92
Copy link
Member

Mic92 commented Jan 24, 2020

Thanks!

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

3 participants