update time to 1.15

(cherry picked from commit 9d8968e)

# Conflicts:
#	Cabal-syntax/Cabal-syntax.cabal
#	Cabal/Cabal.cabal
#	cabal-install/cabal-install.cabal

Author: geekosaur

Cabal-syntax/Cabal-syntax.cabal

@@ -28,6 +28,7 @@ library
   hs-source-dirs: src
 
   build-depends:
+<<<<<<< HEAD
     array      >= 0.4.0.1  && < 0.6,
     base       >= 4.13     && < 5,
     binary     >= 0.7      && < 0.9,
@@ -41,6 +42,21 @@ library
     pretty     >= 1.1.1    && < 1.2,
     text       (>= 1.2.3.0 && < 1.3) || (>= 2.0 && < 2.2),
     time       >= 1.4.0.1  && < 1.15,
+=======
+    , array      >= 0.4.0.1  && < 0.6
+    , base       >= 4.13     && < 5
+    , binary     >= 0.7      && < 0.9
+    , bytestring >= 0.10.0.0 && < 0.13
+    , containers >= 0.5.0.0  && < 0.9
+    , deepseq    >= 1.3.0.1  && < 1.7
+    , directory  >= 1.2      && < 1.4
+    , filepath   >= 1.3.0.1  && < 1.6
+    , mtl        >= 2.1      && < 2.4
+    , parsec     >= 3.1.13.0 && < 3.2
+    , pretty     >= 1.1.1    && < 1.2
+    , text       (>= 1.2.3.0 && < 1.3) || (>= 2.0 && < 2.2)
+    , time       >= 1.4.0.1  && < 1.16
+>>>>>>> 9d8968ed2 (update `time` to 1.15)
     -- transformers-0.4.0.0 doesn't have record syntax e.g. for Identity
     -- See also https://github.com/ekmett/transformers-compat/issues/35
     transformers (>= 0.3      && < 0.4) || (>=0.4.1.0 && <0.7)

Cabal/Cabal.cabal

@@ -34,6 +34,7 @@ library
   hs-source-dirs: src
 
   build-depends:
+<<<<<<< HEAD
     Cabal-syntax >= 3.14.2 && < 3.15,
     array      >= 0.4.0.1  && < 0.6,
     base       >= 4.13     && < 5,
@@ -45,6 +46,19 @@ library
     pretty     >= 1.1.1    && < 1.2,
     process    >= 1.2.1.0  && < 1.7,
     time       >= 1.4.0.1  && < 1.15
+=======
+    , Cabal-syntax ^>= 3.17
+    , array      >= 0.4.0.1  && < 0.6
+    , base       >= 4.13     && < 5
+    , bytestring >= 0.10.0.0 && < 0.13
+    , containers >= 0.5.0.0  && < 0.9
+    , deepseq    >= 1.3.0.1  && < 1.7
+    , directory  >= 1.2      && < 1.4
+    , filepath   >= 1.3.0.1  && < 1.6
+    , pretty     >= 1.1.1    && < 1.2
+    , process    >= 1.2.1.0  && < 1.7
+    , time       >= 1.4.0.1  && < 1.16
+>>>>>>> 9d8968ed2 (update `time` to 1.15)
 
   if os(windows)
     build-depends: Win32 >= 2.3.0.0 && < 2.15

cabal-install/cabal-install.cabal

@@ -219,6 +219,7 @@ library
         Distribution.Client.Win32SelfUpgrade
 
     build-depends:
+<<<<<<< HEAD
         async      >= 2.0      && < 2.3,
         array      >= 0.4      && < 0.6,
         base16-bytestring >= 0.1.1 && < 1.1,
@@ -249,6 +250,38 @@ library
         regex-posix >= 0.96.0.0 && <0.97,
         safe-exceptions >= 0.1.7.0 && < 0.2,
         semaphore-compat >= 1.0.0 && < 1.1
+=======
+      , async      >= 2.0      && < 2.3
+      , array      >= 0.4      && < 0.6
+      , base16-bytestring >= 0.1.1 && < 1.1
+      , binary     >= 0.7.3    && < 0.9
+      , bytestring >= 0.10.6.0 && < 0.13
+      , containers >= 0.5.6.2  && < 0.9
+      , cryptohash-sha256 >= 0.11 && < 0.12
+      , directory  >= 1.3.7.0  && < 1.4
+      , echo       >= 0.1.3    && < 0.2
+      , edit-distance >= 0.2.2 && < 0.3
+      , exceptions >= 0.10.4   && < 0.11
+      , filepath   >= 1.4.0.0  && < 1.6
+      , HTTP       >= 4000.1.5 && < 4000.5
+      , mtl        >= 2.0      && < 2.4
+      , network-uri >= 2.6.0.2 && < 2.7
+      , pretty     >= 1.1      && < 1.2
+      , process    >= 1.2.3.0  && < 1.7
+      , random     >= 1.2      && < 1.4
+      , stm        >= 2.0      && < 2.6
+      , tar        >= 0.5.0.3  && < 0.7
+      , time       >= 1.5.0.1  && < 1.16
+      , zlib       >= 0.5.3    && < 0.8
+      , hackage-security >= 0.6.2.0 && < 0.7
+      , text       >= 1.2.3    && < 1.3 || >= 2.0 && < 2.2
+      , parsec     >= 3.1.13.0 && < 3.2
+      , open-browser >= 0.2.1.0 && < 0.5
+      , regex-base  >= 0.94.0.0 && <0.95
+      , regex-posix >= 0.96.0.0 && <0.97
+      , safe-exceptions >= 0.1.7.0 && < 0.2
+      , semaphore-compat >= 1.0.0 && < 1.1
+>>>>>>> 9d8968ed2 (update `time` to 1.15)
 
     if flag(native-dns)
       if os(windows)