handle Cabals 3.8 and 3.10

tweak orphaned instances
clinty · Sep 21, 2023 · eefed54 · eefed54
1 parent 703efd4
commit eefed54
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/src/Debian/Debianize/InputCabal.hs b/src/Debian/Debianize/InputCabal.hs
@@ -20,7 +20,11 @@ import Distribution.Compiler (CompilerInfo)
 import Distribution.Package (Package(packageId))
 import Distribution.PackageDescription as Cabal (PackageDescription)
 import Distribution.PackageDescription.Configuration (finalizePD)
+#if MIN_VERSION_Cabal(3,8,1)
+import Distribution.Simple.PackageDescription (readGenericPackageDescription)
+#else
 import Distribution.PackageDescription.Parsec (readGenericPackageDescription)
+#endif
 import Distribution.Types.ComponentRequestedSpec (ComponentRequestedSpec(ComponentRequestedSpec))
 import Distribution.Simple.Utils (defaultPackageDesc, die', setupMessage)
 import Distribution.System as Cabal (buildArch, Platform(..))

diff --git a/src/Debian/Orphans.hs b/src/Debian/Orphans.hs
@@ -34,16 +34,24 @@ deriving instance Ord AbiTag
 deriving instance Data Compiler
 deriving instance Data CompilerId
 
+#if !MIN_VERSION_Cabal(3,10,1)
 deriving instance Ord Language
+#endif
 deriving instance Ord Compiler
 deriving instance Ord NameAddr
+#if !MIN_VERSION_Cabal(3,10,1)
 deriving instance Ord License
+#endif
 
+#if !MIN_VERSION_Cabal(3,10,1)
 instance Ord Executable where
     compare = compare `on` exeName
+#endif
 
+#if !MIN_VERSION_Cabal(3,8,1)
 instance Ord PackageDescription where
     compare = compare `on` package
+#endif
 
 dropPrefix :: String -> String -> Maybe String
 dropPrefix p s = if isPrefixOf p s then Just (drop (length p) s) else Nothing