commit bfed455de3f0ba756c8e8f6fc19b9cd0609f64b2 · pyrox.dev/nixpkgs

+2 -2

nixos/modules/programs/less.nix

···

       54
       54
        
               type = types.attrsOf types.str;

     

       55
       55
        
               default = {};

     

       56
       56
        
               example = {

     

       57
       57
       -
                 h = "noaction 5\e(";

     

       58
       58
       -
                 l = "noaction 5\e)";

     

       57
       57
       +
                 h = "noaction 5\\e(";

     

       58
       58
       +
                 l = "noaction 5\\e)";

     

       59
       59
        
               };

     

       60
       60
        
               description = "Defines new command keys.";

     

       61
       61
        
             };

+1 -1

nixos/modules/services/mail/rspamd.nix

···

       68
       68
        
                 replaced with <literal>rspamd_proxy</literal>.

     

       69
       69
        
               '';

     

       70
       70
        
               apply = let

     

       71
       71
       -
                   from = "services.rspamd.workers.\”${name}\".type";

     

       71
       71
       +
                   from = "services.rspamd.workers.\"${name}\".type";

     

       72
       72
        
                   files = options.type.files;

     

       73
       73
        
                   warning = "The option `${from}` defined in ${showFiles files} has enum value `proxy` which has been renamed to `rspamd_proxy`";

     

       74
       74
        
                 in x: if x == "proxy" then traceWarning warning "rspamd_proxy" else x;

+1 -1

nixos/modules/services/monitoring/graphite.nix

