Merge branch 'master' into staging

5 files changed, 19 insertions, 10 deletions

diff --git a/pkgs/tools/X11/nitrogen/default.nix b/pkgs/tools/X11/nitrogen/default.nix
index 06a7630c7bc0..f53ab38672bd 100644
--- a/pkgs/tools/X11/nitrogen/default.nix
+++ b/pkgs/tools/X11/nitrogen/default.nix
@@ -1,23 +1,20 @@
 { stdenv, fetchurl, pkgconfig, glib, gtkmm2 }:
 
-let version = "1.6.0";
+let version = "1.6.1";
 in
 stdenv.mkDerivation rec {
   name = "nitrogen-${version}";
 
   src = fetchurl {
     url = "http://projects.l3ib.org/nitrogen/files/${name}.tar.gz";
-    sha256 = "1pil2qa3v7x56zh9xvba8v96abnf9qgglbsdlrlv0kfjlhzl4jhr";
+    sha256 = "0zc3fl1mbhq0iyndy4ysmy8vv5c7xwf54rbgamzfhfvsgdq160pl";
   };
 
   nativeBuildInputs = [ pkgconfig ];
 
   buildInputs = [ glib gtkmm2 ];
 
-  NIX_CXXFLAGS_COMPILE = "-std=c++11";
-
   patchPhase = ''
-    substituteInPlace data/Makefile.in --replace /usr/share $out/share
     patchShebangs data/icon-theme-installer
   '';
 
diff --git a/pkgs/tools/graphics/bins/cp-dash-f.patch b/pkgs/tools/graphics/bins/cp-dash-f.patch
new file mode 100644
index 000000000000..e280e5349c1f
--- /dev/null
+++ b/pkgs/tools/graphics/bins/cp-dash-f.patch
@@ -0,0 +1,11 @@
+--- a/bins	2016-05-18 20:45:49.513330005 -0400
++++ b/bins	2016-05-18 20:58:58.957830874 -0400
+@@ -1332,7 +1332,7 @@
+                 mkdir $destDir, 0755
+                     or die("\nCannot create $destDir: $?");
+             }
+-            system("cp", "-R", bsd_glob("$staticDir/*", GLOB_TILDE), "$destDir") == 0
++            system("cp", "-Rf", bsd_glob("$staticDir/*", GLOB_TILDE), "$destDir") == 0
+                 or die("\nCannot copy $staticDir directory content to $destDir: $?");
+         } else {
+             beVerboseN("  Cannot find any static template directory.", 4);
diff --git a/pkgs/tools/graphics/bins/default.nix b/pkgs/tools/graphics/bins/default.nix
index d41df87fb6d9..b43e99c42a14 100644
--- a/pkgs/tools/graphics/bins/default.nix
+++ b/pkgs/tools/graphics/bins/default.nix
@@ -23,7 +23,8 @@ stdenv.mkDerivation {
                                      DateTimeFormatDateParse ]; #TODO need Gtk (not Gtk2?) for bins-edit-gui
 
   patches = [ ./bins_edit-isa.patch
-              ./hashref.patch ];
+              ./hashref.patch
+              ./cp-dash-f.patch ];
 
   installPhase = ''
     export DESTDIR=$out;
diff --git a/pkgs/tools/misc/antimicro/default.nix b/pkgs/tools/misc/antimicro/default.nix
index 4bba4858beb4..710641281e52 100644
--- a/pkgs/tools/misc/antimicro/default.nix
+++ b/pkgs/tools/misc/antimicro/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "antimicro-${version}";
-  version = "2.22";
+  version = "2.23";
 
   src = fetchFromGitHub {
     owner = "AntiMicro";
     repo = "antimicro";
     rev = "${version}";
-    sha256 = "102fh9ysd2dmfc6b73bj88m064jhlglqrz2gd7k9jccadxpbp3mq";
+    sha256 = "1q40ayxwwyq85lc89cnj1cm2nar625h4vhh8dvmb2qcxczaggf4v";
   };
 
   buildInputs = [
diff --git a/pkgs/tools/system/efivar/default.nix b/pkgs/tools/system/efivar/default.nix
index bdc33ef749c6..744e34a9c60a 100644
--- a/pkgs/tools/system/efivar/default.nix
+++ b/pkgs/tools/system/efivar/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "efivar-${version}";
-  version = "27";
+  version = "31";
 
   src = fetchFromGitHub {
     owner = "rhinstaller";
     repo = "efivar";
     rev = version;
-    sha256 = "1vz3hzs9k7bjg2r5bsw1irnfq77lmq9819sg9a7w6w528bvzr4lx";
+    sha256 = "0dhycikylm87jmds4ii5ygwq59g4sa5sv9mzryjzgqlgppw5arli";
   };
 
   nativeBuildInputs = [ pkgconfig ];