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

Conflicts:
      pkgs/development/libraries/qt-5/5.7/qtbase/default.nix

pkgs/tools/compression/bsc/default.nix

@@ -0,0 +1,25 @@
+{ stdenv, fetchurl } :
+
+stdenv.mkDerivation rec {
+  name = "bsc-${version}";
+  version = "3.1.0";
+
+  src = fetchurl {
+    url = "https://github.com/IlyaGrebnov/libbsc/archive/${version}.tar.gz";
+    sha256 = "01yhizaf6qjv1plyrx0fcib264maa5qwvgfvvid9rzlzj9fxjib6";
+  };
+
+  enableParallelBuilding = true;
+
+  preInstall = ''
+    makeFlagsArray+=("PREFIX=$out")
+  '';
+
+  meta = with stdenv.lib; {
+    description = "High performance block-sorting data compression library";
+    homepage = http://libbsc.com/;
+    # Later commits changed the licence to Apache2 (no release yet, though)
+    license = with licenses; [ lgpl3Plus ];
+    platforms = platforms.unix;
+  };
+}

pkgs/tools/compression/lzham/default.nix

@@ -0,0 +1,28 @@
+{ stdenv, fetchFromGitHub, cmake } :
+
+stdenv.mkDerivation rec {
+  name = "lzham-1.0";
+
+  src = fetchFromGitHub {
+    owner = "richgel999";
+    repo = "lzham_codec";
+    rev = "v1_0_release";
+    sha256 = "14c1zvzmp1ylp4pgayfdfk1kqjb23xj4f7ll1ra7b18wjxc9ja1v";
+  };
+
+  buildInputs = [ cmake ];
+
+  enableParallelBuilding = true;
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp ../bin_linux/lzhamtest $out/bin
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Lossless data compression codec with LZMA-like ratios but 1.5x-8x faster decompression speed";
+    homepage = https://github.com/richgel999/lzham_codec;
+    license = with licenses; [ mit ];
+    platforms = platforms.linux;
+  };
+}