From 63b3037be084b38d6b0f9550d5161b038aa29fcc Mon Sep 17 00:00:00 2001 From: Infinidoge Date: Sun, 1 Oct 2023 13:42:15 -0400 Subject: [PATCH] bump: qtile --- overlays/overrides.nix | 58 +++--------------------------------------- 1 file changed, 4 insertions(+), 54 deletions(-) diff --git a/overlays/overrides.nix b/overlays/overrides.nix index 45ade6d..c768217 100644 --- a/overlays/overrides.nix +++ b/overlays/overrides.nix @@ -18,66 +18,16 @@ in inherit (stable) ; - # https://github.com/NixOS/nixpkgs/issues/252769 - # https://github.com/NixOS/nixpkgs/issues/252320#issuecomment-1706262385 python3 = prev.python3.override { packageOverrides = pythonFinal: pythonPrev: { qtile = pythonPrev.qtile.overrideAttrs (oldAttrs: { - version = "unstable-2023-09-08"; + version = "unstable-2023-09-30"; src = oldAttrs.src.override { - rev = "133c4119e34635296c1db62346325152f89d6df9"; - hash = "sha256-JtPN0FMRZMc89AzQfe0JiB9OMR+tmMq+pLye5nAOQ7Y="; + rev = "65693447ba6020919eed7c519efe76257161e80b"; + hash = "sha256-0JuJi1DyptChMyHWWDahK+oEqYYDHOdV3/bVtMr83CI="; }; - patches = oldAttrs.patches ++ [ - # https://github.com/qtile/qtile/pull/4473 - (final.fetchpatch { - name = "qtile-load-icons-for-group-specific-layouts.patch"; - url = "https://github.com/qtile/qtile/commit/56b0519d74a090e25f4f930c7f49ab5704e1cc21.patch"; - sha256 = "sha256-Na525vpHKOdQHS6lkbs2roCbalfIiYakakrH9XqPf5Q="; - }) - ]; - - propagatedBuildInputs = - let - xcffib = pythonFinal.xcffib.overrideAttrs (oldAttrs: rec { - version = "1.5.0"; - patches = [ ]; - src = oldAttrs.src.override { - inherit version; - hash = "sha256-qVyUZfL5e0/O3mBr0eCEB6Mt9xy3YP1Xv+U2d9tpGsw="; - }; - }); - in - with final; with pythonFinal; [ - (pywlroots.overridePythonAttrs (oldAttrs: rec { - version = "0.16.4"; - src = oldAttrs.src.override { - inherit version; - hash = "sha256-+1PILk14XoA/dINfoOQeeMSGBrfYX3pLA6eNdwtJkZE="; - }; - buildInputs = [ wlroots_0_16 ] ++ lib.remove wlroots oldAttrs.buildInputs; - })) - xcffib - (cairocffi.override { withXcffib = true; inherit xcffib; }) - iwlib - ] ++ lib.remove - (cairocffi.override { withXcffib = true; }) - (lib.remove pywlroots oldAttrs.propagatedBuildInputs); - - buildInputs = with final; [ - wlroots_0_16 - libdrm - ] ++ lib.remove wlroots oldAttrs.buildInputs; - - postPatch = with final; oldAttrs.postPatch + '' - substituteInPlace libqtile/backend/wayland/cffi/cairo_buffer.py \ - --replace drm_fourcc.h libdrm/drm_fourcc.h - - substituteInPlace libqtile/backend/wayland/cffi/build.py \ - --replace /usr/include/pixman-1 ${pixman.outPath}/include \ - --replace /usr/include/libdrm ${libdrm.dev.outPath}/include/libdrm - ''; + propagatedBuildInputs = oldAttrs.propagatedBuildInputs ++ (with pythonFinal; [ iwlib ]); }); }; };