From bff193eaba598168bbda445074fea040cd3760e3 Mon Sep 17 00:00:00 2001
From: linsui <36977733+linsui@users.noreply.github.com>
Date: Thu, 8 May 2025 23:01:00 +0800
Subject: [PATCH] readeck: 0.17.1 -> 0.18.2

---
 nixos/modules/services/web-apps/readeck.nix |  2 --
 pkgs/by-name/re/readeck/package.nix         | 20 ++++++++++++--------
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/nixos/modules/services/web-apps/readeck.nix b/nixos/modules/services/web-apps/readeck.nix
index bd529fa488ef..f0e7252f40bd 100644
--- a/nixos/modules/services/web-apps/readeck.nix
+++ b/nixos/modules/services/web-apps/readeck.nix
@@ -68,7 +68,6 @@ in
         ExecStart = "${lib.getExe cfg.package} serve -config ${configFile}";
         ProtectSystem = "full";
         SystemCallArchitectures = "native";
-        MemoryDenyWriteExecute = true;
         NoNewPrivileges = true;
         PrivateTmp = true;
         PrivateDevices = true;
@@ -89,7 +88,6 @@ in
         ProtectKernelTunables = true;
         LockPersonality = true;
         Restart = "on-failure";
-
       };
     };
   };
diff --git a/pkgs/by-name/re/readeck/package.nix b/pkgs/by-name/re/readeck/package.nix
index cf8f768e733d..d0082683eef4 100644
--- a/pkgs/by-name/re/readeck/package.nix
+++ b/pkgs/by-name/re/readeck/package.nix
@@ -1,14 +1,14 @@
 {
+  lib,
   fetchFromGitea,
   fetchNpmDeps,
   buildGoModule,
   nodejs,
   npmHooks,
-  lib,
+  python3,
 }:
 
 let
-
   file-compose = buildGoModule {
     pname = "file-compose";
     version = "unstable-2023-10-21";
@@ -27,19 +27,20 @@ in
 
 buildGoModule rec {
   pname = "readeck";
-  version = "0.17.1";
+  version = "0.18.2";
 
   src = fetchFromGitea {
     domain = "codeberg.org";
     owner = "readeck";
     repo = "readeck";
     tag = version;
-    hash = "sha256-+GgjR1mxD93bFNaLeDuEefPlQEV9jNgFIo8jTAxphyo=";
+    hash = "sha256-geKhug1sQ51i+6qw2LVzW8lXyvre6AlVHWvGlEXWki8=";
   };
 
   nativeBuildInputs = [
     nodejs
     npmHooks.npmConfigHook
+    (python3.withPackages (ps: with ps; [ babel ]))
   ];
 
   npmRoot = "web";
@@ -48,10 +49,13 @@ buildGoModule rec {
 
   preBuild = ''
     make web-build
+    python3 locales/messages.py compile
     ${file-compose}/bin/file-compose -format json docs/api/api.yaml docs/assets/api.json
     go run ./tools/docs docs/src docs/assets
   '';
 
+  subPackages = [ "." ];
+
   tags = [
     "netgo"
     "osusergo"
@@ -66,6 +70,7 @@ buildGoModule rec {
     "-X"
     "codeberg.org/readeck/readeck/configs.version=${version}"
   ];
+
   overrideModAttrs = oldAttrs: {
     # Do not add `npmConfigHook` to `goModules`
     nativeBuildInputs = lib.remove npmHooks.npmConfigHook oldAttrs.nativeBuildInputs;
@@ -75,18 +80,17 @@ buildGoModule rec {
 
   npmDeps = fetchNpmDeps {
     src = "${src}/web";
-    hash = "sha256-7fRSkXKAMEC7rFmSF50DM66SVhV68g93PMBjrtkd9/E=";
+    hash = "sha256-3MVrzpilJKptT0iRBQx2Cl0iKVoOJu5cBT987U1/C1k=";
   };
 
-  vendorHash = "sha256-O/ZrpT6wTtPwBDUCAmR0XHRgQmd46/MPvWNE0EvD3bg=";
+  vendorHash = "sha256-RjU3PW7GeMkQE0oHkI4EmFNr4HT3vRyFITUzYX9AHpw=";
 
   meta = {
     description = "Web application that lets you save the readable content of web pages you want to keep forever.";
     mainProgram = "readeck";
     homepage = "https://readeck.org/";
-    changelog = "https://github.com/readeck/readeck/releases/tag/${version}";
+    changelog = "https://codeberg.org/readeck/readeck/releases/tag/${version}";
     license = lib.licenses.agpl3Only;
     maintainers = with lib.maintainers; [ julienmalka ];
   };
-
 }