cabal: default to ScopeTypeVariables

Anton-Latukha · Anton-Latukha · commit c520632c066b · 2021-08-13T21:19:02.000+03:00
It is used in ~50% of modules &amp; looks a standard feature at this point.
diff --git a/hnix.cabal b/hnix.cabal
@@ -477,6 +477,7 @@ library
     , DeriveLift
     , FlexibleContexts
     , FlexibleInstances
+    , ScopedTypeVariables
     , StandaloneDeriving
     , TypeApplications
     , TypeSynonymInstances
@@ -544,6 +545,7 @@ executable hnix
     , DeriveLift
     , FlexibleContexts
     , FlexibleInstances
+    , ScopedTypeVariables
     , StandaloneDeriving
     , TypeApplications
     , TypeSynonymInstances
@@ -623,6 +625,7 @@ test-suite hnix-tests
     , DeriveLift
     , FlexibleContexts
     , FlexibleInstances
+    , ScopedTypeVariables
     , StandaloneDeriving
     , TypeApplications
     , TypeSynonymInstances
@@ -676,6 +679,7 @@ benchmark hnix-benchmarks
     , DeriveLift
     , FlexibleContexts
     , FlexibleInstances
+    , ScopedTypeVariables
     , StandaloneDeriving
     , TypeApplications
     , TypeSynonymInstances
