commit ed73969d6d1a1d44dea1ebbdffc957f336cc4b6a · pyrox.dev/nixpkgs

-158

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

···

       1
       1
       -
       diff --git a/colorer/configs/base/hrc/nix.hrc b/colorer/configs/base/hrc/nix.hrc

     

       2
       2
       -
       new file mode 100644

     

       3
       3
       -
       index 0000000..1bd9bb5

     

       4
       4
       -
       --- /dev/null

     

       5
       5
       -
       +++ b/colorer/configs/base/hrc/nix.hrc

     

       6
       6
       -
       @@ -0,0 +1,132 @@

     

       7
       7
       -
       +<?xml version="1.0" encoding="windows-1251"?>

     

       8
       8
       -
       +<!DOCTYPE hrc PUBLIC "-//Cail Lomecb//DTD Colorer HRC take5//EN"

     

       9
       9
       -
       +  "http://colorer.sf.net/2003/hrc.dtd">

     

       10
       10
       -
       +<hrc version="take5" xmlns="http://colorer.sf.net/2003/hrc"

     

       11
       11
       -
       +     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

     

       12
       12
       -
       +     xsi:schemaLocation="http://colorer.sf.net/2003/hrc http://colorer.sf.net/2003/hrc.xsd">

     

       13
       13
       -
       +

     

       14
       14
       -
       +  <type name="nix">

     

       15
       15
       -
       +

     

       16
       16
       -
       +    <annotation><documentation>

     

       17
       17
       -
       +        Nix

     

       18
       18
       -
       +    </documentation></annotation>

     

       19
       19
       -
       +

     

       20
       20
       -
       +    <import type="def"/>

     

       21
       21
       -
       +

     

       22
       22
       -
       +    <region name="Code" parent="def:Text"/>

     

       23
       23
       -
       +    <region name="StringEscape" parent="def:StringContent"/>

     

       24
       24
       -
       +    <region name='Import' parent='def:Directive'/>

     

       25
       25
       -
       +    <region name='ImportOutline' parent='def:Outlined'/>

     

       26
       26
       -
       +    <region name="Path"     parent="def:Path"/>

     

       27
       27
       -
       +    <region name="URL"      parent="def:String"/>

     

       28
       28
       -
       +    <region name="LiteralKeyword" parent="def:Keyword"/>

     

       29
       29
       -
       +    <region name='Interpolation' parent='def:StringEdge'/>

     

       30
       30
       -
       +    <region name="Ident" parent="def:Identifier"/> <!-- Label  -->

     

       31
       31
       -
       +

     

       32
       32
       -
       +    <scheme name="TabsAsErrors" if="tabs-as-errors">

     

       33
       33
       -
       +      <regexp match="/\t+/" region='def:Error'/>

     

       34
       34
       -
       +    </scheme>

     

       35
       35
       -
       +

     

       36
       36
       -
       +    <scheme name="SpacesAsErrors" if="spaces-as-errors">

     

       37
       37
       -
       +      <regexp match="/\x20+$/" region='def:Error'/>

     

       38
       38
       -
       +    </scheme>

     

       39
       39
       -
       +

     

       40
       40
       -
       +    <scheme name="NotNestedComment">

     

       41
       41
       -
       +      <inherit scheme="TabsAsErrors"/>

     

       42
       42
       -
       +      <inherit scheme="SpacesAsErrors"/>

     

       43
       43
       -
       +      <inherit scheme="Comment"/>

     

       44
       44
       -
       +    </scheme>

     

       45
       45
       -
       +

     

       46
       46
       -
       +    <scheme name="String">

     

       47
       47
       -
       +      <inherit scheme="TabsAsErrors"/>

     

       48
       48
       -
       +      <inherit scheme="SpacesAsErrors"/>

     

       49
       49
       -
       +<!--  <regexp match="/\\[xX]0*[\da-fA-F]{1,2}/"                   region0="StringEscape"/> -->

     

       50
       50
       -
       +      <regexp match="/\\./"                                       region0="StringEscape"/>

     

       51
       51
       -
       +      <block start="/(\$\{)/" end="/(\})/" scheme="NixExpression" region="Code" region00="Interpolation" region01="PairStart" region10="Interpolation" region11="PairEnd"/>

     

       52
       52
       -
       +    </scheme>

     

       53
       53
       -
       +

     

       54
       54
       -
       +    <scheme name="BlockString">

     

       55
       55
       -
       +      <inherit scheme="TabsAsErrors"/>

     

       56
       56
       -
       +      <inherit scheme="SpacesAsErrors"/>

     

       57
       57
       -
       +

     

       58
       58
       -
       +      <regexp match="/&apos;&apos;\$/"                                          region0="StringEscape"/>

     

       59
       59
       -
       +      <regexp match="/&apos;&apos;&apos;/"                                      region0="StringEscape"/>

     

       60
       60
       -
       +      <block start="/(\$\{)/" end="/(\})/" scheme="NixExpression" region="Code" region00="Interpolation" region01="PairStart" region10="Interpolation" region11="PairEnd"/>

     

       61
       61
       -
       +    </scheme>

     

       62
       62
       -
       +

     

       63
       63
       -
       +    <scheme name="NixIdent">

     

       64
       64
       -
       +      <regexp match="/\w[\w\d-]*'*/"           region0="Ident"/>

     

       65
       65
       -
       +    </scheme>

     

       66
       66
       -
       +

     

       67
       67
       -
       +    <scheme name="NixExpression">

     

       68
       68
       -
       +      <inherit scheme="TabsAsErrors"/>

     

       69
       69
       -
       +      <inherit scheme="SpacesAsErrors"/>

     

       70
       70
       -
       +

     

       71
       71
       -
       +      <inherit scheme="def:unixCommentDirective"/>

     

       72
       72
       -
       +      <block start="/#/"    end="/\s*$/"            scheme="Comment"          region="LineComment" region10="def:Error"/>

     

       73
       73
       -
       +      <block start="/\/\*/" end="/\*\//"            scheme="NotNestedComment" region="Comment"     region00="PairStart" region10="PairEnd"/>

     

       74
       74
       -
       +

     

       75
       75
       -
       +      <block start="/(\$\{)/" end="/(\})/" scheme="NixExpression" region00="Interpolation" region01="PairStart" region10="Interpolation" region11="PairEnd"/>

     

       76
       76
       -
       +      <block start="/(\{)/"   end="/(\})/" scheme="NixExpression" region00="Symbol"        region01="PairStart" region10="Symbol"        region11="PairEnd"/>

     

       77
       77
       -
       +      <block start="/(\()/"   end="/(\))/" scheme="NixExpression" region00="Symbol"        region01="PairStart" region10="Symbol"        region11="PairEnd"/>

     

       78
       78
       -
       +      <block start="/(\[)/"   end="/(\])/" scheme="NixExpression" region00="Symbol"        region01="PairStart" region10="Symbol"        region11="PairEnd"/>

     

       79
       79
       -
       +

     

       80
       80
       -
       +      <regexp match="/[\w\d.+=?~-]*(\/[\w\d.+?~-]+)+/"                          region0="Path"/>

     

       81
       81
       -
       +      <regexp match="/&lt;[\w\d\/.+?~-]+&gt;/"                                  region0="Path"/>

     

       82
       82
       -
       +      <regexp match="/(ftp|mirror|http|https|git):\/\/[\w\d\/:?=&amp;.~+-]+/"   region0="URL"/>

     

       83
       83
       -
       +      <block start="/(&quot;)/"       end="/(&quot;)/"       scheme="String"      region="String" region00="def:StringEdge" region01="def:PairStart" region10="def:StringEdge" region11="def:PairEnd"/>

     

       84
       84
       -
       +      <block start="/(&apos;&apos;)/" end="/(&apos;&apos;)/" scheme="BlockString" region="String" region00="def:StringEdge" region01="def:PairStart" region10="def:StringEdge" region11="def:PairEnd"/>

     

       85
       85
       -
       +

     

       86
       86
       -
       +      <keywords region="Keyword">

     

       87
       87
       -
       +        <word name="assert"/>

     

       88
       88
       -
       +        <word name="else"/>

     

       89
       89
       -
       +        <word name="if"/>

     

       90
       90
       -
       +        <word name="in"/>

     

       91
       91
       -
       +        <word name="inherit"/>

     

       92
       92
       -
       +        <word name="import"/>

     

       93
       93
       -
       +        <word name="let"/>

     

       94
       94
       -
       +        <word name="or"/>

     

       95
       95
       -
       +        <word name="rec"/>

     

       96
       96
       -
       +        <word name="then"/>

     

       97
       97
       -
       +        <word name="throw"/>

     

       98
       98
       -
       +        <word name="with"/>

     

       99
       99
       -
       +      </keywords>

     

       100
       100
       -
       +      <keywords region="LiteralKeyword">

     

       101
       101
       -
       +        <word name="true"/>

     

       102
       102
       -
       +        <word name="false"/>

     

       103
       103
       -
       +        <word name="null"/>

     

       104
       104
       -
       +      </keywords>

     

       105
       105
       -
       +      <keywords region="Symbol">

     

       106
       106
       -
       +        <symb name="."/>

     

       107
       107
       -
       +        <symb name=":"/>

     

       108
       108
       -
       +        <symb name=","/>

     

       109
       109
       -
       +        <symb name=";"/>

     

       110
       110
       -
       +

     

       111
       111
       -
       +        <symb name="*"/>

     

       112
       112
       -
       +        <symb name="/"/>

     

       113
       113
       -
       +        <symb name="%"/>

     

       114
       114
       -
       +        <symb name="+"/>

     

       115
       115
       -
       +        <symb name="-"/>

     

       116
       116
       -
       +        <symb name="!"/>

     

       117
       117
       -
       +        <symb name="?"/>

     

       118
       118
       -
       +        <symb name="@"/>

     

       119
       119
       -
       +        <symb name="&lt;"/>

     

       120
       120
       -
       +        <symb name="&gt;"/>

     

       121
       121
       -
       +        <symb name="&amp;"/>

     

       122
       122
       -
       +        <symb name="|"/>

     

       123
       123
       -
       +        <symb name="="/>

     

       124
       124
       -
       +        <symb name="..."/>

     

       125
       125
       -
       +      </keywords>

     

       126
       126
       -
       +

     

       127
       127
       -
       +      <inherit scheme="def:Number"/>

     

       128
       128
       -
       +      <inherit scheme="NixIdent"/>

     

       129
       129
       -
       +

     

       130
       130
       -
       +      <regexp match="/[^\)\}\]\s]/" region='def:Error'/>

     

       131
       131
       -
       +

     

       132
       132
       -
       +    </scheme>

     

       133
       133
       -
       +

     

       134
       134
       -
       +    <scheme name="nix">

     

       135
       135
       -
       +      <inherit scheme="NixExpression"/>

     

       136
       136
       -
       +    </scheme>

     

       137
       137
       -
       +

     

       138
       138
       -
       +  </type>

     

       139
       139
       -
       +</hrc>

     

       140
       140
       -
       diff --git a/colorer/configs/base/hrc/proto.hrc b/colorer/configs/base/hrc/proto.hrc

     

       141
       141
       -
       index 11e493b..2a67263 100644

     

       142
       142
       -
       --- a/colorer/configs/base/hrc/proto.hrc

     

       143
       143
       -
       +++ b/colorer/configs/base/hrc/proto.hrc

     

       144
       144
       -
       @@ -156,6 +156,14 @@

     

       145
       145
       -
            <location link="jar:common.jar!base/lua.hrc"/>

     

       146
       146
       -
            <filename>/\.(w?lua)$/i</filename>

     

       147
       147
       -
          </prototype>

     

       148
       148
       -
       +  <prototype name="nix" group="main" description="Nix">

     

       149
       149
       -
       +    <location link="nix.hrc"/>

     

       150
       150
       -
       +    <filename>/\.(nix)$/i</filename>

     

       151
       151
       -
       +    <parameters>

     

       152
       152
       -
       +      <param name="tabs-as-errors" value="true" description="Shows tabulation symbol as error"/>

     

       153
       153
       -
       +      <param name="spaces-as-errors" value="true" description="Shows trailing spaces as error"/>

     

       154
       154
       -
       +    </parameters>

     

       155
       155
       -
       +  </prototype>

     

       156
       156
       -
          <prototype name="ruby" group="main" description="Ruby">

     

       157
       157
       -
            <location link="jar:common.jar!base/ruby.hrc"/>

     

       158
       158
       -
            <filename>/\.(rb|rbw|ruby|rake)$/i</filename>

