Merge branch 'master'

This commit is contained in:
Vladimír Čunát
2018-03-05 14:53:27 +01:00
1666 changed files with 26733 additions and 31238 deletions
@@ -2,11 +2,11 @@
}:
stdenv.mkDerivation rec {
version = "1.4.0";
version = "1.4.2";
name = "opencsg-${version}";
src = fetchurl {
url = "http://www.opencsg.org/OpenCSG-${version}.tar.gz";
sha256 = "13c73jxadm27h7spdh3qj1v6rnn81v4xwqlv5a6k72pv9kjnpd7c";
sha256 = "1ysazynm759gnw1rdhn9xw9nixnzrlzrc462340a6iif79fyqlnr";
};
buildInputs = [libGLU_combined freeglut glew libXmu libXext libX11];