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

[Felix Yan]

    Date: Sunday, February 27, 2022 @ 07:40:51
  Author: felixonmars
Revision: 1136735

upgpkg: haskell-clash-prelude 1.4.7-1

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

--------------------+
 PKGBUILD           |   28 ++++++++++------------------
 hashable-1.4.patch |   46 ----------------------------------------------
 2 files changed, 10 insertions(+), 64 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-02-27 07:30:22 UTC (rev 1136734)
+++ PKGBUILD	2022-02-27 07:40:51 UTC (rev 1136735)
@@ -2,7 +2,7 @@
 
 _hkgname=clash-prelude
 pkgname=haskell-clash-prelude
-pkgver=1.4.6
+pkgver=1.4.7
 pkgrel=1
 pkgdesc="Clash: a functional hardware description language - Prelude library"
 url="https://github.com/clash-lang/clash-prelude"
@@ -9,27 +9,19 @@
 license=('BSD')
 arch=('x86_64')
 depends=('ghc-libs' 'haskell-arrows' 'haskell-bifunctors' 'haskell-constraints'
-         'haskell-data-binary-ieee754' 'haskell-data-default-class' 'haskell-ghc-typelits-extra'
-         'haskell-ghc-typelits-knownnat' 'haskell-ghc-typelits-natnormalise' 'haskell-half'
-         'haskell-hashable' 'haskell-interpolate' 'haskell-lens' 'haskell-quickcheck'
-         'haskell-recursion-schemes' 'haskell-reflection' 'haskell-singletons'
-         'haskell-th-abstraction' 'haskell-th-lift' 'haskell-text-show' 'haskell-th-orphans'
-         'haskell-type-errors' 'haskell-uniplate' 'haskell-vector')
-makedepends=('ghc' 'uusi' 'haskell-cabal-doctest' 'haskell-doctest' 'haskell-hedgehog'
+         'haskell-data-binary-ieee754' 'haskell-data-default-class' 'haskell-extra'
+         'haskell-ghc-typelits-extra' 'haskell-ghc-typelits-knownnat'
+         'haskell-ghc-typelits-natnormalise' 'haskell-half' 'haskell-hashable' 'haskell-interpolate'
+         'haskell-lens' 'haskell-quickcheck' 'haskell-recursion-schemes' 'haskell-reflection'
+         'haskell-singletons' 'haskell-th-abstraction' 'haskell-th-lift' 'haskell-text-show'
+         'haskell-th-orphans' 'haskell-type-errors' 'haskell-uniplate' 'haskell-vector')
+makedepends=('ghc' 'haskell-cabal-doctest' 'haskell-doctest' 'haskell-hedgehog'
              '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
-        hashable-1.4.patch)
-sha512sums=('b8e7dc5f202975191c8e248b2f30f872c46d78f6c6d0e9e5a830e0645a63ef6e8ae0c0eac11ac9fb86b7e82b33f98d10cff7c35e81944bf34275157be81965de'
-            '84971d5f70f21e8962436e5c14d627a3fddb9805b505fa7ade82c22b59d94912d52d28bb509906e2e6acfcf6432c54b8d7837fc1eae5149a2ce42d51c562934a')
+source=(https://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
+sha512sums=('8e8d35aa7795fcb38886b11b5ffd62185c5f731beb9c4ca9aebbc9dd3c77aa7558a1fb09655668974ef69bbc8ffa06abddf9558feefc065dbd149caa583a6151')
 
-prepare() {
-    cd $_hkgname-$pkgver
-    patch -p2 -i ../hashable-1.4.patch
-    uusi -u ghc-bignum $_hkgname.cabal
-}
-
 build() {
     cd $_hkgname-$pkgver
     

Deleted: hashable-1.4.patch
===================================================================
--- hashable-1.4.patch	2022-02-27 07:30:22 UTC (rev 1136734)
+++ hashable-1.4.patch	2022-02-27 07:40:51 UTC (rev 1136735)
@@ -1,46 +0,0 @@
-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'.