mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-26 08:53:21 +00:00
Merge pull request #35901 from volth/far-2018-02-27
far2l: 2017-10-08 -> 2018-02-27
This commit is contained in:
commit
24894fbc69
@ -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="/<[\w\d\/.+=?~-]+>/" region0="Path"/>
|
||||
+ <regexp match="/(ftp|mirror|http|https|git):\/\/[\w\d\/:?=&.~-]+/" region0="URL"/>
|
||||
+ <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"/>
|
||||
+
|
||||
|
@ -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 ];
|
||||
|
Loading…
Reference in New Issue
Block a user