From 781666da50653a58d3bed0c95cfbca2252aa8cca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Mon, 23 Feb 2015 10:20:12 +0100
Subject: [PATCH] octave: generate the documentation

I find octave quite unusable, without its help pages. Recently it started to
require gnuplot to generate them (even the text-only).

I also enabled parallel building. A comment from 2012 said about spurious
failures if it were enabled, but I don't know if these happen again. Let's
enable it to see.

(cherry picked from commit a6f1024b1f2235825d7b441125db2e0d42febdd1)

Conflicts:
	pkgs/top-level/all-packages.nix
---
 pkgs/development/interpreters/octave/default.nix | 4 +---
 pkgs/top-level/all-packages.nix                  | 1 -
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/development/interpreters/octave/default.nix b/pkgs/development/interpreters/octave/default.nix
index 7545e80fd117..dc3d700dc8e1 100644
--- a/pkgs/development/interpreters/octave/default.nix
+++ b/pkgs/development/interpreters/octave/default.nix
@@ -31,9 +31,7 @@ stdenv.mkDerivation rec {
   # there is a mysterious sh: command not found
   doCheck = false;
 
-  /* The build failed with a missing libranlib.la in hydra,
-     but worked on my computer. I think they have concurrency problems */
-  enableParallelBuilding = false;
+  enableParallelBuilding = true;
 
   configureFlags = [ "--enable-readline" "--enable-dl" ];
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 71d2c6434506..18d252fa49c1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4380,7 +4380,6 @@ let
     glpk = null;
     suitesparse = null;
     jdk = null;
-    gnuplot = null;
   };
   octaveFull = (lowPrio (callPackage ../development/interpreters/octave {
     fltk = fltk13;