2022-01-23T07:00:01Z

1 files changed, 33 insertions, 50 deletions

diff --git a/haskell.txt b/haskell.txt
index df8d20f55fd0..4eb3f39b629b 100644
--- a/haskell.txt
+++ b/haskell.txt
@@ -16,57 +16,40 @@ pkgcore 0.12.8
 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync haskell
 *** syncing haskell
 From https://github.com/gentoo-haskell/gentoo-haskell
-   8849064e3d..9c03dc2eb9  master     -> origin/master
-Updating 8849064e3d..9c03dc2eb9
-Fast-forward
- dev-haskell/algebraic-graphs/Manifest              |  3 +-
- ...aphs-0.5.ebuild => algebraic-graphs-0.6.ebuild} | 20 ++++----
- ...upstream-fix-duplicate-arbitrary-instance.patch | 35 -------------
- dev-haskell/dependent-sum-template/Manifest        |  2 +-
- ...build => dependent-sum-template-0.1.1.1.ebuild} | 13 ++---
- dev-haskell/fourmolu/Manifest                      |  1 +
- .../files/fourmolu-0.4.0.0-add-flags.patch         | 32 ++++++++++++
- dev-haskell/fourmolu/fourmolu-0.4.0.0.ebuild       | 57 ++++++++++++++++++++++
- .../ghcide-1.5.0.1-add-parallelism-rtsopts.patch   |  5 ++
- ...ide-1.5.0.1.ebuild => ghcide-1.5.0.1-r1.ebuild} |  7 ++-
- dev-haskell/hie-bios/Manifest                      |  2 +-
- .../hie-bios-0.8.1-disable-network-tests.patch     | 17 +++++++
- ...hie-bios-0.7.6.ebuild => hie-bios-0.8.1.ebuild} | 18 +++----
- .../files/hlint-3.2.7-change-refactor-name.patch   | 48 ++++++++++++++++++
- .../files/hlint-3.3.6-change-refactor-name.patch   | 48 ++++++++++++++++++
- dev-haskell/hlint/hlint-3.2.7.ebuild               | 12 +++--
- dev-haskell/hlint/hlint-3.3.6.ebuild               | 18 +++++--
- dev-haskell/hnix-store-core/Manifest               |  2 +-
- ...store-core-0.5.0.0-add-overloaded-strings.patch | 14 ++++++
- .../files/hnix-store-core-0.5.0.0-fix-cabal.patch  | 55 +++------------------
- ....0.ebuild => hnix-store-core-0.5.0.0-r1.ebuild} | 45 +++++++++--------
- dev-haskell/retrie/Manifest                        |  2 +-
- .../retrie/files/retrie-0.1.1.1-modify-flags.patch | 34 -------------
- .../retrie/files/retrie-1.1.0.0-modify-flags.patch | 42 ++++++++++++++++
- dev-haskell/retrie/metadata.xml                    | 14 +-----
- ...rie-0.1.1.1-r1.ebuild => retrie-1.1.0.0.ebuild} | 31 +++++-------
- dev-haskell/th-extras/Manifest                     |  2 +-
- dev-haskell/th-extras/metadata.xml                 | 11 -----
- ...ras-0.0.0.4.ebuild => th-extras-0.0.0.6.ebuild} | 17 +++----
- 29 files changed, 377 insertions(+), 230 deletions(-)
- rename dev-haskell/algebraic-graphs/{algebraic-graphs-0.5.ebuild => algebraic-graphs-0.6.ebuild} (58%)
- delete mode 100644 dev-haskell/algebraic-graphs/files/algebraic-graphs-0.5-upstream-fix-duplicate-arbitrary-instance.patch
- rename dev-haskell/dependent-sum-template/{dependent-sum-template-0.1.0.3.ebuild => dependent-sum-template-0.1.1.1.ebuild} (72%)
- create mode 100644 dev-haskell/fourmolu/files/fourmolu-0.4.0.0-add-flags.patch
- create mode 100644 dev-haskell/fourmolu/fourmolu-0.4.0.0.ebuild
- rename dev-haskell/ghcide/{ghcide-1.5.0.1.ebuild => ghcide-1.5.0.1-r1.ebuild} (95%)
- create mode 100644 dev-haskell/hie-bios/files/hie-bios-0.8.1-disable-network-tests.patch
- rename dev-haskell/hie-bios/{hie-bios-0.7.6.ebuild => hie-bios-0.8.1.ebuild} (83%)
- create mode 100644 dev-haskell/hlint/files/hlint-3.2.7-change-refactor-name.patch
- create mode 100644 dev-haskell/hlint/files/hlint-3.3.6-change-refactor-name.patch
- create mode 100644 dev-haskell/hnix-store-core/files/hnix-store-core-0.5.0.0-add-overloaded-strings.patch
- rename dev-haskell/hnix-store-core/{hnix-store-core-0.5.0.0.ebuild => hnix-store-core-0.5.0.0-r1.ebuild} (50%)
- delete mode 100644 dev-haskell/retrie/files/retrie-0.1.1.1-modify-flags.patch
- create mode 100644 dev-haskell/retrie/files/retrie-1.1.0.0-modify-flags.patch
- rename dev-haskell/retrie/{retrie-0.1.1.1-r1.ebuild => retrie-1.1.0.0.ebuild} (71%)
- rename dev-haskell/th-extras/{th-extras-0.0.0.4.ebuild => th-extras-0.0.0.6.ebuild} (60%)
+ + 9c03dc2eb9...5884fcb20e master     -> origin/master  (forced update)
+hint: Pulling without specifying how to reconcile divergent branches is
+hint: discouraged. You can squelch this message by running one of the following
+hint: commands sometime before your next pull:
+hint: 
+hint:   git config pull.rebase false  # merge (the default strategy)
+hint:   git config pull.rebase true   # rebase
+hint:   git config pull.ff only       # fast-forward only
+hint: 
+hint: You can replace "git config" with "git config --global" to set a default
+hint: preference for all repositories. You can also pass --rebase, --no-rebase,
+hint: or --ff-only on the command line to override the configured default per
+hint: invocation.
+Committer identity unknown
+
+*** Please tell me who you are.
+
+Run
+
+  git config --global user.email "you@example.com"
+  git config --global user.name "Your Name"
+
+to set your account's default identity.
+Omit --global to set the identity only in this repository.
+
+fatal: empty ident name (for <repomirrorci@jacamar.gentoo.org>) not allowed
+!!! failed syncing haskell
+ * Sync failed with 1
+ * Will try to re-create
+$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync haskell
+*** syncing haskell
+Cloning into '/var/lib/repo-mirror-ci/sync/haskell'...
 *** synced haskell
- * Sync succeeded
+ * Sync succeeded after re-adding
 $ git log --format=%ci -1
 $ git show -q --pretty=format:%G? HEAD
 $ pmaint --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 haskell