b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Simplify dhall-kubernetes packages

Browse source 
There is no need to provide a separate `kubernetesVersion` argument
since the `file` argument works just fine
This commit is contained in:
Gabriel Gonzalez 2020-02-12 06:44:55 -08:00
parent 38f1d70c01
commit 822ad560b4
2 changed files with 4 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
pkgs/development/dhall-modules/dhall-kubernetes.nix
View file

@ -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}";
}
);

6
pkgs/development/dhall-modules/dhall-packages.nix
View file

@ -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"; })