Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package ghc-hackage-security for
openSUSE:Factory checked in at 2022-10-13 15:42:04
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ghc-hackage-security (Old)
and /work/SRC/openSUSE:Factory/.ghc-hackage-security.new.2275 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ghc-hackage-security"
Thu Oct 13 15:42:04 2022 rev:27 rq:1008468 version:0.6.1.0
Changes:
--------
---
/work/SRC/openSUSE:Factory/ghc-hackage-security/ghc-hackage-security.changes
2022-08-01 21:29:57.097579464 +0200
+++
/work/SRC/openSUSE:Factory/.ghc-hackage-security.new.2275/ghc-hackage-security.changes
2022-10-13 15:42:10.106740647 +0200
@@ -2,29 +2 @@
-Wed May 25 10:55:41 UTC 2022 - Peter Simons <[email protected]>
-
-- Update hackage-security to version 0.6.2.1 revision 2.
- Upstream has revised the Cabal build instructions on Hackage.
-
--------------------------------------------------------------------
-Fri Feb 18 15:40:15 UTC 2022 - Peter Simons <[email protected]>
-
-- Update hackage-security to version 0.6.2.1 revision 1.
- Upstream has revised the Cabal build instructions on Hackage.
-
--------------------------------------------------------------------
-Thu Feb 17 20:27:39 UTC 2022 - Peter Simons <[email protected]>
-
-- Update hackage-security to version 0.6.2.1.
- 0.6.2.1
- -------
-
- * Allow GHC-9.0 (base-4.15) (#265)
- * Fix running `cabal repl hackage-security` (#263)
-
--------------------------------------------------------------------
-Sat Jan 22 17:15:12 UTC 2022 - Peter Simons <[email protected]>
-
-- Update hackage-security to version 0.6.2.0.
- 0.6.2.0
- -------
-
- * Safely prepare for when cabal factors out Cabal-syntax
+Mon Jan 17 11:19:09 UTC 2022 - Peter Simons <[email protected]>
@@ -31,0 +4 @@
+- Update hackage-security to version 0.6.1.0.
Old:
----
hackage-security-0.6.2.1.tar.gz
hackage-security.cabal
New:
----
hackage-security-0.6.1.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ghc-hackage-security.spec ++++++
--- /var/tmp/diff_new_pack.g6I17A/_old 2022-10-13 15:42:11.034742458 +0200
+++ /var/tmp/diff_new_pack.g6I17A/_new 2022-10-13 15:42:11.046742482 +0200
@@ -19,15 +19,13 @@
%global pkg_name hackage-security
%bcond_with tests
Name: ghc-%{pkg_name}
-Version: 0.6.2.1
+Version: 0.6.1.0
Release: 0
Summary: Hackage security library
License: BSD-3-Clause
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/2.cabal#/%{pkg_name}.cabal
BuildRequires: ghc-Cabal-devel
-BuildRequires: ghc-Cabal-syntax-devel
BuildRequires: ghc-base16-bytestring-devel
BuildRequires: ghc-base64-bytestring-devel
BuildRequires: ghc-bytestring-devel
@@ -91,7 +89,6 @@
%prep
%autosetup -n %{pkg_name}-%{version}
-cp -p %{SOURCE1} %{pkg_name}.cabal
%build
%ghc_lib_build
++++++ hackage-security-0.6.2.1.tar.gz -> hackage-security-0.6.1.0.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/hackage-security-0.6.2.1/ChangeLog.md
new/hackage-security-0.6.1.0/ChangeLog.md
--- old/hackage-security-0.6.2.1/ChangeLog.md 2001-09-09 03:46:40.000000000
+0200
+++ new/hackage-security-0.6.1.0/ChangeLog.md 2001-09-09 03:46:40.000000000
+0200
@@ -1,16 +1,5 @@
See also http://pvp.haskell.org/faq
-0.6.2.1
--------
-
-* Allow GHC-9.0 (base-4.15) (#265)
-* Fix running `cabal repl hackage-security` (#263)
-
-0.6.2.0
--------
-
-* Safely prepare for when cabal factors out Cabal-syntax
-
0.6.1.0
-------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/hackage-security-0.6.2.1/hackage-security.cabal
new/hackage-security-0.6.1.0/hackage-security.cabal
--- old/hackage-security-0.6.2.1/hackage-security.cabal 2001-09-09
03:46:40.000000000 +0200
+++ new/hackage-security-0.6.1.0/hackage-security.cabal 2001-09-09
03:46:40.000000000 +0200
@@ -1,6 +1,6 @@
cabal-version: 1.12
name: hackage-security
-version: 0.6.2.1
+version: 0.6.1.0
synopsis: Hackage security library
description: The hackage security library provides both server and
@@ -48,11 +48,6 @@
description: Are we using @network-uri@?
manual: False
-flag Cabal-syntax
- description: Are we using Cabal-syntax?
- manual: False
- default: False
-
flag old-directory
description: Use @directory@ < 1.2 and @old-time@
manual: False
@@ -113,12 +108,15 @@
Hackage.Security.Util.Lens
Hackage.Security.Util.Stack
Hackage.Security.Util.TypedEmbedded
- MyPrelude
+ Prelude
-- We support ghc 7.4 (bundled with Cabal 1.14) and up
- build-depends: base >= 4.5 && < 4.16,
+ build-depends: base >= 4.5 && < 4.17,
base16-bytestring >= 0.1.1 && < 1.1,
base64-bytestring >= 1.0 && < 1.3,
bytestring >= 0.9 && < 0.12,
+ Cabal >= 1.14 && < 1.26
+ || >= 2.0 && < 2.6
+ || >= 3.0 && < 3.8,
containers >= 0.4 && < 0.7,
ed25519 >= 0.0 && < 0.1,
filepath >= 1.2 && < 1.5,
@@ -151,14 +149,6 @@
else
build-depends: base >= 4.10
- if flag(Cabal-syntax)
- build-depends: Cabal-syntax >= 3.7 && < 3.9
- else
- build-depends: Cabal >= 1.14 && < 1.26
- || >= 2.0 && < 2.6
- || >= 3.0 && < 3.7,
- Cabal-syntax < 3.7
-
hs-source-dirs: src
default-language: Haskell2010
default-extensions: DefaultSignatures
@@ -171,7 +161,6 @@
KindSignatures
MultiParamTypeClasses
NamedFieldPuns
- NoImplicitPrelude
NoMonomorphismRestriction
RankNTypes
RecordWildCards
@@ -269,9 +258,6 @@
time,
zlib
- if flag(Cabal-syntax)
- build-depends: Cabal-syntax
-
-- dependencies exclusive to test-suite
build-depends: tasty >= 1.2 && < 1.5,
tasty-hunit == 0.10.*,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/hackage-security-0.6.2.1/src/Hackage/Security/Client/Formats.hs
new/hackage-security-0.6.1.0/src/Hackage/Security/Client/Formats.hs
--- old/hackage-security-0.6.2.1/src/Hackage/Security/Client/Formats.hs
2001-09-09 03:46:40.000000000 +0200
+++ new/hackage-security-0.6.1.0/src/Hackage/Security/Client/Formats.hs
2001-09-09 03:46:40.000000000 +0200
@@ -17,7 +17,6 @@
, formatsLookup
) where
-import MyPrelude
import Hackage.Security.Util.Stack
import Hackage.Security.Util.TypedEmbedded
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/hackage-security-0.6.2.1/src/Hackage/Security/Client/Repository/Cache.hs
new/hackage-security-0.6.1.0/src/Hackage/Security/Client/Repository/Cache.hs
---
old/hackage-security-0.6.2.1/src/Hackage/Security/Client/Repository/Cache.hs
2001-09-09 03:46:40.000000000 +0200
+++
new/hackage-security-0.6.1.0/src/Hackage/Security/Client/Repository/Cache.hs
2001-09-09 03:46:40.000000000 +0200
@@ -15,7 +15,6 @@
, lockCacheWithLogger
) where
-import MyPrelude
import Control.Exception
import Control.Monad
import Control.Monad.IO.Class
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/hackage-security-0.6.2.1/src/Hackage/Security/Client/Repository/HttpLib.hs
new/hackage-security-0.6.1.0/src/Hackage/Security/Client/Repository/HttpLib.hs
---
old/hackage-security-0.6.2.1/src/Hackage/Security/Client/Repository/HttpLib.hs
2001-09-09 03:46:40.000000000 +0200
+++
new/hackage-security-0.6.1.0/src/Hackage/Security/Client/Repository/HttpLib.hs
2001-09-09 03:46:40.000000000 +0200
@@ -11,7 +11,6 @@
, bodyReaderFromBS
) where
-import MyPrelude
import Data.IORef
import Network.URI hiding (uriPath, path)
import qualified Data.ByteString as BS
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/hackage-security-0.6.2.1/src/Hackage/Security/Client/Repository/Local.hs
new/hackage-security-0.6.1.0/src/Hackage/Security/Client/Repository/Local.hs
---
old/hackage-security-0.6.2.1/src/Hackage/Security/Client/Repository/Local.hs
2001-09-09 03:46:40.000000000 +0200
+++
new/hackage-security-0.6.1.0/src/Hackage/Security/Client/Repository/Local.hs
2001-09-09 03:46:40.000000000 +0200
@@ -5,7 +5,6 @@
, withRepository
) where
-import MyPrelude
import Hackage.Security.Client.Formats
import Hackage.Security.Client.Repository
import Hackage.Security.Client.Repository.Cache
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/hackage-security-0.6.2.1/src/Hackage/Security/Client/Repository/Remote.hs
new/hackage-security-0.6.1.0/src/Hackage/Security/Client/Repository/Remote.hs
---
old/hackage-security-0.6.2.1/src/Hackage/Security/Client/Repository/Remote.hs
2001-09-09 03:46:40.000000000 +0200
+++
new/hackage-security-0.6.1.0/src/Hackage/Security/Client/Repository/Remote.hs
2001-09-09 03:46:40.000000000 +0200
@@ -27,7 +27,6 @@
, fileSizeWithinBounds
) where
-import MyPrelude
import Control.Concurrent
import Control.Exception
import Control.Monad.Cont
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/hackage-security-0.6.2.1/src/Hackage/Security/Client/Repository.hs
new/hackage-security-0.6.1.0/src/Hackage/Security/Client/Repository.hs
--- old/hackage-security-0.6.2.1/src/Hackage/Security/Client/Repository.hs
2001-09-09 03:46:40.000000000 +0200
+++ new/hackage-security-0.6.1.0/src/Hackage/Security/Client/Repository.hs
2001-09-09 03:46:40.000000000 +0200
@@ -30,7 +30,6 @@
, mustCache
) where
-import MyPrelude
import Control.Exception
import Data.Typeable (Typeable)
import qualified Codec.Archive.Tar.Index as Tar
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/hackage-security-0.6.2.1/src/Hackage/Security/Client/Verify.hs
new/hackage-security-0.6.1.0/src/Hackage/Security/Client/Verify.hs
--- old/hackage-security-0.6.2.1/src/Hackage/Security/Client/Verify.hs
2001-09-09 03:46:40.000000000 +0200
+++ new/hackage-security-0.6.1.0/src/Hackage/Security/Client/Verify.hs
2001-09-09 03:46:40.000000000 +0200
@@ -10,7 +10,6 @@
, liftIO
) where
-import MyPrelude
import Control.Exception
import Control.Monad.Reader
import Data.IORef
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/hackage-security-0.6.2.1/src/Hackage/Security/Client.hs
new/hackage-security-0.6.1.0/src/Hackage/Security/Client.hs
--- old/hackage-security-0.6.2.1/src/Hackage/Security/Client.hs 2001-09-09
03:46:40.000000000 +0200
+++ new/hackage-security-0.6.1.0/src/Hackage/Security/Client.hs 2001-09-09
03:46:40.000000000 +0200
@@ -41,7 +41,7 @@
, LocalFileCorrupted(..)
) where
-import MyPrelude hiding (log)
+import Prelude hiding (log)
import Control.Arrow (first)
import Control.Exception
import Control.Monad
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/hackage-security-0.6.2.1/src/Hackage/Security/JSON.hs
new/hackage-security-0.6.1.0/src/Hackage/Security/JSON.hs
--- old/hackage-security-0.6.2.1/src/Hackage/Security/JSON.hs 2001-09-09
03:46:40.000000000 +0200
+++ new/hackage-security-0.6.1.0/src/Hackage/Security/JSON.hs 2001-09-09
03:46:40.000000000 +0200
@@ -38,7 +38,6 @@
, module Hackage.Security.Util.JSON
) where
-import MyPrelude
import Control.Arrow (first, second)
import Control.Exception
import Control.Monad.Except
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/hackage-security-0.6.2.1/src/Hackage/Security/Key/Env.hs
new/hackage-security-0.6.1.0/src/Hackage/Security/Key/Env.hs
--- old/hackage-security-0.6.2.1/src/Hackage/Security/Key/Env.hs
2001-09-09 03:46:40.000000000 +0200
+++ new/hackage-security-0.6.1.0/src/Hackage/Security/Key/Env.hs
2001-09-09 03:46:40.000000000 +0200
@@ -12,7 +12,7 @@
, union
) where
-import MyPrelude hiding (lookup, null)
+import Prelude hiding (lookup, null)
import Control.Monad
import Data.Map (Map)
import qualified Data.Map as Map
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/hackage-security-0.6.2.1/src/Hackage/Security/Key.hs
new/hackage-security-0.6.1.0/src/Hackage/Security/Key.hs
--- old/hackage-security-0.6.2.1/src/Hackage/Security/Key.hs 2001-09-09
03:46:40.000000000 +0200
+++ new/hackage-security-0.6.1.0/src/Hackage/Security/Key.hs 2001-09-09
03:46:40.000000000 +0200
@@ -25,7 +25,6 @@
, verify
) where
-import MyPrelude
import Control.Monad
import Data.Functor.Identity
import Data.Typeable (Typeable)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/hackage-security-0.6.2.1/src/Hackage/Security/TUF/Common.hs
new/hackage-security-0.6.1.0/src/Hackage/Security/TUF/Common.hs
--- old/hackage-security-0.6.2.1/src/Hackage/Security/TUF/Common.hs
2001-09-09 03:46:40.000000000 +0200
+++ new/hackage-security-0.6.1.0/src/Hackage/Security/TUF/Common.hs
2001-09-09 03:46:40.000000000 +0200
@@ -6,7 +6,6 @@
, KeyThreshold(..)
) where
-import MyPrelude
import Hackage.Security.JSON
{-------------------------------------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/hackage-security-0.6.2.1/src/Hackage/Security/TUF/FileInfo.hs
new/hackage-security-0.6.1.0/src/Hackage/Security/TUF/FileInfo.hs
--- old/hackage-security-0.6.2.1/src/Hackage/Security/TUF/FileInfo.hs
2001-09-09 03:46:40.000000000 +0200
+++ new/hackage-security-0.6.1.0/src/Hackage/Security/TUF/FileInfo.hs
2001-09-09 03:46:40.000000000 +0200
@@ -13,7 +13,7 @@
, Int54
) where
-import MyPrelude hiding (lookup)
+import Prelude hiding (lookup)
import Data.Map (Map)
import qualified Crypto.Hash.SHA256 as SHA256
import qualified Data.Map as Map
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/hackage-security-0.6.2.1/src/Hackage/Security/TUF/FileMap.hs
new/hackage-security-0.6.1.0/src/Hackage/Security/TUF/FileMap.hs
--- old/hackage-security-0.6.2.1/src/Hackage/Security/TUF/FileMap.hs
2001-09-09 03:46:40.000000000 +0200
+++ new/hackage-security-0.6.1.0/src/Hackage/Security/TUF/FileMap.hs
2001-09-09 03:46:40.000000000 +0200
@@ -18,7 +18,7 @@
, fileMapChanges
) where
-import MyPrelude hiding (lookup)
+import Prelude hiding (lookup)
import Control.Arrow (second)
import Data.Map (Map)
import qualified Data.Map as Map
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/hackage-security-0.6.2.1/src/Hackage/Security/TUF/Header.hs
new/hackage-security-0.6.1.0/src/Hackage/Security/TUF/Header.hs
--- old/hackage-security-0.6.2.1/src/Hackage/Security/TUF/Header.hs
2001-09-09 03:46:40.000000000 +0200
+++ new/hackage-security-0.6.1.0/src/Hackage/Security/TUF/Header.hs
2001-09-09 03:46:40.000000000 +0200
@@ -12,7 +12,6 @@
, versionIncrement
) where
-import MyPrelude
import Data.Time
import Data.Typeable (Typeable)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/hackage-security-0.6.2.1/src/Hackage/Security/TUF/Layout/Cache.hs
new/hackage-security-0.6.1.0/src/Hackage/Security/TUF/Layout/Cache.hs
--- old/hackage-security-0.6.2.1/src/Hackage/Security/TUF/Layout/Cache.hs
2001-09-09 03:46:40.000000000 +0200
+++ new/hackage-security-0.6.1.0/src/Hackage/Security/TUF/Layout/Cache.hs
2001-09-09 03:46:40.000000000 +0200
@@ -4,7 +4,6 @@
, cabalCacheLayout
) where
-import MyPrelude
import Hackage.Security.TUF.Paths
import Hackage.Security.Util.Path
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/hackage-security-0.6.2.1/src/Hackage/Security/TUF/Layout/Index.hs
new/hackage-security-0.6.1.0/src/Hackage/Security/TUF/Layout/Index.hs
--- old/hackage-security-0.6.2.1/src/Hackage/Security/TUF/Layout/Index.hs
2001-09-09 03:46:40.000000000 +0200
+++ new/hackage-security-0.6.1.0/src/Hackage/Security/TUF/Layout/Index.hs
2001-09-09 03:46:40.000000000 +0200
@@ -9,7 +9,6 @@
, indexLayoutPkgPrefs
) where
-import MyPrelude
import Distribution.Package
import Distribution.Text
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/hackage-security-0.6.2.1/src/Hackage/Security/TUF/Layout/Repo.hs
new/hackage-security-0.6.1.0/src/Hackage/Security/TUF/Layout/Repo.hs
--- old/hackage-security-0.6.2.1/src/Hackage/Security/TUF/Layout/Repo.hs
2001-09-09 03:46:40.000000000 +0200
+++ new/hackage-security-0.6.1.0/src/Hackage/Security/TUF/Layout/Repo.hs
2001-09-09 03:46:40.000000000 +0200
@@ -5,7 +5,6 @@
, cabalLocalRepoLayout
) where
-import MyPrelude
import Distribution.Package
import Distribution.Text
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/hackage-security-0.6.2.1/src/Hackage/Security/TUF/Mirrors.hs
new/hackage-security-0.6.1.0/src/Hackage/Security/TUF/Mirrors.hs
--- old/hackage-security-0.6.2.1/src/Hackage/Security/TUF/Mirrors.hs
2001-09-09 03:46:40.000000000 +0200
+++ new/hackage-security-0.6.1.0/src/Hackage/Security/TUF/Mirrors.hs
2001-09-09 03:46:40.000000000 +0200
@@ -9,7 +9,6 @@
, describeMirror
) where
-import MyPrelude
import Control.Monad.Except
import Network.URI
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/hackage-security-0.6.2.1/src/Hackage/Security/TUF/Paths.hs
new/hackage-security-0.6.1.0/src/Hackage/Security/TUF/Paths.hs
--- old/hackage-security-0.6.2.1/src/Hackage/Security/TUF/Paths.hs
2001-09-09 03:46:40.000000000 +0200
+++ new/hackage-security-0.6.1.0/src/Hackage/Security/TUF/Paths.hs
2001-09-09 03:46:40.000000000 +0200
@@ -14,7 +14,6 @@
, anchorCachePath
) where
-import MyPrelude
import Hackage.Security.Util.Path
import Hackage.Security.Util.Pretty
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/hackage-security-0.6.2.1/src/Hackage/Security/TUF/Patterns.hs
new/hackage-security-0.6.1.0/src/Hackage/Security/TUF/Patterns.hs
--- old/hackage-security-0.6.2.1/src/Hackage/Security/TUF/Patterns.hs
2001-09-09 03:46:40.000000000 +0200
+++ new/hackage-security-0.6.1.0/src/Hackage/Security/TUF/Patterns.hs
2001-09-09 03:46:40.000000000 +0200
@@ -26,7 +26,6 @@
, qqd
) where
-import MyPrelude
import Control.Monad.Except
import Language.Haskell.TH (Q, Exp)
import System.FilePath.Posix
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/hackage-security-0.6.2.1/src/Hackage/Security/TUF/Root.hs
new/hackage-security-0.6.1.0/src/Hackage/Security/TUF/Root.hs
--- old/hackage-security-0.6.2.1/src/Hackage/Security/TUF/Root.hs
2001-09-09 03:46:40.000000000 +0200
+++ new/hackage-security-0.6.1.0/src/Hackage/Security/TUF/Root.hs
2001-09-09 03:46:40.000000000 +0200
@@ -6,7 +6,6 @@
, RoleSpec(..)
) where
-import MyPrelude
import Hackage.Security.JSON
import Hackage.Security.Key
import Hackage.Security.Key.Env (KeyEnv)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/hackage-security-0.6.2.1/src/Hackage/Security/TUF/Signed.hs
new/hackage-security-0.6.1.0/src/Hackage/Security/TUF/Signed.hs
--- old/hackage-security-0.6.2.1/src/Hackage/Security/TUF/Signed.hs
2001-09-09 03:46:40.000000000 +0200
+++ new/hackage-security-0.6.1.0/src/Hackage/Security/TUF/Signed.hs
2001-09-09 03:46:40.000000000 +0200
@@ -27,7 +27,6 @@
, toPreSignatures
) where
-import MyPrelude
import Control.Monad
import Data.Functor.Identity
import qualified Data.ByteString as BS
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/hackage-security-0.6.2.1/src/Hackage/Security/TUF/Snapshot.hs
new/hackage-security-0.6.1.0/src/Hackage/Security/TUF/Snapshot.hs
--- old/hackage-security-0.6.2.1/src/Hackage/Security/TUF/Snapshot.hs
2001-09-09 03:46:40.000000000 +0200
+++ new/hackage-security-0.6.1.0/src/Hackage/Security/TUF/Snapshot.hs
2001-09-09 03:46:40.000000000 +0200
@@ -3,7 +3,6 @@
Snapshot(..)
) where
-import MyPrelude
import Control.Monad.Except
import Control.Monad.Reader
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/hackage-security-0.6.2.1/src/Hackage/Security/TUF/Targets.hs
new/hackage-security-0.6.1.0/src/Hackage/Security/TUF/Targets.hs
--- old/hackage-security-0.6.2.1/src/Hackage/Security/TUF/Targets.hs
2001-09-09 03:46:40.000000000 +0200
+++ new/hackage-security-0.6.1.0/src/Hackage/Security/TUF/Targets.hs
2001-09-09 03:46:40.000000000 +0200
@@ -8,7 +8,6 @@
, targetsLookup
) where
-import MyPrelude
import Hackage.Security.JSON
import Hackage.Security.Key
import Hackage.Security.Key.Env (KeyEnv)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/hackage-security-0.6.2.1/src/Hackage/Security/TUF/Timestamp.hs
new/hackage-security-0.6.1.0/src/Hackage/Security/TUF/Timestamp.hs
--- old/hackage-security-0.6.2.1/src/Hackage/Security/TUF/Timestamp.hs
2001-09-09 03:46:40.000000000 +0200
+++ new/hackage-security-0.6.1.0/src/Hackage/Security/TUF/Timestamp.hs
2001-09-09 03:46:40.000000000 +0200
@@ -3,7 +3,6 @@
Timestamp(..)
) where
-import MyPrelude
import Control.Monad.Except
import Control.Monad.Reader
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/hackage-security-0.6.2.1/src/Hackage/Security/Trusted/TCB.hs
new/hackage-security-0.6.1.0/src/Hackage/Security/Trusted/TCB.hs
--- old/hackage-security-0.6.2.1/src/Hackage/Security/Trusted/TCB.hs
2001-09-09 03:46:40.000000000 +0200
+++ new/hackage-security-0.6.1.0/src/Hackage/Security/Trusted/TCB.hs
2001-09-09 03:46:40.000000000 +0200
@@ -26,7 +26,6 @@
#endif
) where
-import MyPrelude
import Control.Exception
import Control.Monad.Except
import Data.Typeable
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/hackage-security-0.6.2.1/src/Hackage/Security/Trusted.hs
new/hackage-security-0.6.1.0/src/Hackage/Security/Trusted.hs
--- old/hackage-security-0.6.2.1/src/Hackage/Security/Trusted.hs
2001-09-09 03:46:40.000000000 +0200
+++ new/hackage-security-0.6.1.0/src/Hackage/Security/Trusted.hs
2001-09-09 03:46:40.000000000 +0200
@@ -12,7 +12,6 @@
, trustedFileInfoEqual
) where
-import MyPrelude
import Data.Function (on)
import Data.Time
import Hackage.Security.TUF
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/hackage-security-0.6.2.1/src/Hackage/Security/Util/Base64.hs
new/hackage-security-0.6.1.0/src/Hackage/Security/Util/Base64.hs
--- old/hackage-security-0.6.2.1/src/Hackage/Security/Util/Base64.hs
2001-09-09 03:46:40.000000000 +0200
+++ new/hackage-security-0.6.1.0/src/Hackage/Security/Util/Base64.hs
2001-09-09 03:46:40.000000000 +0200
@@ -4,7 +4,6 @@
, toByteString
) where
-import MyPrelude
import Data.ByteString (ByteString)
import qualified Data.ByteString.Char8 as C8 -- only called on B64-enc
strings
import qualified Data.ByteString.Base64 as B64
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/hackage-security-0.6.2.1/src/Hackage/Security/Util/Checked.hs
new/hackage-security-0.6.1.0/src/Hackage/Security/Util/Checked.hs
--- old/hackage-security-0.6.2.1/src/Hackage/Security/Util/Checked.hs
2001-09-09 03:46:40.000000000 +0200
+++ new/hackage-security-0.6.1.0/src/Hackage/Security/Util/Checked.hs
2001-09-09 03:46:40.000000000 +0200
@@ -25,7 +25,6 @@
, internalError
) where
-import MyPrelude
import Control.Exception (Exception, IOException)
import qualified Control.Exception as Base
import Data.Typeable (Typeable)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/hackage-security-0.6.2.1/src/Hackage/Security/Util/Exit.hs
new/hackage-security-0.6.1.0/src/Hackage/Security/Util/Exit.hs
--- old/hackage-security-0.6.2.1/src/Hackage/Security/Util/Exit.hs
2001-09-09 03:46:40.000000000 +0200
+++ new/hackage-security-0.6.1.0/src/Hackage/Security/Util/Exit.hs
2001-09-09 03:46:40.000000000 +0200
@@ -1,6 +1,5 @@
module Hackage.Security.Util.Exit where
-import MyPrelude
import Control.Monad.Except
{-------------------------------------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/hackage-security-0.6.2.1/src/Hackage/Security/Util/IO.hs
new/hackage-security-0.6.1.0/src/Hackage/Security/Util/IO.hs
--- old/hackage-security-0.6.2.1/src/Hackage/Security/Util/IO.hs
2001-09-09 03:46:40.000000000 +0200
+++ new/hackage-security-0.6.1.0/src/Hackage/Security/Util/IO.hs
2001-09-09 03:46:40.000000000 +0200
@@ -9,7 +9,6 @@
, timedIO
) where
-import MyPrelude
import Control.Concurrent (threadDelay)
import Control.Exception
import Data.Time
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/hackage-security-0.6.2.1/src/Hackage/Security/Util/JSON.hs
new/hackage-security-0.6.1.0/src/Hackage/Security/Util/JSON.hs
--- old/hackage-security-0.6.2.1/src/Hackage/Security/Util/JSON.hs
2001-09-09 03:46:40.000000000 +0200
+++ new/hackage-security-0.6.1.0/src/Hackage/Security/Util/JSON.hs
2001-09-09 03:46:40.000000000 +0200
@@ -23,7 +23,6 @@
, Int54
) where
-import MyPrelude
import Control.Monad (liftM)
import Data.Maybe (catMaybes)
import Data.Map (Map)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/hackage-security-0.6.2.1/src/Hackage/Security/Util/Lens.hs
new/hackage-security-0.6.1.0/src/Hackage/Security/Util/Lens.hs
--- old/hackage-security-0.6.2.1/src/Hackage/Security/Util/Lens.hs
2001-09-09 03:46:40.000000000 +0200
+++ new/hackage-security-0.6.1.0/src/Hackage/Security/Util/Lens.hs
2001-09-09 03:46:40.000000000 +0200
@@ -14,7 +14,6 @@
, set
) where
-import MyPrelude
import Control.Applicative
import Data.Functor.Identity
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/hackage-security-0.6.2.1/src/Hackage/Security/Util/Path.hs
new/hackage-security-0.6.1.0/src/Hackage/Security/Util/Path.hs
--- old/hackage-security-0.6.2.1/src/Hackage/Security/Util/Path.hs
2001-09-09 03:46:40.000000000 +0200
+++ new/hackage-security-0.6.1.0/src/Hackage/Security/Util/Path.hs
2001-09-09 03:46:40.000000000 +0200
@@ -83,7 +83,6 @@
, IO.hSeek
) where
-import MyPrelude
import Control.Monad
import Data.List (isPrefixOf)
import System.IO (IOMode(..), BufferMode(..), Handle, SeekMode(..))
@@ -295,7 +294,7 @@
fromAbsoluteFilePath :: FilePath -> Path Absolute
fromAbsoluteFilePath fp
| FP.Native.isAbsolute fp = mkPathNative fp
- | otherwise = error ("fromAbsoluteFilePath: not an absolute
path: " ++ fp)
+ | otherwise = error "fromAbsoluteFilePath: not an absolute
path"
{-------------------------------------------------------------------------------
Wrappers around System.IO
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/hackage-security-0.6.2.1/src/Hackage/Security/Util/Pretty.hs
new/hackage-security-0.6.1.0/src/Hackage/Security/Util/Pretty.hs
--- old/hackage-security-0.6.2.1/src/Hackage/Security/Util/Pretty.hs
2001-09-09 03:46:40.000000000 +0200
+++ new/hackage-security-0.6.1.0/src/Hackage/Security/Util/Pretty.hs
2001-09-09 03:46:40.000000000 +0200
@@ -3,8 +3,6 @@
Pretty(..)
) where
-import MyPrelude
-
-- | Produce a human-readable string
class Pretty a where
pretty :: a -> String
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/hackage-security-0.6.2.1/src/Hackage/Security/Util/Some.hs
new/hackage-security-0.6.1.0/src/Hackage/Security/Util/Some.hs
--- old/hackage-security-0.6.2.1/src/Hackage/Security/Util/Some.hs
2001-09-09 03:46:40.000000000 +0200
+++ new/hackage-security-0.6.1.0/src/Hackage/Security/Util/Some.hs
2001-09-09 03:46:40.000000000 +0200
@@ -19,7 +19,6 @@
#endif
) where
-import MyPrelude
#if MIN_VERSION_base(4,7,0)
import Data.Typeable (Typeable)
#else
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/hackage-security-0.6.2.1/src/Hackage/Security/Util/Stack.hs
new/hackage-security-0.6.1.0/src/Hackage/Security/Util/Stack.hs
--- old/hackage-security-0.6.2.1/src/Hackage/Security/Util/Stack.hs
2001-09-09 03:46:40.000000000 +0200
+++ new/hackage-security-0.6.1.0/src/Hackage/Security/Util/Stack.hs
2001-09-09 03:46:40.000000000 +0200
@@ -3,8 +3,6 @@
(:-)(..)
) where
-import MyPrelude
-
data h :- t = h :- t
deriving (Eq, Show)
infixr 5 :-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/hackage-security-0.6.2.1/src/Hackage/Security/Util/TypedEmbedded.hs
new/hackage-security-0.6.1.0/src/Hackage/Security/Util/TypedEmbedded.hs
--- old/hackage-security-0.6.2.1/src/Hackage/Security/Util/TypedEmbedded.hs
2001-09-09 03:46:40.000000000 +0200
+++ new/hackage-security-0.6.1.0/src/Hackage/Security/Util/TypedEmbedded.hs
2001-09-09 03:46:40.000000000 +0200
@@ -7,8 +7,6 @@
, AsType(..)
) where
-import MyPrelude
-
-- | Type equality proofs
--
-- This is a direct copy of "type-equality:Data.Type.Equality"; if we don't
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/hackage-security-0.6.2.1/src/MyPrelude.hs
new/hackage-security-0.6.1.0/src/MyPrelude.hs
--- old/hackage-security-0.6.2.1/src/MyPrelude.hs 2001-09-09
03:46:40.000000000 +0200
+++ new/hackage-security-0.6.1.0/src/MyPrelude.hs 1970-01-01
01:00:00.000000000 +0100
@@ -1,31 +0,0 @@
--- | Smooth over differences between various ghc versions by making older
--- preludes look like 4.8.0
-{-# LANGUAGE CPP #-}
-module MyPrelude (
- module P
-#if !MIN_VERSION_base(4,8,0)
- , Applicative(..)
- , Monoid(..)
- , (<$>)
- , (<$)
- , Traversable(traverse)
- , displayException
-#endif
- ) where
-
-#if MIN_VERSION_base(4,8,0)
-import Prelude as P
-#else
-#if MIN_VERSION_base(4,6,0)
-import Prelude as P
-#else
-import Prelude as P hiding (catch)
-#endif
-import Control.Applicative
-import Control.Exception (Exception)
-import Data.Monoid
-import Data.Traversable (Traversable(traverse))
-
-displayException :: Exception e => e -> String
-displayException = show
-#endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/hackage-security-0.6.2.1/src/Prelude.hs
new/hackage-security-0.6.1.0/src/Prelude.hs
--- old/hackage-security-0.6.2.1/src/Prelude.hs 1970-01-01 01:00:00.000000000
+0100
+++ new/hackage-security-0.6.1.0/src/Prelude.hs 2001-09-09 03:46:40.000000000
+0200
@@ -0,0 +1,32 @@
+-- | Smooth over differences between various ghc versions by making older
+-- preludes look like 4.8.0
+{-# LANGUAGE PackageImports #-}
+{-# LANGUAGE CPP #-}
+module Prelude (
+ module P
+#if !MIN_VERSION_base(4,8,0)
+ , Applicative(..)
+ , Monoid(..)
+ , (<$>)
+ , (<$)
+ , Traversable(traverse)
+ , displayException
+#endif
+ ) where
+
+#if MIN_VERSION_base(4,8,0)
+import "base" Prelude as P
+#else
+#if MIN_VERSION_base(4,6,0)
+import "base" Prelude as P
+#else
+import "base" Prelude as P hiding (catch)
+#endif
+import Control.Applicative
+import Control.Exception (Exception)
+import Data.Monoid
+import Data.Traversable (Traversable(traverse))
+
+displayException :: Exception e => e -> String
+displayException = show
+#endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/hackage-security-0.6.2.1/src/Text/JSON/Canonical.hs
new/hackage-security-0.6.1.0/src/Text/JSON/Canonical.hs
--- old/hackage-security-0.6.2.1/src/Text/JSON/Canonical.hs 2001-09-09
03:46:40.000000000 +0200
+++ new/hackage-security-0.6.1.0/src/Text/JSON/Canonical.hs 2001-09-09
03:46:40.000000000 +0200
@@ -30,7 +30,6 @@
, prettyCanonicalJSON
) where
-import MyPrelude
import Text.ParserCombinators.Parsec
( CharParser, (<|>), (<?>), many, between, sepBy
, satisfy, char, string, digit, spaces
