diff --git a/pkgs/by-name/la/lazpaint/package.nix b/pkgs/by-name/la/lazpaint/package.nix index 60e11d903094..c15a99ee8946 100644 --- a/pkgs/by-name/la/lazpaint/package.nix +++ b/pkgs/by-name/la/lazpaint/package.nix @@ -10,29 +10,27 @@ python3, }: -let - bgrabitmap = fetchFromGitHub { - owner = "bgrabitmap"; - repo = "bgrabitmap"; - rev = "2814b069d55f726b9f3b4774d85d00dd72be9c05"; - hash = "sha256-YibwdhlgjgI30gqYsKchgDPlOSpBiDBDJNlUDFMygGs="; - }; - bgracontrols = fetchFromGitHub { - owner = "bgrabitmap"; - repo = "bgracontrols"; - rev = "v8.0"; - hash = "sha256-5L05eGVN+xncd0/0XLFN6EL2ux4aAOsiU0BMoy0dKgg="; - }; -in -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { pname = "lazpaint"; - version = "7.2.2-unstable-2024-01-23"; + version = "7.3"; src = fetchFromGitHub { owner = "bgrabitmap"; repo = "lazpaint"; - rev = "45a7a471d531d6adb5ee557ff917a99af76e92f1"; - hash = "sha256-KgCxSK72Ow29T58mlcYCJiS4D0Ov2/p37c1FSNgKZew="; + tag = "v${finalAttrs.version}"; + hash = "sha256-yT1HyvJcYEJgMkQxzCSD8s7/ttemxZaur9T+As8WdIo="; + }; + bgrabitmap = fetchFromGitHub { + owner = "bgrabitmap"; + repo = "bgrabitmap"; + tag = "v11.6.6"; + hash = "sha256-bA8tvo7Srm5kIZTVWEA2+gjqHab7LByyL/zqdQxeFlA="; + }; + bgracontrols = fetchFromGitHub { + owner = "bgrabitmap"; + repo = "bgracontrols"; + tag = "v9.0.2"; + hash = "sha256-HqX9n4VpOyMwTz3fTweTTqzW+jA2BU62mm/X7Iwjd/8="; }; nativeBuildInputs = [ @@ -59,8 +57,8 @@ stdenv.mkDerivation { runHook preBuild export HOME=$(mktemp -d) - cp -r --no-preserve=mode ${bgrabitmap} bgrabitmap - cp -r --no-preserve=mode ${bgracontrols} bgracontrols + cp -r --no-preserve=mode ${finalAttrs.bgrabitmap} bgrabitmap + cp -r --no-preserve=mode ${finalAttrs.bgracontrols} bgracontrols lazbuild --lazarusdir=${lazarus-qt5}/share/lazarus \ --build-mode=ReleaseQt5 \ @@ -86,4 +84,4 @@ stdenv.mkDerivation { maintainers = with lib.maintainers; [ aleksana ]; mainProgram = "lazpaint"; }; -} +})