From 37177b6182f400e44ce8c15b34640a37a5d2cad2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?W=C3=B6lfchen?= <115360611+W-lfchen@users.noreply.github.com> Date: Sat, 8 Jun 2024 22:16:09 +0200 Subject: [PATCH 1/8] obsidian: 1.5.12 -> 1.6.3 (cherry picked from commit 1f577fc00a75e6e586d98e7ab72f3d9757219d5f) --- pkgs/applications/misc/obsidian/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/obsidian/default.nix b/pkgs/applications/misc/obsidian/default.nix index 1090941f8e39ed1..e9d8437c6dfd43e 100644 --- a/pkgs/applications/misc/obsidian/default.nix +++ b/pkgs/applications/misc/obsidian/default.nix @@ -12,7 +12,7 @@ let inherit (stdenv.hostPlatform) system; pname = "obsidian"; - version = "1.5.12"; + version = "1.6.3"; appname = "Obsidian"; meta = with lib; { description = "A powerful knowledge base that works on top of a local folder of plain text Markdown files"; @@ -25,7 +25,7 @@ let filename = if stdenv.isDarwin then "Obsidian-${version}-universal.dmg" else "obsidian-${version}.tar.gz"; src = fetchurl { url = "https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/${filename}"; - hash = if stdenv.isDarwin then "sha256-MSJmF5WddxbC/S7w2nWjlDxt5HPUDCoRFwJ2MZMH9Ks=" else "sha256-UQLljP7eZELTuHwX+OylXY+Wy2YK1ZEJX1IQfIvBLe8="; + hash = if stdenv.isDarwin then "sha256-o5ELpG82mJgcd9Pil6A99BPK6Hoa0OKJJkYpyfGJR9I=" else "sha256-Eq2cUXjp0XdVeR4t3oG2DUtsKOp3e3nPMMhznUc4BmE="; }; icon = fetchurl { From 871312f892be7c2fe513ebb1da198b4c8f8501d7 Mon Sep 17 00:00:00 2001 From: nyanotech Date: Sun, 9 Jun 2024 22:28:53 -0700 Subject: [PATCH 2/8] obsidian: update hash (cherry picked from commit 2265a2fb24739a0c693da3ca16898c17ca855c5e) --- pkgs/applications/misc/obsidian/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/obsidian/default.nix b/pkgs/applications/misc/obsidian/default.nix index e9d8437c6dfd43e..700550555cefbe9 100644 --- a/pkgs/applications/misc/obsidian/default.nix +++ b/pkgs/applications/misc/obsidian/default.nix @@ -25,7 +25,7 @@ let filename = if stdenv.isDarwin then "Obsidian-${version}-universal.dmg" else "obsidian-${version}.tar.gz"; src = fetchurl { url = "https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/${filename}"; - hash = if stdenv.isDarwin then "sha256-o5ELpG82mJgcd9Pil6A99BPK6Hoa0OKJJkYpyfGJR9I=" else "sha256-Eq2cUXjp0XdVeR4t3oG2DUtsKOp3e3nPMMhznUc4BmE="; + hash = if stdenv.isDarwin then "sha256-o5ELpG82mJgcd9Pil6A99BPK6Hoa0OKJJkYpyfGJR9I=" else "sha256-ho8E2Iq+s/w8NjmxzZo/y5aj3MNgbyvIGjk3nSKPLDw="; }; icon = fetchurl { From 42f8839e0ecbba9ee64dd939ebc0e3d9d569fee7 Mon Sep 17 00:00:00 2001 From: kashw2 Date: Wed, 12 Jun 2024 20:01:40 +1000 Subject: [PATCH 3/8] obsidian: removed electron version pin (cherry picked from commit 952f3cee95f7c0dcb1b9f79c9e3e3577da5cd71b) --- pkgs/top-level/all-packages.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3fc3bc28e3b0975..7fa681b0b4bf267 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -33398,9 +33398,7 @@ with pkgs; obs-studio-plugins = recurseIntoAttrs (callPackage ../applications/video/obs-studio/plugins {}); wrapOBS = callPackage ../applications/video/obs-studio/wrapper.nix { }; - obsidian = callPackage ../applications/misc/obsidian { - electron = electron_28; - }; + obsidian = callPackage ../applications/misc/obsidian { }; octoprint = callPackage ../applications/misc/octoprint { }; From 17416ac0efd8f6b9458b0a5d6a1bb5f421cc0489 Mon Sep 17 00:00:00 2001 From: CrackTC Date: Thu, 13 Jun 2024 18:18:44 +0800 Subject: [PATCH 4/8] obsidian: add commandLineArgs (cherry picked from commit ead69bba03d019c3f491918da9f341dafa632b08) --- pkgs/applications/misc/obsidian/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/misc/obsidian/default.nix b/pkgs/applications/misc/obsidian/default.nix index 700550555cefbe9..93c4ea3fb28de01 100644 --- a/pkgs/applications/misc/obsidian/default.nix +++ b/pkgs/applications/misc/obsidian/default.nix @@ -8,6 +8,7 @@ , writeScript , undmg , unzip +, commandLineArgs ? "" }: let inherit (stdenv.hostPlatform) system; @@ -52,7 +53,8 @@ let mkdir -p $out/bin makeWrapper ${electron}/bin/electron $out/bin/obsidian \ --add-flags $out/share/obsidian/app.asar \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland}}" + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland}}" \ + --add-flags ${lib.escapeShellArg commandLineArgs} install -m 444 -D resources/app.asar $out/share/obsidian/app.asar install -m 444 -D resources/obsidian.asar $out/share/obsidian/obsidian.asar install -m 444 -D "${desktopItem}/share/applications/"* \ From 2e18df30b60a012e511912ef3ce3f7450b2e2ca2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?W=C3=B6lfchen?= <115360611+W-lfchen@users.noreply.github.com> Date: Tue, 25 Jun 2024 20:31:25 +0200 Subject: [PATCH 5/8] obsidian: 1.6.3 -> 1.6.5 (cherry picked from commit bac1a063254c546c7f8d8efc18180d9a947a4212) --- pkgs/applications/misc/obsidian/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/obsidian/default.nix b/pkgs/applications/misc/obsidian/default.nix index 93c4ea3fb28de01..5b67d98f07159fe 100644 --- a/pkgs/applications/misc/obsidian/default.nix +++ b/pkgs/applications/misc/obsidian/default.nix @@ -13,7 +13,7 @@ let inherit (stdenv.hostPlatform) system; pname = "obsidian"; - version = "1.6.3"; + version = "1.6.5"; appname = "Obsidian"; meta = with lib; { description = "A powerful knowledge base that works on top of a local folder of plain text Markdown files"; @@ -23,10 +23,10 @@ let maintainers = with maintainers; [ atila conradmearns zaninime qbit kashw2 w-lfchen ]; }; - filename = if stdenv.isDarwin then "Obsidian-${version}-universal.dmg" else "obsidian-${version}.tar.gz"; + filename = if stdenv.isDarwin then "Obsidian-${version}.dmg" else "obsidian-${version}.tar.gz"; src = fetchurl { url = "https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/${filename}"; - hash = if stdenv.isDarwin then "sha256-o5ELpG82mJgcd9Pil6A99BPK6Hoa0OKJJkYpyfGJR9I=" else "sha256-ho8E2Iq+s/w8NjmxzZo/y5aj3MNgbyvIGjk3nSKPLDw="; + hash = if stdenv.isDarwin then "sha256-gA6FkCalGw0pgnCbOJliItLzMGr+CG9r6mSMdvVUAoQ=" else "sha256-9goJnKOgJk5TrFUNz4vff8704cvHfqZpGL/iBkcU2GY="; }; icon = fetchurl { From 831e08a898293513bcba2a95e620579300ed6ef3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?W=C3=B6lfchen?= <115360611+W-lfchen@users.noreply.github.com> Date: Thu, 18 Jul 2024 23:49:07 +0200 Subject: [PATCH 6/8] obsidian: 1.6.5 -> 1.6.7 (cherry picked from commit a8c8ce96d18e189950e454cae99ac3b93e846d7d) --- pkgs/applications/misc/obsidian/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/obsidian/default.nix b/pkgs/applications/misc/obsidian/default.nix index 5b67d98f07159fe..0523c0be1ba1984 100644 --- a/pkgs/applications/misc/obsidian/default.nix +++ b/pkgs/applications/misc/obsidian/default.nix @@ -13,7 +13,7 @@ let inherit (stdenv.hostPlatform) system; pname = "obsidian"; - version = "1.6.5"; + version = "1.6.7"; appname = "Obsidian"; meta = with lib; { description = "A powerful knowledge base that works on top of a local folder of plain text Markdown files"; @@ -26,7 +26,7 @@ let filename = if stdenv.isDarwin then "Obsidian-${version}.dmg" else "obsidian-${version}.tar.gz"; src = fetchurl { url = "https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/${filename}"; - hash = if stdenv.isDarwin then "sha256-gA6FkCalGw0pgnCbOJliItLzMGr+CG9r6mSMdvVUAoQ=" else "sha256-9goJnKOgJk5TrFUNz4vff8704cvHfqZpGL/iBkcU2GY="; + hash = if stdenv.isDarwin then "sha256-rFXmhlxXlVz5nCrXMmfYGaxe4/wnBRdFxsfiwiIDHgw=" else "sha256-ok1fedN8+OXBisFpVXbKRW2OhE4o9MC9lJmtMMST6V8="; }; icon = fetchurl { From 8992b4b4573f299ed1f66792e43923ce6877f04f Mon Sep 17 00:00:00 2001 From: diniamo Date: Sun, 4 Aug 2024 17:57:42 +0200 Subject: [PATCH 7/8] obsidian: add meta.mainProgram (cherry picked from commit 09e008349fc8bfd8044680c634bbaff0fb46f987) --- pkgs/applications/misc/obsidian/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/misc/obsidian/default.nix b/pkgs/applications/misc/obsidian/default.nix index 0523c0be1ba1984..7fa1a1b62d58c34 100644 --- a/pkgs/applications/misc/obsidian/default.nix +++ b/pkgs/applications/misc/obsidian/default.nix @@ -19,6 +19,7 @@ let description = "A powerful knowledge base that works on top of a local folder of plain text Markdown files"; homepage = "https://obsidian.md"; downloadPage = "https://github.com/obsidianmd/obsidian-releases/releases"; + mainProgram = "obsidian"; license = licenses.obsidian; maintainers = with maintainers; [ atila conradmearns zaninime qbit kashw2 w-lfchen ]; }; From 8e4470a74283aceb42d679947bc4340e693b1f74 Mon Sep 17 00:00:00 2001 From: diniamo Date: Sun, 4 Aug 2024 17:57:55 +0200 Subject: [PATCH 8/8] obsidian: remove reduant inherit (cherry picked from commit 1335aeda7aca5be59e056896f887223ac0efe9bd) --- pkgs/applications/misc/obsidian/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/applications/misc/obsidian/default.nix b/pkgs/applications/misc/obsidian/default.nix index 7fa1a1b62d58c34..81d0be6e9de0323 100644 --- a/pkgs/applications/misc/obsidian/default.nix +++ b/pkgs/applications/misc/obsidian/default.nix @@ -11,7 +11,6 @@ , commandLineArgs ? "" }: let - inherit (stdenv.hostPlatform) system; pname = "obsidian"; version = "1.6.7"; appname = "Obsidian";