From eb6f4a74c3cf7d0e452ace5affa9f2f1f4214d83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 5 Jul 2024 13:58:19 +0200 Subject: [PATCH] add Translate and UniversialLanguageSelector --- modules/nixos-wiki/default.nix | 5 +++++ modules/nixos-wiki/extensions.json | 4 +++- modules/nixos-wiki/extensions.nix | 8 +++++--- modules/nixos-wiki/update-extensions.py | 5 +++-- 4 files changed, 16 insertions(+), 6 deletions(-) diff --git a/modules/nixos-wiki/default.nix b/modules/nixos-wiki/default.nix index dcff372..a18fce5 100644 --- a/modules/nixos-wiki/default.nix +++ b/modules/nixos-wiki/default.nix @@ -165,6 +165,11 @@ in ''; }; + # https://www.mediawiki.org/wiki/Help:Extension:Translate/Installation + services.phpfpm.pools.mediawiki.phpOptions = '' + extension=${pkgs.phpExtensions.yaml}/lib/php/extensions/yaml.so + ''; + services.postgresql.package = pkgs.postgresql_16; networking.firewall.allowedTCPPorts = [ 443 80 ]; diff --git a/modules/nixos-wiki/extensions.json b/modules/nixos-wiki/extensions.json index 824de5e..a9a9720 100644 --- a/modules/nixos-wiki/extensions.json +++ b/modules/nixos-wiki/extensions.json @@ -1,5 +1,7 @@ { "MobileFrontend": {}, "DarkMode": {}, - "QuickInstantCommons": {} + "QuickInstantCommons": {}, + "Translate": {}, + "UniversalLanguageSelector": {} } diff --git a/modules/nixos-wiki/extensions.nix b/modules/nixos-wiki/extensions.nix index caee523..64e4a2f 100644 --- a/modules/nixos-wiki/extensions.nix +++ b/modules/nixos-wiki/extensions.nix @@ -1,5 +1,7 @@ { fetchzip }: { - "MobileFrontend" = fetchzip { url = "https://github.com/NixOS/nixos-wiki-infra/releases/download/MobileFrontend-REL1_42-762b528.tar.gz/MobileFrontend-REL1_42-762b528.tar.gz"; sha256 = "153psy35c28sz0nvhhxk0plw6x76gjn43jqv31753jji0xalnjqm"; }; - "DarkMode" = fetchzip { url = "https://github.com/NixOS/nixos-wiki-infra/releases/download/DarkMode-REL1_42-01e7144.tar.gz/DarkMode-REL1_42-01e7144.tar.gz"; sha256 = "1c9p52mylxbnf15n9xnhvjsx766bz01b176y4kzrzgcnivf1ssrb"; }; - "QuickInstantCommons" = fetchzip { url = "https://github.com/NixOS/nixos-wiki-infra/releases/download/QuickInstantCommons-REL1_42-3e6a069.tar.gz/QuickInstantCommons-REL1_42-3e6a069.tar.gz"; sha256 = "0vc6drd3j32wc4z4yc5g5dhh8x1904jsws31h4x8x47l3a78vfak"; }; + "MobileFrontend" = fetchzip { url = "https://github.com/NixOS/nixos-wiki-infra/releases/download/MobileFrontend-REL1_42-762b528.tar.gz/MobileFrontend-REL1_42-762b528.tar.gz"; hash = "sha256-FUtLVQdRylFOGBvLQax85nTD6QWzQ7gt+BoJVobXd5Q="; }; + "DarkMode" = fetchzip { url = "https://github.com/NixOS/nixos-wiki-infra/releases/download/DarkMode-REL1_42-01e7144.tar.gz/DarkMode-REL1_42-01e7144.tar.gz"; hash = "sha256-K2sd3I6WvZ//JN6csAL4y5jTtdzQ9mRLcHZ16qsoN7E="; }; + "QuickInstantCommons" = fetchzip { url = "https://github.com/NixOS/nixos-wiki-infra/releases/download/QuickInstantCommons-REL1_42-3e6a069.tar.gz/QuickInstantCommons-REL1_42-3e6a069.tar.gz"; hash = "sha256-U7mNjhr0kI46gWForiUBKXQEYSuvME8+YVwMOVpuhm0="; }; + "Translate" = fetchzip { url = "https://github.com/NixOS/nixos-wiki-infra/releases/download/Translate-REL1_42-aece617.tar.gz/Translate-REL1_42-aece617.tar.gz"; hash = "sha256-hCYQ6zEZPH4GGO7JnzLIYc/J9yB0wE84l5uLvQFNjdM="; }; + "UniversalLanguageSelector" = fetchzip { url = "https://github.com/NixOS/nixos-wiki-infra/releases/download/UniversalLanguageSelector-REL1_42-5261def.tar.gz/UniversalLanguageSelector-REL1_42-5261def.tar.gz"; hash = "sha256-BXDNICXSt3X/ZCYBsExP9IgELFf9V4vQMoDnCiSj4wg="; }; } diff --git a/modules/nixos-wiki/update-extensions.py b/modules/nixos-wiki/update-extensions.py index 001bb36..51f9e1c 100755 --- a/modules/nixos-wiki/update-extensions.py +++ b/modules/nixos-wiki/update-extensions.py @@ -70,7 +70,8 @@ def mirror_extension(extension_name: str, mediawiki_version: str) -> Extension: run(["gh", "release", "upload", base_name, f"{tmpdir}/{base_name}"]) for i in range(30): try: - hash = run(["nix-prefetch-url", "--unpack", mirror_url], stdout=subprocess.PIPE).stdout.strip() + data = run(["nix", "store", "prefetch-file", "--unpack", mirror_url, "--json"], stdout=subprocess.PIPE).stdout.strip() + hash = json.loads(data)["hash"] except subprocess.CalledProcessError: # sometimes github takes a while to make releases available print("nix-prefetch-url failed, retrying") @@ -85,7 +86,7 @@ def write_nix_file(file: IO[str], mirrored_extensions: list[Extension]) -> None: file.write("{ fetchzip }: {\n") for extension in mirrored_extensions: file.write( - f' "{extension.name}" = fetchzip {{ url = "{extension.url}"; sha256 = "{extension.hash}"; }};\n' + f' "{extension.name}" = fetchzip {{ url = "{extension.url}"; hash = "{extension.hash}"; }};\n' ) file.write("}\n")