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

Merge pull request #91454 from ConradMearns/obsidian 

obsidian: init at 0.7.3
This commit is contained in:
Maximilian Bosch 2020-06-28 01:21:21 +02:00 committed by GitHub
parent 569d2965fe fc120e6436
commit c0c786c3bd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 46 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/licenses.nix
View File

@ -550,6 +550,12 @@ lib.mapAttrs (n: v: v // { shortName = n; }) {
fullName = "Non-Profit Open Software License 3.0"; fullName = "Non-Profit Open Software License 3.0";
}; };
obsidian = {
fullName = "Obsidian End User Agreement";
url = "https://obsidian.md/eula";
free = false;
};
ocamlpro_nc = { ocamlpro_nc = {
fullName = "OCamlPro Non Commercial license version 1"; fullName = "OCamlPro Non Commercial license version 1";
url = "https://alt-ergo.ocamlpro.com/http/alt-ergo-2.2.0/OCamlPro-Non-Commercial-License.pdf"; url = "https://alt-ergo.ocamlpro.com/http/alt-ergo-2.2.0/OCamlPro-Non-Commercial-License.pdf";

6
maintainers/maintainer-list.nix
View File

@ -1604,6 +1604,12 @@
githubId = 32609395; githubId = 32609395;
name = "B YI"; name = "B YI";
}; };
conradmearns = {
email = "conradmearns+github@pm.me";
github = "ConradMearns";
githubId = 5510514;
name = "Conrad Mearns";
};
couchemar = { couchemar = {
email = "couchemar@yandex.ru"; email = "couchemar@yandex.ru";
github = "couchemar"; github = "couchemar";

32
pkgs/applications/misc/obsidian/default.nix Normal file
View File

@ -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" ];
};
}

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

@ -21486,6 +21486,8 @@ in
obs-ndi = callPackage ../applications/video/obs-studio/obs-ndi.nix { }; obs-ndi = callPackage ../applications/video/obs-studio/obs-ndi.nix { };
obsidian = callPackage ../applications/misc/obsidian { };
octoprint = callPackage ../applications/misc/octoprint { }; octoprint = callPackage ../applications/misc/octoprint { };
octoprint-plugins = throw ''octoprint-plugins are now part of the octoprint.python.pkgs package set.''; octoprint-plugins = throw ''octoprint-plugins are now part of the octoprint.python.pkgs package set.'';