Accepting request 1218581 from devel:languages:haskell

version update

OBS-URL: https://build.opensuse.org/request/show/1218581
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/git-annex?expand=0&rev=42

0001-persistent-2.12.0.1-include-the-code-from-persistent.patch

@@ -14,10 +14,10 @@ persistent-template has been deprecated.
  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
+Index: git-annex-10.20240927/Database/ContentIdentifier.hs
+===================================================================
+--- git-annex-10.20240927.orig/Database/ContentIdentifier.hs	2024-09-30 23:15:57.000000000 +0000
++++ git-annex-10.20240927/Database/ContentIdentifier.hs	2024-10-26 13:36:42.452641193 +0000
 @@ -12,10 +12,8 @@
  {-# LANGUAGE RankNTypes #-}
  {-# LANGUAGE DataKinds, FlexibleInstances #-}
@@ -29,10 +29,10 @@ index bbf67dcfb1..3a399f7765 100644
  
  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
+Index: git-annex-10.20240927/Database/Export.hs
+===================================================================
+--- git-annex-10.20240927.orig/Database/Export.hs	2024-09-30 23:15:57.000000000 +0000
++++ git-annex-10.20240927/Database/Export.hs	2024-10-26 13:36:42.452641193 +0000
 @@ -5,17 +5,14 @@
   - Licensed under the GNU AGPL version 3 or higher.
   -}
@@ -51,10 +51,10 @@ index 2f0da8b231..6de86c7925 100644
  
  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
+Index: git-annex-10.20240927/Database/Fsck.hs
+===================================================================
+--- git-annex-10.20240927.orig/Database/Fsck.hs	2024-09-30 23:15:57.000000000 +0000
++++ git-annex-10.20240927/Database/Fsck.hs	2024-10-26 13:36:42.452641193 +0000
 @@ -5,7 +5,6 @@
   - Licensed under the GNU AGPL version 3 or higher.
   -}
@@ -74,10 +74,10 @@ index cce5528100..2ff4eb6bb5 100644
  
  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
+Index: git-annex-10.20240927/Database/ImportFeed.hs
+===================================================================
+--- git-annex-10.20240927.orig/Database/ImportFeed.hs	2024-09-30 23:15:57.000000000 +0000
++++ git-annex-10.20240927/Database/ImportFeed.hs	2024-10-26 13:36:42.452641193 +0000
 @@ -6,17 +6,14 @@
   - Licensed under the GNU AGPL version 3 or higher.
   -}
@@ -96,10 +96,10 @@ index 2d44b0b9ea..84cd24bdab 100644
  
  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
+Index: git-annex-10.20240927/Database/Keys/SQL.hs
+===================================================================
+--- git-annex-10.20240927.orig/Database/Keys/SQL.hs	2024-09-30 23:15:57.000000000 +0000
++++ git-annex-10.20240927/Database/Keys/SQL.hs	2024-10-26 13:36:42.453641181 +0000
 @@ -5,17 +5,14 @@
   - Licensed under the GNU AGPL version 3 or higher.
   -}
@@ -118,11 +118,11 @@ index 2e40e39db3..6b36cd09d5 100644
  
  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
+Index: git-annex-10.20240927/git-annex.cabal
+===================================================================
+--- git-annex-10.20240927.orig/git-annex.cabal	2024-09-30 23:15:57.000000000 +0000
++++ git-annex-10.20240927/git-annex.cabal	2024-10-26 13:36:42.453641181 +0000
+@@ -249,8 +249,7 @@ Executable git-annex
     time (>= 1.5.0),
     old-locale,
     persistent-sqlite (>= 2.8.1),
@@ -132,6 +132,26 @@ index 31e66f9f27..7bf1a8ae0c 100644
     unliftio-core,
     microlens,
     aeson,
