Revert changes from cabal

eta-lang · Nov 4, 2019 · 7b712f4 · 7b712f4
1 parent 3b82c9f
commit 7b712f4
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 19 deletions.
diff --git a/dhall-to-etlas.dhall b/dhall-to-etlas.dhall
@@ -31,7 +31,7 @@ let deps =
       , bytestring = pkgVer "bytestring" "0.10" "0.11"
       , containers = pkgVer "containers" "0.5" "0.6"
       , directory = pkgVer "directory" "1.2.7.1" "1.4"
-      , dhall = pkgVer "dhall" "1.25.0" "1.26"
+      , dhall = pkgVer "dhall" "1.26.0" "1.27"
       , dhall-to-etlas = pkg "dhall-to-etlas" anyVersion
       , filepath = pkgVer "filepath" "1.4" "1.5"
       , microlens = pkgVer "microlens" "0.1.0.0" "0.5"

diff --git a/dhall/types.dhall b/dhall/types.dhall
@@ -36,10 +36,10 @@
     ./types/Language.dhall
 , Library =
     ./types/Library.dhall
-, LibraryName =
-    ./types/LibraryName.dhall
-, LibraryVisibility =
-    ./types/LibraryVisibility.dhall
+-- , LibraryName =
+--     ./types/LibraryName.dhall
+-- , LibraryVisibility =
+--     ./types/LibraryVisibility.dhall
 , License =
     ./types/License.dhall
 , LicenseExceptionId =
@@ -54,8 +54,8 @@
     ./types/OS.dhall
 , Package =
     ./types/Package.dhall
-, PkgconfigVersionRange =
-    ./types/PkgconfigVersionRange.dhall
+-- , PkgconfigVersionRange =
+--    ./types/PkgconfigVersionRange.dhall
 , RepoKind =
     ./types/RepoKind.dhall
 , RepoType =

diff --git a/dhall/utils/mapBuildInfo.dhall b/dhall/utils/mapBuildInfo.dhall
@@ -1,8 +1,8 @@
 let types = ../types.dhall
 
-let mapOptional = https://github.com/dhall-lang/dhall-lang/raw/v10.0.0/Optional/map
+let mapOptional = https://raw.githubusercontent.com/dhall-lang/dhall-lang/v10.0.0/Prelude/Optional/map
 
-let mapList = https://github.com/dhall-lang/dhall-lang/raw/v10.0.0/List/map
+let mapList = https://raw.githubusercontent.com/dhall-lang/dhall-lang/v10.0.0/Prelude/List/map
 
 let mapGuarded =
 		λ(a : Type)

diff --git a/lib/DhallToCabal/FactorType.hs b/lib/DhallToCabal/FactorType.hs
@@ -56,19 +56,19 @@ data KnownType
   | Dependency
   | VersionRange
   | Version
-  | PkgconfigVersionRange
-  | SPDX
-  | LicenseId
-  | LicenseExceptionId
-  | Scope
+--  | PkgconfigVersionRange
+--  | SPDX
+--  | LicenseId
+--  | LicenseExceptionId
+--  | Scope
   | Mixin
   | ModuleRenaming
   | ForeignLibOption
   | ForeignLibType
   | TestType
   | Flag
-  | LibraryName
-  | LibraryVisibility
+--  | LibraryName
+--  | LibraryVisibility
   deriving (Bounded, Enum, Eq, Ord, Read, Show)
 
 

diff --git a/meta/Main.hs b/meta/Main.hs
@@ -89,9 +89,9 @@ typeFile = \case
   TestType -> "types/TestType.dhall"
   Mixin -> "types/Mixin.dhall"
   Flag -> "types/Flag.dhall"
-  PkgconfigVersionRange -> "types/PkgconfigVersionRange.dhall"
-  LibraryName -> "types/LibraryName.dhall"
-  LibraryVisibility -> "types/LibraryVisibility.dhall"
+--  PkgconfigVersionRange -> "types/PkgconfigVersionRange.dhall"
+--  LibraryName -> "types/LibraryName.dhall"
+--  LibraryVisibility -> "types/LibraryVisibility.dhall"
 
 
 importFile :: FilePath -> Dhall.Core.Import