Hello community,
here is the log from the commit of package ghc-hackage-security for
openSUSE:Factory checked in at 2020-01-03 17:35:19
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ghc-hackage-security (Old)
and /work/SRC/openSUSE:Factory/.ghc-hackage-security.new.6675 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ghc-hackage-security"
Fri Jan 3 17:35:19 2020 rev:14 rq:760284 version:0.5.3.0
Changes:
--------
---
/work/SRC/openSUSE:Factory/ghc-hackage-security/ghc-hackage-security.changes
2019-12-27 13:53:44.836669285 +0100
+++
/work/SRC/openSUSE:Factory/.ghc-hackage-security.new.6675/ghc-hackage-security.changes
2020-01-03 17:35:32.223251087 +0100
@@ -0,0 +1,6 @@
+------------------------------------------------------------------
+Wed Jan 1 11:06:30 UTC 2020 - psim...@suse.com
+
+- Apply "fix-ghc-8.8.x-build.patch" from head.hackage to fix the
+ build with ghc-8.8.1.
+
New:
----
fix-ghc-8.8.x-build.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ghc-hackage-security.spec ++++++
--- /var/tmp/diff_new_pack.INjKM0/_old 2020-01-03 17:35:33.715251853 +0100
+++ /var/tmp/diff_new_pack.INjKM0/_new 2020-01-03 17:35:33.719251856 +0100
@@ -1,7 +1,7 @@
#
# spec file for package ghc-hackage-security
#
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -26,6 +26,7 @@
URL: https://hackage.haskell.org/package/%{pkg_name}
Source0:
https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz
Source1:
https://hackage.haskell.org/package/%{pkg_name}-%{version}/revision/6.cabal#/%{pkg_name}.cabal
+Patch01:
https://raw.githubusercontent.com/hvr/head.hackage/master/patches/hackage-security-0.5.3.0.patch#/fix-ghc-8.8.x-build.patch
BuildRequires: ghc-Cabal-devel
BuildRequires: ghc-base16-bytestring-devel
BuildRequires: ghc-base64-bytestring-devel
@@ -85,6 +86,8 @@
%prep
%setup -q -n %{pkg_name}-%{version}
cp -p %{SOURCE1} %{pkg_name}.cabal
+%patch01 -p1
+cabal-tweak-dep-ver base '< 4.13' '< 5'
%build
%ghc_lib_build
++++++ fix-ghc-8.8.x-build.patch ++++++
diff -ru hackage-security-0.5.3.0.orig/src/Hackage/Security/TUF/FileMap.hs
hackage-security-0.5.3.0/src/Hackage/Security/TUF/FileMap.hs
--- hackage-security-0.5.3.0.orig/src/Hackage/Security/TUF/FileMap.hs
2018-03-25 19:39:07.000000000 -0400
+++ hackage-security-0.5.3.0/src/Hackage/Security/TUF/FileMap.hs
2019-03-16 08:29:08.347456951 -0400
@@ -78,7 +78,7 @@
lookupM :: Monad m => FileMap -> TargetPath -> m FileInfo
lookupM m fp =
case lookup fp m of
- Nothing -> fail $ "No entry for " ++ pretty fp ++ " in filemap"
+ Nothing -> error $ "No entry for " ++ pretty fp ++ " in filemap"
Just nfo -> return nfo
{-------------------------------------------------------------------------------
