From 82f6c9966adf85430aec37e94c77bb8bfbe3b09a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 2 Dec 2022 19:23:10 +0000 Subject: [PATCH 1/4] logseq: 0.8.11 -> 0.8.12 (cherry picked from commit eb10cd096365571b145df446dfd9eae0e581942e) --- pkgs/applications/misc/logseq/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/logseq/default.nix b/pkgs/applications/misc/logseq/default.nix index bb879bce1572..54e3e98d48b8 100644 --- a/pkgs/applications/misc/logseq/default.nix +++ b/pkgs/applications/misc/logseq/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "logseq"; - version = "0.8.11"; + version = "0.8.12"; src = fetchurl { url = "https://github.com/logseq/logseq/releases/download/${version}/logseq-linux-x64-${version}.AppImage"; - sha256 = "sha256-c8gP7OJwnCEXnT2FQH1ttYRzZfbcJL86FX2JQezJI+s="; + sha256 = "sha256-I1jGPNGlZ53N3ZlN9nN/GSgQIfdoUeclyuMl+PpNVY4="; name = "${pname}-${version}.AppImage"; }; From 5b95886e8373cceaf3defad825809e2f6681645d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 29 Dec 2022 19:35:02 +0000 Subject: [PATCH 2/4] logseq: 0.8.12 -> 0.8.15 (cherry picked from commit 21e5373d9efeb1a4ea4ae1b6a7e87d50da530a63) --- pkgs/applications/misc/logseq/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/logseq/default.nix b/pkgs/applications/misc/logseq/default.nix index 54e3e98d48b8..3d07e7ab40c9 100644 --- a/pkgs/applications/misc/logseq/default.nix +++ b/pkgs/applications/misc/logseq/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "logseq"; - version = "0.8.12"; + version = "0.8.15"; src = fetchurl { url = "https://github.com/logseq/logseq/releases/download/${version}/logseq-linux-x64-${version}.AppImage"; - sha256 = "sha256-I1jGPNGlZ53N3ZlN9nN/GSgQIfdoUeclyuMl+PpNVY4="; + sha256 = "sha256-lE/bO/zpqChvdf8vfNqbC5iIpXAZDb36/N7Tpsj7PWY="; name = "${pname}-${version}.AppImage"; }; From 51738765c895389a1c70a089f2649ed04f7b801d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 29 Dec 2022 21:45:51 +0100 Subject: [PATCH 3/4] logseq: add changelog to meta (cherry picked from commit f2ad82a06893c360fbbe016259a97853979be094) --- pkgs/applications/misc/logseq/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/misc/logseq/default.nix b/pkgs/applications/misc/logseq/default.nix index 3d07e7ab40c9..505dd6002680 100644 --- a/pkgs/applications/misc/logseq/default.nix +++ b/pkgs/applications/misc/logseq/default.nix @@ -1,4 +1,11 @@ -{ lib, stdenv, fetchurl, appimageTools, makeWrapper, electron, git }: +{ lib +, stdenv +, fetchurl +, appimageTools +, makeWrapper +, electron +, git +}: stdenv.mkDerivation rec { pname = "logseq"; @@ -52,6 +59,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A local-first, non-linear, outliner notebook for organizing and sharing your personal knowledge base"; homepage = "https://github.com/logseq/logseq"; + changelog = "https://github.com/logseq/logseq/releases/tag/${version}"; license = licenses.agpl3Plus; maintainers = with maintainers; [ weihua ]; platforms = [ "x86_64-linux" ]; From a1c9081a4196a384ccb804baf84be9f2629b39e9 Mon Sep 17 00:00:00 2001 From: kilianar Date: Thu, 12 Jan 2023 15:42:01 +0100 Subject: [PATCH 4/4] logseq: 0.8.15 -> 0.8.16 https://github.com/logseq/logseq/releases/tag/0.8.16 (cherry picked from commit 63f96b8e028fa93e63722a41e13d8d35b059a388) Reason: Old version doesn't build because electron 19 is EOL #213299 --- pkgs/applications/misc/logseq/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/logseq/default.nix b/pkgs/applications/misc/logseq/default.nix index 505dd6002680..ea855f3d30be 100644 --- a/pkgs/applications/misc/logseq/default.nix +++ b/pkgs/applications/misc/logseq/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "logseq"; - version = "0.8.15"; + version = "0.8.16"; src = fetchurl { url = "https://github.com/logseq/logseq/releases/download/${version}/logseq-linux-x64-${version}.AppImage"; - sha256 = "sha256-lE/bO/zpqChvdf8vfNqbC5iIpXAZDb36/N7Tpsj7PWY="; + sha256 = "sha256-0tIDoNQoqSn1nYm+YdgzXh34aH1e5N8wl9lqGbQoOeU="; name = "${pname}-${version}.AppImage"; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1342196b414c..e3332c54310e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2015,7 +2015,7 @@ with pkgs; lilo = callPackage ../tools/misc/lilo { }; logseq = callPackage ../applications/misc/logseq { - electron = electron_19; + electron = electron_20; }; natls = callPackage ../tools/misc/natls { };