git-annex 7.20200202.7 → 7.20200204

raw patch · 6 files changed

+29/−1 lines, 6 files

Files

CHANGELOG +8/−0
Database/ContentIdentifier.hs +5/−0
Database/Export.hs +5/−0
Database/Fsck.hs +5/−0
Database/Keys/SQL.hs +5/−0
git-annex.cabal +1/−1

CHANGELOG view

@@ -1,3 +1,11 @@+git-annex (7.20200204) upstream; urgency=medium++  * Fix build with persistent-template 2.8.0.+  * Makefile: Really move the fish completion to the+    vendor_completions.d directory.++ -- Joey Hess <id@joeyh.name>  Tue, 04 Feb 2020 14:30:55 -0400+ git-annex (7.20200202.7) upstream; urgency=medium    * add: --force-annex/--force-git options make it easier to override

Database/ContentIdentifier.hs view

@@ -5,11 +5,16 @@  - Licensed under the GNU AGPL version 3 or higher.  -} +{-# LANGUAGE CPP #-} {-# LANGUAGE QuasiQuotes, TypeFamilies, TemplateHaskell #-} {-# LANGUAGE OverloadedStrings, GADTs, FlexibleContexts, EmptyDataDecls #-} {-# LANGUAGE MultiParamTypeClasses, GeneralizedNewtypeDeriving #-} {-# LANGUAGE RankNTypes #-} {-# LANGUAGE UndecidableInstances #-}+#if MIN_VERSION_persistent_template(2,8,0)+{-# LANGUAGE DerivingStrategies #-}+{-# LANGUAGE StandaloneDeriving #-}+#endif  module Database.ContentIdentifier ( 	ContentIdentifierHandle,

Database/Export.hs view

@@ -5,11 +5,16 @@  - Licensed under the GNU AGPL version 3 or higher.  -} +{-# LANGUAGE CPP #-} {-# LANGUAGE QuasiQuotes, TypeFamilies, TemplateHaskell #-} {-# LANGUAGE OverloadedStrings, GADTs, FlexibleContexts #-} {-# LANGUAGE MultiParamTypeClasses, GeneralizedNewtypeDeriving #-} {-# LANGUAGE RankNTypes #-} {-# LANGUAGE UndecidableInstances #-}+#if MIN_VERSION_persistent_template(2,8,0)+{-# LANGUAGE DerivingStrategies #-}+{-# LANGUAGE StandaloneDeriving #-}+#endif  module Database.Export ( 	ExportHandle,

Database/Fsck.hs view

@@ -5,11 +5,16 @@  - Licensed under the GNU AGPL version 3 or higher.  -} +{-# LANGUAGE CPP #-} {-# LANGUAGE QuasiQuotes, TypeFamilies, TemplateHaskell #-} {-# LANGUAGE OverloadedStrings, GADTs, FlexibleContexts #-} {-# LANGUAGE MultiParamTypeClasses, GeneralizedNewtypeDeriving #-} {-# LANGUAGE RankNTypes #-} {-# LANGUAGE UndecidableInstances #-}+#if MIN_VERSION_persistent_template(2,8,0)+{-# LANGUAGE DerivingStrategies #-}+{-# LANGUAGE StandaloneDeriving #-}+#endif  module Database.Fsck ( 	FsckHandle,

Database/Keys/SQL.hs view

@@ -5,11 +5,16 @@  - Licensed under the GNU AGPL version 3 or higher.  -} +{-# LANGUAGE CPP #-} {-# LANGUAGE QuasiQuotes, TypeFamilies, TemplateHaskell #-} {-# LANGUAGE OverloadedStrings, GADTs, FlexibleContexts #-} {-# LANGUAGE MultiParamTypeClasses, GeneralizedNewtypeDeriving #-} {-# LANGUAGE RankNTypes, ScopedTypeVariables #-} {-# LANGUAGE UndecidableInstances #-}+#if MIN_VERSION_persistent_template(2,8,0)+{-# LANGUAGE DerivingStrategies #-}+{-# LANGUAGE StandaloneDeriving #-}+#endif  module Database.Keys.SQL where

git-annex.cabal view

@@ -1,5 +1,5 @@ Name: git-annex-Version: 7.20200202.7+Version: 7.20200204 Cabal-Version: >= 1.8 License: AGPL-3 Maintainer: Joey Hess <id@joeyh.name>