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

pbrt: 2016-05-19 -> 2017-01-12 #23405

Merged
merged 1 commit into from Mar 13, 2017
Merged

pbrt: 2016-05-19 -> 2017-01-12 #23405

merged 1 commit into from Mar 13, 2017

Conversation

juliendehos
Copy link
Contributor

Motivation for this change

Update created for the release of the book.

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
    • Linux
  • 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.

Copy link
Contributor

@ndowens ndowens left a comment

Choose a reason for hiding this comment

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

fetchFromGitHub is preferred over fetchgit

rev = "638249e5cf4596e129695c8df8525d43f11573ff";
sha256 = "10ykqrg4zcfb4sfsg3z793c6vld6b6g8bzfyk7ya3yvvc9sdlr5g";
rev = "35b6da3429526f2026fe5e5ebaf36d593e113028";
sha256 = "10lvbph13p6ilzqb8sgrvn9gg1zmi8wpy3hhjbqp8dnsa4x0mhj7";
};

fetchSubmodules = true;
Copy link
Contributor

Choose a reason for hiding this comment

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

Why is fetchSubmodules outside of src?

rev = "638249e5cf4596e129695c8df8525d43f11573ff";
sha256 = "10ykqrg4zcfb4sfsg3z793c6vld6b6g8bzfyk7ya3yvvc9sdlr5g";
rev = "35b6da3429526f2026fe5e5ebaf36d593e113028";
sha256 = "10lvbph13p6ilzqb8sgrvn9gg1zmi8wpy3hhjbqp8dnsa4x0mhj7";
};

fetchSubmodules = true;
Copy link
Contributor

@ndowens ndowens Mar 2, 2017

Choose a reason for hiding this comment

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

meta = {
homepage = "http://pbrt.org";
description = "The renderer described in the third edition of the book 'Physically Based Rendering: From Theory To Implementation'";
platforms = stdenv.lib.platforms.linux ;

  • license = stdenv.lib.licenses.bsd3;
  • license = stdenv.lib.licenses.bsd2;
    maintainers = [ stdenv.lib.maintainers.juliendehos ];
    priority = 10;
    };

Could do:
meta = with stdenv.lib; {
homepage = "http://pbrt.org";
description = "The renderer described in the third edition of the book 'Physically Based Rendering: From Theory To Implementation'";
platforms = platforms.linux;
license = licenses.bsd2;
maintainers = [ maintainers.juliendehos ];
priority = 10;

@juliendehos
Copy link
Contributor Author

Yes, fixed.
Thanks.

@joachifm joachifm merged commit 14db0b9 into NixOS:master Mar 13, 2017
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