Accepting request 849166 from devel:languages:haskell

automatic update

OBS-URL: https://build.opensuse.org/request/show/849166
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/git-annex?expand=0&rev=9
This commit is contained in:
Dominique Leuenberger 2020-11-19 10:59:04 +00:00 committed by Git OBS Bridge
commit c2f7c3570e
5 changed files with 29 additions and 72 deletions

View File

@ -1,66 +0,0 @@
From 028d4517c7cf9e0f031aa71db15924c09be36cf5 Mon Sep 17 00:00:00 2001
From: Joey Hess <joeyh@joeyh.name>
Date: Sat, 7 Nov 2020 14:09:17 -0400
Subject: [PATCH] enable extensions needed by new version of persistent
Needed in order to use mkPersist in
persistent version 2.11.0.1
persistent-template version 2.9.1.0
---
Database/ContentIdentifier.hs | 1 +
Database/Export.hs | 1 +
Database/Fsck.hs | 1 +
Database/Keys/SQL.hs | 1 +
4 files changed, 4 insertions(+)
diff --git a/Database/ContentIdentifier.hs b/Database/ContentIdentifier.hs
index 0508a386e..da7f9545d 100644
--- a/Database/ContentIdentifier.hs
+++ b/Database/ContentIdentifier.hs
@@ -10,6 +10,7 @@
{-# 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 #-}
diff --git a/Database/Export.hs b/Database/Export.hs
index 1eba4dd40..99a481703 100644
--- a/Database/Export.hs
+++ b/Database/Export.hs
@@ -10,6 +10,7 @@
{-# LANGUAGE OverloadedStrings, GADTs, FlexibleContexts #-}
{-# LANGUAGE MultiParamTypeClasses, GeneralizedNewtypeDeriving #-}
{-# LANGUAGE RankNTypes #-}
+{-# LANGUAGE DataKinds, FlexibleInstances #-}
{-# LANGUAGE UndecidableInstances #-}
#if MIN_VERSION_persistent_template(2,8,0)
{-# LANGUAGE DerivingStrategies #-}
diff --git a/Database/Fsck.hs b/Database/Fsck.hs
index 528f3a007..c1e984197 100644
--- a/Database/Fsck.hs
+++ b/Database/Fsck.hs
@@ -9,6 +9,7 @@
{-# LANGUAGE QuasiQuotes, TypeFamilies, TemplateHaskell #-}
{-# LANGUAGE OverloadedStrings, GADTs, FlexibleContexts #-}
{-# LANGUAGE MultiParamTypeClasses, GeneralizedNewtypeDeriving #-}
+{-# LANGUAGE DataKinds, FlexibleInstances #-}
{-# LANGUAGE RankNTypes #-}
{-# LANGUAGE UndecidableInstances #-}
#if MIN_VERSION_persistent_template(2,8,0)
diff --git a/Database/Keys/SQL.hs b/Database/Keys/SQL.hs
index f96433b36..26108b196 100644
--- a/Database/Keys/SQL.hs
+++ b/Database/Keys/SQL.hs
@@ -10,6 +10,7 @@
{-# 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 #-}
--
2.28.0.297.g1956fa8f8d

View File

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

View File

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

View File

@ -1,3 +1,27 @@
-------------------------------------------------------------------
Tue Nov 17 15:41:20 UTC 2020 - Ondřej Súkup <mimi.vx@gmail.com>
- drop 0001-enable-extensions-needed-by-new-version-of-persistent.patch
-------------------------------------------------------------------
Mon Nov 16 21:55:38 UTC 2020 - psimons@suse.com
- Update git-annex to version 8.20201116.
git-annex (8.20201116) upstream; urgency=medium
* move: Fix a regression in the last release that made move --to not
honor numcopies settings.
* sync --content: Fix a bug where a file that was not preferred content
could be transferred to a remote. This happened when the file got deleted
after the sync started running.
* Warn when adding a annex symlink or pointer file that uses a key that
is not known to the repository, to prevent confusion if the user has
copied it from some other repository.
* examinekey: Added two new format variables: objectpath and objectpointer
* examinekey: Added --migrate-to-backend
-- Joey Hess <id@joeyh.name> Mon, 16 Nov 2020 09:36:35 -0400
-------------------------------------------------------------------
Sat Nov 7 22:15:09 UTC 2020 - Ondřej Súkup <mimi.vx@gmail.com>

View File

@ -17,13 +17,12 @@
Name: git-annex
Version: 8.20201103
Version: 8.20201116
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
URL: https://hackage.haskell.org/package/%{name}
Source0: https://github.com/peti/git-annex/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
Patch0: 0001-enable-extensions-needed-by-new-version-of-persisten.patch
BuildRequires: bash-completion
BuildRequires: chrpath
BuildRequires: curl
@ -169,7 +168,7 @@ Supplements: (%{name} and bash-completion)
Optional dependency offering bash completion for git-annex
%prep
%autosetup -p1
%autosetup
%build
%define cabal_configure_options -ftestsuite