[arch-commits] Commit in haskell-generic-lens-core/trunk (PKGBUILD ghc9.patch)
Date: Thursday, July 15, 2021 @ 04:58:12 Author: felixonmars Revision: 977147 upgpkg: haskell-generic-lens-core 2.2.0.0-1: rebuild with generic-lens 2.2.0.0, generic-lens-core 2.2.0.0 Modified: haskell-generic-lens-core/trunk/PKGBUILD Deleted: haskell-generic-lens-core/trunk/ghc9.patch + PKGBUILD | 15 --- ghc9.patch | 40 2 files changed, 4 insertions(+), 51 deletions(-) Modified: PKGBUILD === --- PKGBUILD2021-07-14 23:36:37 UTC (rev 977146) +++ PKGBUILD2021-07-15 04:58:12 UTC (rev 977147) @@ -2,8 +2,8 @@ _hkgname=generic-lens-core pkgname=haskell-generic-lens-core -pkgver=2.1.0.0 -pkgrel=5 +pkgver=2.2.0.0 +pkgrel=1 pkgdesc="Generically derive traversals, lenses and prisms" url="https://github.com/kcsongor/generic-lens; license=('BSD') @@ -10,16 +10,9 @@ arch=('x86_64') depends=('ghc-libs' 'haskell-indexed-profunctors') makedepends=('ghc') -source=(https://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz -ghc9.patch) -sha512sums=('9a64ab9a2f7c0f485088ef0e5a6bb75668a8a7a9c059f566b3ec4145f38edc35f49331e7d2553f6f7753f2a02fb9bad461c978e90c44f65b878b3d70bddda291' - 'ce5d9531e8a0755bde320c98fc06e49355220d731d98dd94b657155e7aa769c8617f2c1486fbf622fa449a9a07a97aec0b986ad8e3dbc270da65c0d2c0d97d79') +source=(https://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) +sha512sums=('a29724de67f63c639b8d44856ff7285ac48140acf71ea6562de71a2413407f1a19c48c6efa5cdf831bf8a57233dca167b1da57e2c40eec2fc4be21ae9b5cd767') -prepare() { -# https://github.com/kcsongor/generic-lens/pull/130 -patch -d $_hkgname-$pkgver -p2 < ghc9.patch -} - build() { cd $_hkgname-$pkgver Deleted: ghc9.patch === --- ghc9.patch 2021-07-14 23:36:37 UTC (rev 977146) +++ ghc9.patch 2021-07-15 04:58:12 UTC (rev 977147) @@ -1,40 +0,0 @@ -From b4fc120730a84cb42ee0c1ad27cce043194249fb Mon Sep 17 00:00:00 2001 -From: amesgen -Date: Thu, 4 Feb 2021 18:43:16 +0100 -Subject: [PATCH 1/2] update to GHC 9.0 - - .../src/Data/Generics/Internal/Profunctor/Iso.hs | 2 +- - .../src/Data/Generics/Internal/Profunctor/Prism.hs| 4 ++-- - generic-lens/src/Data/Generics/Internal/VL/Iso.hs | 2 +- - generic-lens/src/Data/Generics/Internal/VL/Prism.hs | 2 +- - 4 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/generic-lens-core/src/Data/Generics/Internal/Profunctor/Iso.hs b/generic-lens-core/src/Data/Generics/Internal/Profunctor/Iso.hs -index 31de61c..31210d5 100644 a/generic-lens-core/src/Data/Generics/Internal/Profunctor/Iso.hs -+++ b/generic-lens-core/src/Data/Generics/Internal/Profunctor/Iso.hs -@@ -73,7 +73,7 @@ fromIso l = withIso l $ \ sa bt -> iso bt sa - {-# INLINE fromIso #-} - - iso :: (s -> a) -> (b -> t) -> Iso s t a b --iso = dimap -+iso sa bt = dimap sa bt - {-# INLINE iso #-} - - withIso :: Iso s t a b -> ((s -> a) -> (b -> t) -> r) -> r -diff --git a/generic-lens-core/src/Data/Generics/Internal/Profunctor/Prism.hs b/generic-lens-core/src/Data/Generics/Internal/Profunctor/Prism.hs -index fd05757..dc032aa 100644 a/generic-lens-core/src/Data/Generics/Internal/Profunctor/Prism.hs -+++ b/generic-lens-core/src/Data/Generics/Internal/Profunctor/Prism.hs -@@ -60,8 +60,8 @@ match k = withPrism k $ \_ _match -> _match - -- Prism stuff - - without' :: Prism s t a b -> Prism s t c d -> Prism s t (Either a c) (Either b d) --without' k = -- withPrism k $ \bt _ k' -> -+without' k k' = -+ withPrism k $ \bt _ -> - withPrism k' $ \dt setc -> - prism (either bt dt) $ \s -> fmap Right (setc s) - {-# INLINE without' #-}
[arch-commits] Commit in haskell-generic-lens-core/trunk (PKGBUILD ghc9.patch)
Date: Thursday, June 17, 2021 @ 00:25:19 Author: felixonmars Revision: 964478 upgpkg: haskell-generic-lens-core 2.1.0.0-5: rebuild with ghc 9.0.1 Added: haskell-generic-lens-core/trunk/ghc9.patch Modified: haskell-generic-lens-core/trunk/PKGBUILD + PKGBUILD | 13 ++--- ghc9.patch | 40 2 files changed, 50 insertions(+), 3 deletions(-) Modified: PKGBUILD === --- PKGBUILD2021-06-17 00:18:49 UTC (rev 964477) +++ PKGBUILD2021-06-17 00:25:19 UTC (rev 964478) @@ -3,7 +3,7 @@ _hkgname=generic-lens-core pkgname=haskell-generic-lens-core pkgver=2.1.0.0 -pkgrel=4 +pkgrel=5 pkgdesc="Generically derive traversals, lenses and prisms" url="https://github.com/kcsongor/generic-lens; license=('BSD') @@ -10,9 +10,16 @@ arch=('x86_64') depends=('ghc-libs' 'haskell-indexed-profunctors') makedepends=('ghc') -source=(https://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) -sha512sums=('9a64ab9a2f7c0f485088ef0e5a6bb75668a8a7a9c059f566b3ec4145f38edc35f49331e7d2553f6f7753f2a02fb9bad461c978e90c44f65b878b3d70bddda291') +source=(https://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz +ghc9.patch) +sha512sums=('9a64ab9a2f7c0f485088ef0e5a6bb75668a8a7a9c059f566b3ec4145f38edc35f49331e7d2553f6f7753f2a02fb9bad461c978e90c44f65b878b3d70bddda291' + 'ce5d9531e8a0755bde320c98fc06e49355220d731d98dd94b657155e7aa769c8617f2c1486fbf622fa449a9a07a97aec0b986ad8e3dbc270da65c0d2c0d97d79') +prepare() { +# https://github.com/kcsongor/generic-lens/pull/130 +patch -d $_hkgname-$pkgver -p2 < ghc9.patch +} + build() { cd $_hkgname-$pkgver Added: ghc9.patch === --- ghc9.patch (rev 0) +++ ghc9.patch 2021-06-17 00:25:19 UTC (rev 964478) @@ -0,0 +1,40 @@ +From b4fc120730a84cb42ee0c1ad27cce043194249fb Mon Sep 17 00:00:00 2001 +From: amesgen +Date: Thu, 4 Feb 2021 18:43:16 +0100 +Subject: [PATCH 1/2] update to GHC 9.0 + +--- + .../src/Data/Generics/Internal/Profunctor/Iso.hs | 2 +- + .../src/Data/Generics/Internal/Profunctor/Prism.hs| 4 ++-- + generic-lens/src/Data/Generics/Internal/VL/Iso.hs | 2 +- + generic-lens/src/Data/Generics/Internal/VL/Prism.hs | 2 +- + 4 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/generic-lens-core/src/Data/Generics/Internal/Profunctor/Iso.hs b/generic-lens-core/src/Data/Generics/Internal/Profunctor/Iso.hs +index 31de61c..31210d5 100644 +--- a/generic-lens-core/src/Data/Generics/Internal/Profunctor/Iso.hs b/generic-lens-core/src/Data/Generics/Internal/Profunctor/Iso.hs +@@ -73,7 +73,7 @@ fromIso l = withIso l $ \ sa bt -> iso bt sa + {-# INLINE fromIso #-} + + iso :: (s -> a) -> (b -> t) -> Iso s t a b +-iso = dimap ++iso sa bt = dimap sa bt + {-# INLINE iso #-} + + withIso :: Iso s t a b -> ((s -> a) -> (b -> t) -> r) -> r +diff --git a/generic-lens-core/src/Data/Generics/Internal/Profunctor/Prism.hs b/generic-lens-core/src/Data/Generics/Internal/Profunctor/Prism.hs +index fd05757..dc032aa 100644 +--- a/generic-lens-core/src/Data/Generics/Internal/Profunctor/Prism.hs b/generic-lens-core/src/Data/Generics/Internal/Profunctor/Prism.hs +@@ -60,8 +60,8 @@ match k = withPrism k $ \_ _match -> _match + -- Prism stuff + + without' :: Prism s t a b -> Prism s t c d -> Prism s t (Either a c) (Either b d) +-without' k = +- withPrism k $ \bt _ k' -> ++without' k k' = ++ withPrism k $ \bt _ -> + withPrism k' $ \dt setc -> + prism (either bt dt) $ \s -> fmap Right (setc s) + {-# INLINE without' #-}