From fa851fd7a897ffef26305e1bf30d13c9ff2e0d59 Mon Sep 17 00:00:00 2001 From: Christian Kampka Date: Thu, 5 Dec 2019 13:44:08 +0100 Subject: trilium: 0.33.6 -> 0.37.8 --- pkgs/applications/office/trilium/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/applications/office') diff --git a/pkgs/applications/office/trilium/default.nix b/pkgs/applications/office/trilium/default.nix index 877dfba88c0..b63b2e28d4c 100644 --- a/pkgs/applications/office/trilium/default.nix +++ b/pkgs/applications/office/trilium/default.nix @@ -13,11 +13,11 @@ let in stdenv.mkDerivation rec { pname = "trilium"; - version = "0.33.6"; + version = "0.37.8"; src = fetchurl { url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-${version}.tar.xz"; - sha256 = "1sg6iqhpgyr8zr6w6dgs0ha0indb9vyp8vh2clj2fds5ahhlvf91"; + sha256 = "06d88waxxjdnrn0y8qr6p9rf5xkvl5lbabb0xyk0dgy3wg70zlxz"; }; # Fetch from source repo, no longer included in release. -- cgit 1.4.1 From 184339fe8b3b5218aa5203b587065d48a99fafb7 Mon Sep 17 00:00:00 2001 From: Christian Kampka Date: Thu, 5 Dec 2019 13:52:55 +0100 Subject: trilium: Rename package to trilium-desktop --- pkgs/applications/office/trilium/default.nix | 102 ++++++++++++++------------- pkgs/top-level/all-packages.nix | 5 +- 2 files changed, 57 insertions(+), 50 deletions(-) (limited to 'pkgs/applications/office') diff --git a/pkgs/applications/office/trilium/default.nix b/pkgs/applications/office/trilium/default.nix index b63b2e28d4c..84e351b9d42 100644 --- a/pkgs/applications/office/trilium/default.nix +++ b/pkgs/applications/office/trilium/default.nix @@ -11,56 +11,60 @@ let categories = "Office"; }; -in stdenv.mkDerivation rec { - pname = "trilium"; version = "0.37.8"; +in { + + trilium-desktop = stdenv.mkDerivation rec { + pname = "trilium-desktop"; + inherit version; - src = fetchurl { - url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-${version}.tar.xz"; - sha256 = "06d88waxxjdnrn0y8qr6p9rf5xkvl5lbabb0xyk0dgy3wg70zlxz"; - }; - - # Fetch from source repo, no longer included in release. - # (they did special-case icon.png but we want the scalable svg) - # Use the version here to ensure we get any changes. - trilium_svg = fetchurl { - url = "https://raw.githubusercontent.com/zadam/trilium/v${version}/src/public/images/trilium.svg"; - sha256 = "1rgj7pza20yndfp8n12k93jyprym02hqah36fkk2b3if3kcmwnfg"; - }; - - - nativeBuildInputs = [ - autoPatchelfHook - makeWrapper - wrapGAppsHook - ]; - - buildInputs = [ atomEnv.packages gtk3 ]; - - installPhase = '' - mkdir -p $out/bin - mkdir -p $out/share/trilium - mkdir -p $out/share/{applications,icons/hicolor/scalable/apps} - - cp -r ./* $out/share/trilium - ln -s $out/share/trilium/trilium $out/bin/trilium - - ln -s ${trilium_svg} $out/share/icons/hicolor/scalable/apps/trilium.svg - cp ${desktopItem}/share/applications/* $out/share/applications - ''; - - # LD_LIBRARY_PATH "shouldn't" be needed, remove when possible :) - preFixup = '' - gappsWrapperArgs+=(--prefix LD_LIBRARY_PATH : ${atomEnv.libPath}) - ''; - - dontStrip = true; - - meta = with stdenv.lib; { - inherit description; - homepage = https://github.com/zadam/trilium; - license = licenses.agpl3; - platforms = platforms.linux; - maintainers = with maintainers; [ emmanuelrosa dtzWill ]; + src = fetchurl { + url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-${version}.tar.xz"; + sha256 = "06d88waxxjdnrn0y8qr6p9rf5xkvl5lbabb0xyk0dgy3wg70zlxz"; + }; + + # Fetch from source repo, no longer included in release. + # (they did special-case icon.png but we want the scalable svg) + # Use the version here to ensure we get any changes. + trilium_svg = fetchurl { + url = "https://raw.githubusercontent.com/zadam/trilium/v${version}/src/public/images/trilium.svg"; + sha256 = "1rgj7pza20yndfp8n12k93jyprym02hqah36fkk2b3if3kcmwnfg"; + }; + + + nativeBuildInputs = [ + autoPatchelfHook + makeWrapper + wrapGAppsHook + ]; + + buildInputs = [ atomEnv.packages gtk3 ]; + + installPhase = '' + mkdir -p $out/bin + mkdir -p $out/share/trilium + mkdir -p $out/share/{applications,icons/hicolor/scalable/apps} + + cp -r ./* $out/share/trilium + ln -s $out/share/trilium/trilium $out/bin/trilium + + ln -s ${trilium_svg} $out/share/icons/hicolor/scalable/apps/trilium.svg + cp ${desktopItem}/share/applications/* $out/share/applications + ''; + + # LD_LIBRARY_PATH "shouldn't" be needed, remove when possible :) + preFixup = '' + gappsWrapperArgs+=(--prefix LD_LIBRARY_PATH : ${atomEnv.libPath}) + ''; + + dontStrip = true; + + meta = with stdenv.lib; { + inherit description; + homepage = https://github.com/zadam/trilium; + license = licenses.agpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ emmanuelrosa dtzWill ]; + }; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 39b764537f7..dc7fe5e35d5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6808,7 +6808,10 @@ in triggerhappy = callPackage ../tools/inputmethods/triggerhappy {}; - trilium = callPackage ../applications/office/trilium { }; + inherit (callPackage ../applications/office/trilium {}) + trilium-desktop + ; + trilium = trilium-desktop; trousers = callPackage ../tools/security/trousers { }; -- cgit 1.4.1 From a84c8599b305021891b4bc44f9ae8fceedc2c663 Mon Sep 17 00:00:00 2001 From: Christian Kampka Date: Thu, 5 Dec 2019 14:07:17 +0100 Subject: trilium-server: init at 0.37.8 --- pkgs/applications/office/trilium/default.nix | 55 ++++++++++++++++++++++++---- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 48 insertions(+), 8 deletions(-) (limited to 'pkgs/applications/office') diff --git a/pkgs/applications/office/trilium/default.nix b/pkgs/applications/office/trilium/default.nix index 84e351b9d42..ed6715e50f8 100644 --- a/pkgs/applications/office/trilium/default.nix +++ b/pkgs/applications/office/trilium/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoPatchelfHook, atomEnv, makeWrapper, makeDesktopItem, gtk3, wrapGAppsHook }: +{ stdenv, fetchurl, autoPatchelfHook, atomEnv, makeWrapper, makeDesktopItem, gtk3, wrapGAppsHook, zlib, libxkbfile }: let description = "Trilium Notes is a hierarchical note taking application with focus on building large personal knowledge bases."; @@ -11,12 +11,21 @@ let categories = "Office"; }; + meta = with stdenv.lib; { + inherit description; + homepage = https://github.com/zadam/trilium; + license = licenses.agpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ emmanuelrosa dtzWill kampka ]; + }; + version = "0.37.8"; in { trilium-desktop = stdenv.mkDerivation rec { pname = "trilium-desktop"; inherit version; + inherit meta; src = fetchurl { url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-${version}.tar.xz"; @@ -58,13 +67,43 @@ in { ''; dontStrip = true; - - meta = with stdenv.lib; { - inherit description; - homepage = https://github.com/zadam/trilium; - license = licenses.agpl3; - platforms = platforms.linux; - maintainers = with maintainers; [ emmanuelrosa dtzWill ]; + }; + + + trilium-server = stdenv.mkDerivation rec { + pname = "trilium-server"; + inherit version; + inherit meta; + + src = fetchurl { + url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-server-${version}.tar.xz"; + sha256 = "04xhmc60fwvv8ip8mj112z7a9x5ahp51f1hvi20sffs0685mfaj3"; }; + + nativeBuildInputs = [ + autoPatchelfHook + ]; + + buildInputs = [ + stdenv.cc.cc.lib + zlib + libxkbfile + ]; + + installPhase = '' + mkdir -p $out/bin + mkdir -p $out/share/trilium-server + + cp -r ./* $out/share/trilium-server + ''; + + postFixup = '' + cat > $out/bin/trilium-server < Date: Mon, 9 Dec 2019 19:44:46 +0100 Subject: trilium-server: Patch logger to use console instead of rolling files --- ...e-console-logger-instead-of-rolling-files.patch | 69 ++++++++++++++++++++++ pkgs/applications/office/trilium/default.nix | 2 + 2 files changed, 71 insertions(+) create mode 100644 pkgs/applications/office/trilium/0001-Use-console-logger-instead-of-rolling-files.patch (limited to 'pkgs/applications/office') diff --git a/pkgs/applications/office/trilium/0001-Use-console-logger-instead-of-rolling-files.patch b/pkgs/applications/office/trilium/0001-Use-console-logger-instead-of-rolling-files.patch new file mode 100644 index 00000000000..1a4350ca71a --- /dev/null +++ b/pkgs/applications/office/trilium/0001-Use-console-logger-instead-of-rolling-files.patch @@ -0,0 +1,69 @@ +From 5be803a1171855f976a5b607970fa3949db72181 Mon Sep 17 00:00:00 2001 +From: Christian Kampka +Date: Mon, 9 Dec 2019 19:40:27 +0100 +Subject: [PATCH] Use console logger instead of rolling files + +--- + src/services/log.js | 26 +++----------------------- + 1 file changed, 3 insertions(+), 23 deletions(-) + +diff --git a/src/services/log.js b/src/services/log.js +index 1514c209..456c3749 100644 +--- a/src/services/log.js ++++ b/src/services/log.js +@@ -1,35 +1,15 @@ + "use strict"; + +-const fs = require('fs'); +-const dataDir = require('./data_dir'); +- +-if (!fs.existsSync(dataDir.LOG_DIR)) { +- fs.mkdirSync(dataDir.LOG_DIR, 0o700); +-} +- +-const logger = require('simple-node-logger').createRollingFileLogger({ +- errorEventName: 'error', +- logDirectory: dataDir.LOG_DIR, +- fileNamePattern: 'trilium-.log', +- dateFormat:'YYYY-MM-DD' +-}); +- + function info(message) { + // info messages are logged asynchronously + setTimeout(() => { + console.log(message); +- +- logger.info(message); + }, 0); + } + + function error(message) { + message = "ERROR: " + message; + +- // we're using .info() instead of .error() because simple-node-logger emits weird error for showError() +- // errors are logged synchronously to make sure it doesn't get lost in case of crash +- logger.info(message); +- + console.trace(message); + } + +@@ -45,12 +25,12 @@ function request(req) { + if (req.url.includes(".js.map") || req.url.includes(".css.map")) { + return; + } +- +- logger.info(req.method + " " + req.url); ++ if(process.env.DEBUG) ++ console.log(req.method + " " + req.url); + } + + module.exports = { + info, + error, + request +-}; +\ No newline at end of file ++}; +-- +2.23.0 + diff --git a/pkgs/applications/office/trilium/default.nix b/pkgs/applications/office/trilium/default.nix index ed6715e50f8..2c8a85c4933 100644 --- a/pkgs/applications/office/trilium/default.nix +++ b/pkgs/applications/office/trilium/default.nix @@ -20,6 +20,7 @@ let }; version = "0.37.8"; + in { trilium-desktop = stdenv.mkDerivation rec { @@ -90,6 +91,7 @@ in { libxkbfile ]; + patches = [ ./0001-Use-console-logger-instead-of-rolling-files.patch ] ; installPhase = '' mkdir -p $out/bin mkdir -p $out/share/trilium-server -- cgit 1.4.1 From 39ecfaf0bad22982bb9189688633d664e1d8b5e6 Mon Sep 17 00:00:00 2001 From: Christian Kampka Date: Sat, 14 Dec 2019 11:08:31 +0100 Subject: trilium-server: Add passthru tests --- pkgs/applications/office/trilium/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'pkgs/applications/office') diff --git a/pkgs/applications/office/trilium/default.nix b/pkgs/applications/office/trilium/default.nix index 2c8a85c4933..cfaaff1d0a8 100644 --- a/pkgs/applications/office/trilium/default.nix +++ b/pkgs/applications/office/trilium/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoPatchelfHook, atomEnv, makeWrapper, makeDesktopItem, gtk3, wrapGAppsHook, zlib, libxkbfile }: +{ stdenv, nixosTests, fetchurl, autoPatchelfHook, atomEnv, makeWrapper, makeDesktopItem, gtk3, wrapGAppsHook, zlib, libxkbfile }: let description = "Trilium Notes is a hierarchical note taking application with focus on building large personal knowledge bases."; @@ -107,5 +107,9 @@ in { EOF chmod a+x $out/bin/trilium-server ''; + + passthru.tests = { + trilium-server = nixosTests.trilium-server; + }; }; } -- cgit 1.4.1 From a7db640bf71f189c860f03c357999c18052c4eea Mon Sep 17 00:00:00 2001 From: Christian Kampka Date: Thu, 19 Dec 2019 09:53:51 +0100 Subject: trilium: 0.37.8 -> 0.38.2 --- pkgs/applications/office/trilium/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs/applications/office') diff --git a/pkgs/applications/office/trilium/default.nix b/pkgs/applications/office/trilium/default.nix index cfaaff1d0a8..852000a2984 100644 --- a/pkgs/applications/office/trilium/default.nix +++ b/pkgs/applications/office/trilium/default.nix @@ -19,7 +19,7 @@ let maintainers = with maintainers; [ emmanuelrosa dtzWill kampka ]; }; - version = "0.37.8"; + version = "0.38.2"; in { @@ -30,7 +30,7 @@ in { src = fetchurl { url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-${version}.tar.xz"; - sha256 = "06d88waxxjdnrn0y8qr6p9rf5xkvl5lbabb0xyk0dgy3wg70zlxz"; + sha256 = "10f5zfqcfcjynw04d5xzrfmkbqpk85i4mq7njhkibx2f1m0br2qa"; }; # Fetch from source repo, no longer included in release. @@ -78,7 +78,7 @@ in { src = fetchurl { url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-server-${version}.tar.xz"; - sha256 = "04xhmc60fwvv8ip8mj112z7a9x5ahp51f1hvi20sffs0685mfaj3"; + sha256 = "1df0cx9gpzk0086lgha0qm1g03l8f4rz7y2xzgpzng5rrxjkgz61"; }; nativeBuildInputs = [ -- cgit 1.4.1 From ebf3f1fe784c5475230fc1f99f4a716f2b6821ad Mon Sep 17 00:00:00 2001 From: Christian Kampka Date: Sun, 22 Dec 2019 14:34:54 +0100 Subject: trilium: Pin platforms to x86_64 linux --- nixos/tests/all-tests.nix | 2 +- pkgs/applications/office/trilium/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/applications/office') diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 520db157961..7448015ee0f 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -277,7 +277,7 @@ in tor = handleTest ./tor.nix {}; transmission = handleTest ./transmission.nix {}; trac = handleTest ./trac.nix {}; - trilium-server = handleTest ./trilium-server.nix {}; + trilium-server = handleTestOn ["x86_64-linux"] ./trilium-server.nix {}; trezord = handleTest ./trezord.nix {}; trickster = handleTest ./trickster.nix {}; udisks2 = handleTest ./udisks2.nix {}; diff --git a/pkgs/applications/office/trilium/default.nix b/pkgs/applications/office/trilium/default.nix index 852000a2984..d44b51861dc 100644 --- a/pkgs/applications/office/trilium/default.nix +++ b/pkgs/applications/office/trilium/default.nix @@ -15,7 +15,7 @@ let inherit description; homepage = https://github.com/zadam/trilium; license = licenses.agpl3; - platforms = platforms.linux; + platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ emmanuelrosa dtzWill kampka ]; }; -- cgit 1.4.1