[arch-commits] Commit in haskell-clash-prelude/trunk (PKGBUILD hashable-1.4.patch)

[Felix Yan]

    Date: Tuesday, February 22, 2022 @ 07:46:00
  Author: felixonmars
Revision: 1135788

upgpkg: haskell-clash-prelude 1.4.3-58: rebuild with hashable 1.4.0.0, quickcheck-instances 0.3.26.1

Added:
  haskell-clash-prelude/trunk/hashable-1.4.patch
Modified:
  haskell-clash-prelude/trunk/PKGBUILD

--------------------+
 PKGBUILD           |    9 ++++++---
 hashable-1.4.patch |   46 ++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 52 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-02-22 07:44:18 UTC (rev 1135787)
+++ PKGBUILD	2022-02-22 07:46:00 UTC (rev 1135788)
@@ -3,7 +3,7 @@
 _hkgname=clash-prelude
 pkgname=haskell-clash-prelude
 pkgver=1.4.3
-pkgrel=57
+pkgrel=58
 pkgdesc="Clash: a functional hardware description language - Prelude library"
 url="https://github.com/clash-lang/clash-prelude"
 license=('BSD')
@@ -19,11 +19,14 @@
              'haskell-hint' 'haskell-quickcheck-classes-base' 'haskell-tasty'
              'haskell-tasty-hedgehog' 'haskell-tasty-hunit' 'haskell-tasty-quickcheck'
              'haskell-tasty-th')
-source=(https://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
-sha512sums=('fdfed70e2ce3d756f60af9820acb6affaa4ee6c2aa063ab39b5133106d78bca9ee51b65a4b9b8b3fdbe273e4a6d9926c4b910b26d6d1ec6e14dd219a90d7f3c1')
+source=(https://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz
+        hashable-1.4.patch)
+sha512sums=('fdfed70e2ce3d756f60af9820acb6affaa4ee6c2aa063ab39b5133106d78bca9ee51b65a4b9b8b3fdbe273e4a6d9926c4b910b26d6d1ec6e14dd219a90d7f3c1'
+            '84971d5f70f21e8962436e5c14d627a3fddb9805b505fa7ade82c22b59d94912d52d28bb509906e2e6acfcf6432c54b8d7837fc1eae5149a2ce42d51c562934a')
 
 prepare() {
     cd $_hkgname-$pkgver
+    patch -p2 -i ../hashable-1.4.patch
     uusi -u ghc-bignum $_hkgname.cabal
 }
 

Added: hashable-1.4.patch
===================================================================
--- hashable-1.4.patch	                        (rev 0)
+++ hashable-1.4.patch	2022-02-22 07:46:00 UTC (rev 1135788)
@@ -0,0 +1,46 @@
+diff --git a/clash-prelude/clash-prelude.cabal b/clash-prelude/clash-prelude.cabal
+index 43dfaa6fc..2e2c1e619 100644
+--- a/clash-prelude/clash-prelude.cabal
++++ b/clash-prelude/clash-prelude.cabal
+@@ -326,7 +326,7 @@ Library
+                       ghc-typelits-extra        >= 0.4     && < 0.5,
+                       ghc-typelits-knownnat     >= 0.7.2   && < 0.8,
+                       ghc-typelits-natnormalise >= 0.7.2   && < 0.8,
+-                      hashable                  >= 1.2.1.0  && < 1.4,
++                      hashable                  >= 1.2.1.0  && < 1.5,
+                       half                      >= 0.2.2.3 && < 1.0,
+                       interpolate               >= 0.2     && < 0.3,
+                       lens                      >= 4.10    && < 5.1.0,
+diff --git a/clash-prelude/src/Clash/Annotations/Primitive.hs b/clash-prelude/src/Clash/Annotations/Primitive.hs
+index 475b0977a..13db3aece 100644
+--- a/clash-prelude/src/Clash/Annotations/Primitive.hs
++++ b/clash-prelude/src/Clash/Annotations/Primitive.hs
+@@ -272,7 +272,7 @@ data Primitive
+   -- ^ Description of a primitive for a given 'HDL's in a file at 'FilePath'
+   | InlinePrimitive [HDL] String
+   -- ^ Description of a primitive for a given 'HDL's as an inline 'String'
+-  deriving (Show, Read, Data, Generic, NFData, Hashable)
++  deriving (Show, Read, Data, Generic, NFData, Hashable, Eq)
+ 
+ -- | Primitive guard to mark a value as either not translatable or as having a
+ -- blackbox with an optional extra warning. Helps Clash generate better error
+@@ -287,7 +287,9 @@ data PrimitiveGuard a
+   | HasBlackBox [PrimitiveWarning] a
+   -- ^ Marks a value as having a blackbox. Clash will error if it hasn't found
+   -- a blackbox.
+-    deriving (Show, Read, Data, Generic, NFData, Hashable, Functor, Foldable, Traversable, Binary)
++  deriving
++    ( Show, Read, Data, Generic, NFData, Hashable, Functor, Foldable
++    , Traversable, Binary, Eq )
+ 
+ -- | Warning that will be emitted on instantiating a guarded value.
+ data PrimitiveWarning
+@@ -296,7 +298,7 @@ data PrimitiveWarning
+   -- instantiated in a non-testbench context.
+   | WarnAlways String
+   -- ^ Always emit warning upon primitive instantiation.
+-    deriving (Show, Read, Data, Generic, NFData, Hashable, Binary)
++    deriving (Show, Read, Data, Generic, NFData, Hashable, Binary, Eq)
+ 
+ -- | Extract primitive definition from a PrimitiveGuard. Will yield Nothing
+ -- for guards of value 'DontTranslate'.