commit cf09023b721918d784923e2ec3a2b940e76e929d parent 57828534cc9bceec3f401ca664107d3603821b3e Author: Vincent Demeester <vincent@sbr.pm> Date: Fri, 4 Dec 2020 18:13:03 +0100 flake: move oc/openshift-install to x86_64 only Signed-off-by: Vincent Demeester <vincent@sbr.pm> Diffstat:
| M | flake.nix | | | 76 | +++++++++++++++++++++++++++++++++++++++------------------------------------- |
1 file changed, 39 insertions(+), 37 deletions(-)
diff --git a/flake.nix b/flake.nix @@ -113,45 +113,47 @@ # Expose the packages defined in this flake, built for any supported systems. These are # meant to be consumed by other projects that might import this flake. - packages = forEachSystem (system: - let - pkgs = pkgsBySystem."${system}"; - in - { - ape = pkgs.callPackage ./pkgs/ape { }; - nr = pkgs.callPackage ./pkgs/nr { }; - ram = pkgs.callPackage ./pkgs/ram { }; - systemd-email = pkgs.callPackage ./pkgs/systemd-email { }; + packages = forEachSystem + (system: + let + pkgs = pkgsBySystem."${system}"; + in + { + ape = pkgs.callPackage ./pkgs/ape { }; + nr = pkgs.callPackage ./pkgs/nr { }; + ram = pkgs.callPackage ./pkgs/ram { }; + systemd-email = pkgs.callPackage ./pkgs/systemd-email { }; - batzconverter = pkgs.callPackage ./pkgs/batzconverter { }; - # Tekton - inherit (pkgs.callPackage ./pkgs/tkn { }) - tkn_0_11 - tkn_0_12 - tkn_0_13 - tkn_0_14 - tkn - ; - # OpenShift - inherit (pkgs.callPackage ./pkgs/oc { }) - oc_4_1 - oc_4_2 - oc_4_3 - oc_4_4 - oc_4_5 - oc_4_6 - oc - ; - inherit (pkgs.callPackage ./pkgs/openshift-install { }) - openshift-install_4_3 - openshift-install_4_4 - openshift-install_4_5 - openshift-install_4_6 - openshift-install - ; + batzconverter = pkgs.callPackage ./pkgs/batzconverter { }; + # Tekton + inherit (pkgs.callPackage ./pkgs/tkn { }) + tkn_0_11 + tkn_0_12 + tkn_0_13 + tkn_0_14 + tkn + ; - manifest-tool = pkgs.callPackage ./pkgs/manifest-tool { }; - }); + manifest-tool = pkgs.callPackage ./pkgs/manifest-tool { }; + } // optionalAttrs (system == "x86_64-linux") { + # OpenShift + inherit (pkgs.callPackage ./pkgs/oc { }) + oc_4_1 + oc_4_2 + oc_4_3 + oc_4_4 + oc_4_5 + oc_4_6 + oc + ; + inherit (pkgs.callPackage ./pkgs/openshift-install { }) + openshift-install_4_3 + openshift-install_4_4 + openshift-install_4_5 + openshift-install_4_6 + openshift-install + ; + }); # defaultPackage.x86_64-linux = self.packages.x86_64-linux.hello;