diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index b717f3044bc..c0420d6ac67 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -10,15 +10,13 @@ with lib; stdenv.mkDerivation rec { - name = "blender-2.74"; + name = "blender-2.75"; src = fetchurl { url = "http://download.blender.org/source/${name}.tar.gz"; - sha256 = "178i19pz7jl79b4wn92869j6qymawsa0kaw1dxaprbjnqsvcx8qc"; + sha256 = "1r3qyj57g06ir424q7szxkyb6h0b7laq7f126158kgs94xpkhlsz"; }; - patches = [ ./sm52.patch ]; - buildInputs = [ SDL boost cmake ffmpeg gettext glew ilmbase libXi libjpeg libpng libsamplerate libsndfile libtiff mesa openal diff --git a/pkgs/applications/misc/blender/sm52.patch b/pkgs/applications/misc/blender/sm52.patch deleted file mode 100644 index 7cb86c53bdd..00000000000 --- a/pkgs/applications/misc/blender/sm52.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ru -x '*~' blender-2.73a-orig/CMakeLists.txt blender-2.73a/CMakeLists.txt ---- blender-2.73a-orig/CMakeLists.txt 2015-01-21 13:31:24.000000000 +0100 -+++ blender-2.73a/CMakeLists.txt 2015-03-01 23:14:22.962585422 +0100 -@@ -351,7 +351,7 @@ - option(WITH_CYCLES_STANDALONE_GUI "Build cycles standalone with GUI" OFF) - option(WITH_CYCLES_OSL "Build Cycles with OSL support" ${_init_CYCLES_OSL}) - option(WITH_CYCLES_CUDA_BINARIES "Build cycles CUDA binaries" OFF) --set(CYCLES_CUDA_BINARIES_ARCH sm_20 sm_21 sm_30 sm_35 sm_50 CACHE STRING "CUDA architectures to build binaries for") -+set(CYCLES_CUDA_BINARIES_ARCH sm_20 sm_21 sm_30 sm_35 sm_50 sm_52 CACHE STRING "CUDA architectures to build binaries for") - mark_as_advanced(CYCLES_CUDA_BINARIES_ARCH) - unset(PLATFORM_DEFAULT) - option(WITH_CYCLES_LOGGING "Build cycles with logging support" ON) diff --git a/pkgs/development/libraries/opencollada/default.nix b/pkgs/development/libraries/opencollada/default.nix index 20003f23874..eaa90efc131 100644 --- a/pkgs/development/libraries/opencollada/default.nix +++ b/pkgs/development/libraries/opencollada/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, cmake, pkgconfig, libxml2, pcre }: # The exact revision specified by Blender's install_deps.sh script. -let rev = "18da7f4109a8eafaa290a33f5550501cc4c8bae8"; in +let rev = "3335ac164e68b2512a40914b14c74db260e6ff7d"; in stdenv.mkDerivation { name = "opencollada-1.3-${rev}"; @@ -10,7 +10,7 @@ stdenv.mkDerivation { owner = "KhronosGroup"; repo = "OpenCOLLADA"; inherit rev; - sha256 = "0ach32ws95mh0ijd8sr22kxka3riq72bb9ng46vs3615dxn7h18d"; + sha256 = "0s2m8crbg1kf09hpscrplv65a45dlg157b9c20chrv7wy0qizbw5"; }; buildInputs = [ cmake pkgconfig ];