From f8cc151294b358912fa5e786c59d7f6b9bf415d3 Mon Sep 17 00:00:00 2001 From: kolaente Date: Tue, 6 Jul 2021 14:35:24 +0200 Subject: [PATCH] cleanup / use fetchFromGitHub --- default.nix | 12 ++++++++++-- frontend/default.nix | 3 --- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/default.nix b/default.nix index 628b4f7..38ecbf7 100644 --- a/default.nix +++ b/default.nix @@ -1,13 +1,17 @@ { lib, fetchgit , makeWrapper, makeDesktopItem, mkYarnPackage, callPackage , electron_12 +, unstableGitUpdater +, fetchFromGitHub }: let executableName = "vikunja-desktop"; version = "unstable"; - src = fetchgit { - url = "https://kolaente.dev/vikunja/desktop.git"; + src = fetchFromGitHub { + githubBase = "kolaente.dev"; # Using this until we can use fetchFromGitea + owner = "vikunja"; + repo = "desktop"; rev = "03402a65dc99efe3eeacc952cfc59eb9551709a1"; sha256 = "1bqix2my5sz4nlldrk0lvcw7xsb7135s9sgkjgd6l9z4s5xw7r3i"; }; @@ -72,5 +76,9 @@ in mkYarnPackage rec { maintainers = with lib.maintainers; [ kolaente ]; inherit (electron.meta) platforms; }; + + passthru.updateScript = unstableGitUpdater { + url = "${src.meta.homepage}.git"; + }; } diff --git a/frontend/default.nix b/frontend/default.nix index a51261f..9c300e4 100644 --- a/frontend/default.nix +++ b/frontend/default.nix @@ -1,9 +1,6 @@ { stdenv , lib , mkYarnPackage -, python2 -, pkg-config -, libsass , nodejs , yarn , unstableGitUpdater