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.

Sign up for GitHub

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

Jump to bottom

release-notes/18-09: add licenses marked as unfree #48463

Merged
merged 3 commits into from Oct 15, 2018
Merged

release-notes/18-09: add licenses marked as unfree #48463

merged 3 commits into from Oct 15, 2018

Conversation

Ekleog
Copy link
Member

@Ekleog Ekleog commented Oct 15, 2018

Motivation for this change

Adds missing backwards-incompatible change in the release notes. Needs backport to 18.09 for display on nixos.org.

Docs built locally and verified.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • 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 nox --run "nox-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)
  • Fits CONTRIBUTING.md.

@samueldr
Copy link
Member

Not sure if this is a dealbreaker, but I would like to see better descriptive names in the list, in addition to our identifiers. That is, "Microsoft Research License Agreement (msrla)" instead of the stand-alone identifiers.

@Ekleog
Copy link
Member Author

Ekleog commented Oct 15, 2018

Fixed by adding the full names taken from lib/licenses.nix :)

@grahamc grahamc merged commit 94c6f1b into NixOS:master Oct 15, 2018
@grahamc
Copy link
Member

grahamc commented Oct 15, 2018

@Ekleog can you open a backport PR? use git cherry-pick -x

@Ekleog
Copy link
Member Author

Ekleog commented Oct 15, 2018

@grahamc Done :) #48468

@Ekleog Ekleog deleted the release-notes-license branch October 15, 2018 15:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
6.topic: nixos 8.has: changelog 8.has: documentation 10.rebuild-darwin: 0 10.rebuild-linux: 0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@Ekleog @samueldr @grahamc @GrahamcOfBorg