From 60cf98b0677b080109fd4affa8b965a24d1a5ac4 Mon Sep 17 00:00:00 2001 From: Stefan Junker Date: Thu, 25 Aug 2022 09:40:34 +0200 Subject: [PATCH 1/2] lib.licenses: add CAL-1.0 --- lib/licenses.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lib/licenses.nix b/lib/licenses.nix index 6eeba6588be1..6e3154b8a21e 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -169,6 +169,11 @@ in mkLicense lset) ({ free = false; }; + cal10 = { + fullName = "Cryptographic Autonomy License version 1.0 (CAL-1.0)"; + url = "https://opensource.org/licenses/CAL-1.0"; + }; + capec = { fullName = "Common Attack Pattern Enumeration and Classification"; url = "https://capec.mitre.org/about/termsofuse.html"; From 11f978d53355759a47d60d688709921f2e0fb158 Mon Sep 17 00:00:00 2001 From: Stefan Junker Date: Thu, 25 Aug 2022 09:40:52 +0200 Subject: [PATCH 2/2] holochain-launcher: init at v0.6.0 --- .../misc/holochain-launcher/default.nix | 52 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 54 insertions(+) create mode 100644 pkgs/applications/misc/holochain-launcher/default.nix diff --git a/pkgs/applications/misc/holochain-launcher/default.nix b/pkgs/applications/misc/holochain-launcher/default.nix new file mode 100644 index 000000000000..5a9c5122acc3 --- /dev/null +++ b/pkgs/applications/misc/holochain-launcher/default.nix @@ -0,0 +1,52 @@ +{ stdenv +, lib +, fetchurl +, autoPatchelfHook +, pkg-config +, dpkg +, openssl +, webkitgtk +, libappindicator +, wrapGAppsHook +}: + +stdenv.mkDerivation rec { + name = "holochain-launcher"; + version = "0.6.0"; + + src = fetchurl { + url = "https://github.com/holochain/launcher/releases/download/v${version}/holochain-launcher_${version}_amd64.deb"; + sha256 = "sha256-o9cUFtq5XUkbC3yFRFiV2k4uWjb+szlE8qV+G9Gve5E="; + }; + + nativeBuildInputs = [ + autoPatchelfHook + dpkg + wrapGAppsHook # required for FileChooser + ]; + + buildInputs = [ + openssl + webkitgtk + libappindicator + ]; + + unpackCmd = "dpkg-deb -x $curSrc source"; + + installPhase = '' + mv usr $out + ''; + + preFixup = '' + patchelf --add-needed "libappindicator3.so" "$out/bin/holochain-launcher" + ''; + + meta = with lib; { + description = "A cross-platform executable that launches a local Holochain conductor, and installs and opens apps"; + homepage = "https://github.com/holochain/launcher"; + maintainers = [ maintainers.steveej ]; + license = licenses.cal10; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 888bb8dcb75c..c72a3a5ca4c9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7505,6 +7505,8 @@ with pkgs; hockeypuck-web = callPackage ../servers/hockeypuck/web.nix { }; + holochain-launcher = callPackage ../applications/misc/holochain-launcher { }; + homesick = callPackage ../tools/misc/homesick { }; honcho = callPackage ../tools/system/honcho { };