diff options
| author | Vladimír Čunát <v@cunat.cz> | 2022-04-30 23:02:28 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2022-04-30 23:02:28 +0200 |
| commit | c480cc28958dd852aa1acb29dee80d5324b3571e (patch) | |
| tree | e96e973d9009044d6e088db4ba7113382a4312ce /pkgs/applications/graphics | |
| parent | 6431e183cd9b67801ed4b6760649e639d2cb2f84 (diff) | |
| parent | 16cdb34f95601222a19f1f9f8d041dc192d83619 (diff) | |
Merge branch 'master' into staging-next-2022-04-23
Diffstat (limited to 'pkgs/applications/graphics')
| -rw-r--r-- | pkgs/applications/graphics/cloudcompare/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/applications/graphics/ovito/default.nix | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/applications/graphics/cloudcompare/default.nix b/pkgs/applications/graphics/cloudcompare/default.nix index 6a6820240f4a9..1d5556b6a8b50 100644 --- a/pkgs/applications/graphics/cloudcompare/default.nix +++ b/pkgs/applications/graphics/cloudcompare/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , mkDerivation , fetchFromGitHub , fetchpatch @@ -114,5 +115,6 @@ mkDerivation rec { license = licenses.gpl2Plus; maintainers = with maintainers; [ nh2 ]; platforms = with platforms; linux; # only tested here; might work on others + broken = stdenv.isLinux; # plugins/core/IO/qPDALIO/CMakeFiles/QPDAL_IO_PLUGIN.dir/src/LASFilter.cpp.o] Error 1 }; } diff --git a/pkgs/applications/graphics/ovito/default.nix b/pkgs/applications/graphics/ovito/default.nix index 45457ad8ebb11..2a8c9afbd26ba 100644 --- a/pkgs/applications/graphics/ovito/default.nix +++ b/pkgs/applications/graphics/ovito/default.nix @@ -21,13 +21,13 @@ mkDerivation rec { pname = "ovito"; - version = "3.6.0"; + version = "3.7.1"; src = fetchFromGitLab { owner = "stuko"; repo = "ovito"; rev = "v${version}"; - sha256 = "sha256-yQ8gSe/QM1RRNxk4bDJ+K5QX0eYjZ+iG3QOHj01tJhY="; + sha256 = "sha256-6b/yqfrpeZ6i6DoPe3lcftvuzwvK7rfZhgyHc9GtyBs="; }; nativeBuildInputs = [ |