Update the Nix build for dhall

... and generate the files based on that

1.12/Prelude.dhall

@@ -25,5 +25,5 @@
 -}
 
   env:DHALL_PRELUDE
-? https://raw.githubusercontent.com/dhall-lang/dhall-lang/v10.0.0/Prelude/package.dhall sha256:771c7131fc87e13eb18f770a27c59f9418879f7e230ba2a50e46f4461f43ec69
+? https://raw.githubusercontent.com/dhall-lang/dhall-lang/v17.0.0/Prelude/package.dhall sha256:10db3c919c25e9046833df897a8ffe2701dc390fa0893d958c3430524be5a43e
-? https://raw.githubusercontent.com/dhall-lang/dhall-lang/v10.0.0/Prelude/package.dhall
+? https://raw.githubusercontent.com/dhall-lang/dhall-lang/v17.0.0/Prelude/package.dhall

1.12/README.md

@@ -143,7 +143,7 @@ Things to note in the following example:
 -- examples/ingress.dhall
 
 let Prelude =
-      ../Prelude.dhall sha256:771c7131fc87e13eb18f770a27c59f9418879f7e230ba2a50e46f4461f43ec69
+      ../Prelude.dhall sha256:10db3c919c25e9046833df897a8ffe2701dc390fa0893d958c3430524be5a43e
 
 let map = Prelude.List.map
 
@@ -156,15 +156,15 @@ let services = [ { name = "foo", host = "foo.example.com", version = "2.3" } ]
 
 let makeTLS
     : Service → kubernetes.IngressTLS.Type
