d5e4685435
OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/git-annex?expand=0&rev=85
138 lines
4.3 KiB
Diff
138 lines
4.3 KiB
Diff
From 58b3b46b517358295c7041a92ce135e7c8013eec Mon Sep 17 00:00:00 2001
|
|
From: Peter Simons <simons@cryp.to>
|
|
Date: Thu, 10 Aug 2023 15:39:56 +0200
|
|
Subject: [PATCH] persistent >= 2.12.0.1 includes the code from
|
|
persistent-template
|
|
|
|
persistent-template has been deprecated.
|
|
---
|
|
Database/ContentIdentifier.hs | 2 --
|
|
Database/Export.hs | 3 ---
|
|
Database/Fsck.hs | 3 ---
|
|
Database/ImportFeed.hs | 3 ---
|
|
Database/Keys/SQL.hs | 3 ---
|
|
git-annex.cabal | 3 +--
|
|
6 files changed, 1 insertion(+), 16 deletions(-)
|
|
|
|
diff --git a/Database/ContentIdentifier.hs b/Database/ContentIdentifier.hs
|
|
index bbf67dcfb1..3a399f7765 100644
|
|
--- a/Database/ContentIdentifier.hs
|
|
+++ b/Database/ContentIdentifier.hs
|
|
@@ -12,10 +12,8 @@
|
|
{-# LANGUAGE RankNTypes #-}
|
|
{-# LANGUAGE DataKinds, FlexibleInstances #-}
|
|
{-# LANGUAGE UndecidableInstances #-}
|
|
-#if MIN_VERSION_persistent_template(2,8,0)
|
|
{-# LANGUAGE DerivingStrategies #-}
|
|
{-# LANGUAGE StandaloneDeriving #-}
|
|
-#endif
|
|
|
|
module Database.ContentIdentifier (
|
|
ContentIdentifierHandle,
|
|
diff --git a/Database/Export.hs b/Database/Export.hs
|
|
index 2f0da8b231..6de86c7925 100644
|
|
--- a/Database/Export.hs
|
|
+++ b/Database/Export.hs
|
|
@@ -5,17 +5,14 @@
|
|
- Licensed under the GNU AGPL version 3 or higher.
|
|
-}
|
|
|
|
-{-# LANGUAGE CPP #-}
|
|
{-# LANGUAGE QuasiQuotes, TypeFamilies, TypeOperators, TemplateHaskell #-}
|
|
{-# LANGUAGE OverloadedStrings, GADTs, FlexibleContexts #-}
|
|
{-# LANGUAGE MultiParamTypeClasses, GeneralizedNewtypeDeriving #-}
|
|
{-# LANGUAGE RankNTypes #-}
|
|
{-# LANGUAGE DataKinds, FlexibleInstances #-}
|
|
{-# LANGUAGE UndecidableInstances #-}
|
|
-#if MIN_VERSION_persistent_template(2,8,0)
|
|
{-# LANGUAGE DerivingStrategies #-}
|
|
{-# LANGUAGE StandaloneDeriving #-}
|
|
-#endif
|
|
|
|
module Database.Export (
|
|
ExportHandle,
|
|
diff --git a/Database/Fsck.hs b/Database/Fsck.hs
|
|
index cce5528100..2ff4eb6bb5 100644
|
|
--- a/Database/Fsck.hs
|
|
+++ b/Database/Fsck.hs
|
|
@@ -5,7 +5,6 @@
|
|
- Licensed under the GNU AGPL version 3 or higher.
|
|
-}
|
|
|
|
-{-# LANGUAGE CPP #-}
|
|
{-# LANGUAGE QuasiQuotes, TypeFamilies, TemplateHaskell #-}
|
|
{-# LANGUAGE OverloadedStrings, GADTs, FlexibleContexts #-}
|
|
{-# LANGUAGE MultiParamTypeClasses, GeneralizedNewtypeDeriving #-}
|
|
@@ -13,10 +12,8 @@
|
|
{-# LANGUAGE RankNTypes #-}
|
|
{-# LANGUAGE UndecidableInstances #-}
|
|
{-# LANGUAGE TypeOperators #-}
|
|
-#if MIN_VERSION_persistent_template(2,8,0)
|
|
{-# LANGUAGE DerivingStrategies #-}
|
|
{-# LANGUAGE StandaloneDeriving #-}
|
|
-#endif
|
|
|
|
module Database.Fsck (
|
|
FsckHandle,
|
|
diff --git a/Database/ImportFeed.hs b/Database/ImportFeed.hs
|
|
index 2d44b0b9ea..84cd24bdab 100644
|
|
--- a/Database/ImportFeed.hs
|
|
+++ b/Database/ImportFeed.hs
|
|
@@ -6,17 +6,14 @@
|
|
- Licensed under the GNU AGPL version 3 or higher.
|
|
-}
|
|
|
|
-{-# LANGUAGE CPP #-}
|
|
{-# LANGUAGE QuasiQuotes, TypeFamilies, TypeOperators, TemplateHaskell #-}
|
|
{-# LANGUAGE OverloadedStrings, GADTs, FlexibleContexts, EmptyDataDecls #-}
|
|
{-# LANGUAGE MultiParamTypeClasses, GeneralizedNewtypeDeriving #-}
|
|
{-# LANGUAGE RankNTypes #-}
|
|
{-# LANGUAGE DataKinds, FlexibleInstances #-}
|
|
{-# LANGUAGE UndecidableInstances #-}
|
|
-#if MIN_VERSION_persistent_template(2,8,0)
|
|
{-# LANGUAGE DerivingStrategies #-}
|
|
{-# LANGUAGE StandaloneDeriving #-}
|
|
-#endif
|
|
|
|
module Database.ImportFeed (
|
|
ImportFeedDbHandle,
|
|
diff --git a/Database/Keys/SQL.hs b/Database/Keys/SQL.hs
|
|
index 2e40e39db3..6b36cd09d5 100644
|
|
--- a/Database/Keys/SQL.hs
|
|
+++ b/Database/Keys/SQL.hs
|
|
@@ -5,17 +5,14 @@
|
|
- Licensed under the GNU AGPL version 3 or higher.
|
|
-}
|
|
|
|
-{-# LANGUAGE CPP #-}
|
|
{-# LANGUAGE QuasiQuotes, TypeFamilies, TypeOperators, TemplateHaskell #-}
|
|
{-# LANGUAGE OverloadedStrings, GADTs, FlexibleContexts #-}
|
|
{-# LANGUAGE MultiParamTypeClasses, GeneralizedNewtypeDeriving #-}
|
|
{-# LANGUAGE RankNTypes, ScopedTypeVariables #-}
|
|
{-# LANGUAGE DataKinds, FlexibleInstances #-}
|
|
{-# LANGUAGE UndecidableInstances #-}
|
|
-#if MIN_VERSION_persistent_template(2,8,0)
|
|
{-# LANGUAGE DerivingStrategies #-}
|
|
{-# LANGUAGE StandaloneDeriving #-}
|
|
-#endif
|
|
|
|
module Database.Keys.SQL where
|
|
|
|
diff --git a/git-annex.cabal b/git-annex.cabal
|
|
index 31e66f9f27..7bf1a8ae0c 100644
|
|
--- a/git-annex.cabal
|
|
+++ b/git-annex.cabal
|
|
@@ -247,8 +247,7 @@ Executable git-annex
|
|
time (>= 1.5.0),
|
|
old-locale,
|
|
persistent-sqlite (>= 2.8.1),
|
|
- persistent (>= 2.8.1),
|
|
- persistent-template,
|
|
+ persistent (>= 2.12.0.2),
|
|
unliftio-core,
|
|
microlens,
|
|
aeson,
|
|
--
|
|
2.42.0
|
|
|