From 82843cc4fa70a5e4dbe4a19da66650fba4b96625 Mon Sep 17 00:00:00 2001
From: Veronika Romashkina <vrom911@gmail.com>
Date: Thu, 9 Jun 2022 15:59:45 +0100
Subject: [PATCH] [#404] Build failure in a released version when using an
 older version of 'containers'

Resolves #404
---
 CHANGELOG.md      |  3 +++
 src/Relude/Nub.hs | 15 +++++++--------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b20e898..cb5da05 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,9 @@ The changelog is available [on GitHub][2].
   Warn on usages of `readFileText`, `readFileLText`, `readFile` and `readFile'`.
 * Support `hashable ^>=1.4`
 * Switch benchmarks from `criterion` to `tasty-bench`.
+* [#404](https://github.com/kowainik/relude/issues/404):
+  Fix condidion for `ordNubOn`, `intNub`, `intNubOn` export for `Relude.Nub` module.
+  Use min version of `containers-0.6.0` instead of min version of GHC `8.4`. 
 
 ## 1.0.0.1 — Mar 15, 2021
 
diff --git a/src/Relude/Nub.hs b/src/Relude/Nub.hs
index a924635..7964083 100644
--- a/src/Relude/Nub.hs
+++ b/src/Relude/Nub.hs
@@ -41,7 +41,7 @@ module Relude.Nub
     ( hashNub
     , ordNub
 
-#if __GLASGOW_HASKELL__ > 804
+#if MIN_VERSION_containers(0,6,0)
     , ordNubOn
     , intNub
     , intNubOn
@@ -54,13 +54,13 @@ module Relude.Nub
 #if !MIN_VERSION_hashable(1,4,0)
 import Data.Eq (Eq)
 #endif
-import Data.Hashable (Hashable)
 import Data.HashSet as HashSet
+import Data.Hashable (Hashable)
 import Data.Ord (Ord)
 import Prelude (Int, (.))
 
 import qualified Data.Set as Set
-#if __GLASGOW_HASKELL__ > 804
+#if MIN_VERSION_containers(0,6,0)
 import qualified Data.Containers.ListUtils as Containers
 #endif
 
@@ -78,7 +78,7 @@ Like 'Prelude.nub' but runs in \( O(n \log n) \)  time and requires 'Ord'.
 
 -}
 ordNub :: forall a . (Ord a) => [a] -> [a]
-#if __GLASGOW_HASKELL__ > 804
+#if MIN_VERSION_containers(0,6,0)
 ordNub = Containers.nubOrd
 {-# INLINE ordNub #-}
 #else
@@ -94,7 +94,7 @@ ordNub = go Set.empty
 #endif
 
 
-#if __GLASGOW_HASKELL__ > 804
+#if MIN_VERSION_containers(0,6,0)
 {- | Similar to 'ordNub' but performs nub through the mapped list on the given
 function.
 
@@ -154,12 +154,11 @@ unstableNub = HashSet.toList . HashSet.fromList
 {-# INLINE unstableNub #-}
 
 
-#if __GLASGOW_HASKELL__ > 804
-
+#if MIN_VERSION_containers(0,6,0)
 {- | Removes duplicate elements from a list, keeping only the first occurance of
 the element.
 
-Like 'Prelude.nub' but runs in \( O(n \min\(n, int_bits\)) \)  time and requires 'Ord'.
+Like 'Prelude.nub' but runs in \( O (n \min (n, int\_bits )) \)  time and requires 'Ord'.
 
 >>> intNub [3, 3, 3, 2, 2, -1, 1]
 [3,2,-1,1]