Unverified Commit 0bcdafbd authored by Emily Trau's avatar Emily Trau Committed by GitHub
Browse files

Merge pull request #265276 from eliandoran/update/trilium 

trilium-{desktop,server}: 0.60.4 -> 0.61.14
parents 0127a4fc 0f351078

nixos/doc/manual/release-notes/rl-2311.section.md

+2 −0
Original line number Diff line number Diff line
@@ -401,6 +401,8 @@ 


- The `chrony` NixOS module now tracks the Real-Time Clock drift from the System Clock with `rtcfile` and automatically adjusts it with `rtcautotrim` when it exceeds the maximum error specified in `services.chrony.autotrimThreshold` (default 30 seconds). If you enabled `rtcsync` in `extraConfig`, you should remove RTC related options from `extraConfig`. If you do not want chrony configured to keep the RTC in check, you can set `services.chrony.enableRTCTrimming = false;`



- `trilium-desktop` and `trilium-server` have been updated to [v0.61](https://github.com/zadam/trilium/releases/tag/v0.61.12). For existing installations, upgrading to this version is supported only after running v0.60.X at least once. If you are still on an older version, make sure to update to v0.60 (available in NixOS 23.05) first and only then to v0.61 (available in NixOS 23.11).



## Other Notable Changes {#sec-release-23.11-notable-changes}



- A new option `system.switch.enable` was added. By default, this is option is

pkgs/applications/office/trilium/desktop.nix

+3 −3
Original line number Diff line number Diff line
@@ -7,13 +7,13 @@ 


let

  pname = "trilium-desktop";

  version = "0.60.4";

  version = "0.61.14";



  linuxSource.url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-${version}.tar.xz";

  linuxSource.sha256 = "02vbghvi2sbh943rslgm712x9zccvpjab3jvr5b1bw4bq5fzppgq";

  linuxSource.sha256 = "1yxkgbnajlzhc62g4siq1hs7vd5hkvmdg4zsk1wqijhp0f4iix3s";



  darwinSource.url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-mac-x64-${version}.zip";

  darwinSource.sha256 = "0z6dk16xdzkiyxrm1yh3iz5351c8sdzvk8v5l3jdqy7davxw9f86";

  darwinSource.sha256 = "1pvyy1k50n90ww3spm7bkmx0lzdi22na66mcpcwyls15r9kqb1ib";



  meta = metaCommon // {

    mainProgram = "trilium";

pkgs/applications/office/trilium/server.nix

+4 −4
Original line number Diff line number Diff line 
{ stdenv, lib, autoPatchelfHook, fetchurl, nixosTests

{ stdenv, autoPatchelfHook, fetchurl, nixosTests

, metaCommon }:



let

  serverSource.url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-server-${version}.tar.xz";

  serverSource.sha256 = "16xyxpxqvzhdq63wc2nzmfabpasypxwm474jf15y3q8kdrca9myv";

  version = "0.60.4";

in stdenv.mkDerivation rec {

  serverSource.sha256 = "0l49jnsgbzppc2sfh4fykidl0skzlc2kbgsyz0dcnh9g2i562fq9";

  version = "0.61.14";

in stdenv.mkDerivation {

  pname = "trilium-server";

  inherit version;

  meta = metaCommon // {