Merge branch 'master.upstream' into staging.upstream

pkgs/os-specific/linux/nvidiabl/default.nix

@@ -8,6 +8,8 @@ stdenv.mkDerivation {
     sha256 = "1c7ar39wc8jpqh67sw03lwnyp0m9l6dad469ybqrgcywdiwxspwj";
   };
 
+  patches = [ ./linux4compat.patch ];
+
   preConfigure = ''
     sed -i 's|/sbin/depmod|#/sbin/depmod|' Makefile
   '';

pkgs/os-specific/linux/nvidiabl/linux4compat.patch

@@ -0,0 +1,22 @@
+From 2bf6f08b2492cc04a2c39fdcb22a2d0c18963d1c Mon Sep 17 00:00:00 2001
+From: sonic414 <sonic414@gmail.com>
+Date: Tue, 28 Apr 2015 19:30:15 +0530
+Subject: [PATCH] strnicmp to strncasecmp in Linux 4.0.0
+
+---
+ nvidiabl-module.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/nvidiabl-module.c b/nvidiabl-module.c
+index b789ea4..b306579 100644
+--- a/nvidiabl-module.c
++++ b/nvidiabl-module.c
+@@ -214,7 +214,7 @@ static int __init nvidiabl_init(void)
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,39)
+ 	
+ 	for (iii = 0 ; iii < sizeof(backlight_type_ids) ; iii++) {
+-		if (strnicmp(bl_type, backlight_type_ids[iii].id, sizeof(bl_type)) == 0) {
++		if (strncasecmp(bl_type, backlight_type_ids[iii].id, sizeof(bl_type)) == 0) {
+ 			props.type = backlight_type_ids[iii].type;
+ 			printk(KERN_INFO "nvidiabl: backlight type is %s\n", backlight_type_ids[iii].id);
+ 		}

pkgs/os-specific/linux/pommed/default.nix

@@ -75,5 +75,6 @@ stdenv.mkDerivation rec {
     description = "A tool to handle hotkeys on Apple laptop keyboards";
     homepage = http://www.technologeek.org/projects/pommed/index.html;
     license = stdenv.lib.licenses.gpl2;
+    broken = true; # hash changed, and it's quite suspicious
   };
 }

pkgs/os-specific/linux/syslinux/default.nix

@@ -1,24 +1,26 @@
-{ stdenv, fetchurl, nasm, perl, libuuid }:
+{ stdenv, fetchFromGitHub, nasm, perl, python, libuuid }:
 
 stdenv.mkDerivation rec {
-  name = "syslinux-6.03";
+  name = "syslinux-2015-11-09";
 
-  src = fetchurl {
-    url = "mirror://kernel/linux/utils/boot/syslinux/${name}.tar.xz";
-    sha256 = "03l5iifwlg1wyb4yh98i0b7pd4j55a1c9y74q1frs47a5dnrilr6";
+  src = fetchFromGitHub {
+    owner = "geneC";
+    repo = "syslinux";
+    rev = "0cc9a99e560a2f52bcf052fd85b1efae35ee812f";
+    sha256 = "0wk3r5ki4lc334f9jpml07wpl8d0bnxi9h1l4h4fyf9a0d7n4kmw";
   };
 
-  # gcc5-fix should be in 6.04+, so remove if it fails to apply.
-  patches = [ ./perl-deps.patch ./gcc5-fix.patch ];
+  patches = [ ./perl-deps.patch ];
 
-  buildInputs = [ nasm perl libuuid ];
+  nativeBuildInputs = [ nasm perl python ];
+  buildInputs = [ libuuid ];
 
   enableParallelBuilding = false; # Fails very rarely with 'No rule to make target: ...'
 
   preBuild = ''
     substituteInPlace Makefile --replace /bin/pwd $(type -P pwd)
     substituteInPlace gpxe/src/Makefile.housekeeping --replace /bin/echo $(type -P echo)
-    substituteInPlace gpxe/src/Makefile --replace /usr/bin/perl $(type -P perl)
+    substituteInPlace utils/ppmtolss16 gpxe/src/Makefile --replace /usr/bin/perl $(type -P perl)
   '';
 
   stripDebugList = "bin sbin share/syslinux/com32";

pkgs/os-specific/linux/syslinux/gcc5-fix.patch

@@ -1,26 +0,0 @@
-diff --git a/com32/include/menu.h b/com32/include/menu.h
-index bc0182f..b0251e4 100644
---- a/com32/include/menu.h
-+++ b/com32/include/menu.h
-@@ -195,7 +195,7 @@ void local_cursor_enable(bool);
- 
- static inline int my_isspace(char c)
- {
--    return (unsigned char)c <= ' ';
-+    return (unsigned char)c <= ' ' || (unsigned char)c == '\x7f';
- }
- 
- int my_isxdigit(char c);
-diff --git a/com32/menu/readconfig.c b/com32/menu/readconfig.c
-index b7814be..a433fad 100644
---- a/com32/menu/readconfig.c
-+++ b/com32/menu/readconfig.c
-@@ -299,7 +299,7 @@ static char *copy_sysappend_string(char *dst, const char *src)
-     char c;
- 
-     while ((c = *src++)) {
--	if (c <= ' ' && c == '\x7f') {
-+	if (my_isspace(c)) {
- 	    if (!was_space)
- 		*dst++ = '_';
- 	    was_space = true;