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

6 files changed, 12 insertions, 124 deletions

diff --git a/pkgs/os-specific/linux/fusionio/srcs.nix b/pkgs/os-specific/linux/fusionio/srcs.nix
deleted file mode 100644
index fb632a6e9fba9..0000000000000
--- a/pkgs/os-specific/linux/fusionio/srcs.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ fetchurl }:
-rec {
-  version = "3.2.10";
-
-  libvsl = fetchurl {
-    name = "fusionio-libvsl-${version}.deb";
-    url = "https://drive.google.com/uc?export=download&id=0B7U0_ZBLoB2Wc01uNk1nVURMVFk";
-    sha256 = "1i8ii9dlyskj2dvad7nfvlm1wz2s4gy5llbl29hfa13w6nhcl5wk";
-  };
-
-  util = fetchurl {
-    name = "fusionio-util-${version}.deb";
-    url = "https://drive.google.com/uc?export=download&id=0B7U0_ZBLoB2WbDVuQkwzWjZONGs";
-    sha256 = "0aw64kk5cwchjhqh5n1lpqrrh5gn4qdalnmasd25z7sijy2flxgq";
-  };
-
-  vsl = fetchurl {
-    name = "fusionio-iomemory-vsl-${version}.tar.gz";
-    url = "https://drive.google.com/uc?export=download&id=0B7U0_ZBLoB2WbXFMbExEMUFCcWM";
-    sha256 = "1zm20aa1jmmqcqkb4p9r4jsgbg371zr1abdz32rw02i9687fsgcc";
-  };
-}
diff --git a/pkgs/os-specific/linux/fusionio/util.nix b/pkgs/os-specific/linux/fusionio/util.nix
deleted file mode 100644
index 6327a95f39d71..0000000000000
--- a/pkgs/os-specific/linux/fusionio/util.nix
+++ /dev/null
@@ -1,45 +0,0 @@
-{ stdenv, fetchurl, dpkg, glibc, gcc, libuuid }:
-
-let
-  srcs = import ./srcs.nix { inherit fetchurl; };
-in
-stdenv.mkDerivation {
-  name = "fusionio-util-${srcs.version}";
-
-  nativeBuildInputs = [ dpkg ];
-
-  buildCommand = ''
-    dpkg-deb -R ${srcs.libvsl} $TMPDIR
-    dpkg-deb -R ${srcs.util} $TMPDIR
-
-    rm $TMPDIR/usr/bin/fio-{bugreport,sanitize}
-
-    mkdir -p $out
-    cp -r $TMPDIR/{etc,usr/{bin,lib,share}} $out
-    for BIN in $(find $out/bin -type f); do
-      echo Patching $BIN
-      patchelf --set-interpreter "${glibc.out}/lib/ld-linux-x86-64.so.2" --set-rpath "${stdenv.lib.makeLibraryPath [ glibc gcc.cc libuuid ] }:$out/lib" $BIN
-
-      # Test our binary to see if it was correctly patched
-      set +e
-      $BIN --help >/dev/null 2>&1
-      ST="$?"
-      set -e
-      if [ "$ST" -ge "10" ]; then
-        echo "Failed testing $BIN"
-        exit 1;
-      fi
-    done
-  '';
-
-  dontStrip = true;
-
-  meta = with stdenv.lib; {
-    homepage = http://fusionio.com;
-    description = "Fusionio command line utilities";
-    license = licenses.unfree;
-    platforms = [ "x86_64-linux" ];
-    broken = stdenv.hostPlatform.system != "x86_64-linux";
-    maintainers = with maintainers; [ wkennington ];
-  };
-}
diff --git a/pkgs/os-specific/linux/fusionio/vsl-fix-file-inode.patch b/pkgs/os-specific/linux/fusionio/vsl-fix-file-inode.patch
deleted file mode 100644
index 25887ceee0f67..0000000000000
--- a/pkgs/os-specific/linux/fusionio/vsl-fix-file-inode.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/kfile.c b/kfile.c
-index 5014e77..a65d921 100644
---- a/kfile.c
-+++ b/kfile.c
-@@ -51,7 +51,7 @@ fusion_inode * noinline kfio_fs_inode(fusion_file *fp)
- #if KFIOC_STRUCT_FILE_HAS_PATH
-     return (fusion_inode *) ((struct file *)fp)->f_path.dentry->d_inode;
- #else
--    return (fusion_inode *) ((struct file *)fp)->f_dentry->d_inode;
-+    return (fusion_inode *) file_inode((struct file *)fp);
- #endif
- }
- 
diff --git a/pkgs/os-specific/linux/fusionio/vsl.nix b/pkgs/os-specific/linux/fusionio/vsl.nix
deleted file mode 100644
index 6ebe2e0cdaf5a..0000000000000
--- a/pkgs/os-specific/linux/fusionio/vsl.nix
+++ /dev/null
@@ -1,39 +0,0 @@
-{ stdenv, fetchurl, kernel }:
-
-let
-  srcs = import ./srcs.nix { inherit fetchurl; };
-in
-stdenv.mkDerivation rec {
-  name = "fusionio-iomemory-vsl-${srcs.version}";
-
-  src = srcs.vsl;
-
-  hardeningDisable = [ "pic" ];
-
-  prePatch = ''
-    cd root/usr/src/iomemory-vsl-*
-  '';
-
-  patches = stdenv.lib.optional (stdenv.lib.versionAtLeast kernel.version "3.19") ./vsl-fix-file-inode.patch;
-
-  preBuild = ''
-    sed -i Makefile kfio_config.sh \
-      -e "s,\(KERNELDIR=\"\|KERNEL_SRC =\)[^\"]*,\1${kernel.dev}/lib/modules/${kernel.modDirVersion}/build,g"
-    export DKMS_KERNEL_VERSION=${kernel.modDirVersion}
-    export TARGET="x86_64_cc48"
-  '';
-
-  installPhase = ''
-    export INSTALL_ROOT=$out
-    make modules_install
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = http://fusionio.com;
-    description = "Kernel driver for accessing fusion-io cards";
-    license = licenses.unfree;
-    platforms = [ "x86_64-linux" ];
-    broken = stdenv.hostPlatform.system != "x86_64-linux";
-    maintainers = with maintainers; [ wkennington ];
-  };
-}
diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index b94e34c8f6c43..ec9aed402bf47 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -641,6 +641,7 @@ let
       MEGARAID_NEWGEN       = yes;
 
       MLX4_EN_VXLAN = whenOlder "4.8" yes;
