far2l: unstable-2017-09-30 -> unstable-2017-10-08

John Doe 6c3731ce c2a4baf9

+7 -6
+3 -2
pkgs/applications/misc/far2l/add-nix-syntax-highlighting.patch
··· 77 77 + <block start="/(\()/" end="/(\))/" scheme="NixExpression" region00="Symbol" region01="PairStart" region10="Symbol" region11="PairEnd"/> 78 78 + <block start="/(\[)/" end="/(\])/" scheme="NixExpression" region00="Symbol" region01="PairStart" region10="Symbol" region11="PairEnd"/> 79 79 + 80 - + <regexp match="/(\.\.|\.|\~|)\/[\w\d.+=?-]+(\/[\w\d.+=?-]+)*/" region0="Path"/> 81 - + <regexp match="/&lt;[\w\d\/.-]+&gt;/" region0="Path"/> 80 + + <regexp match="/[\w\d.+=?~-]*(\/[\w\d.+=?~-]+)+/" region0="Path"/> 81 + + <regexp match="/&lt;[\w\d\/.+=?~-]+&gt;/" region0="Path"/> 82 82 + <regexp match="/(ftp|mirror|http|https|git):\/\/[\w\d\/:?=&amp;.~-]+/" region0="URL"/> 83 83 + <block start="/(&quot;)/" end="/(&quot;)/" scheme="String" region="String" region00="def:StringEdge" region01="def:PairStart" region10="def:StringEdge" region11="def:PairEnd"/> 84 84 + <block start="/(&apos;&apos;)/" end="/(&apos;&apos;)/" scheme="BlockString" region="String" region00="def:StringEdge" region01="def:PairStart" region10="def:StringEdge" region11="def:PairEnd"/> ··· 91 91 + <word name="inherit"/> 92 92 + <word name="import"/> 93 93 + <word name="let"/> 94 + + <word name="or"/> 94 95 + <word name="rec"/> 95 96 + <word name="then"/> 96 97 + <word name="throw"/>
+4 -4
pkgs/applications/misc/far2l/default.nix
··· 1 - { stdenv, fetchFromGitHub, makeWrapper, cmake, pkgconfig, wxGTK30, glib, pcre, m4, bash, 1 + { stdenv, fetchFromGitHub, fetchpatch, makeWrapper, cmake, pkgconfig, wxGTK30, glib, pcre, m4, bash, 2 2 xdg_utils, gvfs, zip, unzip, gzip, bzip2, gnutar, p7zip, xz, imagemagick, darwin }: 3 3 4 4 with stdenv.lib; 5 5 stdenv.mkDerivation rec { 6 - rev = "1ecd3a37c7b866a4599c547ea332541de2a2af26"; 7 - build = "unstable-2017-09-30.git${builtins.substring 0 7 rev}"; 6 + rev = "192dace49c2e5456ca235833ee9877e4b8b491cc"; 7 + build = "unstable-2017-10-08.git${builtins.substring 0 7 rev}"; 8 8 name = "far2l-2.1.${build}"; 9 9 10 10 src = fetchFromGitHub { 11 11 owner = "elfmz"; 12 12 repo = "far2l"; 13 13 rev = rev; 14 - sha256 = "0mavg9z1n81b1hbkj320m36r8lpw28j07rl1d2hpg69y768yyq05"; 14 + sha256 = "1l1sf5zlr99xrmjlpzfk3snxqw13xgvnqilw4n7051b8km0snrbl"; 15 15 }; 16 16 17 17 nativeBuildInputs = [ cmake pkgconfig m4 makeWrapper imagemagick ];