ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-28 22:32:58 +03:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
John Doe 2017-12-06 04:07:27 +00:00
parent c2a4baf9f5
commit 6c3731cead
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/applications/misc/far2l/add-nix-syntax-highlighting.patch
View File

@ -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"/>
+ <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.+=?~-]*(\/[\w\d.+=?~-]+)+/" region0="Path"/>
+ <regexp match="/&lt;[\w\d\/.-]+&gt;/" region0="Path"/> + <regexp match="/&lt;[\w\d\/.+=?~-]+&gt;/" region0="Path"/>
+ <regexp match="/(ftp|mirror|http|https|git):\/\/[\w\d\/:?=&amp;.~-]+/" region0="URL"/> + <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="/(&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"/> + <block start="/(&apos;&apos;)/" end="/(&apos;&apos;)/" 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="inherit"/>
+ <word name="import"/> + <word name="import"/>
+ <word name="let"/> + <word name="let"/>
+ <word name="or"/>
+ <word name="rec"/> + <word name="rec"/>
+ <word name="then"/> + <word name="then"/>
+ <word name="throw"/> + <word name="throw"/>

8
pkgs/applications/misc/far2l/default.nix
View File

@ -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 }: xdg_utils, gvfs, zip, unzip, gzip, bzip2, gnutar, p7zip, xz, imagemagick, darwin }:
with stdenv.lib; with stdenv.lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
rev = "1ecd3a37c7b866a4599c547ea332541de2a2af26"; rev = "192dace49c2e5456ca235833ee9877e4b8b491cc";
build = "unstable-2017-09-30.git${builtins.substring 0 7 rev}"; build = "unstable-2017-10-08.git${builtins.substring 0 7 rev}";
name = "far2l-2.1.${build}"; name = "far2l-2.1.${build}";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "elfmz"; owner = "elfmz";
repo = "far2l"; repo = "far2l";
rev = rev; rev = rev;
sha256 = "0mavg9z1n81b1hbkj320m36r8lpw28j07rl1d2hpg69y768yyq05"; sha256 = "1l1sf5zlr99xrmjlpzfk3snxqw13xgvnqilw4n7051b8km0snrbl";
}; };
nativeBuildInputs = [ cmake pkgconfig m4 makeWrapper imagemagick ]; nativeBuildInputs = [ cmake pkgconfig m4 makeWrapper imagemagick ];