From d92cead8841353da01552c6d6e7deff98cc59dd1 Mon Sep 17 00:00:00 2001 From: Jappie Klooster Date: Wed, 23 Dec 2020 19:38:28 -0400 Subject: [PATCH 1/5] Fix tls bound --- persistent-mysql-haskell/persistent-mysql-haskell.cabal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/persistent-mysql-haskell/persistent-mysql-haskell.cabal b/persistent-mysql-haskell/persistent-mysql-haskell.cabal index d3706336f..387571299 100644 --- a/persistent-mysql-haskell/persistent-mysql-haskell.cabal +++ b/persistent-mysql-haskell/persistent-mysql-haskell.cabal @@ -43,7 +43,7 @@ library , io-streams >= 1.2 && < 2.0 , time >= 1.5.0 , network >= 2.3 && < 4.0 - , tls >= 1.3.5 && < 1.5 + , tls >= 1.3.5 && < 2.0 exposed-modules: Database.Persist.MySQL other-modules: Database.Persist.MySQLConnectInfoShowInstance ghc-options: -Wall From 9254a0a06120fe03c441baaa1ff0eb7039af0133 Mon Sep 17 00:00:00 2001 From: Jappie Klooster Date: Wed, 23 Dec 2020 19:38:39 -0400 Subject: [PATCH 2/5] Fix issues with compilation of tests --- persistent-mysql-haskell/example/Main.hs | 2 ++ persistent-mysql-haskell/test/CustomConstraintTest.hs | 3 +++ persistent-mysql-haskell/test/InsertDuplicateUpdate.hs | 5 ++++- persistent-mysql-haskell/test/main.hs | 4 ++++ persistent/test/main.hs | 4 ++++ 5 files changed, 17 insertions(+), 1 deletion(-) diff --git a/persistent-mysql-haskell/example/Main.hs b/persistent-mysql-haskell/example/Main.hs index 1ab1660d9..9401a1a32 100644 --- a/persistent-mysql-haskell/example/Main.hs +++ b/persistent-mysql-haskell/example/Main.hs @@ -7,6 +7,8 @@ {-# LANGUAGE QuasiQuotes #-} {-# LANGUAGE TemplateHaskell #-} {-# LANGUAGE TypeFamilies #-} +{-# LANGUAGE DerivingStrategies #-} +{-# LANGUAGE StandaloneDeriving #-} -- | Taken from http://www.yesodweb.com/book/persistent. module Main where diff --git a/persistent-mysql-haskell/test/CustomConstraintTest.hs b/persistent-mysql-haskell/test/CustomConstraintTest.hs index 40d7255cf..949e85756 100644 --- a/persistent-mysql-haskell/test/CustomConstraintTest.hs +++ b/persistent-mysql-haskell/test/CustomConstraintTest.hs @@ -8,6 +8,9 @@ {-# LANGUAGE TemplateHaskell #-} {-# LANGUAGE TypeFamilies #-} {-# LANGUAGE UndecidableInstances #-} +{-# LANGUAGE DerivingStrategies #-} +{-# LANGUAGE StandaloneDeriving #-} + module CustomConstraintTest where import MyInit diff --git a/persistent-mysql-haskell/test/InsertDuplicateUpdate.hs b/persistent-mysql-haskell/test/InsertDuplicateUpdate.hs index 683c4a333..c4b61ce60 100644 --- a/persistent-mysql-haskell/test/InsertDuplicateUpdate.hs +++ b/persistent-mysql-haskell/test/InsertDuplicateUpdate.hs @@ -5,6 +5,9 @@ {-# LANGUAGE TemplateHaskell #-} {-# LANGUAGE TypeFamilies #-} {-# LANGUAGE UndecidableInstances #-} +{-# LANGUAGE DerivingStrategies #-} +{-# LANGUAGE StandaloneDeriving #-} + module InsertDuplicateUpdate where @@ -141,4 +144,4 @@ specs = describe "DuplicateKeyUpdate" $ do [] [ItemSizeSize +=. 1] dbItems <- selectList [] [] - sort dbItems @== sort (map (\(Entity k v) -> Entity k (v { itemSizeSize = itemSizeSize v + 1 })) entities) \ No newline at end of file + sort dbItems @== sort (map (\(Entity k v) -> Entity k (v { itemSizeSize = itemSizeSize v + 1 })) entities) diff --git a/persistent-mysql-haskell/test/main.hs b/persistent-mysql-haskell/test/main.hs index 6c76cf16d..540b7ba6c 100644 --- a/persistent-mysql-haskell/test/main.hs +++ b/persistent-mysql-haskell/test/main.hs @@ -5,8 +5,12 @@ {-# LANGUAGE TemplateHaskell #-} {-# LANGUAGE TypeFamilies #-} {-# LANGUAGE UndecidableInstances #-} +{-# LANGUAGE DerivingStrategies #-} +{-# LANGUAGE GeneralizedNewtypeDeriving #-} +{-# LANGUAGE StandaloneDeriving #-} {-# OPTIONS_GHC -Wno-unused-top-binds #-} + import MyInit import Data.Time (Day, UTCTime (..), TimeOfDay, timeToTimeOfDay, timeOfDayToTime) diff --git a/persistent/test/main.hs b/persistent/test/main.hs index 8eef71943..32689b1bd 100644 --- a/persistent/test/main.hs +++ b/persistent/test/main.hs @@ -1,3 +1,7 @@ +{-# LANGUAGE DerivingStrategies #-} +{-# LANGUAGE GeneralizedNewtypeDeriving #-} +{-# LANGUAGE StandaloneDeriving #-} + import Test.Hspec import Database.Persist.Quasi From 6554b715f85bdc2395bbfb1046125cf48b7391fb Mon Sep 17 00:00:00 2001 From: Jappie Klooster Date: Wed, 23 Dec 2020 19:39:31 -0400 Subject: [PATCH 3/5] Bump version number --- persistent-mysql-haskell/persistent-mysql-haskell.cabal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/persistent-mysql-haskell/persistent-mysql-haskell.cabal b/persistent-mysql-haskell/persistent-mysql-haskell.cabal index 387571299..840bab08a 100644 --- a/persistent-mysql-haskell/persistent-mysql-haskell.cabal +++ b/persistent-mysql-haskell/persistent-mysql-haskell.cabal @@ -1,5 +1,5 @@ name: persistent-mysql-haskell -version: 0.6.0 +version: 0.6.1 license: MIT license-file: LICENSE author: Naushadh , Felipe Lessa , Michael Snoyman From ab8d37ea63d1a227ceeaead09b4d2c9a03dbbec7 Mon Sep 17 00:00:00 2001 From: Jappie Klooster Date: Wed, 23 Dec 2020 19:43:41 -0400 Subject: [PATCH 4/5] Undo needless change --- persistent/test/main.hs | 4 ---- 1 file changed, 4 deletions(-) diff --git a/persistent/test/main.hs b/persistent/test/main.hs index 32689b1bd..8eef71943 100644 --- a/persistent/test/main.hs +++ b/persistent/test/main.hs @@ -1,7 +1,3 @@ -{-# LANGUAGE DerivingStrategies #-} -{-# LANGUAGE GeneralizedNewtypeDeriving #-} -{-# LANGUAGE StandaloneDeriving #-} - import Test.Hspec import Database.Persist.Quasi From 1052114ac5bf7987271fe42aa1280ec4f289666b Mon Sep 17 00:00:00 2001 From: Jappie Klooster Date: Wed, 23 Dec 2020 19:46:00 -0400 Subject: [PATCH 5/5] Add changelog --- persistent-mysql-haskell/ChangeLog.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/persistent-mysql-haskell/ChangeLog.md b/persistent-mysql-haskell/ChangeLog.md index 529de5ca7..ab873fa36 100644 --- a/persistent-mysql-haskell/ChangeLog.md +++ b/persistent-mysql-haskell/ChangeLog.md @@ -1,5 +1,8 @@ # ChangeLog for `persistent-mysql-haskell` +## 0.6.1 +- Fix [#13](https://github.com/naushadh/persistent/pull/13) Make it build on nixos 20.09 + ## 0.6.0 - Port [#977](https://github.com/yesodweb/persistent/pull/977) from `persistent-mysql`: Support Stackage Nightly