cleanup / use fetchFromGitHub

This commit is contained in:
kolaente 2021-07-06 14:35:24 +02:00
parent 84aa99a4c4
commit f8cc151294
Signed by: konrad
GPG Key ID: F40E70337AB24C9B
2 changed files with 10 additions and 5 deletions

View File

@ -1,13 +1,17 @@
{ lib, fetchgit { lib, fetchgit
, makeWrapper, makeDesktopItem, mkYarnPackage, callPackage , makeWrapper, makeDesktopItem, mkYarnPackage, callPackage
, electron_12 , electron_12
, unstableGitUpdater
, fetchFromGitHub
}: }:
let let
executableName = "vikunja-desktop"; executableName = "vikunja-desktop";
version = "unstable"; version = "unstable";
src = fetchgit { src = fetchFromGitHub {
url = "https://kolaente.dev/vikunja/desktop.git"; githubBase = "kolaente.dev"; # Using this until we can use fetchFromGitea
owner = "vikunja";
repo = "desktop";
rev = "03402a65dc99efe3eeacc952cfc59eb9551709a1"; rev = "03402a65dc99efe3eeacc952cfc59eb9551709a1";
sha256 = "1bqix2my5sz4nlldrk0lvcw7xsb7135s9sgkjgd6l9z4s5xw7r3i"; sha256 = "1bqix2my5sz4nlldrk0lvcw7xsb7135s9sgkjgd6l9z4s5xw7r3i";
}; };
@ -72,5 +76,9 @@ in mkYarnPackage rec {
maintainers = with lib.maintainers; [ kolaente ]; maintainers = with lib.maintainers; [ kolaente ];
inherit (electron.meta) platforms; inherit (electron.meta) platforms;
}; };
passthru.updateScript = unstableGitUpdater {
url = "${src.meta.homepage}.git";
};
} }

View File

@ -1,9 +1,6 @@
{ stdenv { stdenv
, lib , lib
, mkYarnPackage , mkYarnPackage
, python2
, pkg-config
, libsass
, nodejs , nodejs
, yarn , yarn
, unstableGitUpdater , unstableGitUpdater