diff options
author | Robin Gloster <mail@glob.in> | 2016-07-15 14:41:01 +0000 |
---|---|---|
committer | Robin Gloster <mail@glob.in> | 2016-07-15 14:41:01 +0000 |
commit | 5185bc177309c62e53dad1ad346d1220f0e77bd4 (patch) | |
tree | 52f5878b394abf2ef326765d46880ccbabd84903 /pkgs/misc | |
parent | 07615735077db344539eb9131823600593f0eddf (diff) | |
parent | f402c6321aa3c6e56f5e1f1e36c4ad459c881309 (diff) | |
download | nixlib-5185bc177309c62e53dad1ad346d1220f0e77bd4.tar nixlib-5185bc177309c62e53dad1ad346d1220f0e77bd4.tar.gz nixlib-5185bc177309c62e53dad1ad346d1220f0e77bd4.tar.bz2 nixlib-5185bc177309c62e53dad1ad346d1220f0e77bd4.tar.lz nixlib-5185bc177309c62e53dad1ad346d1220f0e77bd4.tar.xz nixlib-5185bc177309c62e53dad1ad346d1220f0e77bd4.tar.zst nixlib-5185bc177309c62e53dad1ad346d1220f0e77bd4.zip |
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
Diffstat (limited to 'pkgs/misc')
30 files changed, 572 insertions, 387 deletions
diff --git a/pkgs/misc/cups/drivers/samsung/4.00.39/default.nix b/pkgs/misc/cups/drivers/samsung/4.00.39/default.nix index 27d21f862852..0569eabe8f14 100644 --- a/pkgs/misc/cups/drivers/samsung/4.00.39/default.nix +++ b/pkgs/misc/cups/drivers/samsung/4.00.39/default.nix @@ -15,7 +15,9 @@ # Do not bump lightly! Visit <http://www.bchemnet.com/suldr/supported.html> # to see what will break when upgrading. Consider a new versioned attribute. -stdenv.mkDerivation rec { +let + cups' = cups.out; +in stdenv.mkDerivation rec { name = "samsung-UnifiedLinuxDriver-${version}"; version = "4.00.39"; @@ -24,9 +26,10 @@ stdenv.mkDerivation rec { sha256 = "144b4xggbzjfq7ga5nza7nra2cf6qn63z5ls7ba1jybkx1vm369k"; }; - buildInputs = [ cups gcc ghostscript glibc patchelf ]; + buildInputs = [ cups' gcc ghostscript glibc patchelf ]; - inherit cups gcc ghostscript glibc; + inherit gcc ghostscript glibc; + cups = cups'; builder = ./builder.sh; diff --git a/pkgs/misc/drivers/postscript-lexmark/default.nix b/pkgs/misc/drivers/postscript-lexmark/default.nix new file mode 100644 index 000000000000..5b8f88218ff1 --- /dev/null +++ b/pkgs/misc/drivers/postscript-lexmark/default.nix @@ -0,0 +1,37 @@ +{ stdenv, lib, fetchurl, rpmextract }: +let + version = "20160218"; +in +stdenv.mkDerivation { + name = "postscript-lexmark-${version}"; + + src = fetchurl { + url = "http://www.openprinting.org/download/printdriver/components/lsb3.2/main/RPMS/noarch/openprinting-ppds-postscript-lexmark-${version}-1lsb3.2.noarch.rpm"; + sha256 = "0wbhvypdr96a5ddg6kj41dn9sbl49n7pfi2vs762ij82hm2gvwcm"; + }; + + nativeBuildInputs = [ rpmextract ]; + + phases = [ "unpackPhase" "installPhase"]; + + sourceRoot = "."; + + unpackPhase = '' + rpmextract $src + for ppd in opt/OpenPrinting-Lexmark/ppds/Lexmark/*; do + gzip -d $ppd + done + ''; + + installPhase = '' + mkdir -p $out/share/cups/model/postscript-lexmark + cp opt/OpenPrinting-Lexmark/ppds/Lexmark/*.ppd $out/share/cups/model/postscript-lexmark/ + cp -r opt/OpenPrinting-Lexmark/doc $out/doc + ''; + + meta = with stdenv.lib; { + homepage = "http://www.openprinting.org/driver/Postscript-Lexmark/"; + description = "Lexmark Postscript Drivers"; + platforms = platforms.linux; + }; +} diff --git a/pkgs/misc/emulators/dolphin-emu/default.nix b/pkgs/misc/emulators/dolphin-emu/default.nix index 749573f474a2..bbd25f2b3ded 100644 --- a/pkgs/misc/emulators/dolphin-emu/default.nix +++ b/pkgs/misc/emulators/dolphin-emu/default.nix @@ -1,13 +1,17 @@ { stdenv, pkgconfig, cmake, bluez, ffmpeg, libao, mesa, gtk2, glib -, gettext, libpthreadstubs, libXrandr, libXext, readline -, openal, libXdmcp, portaudio, SDL, wxGTK30, fetchurl +, gettext, libpthreadstubs, libXrandr, libXext, readline, openal +, libXdmcp, portaudio, fetchFromGitHub, libusb, libevdev , libpulseaudio ? null }: stdenv.mkDerivation rec { - name = "dolphin-emu-4.0.2"; - src = fetchurl { - url = https://github.com/dolphin-emu/dolphin/archive/4.0.2.tar.gz; - sha256 = "0a8ikcxdify9d7lqz8fn2axk2hq4q1nvbcsi1b8vb9z0mdrhzw89"; + name = "dolphin-emu-${version}"; + version = "5.0"; + + src = fetchFromGitHub { + owner = "dolphin-emu"; + repo = "dolphin"; + rev = version; + sha256 = "07mlfnh0hwvk6xarcg315x7z2j0qbg9g7cm040df9c8psiahc3g6"; }; cmakeFlags = '' @@ -22,14 +26,15 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig cmake bluez ffmpeg libao mesa gtk2 glib gettext libpthreadstubs libXrandr libXext readline openal - libXdmcp portaudio SDL wxGTK30 libpulseaudio ]; + libevdev libXdmcp portaudio libusb libpulseaudio ]; meta = { homepage = http://dolphin-emu.org/; description = "Gamecube/Wii/Triforce emulator for x86_64 and ARM"; license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ MP2E ]; - broken = true; + # 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 9743261c6b2b..4d8b8ac0eb60 100644 --- a/pkgs/misc/emulators/dolphin-emu/master.nix +++ b/pkgs/misc/emulators/dolphin-emu/master.nix @@ -1,4 +1,4 @@ -{ stdenv, gcc5, pkgconfig, cmake, bluez, ffmpeg, libao, mesa, gtk2, glib +{ stdenv, gcc, pkgconfig, cmake, bluez, ffmpeg, libao, mesa, gtk2, glib , gettext, git, libpthreadstubs, libXrandr, libXext, readline , openal, libXdmcp, portaudio, fetchgit, libusb, libevdev , libpulseaudio ? null }: @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - buildInputs = [ gcc5 pkgconfig cmake bluez ffmpeg libao mesa gtk2 glib + buildInputs = [ gcc pkgconfig cmake bluez ffmpeg libao mesa gtk2 glib gettext libpthreadstubs libXrandr libXext readline openal libevdev git libXdmcp portaudio libusb libpulseaudio ]; diff --git a/pkgs/misc/emulators/higan/default.nix b/pkgs/misc/emulators/higan/default.nix index 1395e3ac3efe..f180a446d055 100644 --- a/pkgs/misc/emulators/higan/default.nix +++ b/pkgs/misc/emulators/higan/default.nix @@ -11,16 +11,17 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "higan-${version}"; - version = "098"; + version = "099"; sourceName = "higan_v${version}-source"; src = fetchurl { urls = [ "http://download.byuu.org/${sourceName}.7z" ]; - sha256 = "0qphvjfv17dbmzgb4pny2q6ln0lsgzyhalq6qyqxc3qwm4fzdjv1"; + sha256 = "11lfsas1ym3xwb1rc27z1skvb4m176swix9dih4rvnlqxkqz4qhw"; curlOpts = "--user-agent 'Mozilla/5.0'"; # the good old user-agent trick... }; patches = [ ./0001-change-flags.diff ]; + postPatch = "sed '1i#include <cmath>' -i higan/fc/ppu/ppu.cpp"; buildInputs = [ p7zip pkgconfig libX11 libXv udev mesa SDL libao openal libpulseaudio gtk gtksourceview ]; diff --git a/pkgs/misc/emulators/pcsx2/default.nix b/pkgs/misc/emulators/pcsx2/default.nix index 1b95bca643c7..673e4c3ed087 100644 --- a/pkgs/misc/emulators/pcsx2/default.nix +++ b/pkgs/misc/emulators/pcsx2/default.nix @@ -15,6 +15,8 @@ stdenv.mkDerivation rec { sha256 = "0s7mxq2cgzwjfsq0vhpz6ljk7wr725nxg48128iyirf85585l691"; }; + postPatch = "sed '1i#include \"x86intrin.h\"' -i common/src/x86emitter/cpudetect.cpp"; + configurePhase = '' mkdir -p build cd build @@ -50,6 +52,8 @@ stdenv.mkDerivation rec { soundtouch wxGTK30 zlib ]; + enableParallelBuilding = true; + meta = with stdenv.lib; { description = "Playstation 2 emulator"; longDescription= '' diff --git a/pkgs/misc/emulators/retroarch/default.nix b/pkgs/misc/emulators/retroarch/default.nix index 0ab4698c196e..ac8e1e46112f 100644 --- a/pkgs/misc/emulators/retroarch/default.nix +++ b/pkgs/misc/emulators/retroarch/default.nix @@ -1,6 +1,12 @@ -{ stdenv, fetchgit, makeDesktopItem, pkgconfig, ffmpeg, mesa, nvidia_cg_toolkit -, freetype, libxml2, libv4l, coreutils, python34, which, udev, alsaLib -, libX11, libXext, libXxf86vm, libXdmcp, SDL, libpulseaudio ? null }: +{ stdenv, fetchFromGitHub, makeDesktopItem, coreutils, which, pkgconfig +, ffmpeg, mesa, freetype, libxml2, python34 +, enableNvidiaCgToolkit ? false, nvidia_cg_toolkit ? null +, alsaLib ? null, libv4l ? null +, udev ? null, libX11 ? null, libXext ? null, libXxf86vm ? null +, libXdmcp ? null, SDL ? null, libpulseaudio ? null +}: + +with stdenv.lib; let desktopItem = makeDesktopItem { @@ -9,25 +15,28 @@ let icon = "retroarch"; comment = "Multi-Engine Platform"; desktopName = "RetroArch"; - genericName = "Libretro Frontend"; + genericName = "Libretro Frontend"; categories = "Game;Emulator;"; #keywords = "multi;engine;emulator;xmb;"; }; - in stdenv.mkDerivation rec { name = "retroarch-bare-${version}"; - version = "2015-11-20"; + version = "1.3.4"; - src = fetchgit { - url = https://github.com/libretro/RetroArch.git; - rev = "09dda14549fc13231311fd522a07a75e923889aa"; - sha256 = "0yrisl61iaa70ahswzgb505bvm5cxq8ndnv2bw7gqrlm5qrh54qy"; + src = fetchFromGitHub { + owner = "libretro"; + repo = "RetroArch"; + sha256 = "0ccp17580w0884baxj5kcynlm03jgd7i62dprz1ajxbi2s7b3mi3"; + rev = "v${version}"; }; - buildInputs = [ pkgconfig ffmpeg mesa nvidia_cg_toolkit freetype libxml2 libv4l coreutils - python34 which udev alsaLib libX11 libXext libXxf86vm libXdmcp SDL libpulseaudio ]; + buildInputs = [ pkgconfig ffmpeg mesa freetype libxml2 coreutils python34 which SDL ] + ++ optional enableNvidiaCgToolkit nvidia_cg_toolkit + ++ optionals stdenv.isLinux [ udev alsaLib libX11 libXext libXxf86vm libXdmcp libv4l libpulseaudio ]; + + configureScript = "sh configure"; patchPhase = '' export GLOBAL_CONFIG_DIR=$out/etc @@ -44,11 +53,11 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = { homepage = http://libretro.org/; description = "Multi-platform emulator frontend for libretro cores"; license = licenses.gpl3; - platforms = stdenv.lib.platforms.linux; - maintainers = with maintainers; [ MP2E edwtjo ]; + platforms = platforms.all; + maintainers = with maintainers; [ MP2E edwtjo matthewbauer ]; }; } diff --git a/pkgs/misc/emulators/snes9x-gtk/default.nix b/pkgs/misc/emulators/snes9x-gtk/default.nix index c1ff6cb94934..e5cd08b7f9de 100644 --- a/pkgs/misc/emulators/snes9x-gtk/default.nix +++ b/pkgs/misc/emulators/snes9x-gtk/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "a portable, freeware Super Nintendo Entertainment System (SNES) emulator"; + description = "A portable, freeware Super Nintendo Entertainment System (SNES) emulator"; longDescription = "Snes9x is a portable, freeware Super Nintendo Entertainment System (SNES) emulator. It basically allows you to play most games designed for the SNES 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 ]; diff --git a/pkgs/misc/emulators/wine/base.nix b/pkgs/misc/emulators/wine/base.nix index 0398ed57a702..e35e319a57f0 100644 --- a/pkgs/misc/emulators/wine/base.nix +++ b/pkgs/misc/emulators/wine/base.nix @@ -1,7 +1,7 @@ { stdenv, lib, pkgArches, name, version, src, monos, geckos, platforms, pkgconfig, fontforge, makeWrapper, flex, bison, - pulseaudioSupport, + supportFlags, buildScript ? null, configureFlags ? "" }: @@ -19,14 +19,41 @@ stdenv.mkDerivation ((lib.optionalAttrs (! isNull buildScript) { pkgconfig fontforge makeWrapper flex bison ]; - buildInputs = toBuildInputs pkgArches (pkgs: (with pkgs; [ - freetype fontconfig mesa mesa_noglu.osmesa libdrm libpng libjpeg openssl gnutls cups ncurses - alsaLib libxml2 libxslt lcms2 gettext dbus mpg123 openal - ]) - ++ lib.optional pulseaudioSupport pkgs.libpulseaudio + buildInputs = toBuildInputs pkgArches (with supportFlags; (pkgs: + [ pkgs.freetype ] + ++ lib.optional pngSupport pkgs.libpng + ++ lib.optional jpegSupport pkgs.libjpeg + ++ lib.optional cupsSupport pkgs.cups + ++ lib.optional colorManagementSupport pkgs.lcms2 + ++ lib.optional gettextSupport pkgs.gettext + ++ lib.optional dbusSupport pkgs.dbus + ++ lib.optional mpg123Support pkgs.mpg123 + ++ lib.optional openalSupport pkgs.openal + ++ lib.optional cairoSupport pkgs.cairo + ++ lib.optional tiffSupport pkgs.libtiff + ++ lib.optional odbcSupport pkgs.unixODBC + ++ lib.optional netapiSupport pkgs.samba3_light + ++ lib.optional cursesSupport pkgs.ncurses + ++ lib.optional vaSupport pkgs.libva + ++ lib.optional pcapSupport pkgs.libpcap + ++ lib.optional v4lSupport pkgs.libv4l + ++ lib.optional saneSupport pkgs.saneBackends + ++ lib.optional gsmSupport pkgs.gsm + ++ lib.optional gphoto2Support pkgs.libgphoto2 + ++ lib.optional ldapSupport pkgs.openldap + ++ lib.optional fontconfigSupport pkgs.fontconfig + ++ lib.optional alsaSupport pkgs.alsaLib + ++ lib.optional pulseaudioSupport pkgs.libpulseaudio + ++ lib.optional xineramaSupport pkgs.xorg.libXinerama + ++ lib.optionals gstreamerSupport (with pkgs.gst_all; [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-ffmpeg ]) + ++ lib.optionals gtkSupport [ pkgs.gtk3 pkgs.gnome.glib ] + ++ lib.optionals openclSupport [ pkgs.opencl-headers pkgs.opencl-icd ] + ++ lib.optionals xmlSupport [ pkgs.libxml2 pkgs.libxslt ] + ++ lib.optionals tlsSupport [ pkgs.openssl pkgs.gnutls ] + ++ lib.optionals openglSupport [ pkgs.mesa pkgs.mesa_noglu.osmesa pkgs.libdrm ] ++ (with pkgs.xorg; [ - libXi libXcursor libXinerama libXrandr libXrender libXxf86vm libXcomposite libXext - ])); + libX11 libXi libXcursor libXrandr libXrender libXxf86vm libXcomposite libXext + ]))); # Wine locates a lot of libraries dynamically through dlopen(). Add # them to the RPATH so that the user doesn't have to set them in @@ -34,7 +61,7 @@ stdenv.mkDerivation ((lib.optionalAttrs (! isNull buildScript) { NIX_LDFLAGS = map (path: "-rpath " + path) ( map (x: "${lib.getLib x}/lib") ([ stdenv.cc.cc ] ++ buildInputs) # libpulsecommon.so is linked but not found otherwise - ++ lib.optionals pulseaudioSupport (map (x: "${lib.getLib x}/lib/pulseaudio") + ++ lib.optionals supportFlags.pulseaudioSupport (map (x: "${lib.getLib x}/lib/pulseaudio") (toBuildInputs pkgArches (pkgs: [ pkgs.libpulseaudio ]))) ); @@ -61,6 +88,10 @@ stdenv.mkDerivation ((lib.optionalAttrs (! isNull buildScript) { ${lib.strings.concatStringsSep "\n" ((map (links "share/wine/gecko") geckos) ++ (map (links "share/wine/mono") monos))} + '' + lib.optionalString supportFlags.gstreamerSupport '' + wrapProgram "$out/bin/wine" \ + --argv0 "" \ + --prefix GST_PLUGIN_SYSTEM_PATH ":" "$GST_PLUGIN_SYSTEM_PATH" ''; enableParallelBuilding = true; @@ -71,6 +102,6 @@ stdenv.mkDerivation ((lib.optionalAttrs (! isNull buildScript) { homepage = "http://www.winehq.org/"; license = "LGPL"; description = "An Open Source implementation of the Windows API on top of X, OpenGL, and Unix"; - maintainers = [stdenv.lib.maintainers.raskin]; + maintainers = with stdenv.lib.maintainers; [ avnik raskin ]; }; }) diff --git a/pkgs/misc/emulators/wine/default.nix b/pkgs/misc/emulators/wine/default.nix index a402fba69f67..deeff3c73437 100644 --- a/pkgs/misc/emulators/wine/default.nix +++ b/pkgs/misc/emulators/wine/default.nix @@ -9,13 +9,49 @@ { lib, pkgs, system, callPackage, wineRelease ? "stable", wineBuild ? (if system == "x86_64-linux" then "wineWow" else "wine32"), + libtxc_dxtn_Name ? "libtxc_dxtn_s2tc", + pngSupport ? false, + jpegSupport ? false, + tiffSupport ? false, + gettextSupport ? false, + fontconfigSupport ? false, + alsaSupport ? false, + gtkSupport ? false, + openglSupport ? false, + tlsSupport ? false, + gstreamerSupport ? false, + cupsSupport ? false, + colorManagementSupport ? false, + dbusSupport ? false, + mpg123Support ? false, + openalSupport ? false, + openclSupport ? false, + cairoSupport ? false, + odbcSupport ? false, + netapiSupport ? false, + cursesSupport ? false, + vaSupport ? false, + pcapSupport ? false, + v4lSupport ? false, + saneSupport ? false, + gsmSupport ? false, + gphoto2Support ? false, + ldapSupport ? false, pulseaudioSupport ? false, - libtxc_dxtn_Name ? "libtxc_dxtn_s2tc" }: + xineramaSupport ? false, + xmlSupport ? false }: let wine-build = build: release: lib.getAttr build (callPackage ./packages.nix { wineRelease = release; - inherit pulseaudioSupport; + supportFlags = { + inherit pngSupport jpegSupport cupsSupport colorManagementSupport gettextSupport + dbusSupport mpg123Support openalSupport cairoSupport tiffSupport odbcSupport + netapiSupport cursesSupport vaSupport pcapSupport v4lSupport saneSupport + gsmSupport gphoto2Support ldapSupport fontconfigSupport alsaSupport + pulseaudioSupport xineramaSupport gtkSupport openclSupport xmlSupport tlsSupport + openglSupport gstreamerSupport; + }; }); in if wineRelease == "staging" then diff --git a/pkgs/misc/emulators/wine/packages.nix b/pkgs/misc/emulators/wine/packages.nix index 206deb01b8bb..6c06bcb0949b 100644 --- a/pkgs/misc/emulators/wine/packages.nix +++ b/pkgs/misc/emulators/wine/packages.nix @@ -1,14 +1,14 @@ { system, stdenv, stdenv_32bit, lib, pkgs, pkgsi686Linux, callPackage, callPackage_i686, overrideCC, wrapCCMulti, gcc49, - pulseaudioSupport, - wineRelease ? "stable" + wineRelease ? "stable", + supportFlags }: let src = lib.getAttr wineRelease (callPackage ./sources.nix {}); in with src; { wine32 = callPackage_i686 ./base.nix { name = "wine-${version}"; - inherit src version pulseaudioSupport; + inherit src version supportFlags; pkgArches = [ pkgsi686Linux ]; geckos = [ gecko32 ]; monos = [ mono ]; @@ -16,7 +16,7 @@ in with src; { }; wine64 = callPackage ./base.nix { name = "wine64-${version}"; - inherit src version pulseaudioSupport; + inherit src version supportFlags; # FIXME: drop this when GCC is updated to >5.3. # Corresponding bug: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=69140 stdenv = overrideCC stdenv gcc49; @@ -28,7 +28,7 @@ in with src; { }; wineWow = callPackage ./base.nix { name = "wine-wow-${version}"; - inherit src version pulseaudioSupport; + inherit src version supportFlags; # FIXME: see above. stdenv = overrideCC stdenv_32bit (wrapCCMulti gcc49); pkgArches = [ pkgs pkgsi686Linux ]; diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix index 9ad09ed5dfe1..9a437971e426 100644 --- a/pkgs/misc/emulators/wine/sources.nix +++ b/pkgs/misc/emulators/wine/sources.nix @@ -6,9 +6,9 @@ let fetchurl = args@{url, sha256, ...}: in rec { stable = fetchurl rec { - version = "1.8.1"; + version = "1.8.3"; url = "mirror://sourceforge/wine/wine-${version}.tar.bz2"; - sha256 = "15ya496qq24ipqii7ij8x8h5x8n21vgqa4h6binb74w5mzdd76hl"; + sha256 = "0v3sq5zzj3z5pw1aicn7i03pgf41cr9fr0vg1sazwfxrmbvwvknp"; ## see http://wiki.winehq.org/Gecko gecko32 = fetchurl rec { @@ -30,9 +30,9 @@ in rec { }; unstable = fetchurl rec { - version = "1.9.7"; + version = "1.9.14"; url = "mirror://sourceforge/wine/wine-${version}.tar.bz2"; - sha256 = "1v47i0pxqcixnh06x23kzp2dbz1cf3d2sric0bw6xqh54ph5yw29"; + sha256 = "0b65j8lc2axyc7lpa5rjr7vbjz4y78gkd7hhmvhra78pmwf9dgkz"; inherit (stable) mono; gecko32 = fetchurl rec { version = "2.44"; @@ -48,15 +48,15 @@ in rec { staging = fetchFromGitHub rec { inherit (unstable) version; - sha256 = "1h5hwd07qyx0qw5whf6lcp7v57kqd6mrrcvwwg1bydir68b0zp16"; + sha256 = "0582ylrvl7racpb0il3wmbivb2d7lh6n3mymh19yw94qzgifwqrw"; owner = "wine-compholio"; repo = "wine-staging"; rev = "v${version}"; }; winetricks = fetchFromGitHub rec { - version = "20160219"; - sha256 = "1wqsbdh2qa5xxswilniki9wzbhlmkl6jqmryjd9f5smirr7ryy2r"; + version = "20160622"; + sha256 = "0xh7mc5xby0zxx2g3q1ky18s20y6s7wp3vzvgxydwzhhwf32189q"; owner = "Winetricks"; repo = "winetricks"; rev = version; diff --git a/pkgs/misc/emulators/wine/staging.nix b/pkgs/misc/emulators/wine/staging.nix index 9419aff1a39c..51af13b8a157 100644 --- a/pkgs/misc/emulators/wine/staging.nix +++ b/pkgs/misc/emulators/wine/staging.nix @@ -8,8 +8,7 @@ let patch = (callPackage ./sources.nix {}).staging; in assert (builtins.parseDrvName wineUnstable.name).version == patch.version; stdenv.lib.overrideDerivation wineUnstable (self: { - nativeBuildInputs = build-inputs [ libtxc_dxtn_Name ] self.nativeBuildInputs; - buildInputs = build-inputs [ "perl" "utillinux" "autoconf" ] self.buildInputs; + buildInputs = build-inputs [ "perl" "utillinux" "autoconf" libtxc_dxtn_Name ] self.buildInputs; name = "${self.name}-staging"; diff --git a/pkgs/misc/gnuk/generic.nix b/pkgs/misc/gnuk/generic.nix index 52e970b5b822..14d487da82ba 100644 --- a/pkgs/misc/gnuk/generic.nix +++ b/pkgs/misc/gnuk/generic.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { homepage = http://www.fsij.org/pages/gnuk; - description = "an implementation of USB cryptographic token for gpg"; + description = "An implementation of USB cryptographic token for gpg"; license = licenses.gpl3; maintainers = with maintainers; [ wkennington ]; }; diff --git a/pkgs/misc/jackaudio/default.nix b/pkgs/misc/jackaudio/default.nix index b5748c0f8328..66be12fbc43f 100644 --- a/pkgs/misc/jackaudio/default.nix +++ b/pkgs/misc/jackaudio/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, pkgconfig, python, makeWrapper -, bash, libsamplerate, libsndfile, readline +, bash, libsamplerate, libsndfile, readline, gcc # Optional Dependencies , dbus ? null, pythonDBus ? null, libffado ? null, alsaLib ? null @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig python makeWrapper ]; - buildInputs = [ + buildInputs = [ gcc python libsamplerate libsndfile readline diff --git a/pkgs/misc/screensavers/light-locker/default.nix b/pkgs/misc/screensavers/light-locker/default.nix index 48b30bccbdd8..80e405d4442f 100644 --- a/pkgs/misc/screensavers/light-locker/default.nix +++ b/pkgs/misc/screensavers/light-locker/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://github.com/the-cavalry/light-locker; - description = "light-locker is a simple locker"; + description = "Light-locker is a simple locker"; longDescription = '' light-locker is a simple locker (forked from gnome-screensaver) that aims to have simple, sane, secure defaults and be well integrated with the desktop while not carrying any desktop-specific dependencies. It relies on lightdm for locking and unlocking your session via ConsoleKit/UPower or logind/systemd. diff --git a/pkgs/misc/screensavers/xscreensaver/default.nix b/pkgs/misc/screensavers/xscreensaver/default.nix index 6942d642fb1b..3540119e6656 100644 --- a/pkgs/misc/screensavers/xscreensaver/default.nix +++ b/pkgs/misc/screensavers/xscreensaver/default.nix @@ -1,6 +1,7 @@ { stdenv, fetchurl, pkgconfig, bc, perl, pam, libXext, libXScrnSaver, libX11 , libXrandr, libXmu, libXxf86vm, libXrender, libXxf86misc, libjpeg, mesa, gtk -, libxml2, libglade, intltool, xorg, makeWrapper +, libxml2, libglade, intltool, xorg, makeWrapper, gle +, forceInstallAllHacks ? false }: stdenv.mkDerivation rec { @@ -15,15 +16,11 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig bc perl libjpeg mesa gtk libxml2 libglade pam libXext libXScrnSaver libX11 libXrandr libXmu libXxf86vm libXrender - libXxf86misc intltool xorg.appres makeWrapper + libXxf86misc intltool xorg.appres makeWrapper gle ]; preConfigure = '' - # Fix build error in version 5.18. Remove this patch when updating - # to a later version. - #sed -i -e '/AF_LINK/d' hacks/glx/sonar-icmp.c - # Fix installation paths for GTK resources. sed -e 's%@GTK_DATADIR@%@datadir@% ; s%@PO_DATADIR@%@datadir@%' \ -i driver/Makefile.in po/Makefile.in.in @@ -33,14 +30,21 @@ stdenv.mkDerivation rec { [ "--with-gl" "--with-pam" "--with-pixbuf" "--with-proc-interrupts" "--with-dpms-ext" "--with-randr-ext" "--with-xinerama-ext" "--with-xf86vmode-ext" "--with-xf86gamma-ext" "--with-randr-ext" - "--with-xshm-ext" "--with-xdbe-ext" "--without-readdisplay" + "--with-xshm-ext" "--with-xdbe-ext" "--with-x-app-defaults=\${out}/share/xscreensaver/app-defaults" ]; postInstall = '' wrapProgram $out/bin/xscreensaver-text \ --prefix PATH : ${stdenv.lib.makeBinPath [xorg.appres]} - ''; + '' + + stdenv.lib.optionalString forceInstallAllHacks '' + make -C hacks/glx dnalogo + cat hacks/Makefile.in | grep -E '([a-z0-9]+):[[:space:]]*\1[.]o' | cut -d : -f 1 | xargs make -C hacks + cat hacks/glx/Makefile.in | grep -E '([a-z0-9]+):[[:space:]]*\1[.]o' | cut -d : -f 1 | xargs make -C hacks/glx + cp -f $(find hacks -type f -perm -111 "!" -name "*.*" ) "$out/libexec/xscreensaver" + '' + ; meta = { homepage = "http://www.jwz.org/xscreensaver/"; diff --git a/pkgs/misc/themes/adapta/default.nix b/pkgs/misc/themes/adapta/default.nix new file mode 100644 index 000000000000..96c43af84854 --- /dev/null +++ b/pkgs/misc/themes/adapta/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchFromGitHub, autoreconfHook, gtk-engine-murrine }: + +stdenv.mkDerivation rec { + name = "adapta-gtk-theme-${version}"; + version = "3.21.2"; + + meta = with stdenv.lib; { + description = "An adaptive GTK+ theme based on Material Design"; + homepage = "https://github.com/tista500/Adapta"; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = [ maintainers.SShrike ]; + }; + + src = fetchFromGitHub { + owner = "tista500"; + repo = "Adapta"; + rev = "c48da995abc46087c22b05d2cdb0975d10774641"; + sha256 = "17w9nsrwqwgafswyvhc5h8ld2ggi96ix5fjv6yf1hfz3l1ln9qg7"; + }; + + preferLocalBuild = true; + buildInputs = [ gtk-engine-murrine ]; + nativeBuildInputs = [ autoreconfHook ]; + + configureFlags = "--enable-chrome --disable-unity"; +} diff --git a/pkgs/misc/themes/arc/default.nix b/pkgs/misc/themes/arc/default.nix index b14746cfec50..025ef0913bea 100644 --- a/pkgs/misc/themes/arc/default.nix +++ b/pkgs/misc/themes/arc/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, gnome3, gtk, gtk-engine-murrine }: stdenv.mkDerivation rec { - version = "2016-06-02"; + version = "2016-06-06"; name = "arc-gtk-theme-${version}"; src = fetchFromGitHub { owner = "horst3180"; repo = "arc-theme"; - rev = "226098a06b646981022f0e260fd4d3ca64ff5616"; - sha256 = "1lg2iig1rws2h0p7qy1pavphyzdcchmfdlv126696jczz21d67qm"; + rev = "d24a7b5b4eb25e1a094bdf4e125332cfb8e2c8c1"; + sha256 = "07rf21xhyz3if4n5ccmzmjf9rz9w7wkvci7ccivhh6lkillfbxgi"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/misc/themes/gnome-breeze/default.nix b/pkgs/misc/themes/gnome-breeze/default.nix new file mode 100644 index 000000000000..ac0fb2cfee7d --- /dev/null +++ b/pkgs/misc/themes/gnome-breeze/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchgit }: + +stdenv.mkDerivation { + name = "gnome-breeze"; + src = fetchgit { + url = "https://github.com/dirruk1/gnome-breeze"; + sha256 = "0hkk0gqlnrs1m4rb5r84f5y96qfamrbiwm09z89yc32124x1a1lm"; + rev = "49a5cd67a270e13a4c04a4b904f126ef728e9221"; + }; + installPhase = '' + mkdir -p $out/share/themes + cp -r Breeze* $out/share/themes + ''; + + meta = { + description = "A GTK theme built to match KDE's breeze theme"; + homepage = "https://github.com/dirruk1/gnome-breeze"; + license = stdenv.lib.licenses.lgpl2; + maintainers = with stdenv.lib.maintainers; [ bennofs ]; + platforms = stdenv.lib.platforms.all; + hydraPlatforms = []; + preferLocalBuild = true; + }; +} diff --git a/pkgs/misc/themes/numix-gtk-theme/default.nix b/pkgs/misc/themes/numix/default.nix index 4a37a16d5509..b8dac2540090 100644 --- a/pkgs/misc/themes/numix-gtk-theme/default.nix +++ b/pkgs/misc/themes/numix/default.nix @@ -3,14 +3,14 @@ }: stdenv.mkDerivation rec { - version = "2016-05-25"; + version = "2016-06-12"; name = "numix-gtk-theme-${version}"; src = fetchFromGitHub { repo = "numix-gtk-theme"; owner = "numixproject"; - rev = "e99d167adf1310e110e17f8e7c2baf217c2402aa"; - sha256 = "1418hf034b2bp32wqagbnn5y3i21h8v2ihjqakq2gaqd5fwg0f9g"; + rev = "1d941a15971f43fb2f5675c7059bf313b78797fc"; + sha256 = "14b1gl761acdza4bkqr6dvsblvi2wsph79j5jircxfd3wgvm756i"; }; nativeBuildInputs = [ sass glib libxml2 gdk_pixbuf ]; diff --git a/pkgs/misc/themes/paper-gtk-theme/default.nix b/pkgs/misc/themes/paper/default.nix index ff778b86f9c2..5dfb54fa493c 100644 --- a/pkgs/misc/themes/paper-gtk-theme/default.nix +++ b/pkgs/misc/themes/paper/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, autoreconfHook, gtk_engines }: stdenv.mkDerivation rec { - version = "2016-05-25"; + version = "2016-05-27"; name = "paper-gtk-theme-${version}"; src = fetchFromGitHub { owner = "snwh"; repo = "paper-gtk-theme"; - rev = "dea5f97b12e4f41dddbd01a1529760761aa3784e"; - sha256 = "0fln555827hrn554qcil3rwl9x4x3vdfbh2vplkc8r46a3bn8yng"; + rev = "06fb8b41743dd99410c08a9beabc323e6631d009"; + sha256 = "1gffjsgs43rvxs8ryd5c3yfrp3a69d5wvjmiixwwp1qn1fr46dni"; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/misc/themes/zuki/default.nix b/pkgs/misc/themes/zuki/default.nix new file mode 100644 index 000000000000..73bc677854a1 --- /dev/null +++ b/pkgs/misc/themes/zuki/default.nix @@ -0,0 +1,40 @@ +{ stdenv, fetchFromGitHub, gnome3, gdk_pixbuf, gtk_engines, gtk-engine-murrine }: + +stdenv.mkDerivation rec { + name = "zuki-themes-${version}"; + version = "${gnome3.version}.${date}"; + date = { + "3.18" = "2016-06-21"; + "3.20" = "2016-07-01"; + }."${gnome3.version}"; + + src = fetchFromGitHub { + owner = "lassekongo83"; + repo = "zuki-themes"; + rev = { + "3.18" = "5c83a847ad8fab0fe0b82ed2a7db429655ac9c10"; + "3.20" = "dda1726ac7b556df2ef9696e530f8c2eaa0aed37"; + }."${gnome3.version}"; + sha256 = { + "3.18" = "1x9zrx5dqq8kivhqj5kjwhy4vwr899pri6jvwxbff5hibvyc7ipy"; + "3.20" = "0p7db8a2ni494vwp3b7av7d214fnynf6gr976qma6h9x4ck3phiz"; + }."${gnome3.version}"; + }; + + buildInputs = [ gdk_pixbuf gtk_engines gtk-engine-murrine ]; + + dontBuild = true; + + installPhase = '' + install -dm 755 $out/share/themes + cp -va Zuki* $out/share/themes/ + ''; + + meta = { + description = "A selection of themes for GTK3, gnome-shell and more"; + homepage = "https://github.com/lassekongo83/zuki-themes"; + license = stdenv.lib.licenses.gpl3; + platforms = stdenv.lib.platforms.unix; + maintainers = [ stdenv.lib.maintainers.romildo ]; + }; +} diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix index 605208a757b4..2cf9cbb1ab80 100644 --- a/pkgs/misc/uboot/default.nix +++ b/pkgs/misc/uboot/default.nix @@ -10,13 +10,13 @@ let stdenv.mkDerivation (rec { name = "uboot-${defconfig}-${version}"; - version = "2016.01"; + version = "2016.05"; nativeBuildInputs = [ bc dtc ]; src = fetchurl { url = "ftp://ftp.denx.de/pub/u-boot/u-boot-${version}.tar.bz2"; - sha256 = "1md5jpq5n9jh08s7sdkjrvg2q7kpzwa7yrpgl9581ncrjfx2yyg5"; + sha256 = "0wdivib8kbm17qr6r7n7wyzg5vnwpagvwk5m0z80rbssc5sj5l47"; }; configurePhase = '' @@ -68,6 +68,12 @@ in rec { filesToInstall = ["u-boot-sunxi-with-spl.bin"]; }; + ubootBeagleboneBlack = buildUBoot rec { + defconfig = "am335x_boneblack_defconfig"; + targetPlatforms = ["armv7l-linux"]; + filesToInstall = ["MLO" "u-boot.img"]; + }; + ubootJetsonTK1 = buildUBoot rec { defconfig = "jetson-tk1_defconfig"; targetPlatforms = ["armv7l-linux"]; @@ -86,12 +92,16 @@ in rec { filesToInstall = ["u-boot.bin"]; }; - # Intended only for QEMU's vexpress-a9 emulation target! - ubootVersatileExpressCA9 = buildUBoot rec { - defconfig = "vexpress_ca9x4_defconfig"; + ubootRaspberryPi2 = buildUBoot rec { + defconfig = "rpi_2_defconfig"; + targetPlatforms = ["armv7l-linux"]; + filesToInstall = ["u-boot.bin"]; + }; + + ubootRaspberryPi3 = buildUBoot rec { + defconfig = "rpi_3_32b_defconfig"; targetPlatforms = ["armv7l-linux"]; - filesToInstall = ["u-boot"]; - patches = [ ./vexpress-Use-config_distro_bootcmd.patch ]; + filesToInstall = ["u-boot.bin"]; }; ubootWandboard = buildUBoot rec { diff --git a/pkgs/misc/uboot/vexpress-Use-config_distro_bootcmd.patch b/pkgs/misc/uboot/vexpress-Use-config_distro_bootcmd.patch deleted file mode 100644 index 218132c7758e..000000000000 --- a/pkgs/misc/uboot/vexpress-Use-config_distro_bootcmd.patch +++ /dev/null @@ -1,82 +0,0 @@ -From 98f62c27fe481dc2d444d70265268d2369d8a998 Mon Sep 17 00:00:00 2001 -From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi> -Date: Mon, 8 Jun 2015 22:29:23 +0300 -Subject: [PATCH] vexpress: Use config_distro_bootcmd - -Also had to hack cli_readline.c, as one codepath in -cli_readline_into_buffer doesn't respect the timeout. ---- - common/cli_readline.c | 12 +++++++++++- - configs/vexpress_ca9x4_defconfig | 2 -- - include/configs/vexpress_common.h | 2 +- - 3 files changed, 12 insertions(+), 4 deletions(-) - -diff --git a/common/cli_readline.c b/common/cli_readline.c -index c1476e4..5063a0a 100644 ---- a/common/cli_readline.c -+++ b/common/cli_readline.c -@@ -517,6 +517,7 @@ int cli_readline_into_buffer(const char *const prompt, char *buffer, - int plen = 0; /* prompt length */ - int col; /* output column cnt */ - char c; -+ int first = 1; - - /* print prompt */ - if (prompt) { -@@ -528,7 +529,16 @@ int cli_readline_into_buffer(const char *const prompt, char *buffer, - for (;;) { - if (bootretry_tstc_timeout()) - return -2; /* timed out */ -- WATCHDOG_RESET(); /* Trigger watchdog, if needed */ -+ if (first && timeout) { -+ uint64_t etime = endtick(timeout); -+ -+ while (!tstc()) { /* while no incoming data */ -+ if (get_ticks() >= etime) -+ return -2; /* timed out */ -+ WATCHDOG_RESET(); -+ } -+ first = 0; -+ } - - #ifdef CONFIG_SHOW_ACTIVITY - while (!tstc()) { -diff --git a/configs/vexpress_ca9x4_defconfig b/configs/vexpress_ca9x4_defconfig -index 2947fc1..9a5123d 100644 ---- a/configs/vexpress_ca9x4_defconfig -+++ b/configs/vexpress_ca9x4_defconfig -@@ -5,11 +5,9 @@ CONFIG_TARGET_VEXPRESS_CA9X4=y - # CONFIG_CMD_IMLS is not set - # CONFIG_CMD_XIMG is not set - # CONFIG_CMD_EDITENV is not set --# CONFIG_CMD_ENV_EXISTS is not set - # CONFIG_CMD_LOADB is not set - # CONFIG_CMD_LOADS is not set - # CONFIG_CMD_FPGA is not set --# CONFIG_CMD_ECHO is not set - # CONFIG_CMD_ITEST is not set - # CONFIG_CMD_SETEXPR is not set - # CONFIG_CMD_NFS is not set -diff --git a/include/configs/vexpress_common.h b/include/configs/vexpress_common.h -index 98f6ae9..062532a 100644 ---- a/include/configs/vexpress_common.h -+++ b/include/configs/vexpress_common.h -@@ -185,7 +185,6 @@ - CONFIG_SYS_INIT_RAM_SIZE - \ - GENERATED_GBL_DATA_SIZE) - #define CONFIG_SYS_INIT_SP_ADDR CONFIG_SYS_GBL_DATA_OFFSET --#define CONFIG_CMD_ECHO - - #include <config_distro_defaults.h> - -@@ -225,6 +224,7 @@ - #define CONFIG_EXTRA_ENV_SETTINGS \ - CONFIG_PLATFORM_ENV_SETTINGS \ - BOOTENV \ -+ "fdtfile=vexpress-v2p-ca9.dtb\0" \ - "console=ttyAMA0,38400n8\0" \ - "dram=1024M\0" \ - "root=/dev/sda1 rw\0" \ --- -2.6.0 - diff --git a/pkgs/misc/urbit/default.nix b/pkgs/misc/urbit/default.nix index e4049f07897a..abfeb4dd22d7 100644 --- a/pkgs/misc/urbit/default.nix +++ b/pkgs/misc/urbit/default.nix @@ -1,15 +1,16 @@ -{ stdenv, fetchgit, gcc, gmp, libsigsegv, openssl, automake, autoconf, ragel, +{ stdenv, fetchFromGitHub, gcc, gmp, libsigsegv, openssl, automake, autoconf, ragel, cmake, re2c, libtool, ncurses, perl, zlib, python }: stdenv.mkDerivation rec { name = "urbit-${version}"; - version = "2015.09.26"; + version = "2016-06-02"; - src = fetchgit { - url = "https://github.com/urbit/urbit.git"; - rev = "c9592664c797b2dd74f26886528656f8a7058640"; - sha256 = "0sgrxnmpqh54mgar81wlb6gff8c0pc24p53xwxr448g5shvnzjx9"; + src = fetchFromGitHub { + owner = "urbit"; + repo = "urbit"; + rev = "8c113559872e4a97bce3f3ee5b370ad9545c7459"; + sha256 = "055qdpp4gm0v04pddq4380pdsi0gp2ybgv1d2lchkhwsnjyl46jl"; }; buildInputs = with stdenv.lib; [ @@ -34,8 +35,8 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "an operating function"; - homepage = http://urbit.org/preview/~2015.9.25/materials; + description = "An operating function"; + homepage = http://urbit.org; license = licenses.mit; maintainers = with maintainers; [ mudri ]; }; diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index 98a8a4ddf249..3134aa0eeba3 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -1,7 +1,7 @@ # TODO check that no license information gets lost { fetchurl, bash, stdenv, python, go, cmake, vim, vimUtils, perl, ruby, unzip , which, fetchgit, fetchFromGitHub, fetchhg, fetchzip, llvmPackages, zip -, vim_configurable, vimPlugins, xkb_switch, git, racerdRust, fzf +, vim_configurable, vimPlugins, xkb_switch, git, rustracerd, fzf , Cocoa ? null }: @@ -173,11 +173,11 @@ rec { }; Syntastic = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "Syntastic-2016-05-23"; + name = "Syntastic-2016-07-08"; src = fetchgit { url = "git://github.com/scrooloose/syntastic"; - rev = "95879f19a9f8a72282717e07d0d4e006d8561580"; - sha256 = "19wr3bll9n7y3rh26r4aklk682jqxrh5j8c9wkpg6m9v60yqj053"; + rev = "87f3e80b443870ce821f82dd1b3dba5bd66b51b2"; + sha256 = "09prhzp58470naj8ws2m1pjgj1h675jsiyc6vmfdjsqk6ly2ypg0"; }; dependencies = []; @@ -206,33 +206,33 @@ rec { }; The_NERD_Commenter = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "The_NERD_Commenter-2016-05-24"; + name = "The_NERD_Commenter-2016-06-10"; src = fetchgit { url = "git://github.com/scrooloose/nerdcommenter"; - rev = "2b3714bff67ca57cb9e416bd737a24f71181859b"; - sha256 = "1va0d4vxk53lgy2cs1hgxcha6fsc6c2y6m7jwmzfpj2gdha2v52y"; + rev = "e2d47bec2662d5fcd324d17e22dc37f38c97bf2d"; + sha256 = "099i7jksdp4c4m7imv96xji4lbjscdns37fsr2qgn7zw5pjgjbw4"; }; dependencies = []; }; The_NERD_tree = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "The_NERD_tree-2016-05-11"; + name = "The_NERD_tree-2016-06-23"; src = fetchgit { url = "git://github.com/scrooloose/nerdtree"; - rev = "15445be5fb2559829ac7a1f05af5d713586e8ec9"; - sha256 = "1x85k2h2qm1z67ywg0867w483w1rb7zmq9r2rkjj2kkk5wi6hfvq"; + rev = "2e2b649232d6ae4d02d74793e5da0ee08480ad8d"; + sha256 = "1rfm6w60bk168y1l9hjjxd4840j1jr1h0s77lsdjr9wxpxbw59ml"; }; dependencies = []; }; UltiSnips = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "UltiSnips-2016-05-16"; + name = "UltiSnips-2016-07-07"; src = fetchgit { url = "git://github.com/SirVer/ultisnips"; - rev = "1c6b4f75a006c4411d01a1234cabda3eb4aded1a"; - sha256 = "0m9sfq9d9qvrx5valg0xz9bi0y2zi3790rg1qlnin4h1gbj5axjb"; + rev = "e8c485eb3c7e2c4c3ddc62beb79011f026a3ca04"; + sha256 = "03cdpz136ry6v7h0sddlyvgxwvp3bl1ir7451v3sd6q867ywvbs7"; }; dependencies = []; @@ -250,11 +250,11 @@ rec { }; WebAPI = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "WebAPI-2016-05-12"; + name = "WebAPI-2016-07-06"; src = fetchgit { url = "git://github.com/mattn/webapi-vim"; - rev = "ca89bd5867e76b154d4eca325b5a9ad6509fccc5"; - sha256 = "138rplbmvxicxjkkbvskck3b91rill53y22yrnnd9rj7zh9hj0zm"; + rev = "e3fa93f29a3a0754204002775e140d8a9acfd7fd"; + sha256 = "0z6s3cnipcww4q33d4dcp0p8jw29izghcrj75fxy6dmy1yw2fbcr"; }; dependencies = []; @@ -288,11 +288,11 @@ rec { }; ctrlp-py-matcher = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "ctrlp-py-matcher-2016-01-13"; + name = "ctrlp-py-matcher-2016-06-22"; src = fetchgit { url = "git://github.com/FelikZ/ctrlp-py-matcher"; - rev = "8a803267a741cff3d6147650745f83c8f2125578"; - sha256 = "0d5a7cqjh58l8qgj92s06f2ia83w51g4cic61qxd6sykv9xqiz17"; + rev = "fb831ff903d5622b39f400fc8ba80f9bbd225307"; + sha256 = "0zamyhxn910q6yyja6ypc92pxr47n28yzb6h90x20z0q2wka5842"; }; dependencies = []; @@ -321,66 +321,66 @@ rec { }; fugitive = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "fugitive-2016-05-11"; + name = "fugitive-2016-07-06"; src = fetchgit { url = "git://github.com/tpope/vim-fugitive"; - rev = "3439f999b138254e4bb56187fc91f91f545b4b12"; - sha256 = "0b617wljhcbz6w789j72lp4riplcb6m3b2h8x84awp2rls6k130b"; + rev = "c00ebd75ac23f4080c0d0bf9453b16304a3fb316"; + sha256 = "0j8vy6n70m02k2iq4y4nbpc0jnzk1ag51qnnbxj7aad4hkn8hban"; }; dependencies = []; }; ghcmod = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "ghcmod-2016-01-25"; + name = "ghcmod-2016-06-19"; src = fetchgit { url = "git://github.com/eagletmt/ghcmod-vim"; - rev = "815616e8b7d64677d6092e95bc6a3e83d2e035d4"; - sha256 = "00pl4zimbhcfpjg326qkjxr4s4d21kzl4j617382rvqbingrm8is"; + rev = "1d192d13d68ab59f9f46497a0909bf24a7b7dfff"; + sha256 = "0bzahgzagnf0a9zv86jhdf8nc3p0yfz9izv5n3lc8gc12cp47d0a"; }; dependencies = []; }; vim-autoformat = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-autoformat-2016-05-23"; + name = "vim-autoformat-2016-07-08"; src = fetchgit { url = "git://github.com/Chiel92/vim-autoformat"; - rev = "0dcc7b318939dab7c34c4aa31ce93678800034c6"; - sha256 = "1ahrpjnkyqslmiii8c81mayl299imd1jmgjplh0g575bipy4f7sa"; + rev = "06251ab31789b6c478358306ab0e476c7d03b0d5"; + sha256 = "0q749lbz1zzajdwyyznyg7h4mf2sdd0sq77dr24szs4f937zy007"; }; dependencies = []; }; vim-nix = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-nix-2015-12-10"; + name = "vim-nix-2016-05-31"; src = fetchgit { url = "git://github.com/LnL7/vim-nix"; - rev = "f0b7bd4bce5ed0f12fb4d26115c84fb3edcd1e12"; - sha256 = "0x12a191xafn7918xa8r4sjiw79005lcr0yv5kjc4p1izwddfgdv"; + rev = "9ac8876e5beb824018b9a09d4640f7efc2fbc8ae"; + sha256 = "0whdf56c63vp4c3b2jfl1x5c0dxxrzwvxkfm5951qzpfy6xwg27x"; }; dependencies = []; }; deoplete-nvim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "deoplete-nvim-2016-05-24"; + name = "deoplete-nvim-2016-07-10"; src = fetchgit { url = "git://github.com/Shougo/deoplete.nvim"; - rev = "b254ca56f768b72b3ba136ccd81abd919523036a"; - sha256 = "1dg5ids354f5c9ixfy9b6526yhr9w9968g0rghm0w8mlvgbx6bj8"; + rev = "8102bbb73f942b232b6bcc00b8699fbe3b3f370c"; + sha256 = "083056maiscxyyln09659qv3c7kayps2vm697p459yyhfyir742f"; }; dependencies = []; }; Spacegray-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "Spacegray-vim-2016-05-21"; + name = "Spacegray-vim-2016-06-04"; src = fetchgit { url = "git://github.com/ajh17/Spacegray.vim"; - rev = "82551620059b055d7ed866cf7af3e8b6f1b891a4"; - sha256 = "0xprszpva3via83zbs3x74jbc9zfrnxryilqvgpnrircgxm9cbx7"; + rev = "adb621e3d1df5f55d60383717bbae4533fda9c62"; + sha256 = "15n92rllri11ckdy1dykllx7xpgscvhfqa55z5sl66zicnrv89c9"; }; dependencies = []; @@ -398,22 +398,22 @@ rec { }; vim-css-color = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-css-color-2016-04-14"; + name = "vim-css-color-2016-06-12"; src = fetchgit { url = "git://github.com/ap/vim-css-color"; - rev = "4421dbac36bedcdd4fc345fd95785cfed518847c"; - sha256 = "0z4d9q7irid4wianh94wqc2nr8hx54pci0p87ibhkbi7ibpl1qmp"; + rev = "ba98bd138ee15dbf6b6dc3b7080c0e65e0657c76"; + sha256 = "0l76yqd3cvdm41dx720skbphwqsza51xaf7vi8jlknsqnrb6z1kf"; }; dependencies = []; }; neomake = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "neomake-2016-05-22"; + name = "neomake-2016-07-11"; src = fetchgit { url = "git://github.com/benekastah/neomake"; - rev = "b33d77d4b0543e9444ca5e79daa5109bbab4a31c"; - sha256 = "00r7fpsd4cc3f69jar7v39ffj0xndlvgbkmlmhlcfgk1h1bzic5h"; + rev = "14e894edc35d17b927e5540ceb6d101bbda9f51c"; + sha256 = "1ccgfvvxsl213zlgf801yxwg51kpi5z37z175w4gh9cj8953mgxh"; }; dependencies = []; @@ -431,55 +431,66 @@ rec { }; vim-tmux-navigator = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-tmux-navigator-2016-05-09"; + name = "vim-tmux-navigator-2016-07-07"; src = fetchgit { url = "git://github.com/christoomey/vim-tmux-navigator"; - rev = "e13914d89e9413cfa449f0c3daff18691356f2d1"; - sha256 = "1hs61lgkf4bsy8891zqklh9jfzkwmm7r0lmr228k5wn97778bc83"; + rev = "d0123a8679cebec89ddd385756b25e4c812556b6"; + sha256 = "1bk3saff0lxzl1zrv97klx8f4kqvr01ypv13vg5andc1ylk2nqqf"; }; dependencies = []; }; spacevim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "spacevim-2016-05-23"; + name = "spacevim-2016-07-07"; src = fetchgit { url = "git://github.com/ctjhoa/spacevim"; - rev = "c6d1cae4a72c957279707256f6c91a390f83aa9c"; - sha256 = "1ipm8csk6a7wcpqi1c9nmhb3jfm7ikfrw207yp1b9vklsznnqm53"; + rev = "714cc22f8c4544676a9cc2a4ac075b630ffa5b34"; + sha256 = "0l66h05hridjihjp4g94zq3mrfjs4pywzlb5wh95yvcdix8kyzzm"; }; dependencies = []; }; ctrlp-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "ctrlp-vim-2016-05-01"; + name = "ctrlp-vim-2016-07-08"; src = fetchgit { url = "git://github.com/ctrlpvim/ctrlp.vim"; - rev = "28fce0fb860fe8df0915da1de1fb6e90d6ab2edc"; - sha256 = "1amxly825vdp7s1znnzz7ysjks26j37lhpm8hvgfxpxks2clyhhs"; + rev = "b9fa920b4abbb54799927a3bc57869fdd556321a"; + sha256 = "1h8cm9mihd3jngmb6x60hxyr0g3swg6xhq8jw36xskb1ygdvbxzp"; }; dependencies = []; }; vim-jade = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-jade-2016-02-11"; + name = "vim-jade-2016-06-28"; src = fetchgit { url = "git://github.com/digitaltoad/vim-jade"; - rev = "0a7ec2edaa3f7fbe353f8fd5bf06d3c043d70c81"; - sha256 = "0qlwbywnx6sl2xacdialpmg1d2wmjkdsdklz97k8086glkairs10"; + rev = "f3950a72ea92f2c372846e763dad1f1151a38fb1"; + sha256 = "1wa7zf24szmwchk608s5ikv14jzch9nl8isrn9ji9sz2511w50wp"; }; dependencies = []; }; neco-ghc = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "neco-ghc-2016-05-07"; + name = "neco-ghc-2016-07-01"; src = fetchgit { url = "git://github.com/eagletmt/neco-ghc"; - rev = "b91b30f145d4daaf7e50d083e377bd9fbfdc670b"; - sha256 = "1fnxqqp4p7kxzs7svia33wikrzyav41qlncjpmbz6ss8jb9bk18b"; + rev = "7f02a9c25fb272a87d2be092826e2cd3094c620d"; + sha256 = "1fcfk45qb96h6y4zb3p0104iyqc85q1synn9ah56zp6hnkkyffbw"; + }; + dependencies = []; + + }; + + vim-localvimrc = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-localvimrc-2016-06-06"; + src = fetchgit { + url = "git://github.com/embear/vim-localvimrc"; + rev = "f104384cd9127b5a75ed889b551fd7f46faeb74a"; + sha256 = "0k1ava8nhshkm7llhmagpsmvgwy8xcc0mn3chdk6hz8gzz9755py"; }; dependencies = []; @@ -508,11 +519,11 @@ rec { }; vim-go = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-go-2016-05-23"; + name = "vim-go-2016-07-07"; src = fetchgit { url = "git://github.com/fatih/vim-go"; - rev = "e9f44d933e38bf3193ac5cce15f08fdc7e54814b"; - sha256 = "18hxnb6rn6gxixcqqwpqi4q9adz23jgrz8as2rl90y77m8f5inr5"; + rev = "ab01e7e5a6bf858c1f519a831a4db1d978b92298"; + sha256 = "1g76hasdyncjds6yl38dkb5nwp6sb8aqzp9d7xxhwarlnnihj1la"; }; dependencies = []; @@ -529,6 +540,28 @@ rec { }; + floobits-neovim = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "floobits-neovim-2016-06-20"; + src = fetchgit { + url = "git://github.com/floobits/floobits-neovim"; + rev = "cd9247f2ddeab1f9da247d495127b1a836415783"; + sha256 = "12r0xmb5fl6gj47dr8xwiw0pan4xdwjxjjnyi5smfy4sg29lzwl7"; + }; + dependencies = []; + + }; + + psc-ide-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "psc-ide-vim-2016-07-06"; + src = fetchgit { + url = "git://github.com/frigoeu/psc-ide-vim"; + rev = "8704b993fe7dced73aa871244fbf7cd2fbafb759"; + sha256 = "1wvs5v59aai3q2lgavaav073gz609944j8xbck34xyyq2naqmhaq"; + }; + dependencies = []; + + }; + vim-jsonnet = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "vim-jsonnet-2016-05-10"; src = fetchgit { @@ -563,22 +596,22 @@ rec { }; calendar-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "calendar-vim-2016-05-19"; + name = "calendar-vim-2016-07-06"; src = fetchgit { url = "git://github.com/itchyny/calendar.vim"; - rev = "f49bd337a4643bb58df0fa4df230d60bdfeef022"; - sha256 = "06hzvcpkgz51jl6zj67ycga5p9n1y6kk335d3cha24divp4ll1jb"; + rev = "e5ecd6c6635b0b8c3bc11d3a28f48e0b224e1391"; + sha256 = "0v611z5a24201194j592bpyid27cyfir66xr0pss71yk35wk9agy"; }; dependencies = []; }; lightline-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "lightline-vim-2016-05-16"; + name = "lightline-vim-2016-06-12"; src = fetchgit { url = "git://github.com/itchyny/lightline.vim"; - rev = "ac5e6df5cac0f3ff3078c51f715978288a5c351d"; - sha256 = "1q3zkfg8dq7760jlm207f6d85c46q8x2hfdqmdxkbagvhb9c0f4y"; + rev = "430ce2cb063b39a0c7950cafd617e333acb6759a"; + sha256 = "0336c17vkfh60cvj86y35lqz1xcd80csrlb985k1hyd5s7cayp42"; }; dependencies = []; @@ -618,11 +651,11 @@ rec { }; vim-orgmode = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-orgmode-2016-05-15"; + name = "vim-orgmode-2016-07-08"; src = fetchgit { url = "git://github.com/jceb/vim-orgmode"; - rev = "e0d56a6e93798b7a503bb4ab86fec016cd74d466"; - sha256 = "0704wli8n1x4v40mdfj0icjarr52iqvw2byzsvyzb420wpf1nqpb"; + rev = "54057d58888ad29672cd0cd782be5fc8b1a3a709"; + sha256 = "134dsnfpkzq9gd3d8b9pvy7c5yvy9yxjyvidg927ha1lpilf4kp9"; }; dependencies = []; @@ -640,11 +673,11 @@ rec { }; tslime-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "tslime-vim-2015-08-14"; + name = "tslime-vim-2016-06-14"; src = fetchgit { url = "git://github.com/jgdavey/tslime.vim"; - rev = "4a8091956e331d7b1d4187a2883b720dfec7e9dd"; - sha256 = "09csafrigp1ak566zxvhj71cdr6b6i3fplgncb288r051kw16cg6"; + rev = "c980c76bbfc9a523fcf1edf08580d0d3a486e8f2"; + sha256 = "0gifyxwlspfnkni886adwn9kc0dckanjk0097y8pwxh7qbwfydf1"; }; dependencies = []; @@ -695,33 +728,33 @@ rec { }; fzf-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "fzf-vim-2016-05-24"; + name = "fzf-vim-2016-07-02"; src = fetchgit { url = "git://github.com/junegunn/fzf.vim"; - rev = "c786d516375c5fe404febec39282fc1d63069a37"; - sha256 = "0dk5bs4f2lfs96npgid5ayapsqf9xhf9ii0gaa0rq4dz93i76hzg"; + rev = "e0182d33716068ffb1b53f7a8931fe1b5594f382"; + sha256 = "0hg6yzm11qwgq6cbf1ldb9i3p4r8h6f5ykvlrqh5znyzlxxf27vz"; }; dependencies = []; }; limelight-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "limelight-vim-2016-05-17"; + name = "limelight-vim-2016-06-24"; src = fetchgit { url = "git://github.com/junegunn/limelight.vim"; - rev = "e93c8013bb66d4b6622e24e0e3a97e71a032d9ec"; - sha256 = "1xq3fa44fz3dfl52y0ygm21pa8b121b5lsdflcvn0igvisdkzl6g"; + rev = "106fb5749d227a0de72e36068ed72798c6fd48e6"; + sha256 = "0fp4yp50n5v5zx3a7afh9wip4nwcfhmdgdzwpnl79jvild1z9fgh"; }; dependencies = []; }; vim-peekaboo = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-peekaboo-2016-02-29"; + name = "vim-peekaboo-2016-07-08"; src = fetchgit { url = "git://github.com/junegunn/vim-peekaboo"; - rev = "111c4bacbe5216022d56489c366bf4ce985506e9"; - sha256 = "0pblcxb467n4nxkvmb8sl8765nmz17h74hs5dy5dnmaxiy55v0d9"; + rev = "13e44380895b4a0e52a710a7056ad40514ff5927"; + sha256 = "12pa03dj4plc6za93skcrn3zhz2faw578a78038dwh3fd608rwyd"; }; dependencies = []; @@ -761,11 +794,11 @@ rec { }; vimtex = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vimtex-2016-05-23"; + name = "vimtex-2016-07-10"; src = fetchgit { url = "git://github.com/lervag/vimtex"; - rev = "257d2f91de35716d09f08fbbcb384cdc20ac7659"; - sha256 = "1cq7dvv4hsrm8khhlj1411rp9q5f0xp7q1m61khdr1icgjfasaxp"; + rev = "c16bd147092bfe7ac63f39cd449f36e14e42e948"; + sha256 = "18p7vmas0754r9n227v68wry285vr4y90v3kxcnn9hl60xxb3ba9"; }; dependencies = []; @@ -798,11 +831,11 @@ rec { }; vim-startify = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-startify-2016-03-24"; + name = "vim-startify-2016-07-01"; src = fetchgit { url = "git://github.com/mhinz/vim-startify"; - rev = "e74cc71b1b7b33f6df6e8b48ff4b0f587f6bfed9"; - sha256 = "1s7kys6kj7jrs1z3i8fgb9y1f45halwgpkgw34518ljmjx8n42sa"; + rev = "84a296eb5c36dc263ab67db3202e57fa783473b0"; + sha256 = "0pv15n8mpzgkp7b0fqpjbv24yn8fswwryxi6lzavjhrbqzmv7mxw"; }; dependencies = []; @@ -842,11 +875,11 @@ rec { }; haskell-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "haskell-vim-2016-05-17"; + name = "haskell-vim-2016-07-06"; src = fetchgit { url = "git://github.com/neovimhaskell/haskell-vim"; - rev = "f73cdcdf72e9200420fc74491b6cd215512c3330"; - sha256 = "1fgcfcslb6p84xcv1ighd8i4p4960vac7f7zpvl0d7bpp75ci07b"; + rev = "a9ceb3d812488c1cee8a2b763cca0e4a48bfd14c"; + sha256 = "022ckyc85i8f6r32z2grn41s9g4fg1a7fqprzbgs2kbi9k2igqni"; }; dependencies = []; @@ -864,88 +897,99 @@ rec { }; vim-watchdogs = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-watchdogs-2016-01-13"; + name = "vim-watchdogs-2016-06-26"; src = fetchgit { url = "git://github.com/osyo-manga/vim-watchdogs"; - rev = "ebcf3df39007aa5d65910f44eb20c9caea9007df"; - sha256 = "09wajb6kxvxnqaysj5hhp1g79hzz3bazmbpnj7nn5fdaf83rd8jl"; + rev = "7c89466b2b7fd9b87e0189e4ac66b84f2cfbc842"; + sha256 = "09swjrfrqvciw7blqd1ssklxs09x0sd7ixphy07az7cxfmpdpi4r"; }; dependencies = []; }; vim-racer = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-racer-2016-05-24"; + name = "vim-racer-2016-06-27"; src = fetchgit { url = "git://github.com/racer-rust/vim-racer"; - rev = "031a4e4131450758ade9073025cf4f75e8c2d85c"; - sha256 = "1hq67hi8069h4yp8l6nb0afnkgidrk4c3hagp6saiihlh3541m11"; + rev = "a72b26bb25cb65be29fd1912e9344eaa860fce5e"; + sha256 = "01xg6mmnlx5l37rsb7w0dbgy36pd6zyq7gcigdbj0pgqd39w30fv"; + }; + dependencies = []; + + }; + + purescript-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "purescript-vim-2016-01-04"; + src = fetchgit { + url = "git://github.com/raichoo/purescript-vim"; + rev = "92dd6bc647b45444e9d5e0550bdc3c56928f9762"; + sha256 = "090vpff58lzzhqp28p27am5s8s6ngjxw6j4y46zaixcxxx7wqzha"; }; dependencies = []; }; rust-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "rust-vim-2016-04-12"; + name = "rust-vim-2016-06-21"; src = fetchgit { url = "git://github.com/rust-lang/rust.vim"; - rev = "115d321d383eb96d438466c56cc871fcc1bd0faa"; - sha256 = "0j9vp3kb9kiza3h6jr8csqmdcsdp4g2qix70lvyh6ybrbkz84ghw"; + rev = "5dd7ab99103c05a56e059b39ad9f63274d2ae72e"; + sha256 = "0az35kfcpavz6sbh6mf0mmv7mp5zbnqmnljpmlm1srn6rr9rah2q"; }; dependencies = []; }; neocomplete-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "neocomplete-vim-2016-04-30"; + name = "neocomplete-vim-2016-06-26"; src = fetchgit { url = "git://github.com/shougo/neocomplete.vim"; - rev = "81d39635625730ca43f08762e2908b96e7b7f077"; - sha256 = "0lqvklg2vm8vcgj0786wi103wzr71v2l9i3f215kg9did2nnmky9"; + rev = "71800331948b1bc3c3d79dbbf203a274cd5b6f56"; + sha256 = "132bksxnj50yc2d8hx5sh4xbhzh0shidrvzlalb7gfhkanpg443w"; }; dependencies = []; }; neosnippet-snippets = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "neosnippet-snippets-2016-05-15"; + name = "neosnippet-snippets-2016-06-26"; src = fetchgit { url = "git://github.com/shougo/neosnippet-snippets"; - rev = "b068cc47707ecc7d023d75359687b21545bfc341"; - sha256 = "1gy7dn2h1w8bpqr681nqm1kyb9ggxakw25mlhlb3vvb2p8nm553r"; + rev = "17219351bcbec3708295c72c8280471eed12b8fe"; + sha256 = "08lrqsl9cqkx42llgv0mc54nsmdrv68bpzip2snr58klaj444nir"; }; dependencies = []; }; neosnippet-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "neosnippet-vim-2016-05-17"; + name = "neosnippet-vim-2016-07-10"; src = fetchgit { url = "git://github.com/shougo/neosnippet.vim"; - rev = "9eac227835317d2fad9ae9b816590ce33a3ab7c4"; - sha256 = "0hbj03rhrlga9fszd3ryyrfl93fmxsc3892swdaa3zhl18zfn0m2"; + rev = "9492fbb7e9016243af3c1987b91f0bffcf4cc8e7"; + sha256 = "0p2d762z0s9ayrc4kcqr7s1hmcghd04z818szqdn6v6rsr9lyln8"; }; dependencies = []; }; unite-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "unite-vim-2016-05-22"; + name = "unite-vim-2016-06-30"; src = fetchgit { url = "git://github.com/shougo/unite.vim"; - rev = "5fd81feec7ff3f94173ecb10e3dee98aaef26e5d"; - sha256 = "0lnmys9g99m7fzcxgc9xl2n7am14wyvqmffaqhdlpqjj3lv2l4dz"; + rev = "faeff916c6af683990d3afe571047ebdb8bf2a4b"; + sha256 = "1a29h4450z2g3599g8ln1l10h2lfwf7qr5j15hkrg7z23i5xgrj7"; }; dependencies = []; }; vimproc-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vimproc-vim-2016-04-27"; + name = "vimproc-vim-2016-07-10"; src = fetchgit { url = "git://github.com/shougo/vimproc.vim"; - rev = "0ff17bc0725cd0323df87664fa02b1436349f667"; - sha256 = "14j8ypn54cidh4bk3nqsc0ablwvgydlsbmb256rq512gpwkm2mil"; + rev = "b2255c66a3dc04fba1adbda3e380facff45fe6ec"; + sha256 = "09fabq1j3grd8d8xz0y9i5y756mqzs9n7icvnlmi6hbjzkv1rkx6"; }; dependencies = []; buildInputs = [ which ]; @@ -960,11 +1004,11 @@ rec { }; vimshell-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vimshell-vim-2016-04-04"; + name = "vimshell-vim-2016-06-11"; src = fetchgit { url = "git://github.com/shougo/vimshell.vim"; - rev = "bdcd197b701734a743903c7547e9f56842701614"; - sha256 = "1cv2mdkhq3kvs91cd7d703b6567glb3snvg27vmj1p8amzxjf97d"; + rev = "d36fde6da558d4cad7a1d03a07fd5e1fcf299141"; + sha256 = "0xx84552k7ziymp81slgxsym1nvzkyyyf1d31y7k8cqbvq87nbn1"; }; dependencies = [ "vimproc-vim" ]; }; @@ -981,11 +1025,11 @@ rec { }; vim-hardtime = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-hardtime-2016-05-03"; + name = "vim-hardtime-2016-07-05"; src = fetchgit { url = "git://github.com/takac/vim-hardtime"; - rev = "acf59c8df88e1445c145dfca626957d54a1310c3"; - sha256 = "1q7lhj6ll3lycsxqj0ymm7pb6m1sdglgip7wkirjv357yxl7y7kr"; + rev = "93ed99803df721648a9b93f0ccd4afe3d8d95a4e"; + sha256 = "0as6kbdg2jqkxphxyv6ik6qxyp245hl52aqmx5gjd4vi3pryg0gl"; }; dependencies = []; @@ -1014,11 +1058,11 @@ rec { }; vim-quickrun = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-quickrun-2016-05-18"; + name = "vim-quickrun-2016-07-02"; src = fetchgit { url = "git://github.com/thinca/vim-quickrun"; - rev = "3bdd13cc577b58a90d7964f2fe4446b2e65ea77a"; - sha256 = "0lpnq1pkv8zjj99gfsa21bvz2g1bspxkqjbs3m4h49g1695bf5w9"; + rev = "5149ecd1502b7fc2583cb8799ac1a0c72c41f828"; + sha256 = "1y32s42wgcq8qssm7yr578vvamvlb4kkdb1k5mhp0hmwskj2v7xp"; }; dependencies = []; @@ -1069,11 +1113,11 @@ rec { }; youcompleteme = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "youcompleteme-2016-05-17"; + name = "youcompleteme-2016-07-11"; src = fetchgit { url = "git://github.com/valloric/youcompleteme"; - rev = "fa583935476776ef274adf1d516d1497d5bb573d"; - sha256 = "0i6zr4x28j5lfqsbaq9mdpzxyppkrj2hlh4w1inx94f2sfijf1m5"; + rev = "c44489af16de6ae86294de7dd194bd6e53adaf1e"; + sha256 = "1m8m6wyics1mlxcxzq83ql8l4vd16cfbhc418vmxflx3178ifr36"; }; dependencies = []; buildInputs = [ @@ -1082,8 +1126,8 @@ rec { llvmPackages.llvm ] ++ stdenv.lib.optional stdenv.isDarwin Cocoa; - propogatedBuildInputs = [ - racerdRust + propagatedBuildInputs = [ + rustracerd ]; buildPhase = '' @@ -1109,22 +1153,22 @@ rec { }; vim-airline-themes = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-airline-themes-2016-05-16"; + name = "vim-airline-themes-2016-07-08"; src = fetchgit { url = "git://github.com/vim-airline/vim-airline-themes"; - rev = "97a042a57af7f04e25fddb6e694d75be1d55be02"; - sha256 = "1sgkwjrh8g01kykzbz6dm5giycrq3vqi0f3m5ppvijhj8yind69s"; + rev = "aa95f935047323dbcbe2fed210bd3a0356a3c32b"; + sha256 = "0mz1wb8bwcyd21wcvkdd58dbga78pdrcxnxwmvf0pi8ywix7aw01"; }; dependencies = []; }; vim-pandoc = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-pandoc-2016-05-24"; + name = "vim-pandoc-2016-07-11"; src = fetchgit { url = "git://github.com/vim-pandoc/vim-pandoc"; - rev = "cca2326046fd9bf44276e6d44f106c90d80eca25"; - sha256 = "106dxdll11sj5vi34a0nq5kmfbp13g80ix26m6k9snxjx2y79y3s"; + rev = "18461740f6915540e4833a71ab54a8205c9898b8"; + sha256 = "00mawpl3wwj223g7bcmx4ghfysvxg9d3iqk1h8azykgccp6wg7p6"; }; dependencies = []; @@ -1142,11 +1186,11 @@ rec { }; vim-pandoc-syntax = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-pandoc-syntax-2016-03-20"; + name = "vim-pandoc-syntax-2016-06-14"; src = fetchgit { url = "git://github.com/vim-pandoc/vim-pandoc-syntax"; - rev = "a35e9ce28bae85b1ce5d4f817882a8d78efcd6be"; - sha256 = "08l6sjzvl6bigh4d9rvqadvz8bpq25c1ima4la2i3pg8xgdc9xf3"; + rev = "eaf2507e0bd51ec06bc111777376b21da7340d5d"; + sha256 = "0xxsjvzv98wnfzw0j590am8za75y7gr8r480izb3db2z437micw7"; }; dependencies = []; @@ -1230,22 +1274,22 @@ rec { }; vim-wakatime = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-wakatime-2016-05-21"; + name = "vim-wakatime-2016-07-06"; src = fetchgit { url = "git://github.com/wakatime/vim-wakatime"; - rev = "d46c3e96d5e489d45c2910898212f58c646518c9"; - sha256 = "1qpsasiqin9wlavivfd9925pzsfh04hhdww92iah66a2vvaxjnhw"; + rev = "31b1a5d78244605fcab024edc20e6a0c059e449f"; + sha256 = "0k5bnckv1882r9445p74a4iqys72imy23w87c1shq1gxps47cwms"; }; dependencies = []; buildInputs = [ python ]; }; command-t = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "command-t-2016-05-21"; + name = "command-t-2016-06-14"; src = fetchgit { url = "git://github.com/wincent/command-t"; - rev = "39b75707640493795afb4fb90b2d74cade84cee8"; - sha256 = "1n46dq4fsqq7nsl7nivl3xk23k54sarflrr6b30v1vvg22mw64yq"; + rev = "354c429dad34f7d163663943c948f819588b53d3"; + sha256 = "1vkvc6ckza5b4ck52hv4rjclqi7x4f06dxkbqcqnia490m685v9q"; }; dependencies = []; buildInputs = [ perl ruby ]; @@ -1257,6 +1301,17 @@ rec { ''; }; + deoplete-jedi = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "deoplete-jedi-2016-07-10"; + src = fetchgit { + url = "git://github.com/zchee/deoplete-jedi"; + rev = "e7f0a94ea64b86d2b4946d30b6cedb38133d6603"; + sha256 = "05j1lfqxagndglyh337b6v2l4zmpa9fwrkgr0g4kk1s6f0lmla2b"; + }; + dependencies = []; + + }; + goyo = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "goyo-2016-04-03"; src = fetchgit { @@ -1301,28 +1356,6 @@ rec { }; - psc-ide-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "psc-ide-vim-2016-06-04"; - src = fetchgit { - url = "git://github.com/frigoeu/psc-ide-vim"; - rev = "27c000f0f27c7a4d05f001320ddcf1ae15b22eb7"; - sha256 = "1vgxf5kziv00mi346zw3b2dnxygxk0jyxg41y6w1j22yrp9id1k2"; - }; - dependencies = [ ]; - - }; - - purescript-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "purescript-vim-2016-06-04"; - src = fetchgit { - url = "git://github.com/raichoo/purescript-vim"; - rev = "92dd6bc647b45444e9d5e0550bdc3c56928f9762"; - sha256 = "090vpff58lzzhqp28p27am5s8s6ngjxw6j4y46zaixcxxx7wqzha"; - }; - dependencies = [ ]; - - }; - quickfixstatus = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "quickfixstatus-2011-09-02"; src = fetchgit { @@ -1368,11 +1401,11 @@ rec { }; snipmate = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "snipmate-2016-04-04"; + name = "snipmate-2016-06-15"; src = fetchgit { url = "git://github.com/garbas/vim-snipmate"; - rev = "66555c2a86ba2136459190c06aa2c0f25ad38bb3"; - sha256 = "1156g0iwy4fdfvb9922jvbxyn5k6z094m0y11igamb5d4kv7v72y"; + rev = "ee433e43c76c768c95ad6d9af67c4cd4b40f7eac"; + sha256 = "0rfis0rck0rk69nfzkrj6fm00hhdj75mvp809nw8vr14ldj2bvs7"; }; dependencies = ["vim-addon-mw-utils" "tlib"]; @@ -1390,22 +1423,22 @@ rec { }; surround = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "surround-2015-08-07"; + name = "surround-2016-06-01"; src = fetchgit { url = "git://github.com/tpope/vim-surround"; - rev = "2d05440ad23f97a7874ebd9b5de3a0e65d25d85c"; - sha256 = "1b74l52a2yi9r5j6w3mcyhacdxajs3ndab1viw632nprqqsh8qb4"; + rev = "e49d6c2459e0f5569ff2d533b4df995dd7f98313"; + sha256 = "1v0q2f1n8ngbja3wpjvqp2jh89pb5ij731qmm18k41nhgz6hhm46"; }; dependencies = []; }; table-mode = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "table-mode-2016-05-08"; + name = "table-mode-2016-07-11"; src = fetchgit { url = "git://github.com/dhruvasagar/vim-table-mode"; - rev = "b613e39bd08ecebdb9b18100dae518050f496048"; - sha256 = "1bachhk21x507q8xp4a6a8lpsqs2miv97lnjjf6q9qh0crxhv3z8"; + rev = "96236638a80fe73fa649824c9df25831a0042373"; + sha256 = "1c5xnm63hqw0jycwakdljs0f3mp26rjvd4llijrznpr9z2cvki8f"; }; dependencies = []; @@ -1433,11 +1466,11 @@ rec { }; tlib = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "tlib-2016-04-06"; + name = "tlib-2016-06-28"; src = fetchgit { url = "git://github.com/tomtom/tlib_vim"; - rev = "34b13299b5da7ad66ea387027d458bd54127687c"; - sha256 = "0dwcwqxbfq7gy3iy5smx3zqp2v62p8166vj02bhrrr5zkv8rqnb3"; + rev = "5636472e5dba1a4104376ce6bd93cc2546e02483"; + sha256 = "0cjb7q5aa77ff8r503sn2j35x5w80fkgvmv42nrpxqhz0ldkn5vp"; }; dependencies = []; @@ -1466,11 +1499,11 @@ rec { }; vim-addon-async = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-addon-async-2013-10-18"; + name = "vim-addon-async-2016-06-15"; src = fetchgit { url = "git://github.com/MarcWeber/vim-addon-async"; - rev = "dadc96e188f1cdacbac62129eb29a1eacfed792c"; - sha256 = "0b95l4ig8as82swhavsdica93bv5j55kvldfl7frkfp5zwcwi90f"; + rev = "4fcdf0c8a0da8b9dc2d5ad25e2cf7692cfbc10f3"; + sha256 = "1qa8ivh93ln30jbdwm9xg50yinvysvhricrkfjgg4v5nvk5sxj5n"; }; dependencies = ["vim-addon-signs"]; @@ -1664,22 +1697,22 @@ rec { }; vim-airline = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-airline-2016-05-22"; + name = "vim-airline-2016-07-04"; src = fetchgit { url = "git://github.com/vim-airline/vim-airline"; - rev = "4d39cb6f2078326dd07f2ab680a0365299a2589e"; - sha256 = "0jwk1ly9sbj3warq92haw3alq7q639375c9bl28j3rzg7x008blz"; + rev = "4d0c4f6b1e3fee30873b0c9734fbe83f4d74b81c"; + sha256 = "15fdd6i8p7w0xcj5b3zl8nqn7bx9wqg6s7pq9xj32ya7rg49f5bn"; }; dependencies = []; }; vim-coffee-script = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-coffee-script-2015-04-20"; + name = "vim-coffee-script-2016-06-29"; src = fetchgit { url = "git://github.com/kchmck/vim-coffee-script"; - rev = "32fe889b8cafd3a4921ef8e6485156453ff58c42"; - sha256 = "1x2kk9jm3948avvz3ywakmhdr3x99qfa54fk1pfphny3mrfv4l65"; + rev = "0f4bd9776cfd0fd2a394a4b1991630698e4fdc2d"; + sha256 = "18n1xbs59s71zvavjcg7an8y5dhq6agrb2rc2j6y48y7na0kf8sf"; }; dependencies = []; @@ -1708,11 +1741,11 @@ rec { }; vim-gitgutter = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-gitgutter-2016-05-23"; + name = "vim-gitgutter-2016-06-27"; src = fetchgit { url = "git://github.com/airblade/vim-gitgutter"; - rev = "f8da1fd6dbd558ebcc743bd7f91d35d6ca8db56a"; - sha256 = "0rbvkd8pc2wpfavbkb088rp6fmsww1m29zphcw8r8x1vwk2bz1p2"; + rev = "b5f23e986747a6f4b1dc1196d2a5bd3dc7c8c2b6"; + sha256 = "0z3f4yamkv3fmqnrr00j86xwrrfv199fiabpjqnk583b5kcbn90j"; }; dependencies = []; @@ -1741,55 +1774,55 @@ rec { }; vim-multiple-cursors = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-multiple-cursors-2016-04-11"; + name = "vim-multiple-cursors-2016-06-03"; src = fetchgit { url = "git://github.com/terryma/vim-multiple-cursors"; - rev = "25b567baf712a7e9bc8f3c9ca816bd579363109b"; - sha256 = "0y4gmk4m43ia94dkir2i3qs5z8i00r7yk22hrdws6nqrpnf7dp13"; + rev = "51d0717f63cc231f11b4b63ee5b611f589dce1b3"; + sha256 = "1s06wp4cjdmfvljzd9gz0wawkfcpkj8l2scjdx626ml740pnhmx8"; }; dependencies = []; }; vim-signature = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-signature-2016-05-19"; + name = "vim-signature-2016-07-09"; src = fetchgit { url = "git://github.com/kshenoy/vim-signature"; - rev = "2a2915685f78c60e6c95d936e8881d9336c3b03a"; - sha256 = "1sd4502bixs8311dj1w20jdwf1lgrbkz696ay9r0ywhxp7ri0qs4"; + rev = "e2fca5f3b0474e7174e08b32c89634ac6f53bfe2"; + sha256 = "0ik68qzx0pqsvsla6y593cwab4iw3xy1sl8kb4kq89lhvv1wgxmg"; }; dependencies = []; }; vim-signify = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-signify-2016-04-08"; + name = "vim-signify-2016-06-19"; src = fetchgit { url = "git://github.com/mhinz/vim-signify"; - rev = "37376d9970294063b2ba9594204d50cfa181ebb6"; - sha256 = "0ih09i0smn768fkbzbjpfzsjfsm4w653ghaykzcn4hbail67nx84"; + rev = "76bde232d163c99a8e72b517d8ef770b0d79849e"; + sha256 = "1yzq5ll7yx38872mpph976mn9yqyyypfif5vjhgvlk4l2an18qk6"; }; dependencies = []; }; vim-snippets = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-snippets-2016-05-24"; + name = "vim-snippets-2016-07-06"; src = fetchgit { url = "git://github.com/honza/vim-snippets"; - rev = "477ede1985a92f3ae1a5ff806a7507823abcc203"; - sha256 = "1ncs7bk2pqz4dy3h206s0c9f14h5kgfanipbiiis24z2zvq9mw18"; + rev = "d285c86221e917d13c6cbf89f347627ea9fe1796"; + sha256 = "1dxzl2d9kxn7vhxpz0shd2qsn6mgvbj9gn9rym8j9v4wjn2zvqws"; }; dependencies = []; }; vim-webdevicons = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-webdevicons-2016-04-17"; + name = "vim-webdevicons-2016-06-03"; src = fetchgit { url = "git://github.com/ryanoasis/vim-devicons"; - rev = "ad5d6d7f9fdf741a1e0d45b2bebab1d0116e1158"; - sha256 = "0i3frd23zwbxypj8xgv4hc44wzc2803p15852iqz3k0xr8y8rjxd"; + rev = "0bf80d78cba8603dd4f594f1807cc5bee706db84"; + sha256 = "17r98gh4pk0xdfprjmqzp617szwq4j6yrn6pbx0l1n7k7q5crv89"; }; dependencies = []; @@ -1818,11 +1851,11 @@ rec { }; vinegar = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vinegar-2016-01-30"; + name = "vinegar-2016-06-30"; src = fetchgit { url = "git://github.com/tpope/vim-vinegar"; - rev = "75fc3824bc09053f22735d6726c5cfd614c15642"; - sha256 = "19jl854wylmfdr9k4bfyffkz8bl4vpx1znnxzx0qj7cz2s3i9z0r"; + rev = "bd7f7b7929260072864462c04dde3b9f4c5e0d23"; + sha256 = "09shzlc9dagqlb5558nvm33b4bkk9cy34kp7zgnybphyy72wf31h"; }; dependencies = []; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index cdb411051aa4..b2a2a542bf5e 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -32,10 +32,12 @@ "github:ctrlpvim/ctrlp.vim" "github:digitaltoad/vim-jade" "github:eagletmt/neco-ghc" +"github:embear/vim-localvimrc" "github:enomsg/vim-haskellConcealPlus" "github:esneider/YUNOcommit.vim" "github:fatih/vim-go" "github:flazz/vim-colorschemes" +"github:floobits/floobits-neovim" "github:frigoeu/psc-ide-vim" "github:google/vim-jsonnet" "github:hecal3/vim-leader-guide" @@ -100,6 +102,7 @@ "github:vim-scripts/wombat256.vim" "github:wakatime/vim-wakatime" "github:wincent/command-t" +"github:zchee/deoplete-jedi" "goyo" "matchit.zip" "pathogen" diff --git a/pkgs/misc/vim-plugins/vim-utils.nix b/pkgs/misc/vim-plugins/vim-utils.nix index f39d7093c73b..acb5b4fcbe1e 100644 --- a/pkgs/misc/vim-plugins/vim-utils.nix +++ b/pkgs/misc/vim-plugins/vim-utils.nix @@ -330,7 +330,7 @@ rec { vimHelpTags = '' vimHelpTags(){ if [ -d "$1/doc" ]; then - ${vim}/bin/vim -N -u NONE -i NONE -n -e -s -c "helptags $1/doc" +quit! + ${vim}/bin/vim -N -u NONE -i NONE -n -E -s -c "helptags $1/doc" +quit! || echo "docs to build failed" fi } ''; diff --git a/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/youcompleteme b/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/youcompleteme index 12bcf53f1e04..eb7f6bedf497 100644 --- a/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/youcompleteme +++ b/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/youcompleteme @@ -4,8 +4,8 @@ llvmPackages.llvm ] ++ stdenv.lib.optional stdenv.isDarwin Cocoa; - propogatedBuildInputs = [ - racerdRust + propagatedBuildInputs = [ + rustracerd ]; buildPhase = '' |