diff --git a/pkgs/applications/version-management/sourcehut/builds.nix b/pkgs/applications/version-management/sourcehut/builds.nix index 7fb26476d8a..c8163caf8ea 100644 --- a/pkgs/applications/version-management/sourcehut/builds.nix +++ b/pkgs/applications/version-management/sourcehut/builds.nix @@ -1,24 +1,34 @@ -{ lib, fetchgit, buildPythonPackage +{ lib +, fetchFromSourcehut +, buildPythonPackage , buildGoModule -, srht, redis, celery, pyyaml, markdown }: - +, srht +, redis +, celery +, pyyaml +, markdown +, ansi2html +, python +}: let - version = "0.63.4"; + version = "0.66.7"; buildWorker = src: buildGoModule { inherit src version; pname = "builds-sr-ht-worker"; - vendorSha256 = "1sbcjp93gb0c4p7dd1gjhmhwr1pygxvrrzp954j2fvxvi38w6571"; + vendorSha256 = "sha256-giOaldV46aBqXyFH/cQVsbUr6Rb4VMhbBO86o48tRZY="; }; -in buildPythonPackage rec { +in +buildPythonPackage rec { inherit version; pname = "buildsrht"; - src = fetchgit { - url = "https://git.sr.ht/~sircmpwn/builds.sr.ht"; + src = fetchFromSourcehut { + owner = "~sircmpwn"; + repo = "builds.sr.ht"; rev = version; - sha256 = "1w3rb685nqg2h0k3ag681svc400si9r1gy0sdim3wa2qh8glbqni"; + sha256 = "sha256-2MLs/DOXHjEYarXDVUcPZe3o0fmZbzVxn528SE72lhM="; }; nativeBuildInputs = srht.nativeBuildInputs; @@ -29,10 +39,12 @@ in buildPythonPackage rec { celery pyyaml markdown + ansi2html ]; preBuild = '' export PKGVER=${version} + export SRHT_PATH=${srht}/${python.sitePackages}/srht ''; postInstall = '' @@ -44,8 +56,6 @@ in buildPythonPackage rec { cp ${buildWorker "${src}/worker"}/bin/worker $out/bin/builds.sr.ht-worker ''; - dontUseSetuptoolsCheck = true; - meta = with lib; { homepage = "https://git.sr.ht/~sircmpwn/builds.sr.ht"; description = "Continuous integration service for the sr.ht network";