diff --git a/main/Main.hs b/main/Main.hs
@@ -1,5 +1,4 @@
 {-# language MultiWayIf #-}
-{-# language ScopedTypeVariables #-}
 {-# language TypeFamilies #-}
 {-# language RecordWildCards #-}
 
diff --git a/main/Repl.hs b/main/Repl.hs
@@ -8,7 +8,6 @@
 -}
 
 {-# language MultiWayIf #-}
-{-# language ScopedTypeVariables #-}
 
 module Repl
   ( main
diff --git a/src/Nix.hs b/src/Nix.hs
@@ -1,4 +1,3 @@
-{-# language ScopedTypeVariables #-}
 
 module Nix
   ( module Nix.Cache
diff --git a/src/Nix/Builtins.hs b/src/Nix/Builtins.hs
@@ -7,7 +7,6 @@
 {-# language MultiWayIf #-}
 {-# language PartialTypeSignatures #-}
 {-# language QuasiQuotes #-}
-{-# language ScopedTypeVariables #-}
 {-# language TemplateHaskell #-}
 {-# language UndecidableInstances #-}
 {-# language PackageImports #-} -- 2021-07-05: Due to hashing Haskell IT system situation, in HNix we currently ended-up with 2 hash package dependencies @{hashing, cryptonite}@
diff --git a/src/Nix/Cited/Basic.hs b/src/Nix/Cited/Basic.hs
@@ -1,5 +1,4 @@
 {-# language GeneralizedNewtypeDeriving #-}
-{-# language ScopedTypeVariables #-}
 {-# language UndecidableInstances #-}
 {-# language PatternSynonyms    #-}
 
diff --git a/src/Nix/Convert.hs b/src/Nix/Convert.hs
@@ -1,7 +1,6 @@
 {-# language AllowAmbiguousTypes #-}
 {-# language ConstraintKinds #-}
 {-# language IncoherentInstances #-}
-{-# language ScopedTypeVariables #-}
 {-# language TypeFamilies #-}
 {-# language UndecidableInstances #-}
 
diff --git a/src/Nix/Effects/Basic.hs b/src/Nix/Effects/Basic.hs
@@ -1,5 +1,4 @@
 {-# language CPP #-}
-{-# language ScopedTypeVariables #-}
 
 module Nix.Effects.Basic where
 
diff --git a/src/Nix/Effects/Derivation.hs b/src/Nix/Effects/Derivation.hs
@@ -1,7 +1,6 @@
 {-# language DataKinds #-}
 {-# language NamedFieldPuns #-}
 {-# language RecordWildCards #-}
-{-# language ScopedTypeVariables #-}
 {-# language PackageImports #-} -- 2021-07-05: Due to hashing Haskell IT system situation, in HNix we currently ended-up with 2 hash package dependencies @{hashing, cryptonite}@
 
 module Nix.Effects.Derivation ( defaultDerivationStrict ) where
diff --git a/src/Nix/Eval.hs b/src/Nix/Eval.hs
@@ -1,7 +1,6 @@
 {-# language AllowAmbiguousTypes #-}
 {-# language ConstraintKinds #-}
 {-# language RankNTypes #-}
-{-# language ScopedTypeVariables #-}
 
 
 
diff --git a/src/Nix/Exec.hs b/src/Nix/Exec.hs
@@ -3,7 +3,6 @@
 {-# language ConstraintKinds #-}
 {-# language PartialTypeSignatures #-}
 {-# language RankNTypes #-}
-{-# language ScopedTypeVariables #-}
 {-# language TypeFamilies #-}
 {-# language UndecidableInstances #-}
 
diff --git a/src/Nix/Frames.hs b/src/Nix/Frames.hs
@@ -1,6 +1,5 @@
 {-# language ConstraintKinds #-}
 {-# language ExistentialQuantification #-}
-{-# language ScopedTypeVariables #-}
 
 -- | Definitions of Frames. Frames are messages that gather and ship themself with a context related to the message. For example - the message about some exception would also gather, keep and bring with it the tracing information.
 module Nix.Frames
diff --git a/src/Nix/Fresh/Basic.hs b/src/Nix/Fresh/Basic.hs
@@ -1,5 +1,4 @@
 {-# language CPP #-}
-{-# language ScopedTypeVariables #-}
 
 {-# options_ghc -Wno-orphans #-}
 
diff --git a/src/Nix/Lint.hs b/src/Nix/Lint.hs
@@ -3,7 +3,6 @@
 {-# language DataKinds #-}
 {-# language GADTs #-}
 {-# language GeneralizedNewtypeDeriving #-}
-{-# language ScopedTypeVariables #-}
 {-# language TypeFamilies #-}
 {-# language UndecidableInstances #-}
 
diff --git a/src/Nix/Normal.hs b/src/Nix/Normal.hs
@@ -2,7 +2,6 @@
 {-# language ConstraintKinds #-}
 {-# language DataKinds #-}
 {-# language GADTs #-}
-{-# language ScopedTypeVariables #-}
 {-# language TypeFamilies #-}
 {-# language RankNTypes #-}
 
diff --git a/src/Nix/Pretty.hs b/src/Nix/Pretty.hs
@@ -1,5 +1,4 @@
 {-# language CPP #-}
-{-# language ScopedTypeVariables #-}
 
 {-# options_ghc -fno-warn-name-shadowing #-}
 
diff --git a/src/Nix/Reduce.hs b/src/Nix/Reduce.hs
@@ -3,7 +3,6 @@
 {-# language ConstraintKinds #-}
 {-# language GeneralizedNewtypeDeriving #-}
 {-# language PartialTypeSignatures #-}
-{-# language ScopedTypeVariables #-}
 {-# language TypeFamilies #-}
 
 {-# options_ghc -fno-warn-name-shadowing #-}
diff --git a/src/Nix/Render.hs b/src/Nix/Render.hs
@@ -3,7 +3,6 @@
 {-# language ConstraintKinds #-}
 {-# language DefaultSignatures #-}
 {-# language GADTs #-}
-{-# language ScopedTypeVariables #-}
 {-# language TypeFamilies #-}
 {-# language TypeOperators #-}
 {-# language MultiWayIf #-}
diff --git a/src/Nix/Render/Frame.hs b/src/Nix/Render/Frame.hs
@@ -3,7 +3,6 @@
 {-# language ConstraintKinds #-}
 {-# language MultiWayIf #-}
 {-# language GADTs #-}
-{-# language ScopedTypeVariables #-}
 {-# language TypeFamilies #-}
 
 
diff --git a/src/Nix/Scope.hs b/src/Nix/Scope.hs
@@ -2,7 +2,6 @@
 {-# language ConstraintKinds #-}
 {-# language FunctionalDependencies #-}
 {-# language GeneralizedNewtypeDeriving #-}
-{-# language ScopedTypeVariables #-}
 
 module Nix.Scope where
 
diff --git a/src/Nix/Standard.hs b/src/Nix/Standard.hs
@@ -1,6 +1,5 @@
 {-# language TypeFamilies #-}
 {-# language CPP #-}
-{-# language ScopedTypeVariables #-}
 {-# language GeneralizedNewtypeDeriving #-}
 {-# language UndecidableInstances #-}
 
diff --git a/src/Nix/Thunk/Basic.hs b/src/Nix/Thunk/Basic.hs
@@ -1,5 +1,4 @@
 {-# language ConstraintKinds #-}
-{-# language ScopedTypeVariables #-}
 {-# language UndecidableInstances #-}
 {-# options_ghc -Wno-unused-do-bind #-}
 
diff --git a/src/Nix/Type/Infer.hs b/src/Nix/Type/Infer.hs
@@ -5,7 +5,6 @@
 {-# language ExistentialQuantification #-}
 {-# language GeneralizedNewtypeDeriving #-}
 {-# language RankNTypes #-}
-{-# language ScopedTypeVariables #-}
 {-# language TypeFamilies #-}
 
 {-# options_ghc -Wno-name-shadowing #-}
diff --git a/src/Nix/Utils.hs b/src/Nix/Utils.hs
@@ -1,6 +1,5 @@
 {-# language CPP #-}
 {-# language FunctionalDependencies #-}
-{-# language ScopedTypeVariables #-}
 {-# language TemplateHaskell #-}
 {-# language GeneralizedNewtypeDeriving #-}
 
diff --git a/src/Nix/Value.hs b/src/Nix/Value.hs
@@ -4,7 +4,6 @@
 {-# language ConstraintKinds #-}
 {-# language PatternSynonyms #-}
 {-# language RankNTypes #-}
-{-# language ScopedTypeVariables #-}
 {-# language TemplateHaskell #-}
 
 {-# options_ghc -Wno-missing-signatures #-}
diff --git a/src/Nix/Value/Equal.hs b/src/Nix/Value/Equal.hs
@@ -1,6 +1,5 @@
 {-# language AllowAmbiguousTypes #-}
 {-# language ConstraintKinds #-}
-{-# language ScopedTypeVariables #-}
 {-# language TypeFamilies #-}
 
 {-# options_ghc -Wno-missing-pattern-synonym-signatures #-}
diff --git a/src/Nix/Var.hs b/src/Nix/Var.hs
@@ -1,6 +1,5 @@
 {-# language AllowAmbiguousTypes #-}
 {-# language ConstraintKinds #-}
-{-# language ScopedTypeVariables #-}
 
 {-# options_ghc -Wno-orphans #-}
 {-# options_ghc -Wno-unused-top-binds #-}
diff --git a/src/Nix/XML.hs b/src/Nix/XML.hs
@@ -1,4 +1,3 @@
-{-# language ScopedTypeVariables #-}
 
 module Nix.XML
   ( toXML )
diff --git a/tests/EvalTests.hs b/tests/EvalTests.hs
@@ -1,5 +1,4 @@
 {-# language QuasiQuotes #-}
-{-# language ScopedTypeVariables #-}
 {-# language TemplateHaskell #-}
 
 {-# options_ghc -Wno-missing-signatures #-}
diff --git a/tests/NixLanguageTests.hs b/tests/NixLanguageTests.hs
@@ -1,4 +1,3 @@
-{-# language ScopedTypeVariables #-}
 
 module NixLanguageTests (genTests) where
 
diff --git a/tests/TestCommon.hs b/tests/TestCommon.hs
@@ -1,5 +1,4 @@
 {-# language PartialTypeSignatures #-}
-{-# language ScopedTypeVariables #-}
 
 module TestCommon where
 

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`{-# language MultiWayIf #-}`
`2`		`-{-# language ScopedTypeVariables #-}`
`3`	`2`	`{-# language TypeFamilies #-}`
`4`	`3`	`{-# language RecordWildCards #-}`
`5`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-{-# language ScopedTypeVariables #-}`
`2`	`1`
`3`	`2`	`module Nix`
`4`	`3`	`( module Nix.Cache`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`{-# language GeneralizedNewtypeDeriving #-}`
`2`		`-{-# language ScopedTypeVariables #-}`
`3`	`2`	`{-# language UndecidableInstances #-}`
`4`	`3`	`{-# language PatternSynonyms #-}`
`5`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`{-# language CPP #-}`
`2`		`-{-# language ScopedTypeVariables #-}`
`3`	`2`
`4`	`3`	`module Nix.Effects.Basic where`
`5`	`4`