+14 -8

pkgs/applications/misc/far2l/default.nix

···

       1
       1
       -
       { stdenv, fetchFromGitHub, makeWrapper, cmake, pkgconfig, wxGTK30, glib, pcre, m4, bash,

     

       1
       1
       +
       { stdenv, fetchFromGitHub, fetchpatch, makeWrapper, cmake, pkgconfig, wxGTK30, glib, pcre, m4, bash,

     

       2
       2
        
         xdg_utils, gvfs, zip, unzip, gzip, bzip2, gnutar, p7zip, xz, imagemagick, darwin }:

     

       3
       3
        
       

     

       4
       4
        
       with stdenv.lib;

     

       5
       5
        
       stdenv.mkDerivation rec {

     

       6
       6
       -
         rev = "819d131110a9fedfc14f3b3bea8f1f56e68b077a";

     

       7
       7
       -
         build = "unstable-2018-02-27.git${builtins.substring 0 7 rev}";

     

       6
       6
       +
         build = "unstable-2018-07-19.git${builtins.substring 0 7 src.rev}";

     

       8
       7
        
         name = "far2l-2.1.${build}";

     

       9
       8
        
       

     

       10
       9
        
         src = fetchFromGitHub {

     

       11
       10
        
           owner = "elfmz";

     

       12
       11
        
           repo = "far2l";

     

       13
       13
       -
           rev = rev;

     

       14
       14
       -
           sha256 = "1xjy2ricd68pm9j758pb2axc2269ns2xh86443x5llfcaxrjja4b";

     

       12
       12
       +
           rev = "dceaa3918ea2c5e43600bad3fc63f861b8d26fc4";

     

       13
       13
       +
           sha256 = "1ssd3hwz4b7vl4r858d9whl61cn23pgcamcjmvfa6ysf4x2b7sgi";

     

       15
       14
        
         };

     

       16
       15
        
       

     

       17
       16
        
         nativeBuildInputs = [ cmake pkgconfig m4 makeWrapper imagemagick ];

     

       18
       17
        
       

     

       19
       18
        
         buildInputs = [ wxGTK30 glib pcre ]

     

       20
       19
        
           ++ optional stdenv.isDarwin darwin.apple_sdk.frameworks.Cocoa;

     

       21
       21
       -
       

     

       22
       22
       -
         patches = [ ./add-nix-syntax-highlighting.patch ];

     

       23
       20
        
       

     

       24
       21
        
         postPatch = optionalString stdenv.isLinux ''

     

       25
       25
       -
           substituteInPlace far2l/bootstrap/open.sh \

     

       22
       22
       +
           substituteInPlace far2l/bootstrap/trash.sh \

     

       26
       23
        
             --replace 'gvfs-trash'  '${gvfs}/bin/gvfs-trash'

     

       27
       24
        
         '' + optionalString stdenv.isDarwin ''

     

       28
       25
        
           substituteInPlace far2l/CMakeLists.txt \

     
···

       44
       41
        
             --replace '"gzip '      '"${gzip}/bin/gzip '         \

     

       45
       42
        
             --replace '"bzip2 '     '"${bzip2}/bin/bzip2 '       \

     

       46
       43
        
             --replace '"tar '       '"${gnutar}/bin/tar '

     

       44
       44
       +
       

     

       45
       45
       +
           ( cd colorer/configs/base

     

       46
       46
       +
             patch -p2 <  ${ fetchpatch {

     

       47
       47
       +
                               name   = "nix-language-highlighting.patch";

     

       48
       48
       +
                               url    = https://github.com/colorer/Colorer-schemes/commit/64bd06de0a63224b431cd8fc42cd9fa84b8ba7c0.patch;

     

       49
       49
       +
                               sha256 = "1mrj1wyxmk7sll9j1jzw6miwi0sfavf654klms24wngnh6hadsch";

     

       50
       50
       +
                             }

     

       51
       51
       +
                           }

     

       52
       52
       +
           )

     

       47
       53
        
         '';

     

       48
       54
        
       

     

       49
       55
        
         installPhase = ''