Merge pull request #35901 from volth/far-2018-02-27

far2l: 2017-10-08 -> 2018-02-27

authored by

Jörg Thalheim and committed by
GitHub
24894fbc f38f3c28

+6 -6
+3 -3
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"/> 82 - + <regexp match="/(ftp|mirror|http|https|git):\/\/[\w\d\/:?=&amp;.~-]+/" region0="URL"/> 80 + + <regexp match="/[\w\d.+=?~-]*(\/[\w\d.+?~-]+)+/" region0="Path"/> 81 + + <regexp match="/&lt;[\w\d\/.+?~-]+&gt;/" region0="Path"/> 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"/> 85 85 +
+3 -3
pkgs/applications/misc/far2l/default.nix
··· 3 3 4 4 with stdenv.lib; 5 5 stdenv.mkDerivation rec { 6 - rev = "192dace49c2e5456ca235833ee9877e4b8b491cc"; 7 - build = "unstable-2017-10-08.git${builtins.substring 0 7 rev}"; 6 + rev = "819d131110a9fedfc14f3b3bea8f1f56e68b077a"; 7 + build = "unstable-2018-02-27.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 = "1l1sf5zlr99xrmjlpzfk3snxqw13xgvnqilw4n7051b8km0snrbl"; 14 + sha256 = "1xjy2ricd68pm9j758pb2axc2269ns2xh86443x5llfcaxrjja4b"; 15 15 }; 16 16 17 17 nativeBuildInputs = [ cmake pkgconfig m4 makeWrapper imagemagick ];