diff options
Diffstat (limited to 'pkgs/development')
-rw-r--r-- | pkgs/development/dhall-modules/dhall-kubernetes.nix | 13 | ||||
-rw-r--r-- | pkgs/development/dhall-modules/dhall-packages.nix | 6 |
2 files changed, 4 insertions, 15 deletions
diff --git a/pkgs/development/dhall-modules/dhall-kubernetes.nix b/pkgs/development/dhall-modules/dhall-kubernetes.nix index 5bc0e08c69b74..8ae1d2ae9fbc5 100644 --- a/pkgs/development/dhall-modules/dhall-kubernetes.nix +++ b/pkgs/development/dhall-modules/dhall-kubernetes.nix @@ -6,14 +6,6 @@ let lib.makeOverridable ( { rev , sha256 - - # The version of the Kubernetes OpenAPI spec to use. - # - # This defaults to the latest supported Kubernetes if left unspecified. - # - # This is only supported by dhall-kubernetes version 3.0.0 or newer. - , kubernetesVersion ? null - , file ? "package.dhall" }: buildDhallPackage { @@ -29,11 +21,8 @@ let inherit rev sha256; }; - prefix = - if kubernetesVersion == null then "" else "${kubernetesVersion}/"; - in - "${src}/${prefix}${file}"; + "${src}/${file}"; } ); diff --git a/pkgs/development/dhall-modules/dhall-packages.nix b/pkgs/development/dhall-modules/dhall-packages.nix index 659c582f3c125..b83eb688a60f4 100644 --- a/pkgs/development/dhall-modules/dhall-packages.nix +++ b/pkgs/development/dhall-modules/dhall-packages.nix @@ -56,9 +56,9 @@ in sha256 = "1v4y1x13lxy6cxf8xqc6sb0mc4mrd4frkxih95v9q2wxw4vkw2h7"; dependencies = [ - (k8s_6a47bd.override { kubernetesVersion = "1.14"; }) - (k8s_6a47bd.override { kubernetesVersion = "1.15"; }) - (k8s_6a47bd.override { kubernetesVersion = "1.16"; }) + (k8s_6a47bd.override { file = "1.14/package.dhall"; }) + (k8s_6a47bd.override { file = "1.15/package.dhall"; }) + (k8s_6a47bd.override { file = "1.16/package.dhall"; }) (k8s_4ad581.override { file = "types.dhall"; }) (k8s_fee24c.override { file = "types/io.k8s.api.core.v1.ServiceSpec.dhall"; }) (k8s_fee24c.override { file = "types/io.k8s.api.core.v1.PodTemplateSpec.dhall"; }) |