From 038bdb286ddaf7fc7b18d1fb0c92173fa7854a22 Mon Sep 17 00:00:00 2001
From: Herbert Valerio Riedel <hvr@gnu.org>
Date: Fri, 20 Mar 2015 10:37:33 +0100
Subject: [PATCH] Update deepseq submodule to 1.4.1.1 tag
This deepseq update drops the redundant ghc-prim dependency for GHC>=7.6
(cherry picked from commit c2833d60083dd6f4e13f8f58502e3bf2b0aacf5c)
---
libraries/deepseq | 2 +-
testsuite/tests/safeHaskell/check/pkg01/safePkg01.stdout | 6 +++---
testsuite/tests/th/TH_Roles2.stderr | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/libraries/deepseq b/libraries/deepseq
index 56809c3e45c3..c6cb196fb1bd 160000
--- a/libraries/deepseq
+++ b/libraries/deepseq
@@ -1 +1 @@
-Subproject commit 56809c3e45c3a266564672b968817ca8b6d496c1
+Subproject commit c6cb196fb1bd5f16bb5945add2d6ece3f7910e90
diff --git a/testsuite/tests/safeHaskell/check/pkg01/safePkg01.stdout b/testsuite/tests/safeHaskell/check/pkg01/safePkg01.stdout
index 134ad6f5cd00..636a243d7f64 100644
--- a/testsuite/tests/safeHaskell/check/pkg01/safePkg01.stdout
+++ b/testsuite/tests/safeHaskell/check/pkg01/safePkg01.stdout
@@ -29,17 +29,17 @@ trusted: safe
require own pkg trusted: True
M_SafePkg6
-package dependencies: array-0.5.0.1 base-4.8.0.0* bytestring-0.10.5.0* deepseq-1.4.1.0 ghc-prim-0.3.1.0 integer-gmp-0.5.1.0
+package dependencies: array-0.5.0.1 base-4.8.0.0* bytestring-0.10.6.0* deepseq-1.4.1.1 ghc-prim-0.3.1.0 integer-gmp-1.0.0.0
trusted: trustworthy
require own pkg trusted: False
M_SafePkg7
-package dependencies: array-0.5.0.1 base-4.8.0.0* bytestring-0.10.5.0* deepseq-1.4.1.0 ghc-prim-0.3.1.0 integer-gmp-0.5.1.0
+package dependencies: array-0.5.0.1 base-4.8.0.0* bytestring-0.10.6.0* deepseq-1.4.1.1 ghc-prim-0.3.1.0 integer-gmp-1.0.0.0
trusted: safe
require own pkg trusted: False
M_SafePkg8
-package dependencies: array-0.5.0.1 base-4.8.0.0 bytestring-0.10.5.0* deepseq-1.4.1.0 ghc-prim-0.3.1.0 integer-gmp-0.5.1.0
+package dependencies: array-0.5.0.1 base-4.8.0.0 bytestring-0.10.6.0* deepseq-1.4.1.1 ghc-prim-0.3.1.0 integer-gmp-1.0.0.0
trusted: trustworthy
require own pkg trusted: False
diff --git a/testsuite/tests/th/TH_Roles2.stderr b/testsuite/tests/th/TH_Roles2.stderr
index 489064c35fad..531a874dff8c 100644
--- a/testsuite/tests/th/TH_Roles2.stderr
+++ b/testsuite/tests/th/TH_Roles2.stderr
@@ -4,7 +4,7 @@ TYPE CONSTRUCTORS
data T (a :: k)
COERCION AXIOMS
Dependent modules: []
-Dependent packages: [array-0.5.1.0, base-4.8.0.0, deepseq-1.4.1.0,
+Dependent packages: [array-0.5.1.0, base-4.8.0.0, deepseq-1.4.1.1,
ghc-prim-0.3.1.0, integer-gmp-1.0.0.0, pretty-1.1.2.0,
template-haskell-2.10.0.0]
--
GitLab