Merge remote-tracking branch 'origin/master' into staging

10 files changed, 123 insertions, 21 deletions

diff --git a/pkgs/development/idris-modules/wl-pprint.nix b/pkgs/development/idris-modules/wl-pprint.nix
index 66dd4cefe482..12e9b28d81c0 100644
--- a/pkgs/development/idris-modules/wl-pprint.nix
+++ b/pkgs/development/idris-modules/wl-pprint.nix
@@ -4,25 +4,27 @@
 , base
 , lib
 , idris
-}: build-idris-package {
-  name = "wl-pprint";
+}:
+build-idris-package {
+  name = "wl-pprint-2016-09-28";
 
   src = fetchFromGitHub {
     owner = "shayan-najd";
     repo = "wl-pprint";
-    rev = "120f654b0b9838b57e10b163d3562d959439fb07";
-    sha256 = "1yymdl251zla6hv9rcg06x73gbp6xb0n6f6a02bsy5fqfmrfngcl";
+    rev = "4cc88a0865620a3b997863e4167d3b98e1a41b52";
+    sha256 = "1yxxh366k5njad75r0xci2q5c554cddvzgrwk43b0xn8rq0vm11x";
   };
 
+  # The tests for this package fail. We should attempt to enable them when
+  # updating this package again.
+  doCheck = false;
+
   propagatedBuildInputs = [ prelude base ];
 
   meta = {
     description = "Wadler-Leijen pretty-printing library";
-
     homepage = https://github.com/shayan-najd/wl-pprint;
-
     license = lib.licenses.bsd2;
-
     inherit (idris.meta) platforms;
   };
 }
diff --git a/pkgs/development/libraries/crypto++/default.nix b/pkgs/development/libraries/crypto++/default.nix
index 940af8c44e91..6fbd9451c564 100644
--- a/pkgs/development/libraries/crypto++/default.nix
+++ b/pkgs/development/libraries/crypto++/default.nix
@@ -45,6 +45,8 @@ stdenv.mkDerivation rec {
     license = licenses.boost;
     platforms = platforms.all;
     maintainers = [ ];
+    # Marked as broken due to needing an update for security issues.
+    # See: https://github.com/NixOS/nixpkgs/issues/18856
+    broken = true;
   };
 }
