Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 621c8f6b9b4d
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 64c2ffbe7551
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Jun 2, 2019

  1. osl: 1.10.4 -> 1.10.5 

    Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/openshadinglanguage/versions
    @r-ryantm
    r-ryantm committed Jun 2, 2019
    Copy the full SHA
    09d2e9f View commit details

Commits on Jun 9, 2019

  1. Merge pull request #62491 from r-ryantm/auto-update/openshadinglanguage 

    osl: 1.10.4 -> 1.10.5
    @ryantm
    ryantm authored Jun 9, 2019
    Copy the full SHA
    64c2ffb View commit details
Showing with 3 additions and 3 deletions.
  1. +3 −3 pkgs/development/compilers/osl/default.nix
6 changes: 3 additions & 3 deletions pkgs/development/compilers/osl/default.nix
View file
Original file line number Diff line number Diff line change
@@ -8,13 +8,13 @@ in clangStdenv.mkDerivation rec {
# In theory this could use GCC + Clang rather than just Clang,
# but https://github.com/NixOS/nixpkgs/issues/29877 stops this
name = "openshadinglanguage-${version}";
version = "1.10.4";
version = "1.10.5";

src = fetchFromGitHub {
owner = "imageworks";
repo = "OpenShadingLanguage";
rev = "Release-1.10.4";
sha256 = "0qarxlm139y5sb9dd9rrljb2xnz8mvyfj497via6yqgwy90zr26g";
rev = "Release-1.10.5";
sha256 = "1g7izkjqb5xmp87k2aw0fgkxhcf7b9jn9hi60lwav3yhs50j8qsi";
};

cmakeFlags = [ "-DUSE_BOOST_WAVE=ON" "-DENABLERTTI=ON" ];