diff options
| -rw-r--r-- | lib/licenses.nix | 6 | ||||
| -rw-r--r-- | maintainers/maintainer-list.nix | 6 | ||||
| -rw-r--r-- | pkgs/applications/misc/obsidian/default.nix | 32 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
4 files changed, 46 insertions, 0 deletions
diff --git a/lib/licenses.nix b/lib/licenses.nix index 641184af639e..4e9ae0346a7b 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -550,6 +550,12 @@ lib.mapAttrs (n: v: v // { shortName = n; }) { fullName = "Non-Profit Open Software License 3.0"; }; + obsidian = { + fullName = "Obsidian End User Agreement"; + url = "https://obsidian.md/eula"; + free = false; + }; + ocamlpro_nc = { fullName = "OCamlPro Non Commercial license version 1"; url = "https://alt-ergo.ocamlpro.com/http/alt-ergo-2.2.0/OCamlPro-Non-Commercial-License.pdf"; diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index e8e2eff26c88..1830d7087e64 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1604,6 +1604,12 @@ githubId = 32609395; name = "B YI"; }; + conradmearns = { + email = "conradmearns+github@pm.me"; + github = "ConradMearns"; + githubId = 5510514; + name = "Conrad Mearns"; + }; couchemar = { email = "couchemar@yandex.ru"; github = "couchemar"; diff --git a/pkgs/applications/misc/obsidian/default.nix b/pkgs/applications/misc/obsidian/default.nix new file mode 100644 index 000000000000..396a78451128 --- /dev/null +++ b/pkgs/applications/misc/obsidian/default.nix @@ -0,0 +1,32 @@ +{ appimageTools, fetchurl, lib, gsettings-desktop-schemas, gtk3}: + +let + pname = "obsidian"; + version = "0.7.3"; +in + +appimageTools.wrapType2 rec { + + name = "${pname}-${version}"; + + src = fetchurl { + url = "https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/Obsidian-${version}.AppImage"; + sha256 = "1qiag5szagalik72j8s2dmp7075g48jxgcdy0wgd02kfv90ai0y6"; + }; + + profile = '' + export LC_ALL=C.UTF-8 + export XDG_DATA_DIRS=${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS + ''; + + # Strip version from binary name. + extraInstallCommands = "mv $out/bin/{${name},${pname}}"; + + meta = with lib; { + description = "Obsidian is a powerful knowledge base that works on top of a local folder of plain text Markdown files."; + homepage = "https://obsidian.md"; + license = licenses.obsidian; + maintainers = with maintainers; [ conradmearns ]; + platforms = [ "x86_64-linux" ]; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e1150681e659..bec1c5e58c64 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21486,6 +21486,8 @@ in obs-ndi = callPackage ../applications/video/obs-studio/obs-ndi.nix { }; + obsidian = callPackage ../applications/misc/obsidian { }; + octoprint = callPackage ../applications/misc/octoprint { }; octoprint-plugins = throw ''octoprint-plugins are now part of the octoprint.python.pkgs package set.''; |