Unverified Commit 127761a0 authored by Justin !'s avatar Justin !
Browse files

treewide: fix broken-string-escape 

Lix is going to warn, and in the future, error on broken string escape.
After a flaker run, the following escape were flagged as broken, so this
commit fix them to make sure Lix is still able to build nixpkgs once the
patch deprecating the broken escapes land.
parent 6ab9745e

nixos/modules/services/networking/llama-swap.nix

+1 −1
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ in 
          healthCheckTimeout = 60;

          models = {

            "some-model" = {

              cmd = "$\{llama-server\} --port ''\${PORT} -m /var/lib/llama-cpp/models/some-model.gguf -ngl 0 --no-webui";

              cmd = "''\${llama-server} --port ''\${PORT} -m /var/lib/llama-cpp/models/some-model.gguf -ngl 0 --no-webui";

              aliases = [

                "the-best"

              ];

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

+2 −2
Original line number Diff line number Diff line
@@ -83,11 +83,11 @@ in 
            rewrite ^/.well-known/caldav  /dav.php redirect;

            rewrite ^/.well-known/carddav /dav.php redirect;

          '';

          "~ /(\.ht|Core|Specific|config)".extraConfig = ''

          "~ /(\\.ht|Core|Specific|config)".extraConfig = ''

            deny all;

            return 404;

          '';

          "~ ^(.+\.php)(.*)$".extraConfig = ''

          "~ ^(.+\\.php)(.*)$".extraConfig = ''

            try_files $fastcgi_script_name =404;

            include                   ${config.services.nginx.package}/conf/fastcgi.conf;

            fastcgi_split_path_info   ^(.+\.php)(.*)$;

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

+6 −6
Original line number Diff line number Diff line
@@ -439,7 +439,7 @@ in 
            index index.php;

          '';

          locations = {

            "~ '\.php$|^/update.php'" = {

            "~ '\\.php$|^/update\\.php'" = {

              extraConfig = ''

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

                fastcgi_pass unix:${config.services.phpfpm.pools."drupal-${hostName}".socket};
@@ -470,7 +470,7 @@ in 
                access_log off;

              '';

            };

            "~ \..*/.*\.php$" = {

            "~ \\..*/.*\\.php$" = {

              extraConfig = ''

                return 403;

              '';
@@ -480,7 +480,7 @@ in 
                return 403;

              '';

            };

            "~ ^/sites/[^/]+/files/.*\.php$" = {

            "~ ^/sites/[^/]+/files/.*\\.php$" = {

              extraConfig = ''

                deny all;

              '';
@@ -500,13 +500,13 @@ in 
                rewrite ^ /index.php;

              '';

            };

            "~ /vendor/.*\.php$" = {

            "~ /vendor/.*\\.php$" = {

              extraConfig = ''

                deny all;

                return 404;

              '';

            };

            "~* \.(js|css|png|jpg|jpeg|gif|ico|svg)$" = {

            "~* \\.(js|css|png|jpg|jpeg|gif|ico|svg)$" = {

              extraConfig = ''

                try_files $uri @rewrite;

                expires max;
@@ -518,7 +518,7 @@ in 
                try_files $uri @rewrite;

              '';

            };

            "~ ^(/[a-z\-]+)?/system/files/" = {

            "~ ^(/[a-z\\-]+)?/system/files/" = {

              extraConfig = ''

                try_files $uri /index.php?$query_string;

              '';

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

+1 −1
Original line number Diff line number Diff line
@@ -511,7 +511,7 @@ in 
                tryFiles = "$uri /index.php?$args";

              };



              "~ \.php$".extraConfig = ''

              "~ \\.php$".extraConfig = ''

                fastcgi_pass unix:${config.services.phpfpm.pools."limesurvey".socket};

              '';

              "/tmp".root = "/var/lib/limesurvey";

nixos/modules/services/web-apps/part-db.nix

+1 −1
Original line number Diff line number Diff line
@@ -179,7 +179,7 @@ in 
                sendfile off;

              '';

            };

            "~ \.php$" = {

            "~ \\.php$" = {

              extraConfig = ''

                include ${config.services.nginx.package}/conf/fastcgi_params ;

                fastcgi_param SCRIPT_FILENAME $request_filename;