summaryrefslogtreecommitdiffstats
path: root/pkgs/misc
diff options
context:
space:
mode:
Diffstat (limited to 'pkgs/misc')
-rw-r--r--pkgs/misc/acpilight/default.nix2
-rw-r--r--pkgs/misc/cups/default.nix2
-rw-r--r--pkgs/misc/drivers/utsushi/default.nix154
-rw-r--r--pkgs/misc/drivers/utsushi/patches/absolute-path-to-convert.patch166
-rw-r--r--pkgs/misc/drivers/utsushi/patches/absolute_path_for_tesseract.patch56
-rw-r--r--pkgs/misc/drivers/utsushi/patches/print-errors.patch15
-rw-r--r--pkgs/misc/drivers/utsushi/patches/series3
-rw-r--r--pkgs/misc/emulators/dolphin-emu/default.nix33
-rw-r--r--pkgs/misc/emulators/dolphin-emu/master.nix44
-rw-r--r--pkgs/misc/seafile-shared/default.nix4
-rw-r--r--pkgs/misc/themes/adwaita-qt/default.nix12
-rw-r--r--pkgs/misc/themes/kde2/default.nix4
-rw-r--r--pkgs/misc/themes/qtcurve/default.nix4
-rw-r--r--pkgs/misc/vim-plugins/generated.nix374
-rw-r--r--pkgs/misc/vim-plugins/overrides.nix11
-rw-r--r--pkgs/misc/vim-plugins/vim-plugin-names4
-rw-r--r--pkgs/misc/vim-plugins/vim-utils.nix7
17 files changed, 677 insertions, 218 deletions
diff --git a/pkgs/misc/acpilight/default.nix b/pkgs/misc/acpilight/default.nix
index 4076a8c3a3af..1975e2d37907 100644
--- a/pkgs/misc/acpilight/default.nix
+++ b/pkgs/misc/acpilight/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
homepage = "https://gitlab.com/wavexx/acpilight";
description = "ACPI backlight control";
license = licenses.gpl3;
- maintainers = with maintainers; [ "smakarov" ];
+ maintainers = with maintainers; [ smakarov ];
platforms = platforms.linux;
};
}
diff --git a/pkgs/misc/cups/default.nix b/pkgs/misc/cups/default.nix
index 11873e6f2a06..789aabce0435 100644
--- a/pkgs/misc/cups/default.nix
+++ b/pkgs/misc/cups/default.nix
@@ -133,7 +133,7 @@ stdenv.mkDerivation rec {
homepage = https://cups.org/;
description = "A standards-based printing system for UNIX";
license = licenses.gpl2; # actually LGPL for the library and GPL for the rest
- maintainers = with maintainers; [ ];
+ maintainers = with maintainers; [ matthewbauer ];
platforms = platforms.unix;
};
}
diff --git a/pkgs/misc/drivers/utsushi/default.nix b/pkgs/misc/drivers/utsushi/default.nix
new file mode 100644
index 000000000000..328e8ce45625
--- /dev/null
+++ b/pkgs/misc/drivers/utsushi/default.nix
@@ -0,0 +1,154 @@
+{ stdenv, fetchurl, autoreconfHook, boost, gtkmm2
+, pkg-config, libtool, udev, libjpeg, file, texlive
+, libusb, libtiff, imagemagick, sane-backends, tesseract }:
+
+/*
+Alternatively, this package could use the "community source" at
+https://gitlab.com/utsushi/utsushi/
+Epson provides proprietary plugins for networking, ocr and some more
+scanner models. Those are not (yet ?) packaged here.
+*/
+
+stdenv.mkDerivation rec {
+ pname = "utsushi";
+ version = "3.57.0";
+
+ src = fetchurl {
+ url = "http://support.epson.net/linux/src/scanner/imagescanv3/common/imagescan_${version}.orig.tar.gz";
+ sha256 = "0qy6n6nbisbvy0q3idj7hpmj9i85cd0a18klfd8nsqsa2nkg57ny";
+ };
+
+ nativeBuildInputs = [
+ pkg-config
+ autoreconfHook
+ libtool
+ ];
+
+ buildInputs = [
+ boost
+ libusb
+ libtiff
+ libjpeg
+ udev
+ imagemagick
+ sane-backends
+ gtkmm2
+ file
+ tesseract
+ ];
+
+ patches = [
+ ./patches/absolute-path-to-convert.patch
+ ./patches/print-errors.patch
+ ./patches/absolute_path_for_tesseract.patch
+ ];
+
+ postPatch = ''
+ # remove vendored dependencies
+ rm -r upstream/boost
+ # create fake udev and sane config
+ mkdir -p $out/etc/{sane.d,udev/rules.d}
+ touch $out/etc/sane.d/dll.conf
+ '';
+
+ configureFlags = [
+ "--with-boost-libdir=${boost}/lib"
+ "--with-sane-confdir=${placeholder "out"}/etc/sane.d"
+ "--with-udev-confdir=${placeholder "out"}/etc/udev"
+ "--with-sane"
+ "--with-gtkmm"
+ "--with-jpeg"
+ "--with-magick"
+ "--with-sane"
+ "--with-tiff"
+ ];
+
+ installFlags = [ "SANE_BACKENDDIR=${placeholder "out"}/lib/sane" ];
+
+ enableParallelBuilding = true;
+
+ meta = {
+ description = "SANE utsushi backend for some Epson scanners";
+ longDescription = ''
+ ImageScanV3 (aka utsushi) scanner driver.
+ Non-free plugins are not included so no network support.
+ To use the SANE backend, in /etc/nixos/configuration.nix:
+
+ hardware.sane = {
+ enable = true;
+ extraBackends = [ pkgs.utsushi ];
+ };
+ services.udev.packages = [ pkgs.utsushi ];
+
+ Supported hardware:
+ - DS-40
+ - DS-70
+ - DS-80W
+ - DS-410
+ - DS-510
+ - DS-520
+ - DS-530
+ - DS-535
+ - DS-535H
+ - DS-560
+ - DS-575W
+ - DS-760
+ - DS-775
+ - DS-780N
+ - DS-860
+ - DS-1630
+ - DS-5500
+ - DS-6500
+ - DS-7500
+ - DS-50000
+ - DS-60000
+ - DS-70000
+ - EP-10VA Series
+ - EP-808A Series
+ - EP-978A3 Series
+ - ES-50
+ - ES-55R
+ - ES-60W
+ - ES-65WR
+ - ES-300WR
+ - ES-400
+ - ES-500WR
+ - ES-8500
+ - ET-2500 Series
+ - ET-2550 Series
+ - ET-4500 Series
+ - ET-4550 Series
+ - Expression 1640XL
+ - FF-680W
+ - L220/L360 Series
+ - L365/L366 Series
+ - L380 Series
+ - L455 Series
+ - L565/L566 Series
+ - L655 Series
+ - PX-M840FX
+ - PX-M860F
+ - PX-M884F
+ - PX-M7050 Series
+ - PX-M7050FX Series
+ - WF-4720
+ - WF-6530 Series
+ - WF-6590 Series
+ - WF-8510/8590 Series
+ - WF-R8590 Series
+ - XP-220 Series
+ - XP-230 Series
+ - XP-235 Series
+ - XP-332 335 Series
+ - XP-430 Series
+ - XP-432 435 Series
+ - XP-530 Series
+ - XP-540
+ - XP-630 Series
+ - XP-640
+ - XP-830 Series
+ - XP-960 Series
+ '';
+ license = stdenv.lib.licenses.gpl3Plus;
+ };
+}
diff --git a/pkgs/misc/drivers/utsushi/patches/absolute-path-to-convert.patch b/pkgs/misc/drivers/utsushi/patches/absolute-path-to-convert.patch
new file mode 100644
index 000000000000..2bc9422b061e
--- /dev/null
+++ b/pkgs/misc/drivers/utsushi/patches/absolute-path-to-convert.patch
@@ -0,0 +1,166 @@
+Index: utsushi-0.57.0/configure.ac
+===================================================================
+--- utsushi-0.57.0.orig/configure.ac
++++ utsushi-0.57.0/configure.ac
+@@ -221,6 +221,9 @@ AS_IF([test xno != x$enable_code_coverag
+ [AC_MSG_ERROR([code coverage support requires a GNU C/C++ compiler])])
+ ])
+ AM_PROG_AR
++AC_PATH_PROG([AWK],[awk])
++AC_DEFINE_UNQUOTED([AWK], ["$AWK"],
++ [Path to awk.])
+
+ PKG_PROG_PKG_CONFIG
+
+@@ -379,27 +382,31 @@ AM_CONDITIONAL([have_libmagick_pp], [tes
+ AS_IF([test xno != "x$with_magick"],
+ AS_CASE("x$with_magick",
+ [xGraphicsMagick],
+- [AC_CHECK_PROGS([MAGICK_CONVERT], [gm])
+- AS_IF([test xgm != x$MAGICK_CONVERT],
++ [[AC_PATH_PROG(MAGICK_CONVERT, gm)]
++ AS_IF([test x == x$MAGICK_CONVERT],
+ [AC_MSG_ERROR([$with_magick requested but not found])])
+ AC_DEFINE([HAVE_GRAPHICS_MAGICK], [1])
+- MAGICK_CONVERT="gm convert"
++ HAVE_MAGICK=1
++ MAGICK_CONVERT="$MAGICK_CONVERT convert"
+ ],
+ [xImageMagick],
+- [AC_CHECK_PROGS([MAGICK_CONVERT], [convert])
+- AS_IF([test xconvert != x$MAGICK_CONVERT],
++ [[AC_PATH_PROG(MAGICK_CONVERT, convert)]
++ AS_IF([test x == x$MAGICK_CONVERT],
+ [AC_MSG_ERROR([$with_magick requested but not found])])
+ AC_DEFINE([HAVE_IMAGE_MAGICK], [1])
++ HAVE_MAGICK=1
+ ],
+ [xyes|xcheck],
+- [AC_CHECK_PROGS([MAGICK_CONVERT], [gm convert])
++ [[AC_PATH_PROGS([MAGICK_CONVERT], [gm convert])]
+ AS_CASE(x$MAGICK_CONVERT,
+- [xgm],
++ [x*gm],
+ [AC_DEFINE([HAVE_GRAPHICS_MAGICK], [1])
+- MAGICK_CONVERT="gm convert"
++ HAVE_MAGICK=1
++ MAGICK_CONVERT="$MAGICK_CONVERT convert"
+ ],
+- [xconvert],
++ [x*convert],
+ [AC_DEFINE([HAVE_IMAGE_MAGICK], [1])
++ HAVE_MAGICK=1
+ ],
+ [dnl default case
+ AS_IF([test xcheck != "x$with_magick"],
+@@ -410,7 +417,7 @@ AS_IF([test xno != "x$with_magick"],
+ AC_MSG_ERROR([unknown value: --with-magick=$with_magick])
+ ]))
+ AC_DEFINE_UNQUOTED([MAGICK_CONVERT], ["$MAGICK_CONVERT"])
+-AM_CONDITIONAL([have_magick], [test x != "x$MAGICK_CONVERT"])
++AM_CONDITIONAL([have_magick], [test x != "x$HAVE_MAGICK"])
+
+ AS_IF([test xno != "x$with_gtkmm"],
+ [PKG_CHECK_MODULES([LIBGTKMM], [gtkmm-2.4 >= 2.20],
+Index: utsushi-0.57.0/filters/magick.cpp
+===================================================================
+--- utsushi-0.57.0.orig/filters/magick.cpp
++++ utsushi-0.57.0/filters/magick.cpp
+@@ -81,19 +81,18 @@ chomp (char *str)
+ }
+
+ bool
+-magick_version_before_(const char *magick, const char *cutoff)
++magick_version_before_(const char *cutoff)
+ {
+ FILE *fp = NULL;
+ int errc = 0;
+
+- if (0 == strcmp ("GraphicsMagick", magick))
+- fp = popen ("gm convert -version"
+- "| awk '/^GraphicsMagick/{print $2}'", "r");
+- if (fp) errc = errno;
+-
+- if (0 == strcmp ("ImageMagick", magick))
+- fp = popen ("convert -version"
+- "| awk '/^Version:/{print $3}'", "r");
++#if HAVE_GRAPHICS_MAGICK
++ fp = popen (MAGICK_CONVERT " -version"
++ "| " AWK " '/^GraphicsMagick/{print $2}'", "r");
++#elif HAVE_IMAGE_MAGICK
++ fp = popen (MAGICK_CONVERT " -version"
++ "| " AWK " '/^Version:/{print $3}'", "r");
++#endif
+ if (fp) errc = errno;
+
+ if (fp)
+@@ -106,42 +105,32 @@ magick_version_before_(const char *magic
+
+ if (version)
+ {
+- log::debug ("found %1%-%2%") % magick % version;
++ log::debug ("found " MAGICK_CONVERT "version %1%") % version;
+ return (0 > strverscmp (version, cutoff));
+ }
+ }
+
+ if (errc)
+- log::alert ("failure checking %1% version: %2%")
+- % magick
++ log::alert ("failure checking " MAGICK_CONVERT " version: %1%")
+ % strerror (errc);
+
+ return false;
+ }
+
+ bool
+-graphics_magick_version_before_(const char *cutoff)
+-{
+- return magick_version_before_("GraphicsMagick", cutoff);
+-}
+-
+-bool
+-image_magick_version_before_(const char *cutoff)
+-{
+- return magick_version_before_("ImageMagick", cutoff);
+-}
+-
+-bool
+ auto_orient_is_usable ()
+ {
+ static int usable = -1;
+
+ if (-1 == usable)
+ {
+- if (HAVE_GRAPHICS_MAGICK) // version -auto-orient was added
+- usable = !graphics_magick_version_before_("1.3.18");
+- if (HAVE_IMAGE_MAGICK) // version known to work
+- usable = !image_magick_version_before_("6.7.8-9");
++#if HAVE_GRAPHICS_MAGICK
++ // version -auto-orient was added
++ usable = !magick_version_before_("1.3.18");
++#elif HAVE_IMAGE_MAGICK
++ // version known to work
++ usable = !magick_version_before_("6.7.8-9");
++#endif
+ if (-1 == usable)
+ usable = false;
+ usable = (usable ? 1 : 0);
+@@ -392,7 +381,7 @@ magick::arguments (const context& ctx)
+ if (color_correction_)
+ {
+ if (HAVE_IMAGE_MAGICK
+- && !image_magick_version_before_("6.6.1-0"))
++ && !magick_version_before_("6.6.1-0"))
+ argv += " -color-matrix";
+ else
+ argv += " -recolor";
+@@ -416,7 +405,7 @@ magick::arguments (const context& ctx)
+ size_t mat_size = ((HAVE_IMAGE_MAGICK) ? 6 : 5);
+
+ if (HAVE_IMAGE_MAGICK
+- && !image_magick_version_before_("6.6.1-0"))
++ && !magick_version_before_("6.6.1-0"))
+ argv += " -color-matrix";
+ else
+ argv += " -recolor";
diff --git a/pkgs/misc/drivers/utsushi/patches/absolute_path_for_tesseract.patch b/pkgs/misc/drivers/utsushi/patches/absolute_path_for_tesseract.patch
new file mode 100644
index 000000000000..d4d444979210
--- /dev/null
+++ b/pkgs/misc/drivers/utsushi/patches/absolute_path_for_tesseract.patch
@@ -0,0 +1,56 @@
+Index: utsushi-0.57.0/filters/reorient.cpp
+===================================================================
+--- utsushi-0.57.0.orig/filters/reorient.cpp
++++ utsushi-0.57.0/filters/reorient.cpp
+@@ -96,8 +96,8 @@ chomp (char *str)
+ bool
+ tesseract_version_before_(const char *cutoff)
+ {
+- FILE *fp = popen ("tesseract --version 2>&1"
+- "| awk '/^tesseract/{ print $2 }'", "r");
++ FILE *fp = popen (TESSERACT " --version 2>&1"
++ "| " AWK " '/^tesseract/{ print $2 }'", "r");
+ int errc = errno;
+
+ if (fp)
+@@ -126,7 +126,7 @@ tesseract_version_before_(const char *cu
+ bool
+ have_tesseract_language_pack_(const char *lang)
+ {
+- std::string cmd("tesseract --list-langs 2>&1"
++ std::string cmd(TESSERACT " --list-langs 2>&1"
+ "| sed -n '/^");
+ cmd += lang;
+ cmd += "$/p'";
+@@ -291,7 +291,7 @@ reorient::reorient ()
+
+ if (found)
+ {
+- if (have_tesseract_()) engine_ = "tesseract";
++ if (have_tesseract_()) engine_ = TESSERACT;
+ if (have_ocr_engine_()) engine_ = abs_path_name;
+ }
+ freeze_options (); // initializes option tracking member variables
+Index: utsushi-0.57.0/configure.ac
+===================================================================
+--- utsushi-0.57.0.orig/configure.ac
++++ utsushi-0.57.0/configure.ac
+@@ -196,6 +196,8 @@ AC_DEFINE([HAVE_IMAGE_MAGICK_PP],
+ [0], [Define to 1 if ImageMagick's C++ API is usable])
+ AC_DEFINE([MAGICK_CONVERT],
+ [], [Define to an appropriate command-line invocation for convert])
++AC_DEFINE([TESSERACT],
++ [], [Define to an appropriate command-line invocation for tesseract])
+ AC_DEFINE([WITH_INCLUDED_BOOST],
+ [0], [Define to 1 if using the included Boost sources])
+
+@@ -419,6 +421,9 @@ AS_IF([test xno != "x$with_magick"],
+ AC_DEFINE_UNQUOTED([MAGICK_CONVERT], ["$MAGICK_CONVERT"])
+ AM_CONDITIONAL([have_magick], [test x != "x$HAVE_MAGICK"])
+
++AC_PATH_PROG([TESSERACT], [tesseract], [tesseract])
++AC_DEFINE_UNQUOTED([TESSERACT], ["$TESSERACT"])
++
+ AS_IF([test xno != "x$with_gtkmm"],
+ [PKG_CHECK_MODULES([LIBGTKMM], [gtkmm-2.4 >= 2.20],
+ [AC_DEFINE([HAVE_LIBGTKMM], [1])],
diff --git a/pkgs/misc/drivers/utsushi/patches/print-errors.patch b/pkgs/misc/drivers/utsushi/patches/print-errors.patch
new file mode 100644
index 000000000000..06660ebde988
--- /dev/null
+++ b/pkgs/misc/drivers/utsushi/patches/print-errors.patch
@@ -0,0 +1,15 @@
+Index: utsushi-0.57.0/lib/log.cpp
+===================================================================
+--- utsushi-0.57.0.orig/lib/log.cpp
++++ utsushi-0.57.0/lib/log.cpp
+@@ -26,8 +26,8 @@
+
+ namespace utsushi {
+
+-log::priority log::threshold = log::FATAL;
+-log::category log::matching = log::NOTHING;
++log::priority log::threshold = log::ERROR;
++log::category log::matching = log::ALL;
+
+ template<>
+ std::basic_ostream< char >&
diff --git a/pkgs/misc/drivers/utsushi/patches/series b/pkgs/misc/drivers/utsushi/patches/series
new file mode 100644
index 000000000000..de0964c758b1
--- /dev/null
+++ b/pkgs/misc/drivers/utsushi/patches/series
@@ -0,0 +1,3 @@
+absolute-path-to-convert.patch
+print-errors.patch
+absolute_path_for_tesseract.patch
diff --git a/pkgs/misc/emulators/dolphin-emu/default.nix b/pkgs/misc/emulators/dolphin-emu/default.nix
index 392f5618b6e5..a14f18da4669 100644
--- a/pkgs/misc/emulators/dolphin-emu/default.nix
+++ b/pkgs/misc/emulators/dolphin-emu/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, pkgconfig, cmake, bluez, ffmpeg, libao, gtk2, glib, libGLU_combined
-, gettext, libpthreadstubs, libXrandr, libXext, readline, openal
-, libXdmcp, portaudio, fetchFromGitHub, libusb, libevdev
+{ stdenv, lib, fetchpatch, pkgconfig, cmake, bluez, ffmpeg, libao, gtk2, glib
+, libGLU_combined , gettext, libpthreadstubs, libXrandr, libXext, readline
+, openal , libXdmcp, portaudio, fetchFromGitHub, libusb, libevdev
, wxGTK30, soundtouch, miniupnpc, mbedtls, curl, lzo, sfml
, libpulseaudio ? null }:
@@ -15,17 +15,26 @@ stdenv.mkDerivation rec {
sha256 = "07mlfnh0hwvk6xarcg315x7z2j0qbg9g7cm040df9c8psiahc3g6";
};
+ patches = [
+ # Fix build with soundtouch 2.1.2
+ (fetchpatch {
+ url = "https://src.fedoraproject.org/rpms/dolphin-emu/raw/a1b91fdf94981e12c8889a02cba0ec2267d0f303/f/dolphin-emu-5.0-soundtouch-exception-fix.patch";
+ name = "dolphin-emu-5.0-soundtouch-exception-fix.patch";
+ sha256 = "0yd3l46nja5qiknnl30ryad98f3v8911jwnr67hn61dzx2kwbbaw";
+ })
+ ];
+
postPatch = ''
substituteInPlace Source/Core/VideoBackends/OGL/RasterFont.cpp \
--replace " CHAR_WIDTH " " CHARWIDTH "
'';
- cmakeFlags = ''
- -DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib.out}/lib/glib-2.0/include
- -DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2.out}/lib/gtk-2.0/include
- -DGTK2_INCLUDE_DIRS=${gtk2.dev}/include/gtk-2.0
- -DENABLE_LTO=True
- '';
+ cmakeFlags = [
+ "-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib.out}/lib/glib-2.0/include"
+ "-DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2.out}/lib/gtk-2.0/include"
+ "-DGTK2_INCLUDE_DIRS=${gtk2.dev}/include/gtk-2.0"
+ "-DENABLE_LTO=True"
+ ];
enableParallelBuilding = true;
@@ -36,11 +45,11 @@ stdenv.mkDerivation rec {
libevdev libXdmcp portaudio libusb libpulseaudio
wxGTK30 soundtouch miniupnpc mbedtls curl lzo sfml ];
- meta = {
+ meta = with lib; {
homepage = https://dolphin-emu.org/;
description = "Gamecube/Wii/Triforce emulator for x86_64 and ARMv8";
- license = stdenv.lib.licenses.gpl2Plus;
- maintainers = with stdenv.lib.maintainers; [ MP2E ];
+ license = licenses.gpl2Plus;
+ maintainers = with maintainers; [ MP2E ashkitten ];
# x86_32 is an unsupported platform.
# Enable generic build if you really want a JIT-less binary.
platforms = [ "x86_64-linux" ];
diff --git a/pkgs/misc/emulators/dolphin-emu/master.nix b/pkgs/misc/emulators/dolphin-emu/master.nix
index 4f48f1248f49..ab8ec6868cf2 100644
--- a/pkgs/misc/emulators/dolphin-emu/master.nix
+++ b/pkgs/misc/emulators/dolphin-emu/master.nix
@@ -1,8 +1,9 @@
-{ stdenv, fetchFromGitHub, makeWrapper, makeDesktopItem, pkgconfig, cmake, qt5
-, bluez, ffmpeg, libao, libGLU_combined, pcre, gettext, libXrandr, libusb, lzo
-, libpthreadstubs, libXext, libXxf86vm, libXinerama, libSM, libXdmcp, readline
-, openal, udev, libevdev, portaudio, curl, alsaLib, miniupnpc, enet, mbedtls
-, soundtouch, sfml, vulkan-loader ? null, libpulseaudio ? null
+{ lib, stdenv, fetchFromGitHub, makeDesktopItem, pkgconfig, cmake
+, wrapQtAppsHook, qtbase, bluez, ffmpeg, libao, libGLU_combined, pcre, gettext
+, libXrandr, libusb, lzo, libpthreadstubs, libXext, libXxf86vm, libXinerama
+, libSM, libXdmcp, readline, openal, udev, libevdev, portaudio, curl, alsaLib
+, miniupnpc, enet, mbedtls, soundtouch, sfml
+, vulkan-loader ? null, libpulseaudio ? null
# - Inputs used for Darwin
, CoreBluetooth, ForceFeedback, IOKit, OpenGL, libpng, hidapi }:
@@ -20,27 +21,27 @@ let
};
in stdenv.mkDerivation rec {
name = "dolphin-emu-${version}";
- version = "5.0-10751";
+ version = "5.0-10879";
src = fetchFromGitHub {
owner = "dolphin-emu";
repo = "dolphin";
- rev = "64c0ff576c6d3ea2ee35e6b6d7ea8c814442d53f";
- sha256 = "19351j3gys9kgxpdjv1dckaiv74dylcdh1kx0z9qz8llv9s1r0s3";
+ rev = "c7fc9126aaf447a014af4aed195b17aa593dd49b";
+ sha256 = "1pf4mxacxhrkvvh9j49ackm8hahl8x0ligmann1pafsb4lw0xbnj";
};
enableParallelBuilding = true;
nativeBuildInputs = [ cmake pkgconfig ]
- ++ stdenv.lib.optionals stdenv.isLinux [ makeWrapper ];
+ ++ lib.optional stdenv.isLinux wrapQtAppsHook;
buildInputs = [
curl ffmpeg libao libGLU_combined pcre gettext libpthreadstubs libpulseaudio
libXrandr libXext libXxf86vm libXinerama libSM readline openal libXdmcp lzo
portaudio libusb libpng hidapi miniupnpc enet mbedtls soundtouch sfml
- qt5.qtbase
- ] ++ stdenv.lib.optionals stdenv.isLinux [
+ qtbase
+ ] ++ lib.optionals stdenv.isLinux [
bluez udev libevdev alsaLib vulkan-loader
- ] ++ stdenv.lib.optionals stdenv.isDarwin [
+ ] ++ lib.optionals stdenv.isDarwin [
CoreBluetooth OpenGL ForceFeedback IOKit
];
@@ -50,14 +51,18 @@ in stdenv.mkDerivation rec {
"-DDOLPHIN_WC_REVISION=${src.rev}"
"-DDOLPHIN_WC_DESCRIBE=${version}"
"-DDOLPHIN_WC_BRANCH=master"
- ] ++ stdenv.lib.optionals stdenv.isDarwin [
+ ] ++ lib.optionals stdenv.isDarwin [
"-DOSX_USE_DEFAULT_SEARCH_PATH=True"
];
+ qtWrapperArgs = lib.optionals stdenv.isLinux [
+ "--prefix LD_LIBRARY_PATH : ${vulkan-loader}/lib"
+ ];
+
# - Allow Dolphin to use nix-provided libraries instead of building them
- preConfigure = ''
+ postPatch = ''
sed -i -e 's,DISTRIBUTOR "None",DISTRIBUTOR "NixOS",g' CMakeLists.txt
- '' + stdenv.lib.optionalString stdenv.isDarwin ''
+ '' + lib.optionalString stdenv.isDarwin ''
sed -i -e 's,if(NOT APPLE),if(true),g' CMakeLists.txt
sed -i -e 's,if(LIBUSB_FOUND AND NOT APPLE),if(LIBUSB_FOUND),g' \
CMakeLists.txt
@@ -66,18 +71,13 @@ in stdenv.mkDerivation rec {
postInstall = ''
cp -r ${desktopItem}/share/applications $out/share
ln -sf $out/bin/dolphin-emu $out/bin/dolphin-emu-master
- '' + stdenv.lib.optionalString stdenv.isLinux ''
- wrapProgram $out/bin/dolphin-emu-nogui \
- --prefix LD_LIBRARY_PATH : ${vulkan-loader}/lib
- wrapProgram $out/bin/dolphin-emu \
- --prefix LD_LIBRARY_PATH : ${vulkan-loader}/lib
'';
- meta = with stdenv.lib; {
+ meta = with lib; {
homepage = "https://dolphin-emu.org";
description = "Gamecube/Wii/Triforce emulator for x86_64 and ARMv8";
license = licenses.gpl2Plus;
- maintainers = with maintainers; [ MP2E ];
+ maintainers = with maintainers; [ MP2E ashkitten ];
branch = "master";
# x86_32 is an unsupported platform.
# Enable generic build if you really want a JIT-less binary.
diff --git a/pkgs/misc/seafile-shared/default.nix b/pkgs/misc/seafile-shared/default.nix
index a75c6c1ec76d..d68ac0f9fc19 100644
--- a/pkgs/misc/seafile-shared/default.nix
+++ b/pkgs/misc/seafile-shared/default.nix
@@ -1,14 +1,14 @@
{stdenv, fetchFromGitHub, which, autoreconfHook, pkgconfig, curl, vala, python, intltool, fuse, ccnet}:
stdenv.mkDerivation rec {
- version = "6.2.11";
+ version = "7.0.2";
name = "seafile-shared-${version}";
src = fetchFromGitHub {
owner = "haiwen";
repo = "seafile";
rev = "v${version}";
- sha256 = "16d4m5n5zhip13l6pv951lm081pnwxpiqcm7j4gxqm1ian48m787";
+ sha256 = "0633hhz2cky95y8mvrg9q2cyrnzpnzvn8fcq350wl4a64ij6wa04";
};
nativeBuildInputs = [ pkgconfig which autoreconfHook vala intltool ];
diff --git a/pkgs/misc/themes/adwaita-qt/default.nix b/pkgs/misc/themes/adwaita-qt/default.nix
index f2a682bcf7dc..9b979a11b93b 100644
--- a/pkgs/misc/themes/adwaita-qt/default.nix
+++ b/pkgs/misc/themes/adwaita-qt/default.nix
@@ -1,16 +1,14 @@
-{ stdenv, fetchFromGitHub, cmake, ninja, qtbase }:
+{ mkDerivation, lib, fetchFromGitHub, cmake, ninja, qtbase }:
-stdenv.mkDerivation rec {
+mkDerivation rec {
pname = "adwaita-qt";
- version = "1.0";
-
- name = "${pname}-${version}";
+ version = "1.1.0";
src = fetchFromGitHub {
owner = "FedoraQt";
repo = pname;
rev = version;
- sha256 = "0xn8bianmdj15k11mnw52by9vxkmvpqr2s304kl3dbjj1l7v4cd7";
+ sha256 = "1jlh4l3sxiwglgx6h4aqi364gr4xipmn09bk88cp997r9sm8jcp9";
};
nativeBuildInputs = [
@@ -28,7 +26,7 @@ stdenv.mkDerivation rec {
--replace "DESTINATION \"\''${QT_PLUGINS_DIR}/styles" "DESTINATION \"$qtPluginPrefix/styles"
'';
- meta = with stdenv.lib; {
+ meta = with lib; {
description = "A style to bend Qt applications to look like they belong into GNOME Shell";
homepage = https://github.com/FedoraQt/adwaita-qt;
license = licenses.gpl2Plus;
diff --git a/pkgs/misc/themes/kde2/default.nix b/pkgs/misc/themes/kde2/default.nix
index 91584bfa1fe3..8adf6a1e4330 100644
--- a/pkgs/misc/themes/kde2/default.nix
+++ b/pkgs/misc/themes/kde2/default.nix
@@ -1,10 +1,10 @@
-{ stdenv, fetchFromGitHub
+{ stdenv, fetchFromGitHub, mkDerivation
, cmake, extra-cmake-modules
, qtbase, kcoreaddons, kdecoration }:
let
version = "2017-03-15";
-in stdenv.mkDerivation rec {
+in mkDerivation rec {
name = "kde2-decoration-${version}";
src = fetchFromGitHub {
diff --git a/pkgs/misc/themes/qtcurve/default.nix b/pkgs/misc/themes/qtcurve/default.nix
index 54715c01a9ee..348b4ae4eb94 100644
--- a/pkgs/misc/themes/qtcurve/default.nix
+++ b/pkgs/misc/themes/qtcurve/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, extra-cmake-modules, pkgconfig
+{ stdenv, fetchurl, cmake, extra-cmake-modules, pkgconfig, mkDerivation
, gtk2, qtbase, qtsvg, qtx11extras # Toolkit dependencies
, karchive, kconfig, kconfigwidgets, kio, frameworkintegration
, kguiaddons, ki18n, kwindowsystem, kdelibs4support, kiconthemes
@@ -7,7 +7,7 @@
let
version = "1.9";
-in stdenv.mkDerivation {
+in mkDerivation {
name = "qtcurve-${version}";
src = fetchurl {
url = "http://download.kde.org/stable/qtcurve/qtcurve-${version}.tar.xz";
diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index 7ad6283c9308..4dcfbeecb76d 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -39,12 +39,12 @@ let
agda-vim = buildVimPluginFrom2Nix {
pname = "agda-vim";
- version = "2019-01-23";
+ version = "2019-08-04";
src = fetchFromGitHub {
owner = "derekelkins";
repo = "agda-vim";
- rev = "06efbd079a7dfc0a8b079aed4509e17113cc0977";
- sha256 = "06i9m2xbdsp704d71zv6jcbbn7ibp3fy3wn823azkjcnk317n73i";
+ rev = "4fc0a0a95a347b7b98715a78b6f41edd5aa084c5";
+ sha256 = "15zzc1aqzflw36462ka5914cmfqckciqcgcff0kfmzglfcx7is6z";
};
};
@@ -61,12 +61,12 @@ let
ale = buildVimPluginFrom2Nix {
pname = "ale";
- version = "2019-08-02";
+ version = "2019-08-12";
src = fetchFromGitHub {
owner = "w0rp";
repo = "ale";
- rev = "dd1e1025b8a9b13cb7966bf2baa3e6b42a862857";
- sha256 = "0rgfsnx4dbigbc17r3ksvikmdkyfz3fl4g78nd31lxhsn3x5akcj";
+ rev = "28c93ab1854ef41a46855401cc4addbaf7dfb9d4";
+ sha256 = "12kfvnycdf4sshajhzj3b5l92zbdgvnj1sdzfj7mc77d0k4mzskq";
};
};
@@ -303,34 +303,34 @@ let
coc-git = buildVimPluginFrom2Nix {
pname = "coc-git";
- version = "2019-07-24";
+ version = "2019-08-11";
src = fetchFromGitHub {
owner = "neoclide";
repo = "coc-git";
- rev = "e7f37ceaf250b152de5712454f42172337cb8a0f";
- sha256 = "0p2m3gwhjifbf53g68r8prg7rz7gm5nzv9hw4ar6msy61rmjpy56";
+ rev = "30021c6a3aa7a33617ce1cb187468851bbaf1eb5";
+ sha256 = "09r0ygsjv5d3v6js1ghb49j74plp0jkja2pmd1pbjgafxm02mb2y";
};
};
coc-go = buildVimPluginFrom2Nix {
pname = "coc-go";
- version = "2019-08-02";
+ version = "2019-08-06";
src = fetchFromGitHub {
owner = "josa42";
repo = "coc-go";
- rev = "6a4b1485dbbd1e4bbc18a03beaeebe3cc6018e8f";
- sha256 = "1nd9fph6yvg1n7cabd5li9qxs3b2g0v3q7qq1n1xmp3n49c5m0nr";
+ rev = "3f2748c87c89242c59d3583e8effa0de76c8abe7";
+ sha256 = "1c7v1j3vny20dkc898hgr6val3jk1vc2aswsqm3cb2c3mqwhsrls";
};
};
coc-highlight = buildVimPluginFrom2Nix {
pname = "coc-highlight";
- version = "2019-07-01";
+ version = "2019-08-03";
src = fetchFromGitHub {
owner = "neoclide";
repo = "coc-highlight";
- rev = "00e3cc159b3ce427d9f4e7993bcd963f37a3eb54";
- sha256 = "0q9dfnn598499b8r9nsw0fi5ng873rvhwl5l70zqnc8ny9rbv74r";
+ rev = "b84cfa2738ab0843217c742eb69b4b6e630d45fa";
+ sha256 = "0yrl29fdn0hwyiz4z75km1gidc4bkx1ra6g1pfddlwbbjj32lbqp";
};
};
@@ -391,12 +391,12 @@ let
coc-lists = buildVimPluginFrom2Nix {
pname = "coc-lists";
- version = "2019-08-01";
+ version = "2019-08-12";
src = fetchFromGitHub {
owner = "neoclide";
repo = "coc-lists";
- rev = "999865c6bd3745689d1eb4009b9b706cb5a68617";
- sha256 = "0sq9im0bbbpsjcf22frn24rb5apxf3sravqhlvwkh34wh9qjvzgy";
+ rev = "2c502ceec9816259350969970e76402c984ac4f9";
+ sha256 = "1ic62ba9w4diajd1d65xpqxkb3kjpp3d09p1n7pv8341w015zcf9";
};
};
@@ -413,12 +413,12 @@ let
coc-pairs = buildVimPluginFrom2Nix {
pname = "coc-pairs";
- version = "2019-07-25";
+ version = "2019-08-07";
src = fetchFromGitHub {
owner = "neoclide";
repo = "coc-pairs";
- rev = "3070d22f15c8e41ff01aed9b6b9a377ae5f0358a";
- sha256 = "00ixzdn3wpwm3pp0b87l4bvln9nrmqcd0k5c851x6bif06gsnydz";
+ rev = "51e404a60fa0461ebfaea4ba1311357b8825e73f";
+ sha256 = "0sz45z7i7fqnvl4968dalksz9qk0al6a57wyyhyl7rx1wv67vaya";
};
};
@@ -490,12 +490,12 @@ let
coc-solargraph = buildVimPluginFrom2Nix {
pname = "coc-solargraph";
- version = "2019-06-21";
+ version = "2019-08-11";
src = fetchFromGitHub {
owner = "neoclide";
repo = "coc-solargraph";
- rev = "f7732c49d5173a4f32f3419eaf591857b9d753cb";
- sha256 = "14fcl9zwyq8rpc9pdbydsf1jilc8wmylvs8wjc13l8h3avndpkwd";
+ rev = "6a146623192e661e18830c58abe1055fddcf57d7";
+ sha256 = "1mc8jqpgwy5q4jzb5p09j5mal9paq50dl1hsxhg0y5q6rqrr7qhz";
};
};
@@ -512,12 +512,12 @@ let
coc-tabnine = buildVimPluginFrom2Nix {
pname = "coc-tabnine";
- version = "2019-07-21";
+ version = "2019-08-11";
src = fetchFromGitHub {
owner = "neoclide";
repo = "coc-tabnine";
- rev = "4cddbdc9ecb92fb1633bd3b89bb9aacc3a5504ce";
- sha256 = "08k6vmdzgws6f9461gjc4psqn2ypwf1nz9sjncs1vddckxwxl9k3";
+ rev = "819e2c523df6f809e0f83e4b5079bc9702adbe66";
+ sha256 = "1l1hajj7hihm5klar28j6jqsad6bnjcy3h2cddvhav