From a26c64323a1391218cf64fe580bfaac5b43678cf Mon Sep 17 00:00:00 2001 From: TomaSajt <62384384+TomaSajt@users.noreply.github.com> Date: Fri, 9 May 2025 21:02:24 +0200 Subject: [PATCH 1/2] logseq: 0.10.9-unstable-2025-03-11 -> 0.10.12 --- pkgs/by-name/lo/logseq/package.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/lo/logseq/package.nix b/pkgs/by-name/lo/logseq/package.nix index dccb3963563e..924684fcd911 100644 --- a/pkgs/by-name/lo/logseq/package.nix +++ b/pkgs/by-name/lo/logseq/package.nix @@ -5,7 +5,6 @@ fetchFromGitHub, fetchYarnDeps, replaceVars, - runCommand, writeShellScriptBin, copyDesktopItems, @@ -26,13 +25,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "logseq"; - version = "0.10.9-unstable-2025-03-11"; + version = "0.10.12"; src = fetchFromGitHub { owner = "logseq"; repo = "logseq"; - rev = "ac0a0dae727c46b348d0f1410138d5e49d446692"; - hash = "sha256-esCB51BeWnni/JFL4yMKcJj5lka2+hLpcvWGify0T2o="; + tag = finalAttrs.version; + hash = "sha256-SUzt4hYHE6XJOEMxFp2a0om2oVUk1MHQUteGFiM9Lkc="; }; patches = [ @@ -98,7 +97,7 @@ stdenv.mkDerivation (finalAttrs: { yarnOfflineCacheRoot = fetchYarnDeps { name = "logseq-${finalAttrs.version}-yarn-deps-root"; inherit (finalAttrs) src; - hash = "sha256-z4G675kxfpmG2AJlbK5bfeUUgX7jz1ys2FlMNHJqrQ4="; + hash = "sha256-sbC6WQLjEHIKTuejSQXplQOWZwUmBJdGXuAkilQGjYs="; }; # ./static and ./resources are combined into ./static by the build process @@ -107,7 +106,7 @@ stdenv.mkDerivation (finalAttrs: { name = "logseq-${finalAttrs.version}-yarn-deps-static-resources"; inherit (finalAttrs) src; sourceRoot = "${finalAttrs.src.name}/static"; - hash = "sha256-xuZj2EKHxvkiDPKMLh3ZSvLT54k+buHqg9lRTFv8rNI="; + hash = "sha256-01t6lolMbBL5f6SFk4qTkTx6SQXWtHuVkBhDwW+HScc="; }; yarnOfflineCacheAmplify = fetchYarnDeps { From 3aa48f544044c8a9b9cfa10c42d7e1a3d27725f7 Mon Sep 17 00:00:00 2001 From: TomaSajt <62384384+TomaSajt@users.noreply.github.com> Date: Fri, 9 May 2025 21:03:40 +0200 Subject: [PATCH 2/2] logseq: sign binaries on darwin --- pkgs/by-name/lo/logseq/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/lo/logseq/package.nix b/pkgs/by-name/lo/logseq/package.nix index 924684fcd911..fb243ffb49c2 100644 --- a/pkgs/by-name/lo/logseq/package.nix +++ b/pkgs/by-name/lo/logseq/package.nix @@ -10,6 +10,7 @@ copyDesktopItems, cctools, clojure, + darwin, makeDesktopItem, makeWrapper, nodejs, @@ -150,6 +151,7 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ cctools + darwin.autoSignDarwinBinariesHook xcbuild ];