+      MLX5_CORE_EN       = option yes;
 
       MODVERSIONS        = whenOlder "4.9" yes;
       MOUSE_PS2_ELANTECH = yes; # Elantech PS/2 protocol extension
diff --git a/pkgs/os-specific/linux/reptyr/default.nix b/pkgs/os-specific/linux/reptyr/default.nix
index d8880542e5185..37f1362e14ead 100644
--- a/pkgs/os-specific/linux/reptyr/default.nix
+++ b/pkgs/os-specific/linux/reptyr/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub }:
+{ stdenv, lib, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
   version = "0.6.2";
@@ -20,9 +20,15 @@ stdenv.mkDerivation rec {
 
   makeFlags = ["PREFIX=$(out)"];
   meta = {
-    platforms = [ "i686-linux" "x86_64-linux" ];
-    maintainers = with stdenv.lib.maintainers; [raskin];
-    license = stdenv.lib.licenses.mit;
-    description = ''A Linux tool to change controlling pty of a process'';
+    platforms = [
+      "i686-linux"
+      "x86_64-linux"
+      "i686-freebsd"
+      "x86_64-freebsd"
+    ] ++ lib.platforms.arm;
+    maintainers = with lib.maintainers; [raskin];
+    license = lib.licenses.mit;
+    description = "Reparent a running program to a new terminal";
+    homepage = https://github.com/nelhage/reptyr;
   };
 }