Merge branch 'master'

2018-03-05 14:53:27 +01:00
parent 25a78f7234 97693915e1
commit 565bd805e6
1666 changed files with 26733 additions and 31238 deletions
@@ -1,13 +1,13 @@
 { fetchurl, stdenv, libxml2, freetype, libGLU_combined, glew, qt4
 , cmake, makeWrapper, libjpeg, python }:

-let version = "4.9.0"; in
+let version = "5.1.0"; in
 stdenv.mkDerivation rec {
  name = "tulip-${version}";

  src = fetchurl {
    url = "mirror://sourceforge/auber/${name}_src.tar.gz";
-    sha256 = "0phc7972brvm0v6lfk4ghq9b2b4jsj6c15xlbgnvhhcxhc99wba3";
+    sha256 = "1i70y8b39gkpxfalr9844pa3l4bnnyw5y7ngxdqibil96k2b9q9h";
  };

  buildInputs = [ libxml2 freetype glew libGLU_combined qt4 libjpeg python ];