Merge pull request #19199 from wizeman/u/fix-help2man-hash

help2man: fix hash

8 files changed, 77 insertions, 9 deletions

diff --git a/pkgs/development/libraries/botan/unstable.nix b/pkgs/development/libraries/botan/unstable.nix
index 170e7a757490..71366ed32ad8 100644
--- a/pkgs/development/libraries/botan/unstable.nix
+++ b/pkgs/development/libraries/botan/unstable.nix
@@ -2,8 +2,8 @@
 
 callPackage ./generic.nix (args // {
   baseVersion = "1.11";
-  revision = "31";
-  sha256 = "1vnx75g5zzzbgsrwnmnhqdal29gcn63g0ldyj0g9cky8ha8iqx8f";
+  revision = "32";
+  sha256 = "0b4wgqyv6accsdh7fgr9as34r38f8r9024i6s3vhah6wiah7kddn";
   openssl = null;
   postPatch = "sed '1i#include <cmath>' -i src/tests/test_bigint.cpp";
 })
diff --git a/pkgs/development/libraries/libdvdcss/default.nix b/pkgs/development/libraries/libdvdcss/default.nix
index ae3ae407a923..63978cfd740f 100644
--- a/pkgs/development/libraries/libdvdcss/default.nix
+++ b/pkgs/development/libraries/libdvdcss/default.nix
@@ -1,9 +1,11 @@
-{ stdenv, fetchurl }:
+{stdenv, fetchurl, IOKit}:
 
 stdenv.mkDerivation rec {
   name = "libdvdcss-${version}";
   version = "1.4.0";
 
+  buildInputs = stdenv.lib.optional stdenv.isDarwin IOKit;
+
   src = fetchurl {
     url = "http://get.videolan.org/libdvdcss/${version}/${name}.tar.bz2";
     sha256 = "0nl45ifc4xcb196snv9d6hinfw614cqpzcqp92dg43c0hickg290";
@@ -13,6 +15,6 @@ stdenv.mkDerivation rec {
     homepage = http://www.videolan.org/developers/libdvdcss.html;
     description = "A library for decrypting DVDs";
     license = licenses.gpl2;
-    platforms = platforms.linux;
+    platforms = with platforms; linux ++ darwin;
   };
 }
diff --git a/pkgs/development/libraries/linenoise/create-pkg-config-file.sh b/pkgs/development/libraries/linenoise/create-pkg-config-file.sh
new file mode 100755
index 000000000000..e3c38f05ab4c
--- /dev/null
+++ b/pkgs/development/libraries/linenoise/create-pkg-config-file.sh
@@ -0,0 +1,13 @@
+cat <<EOF > linenoise.pc
+prefix=$out
+exec_prefix=\${prefix}
+libdir=\${exec_prefix}/lib
+includedir=\${prefix}/include
+
+Name: linenoise
+Description: A minimal, zero-config, BSD licensed, readline replacement.
+Requires:
+Version: 1.0.10
+Cflags: -I\${includedir}/ \${prefix}/src/linenoise.c
+
+EOF
diff --git a/pkgs/development/libraries/linenoise/default.nix b/pkgs/development/libraries/linenoise/default.nix
new file mode 100644
index 000000000000..6bbcc725f22f
--- /dev/null
+++ b/pkgs/development/libraries/linenoise/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+  name = "linenoise-${version}";
+  version = "1.0.10";  # Its version 1.0 plus 10 commits
+
+  src = fetchFromGitHub {
+    owner = "antirez";
+    repo = "linenoise";
+    rev = "c894b9e59f02203dbe4e2be657572cf88c4230c3";
+    sha256 = "0wasql7ph5g473zxhc2z47z3pjp42q0dsn4gpijwzbxawid71b4w";
+  };
+
+  buildPhase = ./create-pkg-config-file.sh;
+
+  installPhase = ''
+    mkdir -p $out/{lib/pkgconfig,src,include}
+    cp linenoise.c $out/src/
+    cp linenoise.h $out/include/
+    cp linenoise.pc $out/lib/pkgconfig/
+  '';
+
+  meta = {
+    homepage = https://github.com/antirez/linenoise;
+    description = "A minimal, zero-config, BSD licensed, readline replacement";
+    maintainers = with stdenv.lib.maintainers; [ mpsyco ];
+    platforms = stdenv.lib.platforms.unix;
+    license = stdenv.lib.licenses.bsd2;
+  };
+}
diff --git a/pkgs/development/libraries/movit/default.nix b/pkgs/development/libraries/movit/default.nix
index fdb31293f378..907e628b767c 100644
--- a/pkgs/development/libraries/movit/default.nix
+++ b/pkgs/development/libraries/movit/default.nix
@@ -9,6 +9,8 @@ stdenv.mkDerivation rec {
     sha256 = "0wyl5xl4pkw17pkxsdg8idqvsgm4fxapd0r4dw9wlxw250915nmf";
   };
 
