Accepting request 1157276 from devel:languages:haskell

Update Haskell ecosystem to GHC version 9.8.2.

OBS-URL: https://build.opensuse.org/request/show/1157276
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/git-annex?expand=0&rev=37
This commit is contained in:
Dominique Leuenberger 2024-03-20 20:14:33 +00:00 committed by Git OBS Bridge
commit 26da7a1cf4
5 changed files with 152 additions and 22 deletions

View File

@ -1,4 +1,4 @@
From f2b75ec2d27a671d5074136bf3b1bab25e3562fb Mon Sep 17 00:00:00 2001
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
@ -6,25 +6,19 @@ Subject: [PATCH] persistent >= 2.12.0.1 includes the code from
persistent-template has been deprecated.
---
Database/ContentIdentifier.hs | 3 ---
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 +--
5 files changed, 1 insertion(+), 14 deletions(-)
6 files changed, 1 insertion(+), 16 deletions(-)
diff --git a/Database/ContentIdentifier.hs b/Database/ContentIdentifier.hs
index e847c00cce..be7673facc 100644
index bbf67dcfb1..3a399f7765 100644
--- a/Database/ContentIdentifier.hs
+++ b/Database/ContentIdentifier.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, EmptyDataDecls #-}
{-# LANGUAGE MultiParamTypeClasses, GeneralizedNewtypeDeriving #-}
@@ -12,10 +12,8 @@
{-# LANGUAGE RankNTypes #-}
{-# LANGUAGE DataKinds, FlexibleInstances #-}
{-# LANGUAGE UndecidableInstances #-}
@ -36,7 +30,7 @@ index e847c00cce..be7673facc 100644
module Database.ContentIdentifier (
ContentIdentifierHandle,
diff --git a/Database/Export.hs b/Database/Export.hs
index b9d9879da0..e51d852024 100644
index 2f0da8b231..6de86c7925 100644
--- a/Database/Export.hs
+++ b/Database/Export.hs
@@ -5,17 +5,14 @@
@ -80,8 +74,30 @@ 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
@@ -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 7fea5cf2bb..c9c7e020c1 100644
index 2e40e39db3..6b36cd09d5 100644
--- a/Database/Keys/SQL.hs
+++ b/Database/Keys/SQL.hs
@@ -5,17 +5,14 @@
@ -103,10 +119,10 @@ index 7fea5cf2bb..c9c7e020c1 100644
module Database.Keys.SQL where
diff --git a/git-annex.cabal b/git-annex.cabal
index 837680cbd5..893b816068 100644
index 31e66f9f27..7bf1a8ae0c 100644
--- a/git-annex.cabal
+++ b/git-annex.cabal
@@ -358,8 +358,7 @@ Executable git-annex
@@ -247,8 +247,7 @@ Executable git-annex
time (>= 1.5.0),
old-locale,
persistent-sqlite (>= 2.8.1),
@ -117,5 +133,5 @@ index 837680cbd5..893b816068 100644
microlens,
aeson,
--
2.41.0
2.42.0

View File

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

View File

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

View File

@ -1,3 +1,117 @@
-------------------------------------------------------------------
Tue Feb 27 17:02:42 UTC 2024 - Peter Simons <psimons@suse.com>
- Update git-annex to version 10.20240227.
git-annex (10.20240227) upstream; urgency=medium
* importfeed: Added --scrape option, which uses yt-dlp to screen scrape
the equivilant of an RSS feed.
* importfeed --force: Don't treat it as a failure when an already
downloaded file exists. (Fixes a behavior change introduced in
10.20230626.)
* importfeed --force: Avoid creating duplicates of existing
already downloaded files when yt-dlp or a special remote was used.
* addurl, importfeed: Added --raw-except option.
* stack.yaml: Update to lts-22.9 and use crypton.
* assistant, undo: When committing, let the usual git commit
hooks run.
* Added annex.commitmessage-command config.
* pre-commit: Avoid committing the git-annex branch
(except when a commit is made in a view, which changes metadata).
* Pass --no-warnings to yt-dlp.
-- Joey Hess <id@joeyh.name> Tue, 27 Feb 2024 12:58:30 -0400
-------------------------------------------------------------------
Mon Jan 29 18:12:40 UTC 2024 - Peter Simons <psimons@suse.com>
- Update git-annex to version 10.20240129.
git-annex (10.20240129) upstream; urgency=medium
* info: Added "annex sizes of repositories" table to the overall display.
* import: Sped up import from special remotes.
* import: Added --message/-m option.
* Support using commands that implement the Stateless OpenPGP command line
interface, as an alternative to gpg.
Currently only supported for encryption=shared special remotes,
when annex.shared-sop-command is configured.
* test: Test a specified Stateless OpenPGP command when
run with eg --test-git-config annex.shared-sop-command=sqop
* Improve disk free space checking when transferring unsized keys to
local git remotes.
* Added configs annex.stalldetection-download, annex.stalldetection-upload,
annex.bwlimit-download, annex.bwlimit-upload,
and similar per-remote configs.
* Improve annex.stalldetection to handle remotes that update progress
less frequently than the configured time period.
* external: Monitor file size when getting content from external
special remotes and use that to update the progress meter,
in case the external special remote program does not report progress.
* Added --expected-present file matching option.
* webapp: Added --port option, and annex.port config.
* assistant: When generating a gpg secret key, avoid hardcoding the
key algorithm and size.
-- Joey Hess <id@joeyh.name> Mon, 29 Jan 2024 13:12:00 -0400
git-annex (10.20231227) upstream; urgency=medium
* migrate: Support distributed migrations by recording each migration,
and adding a --update option that updates the local repository
incrementally, hard linking annex objects to their new keys.
* pull, sync: When operating on content, automatically handle
distributed migrations.
* Added annex.syncmigrations config that can be set to false to prevent
pull and sync from migrating object content.
* migrate: Added --apply option that (re)applies all recorded
distributed migrations to the objects in repository.
* migrate: Support adding size to URL keys that were added with
--relaxed, by running eg: git-annex migrate --backend=URL foo
* When importing from a special remote, support preferred content
expressions that use terms that match on keys (eg "present", "copies=1").
Such terms are ignored when importing, since the key is not known yet.
Before, such expressions caused the import to fail.
* Support git-annex copy/move --from-anywhere --to remote.
* Make git-annex get/copy/move --from foo override configuration of
remote.foo.annex-ignore, as documented.
* Lower precision of timestamps in git-annex branch, which can reduce the
size of the branch by up to 8%.
* sync: Fix locking problems during merge when annex.pidlock is set.
* Avoid a problem with temp file names ending in "." on certian
filesystems that have problems with such filenames.
* sync, push: Avoid trying to send individual files to special remotes
configured with importtree=yes exporttree=no, which would always fail.
* Fix a crash opening sqlite databases when run in a non-unicode locale.
(Needs persistent-sqlite 2.13.3.)
-- Joey Hess <id@joeyh.name> Wed, 27 Dec 2023 19:27:37 -0400
git-annex (10.20231129) upstream; urgency=medium
* Fix bug in git-annex copy --from --to that skipped files that were
locally present.
* Make git-annex copy --from --to --fast actually fast.
* Fix crash of enableremote when the special remote has embedcreds=yes.
* Ignore directories and other unusual files in .git/annex/journal/
* info: Added calculation of combined annex size of all repositories.
* log: Added options --sizesof, --sizes and --totalsizes that
display how the size of repositories changed over time.
* log: Added options --interval, --bytes, --received, and --gnuplot
to tune the output of the above added options.
* findkeys: Support --largerthan and --smallerthan.
* importfeed: Use caching database to avoid needing to list urls
on every run, and avoid using too much memory.
* Improve memory use of --all when using annex.private.
* lookupkey: Sped up --batch.
* Windows: Consistently avoid ending standard output lines with CR.
This matches the behavior of git on Windows.
* Windows: Fix CRLF handling in some log files.
* Windows: When git-annex init is installing hook scripts, it will
avoid ending lines with CR for portability. Existing hook scripts
that do have CR line endings will not be changed.
-- Joey Hess <id@joeyh.name> Wed, 29 Nov 2023 15:59:20 -0400
-------------------------------------------------------------------
Thu Nov 16 13:31:34 UTC 2023 - Peter Simons <psimons@suse.com>

View File

@ -1,7 +1,7 @@
#
# spec file for package git-annex
#
# Copyright (c) 2023 SUSE LLC
# Copyright (c) 2024 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -17,7 +17,7 @@
Name: git-annex
Version: 10.20230926
Version: 10.20240227
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