diff --git a/pkgs/by-name/pi/picom-pijulius/package.nix b/pkgs/by-name/pi/picom-pijulius/package.nix index 098e7a68be1a..442e32fda0dc 100644 --- a/pkgs/by-name/pi/picom-pijulius/package.nix +++ b/pkgs/by-name/pi/picom-pijulius/package.nix @@ -3,41 +3,41 @@ lib, writeShellScript, fetchFromGitHub, - pcre, - asciidoctor, - unstableGitUpdater + unstableGitUpdater, }: + picom.overrideAttrs (previousAttrs: { pname = "picom-pijulius"; - version = "8.2-unstable-2024-10-30"; + version = "8.2-unstable-2024-11-12"; src = fetchFromGitHub { owner = "pijulius"; repo = "picom"; - rev = "bdbcae085c1ba6c2ec6f21712ed140daaa630d89"; - hash = "sha256-3S8p4vXfryL3IfWPpjhp1GxqJelHRw5aFI3a+ysRKTU="; + rev = "136ee8d0704753b535d59a4aea03d494929ce081"; + hash = "sha256-om4vHKXA1FFy6b6DrmVunfOMco3SZxiNoIYyXK+j7k8="; }; - buildInputs = (previousAttrs.buildInputs or [ ]) ++ [ pcre ]; - nativeBuildInputs = (previousAttrs.nativeBuildInputs or [ ]) ++ [ asciidoctor ]; - - meta = { - inherit (previousAttrs.meta) - license - platforms - mainProgram - longDescription - ; - - description = "Pijulius's picom fork with extensive animation support"; - homepage = "https://github.com/pijulius/picom"; - maintainers = with lib.maintainers; [ YvesStraten ]; - }; + dontVersionCheck = true; passthru.updateScript = unstableGitUpdater { tagFormat = "v([A-Z]+)([a-z]+)|v([1-9]).([1-9])|v([1-9])-rc([1-9])"; tagConverter = writeShellScript "picom-pijulius-tag-converter.sh" '' -sed -e 's/v//g' -e 's/([A-Z])([a-z])+/8.2/g' -e 's/-rc([1-9])|-rc//g' -e 's/0/8.2/g' -''; + sed -e 's/v//g' -e 's/([A-Z])([a-z])+/8.2/g' -e 's/-rc([1-9])|-rc//g' -e 's/0/8.2/g' + ''; + }; + + meta = { + inherit (previousAttrs.meta) + license + longDescription + mainProgram + platforms + ; + + description = "Pijulius's picom fork with extensive animation support"; + homepage = "https://github.com/pijulius/picom"; + maintainers = with lib.maintainers; [ + YvesStraten + ]; }; }) diff --git a/pkgs/by-name/pi/picom/package.nix b/pkgs/by-name/pi/picom/package.nix index ae649d49c456..1e07ef86231f 100644 --- a/pkgs/by-name/pi/picom/package.nix +++ b/pkgs/by-name/pi/picom/package.nix @@ -1,45 +1,48 @@ -{ asciidoctor -, dbus -, docbook_xml_dtd_45 -, docbook_xsl -, fetchFromGitHub -, lib -, libconfig -, libdrm -, libev -, libGL -, libepoxy -, libX11 -, libxcb -, libxdg_basedir -, libXext -, libxml2 -, libxslt -, makeWrapper -, meson -, ninja -, pcre2 -, pixman -, pkg-config -, stdenv -, uthash -, xcbutil -, xcbutilimage -, xcbutilrenderutil -, xorgproto -, xwininfo -, withDebug ? false +{ + asciidoctor, + dbus, + docbook_xml_dtd_45, + docbook_xsl, + fetchFromGitHub, + lib, + libconfig, + libdrm, + libev, + libGL, + libepoxy, + libX11, + libxcb, + libxdg_basedir, + libXext, + libxml2, + libxslt, + makeWrapper, + meson, + ninja, + pcre2, + pixman, + pkg-config, + stdenv, + uthash, + xcbutil, + xcbutilimage, + xcbutilrenderutil, + xorgproto, + xwininfo, + withDebug ? false, + versionCheckHook, + nix-update-script, }: stdenv.mkDerivation (finalAttrs: { pname = "picom"; - version = "12.4"; + version = "12.5"; src = fetchFromGitHub { owner = "yshui"; repo = "picom"; rev = "v${finalAttrs.version}"; - hash = "sha256-5kScnKUHck86fsYrraeV2O2r6fsVFllRMp4GeNT627A="; + hash = "sha256-H8IbzzrzF1c63MXbw5mqoll3H+vgcSVpijrlSDNkc+o="; fetchSubmodules = true; }; @@ -90,15 +93,28 @@ stdenv.mkDerivation (finalAttrs: { # In debug mode, also copy src directory to store. If you then run `gdb picom` # in the bin directory of picom store path, gdb finds the source files. - postInstall = '' - wrapProgram $out/bin/picom-trans \ - --prefix PATH : ${lib.makeBinPath [ xwininfo ]} - '' + lib.optionalString withDebug '' - cp -r ../src $out/ - ''; + postInstall = + '' + wrapProgram $out/bin/picom-trans \ + --prefix PATH : ${lib.makeBinPath [ xwininfo ]} + '' + + lib.optionalString withDebug '' + cp -r ../src $out/ + ''; - meta = with lib; { + nativeInstallCheckInputs = [ + versionCheckHook + ]; + + doInstallCheck = true; + + passthru = { + updateScript = nix-update-script { }; + }; + + meta = { description = "Fork of XCompMgr, a sample compositing manager for X servers"; + license = lib.licenses.mit; longDescription = '' A fork of XCompMgr, which is a sample compositing manager for X servers supporting the XFIXES, DAMAGE, RENDER, and COMPOSITE @@ -113,10 +129,14 @@ stdenv.mkDerivation (finalAttrs: { For gdb to find the source files, you need to run gdb in the bin directory of picom package in the nix store. ''; - license = licenses.mit; homepage = "https://github.com/yshui/picom"; - maintainers = with maintainers; [ ertes gepbird twey thiagokokada ]; - platforms = platforms.linux; mainProgram = "picom"; + maintainers = with lib.maintainers; [ + ertes + gepbird + thiagokokada + twey + ]; + platforms = lib.platforms.linux; }; })