From 14ddd784d3421701fbc7a780368295b753747d30 Mon Sep 17 00:00:00 2001 From: Conrad Mearns Date: Thu, 25 Jun 2020 02:36:17 +0200 Subject: [PATCH 1/6] maintainers: add conradmearns --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index bdc2a1a83bd..abc645d6b35 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1598,6 +1598,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"; From e4172776e709ffb2732c037597a4f287766342db Mon Sep 17 00:00:00 2001 From: Conrad Mearns Date: Thu, 25 Jun 2020 02:38:06 +0200 Subject: [PATCH 2/6] licences: add Obsidian.md EULA --- lib/licenses.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/lib/licenses.nix b/lib/licenses.nix index b799a6ae8a4..e7219492d28 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -545,6 +545,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"; From adb053abdcea6d1ac5c91ab5f40a8fc540bd0ad2 Mon Sep 17 00:00:00 2001 From: Conrad Mearns Date: Thu, 25 Jun 2020 02:38:32 +0200 Subject: [PATCH 3/6] obsidian: init at 0.7.3 --- pkgs/applications/misc/obsidian/default.nix | 29 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/applications/misc/obsidian/default.nix diff --git a/pkgs/applications/misc/obsidian/default.nix b/pkgs/applications/misc/obsidian/default.nix new file mode 100644 index 00000000000..76e4e9b2b33 --- /dev/null +++ b/pkgs/applications/misc/obsidian/default.nix @@ -0,0 +1,29 @@ +{ 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 + ''; + + 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.mit; + 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 4d88c63bcfb..8804713c225 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21455,6 +21455,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.''; From 16c918438d2fe1c732dfeb0d7fd4f77a33904b04 Mon Sep 17 00:00:00 2001 From: Conrad Mearns Date: Thu, 25 Jun 2020 17:05:27 +0200 Subject: [PATCH 4/6] obsidian: fix license to use Obsidian EULA --- 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 76e4e9b2b33..747c3fb5a0b 100644 --- a/pkgs/applications/misc/obsidian/default.nix +++ b/pkgs/applications/misc/obsidian/default.nix @@ -22,7 +22,7 @@ appimageTools.wrapType2 rec { 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.mit; + license = licenses.obsidian; maintainers = with maintainers; [ conradmearns ]; platforms = [ "x86_64-linux" ]; }; From 929581c2d32f884822b85d63477c26c3902e0074 Mon Sep 17 00:00:00 2001 From: Conrad Mearns Date: Thu, 25 Jun 2020 17:59:43 +0200 Subject: [PATCH 5/6] obsidian: strip version number from binary name --- pkgs/applications/misc/obsidian/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/applications/misc/obsidian/default.nix b/pkgs/applications/misc/obsidian/default.nix index 747c3fb5a0b..b307112814e 100644 --- a/pkgs/applications/misc/obsidian/default.nix +++ b/pkgs/applications/misc/obsidian/default.nix @@ -19,6 +19,9 @@ appimageTools.wrapType2 rec { 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} $out/bin/${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"; From fc120e64369e190b864b816bb46b7e8932aea163 Mon Sep 17 00:00:00 2001 From: Conrad Mearns Date: Thu, 25 Jun 2020 18:33:11 +0200 Subject: [PATCH 6/6] obsidian: fix version stripping --- 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 b307112814e..396a7845112 100644 --- a/pkgs/applications/misc/obsidian/default.nix +++ b/pkgs/applications/misc/obsidian/default.nix @@ -20,7 +20,7 @@ appimageTools.wrapType2 rec { ''; # Strip version from binary name. - extraInstallCommands = "mv $out/bin/${name} $out/bin/${pname}"; + 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.";