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

Jump to bottom

libpng: 1.6.35 -> 1.6.36, license v2 #51447

Merged
merged 2 commits into from Jan 19, 2019
Merged

libpng: 1.6.35 -> 1.6.36, license v2 #51447

merged 2 commits into from Jan 19, 2019

Conversation

dtzWill
Copy link
Member

@dtzWill dtzWill commented Dec 3, 2018 •
edited

Motivation for this change

https://sourceforge.net/p/png-mng/mailman/message/36483059/

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)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

c0bw3b
c0bw3b reviewed Dec 3, 2018
View reviewed changes
lib/licenses.nix Outdated Show resolved Hide resolved
@c0bw3b
Copy link
Contributor

c0bw3b commented Dec 3, 2018 •
edited

So... they do a licensing change in a patch version, to begin with.
And the result is just... :

The new libpng license comprises the terms and conditions from the zlib
license, and the disclaimer from the Boost license.

Oh come on... Just choose one of the two licenses already defined and accepted as free instead of (not) reinventing the wheel by composing parts of others' licenses...

Mic92
Mic92 reviewed Dec 3, 2018
View reviewed changes
pkgs/development/libraries/libpng/default.nix
@@ -25,14 +25,14 @@ in stdenv.mkDerivation rec {

propagatedBuildInputs = [ zlib ];

doCheck = stdenv.hostPlatform == stdenv.buildPlatform;
doCheck = true;
Copy link
Member

Choose a reason for hiding this comment

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

This will be still skipped for cross-builds, right?

Copy link
Member Author

Choose a reason for hiding this comment

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

Yes, that's my understanding! :)

@c0bw3b
Copy link
Contributor

c0bw3b commented Dec 3, 2018

@GrahamcOfBorg eval

1 similar comment
@c0bw3b
Copy link
Contributor

c0bw3b commented Dec 4, 2018

@GrahamcOfBorg eval

@dtzWill
Copy link
Member Author

dtzWill commented Dec 29, 2018

Sorry for the delay! :)

@dtzWill
Copy link
Member Author

dtzWill commented Jan 5, 2019

Okay to merge IMO, any objections?

@vcunat
Copy link
Member

vcunat commented Jan 5, 2019

Bikeshedding: maybe we don't need the definition in licenses.nix, as it doesn't seem likely to be reused, but I don't really care which of the two ways we use here.

@vcunat vcunat merged commit d37b48d into NixOS:staging Jan 19, 2019
vcunat added a commit that referenced this pull request Jan 19, 2019
@vcunat
Merge #51447: libpng: 1.6.35 -> 1.6.36, license v2
3456ad5 
(into staging)
@vcunat
Copy link
Member

vcunat commented Feb 19, 2019

Cross-links: pnggroup/libpng#266 98be12a

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Mic92 Mic92 Mic92 left review comments

@c0bw3b c0bw3b c0bw3b left review comments

@vcunat vcunat vcunat approved these changes

Assignees
No one assigned
Labels
10.rebuild-darwin: 501+ 10.rebuild-linux: 501+
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@dtzWill @c0bw3b @vcunat @Mic92 @GrahamcOfBorg