···

       239
       239
        
               description = "Any metrics received which match one of the experssions will be dropped.";

     

       240
       240
        
               default = null;

     

       241
       241
        
               type = types.nullOr types.str;

     

       242
       242
       -
               example = "^some\.noisy\.metric\.prefix\..*";

     

       242
       242
       +
               example = "^some\\.noisy\\.metric\\.prefix\\..*";

     

       243
       243
        
             };

     

       244
       244
        
       

     

       245
       245
        
             whitelist = mkOption {

+1 -1

nixos/modules/services/networking/prosody.nix

···

       465
       465
        
       

     

       466
       466
        
             modules_enabled = {

     

       467
       467
        
       

     

       468
       468
       -
               ${ lib.concatStringsSep "\n\ \ " (lib.mapAttrsToList

     

       468
       468
       +
               ${ lib.concatStringsSep "\n  " (lib.mapAttrsToList

     

       469
       469
        
                 (name: val: optionalString val "${toLua name};")

     

       470
       470
        
               cfg.modules) }

     

       471
       471
        
               ${ lib.concatStringsSep "\n" (map (x: "${toLua x};") cfg.package.communityModules)}

+5 -5

nixos/modules/services/web-apps/matomo.nix

···

       105
       105
        
               default = null;

     

       106
       106
        
               example = {

     

       107
       107
        
                 serverAliases = [

     

       108
       108
       -
                   "matomo.$\{config.networking.domain\}"

     

       109
       109
       -
                   "stats.$\{config.networking.domain\}"

     

       108
       108
       +
                   "matomo.\${config.networking.domain}"

     

       109
       109
       +
                   "stats.\${config.networking.domain}"

     

       110
       110
        
                 ];

     

       111
       111
        
                 enableACME = false;

     

       112
       112
        
               };

     
···

       115
       115
        
                   Either this option or the webServerUser option is mandatory.

     

       116
       116
        
                   Set this to {} to just enable the virtualHost if you don't need any customization.

     

       117
       117
        
                   If enabled, then by default, the <option>serverName</option> is

     

       118
       118
       -
                   <literal>${user}.$\{config.networking.hostName\}.$\{config.networking.domain\}</literal>,

     

       118
       118
       +
                   <literal>''${user}.''${config.networking.hostName}.''${config.networking.domain}</literal>,

     

       119
       119
        
                   SSL is active, and certificates are acquired via ACME.

     

       120
       120
        
                   If this is set to null (the default), no nginx virtualHost will be configured.

     

       121
       121
        
               '';

     
···

       275
       275
        
                 fastcgi_pass unix:${phpSocket};

     

       276
       276
        
               '';

     

       277
       277
        
               # Any other attempt to access any php files is forbidden

     

       278
       278
       -
               locations."~* ^.+\.php$".extraConfig = ''

     

       278
       278
       +
               locations."~* ^.+\\.php$".extraConfig = ''

     

       279
       279
        
                 return 403;

     

       280
       280
        
               '';

     

       281
       281
        
               # Disallow access to unneeded directories

     
···

       284
       284
        
                 return 403;

     

       285
       285
        
               '';

     

       286
       286
        
               # Disallow access to several helper files

     

       287
       287
       -
               locations."~* \.(?:bat|git|ini|sh|txt|tpl|xml|md)$".extraConfig = ''

     

       287
       287
       +
               locations."~* \\.(?:bat|git|ini|sh|txt|tpl|xml|md)$".extraConfig = ''

     

       288
       288
        
                 return 403;

     

       289
       289
        
               '';

     

       290
       290
        
               # No crawling of this site for bots that obey robots.txt - no useful information here.

+2 -2

nixos/modules/services/web-apps/restya-board.nix

···

       235
       235
        
       

     

       236
       236
        
             locations."/".root = "${runDir}/client";

     

       237
       237
        
       

     

       238
       238
       -
             locations."~ \.php$" = {

     

       238
       238
       +
             locations."~ \\.php$" = {

     

       239
       239
        
               tryFiles = "$uri =404";

     

       240
       240
        
               extraConfig = ''

     

       241
       241
        
                 include ${pkgs.nginx}/conf/fastcgi_params;

     
···

       246
       246
        
               '';

     

       247
       247
        
             };

     

       248
       248
        
       

     

       249
       249
       -
             locations."~* \.(css|js|less|html|ttf|woff|jpg|jpeg|gif|png|bmp|ico)" = {

     

       249
       249
       +
             locations."~* \\.(css|js|less|html|ttf|woff|jpg|jpeg|gif|png|bmp|ico)" = {

     

       250
       250
        
               root = "${runDir}/client";

     

       251
       251
        
               extraConfig = ''

     

       252
       252
        
                 if (-f $request_filename) {

+1 -1

nixos/modules/services/web-apps/tt-rss.nix

···

       548
       548
        
                   index = "index.php";

     

       549
       549
        
                 };

     

       550
       550
        
       

     

       551
       551
       -
                 locations."~ \.php$" = {

     

       551
       551
       +
                 locations."~ \\.php$" = {

     

       552
       552
        
                   extraConfig = ''

     

       553
       553
        
                     fastcgi_split_path_info ^(.+\.php)(/.+)$;

     

       554
       554
        
                     fastcgi_pass unix:${config.services.phpfpm.pools.${cfg.pool}.socket};

+1 -1

pkgs/applications/video/kino/default.nix

···

       80
       80
        
       

     

       81
       81
        
         postInstall = "

     

       82
       82
        
           rpath=`patchelf --print-rpath \$out/bin/kino`;

     

       83
       83
       -
           for i in $\buildInputs; do

     

       83
       83
       +
           for i in $buildInputs; do

     

       84
       84
        
             echo adding \$i/lib

     

       85
       85
        
             rpath=\$rpath\${rpath:+:}\$i/lib

     

       86
       86
        
           done

+2 -2

pkgs/development/haskell-modules/hackage-packages.nix

···

       57676
       57676
        
              version = "0.1.0.1";

     

       57677
       57677
        
              sha256 = "0rwi5zwvqn18g7qyp9aw51w3yzkqbff9g7rcqdk1l871fvq8qhha";

     

       57678
       57678
        
              libraryHaskellDepends = [ base ];

     

       57679
       57679
       -
              description = "Haskell operator `g ... f = \x1 .. xn -> g (f x1 .. xn)`.";

     

       57679
       57679
       +
              description = "Haskell operator `g ... f = \\x1 .. xn -> g (f x1 .. xn)`.";

     

       57680
       57680
        
              license = stdenv.lib.licenses.bsd3;

     

       57681
       57681
        
            }) {};

     

       57682
       57682
        
       

     
···

       253088
       253088
        
                base containers exceptions free spiros split text transformers

     

       253089
       253089
        
              ];

     

       253090
       253090
        
              executableHaskellDepends = [ base ];

     

       253091
       253091
       -
              description = "Automate keyboard\/mouse\/clipboard\/application interaction";

     

       253091
       253091
       +
              description = "Automate keyboard/mouse/clipboard/application interaction";

     

       253092
       253092
        
              license = stdenv.lib.licenses.bsd3;

     

       253093
       253093
        
              hydraPlatforms = stdenv.lib.platforms.none;

     

       253094
       253094
        
              broken = true;

+7 -7

pkgs/development/tools/misc/ctags/wrapped.nix

···

       27
       27
        
       

     

       28
       28
        
         # don't scan version control directories

     

       29
       29
        
         defaultArgs = [

     

       30
       30
       -
           "--exclude=\.svn"

     

       31
       31
       -
           "--exclude=\.hg"

     

       32
       32
       -
           "--exclude=\.git"

     

       33
       33
       -
           "--exclude=\_darcs"

     

       30
       30
       +
           "--exclude=.svn"

     

       31
       31
       +
           "--exclude=.hg"

     

       32
       32
       +
           "--exclude=.git"

     

       33
       33
       +
           "--exclude=_darcs"

     

       34
       34
        
           "--sort=yes"

     

       35
       35
        
         ];

     

       36
       36
        
       

     
···

       38
       38
        
         asLang = [

     

       39
       39
        
           "--langdef=ActionScript"

     

       40
       40
        
           "--langmap=ActionScript:.as"

     

       41
       41
       -
           "--regex-ActionScript=/function[ \\t]+([A-Za-z0-9_]+)[ \\t]*\\(/\1/f,function,functions/"

     

       42
       42
       -
           "--regex-ActionScript=/function[ \\t]+(set|get)[ \\t]+([A-Za-z0-9_]+)[ \\t]*\\(/\2/p,property,properties/"

     

       41
       41
       +
           "--regex-ActionScript=/function[ \\t]+([A-Za-z0-9_]+)[ \\t]*\\(/\\1/f,function,functions/"

     

       42
       42
       +
           "--regex-ActionScript=/function[ \\t]+(set|get)[ \\t]+([A-Za-z0-9_]+)[ \\t]*\\(/\\2/p,property,properties/"

     

       43
       43
        
           "--regex-ActionScript=/interface[ \\t]+[a-z0-9_.]*([A-Z][A-Za-z0-9_]+)/\\1/i,interface,interfaces/"

     

       44
       44
        
           "--regex-ActionScript=/package[ \\t]+([^ \\t]*)/\\1/p/"

     

       45
       45
        
           "--regex-ActionScript=/class[ \\t]+[a-z0-9_.]*([A-Z][A-Za-z0-9_]+)/\\1/c,class,classes/"

     
···

       67
       67
        
         nixLang = [

     

       68
       68
        
           "--langdef=NIX"

     

       69
       69
        
           "--langmap=NIX:.nix"

     

       70
       70
       -
           "--regex-NIX=/\([^ \\t*]*\)[ \\t]*=/\\1/f/"

     

       70
       70
       +
           "--regex-NIX=/([^ \\t*]*)[ \\t]*=/\\1/f/"

     

       71
       71
        
         ];

     

       72
       72
        
       

     

       73
       73
        
         rubyLang = [

+2 -2

pkgs/os-specific/darwin/apple-source-releases/system_cmds/default.nix

···

       14
       14
        
         #                    + lib.optionalString hostPlatform.isAarch32 "-D__arm__";

     

       15
       15
        
         NIX_CFLAGS_COMPILE = [ "-DDAEMON_UID=1"

     

       16
       16
        
                                "-DDAEMON_GID=1"

     

       17
       17
       -
                                "-DDEFAULT_AT_QUEUE=\'a\'"

     

       18
       18
       -
                                "-DDEFAULT_BATCH_QUEUE=\'b\'"

     

       17
       17
       +
                                "-DDEFAULT_AT_QUEUE='a'"

     

       18
       18
       +
                                "-DDEFAULT_BATCH_QUEUE='b'"

     

       19
       19
        
                                "-DPERM_PATH=\"/usr/lib/cron/\""

     

       20
       20
        
                                "-DOPEN_DIRECTORY"

     

       21
       21
        
                                "-DNO_DIRECT_RPC"

+2 -2

pkgs/tools/typesetting/tex/texlive/combine.nix

···

       136
       136
        
           script =

     

       137
       137
        
             writeText "hyphens.sed" (

     

       138
       138
        
               # pick up the header

     

       139
       139
       -
               "1,/^\% from/p;"

     

       139
       139
       +
               "1,/^% from/p;"

     

       140
       140
        
               # pick up all sections matching packages that we combine

     

       141
       141
       -
               + lib.concatMapStrings (pname: "/^\% from ${pname}:$/,/^\%/p;\n") pnames

     

       141
       141
       +
               + lib.concatMapStrings (pname: "/^% from ${pname}:$/,/^%/p;\n") pnames

     

       142
       142
        
             );

     

       143
       143
        
         in ''

     

       144
       144
        
           (