diff options
author | John Ericson <John.Ericson@Obsidian.Systems> | 2017-09-28 12:32:57 -0400 |
---|---|---|
committer | John Ericson <John.Ericson@Obsidian.Systems> | 2017-09-28 12:32:57 -0400 |
commit | f037625f87b0b1d8852a1f31ebaece5fdbc87a2b (patch) | |
tree | af8c8369954890db69195a1e9394ce16c7640d7f /pkgs/misc | |
parent | f08d6f0e2daf9f3d9daa070eee223855b33c430d (diff) | |
parent | 4e22e88b914ffb63393449c5e20fe8843a7ce93b (diff) |
Merge remote-tracking branch 'upstream/staging' into deps-reorg
Diffstat (limited to 'pkgs/misc')
-rw-r--r-- | pkgs/misc/apulse/default.nix | 11 | ||||
-rw-r--r-- | pkgs/misc/drivers/hplip/3.16.11.nix (renamed from pkgs/misc/drivers/hplip/3.15.9.nix) | 96 | ||||
-rw-r--r-- | pkgs/misc/drivers/hplip/default.nix | 48 | ||||
-rw-r--r-- | pkgs/misc/emulators/epsxe/default.nix | 55 | ||||
-rw-r--r-- | pkgs/misc/emulators/snes9x-gtk/default.nix | 37 | ||||
-rw-r--r-- | pkgs/misc/emulators/wine/sources.nix | 6 | ||||
-rw-r--r-- | pkgs/misc/jackaudio/clang.patch | 22 | ||||
-rw-r--r-- | pkgs/misc/jackaudio/darwin-cf.patch | 49 | ||||
-rw-r--r-- | pkgs/misc/jackaudio/default.nix | 28 | ||||
-rw-r--r-- | pkgs/misc/logging/beats/default.nix | 2 | ||||
-rw-r--r-- | pkgs/misc/screensavers/slock/default.nix | 2 | ||||
-rw-r--r-- | pkgs/misc/themes/flat-plat/default.nix | 4 | ||||
-rw-r--r-- | pkgs/misc/themes/gtk3/numix-solarized-gtk-theme/default.nix | 35 | ||||
-rw-r--r-- | pkgs/misc/tw-rs/default.nix | 6 | ||||
-rw-r--r-- | pkgs/misc/vim-plugins/default.nix | 46 | ||||
-rw-r--r-- | pkgs/misc/vim-plugins/vim-plugin-names | 4 | ||||
-rw-r--r-- | pkgs/misc/vim-plugins/vim-utils.nix | 8 |
17 files changed, 357 insertions, 102 deletions
diff --git a/pkgs/misc/apulse/default.nix b/pkgs/misc/apulse/default.nix index 12d774467c522..4b2323eaa7169 100644 --- a/pkgs/misc/apulse/default.nix +++ b/pkgs/misc/apulse/default.nix @@ -2,17 +2,20 @@ stdenv.mkDerivation rec { name = "apulse-${version}"; - version = "0.1.6"; + version = "0.1.10"; src = fetchFromGitHub { owner = "i-rinat"; repo = "apulse"; rev = "v${version}"; - sha256 = "1w0mqa8gcrvvlns3pryhmlsc0g1irdnwsawx4g34wgwrp9paqqzm"; + sha256 = "018gaxn647wz1vjbr49hfrch9svnv0d1nzijc8ckb4fsr8vv95a1"; }; - buildInputs = - [ alsaLib cmake pkgconfig glib ]; + enableParallelBuilding = true; + + nativeBuildInputs = [ cmake pkgconfig ]; + + buildInputs = [ alsaLib glib ]; meta = with stdenv.lib; { description = "PulseAudio emulation for ALSA"; diff --git a/pkgs/misc/drivers/hplip/3.15.9.nix b/pkgs/misc/drivers/hplip/3.16.11.nix index ae96a946e79d1..f538066e75ce3 100644 --- a/pkgs/misc/drivers/hplip/3.15.9.nix +++ b/pkgs/misc/drivers/hplip/3.16.11.nix @@ -1,66 +1,62 @@ { stdenv, fetchurl, substituteAll , pkgconfig +, makeWrapper , cups, zlib, libjpeg, libusb1, pythonPackages, sane-backends, dbus, usbutils -, net_snmp, polkit +, net_snmp, openssl, polkit, nettools , bash, coreutils, utillinux -, qtSupport ? true, qt4 +, qtSupport ? true , withPlugin ? false }: let name = "hplip-${version}"; - version = "3.15.9"; + version = "3.16.11"; src = fetchurl { url = "mirror://sourceforge/hplip/${name}.tar.gz"; - sha256 = "0vcxz3gsqcamlzx61xm77h7c769ya8kdhzwafa9w2wvkf3l8zxd1"; + sha256 = "094vkyr0rjng72m13dgr824cdl7q20x23qjxzih4w7l9njn0rqpn"; }; plugin = fetchurl { url = "http://www.openprinting.org/download/printdriver/auxfiles/HP/plugins/${name}-plugin.run"; - sha256 = "1ahalw83xm8x0h6hljhnkknry1hny9flkrlzcymv8nmwgic0kjgs"; + sha256 = "1y3wdax2wb6kdd8bi40wl7v9s8ffyjz95bz42sjcpzzddmlhcaxg"; }; - hplipState = - substituteAll - { - inherit version; - src = ./hplip.state; - }; - - hplipPlatforms = - { - "i686-linux" = "x86_32"; - "x86_64-linux" = "x86_64"; - "armv6l-linux" = "arm32"; - "armv7l-linux" = "arm32"; - }; + hplipState = substituteAll { + inherit version; + src = ./hplip.state; + }; + + hplipPlatforms = { + "i686-linux" = "x86_32"; + "x86_64-linux" = "x86_64"; + "armv6l-linux" = "arm32"; + "armv7l-linux" = "arm32"; + }; hplipArch = hplipPlatforms."${stdenv.system}" or (throw "HPLIP not supported on ${stdenv.system}"); - pluginArches = [ "x86_32" "x86_64" ]; + pluginArches = [ "x86_32" "x86_64" "arm32" ]; in assert withPlugin -> builtins.elem hplipArch pluginArches || throw "HPLIP plugin not supported on ${stdenv.system}"; -stdenv.mkDerivation { - inherit name src version; +pythonPackages.buildPythonApplication { + inherit name src; + format = "other"; buildInputs = [ libjpeg cups libusb1 - pythonPackages.python - pythonPackages.wrapPython sane-backends dbus net_snmp - ] ++ stdenv.lib.optionals qtSupport [ - qt4 + openssl ]; nativeBuildInputs = [ @@ -71,13 +67,14 @@ stdenv.mkDerivation { dbus pillow pygobject2 - recursivePthLoader reportlab usbutils ] ++ stdenv.lib.optionals qtSupport [ pyqt4 ]; + makeWrapperArgs = [ ''--prefix PATH : "${nettools}/bin"'' ]; + prePatch = '' # HPLIP hardcodes absolute paths everywhere. Nuke from orbit. find . -type f -exec sed -i \ @@ -92,6 +89,7 @@ stdenv.mkDerivation { preConfigure = '' export configureFlags="$configureFlags + --with-hpppddir=$out/share/cups/model/HP --with-cupsfilterdir=$out/lib/cups/filter --with-cupsbackenddir=$out/lib/cups/backend --with-icondir=$out/share/applications @@ -148,32 +146,30 @@ stdenv.mkDerivation { rm $out/etc/udev/rules.d/56-hpmud.rules ''; - fixupPhase = '' - # Wrap the user-facing Python scripts in $out/bin without turning the - # ones in $out /share into shell scripts (they need to be importable). - # Note that $out/bin contains only symlinks to $out/share. + # The installed executables are just symlinks into $out/share/hplip, + # but wrapPythonPrograms ignores symlinks. We cannot replace the Python + # modules in $out/share/hplip with wrapper scripts because they import + # each other as libraries. Instead, we emulate wrapPythonPrograms by + # 1. Calling patchPythonProgram on the original script in $out/share/hplip + # 2. Making our own wrapper pointing directly to the original script. + dontWrapPythonPrograms = true; + preFixup = '' + buildPythonPath "$out $pythonPath" + for bin in $out/bin/*; do - py=`readlink -m $bin` + py=$(readlink -m $bin) rm $bin - cp $py $bin - wrapPythonProgramsIn $bin "$out $pythonPath" - sed -i "s@$(dirname $bin)/[^ ]*@$py@g" $bin + echo "patching \`$py'..." + patchPythonScript "$py" + echo "wrapping \`$bin'..." + makeWrapper "$py" "$bin" \ + --prefix PATH ':' "$program_PATH" \ + --set PYTHONNOUSERSITE "true" \ + $makeWrapperArgs done + ''; - # Remove originals. Knows a little too much about wrapPythonProgramsIn. - rm -f $out/bin/.*-wrapped - - # Merely patching shebangs in $out/share does not cause trouble. - for i in $out/share/hplip{,/*}/*.py; do - substituteInPlace $i \ - --replace /usr/bin/python \ - ${pythonPackages.python}/bin/${pythonPackages.python.executable} \ - --replace "/usr/bin/env python" \ - ${pythonPackages.python}/bin/${pythonPackages.python.executable} - done - - wrapPythonProgramsIn $out/lib "$out $pythonPath" - + postFixup = '' substituteInPlace $out/etc/hp/hplip.conf --replace /usr $out '' + stdenv.lib.optionalString (!withPlugin) '' # A udev rule to notify users that they need the binary plugin. @@ -192,6 +188,6 @@ stdenv.mkDerivation { then licenses.unfree else with licenses; [ mit bsd2 gpl2Plus ]; platforms = [ "i686-linux" "x86_64-linux" "armv6l-linux" "armv7l-linux" ]; - maintainers = with maintainers; [ jgeerds nckx ]; + maintainers = with maintainers; [ jgeerds ttuegel ]; }; } diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix index 6adc2a765c7fe..a01fc74ce471b 100644 --- a/pkgs/misc/drivers/hplip/default.nix +++ b/pkgs/misc/drivers/hplip/default.nix @@ -4,23 +4,23 @@ , cups, zlib, libjpeg, libusb1, pythonPackages, sane-backends, dbus, usbutils , net_snmp, openssl, polkit, nettools , bash, coreutils, utillinux -, qtSupport ? true +, withQt5 ? true , withPlugin ? false }: let name = "hplip-${version}"; - version = "3.16.11"; + version = "3.17.9"; src = fetchurl { url = "mirror://sourceforge/hplip/${name}.tar.gz"; - sha256 = "094vkyr0rjng72m13dgr824cdl7q20x23qjxzih4w7l9njn0rqpn"; + sha256 = "0y46jjq8jdfk9m4vjq55h8yggibvqbi9rl08vni7vbhxym1diamj"; }; plugin = fetchurl { - url = "http://www.openprinting.org/download/printdriver/auxfiles/HP/plugins/${name}-plugin.run"; - sha256 = "1y3wdax2wb6kdd8bi40wl7v9s8ffyjz95bz42sjcpzzddmlhcaxg"; + url = "http://hplipopensource.com/hplip-web/plugin/${name}-plugin.run"; + sha256 = "10z8vzwcwmwni7s4j9xp0fa7l4lwrhl4kp450dga3fj0cck1gxwq"; }; hplipState = substituteAll { @@ -61,19 +61,20 @@ pythonPackages.buildPythonApplication { nativeBuildInputs = [ pkgconfig - makeWrapper ]; - propagatedBuildInputs = with pythonPackages; [ + pythonPath = with pythonPackages; [ dbus pillow pygobject2 reportlab usbutils - ] ++ stdenv.lib.optionals qtSupport [ - pyqt4 + ] ++ stdenv.lib.optionals withQt5 [ + pyqt5 ]; + makeWrapperArgs = [ ''--prefix PATH : "${nettools}/bin"'' ]; + prePatch = '' # HPLIP hardcodes absolute paths everywhere. Nuke from orbit. find . -type f -exec sed -i \ @@ -88,6 +89,7 @@ pythonPackages.buildPythonApplication { preConfigure = '' export configureFlags="$configureFlags + --with-hpppddir=$out/share/cups/model/HP --with-cupsfilterdir=$out/lib/cups/filter --with-cupsbackenddir=$out/lib/cups/backend --with-icondir=$out/share/applications @@ -144,10 +146,30 @@ pythonPackages.buildPythonApplication { rm $out/etc/udev/rules.d/56-hpmud.rules ''; - postFixup = '' - wrapProgram $out/lib/cups/filter/hpps \ - --prefix PATH : "${nettools}/bin" + # The installed executables are just symlinks into $out/share/hplip, + # but wrapPythonPrograms ignores symlinks. We cannot replace the Python + # modules in $out/share/hplip with wrapper scripts because they import + # each other as libraries. Instead, we emulate wrapPythonPrograms by + # 1. Calling patchPythonProgram on the original script in $out/share/hplip + # 2. Making our own wrapper pointing directly to the original script. + dontWrapPythonPrograms = true; + preFixup = '' + buildPythonPath "$out $pythonPath" + + for bin in $out/bin/*; do + py=$(readlink -m $bin) + rm $bin + echo "patching \`$py'..." + patchPythonScript "$py" + echo "wrapping \`$bin'..." + makeWrapper "$py" "$bin" \ + --prefix PATH ':' "$program_PATH" \ + --set PYTHONNOUSERSITE "true" \ + $makeWrapperArgs + done + ''; + postFixup = '' substituteInPlace $out/etc/hp/hplip.conf --replace /usr $out '' + stdenv.lib.optionalString (!withPlugin) '' # A udev rule to notify users that they need the binary plugin. @@ -166,6 +188,6 @@ pythonPackages.buildPythonApplication { then licenses.unfree else with licenses; [ mit bsd2 gpl2Plus ]; platforms = [ "i686-linux" "x86_64-linux" "armv6l-linux" "armv7l-linux" ]; - maintainers = with maintainers; [ jgeerds nckx ]; + maintainers = with maintainers; [ jgeerds ttuegel ]; }; } diff --git a/pkgs/misc/emulators/epsxe/default.nix b/pkgs/misc/emulators/epsxe/default.nix new file mode 100644 index 0000000000000..e367d6a149841 --- /dev/null +++ b/pkgs/misc/emulators/epsxe/default.nix @@ -0,0 +1,55 @@ +{ stdenv, fetchurl, alsaLib, curl, gdk_pixbuf, gcc, glib, gtk3, + libX11, openssl, ncurses5, SDL, SDL_ttf, unzip, zlib, wrapGAppsHook }: + +with stdenv.lib; + +stdenv.mkDerivation rec { + name = "epsxe-${version}"; + version = "2.0.5"; + + src = with stdenv.lib; let + version2 = concatStrings (splitString "." version); + platform = "linux" + (optionalString stdenv.is64bit "_x64"); + in fetchurl { + url = "http://www.epsxe.com/files/ePSXe${version2}${platform}.zip"; + sha256 = if stdenv.is64bit + then "16fa9qc2xhaz1f6294m0b56s5l86cbmclwm9w3mqnch0yjsrvab0" + else "1677lclam557kp8jwvchdrk27zfj50fqx2q9i3bcx26d9k61q3kl"; + }; + + nativeBuildInputs = [ unzip wrapGAppsHook ]; + sourceRoot = "."; + + buildInputs = [ + alsaLib + curl + gdk_pixbuf + glib + gtk3 + libX11 + openssl + ncurses5 + SDL + SDL_ttf + stdenv.cc.cc.lib + zlib + ]; + + dontStrip = true; + + installPhase = '' + install -D ${if stdenv.is64bit then "epsxe_x64" else "ePSXe"} $out/bin/epsxe + patchelf \ + --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) \ + --set-rpath ${makeLibraryPath buildInputs} \ + $out/bin/epsxe + ''; + + meta = { + homepage = http://epsxe.com/; + description = "Enhanced PSX (PlayStation 1) emulator"; + license = licenses.unfree; + maintainers = with maintainers; [ yegortimoshenko ]; + platforms = [ "i686-linux" "x86_64-linux" ]; + }; +} diff --git a/pkgs/misc/emulators/snes9x-gtk/default.nix b/pkgs/misc/emulators/snes9x-gtk/default.nix index a45bb0b2ba1e4..f2d3abc0de3b9 100644 --- a/pkgs/misc/emulators/snes9x-gtk/default.nix +++ b/pkgs/misc/emulators/snes9x-gtk/default.nix @@ -1,27 +1,26 @@ -{stdenv, fetchurl, nasm, SDL, zlib, libpng, ncurses, mesa, intltool, gtk2, pkgconfig, libxml2, xlibsWrapper, libpulseaudio}: +{ stdenv, fetchFromGitHub, autoreconfHook, intltool, pkgconfig +, SDL, zlib, gtk2, libxml2, libXv }: stdenv.mkDerivation rec { name = "snes9x-gtk-${version}"; - version = "1.53"; + version = "1.54.1"; - src = fetchurl { - url = "http://files.ipherswipsite.com/snes9x/snes9x-${version}-src.tar.bz2"; - sha256 = "9f7c5d2d0fa3fe753611cf94e8879b73b8bb3c0eab97cdbcb6ab7376efa78dc3"; + src = fetchFromGitHub { + owner = "snes9xgit"; + repo = "snes9x"; + rev = version; + sha256 = "10fqm7lk36zj2gnx0ypps0nlws923f60b0zj4pmq9apawgx8k6rw"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ nasm SDL zlib libpng ncurses mesa intltool gtk2 libxml2 xlibsWrapper libpulseaudio]; + nativeBuildInputs = [ autoreconfHook intltool pkgconfig ]; - sourceRoot = "snes9x-${version}-src/gtk"; + sourceRoot = "snes9x-${version}-src"; + preAutoreconf = "cd gtk; intltoolize"; + + buildInputs = [ SDL zlib gtk2 libxml2 libXv ]; + installPhase = "install -Dt $out/bin snes9x-gtk"; - configureFlags = "--prefix=$out/ --with-opengl"; - - installPhase = '' - mkdir -p $out/bin - cp snes9x-gtk $out/bin - ''; - - meta = { + meta = with stdenv.lib; { description = "A portable, freeware Super Nintendo Entertainment System (SNES) emulator"; longDescription = '' Snes9x is a portable, freeware Super Nintendo Entertainment System (SNES) @@ -29,9 +28,9 @@ stdenv.mkDerivation rec { and Super Famicom Nintendo game systems on your PC or Workstation; which includes some real gems that were only ever released in Japan. ''; - license = stdenv.lib.licenses.lgpl2; - maintainers = [ stdenv.lib.maintainers.qknight ]; + license = licenses.lgpl2; + maintainers = with maintainers; [ qknight ]; homepage = http://www.snes9x.com/; - platforms = stdenv.lib.platforms.linux; + platforms = platforms.linux; }; } diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix index c3db9b06ef57e..aaaec67c751ec 100644 --- a/pkgs/misc/emulators/wine/sources.nix +++ b/pkgs/misc/emulators/wine/sources.nix @@ -32,15 +32,15 @@ in rec { unstable = fetchurl rec { # NOTE: Don't forget to change the SHA256 for staging as well. - version = "2.16"; + version = "2.17"; url = "https://dl.winehq.org/wine/source/2.x/wine-${version}.tar.xz"; - sha256 = "089cvb7gvhcq5kx1h114fmr09fmj84cz2bjvisa48v6dpv5fsqd5"; + sha256 = "0sgazjn30ki2y3bjrd0xbpf870ii22wkyrmgaxcwbk23j1rrbp3y"; inherit (stable) mono gecko32 gecko64; }; staging = fetchFromGitHub rec { inherit (unstable) version; - sha256 = "1q9dnifz02l96s1bafb4w2z779k8ancl37zd7wxbkf0ks2vrnln0"; + sha256 = "11jm39g1kc77fvn02j9g8syyc095b6w2jashyr28v4gi7g0fqv6h"; owner = "wine-compholio"; repo = "wine-staging"; rev = "v${version}"; diff --git a/pkgs/misc/jackaudio/clang.patch b/pkgs/misc/jackaudio/clang.patch new file mode 100644 index 0000000000000..131f8c4c04dd4 --- /dev/null +++ b/pkgs/misc/jackaudio/clang.patch @@ -0,0 +1,22 @@ +diff --git a/tests/test.cpp b/tests/test.cpp +index 8a8a811..31e8459 100644 +--- a/tests/test.cpp ++++ b/tests/test.cpp +@@ -479,7 +479,7 @@ int process4(jack_nframes_t nframes, void *arg) + jack_nframes_t delta_time = cur_time - last_time; + + Log("calling process4 callback : jack_frame_time = %ld delta_time = %ld\n", cur_time, delta_time); +- if (delta_time > 0 && (jack_nframes_t)abs(delta_time - cur_buffer_size) > tolerance) { ++ if (delta_time > 0 && (jack_nframes_t)fabs(delta_time - cur_buffer_size) > tolerance) { + printf("!!! ERROR !!! jack_frame_time seems to return incorrect values cur_buffer_size = %d, delta_time = %d tolerance %d\n", cur_buffer_size, delta_time, tolerance); + } + +@@ -1064,7 +1064,7 @@ int main (int argc, char *argv[]) + } + jack_sleep(1 * 1000); + cur_buffer_size = jack_get_buffer_size(client1); +- if (abs((old_buffer_size * factor) - cur_buffer_size) > 5) { // Tolerance needed for dummy driver... ++ if (fabs((old_buffer_size * factor) - cur_buffer_size) > 5) { // Tolerance needed for dummy driver... + printf("!!! ERROR !!! Buffer size has not been changed !\n"); + printf("!!! Maybe jack was compiled without the '--enable-resize' flag...\n"); + } else { diff --git a/pkgs/misc/jackaudio/darwin-cf.patch b/pkgs/misc/jackaudio/darwin-cf.patch new file mode 100644 index 0000000000000..0fc0902a0c480 --- /dev/null +++ b/pkgs/misc/jackaudio/darwin-cf.patch @@ -0,0 +1,49 @@ +diff --git a/common/Jackdmp.cpp b/common/Jackdmp.cpp +index 7eea281..4b8d75d 100644 +--- a/common/Jackdmp.cpp ++++ b/common/Jackdmp.cpp +@@ -50,43 +50,11 @@ are "hard-coded" in the source. A much better approach would be to use the contr + - get available drivers and their possible parameters, then prepare to parse them. + */ + +-#ifdef __APPLE__ +-#include <CoreFoundation/CFNotificationCenter.h> +-#include <CoreFoundation/CoreFoundation.h> +- +-static void notify_server_start(const char* server_name) +-{ +- // Send notification to be used in the JackRouter plugin +- CFStringRef ref = CFStringCreateWithCString(NULL, server_name, kCFStringEncodingMacRoman); +- CFNotificationCenterPostNotificationWithOptions(CFNotificationCenterGetDistributedCenter(), +- CFSTR("com.grame.jackserver.start"), +- ref, +- NULL, +- kCFNotificationDeliverImmediately | kCFNotificationPostToAllSessions); +- CFRelease(ref); +-} +- +-static void notify_server_stop(const char* server_name) +-{ +- // Send notification to be used in the JackRouter plugin +- CFStringRef ref1 = CFStringCreateWithCString(NULL, server_name, kCFStringEncodingMacRoman); +- CFNotificationCenterPostNotificationWithOptions(CFNotificationCenterGetDistributedCenter(), +- CFSTR("com.grame.jackserver.stop"), +- ref1, +- NULL, +- kCFNotificationDeliverImmediately | kCFNotificationPostToAllSessions); +- CFRelease(ref1); +-} +- +-#else +- + static void notify_server_start(const char* server_name) + {} + static void notify_server_stop(const char* server_name) + {} + +-#endif +- + static void copyright(FILE* file) + { + fprintf(file, "jackdmp " VERSION "\n" + diff --git a/pkgs/misc/jackaudio/default.nix b/pkgs/misc/jackaudio/default.nix index 52f288deba339..20da91efede8d 100644 --- a/pkgs/misc/jackaudio/default.nix +++ b/pkgs/misc/jackaudio/default.nix @@ -1,9 +1,12 @@ { stdenv, fetchFromGitHub, pkgconfig, python2Packages, makeWrapper , bash, libsamplerate, libsndfile, readline, eigen, celt +# Darwin Dependencies +, aften, AudioToolbox, CoreAudio, CoreFoundation # Optional Dependencies , dbus ? null, libffado ? null, alsaLib ? null , libopus ? null +, darwin # Extra options , prefix ? "" @@ -16,7 +19,7 @@ let libOnly = prefix == "lib"; - optDbus = shouldUsePkg dbus; + optDbus = if stdenv.isDarwin then null else shouldUsePkg dbus; optPythonDBus = if libOnly then null else shouldUsePkg dbus-python; optLibffado = if libOnly then null else shouldUsePkg libffado; optAlsaLib = if libOnly then null else shouldUsePkg alsaLib; @@ -34,21 +37,36 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig python makeWrapper ]; - buildInputs = [ python libsamplerate libsndfile readline eigen celt + buildInputs = [ libsamplerate libsndfile readline eigen celt optDbus optPythonDBus optLibffado optAlsaLib optLibopus - ]; + ] ++ stdenv.lib.optionals stdenv.isDarwin [ aften AudioToolbox CoreAudio CoreFoundation ]; - patchPhase = '' - substituteInPlace svnversion_regenerate.sh --replace /bin/bash ${bash}/bin/bash + # CoreFoundation 10.10 doesn't include CFNotificationCenter.h yet. + patches = stdenv.lib.optionals stdenv.isDarwin [ ./clang.patch ./darwin-cf.patch ]; + + prePatch = '' + substituteInPlace svnversion_regenerate.sh \ + --replace /bin/bash ${bash}/bin/bash + ''; + + # It looks like one of the frameworks depends on <CoreFoundation/CFAttributedString.h> + # since frameworks are impure we also have to use the impure CoreFoundation here. + # FIXME: remove when CoreFoundation is updated to 10.11 + preConfigure = stdenv.lib.optionalString stdenv.isDarwin '' + export NIX_CFLAGS_COMPILE="-F${CoreFoundation}/Library/Frameworks $NIX_CFLAGS_COMPILE" ''; configurePhase = '' + runHook preConfigure + python waf configure --prefix=$out \ ${optionalString (optDbus != null) "--dbus"} \ --classic \ ${optionalString (optLibffado != null) "--firewire"} \ ${optionalString (optAlsaLib != null) "--alsa"} \ --autostart=${if (optDbus != null) then "dbus" else "classic"} \ + + runHook postConfigure ''; buildPhase = '' diff --git a/pkgs/misc/logging/beats/default.nix b/pkgs/misc/logging/beats/default.nix index 2b555978edc33..e3333fa5caacd 100644 --- a/pkgs/misc/logging/beats/default.nix +++ b/pkgs/misc/logging/beats/default.nix @@ -8,7 +8,7 @@ let beat = package : extraArgs : buildGoPackage (rec { owner = "elastic"; repo = "beats"; rev = "v${version}"; - sha256 = "0vzjlgc0sym3kh6nflf2iyy2k3gxd7zwq8ma0cd7kpf42vxwhvqy"; + sha256 = "1lbdi4c0y4bfkmim9q98ravknv4yw0dl3z57c3w5aqhi2sx0w23h"; }; goPackagePath = "github.com/elastic/beats"; diff --git a/pkgs/misc/screensavers/slock/default.nix b/pkgs/misc/screensavers/slock/default.nix index 55765a520da2c..6b310236de426 100644 --- a/pkgs/misc/screensavers/slock/default.nix +++ b/pkgs/misc/screensavers/slock/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { installFlags = "DESTDIR=\${out} PREFIX="; - patchPhase = "sed -i '/chmod u+s/d' Makefile"; + postPatch = "sed -i '/chmod u+s/d' Makefile"; preBuild = optionalString (conf != null) '' cp ${writeText "config.def.h" conf} config.def.h diff --git a/pkgs/misc/themes/flat-plat/default.nix b/pkgs/misc/themes/flat-plat/default.nix index 3c7882e8f9465..cd652440efae2 100644 --- a/pkgs/misc/themes/flat-plat/default.nix +++ b/pkgs/misc/themes/flat-plat/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "flat-plat-gtk-theme-${version}"; - version = "20170605"; + version = "20170917"; src = fetchFromGitHub { owner = "nana-4"; repo = "Flat-Plat"; rev = "v${version}"; - sha256 = "1vcd6mkkfk9a1n5hwpdigvsdsfd8df83kc94w53rs7gw9pqfygya"; + sha256 = "17r4wl27yx49xg0l3s5d67174r63p4cw6cbdmzl81if7iab69hv0"; }; nativeBuildInputs = [ gnome3.glib libxml2 ]; diff --git a/pkgs/misc/themes/gtk3/numix-solarized-gtk-theme/default.nix b/pkgs/misc/themes/gtk3/numix-solarized-gtk-theme/default.nix new file mode 100644 index 0000000000000..4ede14d3bb39e --- /dev/null +++ b/pkgs/misc/themes/gtk3/numix-solarized-gtk-theme/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchFromGitHub, sass, glib, gdk_pixbuf }: + +stdenv.mkDerivation rec { + version = "20160919"; + name = "numix-solarized-gtk-theme-${version}"; + + src = fetchFromGitHub { + owner = "Ferdi265"; + repo = "numix-solarized-gtk-theme"; + rev = version; + sha256 = "0243w918ycmf9vnkzfvwnrxz9zc6xxk7167h8ywxj901pqy59kad"; + }; + + postPatch = '' + substituteInPlace Makefile --replace \ + 'INSTALL_DIR=$(DESTDIR)/usr/share/themes' "INSTALL_DIR=$out/share/themes" + patchShebangs . + ''; + + buildInputs = [sass glib gdk_pixbuf]; + + meta = with stdenv.lib; { + description = "GTK3.20-compatible version of bitterologist's Numix Solarized from deviantart"; + longDescription = '' + This is a fork of the Numix GTK theme that replaces the colors of the theme + and icons to use the solarized theme with a solarized green accent color. + This theme supports both the dark and light theme, just as Numix proper. + ''; + homepage = https://github.com/Ferdi265/numix-solarized-gtk-theme; + downloadPage = https://github.com/Ferdi265/numix-solarized-gtk-theme/releases; + license = licenses.gpl3; + maintainers = [ maintainers.offline ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/misc/tw-rs/default.nix b/pkgs/misc/tw-rs/default.nix index 6c6963303e98f..2459e157a905b 100644 --- a/pkgs/misc/tw-rs/default.nix +++ b/pkgs/misc/tw-rs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, rustPlatform, perl, zlib, openssl }: +{ stdenv, fetchFromGitHub, rustPlatform, perl, zlib, openssl, curl }: rustPlatform.buildRustPackage rec { name = "tw-rs-${version}"; @@ -10,7 +10,9 @@ rustPlatform.buildRustPackage rec { rev = "${version}"; sha256 = "1s1gk2wcs3792gdzrngksczz3gma5kv02ni2jqrhib8l6z8mg9ia"; }; - buildInputs = [ perl zlib openssl ]; + + buildInputs = [ perl zlib openssl ] + ++ stdenv.lib.optional stdenv.isDarwin curl; depsSha256 = "1lg1jh6f9w28i94vaj62r859g6raalxmxabvw7av6sqr0hr56p05"; diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index ee6b0fe8c3752..adc2a6104e7bb 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -16,7 +16,7 @@ in # TL;DR # Add your plugin to ./vim-plugin-names -# Regenerate via `nix-shell -p vimPlugins.pluginnames2nix --command "vim-plugin-names-to-nix"` +# Regenerate via `nix-shell -I nixpkgs=/path/to/your/local/fork -p vimPlugins.pluginnames2nix --command "vim-plugin-names-to-nix"` # Copy the generated expression(s) into this file. # If plugin is complicated then make changes to ./vim2nix/additional-nix-code @@ -495,6 +495,17 @@ rec { }; + LanguageClient-neovim = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "LanguageClient-neovim-2017-09-05"; + src = fetchgit { + url = "https://github.com/autozimu/LanguageClient-neovim"; + rev = "5bfc3492d50c3c48c6e0b0d1899ed2bbca2cf48f"; + sha256 = "1zi3v4yx4hgzfr23377z84yngiqvdwjpdpkn12lpi6irb04q6641"; + }; + dependencies = []; + + }; + clighter8 = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "clighter8-2017-07-23"; src = fetchgit { @@ -641,6 +652,17 @@ rec { }; + xptemplate = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "xptemplate-2017-04-18"; + src = fetchgit { + url = "https://github.com/drmingdrmer/xptemplate"; + rev = "52d84e361e9da53c4309b0d96a1ab667c67b7f07"; + sha256 = "195r5p4cyiip64zmgcih56c59gwm0irgid6cdrqc2y747gyxmf7m"; + }; + dependencies = []; + + }; + neco-ghc = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "neco-ghc-2017-07-22"; src = fetchgit { @@ -1151,6 +1173,17 @@ rec { }; + robotframework-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "robotframework-vim-2017-04-14"; + src = fetchgit { + url = "https://github.com/mfukar/robotframework-vim"; + rev = "75d5b371a4da2a090a2872d55bd0dead013f334e"; + sha256 = "091ac5rq6f1a7j2q3dy9rc00vckv21m4wd29ijj63jannr02v5ad"; + }; + dependencies = []; + + }; + vim-startify = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "vim-startify-2017-06-15"; src = fetchgit { @@ -1363,6 +1396,17 @@ rec { }; + nvim-cm-racer = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "nvim-cm-racer-2017-07-27"; + src = fetchgit { + url = "https://github.com/roxma/nvim-cm-racer"; + rev = "2a8a4a49fa58c5dac9e0bed9511f6928930cacd2"; + sha256 = "1yljxwypgn91084yyicbc2qprn31ld7s4drvnddzczyhzq5m2gpx"; + }; + dependencies = []; + + }; + nvim-completion-manager = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "nvim-completion-manager-2017-09-05"; src = fetchgit { diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 8dd187fe52236..acde3cf2e5b61 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -31,6 +31,7 @@ "github:alvan/vim-closetag" "github:andviro/flake8-vim" "github:ap/vim-css-color" +"github:autozimu/LanguageClient-neovim" "github:bbchung/clighter8" "github:benekastah/neomake" "github:bitc/vim-hdevtools" @@ -44,6 +45,7 @@ "github:digitaltoad/vim-jade" "github:dleonard0/pony-vim-syntax" "github:dracula/vim" +"github:drmingdrmer/xptemplate" "github:eagletmt/neco-ghc" "github:editorconfig/editorconfig-vim" "github:eikenb/acp" @@ -90,6 +92,7 @@ "github:martinda/Jenkinsfile-vim-syntax" "github:megaannum/forms" "github:megaannum/self" +"github:mfukar/robotframework-vim" "github:mhinz/vim-startify" "github:michaeljsmith/vim-indent-object" "github:mileszs/ack.vim" @@ -109,6 +112,7 @@ "github:rhysd/vim-grammarous" "github:rodjek/vim-puppet" "github:roxma/nvim-completion-manager" +"github:roxma/nvim-cm-racer" "github:ryanoasis/vim-devicons" "github:rust-lang/rust.vim" "github:sbdchd/neoformat" diff --git a/pkgs/misc/vim-plugins/vim-utils.nix b/pkgs/misc/vim-plugins/vim-utils.nix index 87b2f9d3e1880..b659266ace7f6 100644 --- a/pkgs/misc/vim-plugins/vim-utils.nix +++ b/pkgs/misc/vim-plugins/vim-utils.nix @@ -383,6 +383,8 @@ rec { unpackPhase ? "", configurePhase ? "", buildPhase ? "", + preInstall ? "", + postInstall ? "", path ? (builtins.parseDrvName name).name, addonInfo ? null, ... @@ -390,9 +392,11 @@ rec { addRtp "${rtpPath}/${path}" (stdenv.mkDerivation (a // { name = namePrefix + name; - inherit unpackPhase configurePhase buildPhase addonInfo; + inherit unpackPhase configurePhase buildPhase addonInfo preInstall postInstall; installPhase = '' + runHook preInstall + target=$out/${rtpPath}/${path} mkdir -p $out/${rtpPath} cp -r . $target @@ -401,6 +405,8 @@ rec { if [ -n "$addonInfo" ]; then echo "$addonInfo" > $target/addon-info.json fi + + runHook postInstall ''; })); |