about summary refs log tree commit diff
path: root/pkgs/misc
diff options
context:
space:
mode:
Diffstat (limited to 'pkgs/misc')
-rw-r--r--pkgs/misc/acpilight/default.nix32
-rw-r--r--pkgs/misc/cups/drivers/brgenml1lpr/default.nix2
-rw-r--r--pkgs/misc/cups/filters.nix4
-rw-r--r--pkgs/misc/drivers/hplip/default.nix6
-rw-r--r--pkgs/misc/emulators/dolphin-emu/master.nix6
-rw-r--r--pkgs/misc/emulators/mgba/default.nix11
-rw-r--r--pkgs/misc/gnash/default.nix10
7 files changed, 49 insertions, 22 deletions
diff --git a/pkgs/misc/acpilight/default.nix b/pkgs/misc/acpilight/default.nix
new file mode 100644
index 000000000000..20efe6342859
--- /dev/null
+++ b/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;
+  };
+}
diff --git a/pkgs/misc/cups/drivers/brgenml1lpr/default.nix b/pkgs/misc/cups/drivers/brgenml1lpr/default.nix
index 51ef47fe4693..2df3cfe67334 100644
--- a/pkgs/misc/cups/drivers/brgenml1lpr/default.nix
+++ b/pkgs/misc/cups/drivers/brgenml1lpr/default.nix
@@ -87,7 +87,7 @@ stdenv.mkDerivation rec {
     description = "Brother BrGenML1 LPR driver";
     homepage = http://www.brother.com;
     platforms = stdenv.lib.platforms.linux;
-    license = stdenv.lib.licenses.gpl2Plus;
+    license = stdenv.lib.licenses.unfreeRedistributable;
     maintainers = with stdenv.lib.maintainers; [ jraygauthier ];
   };
 }
diff --git a/pkgs/misc/cups/filters.nix b/pkgs/misc/cups/filters.nix
index 348b7c6550e2..3d2eafee1687 100644
--- a/pkgs/misc/cups/filters.nix
+++ b/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 ];
diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix
index f03d75dfa02d..10dd0401cf03 100644
--- a/pkgs/misc/drivers/hplip/default.nix
+++ b/pkgs/misc/drivers/hplip/default.nix
@@ -12,16 +12,16 @@
 let
 
   name = "hplip-${version}";
-  version = "3.18.5";
+  version = "3.19.1";
 
   src = fetchurl {
     url = "mirror://sourceforge/hplip/${name}.tar.gz";
-    sha256 = "0xb7ga2wgbwjxsss67mjn2y6fmqsfwzmv11ivvfzhnl36lh22hkb";
+    sha256 = "1kl1q4753xx1w76dhp92wgrhn5k1yx1ib35pyi0vi3mw0njbhrzm";
   };
 
   plugin = fetchurl {
     url = "https://www.openprinting.org/download/printdriver/auxfiles/HP/plugins/${name}-plugin.run";
-    sha256 = "1jf74jya071zqvwhy9n0c3007pzgcxydkw7qdh4sx70brly81i7p";
+    sha256 = "1fwjypy1ycyi7rr1vk1yxhbdhx51n7fxhvjb36mzw8qz71dif2i3";
   };
 
   hplipState = substituteAll {
diff --git a/pkgs/misc/emulators/dolphin-emu/master.nix b/pkgs/misc/emulators/dolphin-emu/master.nix
index b720bf142d4a..e57c3854926f 100644
--- a/pkgs/misc/emulators/dolphin-emu/master.nix
+++ b/pkgs/misc/emulators/dolphin-emu/master.nix
@@ -20,13 +20,13 @@ let
   };
 in stdenv.mkDerivation rec {
   name = "dolphin-emu-${version}";
-  version = "2018-12-25";
+  version = "2019-02-16";
 
   src = fetchFromGitHub {
     owner = "dolphin-emu";
     repo = "dolphin";
-    rev = "ca2a2c98f252d21dc609d26f4264a43ed091b8fe";
-    sha256 = "0903hp7fkh08ggjx8zrsvwhh1x8bprv3lh2d8yci09al1cqqj5cb";
+    rev = "286aafd4ed2949f0b93230fee969c6a32fe75f07";
+    sha256 = "0l0cpq8s7wnng7mhbnzf4v84zggqsqdykrzfyz5avvbv9pla7jwp";
   };
 
   enableParallelBuilding = true;
diff --git a/pkgs/misc/emulators/mgba/default.nix b/pkgs/misc/emulators/mgba/default.nix
index 7fb804d31e41..09c3d8e762d2 100644
--- a/pkgs/misc/emulators/mgba/default.nix
+++ b/pkgs/misc/emulators/mgba/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, fetchpatch, makeDesktopItem, makeWrapper, pkgconfig
+{ stdenv, fetchFromGitHub, makeDesktopItem, makeWrapper, pkgconfig
 , cmake, epoxy, libzip, ffmpeg, imagemagick, SDL2, qtbase, qtmultimedia, libedit
 , qttools, minizip }:
 
@@ -15,13 +15,13 @@ let
   };
 in stdenv.mkDerivation rec {
   name = "mgba-${version}";
-  version = "0.6.3";
+  version = "0.7.0";
 
   src = fetchFromGitHub {
     owner = "mgba-emu";
     repo = "mgba";
     rev = version;
-    sha256 = "0m1pkxa6i94gq95cankv390wsbp88b3x41c7hf415rp9rkfq25vk";
+    sha256 = "0s4dl4pi8rxqahvzxnh37xdgsfax36cn5wlh1srdcmabwsrfpb3w";
   };
 
   enableParallelBuilding = true;
@@ -32,11 +32,6 @@ in stdenv.mkDerivation rec {
     qttools
   ];
 
-  patches = [(fetchpatch {
-      url = "https://github.com/mgba-emu/mgba/commit/7f41dd354176b720c8e3310553c6b772278b9dca.patch";
-      sha256 = "0j334v8wf594kg8s1hngmh58wv1pi003z8avy6fjhj5qpjmbbavh";
-  })];
-
   postInstall = ''
     cp -r ${desktopItem}/share/applications $out/share
     wrapProgram $out/bin/mgba-qt --suffix QT_PLUGIN_PATH : \
diff --git a/pkgs/misc/gnash/default.nix b/pkgs/misc/gnash/default.nix
index db2afa5ba631..991be274ecc9 100644
--- a/pkgs/misc/gnash/default.nix
+++ b/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 = ''