diff --git a/flake.nix b/flake.nix index 44cd951..966cecf 100644 --- a/flake.nix +++ b/flake.nix @@ -113,8 +113,10 @@ # Delete openapi.yaml from the extra-source-files ${pkgs.gnused}/bin/sed -i '/^\s*openapi\.yaml$/d' "${dir}/docker-engine.cabal" - # Patch up some problems - echo "type Map = A.Object" >> "${dir}/lib/DockerEngine/Model.hs" + # Patch up some problems. + # This "Map" type is emitted for the "Topology" definition. Not sure how to correct + # the spec, so let's just provide a type alias here. + echo "type Map = HM.HashMap String String" >> "${dir}/lib/DockerEngine/Model.hs" ''; in diff --git a/v1.36/lib/DockerEngine/Model.hs b/v1.36/lib/DockerEngine/Model.hs index 68009ae..3135270 100644 --- a/v1.36/lib/DockerEngine/Model.hs +++ b/v1.36/lib/DockerEngine/Model.hs @@ -9652,4 +9652,4 @@ toTaskState = \case -type Map = A.Object +type Map = HM.HashMap String String diff --git a/v1.37/lib/DockerEngine/Model.hs b/v1.37/lib/DockerEngine/Model.hs index fe25046..faaa0ea 100644 --- a/v1.37/lib/DockerEngine/Model.hs +++ b/v1.37/lib/DockerEngine/Model.hs @@ -9663,4 +9663,4 @@ toTaskState = \case -type Map = A.Object +type Map = HM.HashMap String String diff --git a/v1.38/lib/DockerEngine/Model.hs b/v1.38/lib/DockerEngine/Model.hs index 6e64cf1..1ed9484 100644 --- a/v1.38/lib/DockerEngine/Model.hs +++ b/v1.38/lib/DockerEngine/Model.hs @@ -9772,4 +9772,4 @@ toTaskState = \case -type Map = A.Object +type Map = HM.HashMap String String diff --git a/v1.39/lib/DockerEngine/Model.hs b/v1.39/lib/DockerEngine/Model.hs index 0823d4c..cc692f8 100644 --- a/v1.39/lib/DockerEngine/Model.hs +++ b/v1.39/lib/DockerEngine/Model.hs @@ -10194,4 +10194,4 @@ toTaskState = \case -type Map = A.Object +type Map = HM.HashMap String String diff --git a/v1.40/lib/DockerEngine/Model.hs b/v1.40/lib/DockerEngine/Model.hs index 0f55a83..3d5ea2c 100644 --- a/v1.40/lib/DockerEngine/Model.hs +++ b/v1.40/lib/DockerEngine/Model.hs @@ -10382,4 +10382,4 @@ toTaskState = \case -type Map = A.Object +type Map = HM.HashMap String String diff --git a/v1.41/lib/DockerEngine/Model.hs b/v1.41/lib/DockerEngine/Model.hs index c082b3c..40fcec2 100644 --- a/v1.41/lib/DockerEngine/Model.hs +++ b/v1.41/lib/DockerEngine/Model.hs @@ -10756,4 +10756,4 @@ toTaskState = \case -type Map = A.Object +type Map = HM.HashMap String String diff --git a/v1.42/lib/DockerEngine/Model.hs b/v1.42/lib/DockerEngine/Model.hs index 1a97ab6..209ce59 100644 --- a/v1.42/lib/DockerEngine/Model.hs +++ b/v1.42/lib/DockerEngine/Model.hs @@ -11282,4 +11282,4 @@ toTaskState = \case -type Map = A.Object +type Map = HM.HashMap String String diff --git a/v1.43/lib/DockerEngine/Model.hs b/v1.43/lib/DockerEngine/Model.hs index 79dcf28..8f937b4 100644 --- a/v1.43/lib/DockerEngine/Model.hs +++ b/v1.43/lib/DockerEngine/Model.hs @@ -11315,4 +11315,4 @@ toTaskState = \case -type Map = A.Object +type Map = HM.HashMap String String diff --git a/v1.44/lib/DockerEngine/Model.hs b/v1.44/lib/DockerEngine/Model.hs index 3096bee..29fad9e 100644 --- a/v1.44/lib/DockerEngine/Model.hs +++ b/v1.44/lib/DockerEngine/Model.hs @@ -11506,4 +11506,4 @@ toTaskState = \case -type Map = A.Object +type Map = HM.HashMap String String