--- 
-2.42.0
-
+Index: git-annex-10.20240927/Database/RepoSize.hs
+===================================================================
+--- git-annex-10.20240927.orig/Database/RepoSize.hs	2024-09-30 23:15:57.000000000 +0000
++++ git-annex-10.20240927/Database/RepoSize.hs	2024-10-26 13:37:26.311088729 +0000
+@@ -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.RepoSize (
+ 	RepoSizeHandle,

git-annex-10.20240531.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:de1cdfe5c984d644a7db04c2bd17b750f5411f542c5fe24eaac84fc4c59cf233
-size 9293897

git-annex-10.20240927.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:71f5615411c9695953b9b1129e84dffee1e81e32ea6b8a8d9d383bd08c67a22f
+size 9491594

git-annex.changes

@@ -1,3 +1,132 @@
+-------------------------------------------------------------------
+Mon Sep 30 23:17:41 UTC 2024 - Peter Simons <psimons@suse.com>
+
+- Update git-annex to version 10.20240927.
+  git-annex (10.20240927) upstream; urgency=medium
+
+    * Detect when a preferred content expression contains "not present",
+      which would lead to repeatedly getting and then dropping files,
+      and make it never match. This also applies to
+      "not balanced" and "not sizebalanced".
+    * Fix --explain display of onlyingroup preferred content expression.
+    * Allow maxsize to be set to 0 to stop checking maxsize for a repository.
+    * Fix bug that prevented anything being stored in an empty
+      repository whose preferred content expression uses sizebalanced.
+    * sim: New command, can be used to simulate networks of repositories
+      and see how preferred content and other configuration makes file
+      content flow through it.
+
+   -- Joey Hess <id@joeyh.name>  Mon, 30 Sep 2024 19:15:35 -0400
+
+-------------------------------------------------------------------
+Sat Aug 31 23:51:02 UTC 2024 - Peter Simons <psimons@suse.com>
+
+- Update git-annex to version 10.20240831.
+  git-annex (10.20240831) upstream; urgency=medium
+
+    * Special remotes configured with exporttree=yes annexobjects=yes
+      can store objects in .git/annex/objects, as well as an exported tree.
+    * Support proxying to special remotes configured with
+      exporttree=yes annexobjects=yes, and allow such remotes to be used as
+      cluster nodes.
+    * post-retrieve: When proxying is enabled for an exporttree=yes
+      special remote (or it is a cluster node) and the configured
+      remote.name.annex-tracking-branch is received, the tree is
+      exported to the special remote.
+    * Support "balanced=", "fullybalanced=", "sizebalanced=" and
+      "fullysizebalanced=" in preferred content expressions.
+    * Added --rebalance option.
+    * Added the annex.fullybalancedthreshhold git config.
+    * maxsize: New command to tell git-annex how large the expected maximum
+      size of a repository is, and to display repository sizes.
+    * vicfg: Include maxsize configuration.
+    * info: Improved speed by using new repository size tracking.
+    * lookupkey: Allow using --ref in a bare repository.
+    * export: Added --from option.
+    * git-remote-annex: Store objects in exportree=yes special remotes
+      in the same paths used by annexobjects=yes. This is a backwards
+      compatible change.
+    * updateproxy, updatecluster: Prevent using an exporttree=yes special
+      remote that does not have annexobjects=yes, since it will not work.
+    * The config versioning=true is now reserved for use by versioned special
+      remotes. External special remotes should not use that config for their
+      own purposes.
+
+   -- Joey Hess <id@joeyh.name>  Sat, 31 Aug 2024 19:48:17 -0400
+
+-------------------------------------------------------------------
+Thu Aug  8 19:27:29 UTC 2024 - Peter Simons <psimons@suse.com>
+
+- Update git-annex to version 10.20240808.
+  git-annex (10.20240808) upstream; urgency=medium
+
+    * Remove debug output (to stderr) accidentially included in
+      last version.
+    * When getting from a P2P HTTP remote, prompt for credentials when
+      required, instead of failing.
+    * When proxying an upload to a special remote, verify the hash.
+    * Avoid loading cluster log at startup.
+
+   -- Joey Hess <id@joeyh.name>  Thu, 08 Aug 2024 15:26:26 -0400
+
+-------------------------------------------------------------------
+Wed Jul 31 18:05:34 UTC 2024 - Peter Simons <psimons@suse.com>
+
+- Update git-annex to version 10.20240731.
+  git-annex (10.20240731) upstream; urgency=medium
+
+    * New HTTP API that is equivilant to the P2P protocol.
+    * New p2phttp command to serve the HTTP API.
+    * annex+http and annex+https urls can be configured for
+      remote.name.annexUrl to use the HTTP API to communicate with a server.
+      This supports writable repositories, as well as accessing clusters
+      and proxied remotes over HTTP.
+    * When a http remote has annex.url set to an annex+http url in
+      the git config file on the website, it will be copied into
+      remote.name.annexUrl the first time git-annex uses the remote.
+    * assistant: Fix a race condition that could cause a pointer file to
+      get ingested into the annex.
+    * Avoid potential data loss in unlikely situations where git-annex-shell
+      or git-annex remotedaemon is killed while locking a key to prevent its
+      removal.
+    * When proxying a download from a special remote, avoid unncessary hashing.
+    * When proxying an upload to a special remote, verify the hash.
+    * Propagate --force to git-annex transferrer.
+    * Added a build flag for servant, enabling annex+http urls and
+      git-annex p2phttp.
+    * Added a dependency on the haskell clock library.
+    * Updated stack.yaml to nightly-2024-07-29.
+
+   -- Joey Hess <id@joeyh.name>  Wed, 31 Jul 2024 14:02:21 -0400
+
+-------------------------------------------------------------------
+Tue Jul  2 16:31:40 UTC 2024 - Peter Simons <psimons@suse.com>
+
+- Update git-annex to version 10.20240701.
+  git-annex (10.20240701) upstream; urgency=medium
+
+    * git-annex remotes can now act as proxies that provide access to
+      their remotes. Configure this with remote.name.annex-proxy
+      and the git-annex update proxy command.
+    * Clusters are now supported. These are collections of nodes that can
+      be accessed as a single entity, accessed by one or more gateway
+      repositories.
+    * Added git-annex initcluster, updatecluster, and extendcluster commands.
+    * Fix a bug where interrupting git-annex while it is updating the
+      git-annex branch for an export could later lead to git fsck
+      complaining about missing tree objects.
+    * Tab completion of options like --from now includes special remotes,
+      as well as proxied remotes and clusters.
+    * Tab completion of many commands like info and trust now includes
+      remotes.
+    * P2P protocol version 2.
+    * Fix Windows build with Win32 2.13.4+
+      Thanks, Oleg Tolmatcev
+    * When --debugfilter or annex.debugfilter is set, avoid propigating
+      debug output from git-annex-shell, since it cannot be filtered.
+
+   -- Joey Hess <id@joeyh.name>  Mon, 01 Jul 2024 15:11:48 -0400
+
 -------------------------------------------------------------------
 Fri May 31 16:33:01 UTC 2024 - Peter Simons <psimons@suse.com>
 

git-annex.spec

@@ -17,7 +17,7 @@
 
 
 Name:           git-annex
-Version:        10.20240531
+Version:        10.20240927
 Release:        0
 Summary:        Manage files with git, without checking their contents into git
 License:        AGPL-3.0-or-later AND GPL-3.0-or-later AND BSD-2-Clause AND MIT AND GPL-2.0-only
@@ -61,14 +61,14 @@ BuildRequires:  ghc-case-insensitive-devel
 BuildRequires:  ghc-case-insensitive-prof
 BuildRequires:  ghc-clientsession-devel
 BuildRequires:  ghc-clientsession-prof
+BuildRequires:  ghc-clock-devel
+BuildRequires:  ghc-clock-prof
 BuildRequires:  ghc-concurrent-output-devel
 BuildRequires:  ghc-concurrent-output-prof
 BuildRequires:  ghc-conduit-devel
 BuildRequires:  ghc-conduit-prof
 BuildRequires:  ghc-containers-devel
 BuildRequires:  ghc-containers-prof
-BuildRequires:  ghc-criterion-devel
-BuildRequires:  ghc-criterion-prof
 BuildRequires:  ghc-crypto-api-devel
 BuildRequires:  ghc-crypto-api-prof
 BuildRequires:  ghc-crypton-devel
@@ -160,6 +160,14 @@ BuildRequires:  ghc-sandi-devel
 BuildRequires:  ghc-sandi-prof
 BuildRequires:  ghc-securemem-devel
 BuildRequires:  ghc-securemem-prof
+BuildRequires:  ghc-servant-client-core-devel
+BuildRequires:  ghc-servant-client-core-prof
+BuildRequires:  ghc-servant-client-devel
+BuildRequires:  ghc-servant-client-prof
+BuildRequires:  ghc-servant-devel
+BuildRequires:  ghc-servant-prof
+BuildRequires:  ghc-servant-server-devel
+BuildRequires:  ghc-servant-server-prof
 BuildRequires:  ghc-shakespeare-devel
 BuildRequires:  ghc-shakespeare-prof
 BuildRequires:  ghc-socks-devel
@@ -269,7 +277,7 @@ Optional dependency offering bash completion for git-annex
 %autosetup -p1
 
 %build
-%define cabal_configure_options -ftestsuite
+%define cabal_configure_options -f+assistant -f+crypton -f+dbus -f+magicmime -f+pairing -f+production -f+servant -f+torrentparser -f-benchmark
 %ghc_bin_build
 
 %check