From 0b4a7c770933bafc718200a2d005aee2c82a8aa9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Wed, 13 Nov 2024 09:12:50 +0100 Subject: [PATCH 1/9] picom: nixfmt --- pkgs/by-name/pi/picom/package.nix | 84 +++++++++++++++++-------------- 1 file changed, 46 insertions(+), 38 deletions(-) diff --git a/pkgs/by-name/pi/picom/package.nix b/pkgs/by-name/pi/picom/package.nix index ae649d49c456..8646eed571c1 100644 --- a/pkgs/by-name/pi/picom/package.nix +++ b/pkgs/by-name/pi/picom/package.nix @@ -1,34 +1,35 @@ -{ 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, }: stdenv.mkDerivation (finalAttrs: { @@ -90,12 +91,14 @@ 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; { description = "Fork of XCompMgr, a sample compositing manager for X servers"; @@ -115,7 +118,12 @@ stdenv.mkDerivation (finalAttrs: { ''; license = licenses.mit; homepage = "https://github.com/yshui/picom"; - maintainers = with maintainers; [ ertes gepbird twey thiagokokada ]; + maintainers = with maintainers; [ + ertes + gepbird + twey + thiagokokada + ]; platforms = platforms.linux; mainProgram = "picom"; }; From d022b09c816b399eb773677987425835b5f90f54 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Wed, 13 Nov 2024 09:14:34 +0100 Subject: [PATCH 2/9] picom: add update script --- pkgs/by-name/pi/picom/package.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/by-name/pi/picom/package.nix b/pkgs/by-name/pi/picom/package.nix index 8646eed571c1..b85254b07bc3 100644 --- a/pkgs/by-name/pi/picom/package.nix +++ b/pkgs/by-name/pi/picom/package.nix @@ -30,6 +30,7 @@ xorgproto, xwininfo, withDebug ? false, + nix-update-script, }: stdenv.mkDerivation (finalAttrs: { @@ -100,6 +101,10 @@ stdenv.mkDerivation (finalAttrs: { cp -r ../src $out/ ''; + passthru = { + updateScript = nix-update-script { }; + }; + meta = with lib; { description = "Fork of XCompMgr, a sample compositing manager for X servers"; longDescription = '' From 3b5b0af7c6dbde41f287bded4f5cb7d2d2c03ab3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Wed, 13 Nov 2024 09:16:37 +0100 Subject: [PATCH 3/9] picom: 12.4 -> 12.5 --- pkgs/by-name/pi/picom/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pi/picom/package.nix b/pkgs/by-name/pi/picom/package.nix index b85254b07bc3..8a9b9b5cd42c 100644 --- a/pkgs/by-name/pi/picom/package.nix +++ b/pkgs/by-name/pi/picom/package.nix @@ -35,13 +35,13 @@ 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; }; From cd518d05b1cee0d34f01e5f5cf11e0d944e9b449 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Wed, 13 Nov 2024 09:17:39 +0100 Subject: [PATCH 4/9] picom: add version check hook --- pkgs/by-name/pi/picom/package.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/by-name/pi/picom/package.nix b/pkgs/by-name/pi/picom/package.nix index 8a9b9b5cd42c..8a147d53a5a0 100644 --- a/pkgs/by-name/pi/picom/package.nix +++ b/pkgs/by-name/pi/picom/package.nix @@ -30,6 +30,7 @@ xorgproto, xwininfo, withDebug ? false, + versionCheckHook, nix-update-script, }: @@ -101,6 +102,12 @@ stdenv.mkDerivation (finalAttrs: { cp -r ../src $out/ ''; + nativeInstallCheckInputs = [ + versionCheckHook + ]; + + doInstallCheck = true; + passthru = { updateScript = nix-update-script { }; }; From 678793e1b59372baeeb1f38ae807f4ce6f84b665 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Wed, 13 Nov 2024 09:18:48 +0100 Subject: [PATCH 5/9] picom: remove `with lib;` order `meta` attrs --- pkgs/by-name/pi/picom/package.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/pi/picom/package.nix b/pkgs/by-name/pi/picom/package.nix index 8a147d53a5a0..1e07ef86231f 100644 --- a/pkgs/by-name/pi/picom/package.nix +++ b/pkgs/by-name/pi/picom/package.nix @@ -112,8 +112,9 @@ stdenv.mkDerivation (finalAttrs: { updateScript = nix-update-script { }; }; - meta = with lib; { + 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 @@ -128,15 +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; [ + mainProgram = "picom"; + maintainers = with lib.maintainers; [ ertes gepbird - twey thiagokokada + twey ]; - platforms = platforms.linux; - mainProgram = "picom"; + platforms = lib.platforms.linux; }; }) From 2d178aa49af3c8b662995ca11bf06a587a8a5663 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Wed, 13 Nov 2024 10:03:16 +0100 Subject: [PATCH 6/9] picom-pijulius: skip version check --- pkgs/by-name/pi/picom-pijulius/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/pi/picom-pijulius/package.nix b/pkgs/by-name/pi/picom-pijulius/package.nix index 098e7a68be1a..1b3f8d95e6b7 100644 --- a/pkgs/by-name/pi/picom-pijulius/package.nix +++ b/pkgs/by-name/pi/picom-pijulius/package.nix @@ -21,6 +21,8 @@ picom.overrideAttrs (previousAttrs: { buildInputs = (previousAttrs.buildInputs or [ ]) ++ [ pcre ]; nativeBuildInputs = (previousAttrs.nativeBuildInputs or [ ]) ++ [ asciidoctor ]; + dontVersionCheck = true; + meta = { inherit (previousAttrs.meta) license From 70f3a840c8c0162a6b0264fa28dc119a3815eac1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Wed, 13 Nov 2024 10:10:24 +0100 Subject: [PATCH 7/9] picom-pijulius: 8.2-unstable-2024-10-30 -> 8.2-unstable-2024-11-12 --- pkgs/by-name/pi/picom-pijulius/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/pi/picom-pijulius/package.nix b/pkgs/by-name/pi/picom-pijulius/package.nix index 1b3f8d95e6b7..0ed9ff42c6cd 100644 --- a/pkgs/by-name/pi/picom-pijulius/package.nix +++ b/pkgs/by-name/pi/picom-pijulius/package.nix @@ -9,13 +9,13 @@ }: 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 ]; From 6cd4419ebe8ec025cebb252871ba9da8c10f9e7c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Wed, 13 Nov 2024 10:17:01 +0100 Subject: [PATCH 8/9] picom-pijulius: remove unnecessary dependencies --- pkgs/by-name/pi/picom-pijulius/package.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pkgs/by-name/pi/picom-pijulius/package.nix b/pkgs/by-name/pi/picom-pijulius/package.nix index 0ed9ff42c6cd..d12a245c3226 100644 --- a/pkgs/by-name/pi/picom-pijulius/package.nix +++ b/pkgs/by-name/pi/picom-pijulius/package.nix @@ -3,8 +3,6 @@ lib, writeShellScript, fetchFromGitHub, - pcre, - asciidoctor, unstableGitUpdater }: picom.overrideAttrs (previousAttrs: { @@ -18,9 +16,6 @@ picom.overrideAttrs (previousAttrs: { hash = "sha256-om4vHKXA1FFy6b6DrmVunfOMco3SZxiNoIYyXK+j7k8="; }; - buildInputs = (previousAttrs.buildInputs or [ ]) ++ [ pcre ]; - nativeBuildInputs = (previousAttrs.nativeBuildInputs or [ ]) ++ [ asciidoctor ]; - dontVersionCheck = true; meta = { From 3d381bc1a352ead7543e390e76a8b3fb5f002c0d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Wed, 13 Nov 2024 10:18:29 +0100 Subject: [PATCH 9/9] picom-pijulius: nixfmt, order attrs --- pkgs/by-name/pi/picom-pijulius/package.nix | 25 ++++++++++++---------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/pkgs/by-name/pi/picom-pijulius/package.nix b/pkgs/by-name/pi/picom-pijulius/package.nix index d12a245c3226..442e32fda0dc 100644 --- a/pkgs/by-name/pi/picom-pijulius/package.nix +++ b/pkgs/by-name/pi/picom-pijulius/package.nix @@ -3,8 +3,9 @@ lib, writeShellScript, fetchFromGitHub, - unstableGitUpdater + unstableGitUpdater, }: + picom.overrideAttrs (previousAttrs: { pname = "picom-pijulius"; version = "8.2-unstable-2024-11-12"; @@ -18,23 +19,25 @@ picom.overrideAttrs (previousAttrs: { 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' + ''; + }; + meta = { inherit (previousAttrs.meta) license - platforms - mainProgram longDescription + mainProgram + platforms ; description = "Pijulius's picom fork with extensive animation support"; homepage = "https://github.com/pijulius/picom"; - maintainers = with lib.maintainers; [ YvesStraten ]; - }; - - 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' -''; + maintainers = with lib.maintainers; [ + YvesStraten + ]; }; })