From 2db84bb673abf53c09e5c9282d2dcef53d968d8d Mon Sep 17 00:00:00 2001 From: Gabriel Gonzalez Date: Mon, 29 Jun 2020 16:32:28 -0700 Subject: [PATCH] Update the Nix build for `dhall` ... and generate the files based on that --- 1.12/Prelude.dhall | 4 +- 1.12/README.md | 34 +++---- .../aws-iam-authenticator-chart.dhall | 99 +++++++++---------- 1.12/examples/deployment.dhall | 16 +-- 1.12/examples/deploymentSimple.dhall | 2 +- 1.12/examples/ingress.dhall | 30 +++--- .../out/aws-iam-authenticator-chart.yaml | 4 +- 1.12/examples/out/deployment.yaml | 4 +- 1.12/examples/out/ingress.yaml | 2 +- 1.12/examples/service.dhall | 12 +-- 1.13/Prelude.dhall | 4 +- 1.13/README.md | 34 +++---- .../aws-iam-authenticator-chart.dhall | 99 +++++++++---------- 1.13/examples/deployment.dhall | 16 +-- 1.13/examples/deploymentSimple.dhall | 2 +- 1.13/examples/ingress.dhall | 30 +++--- .../out/aws-iam-authenticator-chart.yaml | 4 +- 1.13/examples/out/deployment.yaml | 4 +- 1.13/examples/out/ingress.yaml | 2 +- 1.13/examples/service.dhall | 12 +-- 1.14/Prelude.dhall | 4 +- 1.14/README.md | 34 +++---- .../aws-iam-authenticator-chart.dhall | 99 +++++++++---------- 1.14/examples/deployment.dhall | 16 +-- 1.14/examples/deploymentSimple.dhall | 2 +- 1.14/examples/ingress.dhall | 30 +++--- .../out/aws-iam-authenticator-chart.yaml | 4 +- 1.14/examples/out/deployment.yaml | 4 +- 1.14/examples/out/ingress.yaml | 2 +- 1.14/examples/service.dhall | 12 +-- 1.15/Prelude.dhall | 4 +- 1.15/README.md | 34 +++---- .../aws-iam-authenticator-chart.dhall | 99 +++++++++---------- 1.15/examples/deployment.dhall | 16 +-- 1.15/examples/deploymentSimple.dhall | 2 +- 1.15/examples/ingress.dhall | 30 +++--- .../out/aws-iam-authenticator-chart.yaml | 4 +- 1.15/examples/out/deployment.yaml | 4 +- 1.15/examples/out/ingress.yaml | 2 +- 1.15/examples/service.dhall | 12 +-- 1.16/Prelude.dhall | 4 +- 1.16/README.md | 34 +++---- .../aws-iam-authenticator-chart.dhall | 99 +++++++++---------- 1.16/examples/deployment.dhall | 16 +-- 1.16/examples/deploymentSimple.dhall | 2 +- 1.16/examples/ingress.dhall | 30 +++--- .../out/aws-iam-authenticator-chart.yaml | 4 +- 1.16/examples/out/deployment.yaml | 4 +- 1.16/examples/out/ingress.yaml | 2 +- 1.16/examples/service.dhall | 12 +-- 1.17/Prelude.dhall | 4 +- 1.17/README.md | 34 +++---- .../aws-iam-authenticator-chart.dhall | 99 +++++++++---------- 1.17/examples/deployment.dhall | 16 +-- 1.17/examples/deploymentSimple.dhall | 2 +- 1.17/examples/ingress.dhall | 30 +++--- .../out/aws-iam-authenticator-chart.yaml | 4 +- 1.17/examples/out/deployment.yaml | 4 +- 1.17/examples/out/ingress.yaml | 2 +- 1.17/examples/service.dhall | 12 +-- Prelude.dhall | 4 +- .../dhall-kubernetes-generator.cabal | 4 +- dhall-kubernetes-generator/src/Main.hs | 1 + nix/haskell/cborg-json.nix | 20 ---- nix/haskell/dhall-json.nix | 29 ------ nix/haskell/dhall.nix | 49 --------- nix/haskell/prettyprinter.nix | 24 ----- nix/nixpkgs.json | 10 +- nix/nixpkgs.nix | 12 +-- 69 files changed, 614 insertions(+), 781 deletions(-) delete mode 100644 nix/haskell/cborg-json.nix delete mode 100644 nix/haskell/dhall-json.nix delete mode 100644 nix/haskell/dhall.nix delete mode 100644 nix/haskell/prettyprinter.nix diff --git a/1.12/Prelude.dhall b/1.12/Prelude.dhall index 6996e86..bd43aa3 100644 --- a/1.12/Prelude.dhall +++ b/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/v10.0.0/Prelude/package.dhall +? https://raw.githubusercontent.com/dhall-lang/dhall-lang/v17.0.0/Prelude/package.dhall sha256:10db3c919c25e9046833df897a8ffe2701dc390fa0893d958c3430524be5a43e +? https://raw.githubusercontent.com/dhall-lang/dhall-lang/v17.0.0/Prelude/package.dhall diff --git a/1.12/README.md b/1.12/README.md index 6a2cdac..8d2b78a 100644 --- a/1.12/README.md +++ b/1.12/README.md @@ -71,7 +71,7 @@ let deployment = , name = "nginx" , image = Some "nginx:1.15.3" , ports = Some - [ kubernetes.ContainerPort::{ containerPort = 80 } ] + [ kubernetes.ContainerPort::{ containerPort = 80 } ] } ] } @@ -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,31 +156,31 @@ let services = [ { name = "foo", host = "foo.example.com", version = "2.3" } ] let makeTLS : Service → kubernetes.IngressTLS.Type - = λ(service : Service) - → { hosts = Some [ service.host ] + = λ(service : Service) → + { hosts = Some [ service.host ] , secretName = Some "${service.name}-certificate" } let makeRule : Service → kubernetes.IngressRule.Type - = λ(service : Service) - → { host = Some service.host + = λ(service : Service) → + { host = Some service.host , http = Some - { paths = - [ { backend = - { serviceName = service.name - , servicePort = kubernetes.IntOrString.Int 80 - } - , path = None Text + { paths = + [ { backend = + { serviceName = service.name + , servicePort = kubernetes.IntOrString.Int 80 } - ] - } + , path = None Text + } + ] + } } let mkIngress : List Service → kubernetes.Ingress.Type - = λ(inputServices : List Service) - → let annotations = + = λ(inputServices : List Service) → + 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: diff --git a/1.12/examples/aws-iam-authenticator-chart.dhall b/1.12/examples/aws-iam-authenticator-chart.dhall index ef0a60f..2abc81e 100644 --- a/1.12/examples/aws-iam-authenticator-chart.dhall +++ b/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 - ( toMap - { app = name - , chart = chart - , release = release - , heritage = heritage - } - ) + , labels = Some (toMap { app = name, chart, release, 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,68 +30,68 @@ 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 , nodeSelector = Some (toMap { `node-role.kubernetes.io/master` = "" }) , tolerations = Some - [ kubernetes.Toleration::{ - , effect = Some "NoSchedule" - , key = Some "node-role.kubernetes.io/master" - } - , kubernetes.Toleration::{ - , effect = Some "CriticalAddonsOnly" - , key = Some "Exists" - } - ] + [ kubernetes.Toleration::{ + , effect = Some "NoSchedule" + , key = Some "node-role.kubernetes.io/master" + } + , kubernetes.Toleration::{ + , effect = Some "CriticalAddonsOnly" + , key = Some "Exists" + } + ] , containers = [ kubernetes.Container::{ , name = fullName , image = Some "gcr.io/heptio-images/authenticator:v0.1.0" , args = Some - [ "server" - , "--config=/etc/aws-iam-authenticator/config.yaml" - , "--state-dir=/var/aws-iam-authenticator" - , "--generate-kubeconfig=/etc/kubernetes/aws-iam-authenticator/kubeconfig.yaml" - ] + [ "server" + , "--config=/etc/aws-iam-authenticator/config.yaml" + , "--state-dir=/var/aws-iam-authenticator" + , "--generate-kubeconfig=/etc/kubernetes/aws-iam-authenticator/kubeconfig.yaml" + ] , volumeMounts = Some - [ kubernetes.VolumeMount::{ - , name = "config" - , mountPath = "/etc/aws-iam-authenticator/" - } - , kubernetes.VolumeMount::{ - , name = "state" - , mountPath = "/var/aws-iam-authenticator/" - } - , kubernetes.VolumeMount::{ - , name = "output" - , mountPath = "/etc/kubernetes/aws-iam-authenticator/" - } - ] + [ kubernetes.VolumeMount::{ + , name = "config" + , mountPath = "/etc/aws-iam-authenticator/" + } + , kubernetes.VolumeMount::{ + , name = "state" + , mountPath = "/var/aws-iam-authenticator/" + } + , kubernetes.VolumeMount::{ + , name = "output" + , mountPath = "/etc/kubernetes/aws-iam-authenticator/" + } + ] } ] , volumes = Some - [ kubernetes.Volume::{ - , name = "config" - , configMap = Some kubernetes.ConfigMapVolumeSource::{ - , name = Some fullName - } + [ kubernetes.Volume::{ + , name = "config" + , configMap = Some kubernetes.ConfigMapVolumeSource::{ + , name = Some fullName } - , kubernetes.Volume::{ - , name = "output" - , hostPath = Some kubernetes.HostPathVolumeSource::{ - , path = "/srv/kubernetes/aws-iam-authenticator/" - } + } + , kubernetes.Volume::{ + , name = "output" + , hostPath = Some kubernetes.HostPathVolumeSource::{ + , path = "/srv/kubernetes/aws-iam-authenticator/" } - , kubernetes.Volume::{ - , name = "state" - , hostPath = Some kubernetes.HostPathVolumeSource::{ - , path = "/srv/kubernetes/aws-iam-authenticator/" - } + } + , kubernetes.Volume::{ + , name = "state" + , hostPath = Some kubernetes.HostPathVolumeSource::{ + , path = "/srv/kubernetes/aws-iam-authenticator/" } - ] + } + ] } } } diff --git a/1.12/examples/deployment.dhall b/1.12/examples/deployment.dhall index 753eef2..5b9c7b8 100644 --- a/1.12/examples/deployment.dhall +++ b/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 @@ -16,9 +16,9 @@ let deployment = , strategy = Some kubernetes.DeploymentStrategy::{ , type = Some "RollingUpdate" , rollingUpdate = Some - { maxSurge = Some (kubernetes.IntOrString.Int 5) - , maxUnavailable = Some (kubernetes.IntOrString.Int 0) - } + { maxSurge = Some (kubernetes.IntOrString.Int 5) + , maxUnavailable = Some (kubernetes.IntOrString.Int 0) + } } , template = kubernetes.PodTemplateSpec::{ , metadata = kubernetes.ObjectMeta::{ @@ -32,11 +32,11 @@ let deployment = , image = Some "nginx:1.15.3" , imagePullPolicy = Some "Always" , ports = Some - [ kubernetes.ContainerPort::{ containerPort = 80 } ] + [ kubernetes.ContainerPort::{ containerPort = 80 } ] , resources = Some - { limits = Some (toMap { cpu = "500m" }) - , requests = Some (toMap { cpu = "10m" }) - } + { limits = Some (toMap { cpu = "500m" }) + , requests = Some (toMap { cpu = "10m" }) + } } ] } diff --git a/1.12/examples/deploymentSimple.dhall b/1.12/examples/deploymentSimple.dhall index 8bac388..c4665fc 100644 --- a/1.12/examples/deploymentSimple.dhall +++ b/1.12/examples/deploymentSimple.dhall @@ -17,7 +17,7 @@ let deployment = , name = "nginx" , image = Some "nginx:1.15.3" , ports = Some - [ kubernetes.ContainerPort::{ containerPort = 80 } ] + [ kubernetes.ContainerPort::{ containerPort = 80 } ] } ] } diff --git a/1.12/examples/ingress.dhall b/1.12/examples/ingress.dhall index e56d663..fa17180 100644 --- a/1.12/examples/ingress.dhall +++ b/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,31 +12,31 @@ let services = [ { name = "foo", host = "foo.example.com", version = "2.3" } ] let makeTLS : Service → kubernetes.IngressTLS.Type - = λ(service : Service) - → { hosts = Some [ service.host ] + = λ(service : Service) → + { hosts = Some [ service.host ] , secretName = Some "${service.name}-certificate" } let makeRule : Service → kubernetes.IngressRule.Type - = λ(service : Service) - → { host = Some service.host + = λ(service : Service) → + { host = Some service.host , http = Some - { paths = - [ { backend = - { serviceName = service.name - , servicePort = kubernetes.IntOrString.Int 80 - } - , path = None Text + { paths = + [ { backend = + { serviceName = service.name + , servicePort = kubernetes.IntOrString.Int 80 } - ] - } + , path = None Text + } + ] + } } let mkIngress : List Service → kubernetes.Ingress.Type - = λ(inputServices : List Service) - → let annotations = + = λ(inputServices : List Service) → + let annotations = toMap { `kubernetes.io/ingress.class` = "nginx" , `kubernetes.io/ingress.allow-http` = "false" diff --git a/1.12/examples/out/aws-iam-authenticator-chart.yaml b/1.12/examples/out/aws-iam-authenticator-chart.yaml index b4c3dd3..6492e48 100644 --- a/1.12/examples/out/aws-iam-authenticator-chart.yaml +++ b/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 diff --git a/1.12/examples/out/deployment.yaml b/1.12/examples/out/deployment.yaml index 75add54..6bc18dc 100644 --- a/1.12/examples/out/deployment.yaml +++ b/1.12/examples/out/deployment.yaml @@ -27,6 +27,6 @@ spec: - containerPort: 80 resources: limits: - cpu: 500m + cpu: "500m" requests: - cpu: 10m + cpu: "10m" diff --git a/1.12/examples/out/ingress.yaml b/1.12/examples/out/ingress.yaml index 4d56edb..f9e2027 100644 --- a/1.12/examples/out/ingress.yaml +++ b/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: diff --git a/1.12/examples/service.dhall b/1.12/examples/service.dhall index 43154c6..0a51cd3 100644 --- a/1.12/examples/service.dhall +++ b/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 @@ -8,11 +8,11 @@ let spec = { selector = Some (toMap { app = "nginx" }) , type = Some "NodePort" , ports = Some - [ kubernetes.ServicePort::{ - , targetPort = Some (kubernetes.IntOrString.Int 80) - , port = 80 - } - ] + [ kubernetes.ServicePort::{ + , targetPort = Some (kubernetes.IntOrString.Int 80) + , port = 80 + } + ] } let service diff --git a/1.13/Prelude.dhall b/1.13/Prelude.dhall index 6996e86..bd43aa3 100644 --- a/1.13/Prelude.dhall +++ b/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/v10.0.0/Prelude/package.dhall +? https://raw.githubusercontent.com/dhall-lang/dhall-lang/v17.0.0/Prelude/package.dhall sha256:10db3c919c25e9046833df897a8ffe2701dc390fa0893d958c3430524be5a43e +? https://raw.githubusercontent.com/dhall-lang/dhall-lang/v17.0.0/Prelude/package.dhall diff --git a/1.13/README.md b/1.13/README.md index bb018d9..034dce3 100644 --- a/1.13/README.md +++ b/1.13/README.md @@ -71,7 +71,7 @@ let deployment = , name = "nginx" , image = Some "nginx:1.15.3" , ports = Some - [ kubernetes.ContainerPort::{ containerPort = 80 } ] + [ kubernetes.ContainerPort::{ containerPort = 80 } ] } ] } @@ -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,31 +156,31 @@ let services = [ { name = "foo", host = "foo.example.com", version = "2.3" } ] let makeTLS : Service → kubernetes.IngressTLS.Type - = λ(service : Service) - → { hosts = Some [ service.host ] + = λ(service : Service) → + { hosts = Some [ service.host ] , secretName = Some "${service.name}-certificate" } let makeRule : Service → kubernetes.IngressRule.Type - = λ(service : Service) - → { host = Some service.host + = λ(service : Service) → + { host = Some service.host , http = Some - { paths = - [ { backend = - { serviceName = service.name - , servicePort = kubernetes.IntOrString.Int 80 - } - , path = None Text + { paths = + [ { backend = + { serviceName = service.name + , servicePort = kubernetes.IntOrString.Int 80 } - ] - } + , path = None Text + } + ] + } } let mkIngress : List Service → kubernetes.Ingress.Type - = λ(inputServices : List Service) - → let annotations = + = λ(inputServices : List Service) → + 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: diff --git a/1.13/examples/aws-iam-authenticator-chart.dhall b/1.13/examples/aws-iam-authenticator-chart.dhall index c908514..f76314a 100644 --- a/1.13/examples/aws-iam-authenticator-chart.dhall +++ b/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 - ( toMap - { app = name - , chart = chart - , release = release - , heritage = heritage - } - ) + , labels = Some (toMap { app = name, chart, release, 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,68 +30,68 @@ 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 , nodeSelector = Some (toMap { `node-role.kubernetes.io/master` = "" }) , tolerations = Some - [ kubernetes.Toleration::{ - , effect = Some "NoSchedule" - , key = Some "node-role.kubernetes.io/master" - } - , kubernetes.Toleration::{ - , effect = Some "CriticalAddonsOnly" - , key = Some "Exists" - } - ] + [ kubernetes.Toleration::{ + , effect = Some "NoSchedule" + , key = Some "node-role.kubernetes.io/master" + } + , kubernetes.Toleration::{ + , effect = Some "CriticalAddonsOnly" + , key = Some "Exists" + } + ] , containers = [ kubernetes.Container::{ , name = fullName , image = Some "gcr.io/heptio-images/authenticator:v0.1.0" , args = Some - [ "server" - , "--config=/etc/aws-iam-authenticator/config.yaml" - , "--state-dir=/var/aws-iam-authenticator" - , "--generate-kubeconfig=/etc/kubernetes/aws-iam-authenticator/kubeconfig.yaml" - ] + [ "server" + , "--config=/etc/aws-iam-authenticator/config.yaml" + , "--state-dir=/var/aws-iam-authenticator" + , "--generate-kubeconfig=/etc/kubernetes/aws-iam-authenticator/kubeconfig.yaml" + ] , volumeMounts = Some - [ kubernetes.VolumeMount::{ - , name = "config" - , mountPath = "/etc/aws-iam-authenticator/" - } - , kubernetes.VolumeMount::{ - , name = "state" - , mountPath = "/var/aws-iam-authenticator/" - } - , kubernetes.VolumeMount::{ - , name = "output" - , mountPath = "/etc/kubernetes/aws-iam-authenticator/" - } - ] + [ kubernetes.VolumeMount::{ + , name = "config" + , mountPath = "/etc/aws-iam-authenticator/" + } + , kubernetes.VolumeMount::{ + , name = "state" + , mountPath = "/var/aws-iam-authenticator/" + } + , kubernetes.VolumeMount::{ + , name = "output" + , mountPath = "/etc/kubernetes/aws-iam-authenticator/" + } + ] } ] , volumes = Some - [ kubernetes.Volume::{ - , name = "config" - , configMap = Some kubernetes.ConfigMapVolumeSource::{ - , name = Some fullName - } + [ kubernetes.Volume::{ + , name = "config" + , configMap = Some kubernetes.ConfigMapVolumeSource::{ + , name = Some fullName } - , kubernetes.Volume::{ - , name = "output" - , hostPath = Some kubernetes.HostPathVolumeSource::{ - , path = "/srv/kubernetes/aws-iam-authenticator/" - } + } + , kubernetes.Volume::{ + , name = "output" + , hostPath = Some kubernetes.HostPathVolumeSource::{ + , path = "/srv/kubernetes/aws-iam-authenticator/" } - , kubernetes.Volume::{ - , name = "state" - , hostPath = Some kubernetes.HostPathVolumeSource::{ - , path = "/srv/kubernetes/aws-iam-authenticator/" - } + } + , kubernetes.Volume::{ + , name = "state" + , hostPath = Some kubernetes.HostPathVolumeSource::{ + , path = "/srv/kubernetes/aws-iam-authenticator/" } - ] + } + ] } } } diff --git a/1.13/examples/deployment.dhall b/1.13/examples/deployment.dhall index 668653b..d88f6e4 100644 --- a/1.13/examples/deployment.dhall +++ b/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 @@ -16,9 +16,9 @@ let deployment = , strategy = Some kubernetes.DeploymentStrategy::{ , type = Some "RollingUpdate" , rollingUpdate = Some - { maxSurge = Some (kubernetes.IntOrString.Int 5) - , maxUnavailable = Some (kubernetes.IntOrString.Int 0) - } + { maxSurge = Some (kubernetes.IntOrString.Int 5) + , maxUnavailable = Some (kubernetes.IntOrString.Int 0) + } } , template = kubernetes.PodTemplateSpec::{ , metadata = kubernetes.ObjectMeta::{ @@ -32,11 +32,11 @@ let deployment = , image = Some "nginx:1.15.3" , imagePullPolicy = Some "Always" , ports = Some - [ kubernetes.ContainerPort::{ containerPort = 80 } ] + [ kubernetes.ContainerPort::{ containerPort = 80 } ] , resources = Some - { limits = Some (toMap { cpu = "500m" }) - , requests = Some (toMap { cpu = "10m" }) - } + { limits = Some (toMap { cpu = "500m" }) + , requests = Some (toMap { cpu = "10m" }) + } } ] } diff --git a/1.13/examples/deploymentSimple.dhall b/1.13/examples/deploymentSimple.dhall index a1bd6fa..30bbece 100644 --- a/1.13/examples/deploymentSimple.dhall +++ b/1.13/examples/deploymentSimple.dhall @@ -17,7 +17,7 @@ let deployment = , name = "nginx" , image = Some "nginx:1.15.3" , ports = Some - [ kubernetes.ContainerPort::{ containerPort = 80 } ] + [ kubernetes.ContainerPort::{ containerPort = 80 } ] } ] } diff --git a/1.13/examples/ingress.dhall b/1.13/examples/ingress.dhall index 1f1bc29..91ce6c0 100644 --- a/1.13/examples/ingress.dhall +++ b/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,31 +12,31 @@ let services = [ { name = "foo", host = "foo.example.com", version = "2.3" } ] let makeTLS : Service → kubernetes.IngressTLS.Type - = λ(service : Service) - → { hosts = Some [ service.host ] + = λ(service : Service) → + { hosts = Some [ service.host ] , secretName = Some "${service.name}-certificate" } let makeRule : Service → kubernetes.IngressRule.Type - = λ(service : Service) - → { host = Some service.host + = λ(service : Service) → + { host = Some service.host , http = Some - { paths = - [ { backend = - { serviceName = service.name - , servicePort = kubernetes.IntOrString.Int 80 - } - , path = None Text + { paths = + [ { backend = + { serviceName = service.name + , servicePort = kubernetes.IntOrString.Int 80 } - ] - } + , path = None Text + } + ] + } } let mkIngress : List Service → kubernetes.Ingress.Type - = λ(inputServices : List Service) - → let annotations = + = λ(inputServices : List Service) → + let annotations = toMap { `kubernetes.io/ingress.class` = "nginx" , `kubernetes.io/ingress.allow-http` = "false" diff --git a/1.13/examples/out/aws-iam-authenticator-chart.yaml b/1.13/examples/out/aws-iam-authenticator-chart.yaml index b4c3dd3..6492e48 100644 --- a/1.13/examples/out/aws-iam-authenticator-chart.yaml +++ b/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 diff --git a/1.13/examples/out/deployment.yaml b/1.13/examples/out/deployment.yaml index 75add54..6bc18dc 100644 --- a/1.13/examples/out/deployment.yaml +++ b/1.13/examples/out/deployment.yaml @@ -27,6 +27,6 @@ spec: - containerPort: 80 resources: limits: - cpu: 500m + cpu: "500m" requests: - cpu: 10m + cpu: "10m" diff --git a/1.13/examples/out/ingress.yaml b/1.13/examples/out/ingress.yaml index 4d56edb..f9e2027 100644 --- a/1.13/examples/out/ingress.yaml +++ b/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: diff --git a/1.13/examples/service.dhall b/1.13/examples/service.dhall index dafe2c7..6de9474 100644 --- a/1.13/examples/service.dhall +++ b/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 @@ -8,11 +8,11 @@ let spec = { selector = Some (toMap { app = "nginx" }) , type = Some "NodePort" , ports = Some - [ kubernetes.ServicePort::{ - , targetPort = Some (kubernetes.IntOrString.Int 80) - , port = 80 - } - ] + [ kubernetes.ServicePort::{ + , targetPort = Some (kubernetes.IntOrString.Int 80) + , port = 80 + } + ] } let service diff --git a/1.14/Prelude.dhall b/1.14/Prelude.dhall index 6996e86..bd43aa3 100644 --- a/1.14/Prelude.dhall +++ b/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/v10.0.0/Prelude/package.dhall +? https://raw.githubusercontent.com/dhall-lang/dhall-lang/v17.0.0/Prelude/package.dhall sha256:10db3c919c25e9046833df897a8ffe2701dc390fa0893d958c3430524be5a43e +? https://raw.githubusercontent.com/dhall-lang/dhall-lang/v17.0.0/Prelude/package.dhall diff --git a/1.14/README.md b/1.14/README.md index eb5f2dd..c507a7c 100644 --- a/1.14/README.md +++ b/1.14/README.md @@ -71,7 +71,7 @@ let deployment = , name = "nginx" , image = Some "nginx:1.15.3" , ports = Some - [ kubernetes.ContainerPort::{ containerPort = 80 } ] + [ kubernetes.ContainerPort::{ containerPort = 80 } ] } ] } @@ -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,31 +156,31 @@ let services = [ { name = "foo", host = "foo.example.com", version = "2.3" } ] let makeTLS : Service → kubernetes.IngressTLS.Type - = λ(service : Service) - → { hosts = Some [ service.host ] + = λ(service : Service) → + { hosts = Some [ service.host ] , secretName = Some "${service.name}-certificate" } let makeRule : Service → kubernetes.IngressRule.Type - = λ(service : Service) - → { host = Some service.host + = λ(service : Service) → + { host = Some service.host , http = Some - { paths = - [ { backend = - { serviceName = service.name - , servicePort = kubernetes.IntOrString.Int 80 - } - , path = None Text + { paths = + [ { backend = + { serviceName = service.name + , servicePort = kubernetes.IntOrString.Int 80 } - ] - } + , path = None Text + } + ] + } } let mkIngress : List Service → kubernetes.Ingress.Type - = λ(inputServices : List Service) - → let annotations = + = λ(inputServices : List Service) → + 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: diff --git a/1.14/examples/aws-iam-authenticator-chart.dhall b/1.14/examples/aws-iam-authenticator-chart.dhall index 28d97dd..19657f3 100644 --- a/1.14/examples/aws-iam-authenticator-chart.dhall +++ b/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 - ( toMap - { app = name - , chart = chart - , release = release - , heritage = heritage - } - ) + , labels = Some (toMap { app = name, chart, release, 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,68 +30,68 @@ 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 , nodeSelector = Some (toMap { `node-role.kubernetes.io/master` = "" }) , tolerations = Some - [ kubernetes.Toleration::{ - , effect = Some "NoSchedule" - , key = Some "node-role.kubernetes.io/master" - } - , kubernetes.Toleration::{ - , effect = Some "CriticalAddonsOnly" - , key = Some "Exists" - } - ] + [ kubernetes.Toleration::{ + , effect = Some "NoSchedule" + , key = Some "node-role.kubernetes.io/master" + } + , kubernetes.Toleration::{ + , effect = Some "CriticalAddonsOnly" + , key = Some "Exists" + } + ] , containers = [ kubernetes.Container::{ , name = fullName , image = Some "gcr.io/heptio-images/authenticator:v0.1.0" , args = Some - [ "server" - , "--config=/etc/aws-iam-authenticator/config.yaml" - , "--state-dir=/var/aws-iam-authenticator" - , "--generate-kubeconfig=/etc/kubernetes/aws-iam-authenticator/kubeconfig.yaml" - ] + [ "server" + , "--config=/etc/aws-iam-authenticator/config.yaml" + , "--state-dir=/var/aws-iam-authenticator" + , "--generate-kubeconfig=/etc/kubernetes/aws-iam-authenticator/kubeconfig.yaml" + ] , volumeMounts = Some - [ kubernetes.VolumeMount::{ - , name = "config" - , mountPath = "/etc/aws-iam-authenticator/" - } - , kubernetes.VolumeMount::{ - , name = "state" - , mountPath = "/var/aws-iam-authenticator/" - } - , kubernetes.VolumeMount::{ - , name = "output" - , mountPath = "/etc/kubernetes/aws-iam-authenticator/" - } - ] + [ kubernetes.VolumeMount::{ + , name = "config" + , mountPath = "/etc/aws-iam-authenticator/" + } + , kubernetes.VolumeMount::{ + , name = "state" + , mountPath = "/var/aws-iam-authenticator/" + } + , kubernetes.VolumeMount::{ + , name = "output" + , mountPath = "/etc/kubernetes/aws-iam-authenticator/" + } + ] } ] , volumes = Some - [ kubernetes.Volume::{ - , name = "config" - , configMap = Some kubernetes.ConfigMapVolumeSource::{ - , name = Some fullName - } + [ kubernetes.Volume::{ + , name = "config" + , configMap = Some kubernetes.ConfigMapVolumeSource::{ + , name = Some fullName } - , kubernetes.Volume::{ - , name = "output" - , hostPath = Some kubernetes.HostPathVolumeSource::{ - , path = "/srv/kubernetes/aws-iam-authenticator/" - } + } + , kubernetes.Volume::{ + , name = "output" + , hostPath = Some kubernetes.HostPathVolumeSource::{ + , path = "/srv/kubernetes/aws-iam-authenticator/" } - , kubernetes.Volume::{ - , name = "state" - , hostPath = Some kubernetes.HostPathVolumeSource::{ - , path = "/srv/kubernetes/aws-iam-authenticator/" - } + } + , kubernetes.Volume::{ + , name = "state" + , hostPath = Some kubernetes.HostPathVolumeSource::{ + , path = "/srv/kubernetes/aws-iam-authenticator/" } - ] + } + ] } } } diff --git a/1.14/examples/deployment.dhall b/1.14/examples/deployment.dhall index 2b6596f..b33bee0 100644 --- a/1.14/examples/deployment.dhall +++ b/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 @@ -16,9 +16,9 @@ let deployment = , strategy = Some kubernetes.DeploymentStrategy::{ , type = Some "RollingUpdate" , rollingUpdate = Some - { maxSurge = Some (kubernetes.IntOrString.Int 5) - , maxUnavailable = Some (kubernetes.IntOrString.Int 0) - } + { maxSurge = Some (kubernetes.IntOrString.Int 5) + , maxUnavailable = Some (kubernetes.IntOrString.Int 0) + } } , template = kubernetes.PodTemplateSpec::{ , metadata = kubernetes.ObjectMeta::{ @@ -32,11 +32,11 @@ let deployment = , image = Some "nginx:1.15.3" , imagePullPolicy = Some "Always" , ports = Some - [ kubernetes.ContainerPort::{ containerPort = 80 } ] + [ kubernetes.ContainerPort::{ containerPort = 80 } ] , resources = Some - { limits = Some (toMap { cpu = "500m" }) - , requests = Some (toMap { cpu = "10m" }) - } + { limits = Some (toMap { cpu = "500m" }) + , requests = Some (toMap { cpu = "10m" }) + } } ] } diff --git a/1.14/examples/deploymentSimple.dhall b/1.14/examples/deploymentSimple.dhall index 03fe4ae..89a3839 100644 --- a/1.14/examples/deploymentSimple.dhall +++ b/1.14/examples/deploymentSimple.dhall @@ -17,7 +17,7 @@ let deployment = , name = "nginx" , image = Some "nginx:1.15.3" , ports = Some - [ kubernetes.ContainerPort::{ containerPort = 80 } ] + [ kubernetes.ContainerPort::{ containerPort = 80 } ] } ] } diff --git a/1.14/examples/ingress.dhall b/1.14/examples/ingress.dhall index 1e75488..8e11938 100644 --- a/1.14/examples/ingress.dhall +++ b/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,31 +12,31 @@ let services = [ { name = "foo", host = "foo.example.com", version = "2.3" } ] let makeTLS : Service → kubernetes.IngressTLS.Type - = λ(service : Service) - → { hosts = Some [ service.host ] + = λ(service : Service) → + { hosts = Some [ service.host ] , secretName = Some "${service.name}-certificate" } let makeRule : Service → kubernetes.IngressRule.Type - = λ(service : Service) - → { host = Some service.host + = λ(service : Service) → + { host = Some service.host , http = Some - { paths = - [ { backend = - { serviceName = service.name - , servicePort = kubernetes.IntOrString.Int 80 - } - , path = None Text + { paths = + [ { backend = + { serviceName = service.name + , servicePort = kubernetes.IntOrString.Int 80 } - ] - } + , path = None Text + } + ] + } } let mkIngress : List Service → kubernetes.Ingress.Type - = λ(inputServices : List Service) - → let annotations = + = λ(inputServices : List Service) → + let annotations = toMap { `kubernetes.io/ingress.class` = "nginx" , `kubernetes.io/ingress.allow-http` = "false" diff --git a/1.14/examples/out/aws-iam-authenticator-chart.yaml b/1.14/examples/out/aws-iam-authenticator-chart.yaml index b4c3dd3..6492e48 100644 --- a/1.14/examples/out/aws-iam-authenticator-chart.yaml +++ b/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 diff --git a/1.14/examples/out/deployment.yaml b/1.14/examples/out/deployment.yaml index 75add54..6bc18dc 100644 --- a/1.14/examples/out/deployment.yaml +++ b/1.14/examples/out/deployment.yaml @@ -27,6 +27,6 @@ spec: - containerPort: 80 resources: limits: - cpu: 500m + cpu: "500m" requests: - cpu: 10m + cpu: "10m" diff --git a/1.14/examples/out/ingress.yaml b/1.14/examples/out/ingress.yaml index 41382d5..7580efd 100644 --- a/1.14/examples/out/ingress.yaml +++ b/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: diff --git a/1.14/examples/service.dhall b/1.14/examples/service.dhall index 9c55d27..b6956cb 100644 --- a/1.14/examples/service.dhall +++ b/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 @@ -8,11 +8,11 @@ let spec = { selector = Some (toMap { app = "nginx" }) , type = Some "NodePort" , ports = Some - [ kubernetes.ServicePort::{ - , targetPort = Some (kubernetes.IntOrString.Int 80) - , port = 80 - } - ] + [ kubernetes.ServicePort::{ + , targetPort = Some (kubernetes.IntOrString.Int 80) + , port = 80 + } + ] } let service diff --git a/1.15/Prelude.dhall b/1.15/Prelude.dhall index 6996e86..bd43aa3 100644 --- a/1.15/Prelude.dhall +++ b/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/v10.0.0/Prelude/package.dhall +? https://raw.githubusercontent.com/dhall-lang/dhall-lang/v17.0.0/Prelude/package.dhall sha256:10db3c919c25e9046833df897a8ffe2701dc390fa0893d958c3430524be5a43e +? https://raw.githubusercontent.com/dhall-lang/dhall-lang/v17.0.0/Prelude/package.dhall diff --git a/1.15/README.md b/1.15/README.md index c3a2eb7..c1d5063 100644 --- a/1.15/README.md +++ b/1.15/README.md @@ -71,7 +71,7 @@ let deployment = , name = "nginx" , image = Some "nginx:1.15.3" , ports = Some - [ kubernetes.ContainerPort::{ containerPort = 80 } ] + [ kubernetes.ContainerPort::{ containerPort = 80 } ] } ] } @@ -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,31 +156,31 @@ let services = [ { name = "foo", host = "foo.example.com", version = "2.3" } ] let makeTLS : Service → kubernetes.IngressTLS.Type - = λ(service : Service) - → { hosts = Some [ service.host ] + = λ(service : Service) → + { hosts = Some [ service.host ] , secretName = Some "${service.name}-certificate" } let makeRule : Service → kubernetes.IngressRule.Type - = λ(service : Service) - → { host = Some service.host + = λ(service : Service) → + { host = Some service.host , http = Some - { paths = - [ { backend = - { serviceName = service.name - , servicePort = kubernetes.IntOrString.Int 80 - } - , path = None Text + { paths = + [ { backend = + { serviceName = service.name + , servicePort = kubernetes.IntOrString.Int 80 } - ] - } + , path = None Text + } + ] + } } let mkIngress : List Service → kubernetes.Ingress.Type - = λ(inputServices : List Service) - → let annotations = + = λ(inputServices : List Service) → + 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: diff --git a/1.15/examples/aws-iam-authenticator-chart.dhall b/1.15/examples/aws-iam-authenticator-chart.dhall index 81017d5..f79ad25 100644 --- a/1.15/examples/aws-iam-authenticator-chart.dhall +++ b/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 - ( toMap - { app = name - , chart = chart - , release = release - , heritage = heritage - } - ) + , labels = Some (toMap { app = name, chart, release, 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,68 +30,68 @@ 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 , nodeSelector = Some (toMap { `node-role.kubernetes.io/master` = "" }) , tolerations = Some - [ kubernetes.Toleration::{ - , effect = Some "NoSchedule" - , key = Some "node-role.kubernetes.io/master" - } - , kubernetes.Toleration::{ - , effect = Some "CriticalAddonsOnly" - , key = Some "Exists" - } - ] + [ kubernetes.Toleration::{ + , effect = Some "NoSchedule" + , key = Some "node-role.kubernetes.io/master" + } + , kubernetes.Toleration::{ + , effect = Some "CriticalAddonsOnly" + , key = Some "Exists" + } + ] , containers = [ kubernetes.Container::{ , name = fullName , image = Some "gcr.io/heptio-images/authenticator:v0.1.0" , args = Some - [ "server" - , "--config=/etc/aws-iam-authenticator/config.yaml" - , "--state-dir=/var/aws-iam-authenticator" - , "--generate-kubeconfig=/etc/kubernetes/aws-iam-authenticator/kubeconfig.yaml" - ] + [ "server" + , "--config=/etc/aws-iam-authenticator/config.yaml" + , "--state-dir=/var/aws-iam-authenticator" + , "--generate-kubeconfig=/etc/kubernetes/aws-iam-authenticator/kubeconfig.yaml" + ] , volumeMounts = Some - [ kubernetes.VolumeMount::{ - , name = "config" - , mountPath = "/etc/aws-iam-authenticator/" - } - , kubernetes.VolumeMount::{ - , name = "state" - , mountPath = "/var/aws-iam-authenticator/" - } - , kubernetes.VolumeMount::{ - , name = "output" - , mountPath = "/etc/kubernetes/aws-iam-authenticator/" - } - ] + [ kubernetes.VolumeMount::{ + , name = "config" + , mountPath = "/etc/aws-iam-authenticator/" + } + , kubernetes.VolumeMount::{ + , name = "state" + , mountPath = "/var/aws-iam-authenticator/" + } + , kubernetes.VolumeMount::{ + , name = "output" + , mountPath = "/etc/kubernetes/aws-iam-authenticator/" + } + ] } ] , volumes = Some - [ kubernetes.Volume::{ - , name = "config" - , configMap = Some kubernetes.ConfigMapVolumeSource::{ - , name = Some fullName - } + [ kubernetes.Volume::{ + , name = "config" + , configMap = Some kubernetes.ConfigMapVolumeSource::{ + , name = Some fullName } - , kubernetes.Volume::{ - , name = "output" - , hostPath = Some kubernetes.HostPathVolumeSource::{ - , path = "/srv/kubernetes/aws-iam-authenticator/" - } + } + , kubernetes.Volume::{ + , name = "output" + , hostPath = Some kubernetes.HostPathVolumeSource::{ + , path = "/srv/kubernetes/aws-iam-authenticator/" } - , kubernetes.Volume::{ - , name = "state" - , hostPath = Some kubernetes.HostPathVolumeSource::{ - , path = "/srv/kubernetes/aws-iam-authenticator/" - } + } + , kubernetes.Volume::{ + , name = "state" + , hostPath = Some kubernetes.HostPathVolumeSource::{ + , path = "/srv/kubernetes/aws-iam-authenticator/" } - ] + } + ] } } } diff --git a/1.15/examples/deployment.dhall b/1.15/examples/deployment.dhall index b28933d..d4aa07a 100644 --- a/1.15/examples/deployment.dhall +++ b/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 @@ -16,9 +16,9 @@ let deployment = , strategy = Some kubernetes.DeploymentStrategy::{ , type = Some "RollingUpdate" , rollingUpdate = Some - { maxSurge = Some (kubernetes.IntOrString.Int 5) - , maxUnavailable = Some (kubernetes.IntOrString.Int 0) - } + { maxSurge = Some (kubernetes.IntOrString.Int 5) + , maxUnavailable = Some (kubernetes.IntOrString.Int 0) + } } , template = kubernetes.PodTemplateSpec::{ , metadata = kubernetes.ObjectMeta::{ @@ -32,11 +32,11 @@ let deployment = , image = Some "nginx:1.15.3" , imagePullPolicy = Some "Always" , ports = Some - [ kubernetes.ContainerPort::{ containerPort = 80 } ] + [ kubernetes.ContainerPort::{ containerPort = 80 } ] , resources = Some - { limits = Some (toMap { cpu = "500m" }) - , requests = Some (toMap { cpu = "10m" }) - } + { limits = Some (toMap { cpu = "500m" }) + , requests = Some (toMap { cpu = "10m" }) + } } ] } diff --git a/1.15/examples/deploymentSimple.dhall b/1.15/examples/deploymentSimple.dhall index f1a59fe..ad5a871 100644 --- a/1.15/examples/deploymentSimple.dhall +++ b/1.15/examples/deploymentSimple.dhall @@ -17,7 +17,7 @@ let deployment = , name = "nginx" , image = Some "nginx:1.15.3" , ports = Some - [ kubernetes.ContainerPort::{ containerPort = 80 } ] + [ kubernetes.ContainerPort::{ containerPort = 80 } ] } ] } diff --git a/1.15/examples/ingress.dhall b/1.15/examples/ingress.dhall index 471d736..bdfa5e1 100644 --- a/1.15/examples/ingress.dhall +++ b/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,31 +12,31 @@ let services = [ { name = "foo", host = "foo.example.com", version = "2.3" } ] let makeTLS : Service → kubernetes.IngressTLS.Type - = λ(service : Service) - → { hosts = Some [ service.host ] + = λ(service : Service) → + { hosts = Some [ service.host ] , secretName = Some "${service.name}-certificate" } let makeRule : Service → kubernetes.IngressRule.Type - = λ(service : Service) - → { host = Some service.host + = λ(service : Service) → + { host = Some service.host , http = Some - { paths = - [ { backend = - { serviceName = service.name - , servicePort = kubernetes.IntOrString.Int 80 - } - , path = None Text + { paths = + [ { backend = + { serviceName = service.name + , servicePort = kubernetes.IntOrString.Int 80 } - ] - } + , path = None Text + } + ] + } } let mkIngress : List Service → kubernetes.Ingress.Type - = λ(inputServices : List Service) - → let annotations = + = λ(inputServices : List Service) → + let annotations = toMap { `kubernetes.io/ingress.class` = "nginx" , `kubernetes.io/ingress.allow-http` = "false" diff --git a/1.15/examples/out/aws-iam-authenticator-chart.yaml b/1.15/examples/out/aws-iam-authenticator-chart.yaml index b4c3dd3..6492e48 100644 --- a/1.15/examples/out/aws-iam-authenticator-chart.yaml +++ b/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 diff --git a/1.15/examples/out/deployment.yaml b/1.15/examples/out/deployment.yaml index 75add54..6bc18dc 100644 --- a/1.15/examples/out/deployment.yaml +++ b/1.15/examples/out/deployment.yaml @@ -27,6 +27,6 @@ spec: - containerPort: 80 resources: limits: - cpu: 500m + cpu: "500m" requests: - cpu: 10m + cpu: "10m" diff --git a/1.15/examples/out/ingress.yaml b/1.15/examples/out/ingress.yaml index 41382d5..7580efd 100644 --- a/1.15/examples/out/ingress.yaml +++ b/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: diff --git a/1.15/examples/service.dhall b/1.15/examples/service.dhall index e0af85b..c8e8ced 100644 --- a/1.15/examples/service.dhall +++ b/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 @@ -8,11 +8,11 @@ let spec = { selector = Some (toMap { app = "nginx" }) , type = Some "NodePort" , ports = Some - [ kubernetes.ServicePort::{ - , targetPort = Some (kubernetes.IntOrString.Int 80) - , port = 80 - } - ] + [ kubernetes.ServicePort::{ + , targetPort = Some (kubernetes.IntOrString.Int 80) + , port = 80 + } + ] } let service diff --git a/1.16/Prelude.dhall b/1.16/Prelude.dhall index 6996e86..bd43aa3 100644 --- a/1.16/Prelude.dhall +++ b/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/v10.0.0/Prelude/package.dhall +? https://raw.githubusercontent.com/dhall-lang/dhall-lang/v17.0.0/Prelude/package.dhall sha256:10db3c919c25e9046833df897a8ffe2701dc390fa0893d958c3430524be5a43e +? https://raw.githubusercontent.com/dhall-lang/dhall-lang/v17.0.0/Prelude/package.dhall diff --git a/1.16/README.md b/1.16/README.md index 03d39b7..ffccadf 100644 --- a/1.16/README.md +++ b/1.16/README.md @@ -71,7 +71,7 @@ let deployment = , name = "nginx" , image = Some "nginx:1.15.3" , ports = Some - [ kubernetes.ContainerPort::{ containerPort = 80 } ] + [ kubernetes.ContainerPort::{ containerPort = 80 } ] } ] } @@ -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,31 +156,31 @@ let services = [ { name = "foo", host = "foo.example.com", version = "2.3" } ] let makeTLS : Service → kubernetes.IngressTLS.Type - = λ(service : Service) - → { hosts = Some [ service.host ] + = λ(service : Service) → + { hosts = Some [ service.host ] , secretName = Some "${service.name}-certificate" } let makeRule : Service → kubernetes.IngressRule.Type - = λ(service : Service) - → { host = Some service.host + = λ(service : Service) → + { host = Some service.host , http = Some - { paths = - [ { backend = - { serviceName = service.name - , servicePort = kubernetes.IntOrString.Int 80 - } - , path = None Text + { paths = + [ { backend = + { serviceName = service.name + , servicePort = kubernetes.IntOrString.Int 80 } - ] - } + , path = None Text + } + ] + } } let mkIngress : List Service → kubernetes.Ingress.Type - = λ(inputServices : List Service) - → let annotations = + = λ(inputServices : List Service) → + 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: diff --git a/1.16/examples/aws-iam-authenticator-chart.dhall b/1.16/examples/aws-iam-authenticator-chart.dhall index d8ddc6d..d5e80ed 100644 --- a/1.16/examples/aws-iam-authenticator-chart.dhall +++ b/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 - ( toMap - { app = name - , chart = chart - , release = release - , heritage = heritage - } - ) + , labels = Some (toMap { app = name, chart, release, 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,68 +30,68 @@ 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 , nodeSelector = Some (toMap { `node-role.kubernetes.io/master` = "" }) , tolerations = Some - [ kubernetes.Toleration::{ - , effect = Some "NoSchedule" - , key = Some "node-role.kubernetes.io/master" - } - , kubernetes.Toleration::{ - , effect = Some "CriticalAddonsOnly" - , key = Some "Exists" - } - ] + [ kubernetes.Toleration::{ + , effect = Some "NoSchedule" + , key = Some "node-role.kubernetes.io/master" + } + , kubernetes.Toleration::{ + , effect = Some "CriticalAddonsOnly" + , key = Some "Exists" + } + ] , containers = [ kubernetes.Container::{ , name = fullName , image = Some "gcr.io/heptio-images/authenticator:v0.1.0" , args = Some - [ "server" - , "--config=/etc/aws-iam-authenticator/config.yaml" - , "--state-dir=/var/aws-iam-authenticator" - , "--generate-kubeconfig=/etc/kubernetes/aws-iam-authenticator/kubeconfig.yaml" - ] + [ "server" + , "--config=/etc/aws-iam-authenticator/config.yaml" + , "--state-dir=/var/aws-iam-authenticator" + , "--generate-kubeconfig=/etc/kubernetes/aws-iam-authenticator/kubeconfig.yaml" + ] , volumeMounts = Some - [ kubernetes.VolumeMount::{ - , name = "config" - , mountPath = "/etc/aws-iam-authenticator/" - } - , kubernetes.VolumeMount::{ - , name = "state" - , mountPath = "/var/aws-iam-authenticator/" - } - , kubernetes.VolumeMount::{ - , name = "output" - , mountPath = "/etc/kubernetes/aws-iam-authenticator/" - } - ] + [ kubernetes.VolumeMount::{ + , name = "config" + , mountPath = "/etc/aws-iam-authenticator/" + } + , kubernetes.VolumeMount::{ + , name = "state" + , mountPath = "/var/aws-iam-authenticator/" + } + , kubernetes.VolumeMount::{ + , name = "output" + , mountPath = "/etc/kubernetes/aws-iam-authenticator/" + } + ] } ] , volumes = Some - [ kubernetes.Volume::{ - , name = "config" - , configMap = Some kubernetes.ConfigMapVolumeSource::{ - , name = Some fullName - } + [ kubernetes.Volume::{ + , name = "config" + , configMap = Some kubernetes.ConfigMapVolumeSource::{ + , name = Some fullName } - , kubernetes.Volume::{ - , name = "output" - , hostPath = Some kubernetes.HostPathVolumeSource::{ - , path = "/srv/kubernetes/aws-iam-authenticator/" - } + } + , kubernetes.Volume::{ + , name = "output" + , hostPath = Some kubernetes.HostPathVolumeSource::{ + , path = "/srv/kubernetes/aws-iam-authenticator/" } - , kubernetes.Volume::{ - , name = "state" - , hostPath = Some kubernetes.HostPathVolumeSource::{ - , path = "/srv/kubernetes/aws-iam-authenticator/" - } + } + , kubernetes.Volume::{ + , name = "state" + , hostPath = Some kubernetes.HostPathVolumeSource::{ + , path = "/srv/kubernetes/aws-iam-authenticator/" } - ] + } + ] } } } diff --git a/1.16/examples/deployment.dhall b/1.16/examples/deployment.dhall index 47d3f21..c06da98 100644 --- a/1.16/examples/deployment.dhall +++ b/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 @@ -16,9 +16,9 @@ let deployment = , strategy = Some kubernetes.DeploymentStrategy::{ , type = Some "RollingUpdate" , rollingUpdate = Some - { maxSurge = Some (kubernetes.IntOrString.Int 5) - , maxUnavailable = Some (kubernetes.IntOrString.Int 0) - } + { maxSurge = Some (kubernetes.IntOrString.Int 5) + , maxUnavailable = Some (kubernetes.IntOrString.Int 0) + } } , template = kubernetes.PodTemplateSpec::{ , metadata = kubernetes.ObjectMeta::{ @@ -32,11 +32,11 @@ let deployment = , image = Some "nginx:1.15.3" , imagePullPolicy = Some "Always" , ports = Some - [ kubernetes.ContainerPort::{ containerPort = 80 } ] + [ kubernetes.ContainerPort::{ containerPort = 80 } ] , resources = Some - { limits = Some (toMap { cpu = "500m" }) - , requests = Some (toMap { cpu = "10m" }) - } + { limits = Some (toMap { cpu = "500m" }) + , requests = Some (toMap { cpu = "10m" }) + } } ] } diff --git a/1.16/examples/deploymentSimple.dhall b/1.16/examples/deploymentSimple.dhall index f26026f..c4f8909 100644 --- a/1.16/examples/deploymentSimple.dhall +++ b/1.16/examples/deploymentSimple.dhall @@ -17,7 +17,7 @@ let deployment = , name = "nginx" , image = Some "nginx:1.15.3" , ports = Some - [ kubernetes.ContainerPort::{ containerPort = 80 } ] + [ kubernetes.ContainerPort::{ containerPort = 80 } ] } ] } diff --git a/1.16/examples/ingress.dhall b/1.16/examples/ingress.dhall index ea81580..c78b877 100644 --- a/1.16/examples/ingress.dhall +++ b/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,31 +12,31 @@ let services = [ { name = "foo", host = "foo.example.com", version = "2.3" } ] let makeTLS : Service → kubernetes.IngressTLS.Type - = λ(service : Service) - → { hosts = Some [ service.host ] + = λ(service : Service) → + { hosts = Some [ service.host ] , secretName = Some "${service.name}-certificate" } let makeRule : Service → kubernetes.IngressRule.Type - = λ(service : Service) - → { host = Some service.host + = λ(service : Service) → + { host = Some service.host , http = Some - { paths = - [ { backend = - { serviceName = service.name - , servicePort = kubernetes.IntOrString.Int 80 - } - , path = None Text + { paths = + [ { backend = + { serviceName = service.name + , servicePort = kubernetes.IntOrString.Int 80 } - ] - } + , path = None Text + } + ] + } } let mkIngress : List Service → kubernetes.Ingress.Type - = λ(inputServices : List Service) - → let annotations = + = λ(inputServices : List Service) → + let annotations = toMap { `kubernetes.io/ingress.class` = "nginx" , `kubernetes.io/ingress.allow-http` = "false" diff --git a/1.16/examples/out/aws-iam-authenticator-chart.yaml b/1.16/examples/out/aws-iam-authenticator-chart.yaml index b4c3dd3..6492e48 100644 --- a/1.16/examples/out/aws-iam-authenticator-chart.yaml +++ b/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 diff --git a/1.16/examples/out/deployment.yaml b/1.16/examples/out/deployment.yaml index 75add54..6bc18dc 100644 --- a/1.16/examples/out/deployment.yaml +++ b/1.16/examples/out/deployment.yaml @@ -27,6 +27,6 @@ spec: - containerPort: 80 resources: limits: - cpu: 500m + cpu: "500m" requests: - cpu: 10m + cpu: "10m" diff --git a/1.16/examples/out/ingress.yaml b/1.16/examples/out/ingress.yaml index 41382d5..7580efd 100644 --- a/1.16/examples/out/ingress.yaml +++ b/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: diff --git a/1.16/examples/service.dhall b/1.16/examples/service.dhall index 9ceb50c..7acfd68 100644 --- a/1.16/examples/service.dhall +++ b/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 @@ -8,11 +8,11 @@ let spec = { selector = Some (toMap { app = "nginx" }) , type = Some "NodePort" , ports = Some - [ kubernetes.ServicePort::{ - , targetPort = Some (kubernetes.IntOrString.Int 80) - , port = 80 - } - ] + [ kubernetes.ServicePort::{ + , targetPort = Some (kubernetes.IntOrString.Int 80) + , port = 80 + } + ] } let service diff --git a/1.17/Prelude.dhall b/1.17/Prelude.dhall index 6996e86..bd43aa3 100644 --- a/1.17/Prelude.dhall +++ b/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/v10.0.0/Prelude/package.dhall +? https://raw.githubusercontent.com/dhall-lang/dhall-lang/v17.0.0/Prelude/package.dhall sha256:10db3c919c25e9046833df897a8ffe2701dc390fa0893d958c3430524be5a43e +? https://raw.githubusercontent.com/dhall-lang/dhall-lang/v17.0.0/Prelude/package.dhall diff --git a/1.17/README.md b/1.17/README.md index 73ee8a7..bb7942e 100644 --- a/1.17/README.md +++ b/1.17/README.md @@ -71,7 +71,7 @@ let deployment = , name = "nginx" , image = Some "nginx:1.15.3" , ports = Some - [ kubernetes.ContainerPort::{ containerPort = 80 } ] + [ kubernetes.ContainerPort::{ containerPort = 80 } ] } ] } @@ -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,31 +156,31 @@ let services = [ { name = "foo", host = "foo.example.com", version = "2.3" } ] let makeTLS : Service → kubernetes.IngressTLS.Type - = λ(service : Service) - → { hosts = Some [ service.host ] + = λ(service : Service) → + { hosts = Some [ service.host ] , secretName = Some "${service.name}-certificate" } let makeRule : Service → kubernetes.IngressRule.Type - = λ(service : Service) - → { host = Some service.host + = λ(service : Service) → + { host = Some service.host , http = Some - { paths = - [ { backend = - { serviceName = service.name - , servicePort = kubernetes.IntOrString.Int 80 - } - , path = None Text + { paths = + [ { backend = + { serviceName = service.name + , servicePort = kubernetes.IntOrString.Int 80 } - ] - } + , path = None Text + } + ] + } } let mkIngress : List Service → kubernetes.Ingress.Type - = λ(inputServices : List Service) - → let annotations = + = λ(inputServices : List Service) → + 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: diff --git a/1.17/examples/aws-iam-authenticator-chart.dhall b/1.17/examples/aws-iam-authenticator-chart.dhall index 6a4ad67..5cf6ec0 100644 --- a/1.17/examples/aws-iam-authenticator-chart.dhall +++ b/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 - ( toMap - { app = name - , chart = chart - , release = release - , heritage = heritage - } - ) + , labels = Some (toMap { app = name, chart, release, 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,68 +30,68 @@ 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 , nodeSelector = Some (toMap { `node-role.kubernetes.io/master` = "" }) , tolerations = Some - [ kubernetes.Toleration::{ - , effect = Some "NoSchedule" - , key = Some "node-role.kubernetes.io/master" - } - , kubernetes.Toleration::{ - , effect = Some "CriticalAddonsOnly" - , key = Some "Exists" - } - ] + [ kubernetes.Toleration::{ + , effect = Some "NoSchedule" + , key = Some "node-role.kubernetes.io/master" + } + , kubernetes.Toleration::{ + , effect = Some "CriticalAddonsOnly" + , key = Some "Exists" + } + ] , containers = [ kubernetes.Container::{ , name = fullName , image = Some "gcr.io/heptio-images/authenticator:v0.1.0" , args = Some - [ "server" - , "--config=/etc/aws-iam-authenticator/config.yaml" - , "--state-dir=/var/aws-iam-authenticator" - , "--generate-kubeconfig=/etc/kubernetes/aws-iam-authenticator/kubeconfig.yaml" - ] + [ "server" + , "--config=/etc/aws-iam-authenticator/config.yaml" + , "--state-dir=/var/aws-iam-authenticator" + , "--generate-kubeconfig=/etc/kubernetes/aws-iam-authenticator/kubeconfig.yaml" + ] , volumeMounts = Some - [ kubernetes.VolumeMount::{ - , name = "config" - , mountPath = "/etc/aws-iam-authenticator/" - } - , kubernetes.VolumeMount::{ - , name = "state" - , mountPath = "/var/aws-iam-authenticator/" - } - , kubernetes.VolumeMount::{ - , name = "output" - , mountPath = "/etc/kubernetes/aws-iam-authenticator/" - } - ] + [ kubernetes.VolumeMount::{ + , name = "config" + , mountPath = "/etc/aws-iam-authenticator/" + } + , kubernetes.VolumeMount::{ + , name = "state" + , mountPath = "/var/aws-iam-authenticator/" + } + , kubernetes.VolumeMount::{ + , name = "output" + , mountPath = "/etc/kubernetes/aws-iam-authenticator/" + } + ] } ] , volumes = Some - [ kubernetes.Volume::{ - , name = "config" - , configMap = Some kubernetes.ConfigMapVolumeSource::{ - , name = Some fullName - } + [ kubernetes.Volume::{ + , name = "config" + , configMap = Some kubernetes.ConfigMapVolumeSource::{ + , name = Some fullName } - , kubernetes.Volume::{ - , name = "output" - , hostPath = Some kubernetes.HostPathVolumeSource::{ - , path = "/srv/kubernetes/aws-iam-authenticator/" - } + } + , kubernetes.Volume::{ + , name = "output" + , hostPath = Some kubernetes.HostPathVolumeSource::{ + , path = "/srv/kubernetes/aws-iam-authenticator/" } - , kubernetes.Volume::{ - , name = "state" - , hostPath = Some kubernetes.HostPathVolumeSource::{ - , path = "/srv/kubernetes/aws-iam-authenticator/" - } + } + , kubernetes.Volume::{ + , name = "state" + , hostPath = Some kubernetes.HostPathVolumeSource::{ + , path = "/srv/kubernetes/aws-iam-authenticator/" } - ] + } + ] } } } diff --git a/1.17/examples/deployment.dhall b/1.17/examples/deployment.dhall index 93aeba9..f47f799 100644 --- a/1.17/examples/deployment.dhall +++ b/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 @@ -16,9 +16,9 @@ let deployment = , strategy = Some kubernetes.DeploymentStrategy::{ , type = Some "RollingUpdate" , rollingUpdate = Some - { maxSurge = Some (kubernetes.IntOrString.Int 5) - , maxUnavailable = Some (kubernetes.IntOrString.Int 0) - } + { maxSurge = Some (kubernetes.IntOrString.Int 5) + , maxUnavailable = Some (kubernetes.IntOrString.Int 0) + } } , template = kubernetes.PodTemplateSpec::{ , metadata = kubernetes.ObjectMeta::{ @@ -32,11 +32,11 @@ let deployment = , image = Some "nginx:1.15.3" , imagePullPolicy = Some "Always" , ports = Some - [ kubernetes.ContainerPort::{ containerPort = 80 } ] + [ kubernetes.ContainerPort::{ containerPort = 80 } ] , resources = Some - { limits = Some (toMap { cpu = "500m" }) - , requests = Some (toMap { cpu = "10m" }) - } + { limits = Some (toMap { cpu = "500m" }) + , requests = Some (toMap { cpu = "10m" }) + } } ] } diff --git a/1.17/examples/deploymentSimple.dhall b/1.17/examples/deploymentSimple.dhall index c6d374d..528ead9 100644 --- a/1.17/examples/deploymentSimple.dhall +++ b/1.17/examples/deploymentSimple.dhall @@ -17,7 +17,7 @@ let deployment = , name = "nginx" , image = Some "nginx:1.15.3" , ports = Some - [ kubernetes.ContainerPort::{ containerPort = 80 } ] + [ kubernetes.ContainerPort::{ containerPort = 80 } ] } ] } diff --git a/1.17/examples/ingress.dhall b/1.17/examples/ingress.dhall index 16acad4..2dffa60 100644 --- a/1.17/examples/ingress.dhall +++ b/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,31 +12,31 @@ let services = [ { name = "foo", host = "foo.example.com", version = "2.3" } ] let makeTLS : Service → kubernetes.IngressTLS.Type - = λ(service : Service) - → { hosts = Some [ service.host ] + = λ(service : Service) → + { hosts = Some [ service.host ] , secretName = Some "${service.name}-certificate" } let makeRule : Service → kubernetes.IngressRule.Type - = λ(service : Service) - → { host = Some service.host + = λ(service : Service) → + { host = Some service.host , http = Some - { paths = - [ { backend = - { serviceName = service.name - , servicePort = kubernetes.IntOrString.Int 80 - } - , path = None Text + { paths = + [ { backend = + { serviceName = service.name + , servicePort = kubernetes.IntOrString.Int 80 } - ] - } + , path = None Text + } + ] + } } let mkIngress : List Service → kubernetes.Ingress.Type - = λ(inputServices : List Service) - → let annotations = + = λ(inputServices : List Service) → + let annotations = toMap { `kubernetes.io/ingress.class` = "nginx" , `kubernetes.io/ingress.allow-http` = "false" diff --git a/1.17/examples/out/aws-iam-authenticator-chart.yaml b/1.17/examples/out/aws-iam-authenticator-chart.yaml index b4c3dd3..6492e48 100644 --- a/1.17/examples/out/aws-iam-authenticator-chart.yaml +++ b/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 diff --git a/1.17/examples/out/deployment.yaml b/1.17/examples/out/deployment.yaml index 75add54..6bc18dc 100644 --- a/1.17/examples/out/deployment.yaml +++ b/1.17/examples/out/deployment.yaml @@ -27,6 +27,6 @@ spec: - containerPort: 80 resources: limits: - cpu: 500m + cpu: "500m" requests: - cpu: 10m + cpu: "10m" diff --git a/1.17/examples/out/ingress.yaml b/1.17/examples/out/ingress.yaml index 41382d5..7580efd 100644 --- a/1.17/examples/out/ingress.yaml +++ b/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: diff --git a/1.17/examples/service.dhall b/1.17/examples/service.dhall index c22f24b..a743470 100644 --- a/1.17/examples/service.dhall +++ b/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 @@ -8,11 +8,11 @@ let spec = { selector = Some (toMap { app = "nginx" }) , type = Some "NodePort" , ports = Some - [ kubernetes.ServicePort::{ - , targetPort = Some (kubernetes.IntOrString.Int 80) - , port = 80 - } - ] + [ kubernetes.ServicePort::{ + , targetPort = Some (kubernetes.IntOrString.Int 80) + , port = 80 + } + ] } let service diff --git a/Prelude.dhall b/Prelude.dhall index 6996e86..bd43aa3 100644 --- a/Prelude.dhall +++ b/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/v10.0.0/Prelude/package.dhall +? https://raw.githubusercontent.com/dhall-lang/dhall-lang/v17.0.0/Prelude/package.dhall sha256:10db3c919c25e9046833df897a8ffe2701dc390fa0893d958c3430524be5a43e +? https://raw.githubusercontent.com/dhall-lang/dhall-lang/v17.0.0/Prelude/package.dhall diff --git a/dhall-kubernetes-generator/dhall-kubernetes-generator.cabal b/dhall-kubernetes-generator/dhall-kubernetes-generator.cabal index a95aee6..177e9f3 100644 --- a/dhall-kubernetes-generator/dhall-kubernetes-generator.cabal +++ b/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 , - optparse-applicative >= 0.14.3.0 && < 0.15 , + megaparsec >= 7.0 && < 8.1 , + 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 , diff --git a/dhall-kubernetes-generator/src/Main.hs b/dhall-kubernetes-generator/src/Main.hs index 098aab9..75289f8 100644 --- a/dhall-kubernetes-generator/src/Main.hs +++ b/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) diff --git a/nix/haskell/cborg-json.nix b/nix/haskell/cborg-json.nix deleted file mode 100644 index a21baf0..0000000 --- a/nix/haskell/cborg-json.nix +++ /dev/null @@ -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; -} diff --git a/nix/haskell/dhall-json.nix b/nix/haskell/dhall-json.nix deleted file mode 100644 index e7c874b..0000000 --- a/nix/haskell/dhall-json.nix +++ /dev/null @@ -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; -} diff --git a/nix/haskell/dhall.nix b/nix/haskell/dhall.nix deleted file mode 100644 index 809a8b4..0000000 --- a/nix/haskell/dhall.nix +++ /dev/null @@ -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; -} diff --git a/nix/haskell/prettyprinter.nix b/nix/haskell/prettyprinter.nix deleted file mode 100644 index 96c3432..0000000 --- a/nix/haskell/prettyprinter.nix +++ /dev/null @@ -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; -} diff --git a/nix/nixpkgs.json b/nix/nixpkgs.json index ce01223..b7fc764 100644 --- a/nix/nixpkgs.json +++ b/nix/nixpkgs.json @@ -1,7 +1,9 @@ { "url": "https://github.com/NixOS/nixpkgs.git", - "rev": "8f3ca4ec1686251bab083c37d0a4e96f45bc495f", - "date": "2019-12-10T15:32:27-05:00", - "sha256": "0f09m8kp6akxx8m6z9iw95njsja37ihhkwpldmh24zvgaclgv5qj", - "fetchSubmodules": false + "rev": "2cd2e7267e5b9a960c2997756cb30e86f0958a6b", + "date": "2020-06-23T09:46:29+03:00", + "sha256": "0ir3rk776wldyjz6l6y5c5fs8lqk95gsik6w45wxgk6zdpsvhrn5", + "fetchSubmodules": false, + "deepClone": false, + "leaveDotGit": false } diff --git a/nix/nixpkgs.nix b/nix/nixpkgs.nix index 38fea63..cfc7317 100644 --- a/nix/nixpkgs.nix +++ b/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 = - pkgsNew.haskell.lib.dontCheck haskellPackagesOld.dhall-json; - - prettyprinter = - pkgsNew.haskell.lib.dontCheck haskellPackagesOld.prettyprinter; + dhall-json = haskellPackagesOld.dhall-json_1_7_0; }; in pkgsNew.lib.fold pkgsNew.lib.composeExtensions (_: _: {}) [ previous packages - packagesFromDirectory +# packagesFromDirectory manual ]; }