Extend merge for nginx

repology · Oct 23, 2024 · 22397ae · 22397ae
1 parent 1981629
commit 22397ae
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/800.renames-and-merges/n.yaml b/800.renames-and-merges/n.yaml
@@ -98,7 +98,7 @@
 - { setname: nginx,                    name: nginx-custom-dev, addflavor: aurcrap2 }
 - { setname: nginx,                    name: nginx-mainline-boringssl, addflavor: boringssl }
 - { setname: nginx,                    name: nginx-mainline-openssl-weak, addflavor: openssl-weak }
-- { setname: nginx,                    name: [nginx-rtmp,nginx-lite,nginx-extras], addflavor: true }
+- { setname: nginx,                    name: [nginx-rtmp,nginx-lite,nginx-extras,nginx-quic-libressl,nginxquic,nginx-quic], addflavor: true }
 - { setname: ngircd,                   name: ngircd-pam, addflavor: true }
 - { setname: ngs,                      name: [ngs-lang, ngslang, java-ngs, ngs-python, ngs-sdk] } # two projects, split in 850
 - { setname: ngspice,                  name: [libngspice,ng-spice,ngspice-docs,ngspice-rework,ngspice-shared], addflavor: true }

diff --git a/900.version-fixes/n.yaml b/900.version-fixes/n.yaml
@@ -89,6 +89,7 @@
 - { name: nextpnr,                     ver: "1",                                           incorrect: true }
 - { name: nextpnr,                     verge: "2000", verlt: "2022.04.06",                 outdated: true } # 0.3
 - { name: nexuiz,                      verpat: "[0-9]{2}",                                 incorrect: true } # T2; 2.5.2, not 25
+- { name: nginx,                       verpat: "20[0-9]{6}.*",                             incorrect: true }
 - { name: nginx,                       verpat: "[0-9]+(\\.[0-9]+){2}",                     devel: false } # mainline version is not beta/devel, explained here: https://www.nginx.com/blog/nginx-1-6-1-7-released/
 - { name: nginx,                       verpat: ".*quic",                                   incorrect: true }
 - { name: nginx,                                                     ruleset: nix,         untrusted: true } # accused of fake 1.21.7-quic