Source Mage code commit list

[Ismael Luceno <scm AT sourcemage.org>]

GIT changes to master grimoire by Ismael Luceno <ismael AT sourcemage.org>:

 devel/ghc/D4159.diff |   70 
---------------------------------------------------
 devel/ghc/DEPENDS    |    5 ++-
 devel/ghc/DETAILS    |    9 ++----
 devel/ghc/HISTORY    |    5 +++
 devel/ghc/PRE_BUILD  |    3 --
 5 files changed, 12 insertions(+), 80 deletions(-)

New commits:
commit 5ea205ef15be43f7090bd886cec7457236521dd7
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

    ghc 8.4.3

diff --git a/devel/ghc/D4159.diff b/devel/ghc/D4159.diff
deleted file mode 100644
index f934af4..0000000
--- a/devel/ghc/D4159.diff
+++ /dev/null
@@ -1,70 +0,0 @@
-diff --git a/utils/ghc-pkg/Main.hs b/utils/ghc-pkg/Main.hs
---- a/utils/ghc-pkg/Main.hs
-+++ b/utils/ghc-pkg/Main.hs
-@@ -1208,7 +1208,18 @@
-       pkgsCabalFormat = packages db
- 
-       pkgsGhcCacheFormat :: [PackageCacheFormat]
--      pkgsGhcCacheFormat = map convertPackageInfoToCacheFormat 
pkgsCabalFormat
-+      pkgsGhcCacheFormat
-+        = map (recomputeValidAbiDeps pkgsCabalFormat) -- Note [Recompute 
abi-depends]
-+        $ map convertPackageInfoToCacheFormat
-+          pkgsCabalFormat
-+
-+      hasAnyAbiDepends :: InstalledPackageInfo -> Bool
-+      hasAnyAbiDepends x = length (abiDepends x) > 0
-+
-+  -- warn when we find any (possibly-)bogus abi-depends fields;
-+  -- Note [Recompute abi-depends]
-+  when (any hasAnyAbiDepends pkgsCabalFormat) $
-+      infoLn "ignoring (possibly broken) abi-depends field for packages"
- 
-   when (verbosity > Normal) $
-       infoLn ("writing cache " ++ filename)
-@@ -1231,6 +1242,45 @@
-                             ModuleName
-                             OpenModule
- 
-+{- Note [Recompute abi-depends]
-+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-+
-+Like most fields, `ghc-pkg` relies on who-ever is performing package
-+registration to fill in fields; this includes the `abi-depends` field 
present
-+for the package.
-+
-+However, this was likely a mistake, and is not very robust; in certain 
cases,
-+versions of Cabal may use bogus abi-depends fields for a package when doing
-+builds. Why? Because package database information is aggressively cached; 
it is
-+possible to work Cabal into a situation where it uses a cached version of
-+`abi-depends`, rather than the one in the actual database after it has been
-+recomputed.
-+
-+However, there is an easy fix: ghc-pkg /already/ knows the `abi-depends` of 
a
-+package, because they are the ABIs of the packages pointed at by the 
`depends`
-+field. So it can simply look up the abi from the dependencies in the 
original
-+database, and ignore whatever the system registering gave it.
-+
-+So, instead, we do two things here:
-+
-+  - We throw away the information for a registered package's `abi-depends` 
field.
-+
-+  - We recompute it: we simply look up the unit ID of the package in the 
original
-+    database, and use *its* abi-depends.
-+
-+See Trac #14381, and Cabal issue #4728.
-+
-+-}
-+
-+recomputeValidAbiDeps :: [InstalledPackageInfo] -> PackageCacheFormat -> 
PackageCacheFormat
-+recomputeValidAbiDeps db pkg = pkg { GhcPkg.abiDepends = catMaybes 
(newAbiDeps) }
-+  where
-+    newAbiDeps = flip map (GhcPkg.abiDepends pkg) $ \(k, _) ->
-+      case filter (\d -> installedUnitId d == k) db of
-+        []  -> Nothing
-+        [x] -> Just (k, unAbiHash (abiHash x))
-+        _   -> Nothing -- ???
-+
- convertPackageInfoToCacheFormat :: InstalledPackageInfo -> 
PackageCacheFormat
- convertPackageInfoToCacheFormat pkg =
-     GhcPkg.InstalledPackageInfo {
-
diff --git a/devel/ghc/DEPENDS b/devel/ghc/DEPENDS
index 1e511e7..efa36a9 100755
--- a/devel/ghc/DEPENDS
+++ b/devel/ghc/DEPENDS
@@ -1,6 +1,7 @@
 depends gmp    &&
 depends libbsd &&
 depends libffi '--with-system-ffi' &&
-depends python &&
+depends ncurses &&
+depends numactl &&
 depends perl   &&
-depends ncurses
+depends python
diff --git a/devel/ghc/DETAILS b/devel/ghc/DETAILS
index c77575b..3e2972a 100755
--- a/devel/ghc/DETAILS
+++ b/devel/ghc/DETAILS
@@ -1,18 +1,17 @@
            SPELL=ghc
-         VERSION=8.2.2
-      PATCHLEVEL=1
+         VERSION=8.4.3
           SOURCE=$SPELL-$VERSION-src.tar.xz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=http://downloads.haskell.org/~$SPELL/$VERSION/$SOURCE
-     
SOURCE_HASH=sha512:6549416f470b599973d409fa45f59c25b07e6a94798cef1a19ad432547dc225338cf4dbc4a4793114b4a417798a3b59b122b92b020251074405c5302b7ffe799
+     
SOURCE_HASH=sha512:c6cea84264f32ae888f9931f834a1d721889242f656d14262e787ec54a1793d1862ce76daacaf1006c12b8af12919501afce1dc02571373e24830e4d51803414
             ARCH="$(uname -m)"
   if [[ "$ARCH" = i686 ]]; then
             ARCH=i386
   fi
-         SOURCE2=${SPELL}-${VERSION}-${ARCH}-deb8-linux.tar.xz
+         SOURCE2=${SPELL}-${VERSION}-${ARCH}-deb9-linux.tar.xz
   SOURCE2_URL[0]=http://www.haskell.org/${SPELL}/dist/${VERSION}/${SOURCE2}
   if [ "$ARCH" = "x86_64" ]; then
-    
SOURCE2_HASH=sha512:77d30e78cf68ddb40f4c1af23a8b43ffd0aac4c303758f1e3e366402d5dd2f61fb34d73845e73bdbe2acb6911a92302799f17c9f2367edb229491882683a0767
+    
SOURCE2_HASH=sha512:f48c65c865a8a0fb602eaba0630b15e2cebbb081b0d63daef46651bd33877cfd8a98db1fcb2ac94b45fef7d6ea65d75658b209ceb9e7616eae05142faa70a13a
   else
     
SOURCE2_HASH=sha512:64deac59cca41363e96df0a012c70deee7accfbb56cb7807467ae2c2c657dec6e80bac7928699f4ebaf64aa5b60e57e9f39dbf62bcad8c0a2febf52c57770cd5
   fi
diff --git a/devel/ghc/HISTORY b/devel/ghc/HISTORY
index c26243b..ccb7837 100644
--- a/devel/ghc/HISTORY
+++ b/devel/ghc/HISTORY
@@ -1,3 +1,8 @@
+2018-06-23 Ismael Luceno <ismael AT iodev.co.uk>
+       * DETAILS: updated spell to 8.4.3
+       * PRE_BUILD, D4159.diff: remove patch, applied upstream
+       * DEPENDS: added dependency on numactl
+
 2018-02-01 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
        * PRE_BUILD, D4159.diff: apply patch from
          https://phabricator.haskell.org/D4159 to fix bug in dependency 
handling in
diff --git a/devel/ghc/PRE_BUILD b/devel/ghc/PRE_BUILD
index 27ef8b9..4e62d69 100755
--- a/devel/ghc/PRE_BUILD
+++ b/devel/ghc/PRE_BUILD
@@ -16,9 +16,6 @@ fi &&
 
 unpack_file &&
 
-cd "$SOURCE_DIRECTORY/${SPELL}-${VERSION}" &&
-patch -p1 < "$SPELL_DIRECTORY/D4159.diff"  &&
-
 cd ${SOURCE_DIRECTORY}/${SPELL}-${VERSION} &&
 
 if [[ $GHC_NO_OPTS == "y" ]] ; then