-
diff --git a/pkgs/development/libraries/fribidi/default.nix b/pkgs/development/libraries/fribidi/default.nix
index 35d67b633097..bdfbb97f0218 100644
--- a/pkgs/development/libraries/fribidi/default.nix
+++ b/pkgs/development/libraries/fribidi/default.nix
@@ -2,15 +2,17 @@
 
 stdenv.mkDerivation rec {
   name = "fribidi-${version}";
-  version = "0.19.6";
+  version = "0.19.7";
 
   src = fetchurl {
     url = "http://fribidi.org/download/${name}.tar.bz2";
-    sha256 = "0zg1hpaml34ny74fif97j7ngrshlkl3wk3nja3gmlzl17i1bga6b";
+    sha256 = "13jsb5qadlhsaxkbrb49nqslmbh904vvzhsm5mm2ghmv29i2l8h8";
   };
 
   hardeningDisable = [ "format" ];
 
+  outputs = [ "out" "devdoc" ];
+
   meta = with stdenv.lib; {
     homepage = http://fribidi.org/;
     description = "GNU implementation of the Unicode Bidirectional Algorithm (bidi)";
diff --git a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-base/default.nix b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-base/default.nix
index eb55ae874e5a..0e1e3c4897eb 100644
--- a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-base/default.nix
+++ b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-base/default.nix
@@ -24,6 +24,8 @@ stdenv.mkDerivation rec {
     patch -p1 < ${./gcc-4.9.patch}
   '';
 
+  outputs = [ "out" "dev" ];
+
   # TODO : v4l, libvisual
   buildInputs =
     [ pkgconfig glib cairo orc ]
diff --git a/pkgs/development/libraries/gstreamer/legacy/gstreamer/default.nix b/pkgs/development/libraries/gstreamer/legacy/gstreamer/default.nix
index adda7697ffcb..304d02087b49 100644
--- a/pkgs/development/libraries/gstreamer/legacy/gstreamer/default.nix
+++ b/pkgs/development/libraries/gstreamer/legacy/gstreamer/default.nix
@@ -11,6 +11,8 @@ stdenv.mkDerivation rec {
     sha256 = "1nkid1n2l3rrlmq5qrf5yy06grrkwjh3yxl5g0w58w0pih8allci";
   };
 
+  outputs = [ "out" "dev" ];
+
   buildInputs = [ perl bison flex pkgconfig ];
   propagatedBuildInputs = [ glib libxml2 ] ++ libintlOrEmpty;
 
diff --git a/pkgs/development/libraries/libui/default.nix b/pkgs/development/libraries/libui/default.nix
index 50c42f4f10b2..4db641868508 100644
--- a/pkgs/development/libraries/libui/default.nix
+++ b/pkgs/development/libraries/libui/default.nix
@@ -1,8 +1,9 @@
-{ stdenv, fetchgit, cmake, pkgconfig, gtk3 }:
+{ stdenv, fetchgit, cmake, pkgconfig, gtk3, darwin }:
 
 let
   shortName = "libui";
   version   = "3.1a";
+  backend   = if stdenv.isDarwin then "darwin" else "unix";
 in
   stdenv.mkDerivation rec {
     name = "${shortName}-${version}";
@@ -12,27 +13,42 @@ in
       sha256 = "1lpbfa298c61aarlzgp7vghrmxg1274pzxh1j9isv8x758gk6mfn";
     };
 
-    buildInputs = [ cmake pkgconfig gtk3 ];
+    buildInputs = [ cmake pkgconfig ] ++
+      (if stdenv.isDarwin then [darwin.apple_sdk.frameworks.Cocoa] else [gtk3]);
+
+    preConfigure = stdenv.lib.optionalString stdenv.isDarwin ''
+      sed -i 's/set(CMAKE_OSX_DEPLOYMENT_TARGET "10.8")//' ./CMakeLists.txt
+    '';
+    cmakeFlags = stdenv.lib.optionals stdenv.isDarwin [
+      "-DCMAKE_OSX_SYSROOT="
+      "-DCMAKE_OSX_DEPLOYMENT_TARGET="
+    ];
 
     installPhase = ''
       mkdir -p $out/{include,lib}
       mkdir -p $out/lib/pkgconfig
-
+    '' + stdenv.lib.optionalString stdenv.isLinux ''
       mv ./out/${shortName}.so.0 $out/lib/
       ln -s $out/lib/${shortName}.so.0 $out/lib/${shortName}.so
-
+    '' + stdenv.lib.optionalString stdenv.isDarwin ''
+      mv ./out/${shortName}.A.dylib $out/lib/
+      ln -s $out/lib/${shortName}.A.dylib $out/lib/${shortName}.dylib
+    '' + ''
       cp $src/ui.h $out/include
-      cp $src/ui_unix.h $out/include
+      cp $src/ui_${backend}.h $out/include
 
       cp ${./libui.pc} $out/lib/pkgconfig/${shortName}.pc
       substituteInPlace $out/lib/pkgconfig/${shortName}.pc \
         --subst-var-by out $out \
         --subst-var-by version "${version}"
     '';
+    postInstall = stdenv.lib.optionalString stdenv.isDarwin ''
+      install_name_tool -id $out/lib/${shortName}.A.dylib $out/lib/${shortName}.A.dylib
+    '';
 
     meta = {
       homepage    = https://github.com/andlabs/libui;
       description = "Simple and portable (but not inflexible) GUI library in C that uses the native GUI technologies of each platform it supports.";
-      platforms   = stdenv.lib.platforms.linux;
+      platforms   = stdenv.lib.platforms.unix;
     };
   }
diff --git a/pkgs/development/libraries/polkit-qt-1/qt-4.nix b/pkgs/development/libraries/polkit-qt-1/qt-4.nix
index 523189c3b2e5..54e10b965926 100644
--- a/pkgs/development/libraries/polkit-qt-1/qt-4.nix
+++ b/pkgs/development/libraries/polkit-qt-1/qt-4.nix
@@ -10,10 +10,21 @@ stdenv.mkDerivation {
     sha256 = "1ip78x20hjqvm08kxhp6gb8hf6k5n6sxyx6kk2yvvq53djzh7yv7";
   };
 
+  outputs = [ "out" "dev" ];
+
   nativeBuildInputs = [ cmake pkgconfig automoc4 ];
 
   propagatedBuildInputs = [ polkit glib qt4 ];
 
+  postFixup =
+    ''
+      for i in $dev/lib/cmake/*/*.cmake; do
+        echo "fixing $i"
+        substituteInPlace $i \
+          --replace "\''${PACKAGE_PREFIX_DIR}/lib" $out/lib
+      done
+    '';
+
   meta = {
     description = "A Qt wrapper around PolKit";
     maintainers = with stdenv.lib.maintainers; [ ttuegel ];
diff --git a/pkgs/development/libraries/qt-4.x/4.8/default.nix b/pkgs/development/libraries/qt-4.x/4.8/default.nix
index a93ae2fc8adf..8526a5f5b829 100644
--- a/pkgs/development/libraries/qt-4.x/4.8/default.nix
+++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix
@@ -36,6 +36,12 @@ stdenv.mkDerivation rec {
     sha256 = "183fca7n7439nlhxyg1z7aky0izgbyll3iwakw4gwivy16aj5272";
   };
 
+  outputs = [ "out" "dev" ];
+
+  outputInclude = "out";
+
+  setOutputFlags = false;
+
   # The version property must be kept because it will be included into the QtSDK package name
   version = vers;
 
@@ -87,8 +93,8 @@ stdenv.mkDerivation rec {
       -docdir $out/share/doc/${name}
       -plugindir $out/lib/qt4/plugins
       -importdir $out/lib/qt4/imports
-      -examplesdir $out/share/doc/${name}/examples
-      -demosdir $out/share/doc/${name}/demos
+      -examplesdir $TMPDIR/share/doc/${name}/examples
+      -demosdir $TMPDIR/share/doc/${name}/demos
       -datadir $out/share/${name}
       -translationdir $out/share/${name}/translations
     "
@@ -98,6 +104,7 @@ stdenv.mkDerivation rec {
   '';
 
   prefixKey = "-prefix ";
+
   configureFlags =
     ''
       -v -no-separate-debug-info -release -no-fast -confirm-license -opensource
@@ -153,6 +160,11 @@ stdenv.mkDerivation rec {
     sed -i 's/^\(LIBS[[:space:]]*=.*$\)/\1 -lobjc/' ./src/corelib/Makefile.Release
   '';
 
+  postInstall =
+    ''
+      rm -rf $out/tests
+    '';
+
   crossAttrs = let
     isMingw = stdenv.cross.libc == "msvcrt";
   in {
diff --git a/pkgs/development/tools/misc/global/default.nix b/pkgs/development/tools/misc/global/default.nix
index 3d09bc92cd30..d609b3b664cc 100644
--- a/pkgs/development/tools/misc/global/default.nix
+++ b/pkgs/development/tools/misc/global/default.nix
@@ -3,11 +3,12 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "global-6.5.4";
+  name = "global-${version}";
+  version = "6.5.5";
 
   src = fetchurl {
     url = "mirror://gnu/global/${name}.tar.gz";
-    sha256 = "19hxajpwld6qx0faz4rzyh1hfs25ycjmws6bas8pavx4hskf05mg";
+    sha256 = "0yyg91qw8399lnxfai4bxkh9yq71qdwp9kvadgzp05cdqni44nxw";
   };
 
   nativeBuildInputs = [ libtool makeWrapper ];
@@ -51,7 +52,7 @@ stdenv.mkDerivation rec {
     '';
     homepage = http://www.gnu.org/software/global/;
     license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ pSub ];
+    maintainers = with maintainers; [ pSub peterhoeg ];
     platforms = platforms.unix;
   };
 }
diff --git a/pkgs/development/tools/profiling/systemtap/default.nix b/pkgs/development/tools/profiling/systemtap/default.nix
new file mode 100644
index 000000000000..b78727802454
--- /dev/null
+++ b/pkgs/development/tools/profiling/systemtap/default.nix
@@ -0,0 +1,52 @@
+{ fetchgit, pkgconfig, gettext, runCommand, makeWrapper
+, elfutils, kernel, gnumake }:
+let
+  ## fetchgit info
+  url = git://sourceware.org/git/systemtap.git;
+  rev = "a10bdceb7c9a7dc52c759288dd2e555afcc5184a";
+  sha256 = "1kllzfnh4ksis0673rma5psglahl6rvy0xs5v05qkqn6kl7irmg1";
+  version = "2016-09-16";
+
+  inherit (kernel) stdenv;
+  inherit (stdenv) lib;
+
+  ## stap binaries
+  stapBuild = stdenv.mkDerivation {
+    name = "systemtap-${version}";
+    src = fetchgit { inherit url rev sha256; };
+    buildInputs = [ elfutils pkgconfig gettext ];
+    enableParallelBuilding = true;
+  };
+
+  ## a kernel build dir as expected by systemtap
+  kernelBuildDir = runCommand "kbuild-${kernel.version}-merged" { } ''
+    mkdir -p $out
+    for f in \
+        ${kernel}/System.map \
+        ${kernel.dev}/vmlinux \
+        ${kernel.dev}/lib/modules/${kernel.modDirVersion}/build/{*,.*}
+    do
+      ln -s $(readlink -f $f) $out
+    done
+  '';
+
+in runCommand "systemtap-${kernel.version}-${version}" {
+  inherit stapBuild kernelBuildDir;
+  buildInputs = [ makeWrapper ];
+  meta = {
+    homepage = https://sourceware.org/systemtap/;
+    repositories.git = url;
+    description = "Provides a scripting language for instrumentation on a live kernel plus user-space";
+    license = lib.licenses.gpl2;
+    platforms = lib.platforms.linux;
+  };
+} ''
+  mkdir -p $out/bin
+  for bin in $stapBuild/bin/*; do # hello emacs */
+    ln -s $bin $out/bin
+  done
+  rm $out/bin/stap
+  makeWrapper $stapBuild/bin/stap $out/bin/stap \
+    --add-flags "-r $kernelBuildDir" \
+    --prefix PATH : ${lib.makeBinPath [ stdenv.cc.cc elfutils gnumake ]}
+''