-    =   λ(service : Service)
+    = λ(service : Service) →
-      → { hosts = Some [ service.host ]
+        { hosts = Some [ service.host ]
         , secretName = Some "${service.name}-certificate"
         }
 
 let makeRule
     : Service → kubernetes.IngressRule.Type
-    =   λ(service : Service)
+    = λ(service : Service) →
-      → { host = Some service.host
+        { host = Some service.host
         , http = Some
           { paths =
             [ { backend =
@@ -179,8 +179,8 @@ let makeRule
 
 let mkIngress
     : List Service → kubernetes.Ingress.Type
-    =   λ(inputServices : List Service)
+    = λ(inputServices : List Service) →
-      → let annotations =
+        let annotations =
               toMap
                 { `kubernetes.io/ingress.class` = "nginx"
                 , `kubernetes.io/ingress.allow-http` = "false"
@@ -238,7 +238,7 @@ apiVersion: extensions/v1beta1
 kind: Ingress
 metadata:
   annotations:
-    kubernetes.io/ingress.allow-http: "false"
+    kubernetes.io/ingress.allow-http: 'false'
     kubernetes.io/ingress.class: nginx
   name: nginx
 spec:

1.12/examples/aws-iam-authenticator-chart.dhall

@@ -16,18 +16,11 @@ let heritage = "dhall"
 in  kubernetes.DaemonSet::{
     , metadata = kubernetes.ObjectMeta::{
       , name = Some fullName
-      , labels = Some
+      , labels = Some (toMap { app = name, chart, release, heritage })
-          ( toMap
-              { app = name
-              , chart = chart
-              , release = release
-              , heritage = heritage
-              }
-          )
       }
     , spec = Some kubernetes.DaemonSetSpec::{
       , selector = kubernetes.LabelSelector::{
-        , matchLabels = Some (toMap { app = name, release = release })
+        , matchLabels = Some (toMap { app = name, release })
         }
       , updateStrategy = Some kubernetes.DaemonSetUpdateStrategy::{
         , type = Some "RollingUpdate"
@@ -37,7 +30,7 @@ in  kubernetes.DaemonSet::{
           , name = Some name
           , annotations = Some
               (toMap { `scheduler.alpha.kubernetes.io/critical-pod` = "" })
-          , labels = Some (toMap { app = name, release = release })
+          , labels = Some (toMap { app = name, release })
           }
         , spec = Some kubernetes.PodSpec::{
           , hostNetwork = Some True

1.12/examples/deployment.dhall

@@ -1,5 +1,5 @@
 let Prelude =
-      ../Prelude.dhall sha256:771c7131fc87e13eb18f770a27c59f9418879f7e230ba2a50e46f4461f43ec69
+      ../Prelude.dhall sha256:10db3c919c25e9046833df897a8ffe2701dc390fa0893d958c3430524be5a43e
 
 let kubernetes =
       ../package.dhall sha256:f94bc36de9bc672f01cba5ef8fc2e12a2ad33a3a70e1d74abc88b15e14bc20d2

1.12/examples/ingress.dhall

@@ -1,5 +1,5 @@
 let Prelude =
-      ../Prelude.dhall sha256:771c7131fc87e13eb18f770a27c59f9418879f7e230ba2a50e46f4461f43ec69
+      ../Prelude.dhall sha256:10db3c919c25e9046833df897a8ffe2701dc390fa0893d958c3430524be5a43e
 
 let map = Prelude.List.map
 
@@ -12,15 +12,15 @@ let services = [ { name = "foo", host = "foo.example.com", version = "2.3" } ]
 
 let makeTLS
     : Service → kubernetes.IngressTLS.Type
-    =   λ(service : Service)
+    = λ(service : Service) →
-      → { hosts = Some [ service.host ]
+        { hosts = Some [ service.host ]
         , secretName = Some "${service.name}-certificate"
         }
 
 let makeRule
     : Service → kubernetes.IngressRule.Type
-    =   λ(service : Service)
+    = λ(service : Service) →
-      → { host = Some service.host
+        { host = Some service.host
         , http = Some
           { paths =
             [ { backend =
@@ -35,8 +35,8 @@ let makeRule
 
 let mkIngress
     : List Service → kubernetes.Ingress.Type
-    =   λ(inputServices : List Service)
+    = λ(inputServices : List Service) →
-      → let annotations =
+        let annotations =
               toMap
                 { `kubernetes.io/ingress.class` = "nginx"
                 , `kubernetes.io/ingress.allow-http` = "false"

1.12/examples/out/aws-iam-authenticator-chart.yaml

@@ -15,7 +15,7 @@ spec:
   template:
     metadata:
       annotations:
-        scheduler.alpha.kubernetes.io/critical-pod: ""
+        scheduler.alpha.kubernetes.io/critical-pod: ''
       labels:
         app: aws-iam-authenticator
         release: wintering-rodent
@@ -38,7 +38,7 @@ spec:
               name: output
       hostNetwork: true
       nodeSelector:
-        node-role.kubernetes.io/master: ""
+        node-role.kubernetes.io/master: ''
       tolerations:
         - effect: NoSchedule
           key: node-role.kubernetes.io/master

1.12/examples/out/deployment.yaml

@@ -27,6 +27,6 @@ spec:
             - containerPort: 80
           resources:
             limits:
-              cpu: 500m
+              cpu: "500m"
             requests:
-              cpu: 10m
+              cpu: "10m"

1.12/examples/out/ingress.yaml

@@ -2,7 +2,7 @@ apiVersion: extensions/v1beta1
 kind: Ingress
 metadata:
   annotations:
-    kubernetes.io/ingress.allow-http: "false"
+    kubernetes.io/ingress.allow-http: 'false'
     kubernetes.io/ingress.class: nginx
   name: nginx
 spec:

1.12/examples/service.dhall

@@ -1,5 +1,5 @@
 let Prelude =
-      ../Prelude.dhall sha256:771c7131fc87e13eb18f770a27c59f9418879f7e230ba2a50e46f4461f43ec69
+      ../Prelude.dhall sha256:10db3c919c25e9046833df897a8ffe2701dc390fa0893d958c3430524be5a43e
 
 let kubernetes =
       ../package.dhall sha256:f94bc36de9bc672f01cba5ef8fc2e12a2ad33a3a70e1d74abc88b15e14bc20d2

1.13/Prelude.dhall

@@ -25,5 +25,5 @@
 -}
 
   env:DHALL_PRELUDE
-? https://raw.githubusercontent.com/dhall-lang/dhall-lang/v10.0.0/Prelude/package.dhall sha256:771c7131fc87e13eb18f770a27c59f9418879f7e230ba2a50e46f4461f43ec69
+? https://raw.githubusercontent.com/dhall-lang/dhall-lang/v17.0.0/Prelude/package.dhall sha256:10db3c919c25e9046833df897a8ffe2701dc390fa0893d958c3430524be5a43e
-? https://raw.githubusercontent.com/dhall-lang/dhall-lang/v10.0.0/Prelude/package.dhall
+? https://raw.githubusercontent.com/dhall-lang/dhall-lang/v17.0.0/Prelude/package.dhall

1.13/README.md

@@ -143,7 +143,7 @@ Things to note in the following example:
 -- examples/ingress.dhall
 
 let Prelude =
-      ../Prelude.dhall sha256:771c7131fc87e13eb18f770a27c59f9418879f7e230ba2a50e46f4461f43ec69
+      ../Prelude.dhall sha256:10db3c919c25e9046833df897a8ffe2701dc390fa0893d958c3430524be5a43e
 
 let map = Prelude.List.map
 
@@ -156,15 +156,15 @@ let services = [ { name = "foo", host = "foo.example.com", version = "2.3" } ]
 
 let makeTLS
     : Service → kubernetes.IngressTLS.Type
-    =   λ(service : Service)
+    = λ(service : Service) →
-      → { hosts = Some [ service.host ]
+        { hosts = Some [ service.host ]
         , secretName = Some "${service.name}-certificate"
         }
 
 let makeRule
     : Service → kubernetes.IngressRule.Type
-    =   λ(service : Service)
+    = λ(service : Service) →
-      → { host = Some service.host
+        { host = Some service.host
         , http = Some
           { paths =
             [ { backend =
@@ -179,8 +179,8 @@ let makeRule
 
 let mkIngress
     : List Service → kubernetes.Ingress.Type
-    =   λ(inputServices : List Service)
+    = λ(inputServices : List Service) →
-      → let annotations =
+        let annotations =
               toMap
                 { `kubernetes.io/ingress.class` = "nginx"
                 , `kubernetes.io/ingress.allow-http` = "false"
@@ -238,7 +238,7 @@ apiVersion: extensions/v1beta1
 kind: Ingress
 metadata:
   annotations:
-    kubernetes.io/ingress.allow-http: "false"
+    kubernetes.io/ingress.allow-http: 'false'
     kubernetes.io/ingress.class: nginx
   name: nginx
 spec:

1.13/examples/aws-iam-authenticator-chart.dhall

@@ -16,18 +16,11 @@ let heritage = "dhall"
 in  kubernetes.DaemonSet::{
     , metadata = kubernetes.ObjectMeta::{
       , name = Some fullName
-      , labels = Some
+      , labels = Some (toMap { app = name, chart, release, heritage })
-          ( toMap
-              { app = name
-              , chart = chart
-              , release = release
-              , heritage = heritage
-              }
-          )
       }
     , spec = Some kubernetes.DaemonSetSpec::{
       , selector = kubernetes.LabelSelector::{
-        , matchLabels = Some (toMap { app = name, release = release })
+        , matchLabels = Some (toMap { app = name, release })
         }
       , updateStrategy = Some kubernetes.DaemonSetUpdateStrategy::{
         , type = Some "RollingUpdate"
@@ -37,7 +30,7 @@ in  kubernetes.DaemonSet::{
           , name = Some name
           , annotations = Some
               (toMap { `scheduler.alpha.kubernetes.io/critical-pod` = "" })
-          , labels = Some (toMap { app = name, release = release })
+          , labels = Some (toMap { app = name, release })
           }
         , spec = Some kubernetes.PodSpec::{
           , hostNetwork = Some True

1.13/examples/deployment.dhall

@@ -1,5 +1,5 @@
 let Prelude =
-      ../Prelude.dhall sha256:771c7131fc87e13eb18f770a27c59f9418879f7e230ba2a50e46f4461f43ec69
+      ../Prelude.dhall sha256:10db3c919c25e9046833df897a8ffe2701dc390fa0893d958c3430524be5a43e
 
 let kubernetes =
       ../package.dhall sha256:6966f60104bbdcbab6f6472b89710599e58ced14421ebb28885b34b94f439dae

1.13/examples/ingress.dhall

@@ -1,5 +1,5 @@
 let Prelude =
-      ../Prelude.dhall sha256:771c7131fc87e13eb18f770a27c59f9418879f7e230ba2a50e46f4461f43ec69
+      ../Prelude.dhall sha256:10db3c919c25e9046833df897a8ffe2701dc390fa0893d958c3430524be5a43e
 
 let map = Prelude.List.map
 
@@ -12,15 +12,15 @@ let services = [ { name = "foo", host = "foo.example.com", version = "2.3" } ]
 
 let makeTLS
     : Service → kubernetes.IngressTLS.Type
-    =   λ(service : Service)
+    = λ(service : Service) →
-      → { hosts = Some [ service.host ]
+        { hosts = Some [ service.host ]
         , secretName = Some "${service.name}-certificate"
         }
 
 let makeRule
     : Service → kubernetes.IngressRule.Type
-    =   λ(service : Service)
+    = λ(service : Service) →
-      → { host = Some service.host
+        { host = Some service.host
         , http = Some
           { paths =
             [ { backend =
@@ -35,8 +35,8 @@ let makeRule
 
 let mkIngress
     : List Service → kubernetes.Ingress.Type
-    =   λ(inputServices : List Service)
+    = λ(inputServices : List Service) →
-      → let annotations =
+        let annotations =
               toMap
                 { `kubernetes.io/ingress.class` = "nginx"
                 , `kubernetes.io/ingress.allow-http` = "false"

1.13/examples/out/aws-iam-authenticator-chart.yaml

@@ -15,7 +15,7 @@ spec:
   template:
     metadata:
       annotations:
-        scheduler.alpha.kubernetes.io/critical-pod: ""
+        scheduler.alpha.kubernetes.io/critical-pod: ''
       labels:
         app: aws-iam-authenticator
         release: wintering-rodent
@@ -38,7 +38,7 @@ spec:
               name: output
       hostNetwork: true
       nodeSelector:
-        node-role.kubernetes.io/master: ""
+        node-role.kubernetes.io/master: ''
       tolerations:
         - effect: NoSchedule
           key: node-role.kubernetes.io/master

1.13/examples/out/deployment.yaml

@@ -27,6 +27,6 @@ spec:
             - containerPort: 80
           resources:
             limits:
-              cpu: 500m
+              cpu: "500m"
             requests:
-              cpu: 10m
+              cpu: "10m"

1.13/examples/out/ingress.yaml

@@ -2,7 +2,7 @@ apiVersion: extensions/v1beta1
 kind: Ingress
 metadata:
   annotations:
-    kubernetes.io/ingress.allow-http: "false"
+    kubernetes.io/ingress.allow-http: 'false'
     kubernetes.io/ingress.class: nginx
   name: nginx
 spec:

1.13/examples/service.dhall

@@ -1,5 +1,5 @@
 let Prelude =
-      ../Prelude.dhall sha256:771c7131fc87e13eb18f770a27c59f9418879f7e230ba2a50e46f4461f43ec69
+      ../Prelude.dhall sha256:10db3c919c25e9046833df897a8ffe2701dc390fa0893d958c3430524be5a43e
 
 let kubernetes =
       ../package.dhall sha256:6966f60104bbdcbab6f6472b89710599e58ced14421ebb28885b34b94f439dae

1.14/Prelude.dhall

@@ -25,5 +25,5 @@
 -}
 
   env:DHALL_PRELUDE
-? https://raw.githubusercontent.com/dhall-lang/dhall-lang/v10.0.0/Prelude/package.dhall sha256:771c7131fc87e13eb18f770a27c59f9418879f7e230ba2a50e46f4461f43ec69
+? https://raw.githubusercontent.com/dhall-lang/dhall-lang/v17.0.0/Prelude/package.dhall sha256:10db3c919c25e9046833df897a8ffe2701dc390fa0893d958c3430524be5a43e
-? https://raw.githubusercontent.com/dhall-lang/dhall-lang/v10.0.0/Prelude/package.dhall
+? https://raw.githubusercontent.com/dhall-lang/dhall-lang/v17.0.0/Prelude/package.dhall

1.14/README.md

@@ -143,7 +143,7 @@ Things to note in the following example:
 -- examples/ingress.dhall
 
 let Prelude =
-      ../Prelude.dhall sha256:771c7131fc87e13eb18f770a27c59f9418879f7e230ba2a50e46f4461f43ec69
+      ../Prelude.dhall sha256:10db3c919c25e9046833df897a8ffe2701dc390fa0893d958c3430524be5a43e
 
 let map = Prelude.List.map
 
@@ -156,15 +156,15 @@ let services = [ { name = "foo", host = "foo.example.com", version = "2.3" } ]
 
 let makeTLS
     : Service → kubernetes.IngressTLS.Type
-    =   λ(service : Service)
+    = λ(service : Service) →
-      → { hosts = Some [ service.host ]
+        { hosts = Some [ service.host ]
         , secretName = Some "${service.name}-certificate"
         }
 
 let makeRule
     : Service → kubernetes.IngressRule.Type
-    =   λ(service : Service)
+    = λ(service : Service) →
-      → { host = Some service.host
+        { host = Some service.host
         , http = Some
           { paths =
             [ { backend =
@@ -179,8 +179,8 @@ let makeRule
 
 let mkIngress
     : List Service → kubernetes.Ingress.Type
-    =   λ(inputServices : List Service)
+    = λ(inputServices : List Service) →
-      → let annotations =
+        let annotations =
               toMap
                 { `kubernetes.io/ingress.class` = "nginx"
                 , `kubernetes.io/ingress.allow-http` = "false"
@@ -238,7 +238,7 @@ apiVersion: networking.k8s.io/v1beta1
 kind: Ingress
 metadata:
   annotations:
-    kubernetes.io/ingress.allow-http: "false"
+    kubernetes.io/ingress.allow-http: 'false'
     kubernetes.io/ingress.class: nginx
   name: nginx
 spec:

1.14/examples/aws-iam-authenticator-chart.dhall

@@ -16,18 +16,11 @@ let heritage = "dhall"
 in  kubernetes.DaemonSet::{
     , metadata = kubernetes.ObjectMeta::{
       , name = Some fullName
-      , labels = Some
+      , labels = Some (toMap { app = name, chart, release, heritage })
-          ( toMap
-              { app = name
-              , chart = chart
-              , release = release
-              , heritage = heritage
-              }
-          )
       }
     , spec = Some kubernetes.DaemonSetSpec::{
       , selector = kubernetes.LabelSelector::{
-        , matchLabels = Some (toMap { app = name, release = release })
+        , matchLabels = Some (toMap { app = name, release })
         }
       , updateStrategy = Some kubernetes.DaemonSetUpdateStrategy::{
         , type = Some "RollingUpdate"
@@ -37,7 +30,7 @@ in  kubernetes.DaemonSet::{
           , name = Some name
           , annotations = Some
               (toMap { `scheduler.alpha.kubernetes.io/critical-pod` = "" })
-          , labels = Some (toMap { app = name, release = release })
+          , labels = Some (toMap { app = name, release })
           }
         , spec = Some kubernetes.PodSpec::{
           , hostNetwork = Some True

1.14/examples/deployment.dhall

@@ -1,5 +1,5 @@
 let Prelude =
-      ../Prelude.dhall sha256:771c7131fc87e13eb18f770a27c59f9418879f7e230ba2a50e46f4461f43ec69
+      ../Prelude.dhall sha256:10db3c919c25e9046833df897a8ffe2701dc390fa0893d958c3430524be5a43e
 
 let kubernetes =
       ../package.dhall sha256:ca5ddb1035b4740948ee91b380beb10253ff0cd042353cb2ca685de5c0ecec0a

1.14/examples/ingress.dhall

@@ -1,5 +1,5 @@
 let Prelude =
-      ../Prelude.dhall sha256:771c7131fc87e13eb18f770a27c59f9418879f7e230ba2a50e46f4461f43ec69
+      ../Prelude.dhall sha256:10db3c919c25e9046833df897a8ffe2701dc390fa0893d958c3430524be5a43e
 
 let map = Prelude.List.map
 
@@ -12,15 +12,15 @@ let services = [ { name = "foo", host = "foo.example.com", version = "2.3" } ]
 
 let makeTLS
     : Service → kubernetes.IngressTLS.Type
-    =   λ(service : Service)
+    = λ(service : Service) →
-      → { hosts = Some [ service.host ]
+        { hosts = Some [ service.host ]
         , secretName = Some "${service.name}-certificate"
         }
 
 let makeRule
     : Service → kubernetes.IngressRule.Type
-    =   λ(service : Service)
+    = λ(service : Service) →
-      → { host = Some service.host
+        { host = Some service.host
         , http = Some
           { paths =
             [ { backend =
@@ -35,8 +35,8 @@ let makeRule
 
 let mkIngress
     : List Service → kubernetes.Ingress.Type
-    =   λ(inputServices : List Service)
+    = λ(inputServices : List Service) →
-      → let annotations =
+        let annotations =
               toMap
                 { `kubernetes.io/ingress.class` = "nginx"
                 , `kubernetes.io/ingress.allow-http` = "false"

1.14/examples/out/aws-iam-authenticator-chart.yaml

@@ -15,7 +15,7 @@ spec:
   template:
     metadata:
       annotations:
-        scheduler.alpha.kubernetes.io/critical-pod: ""
+        scheduler.alpha.kubernetes.io/critical-pod: ''
       labels:
         app: aws-iam-authenticator
         release: wintering-rodent
@@ -38,7 +38,7 @@ spec:
               name: output
       hostNetwork: true
       nodeSelector:
-        node-role.kubernetes.io/master: ""
+        node-role.kubernetes.io/master: ''
       tolerations:
         - effect: NoSchedule
           key: node-role.kubernetes.io/master

1.14/examples/out/deployment.yaml

@@ -27,6 +27,6 @@ spec:
             - containerPort: 80
           resources:
             limits:
-              cpu: 500m
+              cpu: "500m"
             requests:
-              cpu: 10m
+              cpu: "10m"

1.14/examples/out/ingress.yaml

@@ -2,7 +2,7 @@ apiVersion: networking.k8s.io/v1beta1
 kind: Ingress
 metadata:
   annotations:
-    kubernetes.io/ingress.allow-http: "false"
+    kubernetes.io/ingress.allow-http: 'false'
     kubernetes.io/ingress.class: nginx
   name: nginx
 spec:

1.14/examples/service.dhall

@@ -1,5 +1,5 @@
 let Prelude =
-      ../Prelude.dhall sha256:771c7131fc87e13eb18f770a27c59f9418879f7e230ba2a50e46f4461f43ec69
+      ../Prelude.dhall sha256:10db3c919c25e9046833df897a8ffe2701dc390fa0893d958c3430524be5a43e
 
 let kubernetes =
       ../package.dhall sha256:ca5ddb1035b4740948ee91b380beb10253ff0cd042353cb2ca685de5c0ecec0a

1.15/Prelude.dhall

@@ -25,5 +25,5 @@
 -}
 
   env:DHALL_PRELUDE
-? https://raw.githubusercontent.com/dhall-lang/dhall-lang/v10.0.0/Prelude/package.dhall sha256:771c7131fc87e13eb18f770a27c59f9418879f7e230ba2a50e46f4461f43ec69
+? https://raw.githubusercontent.com/dhall-lang/dhall-lang/v17.0.0/Prelude/package.dhall sha256:10db3c919c25e9046833df897a8ffe2701dc390fa0893d958c3430524be5a43e
-? https://raw.githubusercontent.com/dhall-lang/dhall-lang/v10.0.0/Prelude/package.dhall
+? https://raw.githubusercontent.com/dhall-lang/dhall-lang/v17.0.0/Prelude/package.dhall

1.15/README.md

@@ -143,7 +143,7 @@ Things to note in the following example:
 -- examples/ingress.dhall
 
 let Prelude =
-      ../Prelude.dhall sha256:771c7131fc87e13eb18f770a27c59f9418879f7e230ba2a50e46f4461f43ec69
+      ../Prelude.dhall sha256:10db3c919c25e9046833df897a8ffe2701dc390fa0893d958c3430524be5a43e
 
 let map = Prelude.List.map
 
@@ -156,15 +156,15 @@ let services = [ { name = "foo", host = "foo.example.com", version = "2.3" } ]
 
 let makeTLS
     : Service → kubernetes.IngressTLS.Type
-    =   λ(service : Service)
+    = λ(service : Service) →
-      → { hosts = Some [ service.host ]
+        { hosts = Some [ service.host ]
         , secretName = Some "${service.name}-certificate"
         }
 
 let makeRule
     : Service → kubernetes.IngressRule.Type
-    =   λ(service : Service)
+    = λ(service : Service) →
-      → { host = Some service.host
+        { host = Some service.host
         , http = Some
           { paths =
             [ { backend =
@@ -179,8 +179,8 @@ let makeRule
 
 let mkIngress
     : List Service → kubernetes.Ingress.Type
-    =   λ(inputServices : List Service)
+    = λ(inputServices : List Service) →
-      → let annotations =
+        let annotations =
               toMap
                 { `kubernetes.io/ingress.class` = "nginx"
                 , `kubernetes.io/ingress.allow-http` = "false"
@@ -238,7 +238,7 @@ apiVersion: networking.k8s.io/v1beta1
 kind: Ingress
 metadata:
   annotations:
-    kubernetes.io/ingress.allow-http: "false"
+    kubernetes.io/ingress.allow-http: 'false'
     kubernetes.io/ingress.class: nginx
   name: nginx
 spec:

1.15/examples/aws-iam-authenticator-chart.dhall

@@ -16,18 +16,11 @@ let heritage = "dhall"
 in  kubernetes.DaemonSet::{
     , metadata = kubernetes.ObjectMeta::{
       , name = Some fullName
-      , labels = Some
+      , labels = Some (toMap { app = name, chart, release, heritage })
-          ( toMap
-              { app = name
-              , chart = chart
-              , release = release
-              , heritage = heritage
-              }
-          )
       }
     , spec = Some kubernetes.DaemonSetSpec::{
       , selector = kubernetes.LabelSelector::{
-        , matchLabels = Some (toMap { app = name, release = release })
+        , matchLabels = Some (toMap { app = name, release })
         }
       , updateStrategy = Some kubernetes.DaemonSetUpdateStrategy::{
         , type = Some "RollingUpdate"
@@ -37,7 +30,7 @@ in  kubernetes.DaemonSet::{
           , name = Some name
           , annotations = Some
               (toMap { `scheduler.alpha.kubernetes.io/critical-pod` = "" })
-          , labels = Some (toMap { app = name, release = release })
+          , labels = Some (toMap { app = name, release })
           }
         , spec = Some kubernetes.PodSpec::{
           , hostNetwork = Some True

1.15/examples/deployment.dhall

@@ -1,5 +1,5 @@
 let Prelude =
-      ../Prelude.dhall sha256:771c7131fc87e13eb18f770a27c59f9418879f7e230ba2a50e46f4461f43ec69
+      ../Prelude.dhall sha256:10db3c919c25e9046833df897a8ffe2701dc390fa0893d958c3430524be5a43e
 
 let kubernetes =
       ../package.dhall sha256:ae33004411e418e80644ff44593639fcd03216d667817b92db205796afeccd83

1.15/examples/ingress.dhall

@@ -1,5 +1,5 @@
 let Prelude =
-      ../Prelude.dhall sha256:771c7131fc87e13eb18f770a27c59f9418879f7e230ba2a50e46f4461f43ec69
+      ../Prelude.dhall sha256:10db3c919c25e9046833df897a8ffe2701dc390fa0893d958c3430524be5a43e
 
 let map = Prelude.List.map
 
@@ -12,15 +12,15 @@ let services = [ { name = "foo", host = "foo.example.com", version = "2.3" } ]
 
 let makeTLS
     : Service → kubernetes.IngressTLS.Type
-    =   λ(service : Service)
+    = λ(service : Service) →
-      → { hosts = Some [ service.host ]
+        { hosts = Some [ service.host ]
         , secretName = Some "${service.name}-certificate"
         }
 
 let makeRule
     : Service → kubernetes.IngressRule.Type
-    =   λ(service : Service)
+    = λ(service : Service) →
-      → { host = Some service.host
+        { host = Some service.host
         , http = Some
           { paths =
             [ { backend =
@@ -35,8 +35,8 @@ let makeRule
 
 let mkIngress
     : List Service → kubernetes.Ingress.Type
-    =   λ(inputServices : List Service)
+    = λ(inputServices : List Service) →
-      → let annotations =
+        let annotations =
               toMap
                 { `kubernetes.io/ingress.class` = "nginx"
                 , `kubernetes.io/ingress.allow-http` = "false"

1.15/examples/out/aws-iam-authenticator-chart.yaml

@@ -15,7 +15,7 @@ spec:
   template:
     metadata:
       annotations:
-        scheduler.alpha.kubernetes.io/critical-pod: ""
+        scheduler.alpha.kubernetes.io/critical-pod: ''
       labels:
         app: aws-iam-authenticator
         release: wintering-rodent
@@ -38,7 +38,7 @@ spec:
               name: output
       hostNetwork: true
       nodeSelector:
-        node-role.kubernetes.io/master: ""
+        node-role.kubernetes.io/master: ''
       tolerations:
         - effect: NoSchedule
           key: node-role.kubernetes.io/master

1.15/examples/out/deployment.yaml

@@ -27,6 +27,6 @@ spec:
             - containerPort: 80
           resources:
             limits:
-              cpu: 500m
+              cpu: "500m"
             requests:
-              cpu: 10m
+              cpu: "10m"

1.15/examples/out/ingress.yaml

@@ -2,7 +2,7 @@ apiVersion: networking.k8s.io/v1beta1
 kind: Ingress
 metadata:
   annotations:
-    kubernetes.io/ingress.allow-http: "false"
+    kubernetes.io/ingress.allow-http: 'false'
     kubernetes.io/ingress.class: nginx
   name: nginx
 spec:

1.15/examples/service.dhall

@@ -1,5 +1,5 @@
 let Prelude =
-      ../Prelude.dhall sha256:771c7131fc87e13eb18f770a27c59f9418879f7e230ba2a50e46f4461f43ec69
+      ../Prelude.dhall sha256:10db3c919c25e9046833df897a8ffe2701dc390fa0893d958c3430524be5a43e
 
 let kubernetes =
       ../package.dhall sha256:ae33004411e418e80644ff44593639fcd03216d667817b92db205796afeccd83

1.16/Prelude.dhall

@@ -25,5 +25,5 @@
 -}
 
   env:DHALL_PRELUDE
-? https://raw.githubusercontent.com/dhall-lang/dhall-lang/v10.0.0/Prelude/package.dhall sha256:771c7131fc87e13eb18f770a27c59f9418879f7e230ba2a50e46f4461f43ec69
+? https://raw.githubusercontent.com/dhall-lang/dhall-lang/v17.0.0/Prelude/package.dhall sha256:10db3c919c25e9046833df897a8ffe2701dc390fa0893d958c3430524be5a43e
-? https://raw.githubusercontent.com/dhall-lang/dhall-lang/v10.0.0/Prelude/package.dhall
+? https://raw.githubusercontent.com/dhall-lang/dhall-lang/v17.0.0/Prelude/package.dhall

1.16/README.md

@@ -143,7 +143,7 @@ Things to note in the following example:
 -- examples/ingress.dhall
 
 let Prelude =
-      ../Prelude.dhall sha256:771c7131fc87e13eb18f770a27c59f9418879f7e230ba2a50e46f4461f43ec69
+      ../Prelude.dhall sha256:10db3c919c25e9046833df897a8ffe2701dc390fa0893d958c3430524be5a43e
 
 let map = Prelude.List.map
 
@@ -156,15 +156,15 @@ let services = [ { name = "foo", host = "foo.example.com", version = "2.3" } ]
 
 let makeTLS
     : Service → kubernetes.IngressTLS.Type
-    =   λ(service : Service)
+    = λ(service : Service) →
-      → { hosts = Some [ service.host ]
+        { hosts = Some [ service.host ]
         , secretName = Some "${service.name}-certificate"
         }
 
 let makeRule
     : Service → kubernetes.IngressRule.Type
-    =   λ(service : Service)
+    = λ(service : Service) →
-      → { host = Some service.host
+        { host = Some service.host
         , http = Some
           { paths =
             [ { backend =
@@ -179,8 +179,8 @@ let makeRule
 
 let mkIngress
     : List Service → kubernetes.Ingress.Type
-    =   λ(inputServices : List Service)
+    = λ(inputServices : List Service) →
-      → let annotations =
+        let annotations =
               toMap
                 { `kubernetes.io/ingress.class` = "nginx"
                 , `kubernetes.io/ingress.allow-http` = "false"
@@ -238,7 +238,7 @@ apiVersion: networking.k8s.io/v1beta1
 kind: Ingress
 metadata:
   annotations:
-    kubernetes.io/ingress.allow-http: "false"
+    kubernetes.io/ingress.allow-http: 'false'
     kubernetes.io/ingress.class: nginx
   name: nginx
 spec:

1.16/examples/aws-iam-authenticator-chart.dhall

@@ -16,18 +16,11 @@ let heritage = "dhall"
 in  kubernetes.DaemonSet::{
     , metadata = kubernetes.ObjectMeta::{
       , name = Some fullName
-      , labels = Some
+      , labels = Some (toMap { app = name, chart, release, heritage })
-          ( toMap
-              { app = name
-              , chart = chart
-              , release = release
-              , heritage = heritage
-              }
-          )
       }
     , spec = Some kubernetes.DaemonSetSpec::{
       , selector = kubernetes.LabelSelector::{
-        , matchLabels = Some (toMap { app = name, release = release })
+        , matchLabels = Some (toMap { app = name, release })
         }
       , updateStrategy = Some kubernetes.DaemonSetUpdateStrategy::{
         , type = Some "RollingUpdate"
@@ -37,7 +30,7 @@ in  kubernetes.DaemonSet::{
           , name = Some name
           , annotations = Some
               (toMap { `scheduler.alpha.kubernetes.io/critical-pod` = "" })
-          , labels = Some (toMap { app = name, release = release })
+          , labels = Some (toMap { app = name, release })
           }
         , spec = Some kubernetes.PodSpec::{
           , hostNetwork = Some True

1.16/examples/deployment.dhall

@@ -1,5 +1,5 @@
 let Prelude =
-      ../Prelude.dhall sha256:771c7131fc87e13eb18f770a27c59f9418879f7e230ba2a50e46f4461f43ec69
+      ../Prelude.dhall sha256:10db3c919c25e9046833df897a8ffe2701dc390fa0893d958c3430524be5a43e
 
 let kubernetes =
       ../package.dhall sha256:1b741038994df16ced6eaa17908bfedf535634c7a0ac4f82ce48cde26bc07a76

1.16/examples/ingress.dhall

@@ -1,5 +1,5 @@
 let Prelude =
-      ../Prelude.dhall sha256:771c7131fc87e13eb18f770a27c59f9418879f7e230ba2a50e46f4461f43ec69
+      ../Prelude.dhall sha256:10db3c919c25e9046833df897a8ffe2701dc390fa0893d958c3430524be5a43e
 
 let map = Prelude.List.map
 
@@ -12,15 +12,15 @@ let services = [ { name = "foo", host = "foo.example.com", version = "2.3" } ]
 
 let makeTLS
     : Service → kubernetes.IngressTLS.Type
-    =   λ(service : Service)
+    = λ(service : Service) →
-      → { hosts = Some [ service.host ]
+        { hosts = Some [ service.host ]
         , secretName = Some "${service.name}-certificate"
         }
 
 let makeRule
     : Service → kubernetes.IngressRule.Type
-    =   λ(service : Service)
+    = λ(service : Service) →
-      → { host = Some service.host
+        { host = Some service.host
         , http = Some
           { paths =
             [ { backend =
@@ -35,8 +35,8 @@ let makeRule
 
 let mkIngress
     : List Service → kubernetes.Ingress.Type
-    =   λ(inputServices : List Service)
+    = λ(inputServices : List Service) →
-      → let annotations =
+        let annotations =
               toMap
                 { `kubernetes.io/ingress.class` = "nginx"
                 , `kubernetes.io/ingress.allow-http` = "false"

1.16/examples/out/aws-iam-authenticator-chart.yaml

@@ -15,7 +15,7 @@ spec:
   template:
     metadata:
       annotations:
-        scheduler.alpha.kubernetes.io/critical-pod: ""
+        scheduler.alpha.kubernetes.io/critical-pod: ''
       labels:
         app: aws-iam-authenticator
         release: wintering-rodent
@@ -38,7 +38,7 @@ spec:
               name: output
       hostNetwork: true
       nodeSelector:
-        node-role.kubernetes.io/master: ""
+        node-role.kubernetes.io/master: ''
       tolerations:
         - effect: NoSchedule
           key: node-role.kubernetes.io/master

1.16/examples/out/deployment.yaml

@@ -27,6 +27,6 @@ spec:
             - containerPort: 80
           resources:
             limits:
-              cpu: 500m
+              cpu: "500m"
             requests:
-              cpu: 10m
+              cpu: "10m"

1.16/examples/out/ingress.yaml

@@ -2,7 +2,7 @@ apiVersion: networking.k8s.io/v1beta1
 kind: Ingress
 metadata:
   annotations:
-    kubernetes.io/ingress.allow-http: "false"
+    kubernetes.io/ingress.allow-http: 'false'
     kubernetes.io/ingress.class: nginx
   name: nginx
 spec:

1.16/examples/service.dhall

@@ -1,5 +1,5 @@
 let Prelude =
-      ../Prelude.dhall sha256:771c7131fc87e13eb18f770a27c59f9418879f7e230ba2a50e46f4461f43ec69
+      ../Prelude.dhall sha256:10db3c919c25e9046833df897a8ffe2701dc390fa0893d958c3430524be5a43e
 
 let kubernetes =
       ../package.dhall sha256:1b741038994df16ced6eaa17908bfedf535634c7a0ac4f82ce48cde26bc07a76

1.17/Prelude.dhall

@@ -25,5 +25,5 @@
 -}
 
   env:DHALL_PRELUDE
-? https://raw.githubusercontent.com/dhall-lang/dhall-lang/v10.0.0/Prelude/package.dhall sha256:771c7131fc87e13eb18f770a27c59f9418879f7e230ba2a50e46f4461f43ec69
+? https://raw.githubusercontent.com/dhall-lang/dhall-lang/v17.0.0/Prelude/package.dhall sha256:10db3c919c25e9046833df897a8ffe2701dc390fa0893d958c3430524be5a43e
-? https://raw.githubusercontent.com/dhall-lang/dhall-lang/v10.0.0/Prelude/package.dhall
+? https://raw.githubusercontent.com/dhall-lang/dhall-lang/v17.0.0/Prelude/package.dhall

1.17/README.md

@@ -143,7 +143,7 @@ Things to note in the following example:
 -- examples/ingress.dhall
 
 let Prelude =
-      ../Prelude.dhall sha256:771c7131fc87e13eb18f770a27c59f9418879f7e230ba2a50e46f4461f43ec69
+      ../Prelude.dhall sha256:10db3c919c25e9046833df897a8ffe2701dc390fa0893d958c3430524be5a43e
 
 let map = Prelude.List.map
 
@@ -156,15 +156,15 @@ let services = [ { name = "foo", host = "foo.example.com", version = "2.3" } ]
 
 let makeTLS
     : Service → kubernetes.IngressTLS.Type
-    =   λ(service : Service)
+    = λ(service : Service) →
-      → { hosts = Some [ service.host ]
+        { hosts = Some [ service.host ]
         , secretName = Some "${service.name}-certificate"
         }
 
 let makeRule
     : Service → kubernetes.IngressRule.Type
-    =   λ(service : Service)
+    = λ(service : Service) →
-      → { host = Some service.host
+        { host = Some service.host
         , http = Some
           { paths =
             [ { backend =
@@ -179,8 +179,8 @@ let makeRule
 
 let mkIngress
     : List Service → kubernetes.Ingress.Type
-    =   λ(inputServices : List Service)
+    = λ(inputServices : List Service) →
-      → let annotations =
+        let annotations =
               toMap
                 { `kubernetes.io/ingress.class` = "nginx"
                 , `kubernetes.io/ingress.allow-http` = "false"
@@ -238,7 +238,7 @@ apiVersion: networking.k8s.io/v1beta1
 kind: Ingress
 metadata:
   annotations:
-    kubernetes.io/ingress.allow-http: "false"
+    kubernetes.io/ingress.allow-http: 'false'
     kubernetes.io/ingress.class: nginx
   name: nginx
 spec:

1.17/examples/aws-iam-authenticator-chart.dhall

@@ -16,18 +16,11 @@ let heritage = "dhall"
 in  kubernetes.DaemonSet::{
     , metadata = kubernetes.ObjectMeta::{
       , name = Some fullName
-      , labels = Some
+      , labels = Some (toMap { app = name, chart, release, heritage })
-          ( toMap
-              { app = name
-              , chart = chart
-              , release = release
-              , heritage = heritage
-              }
-          )
       }
     , spec = Some kubernetes.DaemonSetSpec::{
       , selector = kubernetes.LabelSelector::{
-        , matchLabels = Some (toMap { app = name, release = release })
+        , matchLabels = Some (toMap { app = name, release })
         }
       , updateStrategy = Some kubernetes.DaemonSetUpdateStrategy::{
         , type = Some "RollingUpdate"
@@ -37,7 +30,7 @@ in  kubernetes.DaemonSet::{
           , name = Some name
           , annotations = Some
               (toMap { `scheduler.alpha.kubernetes.io/critical-pod` = "" })
-          , labels = Some (toMap { app = name, release = release })
+          , labels = Some (toMap { app = name, release })
           }
         , spec = Some kubernetes.PodSpec::{
           , hostNetwork = Some True

1.17/examples/deployment.dhall

@@ -1,5 +1,5 @@
 let Prelude =
-      ../Prelude.dhall sha256:771c7131fc87e13eb18f770a27c59f9418879f7e230ba2a50e46f4461f43ec69
+      ../Prelude.dhall sha256:10db3c919c25e9046833df897a8ffe2701dc390fa0893d958c3430524be5a43e
 
 let kubernetes =
       ../package.dhall sha256:7150ac4309a091740321a3a3582e7695ee4b81732ce8f1ed1691c1c52791daa1

1.17/examples/ingress.dhall

@@ -1,5 +1,5 @@
 let Prelude =
-      ../Prelude.dhall sha256:771c7131fc87e13eb18f770a27c59f9418879f7e230ba2a50e46f4461f43ec69
+      ../Prelude.dhall sha256:10db3c919c25e9046833df897a8ffe2701dc390fa0893d958c3430524be5a43e
 
 let map = Prelude.List.map
 
@@ -12,15 +12,15 @@ let services = [ { name = "foo", host = "foo.example.com", version = "2.3" } ]
 
 let makeTLS
     : Service → kubernetes.IngressTLS.Type
-    =   λ(service : Service)
+    = λ(service : Service) →
-      → { hosts = Some [ service.host ]
+        { hosts = Some [ service.host ]
         , secretName = Some "${service.name}-certificate"
         }
 
 let makeRule
     : Service → kubernetes.IngressRule.Type
-    =   λ(service : Service)
+    = λ(service : Service) →
-      → { host = Some service.host
+        { host = Some service.host
         , http = Some
           { paths =
             [ { backend =
@@ -35,8 +35,8 @@ let makeRule
 
 let mkIngress
     : List Service → kubernetes.Ingress.Type
-    =   λ(inputServices : List Service)
+    = λ(inputServices : List Service) →
-      → let annotations =
+        let annotations =
               toMap
                 { `kubernetes.io/ingress.class` = "nginx"
                 , `kubernetes.io/ingress.allow-http` = "false"

1.17/examples/out/aws-iam-authenticator-chart.yaml

@@ -15,7 +15,7 @@ spec:
   template:
     metadata:
       annotations:
-        scheduler.alpha.kubernetes.io/critical-pod: ""
+        scheduler.alpha.kubernetes.io/critical-pod: ''
       labels:
         app: aws-iam-authenticator
         release: wintering-rodent
@@ -38,7 +38,7 @@ spec:
               name: output
       hostNetwork: true
       nodeSelector:
-        node-role.kubernetes.io/master: ""
+        node-role.kubernetes.io/master: ''
       tolerations:
         - effect: NoSchedule
           key: node-role.kubernetes.io/master

1.17/examples/out/deployment.yaml

@@ -27,6 +27,6 @@ spec:
             - containerPort: 80
           resources:
             limits:
-              cpu: 500m
+              cpu: "500m"
             requests:
-              cpu: 10m
+              cpu: "10m"

1.17/examples/out/ingress.yaml

@@ -2,7 +2,7 @@ apiVersion: networking.k8s.io/v1beta1
 kind: Ingress
 metadata:
   annotations:
-    kubernetes.io/ingress.allow-http: "false"
+    kubernetes.io/ingress.allow-http: 'false'
     kubernetes.io/ingress.class: nginx
   name: nginx
 spec:

1.17/examples/service.dhall

@@ -1,5 +1,5 @@
 let Prelude =
-      ../Prelude.dhall sha256:771c7131fc87e13eb18f770a27c59f9418879f7e230ba2a50e46f4461f43ec69
+      ../Prelude.dhall sha256:10db3c919c25e9046833df897a8ffe2701dc390fa0893d958c3430524be5a43e
 
 let kubernetes =
       ../package.dhall sha256:7150ac4309a091740321a3a3582e7695ee4b81732ce8f1ed1691c1c52791daa1

Prelude.dhall

@@ -25,5 +25,5 @@
 -}
 
   env:DHALL_PRELUDE
-? https://raw.githubusercontent.com/dhall-lang/dhall-lang/v10.0.0/Prelude/package.dhall sha256:771c7131fc87e13eb18f770a27c59f9418879f7e230ba2a50e46f4461f43ec69
+? https://raw.githubusercontent.com/dhall-lang/dhall-lang/v17.0.0/Prelude/package.dhall sha256:10db3c919c25e9046833df897a8ffe2701dc390fa0893d958c3430524be5a43e
-? https://raw.githubusercontent.com/dhall-lang/dhall-lang/v10.0.0/Prelude/package.dhall
+? https://raw.githubusercontent.com/dhall-lang/dhall-lang/v17.0.0/Prelude/package.dhall

dhall-kubernetes-generator/dhall-kubernetes-generator.cabal

@@ -24,8 +24,8 @@ executable dhall-kubernetes-generator
     aeson                   >= 1.0.0.0   && < 1.5  ,
     containers              >= 0.5.0.0   && < 0.7  ,
     dhall                   >= 1.22.0    && < 1.34 ,
-    megaparsec              >= 7.0       && < 7.1  ,
+    megaparsec              >= 7.0       && < 8.1  ,
-    optparse-applicative    >= 0.14.3.0  && < 0.15 ,
+    optparse-applicative    >= 0.14.3.0  && < 0.16 ,
     parser-combinators      >= 1.0.3     && < 1.3  ,
     prettyprinter           >= 1.2.0.1   && < 1.7  ,
     sort                    >= 1.0       && < 1.1  ,

dhall-kubernetes-generator/src/Main.hs

@@ -11,6 +11,7 @@ import Data.Text (Text, pack)
 import Data.Void (Void)
 import Data.Yaml
 import Dhall.Core (Expr(..))
+import Dhall.Format (Format(..))
 import Dhall.Kubernetes.Data (patchCyclicImports)
 import Numeric.Natural (Natural)
 import Text.Megaparsec (Parsec, some, parse, (<|>), errorBundlePretty)

nix/haskell/cborg-json.nix

@@ -1,20 +0,0 @@
-{ mkDerivation, aeson, aeson-pretty, base, bytestring, cborg
-, criterion, deepseq, directory, process, scientific, stdenv, text
-, unordered-containers, vector, zlib
-}:
-mkDerivation {
-  pname = "cborg-json";
-  version = "0.2.2.0";
-  sha256 = "ab68a2457cb71a76699d7a8df07a880ea70c51d2c1a891b12669ca9ccfa7517b";
-  libraryHaskellDepends = [
-    aeson aeson-pretty base cborg scientific text unordered-containers
-    vector
-  ];
-  benchmarkHaskellDepends = [
-    aeson base bytestring cborg criterion deepseq directory process
-    zlib
-  ];
-  homepage = "https://github.com/well-typed/cborg";
-  description = "A library for encoding JSON as CBOR";
-  license = stdenv.lib.licenses.bsd3;
-}

nix/haskell/dhall-json.nix

@@ -1,29 +0,0 @@
-{ mkDerivation, aeson, aeson-pretty, aeson-yaml, ansi-terminal
-, base, bytestring, containers, dhall, exceptions, filepath
-, optparse-applicative, prettyprinter, prettyprinter-ansi-terminal
-, scientific, stdenv, tasty, tasty-hunit, text
-, unordered-containers, vector
-}:
-mkDerivation {
-  pname = "dhall-json";
-  version = "1.6.1";
-  sha256 = "3ce9b0a9d3a946beb021bb42589426ceb4c44cf5f104e5bdf120659ccb5109c9";
-  revision = "1";
-  editedCabalFile = "07h7vldqd623y7jf15j87mhs3nnbwl3a0121ajqc56qc0vvpgywp";
-  isLibrary = true;
-  isExecutable = true;
-  libraryHaskellDepends = [
-    aeson aeson-pretty aeson-yaml base bytestring containers dhall
-    exceptions filepath optparse-applicative prettyprinter scientific
-    text unordered-containers vector
-  ];
-  executableHaskellDepends = [
-    aeson aeson-pretty ansi-terminal base bytestring dhall exceptions
-    optparse-applicative prettyprinter prettyprinter-ansi-terminal text
-  ];
-  testHaskellDepends = [
-    aeson base bytestring dhall tasty tasty-hunit text
-  ];
-  description = "Convert between Dhall and JSON or YAML";
-  license = stdenv.lib.licenses.bsd3;
-}

nix/haskell/dhall.nix

@@ -1,49 +0,0 @@
-{ mkDerivation, aeson, aeson-pretty, ansi-terminal, atomic-write
-, base, bytestring, case-insensitive, cborg, cborg-json, containers
-, contravariant, cryptonite, data-fix, deepseq, Diff, directory
-, doctest, dotgen, either, exceptions, filepath, foldl, gauge
-, generic-random, hashable, haskeline, http-client, http-client-tls
-, http-types, lens-family-core, megaparsec, memory, mockery, mtl
-, network-uri, optparse-applicative, parsers, pretty-simple
-, prettyprinter, prettyprinter-ansi-terminal, profunctors
-, QuickCheck, quickcheck-instances, repline, scientific, semigroups
-, serialise, special-values, spoon, stdenv, tasty
-, tasty-expected-failure, tasty-hunit, tasty-quickcheck
-, template-haskell, text, th-lift-instances, transformers
-, transformers-compat, turtle, unordered-containers, uri-encode
-, vector
-}:
-mkDerivation {
-  pname = "dhall";
-  version = "1.29.0";
-  sha256 = "c73e59717ff15707c77f3ff582f5adf68fc7abc68dbf70aa77ce65333637e7f6";
-  revision = "2";
-  editedCabalFile = "1qksvk63vmypqcd9hasacmqw7gsqcggs5lk85x7w2731mh3c3sa8";
-  isLibrary = true;
-  isExecutable = true;
-  libraryHaskellDepends = [
-    aeson aeson-pretty ansi-terminal atomic-write base bytestring
-    case-insensitive cborg cborg-json containers contravariant
-    cryptonite data-fix deepseq Diff directory dotgen either exceptions
-    filepath hashable haskeline http-client http-client-tls http-types
-    lens-family-core megaparsec memory mtl network-uri
-    optparse-applicative parsers pretty-simple prettyprinter
-    prettyprinter-ansi-terminal profunctors repline scientific
-    serialise template-haskell text th-lift-instances transformers
-    transformers-compat unordered-containers uri-encode vector
-  ];
-  executableHaskellDepends = [ base ];
-  testHaskellDepends = [
-    base bytestring cborg containers data-fix deepseq directory doctest
-    either filepath foldl generic-random lens-family-core megaparsec
-    mockery prettyprinter QuickCheck quickcheck-instances scientific
-    semigroups serialise special-values spoon tasty
-    tasty-expected-failure tasty-hunit tasty-quickcheck text
-    transformers turtle unordered-containers vector
-  ];
-  benchmarkHaskellDepends = [
-    base bytestring containers directory gauge serialise text
-  ];
-  description = "A configuration language guaranteed to terminate";
-  license = stdenv.lib.licenses.bsd3;
-}

nix/haskell/prettyprinter.nix

@@ -1,24 +0,0 @@
-{ mkDerivation, ansi-wl-pprint, base, base-compat, bytestring
-, containers, deepseq, doctest, gauge, mtl, pgp-wordlist
-, QuickCheck, quickcheck-instances, random, stdenv, tasty
-, tasty-hunit, tasty-quickcheck, text, transformers
-}:
-mkDerivation {
-  pname = "prettyprinter";
-  version = "1.6.0";
-  sha256 = "fdaa85aeaff852c3d96f1ac2a323bc1dd96e0061185d11cdc4d1cdb269f5f2f5";
-  isLibrary = true;
-  isExecutable = true;
-  libraryHaskellDepends = [ base text ];
-  testHaskellDepends = [
-    base bytestring doctest pgp-wordlist QuickCheck
-    quickcheck-instances tasty tasty-hunit tasty-quickcheck text
-  ];
-  benchmarkHaskellDepends = [
-    ansi-wl-pprint base base-compat containers deepseq gauge mtl
-    QuickCheck random text transformers
-  ];
-  homepage = "http://github.com/quchen/prettyprinter";
-  description = "A modern, easy to use, well-documented, extensible pretty-printer";
-  license = stdenv.lib.licenses.bsd2;
-}

nix/nixpkgs.json

@@ -1,7 +1,9 @@
 {
   "url": "https://github.com/NixOS/nixpkgs.git",
-  "rev": "8f3ca4ec1686251bab083c37d0a4e96f45bc495f",
+  "rev": "2cd2e7267e5b9a960c2997756cb30e86f0958a6b",
-  "date": "2019-12-10T15:32:27-05:00",
+  "date": "2020-06-23T09:46:29+03:00",
-  "sha256": "0f09m8kp6akxx8m6z9iw95njsja37ihhkwpldmh24zvgaclgv5qj",
+  "sha256": "0ir3rk776wldyjz6l6y5c5fs8lqk95gsik6w45wxgk6zdpsvhrn5",
-  "fetchSubmodules": false
+  "fetchSubmodules": false,
+  "deepClone": false,
+  "leaveDotGit": false
 }

nix/nixpkgs.nix

@@ -109,8 +109,6 @@ let
              previous = old.overrides or (_: _: {});
 
              packages = pkgsNew.haskell.lib.packageSourceOverrides {
-               dhall-json = "1.5.0";
-
                dhall-kubernetes-generator = ../dhall-kubernetes-generator;
              };
 
@@ -119,20 +117,16 @@ let
              };
 
              manual = haskellPackagesNew: haskellPackagesOld: {
-               dhall = pkgsNew.haskell.lib.dontCheck haskellPackagesOld.dhall;
+               dhall = haskellPackagesOld.dhall_1_33_0;
 
-               dhall-json =
+               dhall-json = haskellPackagesOld.dhall-json_1_7_0;
-                 pkgsNew.haskell.lib.dontCheck haskellPackagesOld.dhall-json;
-
-               prettyprinter =
-                 pkgsNew.haskell.lib.dontCheck haskellPackagesOld.prettyprinter;
              };
 
            in
              pkgsNew.lib.fold pkgsNew.lib.composeExtensions (_: _: {})
                [ previous
                  packages
-                 packagesFromDirectory
+#                packagesFromDirectory
                  manual
                ];
       }