From 57a84615c62741957cdc9bc9c80bf07523a85341 Mon Sep 17 00:00:00 2001
From: Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>
Date: Sun, 9 Nov 2014 12:59:32 +0000
Subject: vite: fix and update package

---
 pkgs/applications/science/misc/vite/default.nix    | 34 +++++++++-------------
 .../science/misc/vite/larger-line-buffer.patch     | 14 ---------
 pkgs/top-level/all-packages.nix                    |  2 +-
 3 files changed, 15 insertions(+), 35 deletions(-)
 delete mode 100644 pkgs/applications/science/misc/vite/larger-line-buffer.patch

(limited to 'pkgs')

diff --git a/pkgs/applications/science/misc/vite/default.nix b/pkgs/applications/science/misc/vite/default.nix
index 42c72fa47d41..8537ea171b3c 100644
--- a/pkgs/applications/science/misc/vite/default.nix
+++ b/pkgs/applications/science/misc/vite/default.nix
@@ -2,10 +2,10 @@
 
 # ViTE 1.1 has several bugs, so use the SVN version.
 let
-  rev = "1143";
+  rev = "1543";
   externals = fetchsvn {
     url = "svn://scm.gforge.inria.fr/svn/vite/externals";
-    sha256 = "0wg3yh5q8gx7189rvkd8achld7bzp0i7qqn6c77pg767b4b8dh1a";
+    sha256 = "1a422n3dp72v4visq5b1i21cf8sj12903sgg5v2hah3sgk02dnyz";
     inherit rev;
   };
 in
@@ -14,16 +14,14 @@ stdenv.mkDerivation {
 
   src = fetchsvn {
     url = "svn://scm.gforge.inria.fr/svn/vite/trunk";
-    sha256 = "0cy9b6isiwqwnv9gk0cg97x370fpwyccljadds4a118k5gh58zw4";
+    sha256 = "02479dv96h29d0w0svp42mjjrxhmv8lkkqp30w7mlx5gr2g0v7lf";
     inherit rev;
   };
 
-  preConfigure =
-    '' rm -v externals
-       ln -sv "${externals}" externals
-    '';
-
-  patches = [ ./larger-line-buffer.patch ];
+  preConfigure = ''
+    rm -rv externals
+    ln -sv "${externals}" externals
+  '';
 
   buildInputs = [ cmake qt4 mesa ];
 
@@ -32,19 +30,15 @@ stdenv.mkDerivation {
   meta = {
     description = "Visual Trace Explorer (ViTE), a tool to visualize execution traces";
 
-    longDescription =
-      '' ViTE is a trace explorer. It is a tool to visualize execution traces
-         in Pajé or OTF format for debugging and profiling parallel or
-         distributed applications.
-      '';
+    longDescription = ''
+      ViTE is a trace explorer. It is a tool to visualize execution
+      traces in Pajé or OTF format for debugging and profiling
+      parallel or distributed applications.
+    '';
 
     homepage = http://vite.gforge.inria.fr/;
-
     license = stdenv.lib.licenses.cecill20;
-
-    maintainers = [ stdenv.lib.maintainers.ludo ];
-    platforms = stdenv.lib.platforms.gnu;  # arbitrary choice
-
-    broken = true;
+    maintainers = with stdenv.lib.maintainers; [ ludo fuuzetsu ];
+    platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/applications/science/misc/vite/larger-line-buffer.patch b/pkgs/applications/science/misc/vite/larger-line-buffer.patch
deleted file mode 100644
index 7934c0085c19..000000000000
--- a/pkgs/applications/science/misc/vite/larger-line-buffer.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-ViTE has an arbitrary restriction on the length of lines read by the parser.
-Make it larger.
-
---- a/src/parser/PajeFileManager.hpp
-+++ b/src/parser/PajeFileManager.hpp
-@@ -67,7 +67,7 @@
-  
- #include <string.h>
- 
--#define _PAJE_BUFSIZE  256
-+#define _PAJE_BUFSIZE  16384
- #define _PAJE_NBMAXTKS  16
- 
- /**
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1231314129e4..6a683b757b87 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12217,7 +12217,7 @@ let
 
   tulip = callPackage ../applications/science/misc/tulip { };
 
-  vite = callPackage ../applications/science/misc/vite { };
+  vite = enableDebugging (callPackage ../applications/science/misc/vite { });
 
   xplanet = callPackage ../applications/science/astronomy/xplanet { };
 
-- 
cgit 1.4.1