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

osl: 1.10.9 -> 1.11.14.2 #129248

Closed
wants to merge 5 commits into from
Closed

osl: 1.10.9 -> 1.11.14.2 #129248

wants to merge 5 commits into from

Conversation

gebner
Copy link
Member

@gebner gebner commented Jul 4, 2021

Motivation for this change

New upstream version.

I've also fixed the seexpr and appleseed packages (they were broken before and depend on osl).

Things done
  • 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/)
  • 21.11 Release Notes (or backporting 21.05 Relase notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

@r-rmcgibbo
Copy link

r-rmcgibbo commented Jul 4, 2021 •
edited

Result of nixpkgs-review pr 129248 at 35dc0fa run on x86_64-linux 1

1 package skipped due to time constraints:
  • blender
5 packages built successfully:
  • appleseed
  • opencolorio
  • openimageio2
  • osl
  • seexpr

Result of nixpkgs-review pr 129248 at a2c2da2 run on aarch64-linux 1

2 packages failed to build:
3 packages built successfully:
  • opencolorio
  • openimageio2
  • osl

Note that build failures may predate this PR, and could be nondeterministic or hardware dependent.
Please exercise your independent judgement. Does something look off? Please file an issue or reach out on IRC.

SuperSandro2000
SuperSandro2000 reviewed Jul 5, 2021
View reviewed changes
pkgs/development/compilers/osl/default.nix
Comment on lines 36 to 37
partio pugixml
util-linux # needed just for hexdump
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
partio pugixml
util-linux # needed just for hexdump
partio pugixml
util-linux # needed just for hexdump

pkgs/development/compilers/osl/default.nix
partio pugixml
util-linux # needed just for hexdump
python # CMake doesn't check this?
python3 # CMake doesn't check this?
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
python3 # CMake doesn't check this?
python3 # CMake doesn't check this?

pkgs/development/compilers/seexpr/default.nix
meta = with lib; {
description = "Embeddable expression evaluation engine from Disney Animation";
homepage = "https://www.disneyanimation.com/technology/seexpr.html";
homepage = "http://wdas.github.io/SeExpr/";
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
homepage = "http://wdas.github.io/SeExpr/";
homepage = "https://wdas.github.io/SeExpr/";

pkgs/tools/graphics/appleseed/default.nix
Comment on lines +43 to +44
] ++ lib.optionals stdenv.hostPlatform.isx86_64 ([ "-DUSE_SSE=ON" ] ++
lib.optional stdenv.hostPlatform.sse4_2Support "-DUSE_SSE42=ON");
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
] ++ lib.optionals stdenv.hostPlatform.isx86_64 ([ "-DUSE_SSE=ON" ] ++
lib.optional stdenv.hostPlatform.sse4_2Support "-DUSE_SSE42=ON");
] ++ lib.optionals stdenv.hostPlatform.isx86_64 [ "-DUSE_SSE=ON" ]
++ lib.optional stdenv.hostPlatform.sse4_2Support "-DUSE_SSE42=ON";

@risicle
Copy link
Contributor

risicle commented Jul 17, 2021

nixpkgs-review happy, macos 10.15.

@stale
Copy link

stale bot commented Apr 16, 2022

I marked this as stale due to inactivity. → More info

@stale stale bot added the 2.status: stale https://github.com/NixOS/nixpkgs/blob/master/.github/STALE-BOT.md label Apr 16, 2022
@onny
Copy link
Contributor

onny commented Jul 22, 2022

OSL v1.11.17.0 released :) This PR looks promising, any plans to continue the work?

@stale stale bot removed the 2.status: stale https://github.com/NixOS/nixpkgs/blob/master/.github/STALE-BOT.md label Jul 22, 2022
@onny onny mentioned this pull request Jul 23, 2022
Merged
13 tasks
SuperSandro2000
SuperSandro2000 reviewed Jul 24, 2022
View reviewed changes
pkgs/development/compilers/osl/default.nix
Comment on lines 6 to 7
let boost_static = boost165.override { enableStatic = true; };
in clangStdenv.mkDerivation rec {
Copy link
Member

Choose a reason for hiding this comment

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

Can we move this into top-level to make sure to only use this boost across the package?

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

@SuperSandro2000 SuperSandro2000 SuperSandro2000 left review comments

@jtojnar jtojnar Awaiting requested review from jtojnar

@cillianderoiste cillianderoiste Awaiting requested review from cillianderoiste

@Hodapp87 Hodapp87 Awaiting requested review from Hodapp87

Assignees
No one assigned
Labels
2.status: merge conflict 10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@gebner @r-rmcgibbo @risicle @onny @SuperSandro2000 @bobby285271