diff options
Diffstat (limited to 'pkgs/applications/misc/far2l')
-rw-r--r-- | pkgs/applications/misc/far2l/add-nix-syntax-highlighting.patch | 158 | ||||
-rw-r--r-- | pkgs/applications/misc/far2l/default.nix | 22 |
2 files changed, 14 insertions, 166 deletions
diff --git a/pkgs/applications/misc/far2l/add-nix-syntax-highlighting.patch b/pkgs/applications/misc/far2l/add-nix-syntax-highlighting.patch deleted file mode 100644 index a50070c4eadd..000000000000 --- a/pkgs/applications/misc/far2l/add-nix-syntax-highlighting.patch +++ /dev/null @@ -1,158 +0,0 @@ -diff --git a/colorer/configs/base/hrc/nix.hrc b/colorer/configs/base/hrc/nix.hrc -new file mode 100644 -index 0000000..1bd9bb5 ---- /dev/null -+++ b/colorer/configs/base/hrc/nix.hrc -@@ -0,0 +1,132 @@ -+<?xml version="1.0" encoding="windows-1251"?> -+<!DOCTYPE hrc PUBLIC "-//Cail Lomecb//DTD Colorer HRC take5//EN" -+ "http://colorer.sf.net/2003/hrc.dtd"> -+<hrc version="take5" xmlns="http://colorer.sf.net/2003/hrc" -+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" -+ xsi:schemaLocation="http://colorer.sf.net/2003/hrc http://colorer.sf.net/2003/hrc.xsd"> -+ -+ <type name="nix"> -+ -+ <annotation><documentation> -+ Nix -+ </documentation></annotation> -+ -+ <import type="def"/> -+ -+ <region name="Code" parent="def:Text"/> -+ <region name="StringEscape" parent="def:StringContent"/> -+ <region name='Import' parent='def:Directive'/> -+ <region name='ImportOutline' parent='def:Outlined'/> -+ <region name="Path" parent="def:Path"/> -+ <region name="URL" parent="def:String"/> -+ <region name="LiteralKeyword" parent="def:Keyword"/> -+ <region name='Interpolation' parent='def:StringEdge'/> -+ <region name="Ident" parent="def:Identifier"/> <!-- Label --> -+ -+ <scheme name="TabsAsErrors" if="tabs-as-errors"> -+ <regexp match="/\t+/" region='def:Error'/> -+ </scheme> -+ -+ <scheme name="SpacesAsErrors" if="spaces-as-errors"> -+ <regexp match="/\x20+$/" region='def:Error'/> -+ </scheme> -+ -+ <scheme name="NotNestedComment"> -+ <inherit scheme="TabsAsErrors"/> -+ <inherit scheme="SpacesAsErrors"/> -+ <inherit scheme="Comment"/> -+ </scheme> -+ -+ <scheme name="String"> -+ <inherit scheme="TabsAsErrors"/> -+ <inherit scheme="SpacesAsErrors"/> -+<!-- <regexp match="/\\[xX]0*[\da-fA-F]{1,2}/" region0="StringEscape"/> --> -+ <regexp match="/\\./" region0="StringEscape"/> -+ <block start="/(\$\{)/" end="/(\})/" scheme="NixExpression" region="Code" region00="Interpolation" region01="PairStart" region10="Interpolation" region11="PairEnd"/> -+ </scheme> -+ -+ <scheme name="BlockString"> -+ <inherit scheme="TabsAsErrors"/> -+ <inherit scheme="SpacesAsErrors"/> -+ -+ <regexp match="/''\$/" region0="StringEscape"/> -+ <regexp match="/'''/" region0="StringEscape"/> -+ <block start="/(\$\{)/" end="/(\})/" scheme="NixExpression" region="Code" region00="Interpolation" region01="PairStart" region10="Interpolation" region11="PairEnd"/> -+ </scheme> -+ -+ <scheme name="NixIdent"> -+ <regexp match="/\w[\w\d-]*'*/" region0="Ident"/> -+ </scheme> -+ -+ <scheme name="NixExpression"> -+ <inherit scheme="TabsAsErrors"/> -+ <inherit scheme="SpacesAsErrors"/> -+ -+ <inherit scheme="def:unixCommentDirective"/> -+ <block start="/#/" end="/\s*$/" scheme="Comment" region="LineComment" region10="def:Error"/> -+ <block start="/\/\*/" end="/\*\//" scheme="NotNestedComment" region="Comment" region00="PairStart" region10="PairEnd"/> -+ -+ <block start="/(\$\{)/" end="/(\})/" scheme="NixExpression" region00="Interpolation" region01="PairStart" region10="Interpolation" 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\/.+?~-]+>/" 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"/> -+ -+ <keywords region="Keyword"> -+ <word name="assert"/> -+ <word name="else"/> -+ <word name="if"/> -+ <word name="in"/> -+ <word name="inherit"/> -+ <word name="import"/> -+ <word name="let"/> -+ <word name="or"/> -+ <word name="rec"/> -+ <word name="then"/> -+ <word name="throw"/> -+ <word name="with"/> -+ </keywords> -+ <keywords region="LiteralKeyword"> -+ <word name="true"/> -+ <word name="false"/> -+ <word name="null"/> -+ </keywords> -+ <keywords region="Symbol"> -+ <symb name="."/> -+ <symb name=":"/> -+ <symb name=","/> -+ <symb name=";"/> -+ -+ <symb name="*"/> -+ <symb name="/"/> -+ <symb name="%"/> -+ <symb name="+"/> -+ <symb name="-"/> -+ <symb name="!"/> -+ <symb name="?"/> -+ <symb name="@"/> -+ <symb name="<"/> -+ <symb name=">"/> -+ <symb name="&"/> -+ <symb name="|"/> -+ <symb name="="/> -+ <symb name="..."/> -+ </keywords> -+ -+ <inherit scheme="def:Number"/> -+ <inherit scheme="NixIdent"/> -+ -+ <regexp match="/[^\)\}\]\s]/" region='def:Error'/> -+ -+ </scheme> -+ -+ <scheme name="nix"> -+ <inherit scheme="NixExpression"/> -+ </scheme> -+ -+ </type> -+</hrc> -diff --git a/colorer/configs/base/hrc/proto.hrc b/colorer/configs/base/hrc/proto.hrc -index 11e493b..2a67263 100644 ---- a/colorer/configs/base/hrc/proto.hrc -+++ b/colorer/configs/base/hrc/proto.hrc -@@ -156,6 +156,14 @@ - <location link="jar:common.jar!base/lua.hrc"/> - <filename>/\.(w?lua)$/i</filename> - </prototype> -+ <prototype name="nix" group="main" description="Nix"> -+ <location link="nix.hrc"/> -+ <filename>/\.(nix)$/i</filename> -+ <parameters> -+ <param name="tabs-as-errors" value="true" description="Shows tabulation symbol as error"/> -+ <param name="spaces-as-errors" value="true" description="Shows trailing spaces as error"/> -+ </parameters> -+ </prototype> - <prototype name="ruby" group="main" description="Ruby"> - <location link="jar:common.jar!base/ruby.hrc"/> - <filename>/\.(rb|rbw|ruby|rake)$/i</filename> diff --git a/pkgs/applications/misc/far2l/default.nix b/pkgs/applications/misc/far2l/default.nix index d8a0c53d9e1a..3cdd4fb0bfe9 100644 --- a/pkgs/applications/misc/far2l/default.nix +++ b/pkgs/applications/misc/far2l/default.nix @@ -1,17 +1,16 @@ -{ 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 = "819d131110a9fedfc14f3b3bea8f1f56e68b077a"; - build = "unstable-2018-02-27.git${builtins.substring 0 7 rev}"; + build = "unstable-2018-07-19.git${builtins.substring 0 7 src.rev}"; name = "far2l-2.1.${build}"; src = fetchFromGitHub { owner = "elfmz"; repo = "far2l"; - rev = rev; - sha256 = "1xjy2ricd68pm9j758pb2axc2269ns2xh86443x5llfcaxrjja4b"; + rev = "dceaa3918ea2c5e43600bad3fc63f861b8d26fc4"; + sha256 = "1ssd3hwz4b7vl4r858d9whl61cn23pgcamcjmvfa6ysf4x2b7sgi"; }; nativeBuildInputs = [ cmake pkgconfig m4 makeWrapper imagemagick ]; @@ -19,10 +18,8 @@ stdenv.mkDerivation rec { buildInputs = [ wxGTK30 glib pcre ] ++ optional stdenv.isDarwin darwin.apple_sdk.frameworks.Cocoa; - patches = [ ./add-nix-syntax-highlighting.patch ]; - postPatch = optionalString stdenv.isLinux '' - substituteInPlace far2l/bootstrap/open.sh \ + substituteInPlace far2l/bootstrap/trash.sh \ --replace 'gvfs-trash' '${gvfs}/bin/gvfs-trash' '' + optionalString stdenv.isDarwin '' substituteInPlace far2l/CMakeLists.txt \ @@ -44,6 +41,15 @@ stdenv.mkDerivation rec { --replace '"gzip ' '"${gzip}/bin/gzip ' \ --replace '"bzip2 ' '"${bzip2}/bin/bzip2 ' \ --replace '"tar ' '"${gnutar}/bin/tar ' + + ( cd colorer/configs/base + patch -p2 < ${ fetchpatch { + name = "nix-language-highlighting.patch"; + url = https://github.com/colorer/Colorer-schemes/commit/64bd06de0a63224b431cd8fc42cd9fa84b8ba7c0.patch; + sha256 = "1mrj1wyxmk7sll9j1jzw6miwi0sfavf654klms24wngnh6hadsch"; + } + } + ) ''; installPhase = '' |