Switch from mixins to manual prelude

see commercialhaskell/stack#5077
Kleidukos · May 23, 2020 · c572d8a · c572d8a
1 parent 54536a7
commit c572d8a
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 38 deletions.
diff --git a/irssi-hs.cabal b/irssi-hs.cabal
@@ -4,7 +4,7 @@ cabal-version: 2.2
 --
 -- see: https://github.com/sol/hpack
 --
--- hash: f16439466ff085a7daeee0e07dc5bad26118168b290f9cd1c1a9cf20986738e4
+-- hash: 862d3dff084558677f4cee8330bf43815f49d2233cdbeb0206d3a13997a2a152
 
 name:           irssi-hs
 version:        0.0.0
@@ -37,13 +37,14 @@ library
       Irssi.Types
   other-modules:
       Irssi.Utils
+      Prelude
       Paths_irssi_hs
   hs-source-dirs:
       src
   default-extensions: ApplicativeDo BangPatterns ConstraintKinds DataKinds DefaultSignatures DeriveAnyClass DeriveFoldable DeriveFunctor DeriveGeneric DeriveLift DeriveTraversable DerivingStrategies DuplicateRecordFields EmptyCase ExistentialQuantification FlexibleContexts FlexibleInstances FunctionalDependencies GADTs GeneralizedNewtypeDeriving InstanceSigs KindSignatures LambdaCase MultiParamTypeClasses MultiWayIf NamedFieldPuns OverloadedStrings PatternSynonyms RankNTypes RecordWildCards ScopedTypeVariables StandaloneDeriving TupleSections TypeApplications TypeFamilies TypeFamilyDependencies TypeOperators
   build-depends:
       aeson >=1.4.7 && <1.5
-    , base >=4.10 && <4.14
+    , base-noprelude >=4.10 && <4.14
     , bytestring >=0.10.8 && <0.11
     , containers >=0.6.0 && <0.7
     , directory >=1.3.3 && <1.4
@@ -53,9 +54,6 @@ library
     , unagi-chan >=0.4.1 && <0.5
     , unordered-containers >=0.2.10 && <0.3
     , vector >=0.12.1 && <0.13
-  mixins:
-      base hiding (Prelude)
-    , relude (Relude as Prelude)
   if impl(ghc >= 8.4.4)
     ghc-options: -Wall -Wcompat -Werror -Widentities -Wincomplete-record-updates -Wincomplete-uni-patterns -Wmissing-export-lists -Wpartial-fields -Wredundant-constraints -fhide-source-paths -Wno-unused-do-bind
   else
@@ -72,18 +70,15 @@ test-suite irssi-hs-tests
   default-extensions: ApplicativeDo BangPatterns ConstraintKinds DataKinds DefaultSignatures DeriveAnyClass DeriveFoldable DeriveFunctor DeriveGeneric DeriveLift DeriveTraversable DerivingStrategies DuplicateRecordFields EmptyCase ExistentialQuantification FlexibleContexts FlexibleInstances FunctionalDependencies GADTs GeneralizedNewtypeDeriving InstanceSigs KindSignatures LambdaCase MultiParamTypeClasses MultiWayIf NamedFieldPuns OverloadedStrings PatternSynonyms RankNTypes RecordWildCards ScopedTypeVariables StandaloneDeriving TupleSections TypeApplications TypeFamilies TypeFamilyDependencies TypeOperators
   build-depends:
       aeson
-    , base >=4.10 && <4.14
+    , base-noprelude
     , bytestring
     , irssi-hs
-    , relude >=0.6.0 && <0.7
+    , relude
     , tasty
     , tasty-hspec
     , text
     , unordered-containers
     , vector
-  mixins:
-      base hiding (Prelude)
-    , relude (Relude as Prelude)
   if impl(ghc >= 8.4.4)
     ghc-options: -Wall -Wcompat -Werror -Widentities -Wincomplete-record-updates -Wincomplete-uni-patterns -Wmissing-export-lists -Wpartial-fields -Wredundant-constraints -fhide-source-paths -Wno-unused-do-bind
   else

diff --git a/package.yaml b/package.yaml
@@ -97,24 +97,17 @@ library:
     - Irssi.Types
 
   dependencies:
-  - aeson          >= 1.4.7 && < 1.5
-  - bytestring     >= 0.10.8 && < 0.11
-  - containers     >= 0.6.0 && < 0.7
-  - text           >= 1.2.3 && < 1.3
-  - vector         >= 0.12.1 && < 0.13
-  - name: base
-    version: ">= 4.10 && < 4.14"
-    mixin:
-      - hiding (Prelude)
-  - directory      >= 1.3.3 && < 1.4
-  - network        >= 3.1.1 && < 3.2
-  - name: relude
-    version: ">= 0.6.0 && < 0.7"
-    mixin:
-      - (Relude as Prelude)
-
-  - unagi-chan     >= 0.4.1 && < 0.5
-  - unordered-containers >= 0.2.10 && < 0.3
+  - aeson                >=1.4.7  && < 1.5
+  - bytestring           >=0.10.8 && < 0.11
+  - containers           >=0.6.0  && < 0.7
+  - text                 >=1.2.3  && <1.3
+  - vector               >=0.12.1 && < 0.13
+  - directory            >=1.3.3  && < 1.4
+  - network              >=3.1.1  && < 3.2
+  - base-noprelude       >=4.10   && < 4.14
+  - relude               >=0.6.0  && < 0.7
+  - unagi-chan           >=0.4.1  && < 0.5
+  - unordered-containers >=0.2.10 && < 0.3
   source-dirs: src
 
 tests:
@@ -123,18 +116,12 @@ tests:
     main: Main.hs
     dependencies:
     - aeson
-    - name: base
-      version: ">= 4.10 && < 4.14"
-      mixin:
-        - hiding (Prelude)
+    - base-noprelude
     - bytestring
     - irssi-hs
-    - name: relude
-      version: ">= 0.6.0 && < 0.7"
-      mixin:
-        - (Relude as Prelude)
+    - relude
     - tasty
     - tasty-hspec
-    - vector
-    - unordered-containers
     - text
+    - unordered-containers
+    - vector
diff --git a/src/Prelude.hs b/src/Prelude.hs
@@ -0,0 +1,4 @@
+module Prelude
+  (module Relude) where
+
+import           Relude