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

pkgs/applications/virtualization/cbfstool/default.nix

@@ -1,13 +1,12 @@
-{ stdenv, fetchgit, iasl, flex, bison }:
+{ stdenv, fetchurl, iasl, flex, bison }:
 
 stdenv.mkDerivation rec {
   name = "cbfstool-${version}";
-  version = "4.7";
+  version = "4.9";
 
-  src = fetchgit {
-    url = "http://review.coreboot.org/p/coreboot";
-    rev = "refs/tags/${version}";
-    sha256 = "02k63013vf7wgsilslj68fs1x81clvqpn91dydaqhv5aymh73zpi";
+  src = fetchurl {
+    url = "https://coreboot.org/releases/coreboot-${version}.tar.xz";
+    sha256 = "0xkai65d3z9fivwscbkm7ndcw2p9g794xz8fwdv979w77n5qsdij";
   };
 
   nativeBuildInputs = [ flex bison ];

pkgs/applications/virtualization/lkl/default.nix

@@ -30,7 +30,9 @@ stdenv.mkDerivation rec {
     cp tools/lkl/{cptofs,fs2tar,lklfuse} $out/bin
     ln -s cptofs $out/bin/cpfromfs
     cp -r tools/lkl/include $dev/
-    cp tools/lkl/liblkl*.{a,so} $lib/lib
+    cp tools/lkl/liblkl.a \
+       tools/lkl/lib/liblkl.so \
+       tools/lkl/lib/hijack/liblkl-hijack.so $lib/lib
   '';
 
   # We turn off format and fortify because of these errors (fortify implies -O2, which breaks the jitter entropy code):

pkgs/applications/virtualization/podman/default.nix

@@ -1,5 +1,6 @@
 { stdenv, fetchFromGitHub, pkgconfig
 , buildGoPackage, gpgme, lvm2, btrfs-progs, libseccomp
+, go-md2man
 }:
 
 buildGoPackage rec {
@@ -15,9 +16,11 @@ buildGoPackage rec {
 
   goPackagePath = "github.com/containers/libpod";
 
+  outputs = [ "bin" "out" "man" ];
+
   # Optimizations break compilation of libseccomp c bindings
   hardeningDisable = [ "fortify" ];
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkgconfig go-md2man ];
 
   buildInputs = [
     btrfs-progs libseccomp gpgme lvm2
@@ -26,11 +29,12 @@ buildGoPackage rec {
   buildPhase = ''
     pushd $NIX_BUILD_TOP/go/src/${goPackagePath}
     patchShebangs .
-    make binaries
+    make binaries docs
   '';
 
   installPhase = ''
     install -Dm555 bin/podman $bin/bin/podman
+    MANDIR=$man/share/man make install.man
   '';
 
   meta = with stdenv.lib; {

pkgs/applications/virtualization/qemu/default.nix

@@ -14,6 +14,7 @@
 , spiceSupport ? !stdenv.isDarwin, spice, spice-protocol
 , usbredirSupport ? spiceSupport, usbredir
 , xenSupport ? false, xen
+, cephSupport ? false, ceph
 , openGLSupport ? sdlSupport, mesa_noglu, epoxy, libdrm
 , virglSupport ? openGLSupport, virglrenderer
 , smbdSupport ? false, samba
@@ -63,6 +64,7 @@ stdenv.mkDerivation rec {
     ++ optionals usbredirSupport [ usbredir ]
     ++ optionals stdenv.isLinux [ alsaLib libaio libcap_ng libcap attr ]
     ++ optionals xenSupport [ xen ]
+    ++ optionals cephSupport [ ceph ]
     ++ optionals openGLSupport [ mesa_noglu epoxy libdrm ]
     ++ optionals virglSupport [ virglrenderer ]
     ++ optionals smbdSupport [ samba ];
@@ -117,6 +119,7 @@ stdenv.mkDerivation rec {
     ++ optional stdenv.isLinux "--enable-linux-aio"
     ++ optional gtkSupport "--enable-gtk"
     ++ optional xenSupport "--enable-xen"
+    ++ optional cephSupport "--enable-rbd"
     ++ optional openGLSupport "--enable-opengl"
     ++ optional virglSupport "--enable-virglrenderer"
     ++ optional smbdSupport "--smbd=${samba}/bin/smbd";

pkgs/applications/virtualization/singularity/default.nix

@@ -19,7 +19,7 @@
 
 stdenv.mkDerivation rec {
   name = "singularity-${version}";
-  version = "2.6.0";
+  version = "2.6.1";
 
   enableParallelBuilding = true;
 
@@ -28,6 +28,8 @@ stdenv.mkDerivation rec {
   preConfigure = ''
     sed -i 's/-static//g' src/Makefile.am
     patchShebangs .
+    substituteInPlace libexec/bootstrap-scripts/deffile-sections.sh \
+      --replace /bin/cp ${coreutils}/bin/cp
   '';
 
   configureFlags = [ "--localstatedir=/var" ];
@@ -47,7 +49,7 @@ stdenv.mkDerivation rec {
     owner = "singularityware";
     repo = "singularity";
     rev = version;
-    sha256 = "0bi7acgppbkfbra8r29s1ldq02lazdww0z2h1rfvv8spr8dzzi94";
+    sha256 = "0q8qq9l3s6mv74km9h8gsn5mpd0m98dhmx8vph1jp6wnrr4xyfqf";
   };
 
   nativeBuildInputs = [ autoreconfHook makeWrapper ];