diff options
| author | John Doe <John Doe john@example.com> | 2017-12-06 04:07:27 +0000 |
|---|---|---|
| committer | John Doe <John Doe john@example.com> | 2017-12-07 04:08:45 +0000 |
| commit | 6c3731ceadf280fe8623202eddeac6f9b6a01ff0 (patch) | |
| tree | 4ef0120b2bad711a6273b5845c05cc872aa78cc1 /pkgs/applications/misc/far2l | |
| parent | c2a4baf9f56313e3748cad7e859b7dbad8675f72 (diff) | |
far2l: unstable-2017-09-30 -> unstable-2017-10-08
Diffstat (limited to 'pkgs/applications/misc/far2l')
| -rw-r--r-- | pkgs/applications/misc/far2l/add-nix-syntax-highlighting.patch | 5 | ||||
| -rw-r--r-- | pkgs/applications/misc/far2l/default.nix | 8 |
2 files changed, 7 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 68a16b196fa31..0ed98ee947b2c 100644 --- a/pkgs/applications/misc/far2l/add-nix-syntax-highlighting.patch +++ b/pkgs/applications/misc/far2l/add-nix-syntax-highlighting.patch @@ -77,8 +77,8 @@ 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="/<[\w\d\/.-]+>/" region0="Path"/> ++ <regexp match="/[\w\d.+=?~-]*(\/[\w\d.+=?~-]+)+/" region0="Path"/> ++ <regexp match="/<[\w\d\/.+=?~-]+>/" region0="Path"/> + <regexp match="/(ftp|mirror|http|https|git):\/\/[\w\d\/:?=&.~-]+/" region0="URL"/> + <block start="/(")/" end="/(")/" scheme="String" region="String" region00="def:StringEdge" region01="def:PairStart" region10="def:StringEdge" region11="def:PairEnd"/> + <block start="/('')/" end="/('')/" scheme="BlockString" region="String" region00="def:StringEdge" region01="def:PairStart" region10="def:StringEdge" region11="def:PairEnd"/> @@ -91,6 +91,7 @@ index 0000000..1bd9bb5 + <word name="inherit"/> + <word name="import"/> + <word name="let"/> ++ <word name="or"/> + <word name="rec"/> + <word name="then"/> + <word name="throw"/> diff --git a/pkgs/applications/misc/far2l/default.nix b/pkgs/applications/misc/far2l/default.nix index 7bd876f1d4aa0..aaaa7f3c214ff 100644 --- a/pkgs/applications/misc/far2l/default.nix +++ b/pkgs/applications/misc/far2l/default.nix @@ -1,17 +1,17 @@ -{ stdenv, fetchFromGitHub, makeWrapper, cmake, pkgconfig, wxGTK30, glib, pcre, m4, bash, +{ stdenv, fetchFromGitHub, fetchpatch, makeWrapper, cmake, pkgconfig, wxGTK30, glib, pcre, m4, bash, xdg_utils, gvfs, zip, unzip, gzip, bzip2, gnutar, p7zip, xz, imagemagick, darwin }: with stdenv.lib; stdenv.mkDerivation rec { - rev = "1ecd3a37c7b866a4599c547ea332541de2a2af26"; - build = "unstable-2017-09-30.git${builtins.substring 0 7 rev}"; + rev = "192dace49c2e5456ca235833ee9877e4b8b491cc"; + build = "unstable-2017-10-08.git${builtins.substring 0 7 rev}"; name = "far2l-2.1.${build}"; src = fetchFromGitHub { owner = "elfmz"; repo = "far2l"; rev = rev; - sha256 = "0mavg9z1n81b1hbkj320m36r8lpw28j07rl1d2hpg69y768yyq05"; + sha256 = "1l1sf5zlr99xrmjlpzfk3snxqw13xgvnqilw4n7051b8km0snrbl"; }; nativeBuildInputs = [ cmake pkgconfig m4 makeWrapper imagemagick ]; |