JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #86192 from kampka/trilium

Browse Source 
trilium: 0.40.7 -> 0.42.1
This commit is contained in:
Jörg Thalheim 2020-05-07 10:59:34 +01:00 committed by GitHub
commit 8dba666ebc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
pkgs/applications/office/trilium/default.nix
View File

@ -19,7 +19,17 @@ let
maintainers = with maintainers; [ emmanuelrosa dtzWill kampka ];
};
version = "0.40.7";
version = "0.42.1";
desktopSource = {
url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-${version}.tar.xz";
sha256 = "0xcbkm6z1a0jh3qywlwcjk6l302cxgdfcq8sw30vbnz99cyarpvz";
};
serverSource = {
url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-server-${version}.tar.xz";
sha256 = "012l36z0n3fcdajj3v4w2bcb1619sdhg6cvy3y89b6rxl0h2wdiw";
};
in {
@ -28,10 +38,7 @@ in {
inherit version;
inherit meta;
src = fetchurl {
url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-${version}.tar.xz";
sha256 = "0xi3bb0kbphbgpk2wlsad509g0hwwb259q2vkv0kgyr4i4wcyc1f";
};
src = fetchurl desktopSource;
# Fetch from source repo, no longer included in release.
# (they did special-case icon.png but we want the scalable svg)
@ -76,10 +83,7 @@ in {
inherit version;
inherit meta;
src = fetchurl {
url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-server-${version}.tar.xz";
sha256 = "15bspngnnbq6mhp1f82j9hccg0ymhm6i4rddpgz3n7dw5wxdj0sm";
};
src = fetchurl serverSource;
nativeBuildInputs = [
autoPatchelfHook

1
pkgs/top-level/aliases.nix
View File

@ -577,6 +577,7 @@ mapAliases ({
transmission_gtk = transmission-gtk; # added 2018-01-06
transmission_remote_gtk = transmission-remote-gtk; # added 2018-01-06
transporter = throw "transporter has been removed. It was archived upstream, so it's considered abandoned.";
trilium = throw "trilium has been removed. Please use trilium-desktop instead."; # added 2020-04-29
truecrypt = veracrypt; # added 2018-10-24
tshark = wireshark-cli; # added 2018-04-25
uberwriter = apostrophe; # added 2020-04-23

1
pkgs/top-level/all-packages.nix
View File

@ -7099,7 +7099,6 @@ in
trilium-desktop
trilium-server
;
trilium = trilium-desktop;
trousers = callPackage ../tools/security/trousers { };