[arch-commits] Commit in stack/trunk (PKGBUILD persistent-template-2.8.patch)

[Felix Yan]

    Date: Sunday, March 8, 2020 @ 17:47:25
  Author: felixonmars
Revision: 592291

upgpkg: stack 2.1.3.20200308-1: rebuild with http-download 0.2.0.0, stack 2.1.3.20200308

Modified:
  stack/trunk/PKGBUILD
Deleted:
  stack/trunk/persistent-template-2.8.patch

-------------------------------+
 PKGBUILD                      |   14 ++++---------
 persistent-template-2.8.patch |   42 ----------------------------------------
 2 files changed, 5 insertions(+), 51 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-03-08 17:37:42 UTC (rev 592290)
+++ PKGBUILD	2020-03-08 17:47:25 UTC (rev 592291)
@@ -2,9 +2,9 @@
 # Contributor: Arch Haskell Team <arch-haskell at haskell.org>
 
 pkgname=stack
-pkgver=2.1.3.20200209
-_commit=35f5d869558c4ac8c50e33c4930b0b72cb173b8b
-pkgrel=66
+pkgver=2.1.3.20200308
+_commit=9ae6c817113e8c676f5c6be6734b4e8471178e26
+pkgrel=1
 pkgdesc="The Haskell Tool Stack"
 url="https://github.com/commercialhaskell/stack"
 license=("BSD")
@@ -34,17 +34,13 @@
 conflicts=('haskell-stack')
 replaces=('haskell-stack')
 install="stack.install"
-source=("git+https://github.com/commercialhaskell/stack.git#commit=$_commit"
-        persistent-template-2.8.patch)
-sha512sums=('SKIP'
-            '7d5c95dea6b5f1ff830230856bf829b1372228b1fb116da4e186539206089557df65fea9094a89182a3b67ed46c137b0faaf9070ef22b5a2e5ca56380f68fd21')
+source=("git+https://github.com/commercialhaskell/stack.git#commit=$_commit")
+sha512sums=('SKIP')
 
 prepare() {
   cd $pkgname
-  patch -p1 -i ../persistent-template-2.8.patch
   hpack
   sed -i -e '/semigroups/d' $pkgname.cabal
-
   sed -i -e 's/fail $ "Invalid package name:/error $ "Invalid package name:/' \
          -e 's/fail $ "Invalid CabalConfigKey/error $ "Invalid CabalConfigKey/' \
             src/Stack/Types/Config.hs

Deleted: persistent-template-2.8.patch
===================================================================
--- persistent-template-2.8.patch	2020-03-08 17:37:42 UTC (rev 592290)
+++ persistent-template-2.8.patch	2020-03-08 17:47:25 UTC (rev 592291)
@@ -1,42 +0,0 @@
-commit 6fdcc1828221caa77af700b0cca955c805ac7011
-Author: Felix Yan <felixonmars at archlinux.org>
-Date:   Thu Feb 27 04:24:17 2020 +0800
-
-    Enable StandaloneDeriving and DerivingStrategies
-    
-    This fixes compatibility with persistent-template >= 2.8.0
-
-diff --git a/src/Stack/Storage/Project.hs b/src/Stack/Storage/Project.hs
-index dc5318d8..1dd635c1 100644
---- a/src/Stack/Storage/Project.hs
-+++ b/src/Stack/Storage/Project.hs
-@@ -1,3 +1,4 @@
-+{-# LANGUAGE DerivingStrategies #-}
- {-# LANGUAGE FlexibleInstances #-}
- {-# LANGUAGE GADTs #-}
- {-# LANGUAGE GeneralizedNewtypeDeriving #-}
-@@ -6,6 +7,7 @@
- {-# LANGUAGE OverloadedStrings #-}
- {-# LANGUAGE QuasiQuotes #-}
- {-# LANGUAGE RecordWildCards #-}
-+{-# LANGUAGE StandaloneDeriving #-}
- {-# LANGUAGE TemplateHaskell #-}
- {-# LANGUAGE TupleSections #-}
- {-# LANGUAGE TypeFamilies #-}
-diff --git a/src/Stack/Storage/User.hs b/src/Stack/Storage/User.hs
-index 3845b094..ccd5a66f 100644
---- a/src/Stack/Storage/User.hs
-+++ b/src/Stack/Storage/User.hs
-@@ -1,3 +1,4 @@
-+{-# LANGUAGE DerivingStrategies #-}
- {-# LANGUAGE FlexibleInstances #-}
- {-# LANGUAGE GADTs #-}
- {-# LANGUAGE GeneralizedNewtypeDeriving #-}
-@@ -6,6 +7,7 @@
- {-# LANGUAGE OverloadedStrings #-}
- {-# LANGUAGE QuasiQuotes #-}
- {-# LANGUAGE RecordWildCards #-}
-+{-# LANGUAGE StandaloneDeriving #-}
- {-# LANGUAGE TemplateHaskell #-}
- {-# LANGUAGE TupleSections #-}
- {-# LANGUAGE TypeFamilies #-}