Merge master into staging-next

pkgs/misc/acpilight/default.nix

@@ -0,0 +1,32 @@
+{ stdenv, fetchgit, python36, udev, coreutils }:
+
+stdenv.mkDerivation rec {
+  pname = "acpilight";
+  version = "1.1";
+
+  src = fetchgit {
+    url = "https://gitlab.com/wavexx/acpilight.git";
+    rev = "v${version}";
+    sha256 = "0kykrl71fb146vaq8207c3qp03h2djkn8hn6psryykk8gdzkv3xd";
+  };
+
+  pyenv = python36.withPackages (pythonPackages: with pythonPackages; [
+    ConfigArgParse
+  ]);
+
+  postConfigure = ''
+    substituteInPlace 90-backlight.rules --replace /bin ${coreutils}/bin
+  '';
+
+  buildInputs = [ pyenv udev ];
+
+  makeFlags = [ "DESTDIR=$(out) prefix=" ];
+
+  meta = with stdenv.lib; {
+    homepage = "https://gitlab.com/wavexx/acpilight";
+    description = "ACPI backlight control";
+    license = licenses.gpl3;
+    maintainers = with maintainers; [ "smakarov" ];
+    platforms = platforms.linux;
+  };
+}

pkgs/misc/cups/filters.nix

@@ -9,11 +9,11 @@ let
 
 in stdenv.mkDerivation rec {
   name = "cups-filters-${version}";
-  version = "1.21.6";
+  version = "1.22.0";
 
   src = fetchurl {
     url = "https://openprinting.org/download/cups-filters/${name}.tar.xz";
-    sha256 = "0k0x9p40bahq44189vy9zai2ia9i91h26chrddr0m9agzsy5s3k3";
+    sha256 = "0gdv33g7dr1i7756n07zwgsv9b1i15rp7n1z1xr3n8f59br4fds4";
   };
 
   nativeBuildInputs = [ pkgconfig makeWrapper ];

pkgs/misc/gnash/default.nix

@@ -14,10 +14,10 @@
 , enableQt  ? false, qt4  ? null
 
 # media
-, enableFFmpeg    ? true,  ffmpeg_2 ? null
+, enableFFmpeg   ? true, ffmpeg_2 ? null
 
 # misc
-, enableJemalloc ? true, jemalloc  ? null
+, enableJemalloc ? true, jemalloc ? null
 , enableHwAccel  ? true
 , enablePlugins  ? false, xulrunner ? null, npapi_sdk ? null
 }:
@@ -66,12 +66,12 @@ assert length renderers == 0 -> throw "at least one renderer must be enabled";
 
 stdenv.mkDerivation rec {
   name = "gnash-${version}";
-  version = "0.8.11-2017-03-08";
+  version = "0.8.11-2019-30-01";
 
   src = fetchgit {
     url = "git://git.sv.gnu.org/gnash.git";
-    rev = "8a11e60585db4ed6bc4eafadfbd9b3123ced45d9";
-    sha256 = "1qas084gc4s9cb2jbwi2s1h4hk7m92xmrsb596sd14h0i44dai02";
+    rev = "583ccbc1275c7701dc4843ec12142ff86bb305b4";
+    sha256 = "0fh0bljn0i6ypyh6l99afi855p7ki7lm869nq1qj6k8hrrwhmfry";
   };
 
   postPatch = ''