readeck: 0.17.1 -> 0.18.2 (#405276)

This commit is contained in:
Luj 2025-05-14 17:38:22 +02:00 committed by GitHub
commit b98b4f43bd
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 12 additions and 10 deletions

View file

@ -68,7 +68,6 @@ in
ExecStart = "${lib.getExe cfg.package} serve -config ${configFile}"; ExecStart = "${lib.getExe cfg.package} serve -config ${configFile}";
ProtectSystem = "full"; ProtectSystem = "full";
SystemCallArchitectures = "native"; SystemCallArchitectures = "native";
MemoryDenyWriteExecute = true;
NoNewPrivileges = true; NoNewPrivileges = true;
PrivateTmp = true; PrivateTmp = true;
PrivateDevices = true; PrivateDevices = true;
@ -89,7 +88,6 @@ in
ProtectKernelTunables = true; ProtectKernelTunables = true;
LockPersonality = true; LockPersonality = true;
Restart = "on-failure"; Restart = "on-failure";
}; };
}; };
}; };

View file

@ -1,14 +1,14 @@
{ {
lib,
fetchFromGitea, fetchFromGitea,
fetchNpmDeps, fetchNpmDeps,
buildGoModule, buildGoModule,
nodejs, nodejs,
npmHooks, npmHooks,
lib, python3,
}: }:
let let
file-compose = buildGoModule { file-compose = buildGoModule {
pname = "file-compose"; pname = "file-compose";
version = "unstable-2023-10-21"; version = "unstable-2023-10-21";
@ -27,19 +27,20 @@ in
buildGoModule rec { buildGoModule rec {
pname = "readeck"; pname = "readeck";
version = "0.17.1"; version = "0.18.2";
src = fetchFromGitea { src = fetchFromGitea {
domain = "codeberg.org"; domain = "codeberg.org";
owner = "readeck"; owner = "readeck";
repo = "readeck"; repo = "readeck";
tag = version; tag = version;
hash = "sha256-+GgjR1mxD93bFNaLeDuEefPlQEV9jNgFIo8jTAxphyo="; hash = "sha256-geKhug1sQ51i+6qw2LVzW8lXyvre6AlVHWvGlEXWki8=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
nodejs nodejs
npmHooks.npmConfigHook npmHooks.npmConfigHook
(python3.withPackages (ps: with ps; [ babel ]))
]; ];
npmRoot = "web"; npmRoot = "web";
@ -48,10 +49,13 @@ buildGoModule rec {
preBuild = '' preBuild = ''
make web-build make web-build
python3 locales/messages.py compile
${file-compose}/bin/file-compose -format json docs/api/api.yaml docs/assets/api.json ${file-compose}/bin/file-compose -format json docs/api/api.yaml docs/assets/api.json
go run ./tools/docs docs/src docs/assets go run ./tools/docs docs/src docs/assets
''; '';
subPackages = [ "." ];
tags = [ tags = [
"netgo" "netgo"
"osusergo" "osusergo"
@ -66,6 +70,7 @@ buildGoModule rec {
"-X" "-X"
"codeberg.org/readeck/readeck/configs.version=${version}" "codeberg.org/readeck/readeck/configs.version=${version}"
]; ];
overrideModAttrs = oldAttrs: { overrideModAttrs = oldAttrs: {
# Do not add `npmConfigHook` to `goModules` # Do not add `npmConfigHook` to `goModules`
nativeBuildInputs = lib.remove npmHooks.npmConfigHook oldAttrs.nativeBuildInputs; nativeBuildInputs = lib.remove npmHooks.npmConfigHook oldAttrs.nativeBuildInputs;
@ -75,18 +80,17 @@ buildGoModule rec {
npmDeps = fetchNpmDeps { npmDeps = fetchNpmDeps {
src = "${src}/web"; src = "${src}/web";
hash = "sha256-7fRSkXKAMEC7rFmSF50DM66SVhV68g93PMBjrtkd9/E="; hash = "sha256-3MVrzpilJKptT0iRBQx2Cl0iKVoOJu5cBT987U1/C1k=";
}; };
vendorHash = "sha256-O/ZrpT6wTtPwBDUCAmR0XHRgQmd46/MPvWNE0EvD3bg="; vendorHash = "sha256-RjU3PW7GeMkQE0oHkI4EmFNr4HT3vRyFITUzYX9AHpw=";
meta = { meta = {
description = "Web application that lets you save the readable content of web pages you want to keep forever."; description = "Web application that lets you save the readable content of web pages you want to keep forever.";
mainProgram = "readeck"; mainProgram = "readeck";
homepage = "https://readeck.org/"; 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; license = lib.licenses.agpl3Only;
maintainers = with lib.maintainers; [ julienmalka ]; maintainers = with lib.maintainers; [ julienmalka ];
}; };
} }