pool/git-annex
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

osc copypac from project:devel:languages:haskell:ghc-9.4.x package:git-annex revision:27, using keep-link

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/git-annex?expand=0&rev=76
This commit is contained in:
Peter Simons 2023-08-11 08:05:29 +00:00 committed by Git OBS Bridge
parent 56ffe7e713
commit 36ed4ea8d4
2 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
0001-persistent-2.12.0.1-include-the-code-from-persistent.patch
View File

@ -1,7 +1,7 @@
From 924aab1061129a9ed1b158c5df874bf13c5d44fc Mon Sep 17 00:00:00 2001
From f2b75ec2d27a671d5074136bf3b1bab25e3562fb Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 30 Mar 2023 09:35:58 +0200
Subject: [PATCH] persistent >= 2.12.0.1 include the code from
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.
@ -14,7 +14,7 @@ persistent-template has been deprecated.
5 files changed, 1 insertion(+), 14 deletions(-)
diff --git a/Database/ContentIdentifier.hs b/Database/ContentIdentifier.hs
index aa595a98c..7d868438d 100644
index e847c00cce..be7673facc 100644
--- a/Database/ContentIdentifier.hs
+++ b/Database/ContentIdentifier.hs
@@ -5,17 +5,14 @@
@ -22,7 +22,7 @@ index aa595a98c..7d868438d 100644
-}
-{-# LANGUAGE CPP #-}
{-# LANGUAGE QuasiQuotes, TypeFamilies, TemplateHaskell #-}
{-# LANGUAGE QuasiQuotes, TypeFamilies, TypeOperators, TemplateHaskell #-}
{-# LANGUAGE OverloadedStrings, GADTs, FlexibleContexts, EmptyDataDecls #-}
{-# LANGUAGE MultiParamTypeClasses, GeneralizedNewtypeDeriving #-}
{-# LANGUAGE RankNTypes #-}
@ -36,7 +36,7 @@ index aa595a98c..7d868438d 100644
module Database.ContentIdentifier (
ContentIdentifierHandle,
diff --git a/Database/Export.hs b/Database/Export.hs
index b5c58afd0..346cffbef 100644
index b9d9879da0..e51d852024 100644
--- a/Database/Export.hs
+++ b/Database/Export.hs
@@ -5,17 +5,14 @@
@ -44,7 +44,7 @@ index b5c58afd0..346cffbef 100644
-}
-{-# LANGUAGE CPP #-}
{-# LANGUAGE QuasiQuotes, TypeFamilies, TemplateHaskell #-}
{-# LANGUAGE QuasiQuotes, TypeFamilies, TypeOperators, TemplateHaskell #-}
{-# LANGUAGE OverloadedStrings, GADTs, FlexibleContexts #-}
{-# LANGUAGE MultiParamTypeClasses, GeneralizedNewtypeDeriving #-}
{-# LANGUAGE RankNTypes #-}
@ -58,10 +58,10 @@ index b5c58afd0..346cffbef 100644
module Database.Export (
ExportHandle,
diff --git a/Database/Fsck.hs b/Database/Fsck.hs
index 61e932e3d..0bb7b7b29 100644
index cce5528100..2ff4eb6bb5 100644
--- a/Database/Fsck.hs
+++ b/Database/Fsck.hs
@@ -5,17 +5,14 @@
@@ -5,7 +5,6 @@
- Licensed under the GNU AGPL version 3 or higher.
-}
@ -69,9 +69,10 @@ index 61e932e3d..0bb7b7b29 100644
{-# LANGUAGE QuasiQuotes, TypeFamilies, TemplateHaskell #-}
{-# LANGUAGE OverloadedStrings, GADTs, FlexibleContexts #-}
{-# LANGUAGE MultiParamTypeClasses, GeneralizedNewtypeDeriving #-}
{-# LANGUAGE DataKinds, FlexibleInstances #-}
@@ -13,10 +12,8 @@
{-# LANGUAGE RankNTypes #-}
{-# LANGUAGE UndecidableInstances #-}
{-# LANGUAGE TypeOperators #-}
-#if MIN_VERSION_persistent_template(2,8,0)
{-# LANGUAGE DerivingStrategies #-}
{-# LANGUAGE StandaloneDeriving #-}
@ -80,7 +81,7 @@ index 61e932e3d..0bb7b7b29 100644
module Database.Fsck (
FsckHandle,
diff --git a/Database/Keys/SQL.hs b/Database/Keys/SQL.hs
index c97a4280b..55666c597 100644
index 7fea5cf2bb..c9c7e020c1 100644
--- a/Database/Keys/SQL.hs
+++ b/Database/Keys/SQL.hs
@@ -5,17 +5,14 @@
@ -88,7 +89,7 @@ index c97a4280b..55666c597 100644
-}
-{-# LANGUAGE CPP #-}
{-# LANGUAGE QuasiQuotes, TypeFamilies, TemplateHaskell #-}
{-# LANGUAGE QuasiQuotes, TypeFamilies, TypeOperators, TemplateHaskell #-}
{-# LANGUAGE OverloadedStrings, GADTs, FlexibleContexts #-}
{-# LANGUAGE MultiParamTypeClasses, GeneralizedNewtypeDeriving #-}
{-# LANGUAGE RankNTypes, ScopedTypeVariables #-}
@ -102,10 +103,10 @@ index c97a4280b..55666c597 100644
module Database.Keys.SQL where
diff --git a/git-annex.cabal b/git-annex.cabal
index 65f10351c..f656e7e91 100644
index 837680cbd5..893b816068 100644
--- a/git-annex.cabal
+++ b/git-annex.cabal
@@ -347,8 +347,7 @@ Executable git-annex
@@ -358,8 +358,7 @@ Executable git-annex
time (>= 1.5.0),
old-locale,
persistent-sqlite (>= 2.8.1),
@ -116,5 +117,5 @@ index 65f10351c..f656e7e91 100644
microlens,
aeson,
--
2.39.2
2.41.0

2
git-annex.spec
View File

@ -273,7 +273,7 @@ Optional dependency offering bash completion for git-annex
%install
%ghc_bin_install
make DESTDIR=%{buildroot} BUILDER=./Setup install-mans install-completions install-desktop
make DESTDIR=%{buildroot} BUILDER=./Setup install-bins install-mans install-completions install-desktop
rm %{buildroot}%{_datadir}/fish/vendor_completions.d/git-annex.fish
rm %{buildroot}%{_datadir}/zsh/site-functions/_git-annex