diff --git a/srcpkgs/python3-xcffib/patches/fix-build.patch b/srcpkgs/python3-xcffib/patches/fix-build.patch deleted file mode 100644 index c150eb91329..00000000000 --- a/srcpkgs/python3-xcffib/patches/fix-build.patch +++ /dev/null @@ -1,30 +0,0 @@ -These changes are cargo-culted from - - https://github.com/tych0/xcffib/commit/7e2650fd21b157402cd26bff129a81a0b5ddc60c - ---- a/generator/Data/XCB/Python/Parse.hs -+++ b/generator/Data/XCB/Python/Parse.hs -@@ -309,12 +309,12 @@ - -> BitCase - -> (Expr (), [GenStructElem Type]) - mkSwitch cmp (BitCase Nothing bcCmp _ elems) = -- let cmpVal = xExpressionToPyExpr id bcCmp -+ let cmpVal = xExpressionToPyExpr id (head bcCmp) - equality = BinaryOp (P.BinaryAnd ()) cmp cmpVal () - in (equality, elems) - - mkSwitch cmp (BitCase (Just _) bcCmp _ elems) = -- let cmpVal = xExpressionToPyExpr id bcCmp -+ let cmpVal = xExpressionToPyExpr id (head bcCmp) - equality = BinaryOp (P.Equality ()) cmp cmpVal () - in (equality, elems) - -@@ -373,7 +373,7 @@ - -> BitCase - -> (Expr (), [GenStructElem Type]) - mkSwitch cmp (BitCase _ bcCmp _ elems') = -- let cmpVal = xExpressionToPyExpr accessor bcCmp -+ let cmpVal = xExpressionToPyExpr accessor (head bcCmp) - equality = BinaryOp (P.BinaryAnd ()) cmp cmpVal () - in (equality, elems') - structElemToPyPack ext m accessor (SField n typ _ _) = diff --git a/srcpkgs/python3-xcffib/template b/srcpkgs/python3-xcffib/template index 47d8c8c5df2..1d4b52eb6e2 100644 --- a/srcpkgs/python3-xcffib/template +++ b/srcpkgs/python3-xcffib/template @@ -1,21 +1,14 @@ # Template file for 'python3-xcffib' pkgname=python3-xcffib -version=1.5.0 -revision=3 +version=1.7.1 +revision=1 build_style=python3-pep517 -hostmakedepends="python3-setuptools pkg-config cabal-install parallel xcb-proto python3-cffi python3-wheel" -makedepends="python3-devel libffi-devel libxcb-devel python3-six" -depends="python3-six python3-cffi libxcb" +hostmakedepends="python3-setuptools python3-wheel python3-cffi" +depends="python3-cffi libxcb" checkdepends="python3-pytest xvfb-run xeyes" short_desc="Drop-in replacement for xpyb based on cffi" maintainer="Kai Stian Olstad " license="Apache-2.0" homepage="https://github.com/tych0/xcffib" -distfiles="${homepage}/archive/v${version}.tar.gz" -checksum=3bf9ce88b8a343a12eb1fc72a7b3e6091f8b65e682354510261b0a2cae1b00c5 -nocross="Cannot yet cross compile with Haskell" - -pre_build() { - cabal v2-update - PKG_CONFIG_PATH=/usr/lib/pkgconfig make ${makejobs} xcffib -} +distfiles="${PYPI_SITE}/x/xcffib/xcffib-${version}.tar.gz" +checksum=33775c1d0461f19255fc54e22ce914e10a13fb65bc7bba0eabafee7f0878cfdb