summary refs log tree commit diff
path: root/pkgs/applications/misc/far2l
diff options
context:
space:
mode:
authorvolth <volth@volth.com>2018-02-27 20:50:21 +0000
committervolth <volth@volth.com>2018-02-27 20:50:57 +0000
commita3b406c0aa6b555b00857532bac123c6e3c62c35 (patch)
treef8328b46f4e4eb0a70d4868e3c56b5ac4cb094f9 /pkgs/applications/misc/far2l
parent49c0657e2ceb2486b28452e675a05413a3d2f583 (diff)
downloadnixlib-a3b406c0aa6b555b00857532bac123c6e3c62c35.tar
nixlib-a3b406c0aa6b555b00857532bac123c6e3c62c35.tar.gz
nixlib-a3b406c0aa6b555b00857532bac123c6e3c62c35.tar.bz2
nixlib-a3b406c0aa6b555b00857532bac123c6e3c62c35.tar.lz
nixlib-a3b406c0aa6b555b00857532bac123c6e3c62c35.tar.xz
nixlib-a3b406c0aa6b555b00857532bac123c6e3c62c35.tar.zst
nixlib-a3b406c0aa6b555b00857532bac123c6e3c62c35.zip
far2l: 2017-10-08 -> 2018-02-27
Diffstat (limited to 'pkgs/applications/misc/far2l')
-rw-r--r--pkgs/applications/misc/far2l/add-nix-syntax-highlighting.patch6
-rw-r--r--pkgs/applications/misc/far2l/default.nix6
2 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/applications/misc/far2l/add-nix-syntax-highlighting.patch b/pkgs/applications/misc/far2l/add-nix-syntax-highlighting.patch
index 0ed98ee947b2..a50070c4eadd 100644
--- a/pkgs/applications/misc/far2l/add-nix-syntax-highlighting.patch
+++ b/pkgs/applications/misc/far2l/add-nix-syntax-highlighting.patch
@@ -77,9 +77,9 @@ index 0000000..1bd9bb5
 +      <block start="/(\()/"   end="/(\))/" scheme="NixExpression" region00="Symbol"        region01="PairStart" region10="Symbol"        region11="PairEnd"/>
 +      <block start="/(\[)/"   end="/(\])/" scheme="NixExpression" region00="Symbol"        region01="PairStart" region10="Symbol"        region11="PairEnd"/>
 +
-+      <regexp match="/[\w\d.+=?~-]*(\/[\w\d.+=?~-]+)+/"                         region0="Path"/>
-+      <regexp match="/&lt;[\w\d\/.+=?~-]+&gt;/"                                 region0="Path"/>
-+      <regexp match="/(ftp|mirror|http|https|git):\/\/[\w\d\/:?=&amp;.~-]+/"    region0="URL"/>
++      <regexp match="/[\w\d.+=?~-]*(\/[\w\d.+?~-]+)+/"                          region0="Path"/>
++      <regexp match="/&lt;[\w\d\/.+?~-]+&gt;/"                                  region0="Path"/>
++      <regexp match="/(ftp|mirror|http|https|git):\/\/[\w\d\/:?=&amp;.~+-]+/"   region0="URL"/>
 +      <block start="/(&quot;)/"       end="/(&quot;)/"       scheme="String"      region="String" region00="def:StringEdge" region01="def:PairStart" region10="def:StringEdge" region11="def:PairEnd"/>
 +      <block start="/(&apos;&apos;)/" end="/(&apos;&apos;)/" scheme="BlockString" region="String" region00="def:StringEdge" region01="def:PairStart" region10="def:StringEdge" region11="def:PairEnd"/>
 +
diff --git a/pkgs/applications/misc/far2l/default.nix b/pkgs/applications/misc/far2l/default.nix
index aaaa7f3c214f..9ddd39981cc2 100644
--- a/pkgs/applications/misc/far2l/default.nix
+++ b/pkgs/applications/misc/far2l/default.nix
@@ -3,15 +3,15 @@
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
-  rev = "192dace49c2e5456ca235833ee9877e4b8b491cc";
-  build = "unstable-2017-10-08.git${builtins.substring 0 7 rev}";
+  rev = "819d131110a9fedfc14f3b3bea8f1f56e68b077a";
+  build = "unstable-2018-02-27.git${builtins.substring 0 7 rev}";
   name = "far2l-2.1.${build}";
 
   src = fetchFromGitHub {
     owner = "elfmz";
     repo = "far2l";
     rev = rev;
-    sha256 = "1l1sf5zlr99xrmjlpzfk3snxqw13xgvnqilw4n7051b8km0snrbl";
+    sha256 = "1xjy2ricd68pm9j758pb2axc2269ns2xh86443x5llfcaxrjja4b";
   };
 
   nativeBuildInputs = [ cmake pkgconfig m4 makeWrapper imagemagick ];