+  outputs = [ "out" "dev" ];
+
   GTEST_DIR = "${gtest}";
 
   propagatedBuildInputs = [ eigen epoxy ];
diff --git a/pkgs/development/libraries/opencv/default.nix b/pkgs/development/libraries/opencv/default.nix
index d7f4367739f3..fd66d5bd41ea 100644
--- a/pkgs/development/libraries/opencv/default.nix
+++ b/pkgs/development/libraries/opencv/default.nix
@@ -28,6 +28,14 @@ stdenv.mkDerivation rec {
     sha256 = "1k29rxlvrhgc5hadg2nc50wa3d2ls9ndp373257p756a0aividxh";
   };
 
+  patches =
+    [ # Don't include a copy of the CMake status output in the
+      # build. This causes a runtime dependency on GCC.
+      ./no-build-info.patch
+    ];
+
+  outputs = [ "out" "dev" ];
+
   buildInputs =
        [ zlib ]
     ++ lib.optional enablePython pythonPackages.python
diff --git a/pkgs/development/libraries/opencv/no-build-info.patch b/pkgs/development/libraries/opencv/no-build-info.patch
new file mode 100644
index 000000000000..4ee9701583a0
--- /dev/null
+++ b/pkgs/development/libraries/opencv/no-build-info.patch
@@ -0,0 +1,14 @@
+diff -ru -x '*~' opencv-2.4.13-orig/modules/core/src/system.cpp opencv-2.4.13/modules/core/src/system.cpp
+--- opencv-2.4.13-orig/modules/core/src/system.cpp	1970-01-01 01:00:01.000000000 +0100
++++ opencv-2.4.13/modules/core/src/system.cpp	2016-10-02 18:44:53.674181762 +0200
+@@ -442,9 +442,7 @@
+ 
+ const std::string& getBuildInformation()
+ {
+-    static std::string build_info =
+-#include "version_string.inc"
+-    ;
++    static std::string build_info = "(build info elided)";
+     return build_info;
+ }
+ 
diff --git a/pkgs/development/libraries/vtk/default.nix b/pkgs/development/libraries/vtk/default.nix
index e91d5b8d3979..083f4a9140a1 100644
--- a/pkgs/development/libraries/vtk/default.nix
+++ b/pkgs/development/libraries/vtk/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, fetchpatch, cmake, mesa, libX11, xproto, libXt
 , qtLib ? null
 # Darwin support
-, Cocoa, CoreServices, DiskArbitration, IOKit, CFNetwork, Security, GLUT
+, Cocoa, CoreServices, DiskArbitration, IOKit, CFNetwork, Security, GLUT, OpenGL
 , ApplicationServices, CoreText, IOSurface, cf-private, ImageIO, xpc, libobjc }:
 
 with stdenv.lib;
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
     then [ cmake mesa libX11 xproto libXt ] ++ optional (qtLib != null) qtLib
     else [ cmake qtLib xpc CoreServices DiskArbitration IOKit cf-private
            CFNetwork Security ApplicationServices CoreText IOSurface ImageIO
-           GLUT ];
+           OpenGL GLUT ];
   propagatedBuildInputs = stdenv.lib.optionals stdenv.isDarwin [ Cocoa libobjc ];
 
 
@@ -42,9 +42,8 @@ stdenv.mkDerivation rec {
     ++ optional (qtLib != null) [ "-DVTK_USE_QT:BOOL=ON" ]
     ++ optional stdenv.isDarwin [ "-DBUILD_TESTING:BOOL=OFF"
                                   "-DCMAKE_OSX_SYSROOT="
-                                  "-DCMAKE_OSX_DEPLOYMENT_TARGET=" ];
-
-  doCheck = !stdenv.isDarwin;
+                                  "-DCMAKE_OSX_DEPLOYMENT_TARGET="
+                                  "-DOPENGL_INCLUDE_DIR=${OpenGL}/Library/Frameworks" ];
 
   postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
     sed -i 's|COMMAND vtkHashSource|COMMAND "DYLD_LIBRARY_PATH=''${VTK_BINARY_DIR}/lib" ''${VTK_BINARY_DIR}/bin/vtkHashSource-7.0|' ./Parallel/Core/CMakeLists.txt