commit e3551b7a2dc4f899e2cac4e02eedb423f4bcd4d0
parent 96f96020702a13ed57f6a8069f7e0b0eb8695dfd
Author: Vincent Demeester <vincent@sbr.pm>
Date: Mon, 11 Oct 2021 17:56:55 +0200
nix/packages: move some openshift specifics in the same folder
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Diffstat:
8 files changed, 219 insertions(+), 206 deletions(-)
diff --git a/nix/packages/default.nix b/nix/packages/default.nix
@@ -69,7 +69,7 @@ rec {
yaspell = pkgs.callPackage ./yaspell { };
# OpenShift
- inherit (pkgs.callPackage ./oc { })
+ inherit (pkgs.callPackage ./openshift/oc.nix { })
oc_4_1
oc_4_2
oc_4_3
@@ -80,7 +80,7 @@ rec {
oc_4_8
oc
;
- inherit (pkgs.callPackage ./openshift-install { })
+ inherit (pkgs.callPackage ./openshift/openshift-install.nix { })
openshift-install_4_3
openshift-install_4_4
openshift-install_4_5
@@ -90,11 +90,12 @@ rec {
openshift-install
;
- inherit (pkgs.callPackage ./odo { })
+ inherit (pkgs.callPackage ./openshift/odo.nix { })
odo_1_2
odo_2_0
odo_2_1
odo_2_2
+ odo_2_3
odo
;
@@ -114,10 +115,12 @@ rec {
# Operator SDK
inherit (pkgs.callPackage ./operator-sdk { })
+ operator-sdk_1
+ operator-sdk_1_13
operator-sdk_0_18
operator-sdk_0_19
+ operator-sdk
;
- operator-sdk = operator-sdk_0_19;
# Tekton
inherit (pkgs.callPackage ./tkn { })
@@ -132,7 +135,6 @@ rec {
tkn_0_21
tkn
;
- tkn_oci = pkgs.callPackage ./tkn-oci { };
manifest-tool = pkgs.callPackage ./manifest-tool { };
# Upstream
diff --git a/nix/packages/oc/default.nix b/nix/packages/oc/default.nix
@@ -1,74 +0,0 @@
-{ stdenv, lib, fetchurl }:
-
-with lib;
-rec {
- ocGen =
- { version
- , sha256
- }:
-
- stdenv.mkDerivation rec {
- pname = "oc";
- name = "${pname}-${version}";
-
- src = fetchurl {
- url = "https://mirror.openshift.com/pub/openshift-v4/clients/ocp/${version}/openshift-client-linux-${version}.tar.gz";
- sha256 = "${sha256}";
- };
-
- phases = " unpackPhase installPhase fixupPhase ";
-
- unpackPhase = ''
- runHook preUnpack
- mkdir ${name}
- tar -C ${name} -xzf $src
- '';
-
- installPhase = ''
- runHook preInstall
- install -D ${name}/oc $out/bin/oc
- patchelf \
- --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
- $out/bin/oc
- # completions
- mkdir -p $out/share/bash-completion/completions/
- $out/bin/oc completion bash > $out/share/bash-completion/completions/oc
- mkdir -p $out/share/zsh/site-functions
- $out/bin/oc completion zsh > $out/share/zsh/site-functions/_oc
- '';
- };
-
- oc = oc_4_8;
- oc_4_8 = makeOverridable ocGen {
- version = "4.8.2";
- sha256 = "1s8ihny9aj3s3gfp2p3yp8r2p5ak48fwq99524pvjxdnicf3ssvm";
- };
- oc_4_7 = makeOverridable ocGen {
- version = "4.7.21";
- sha256 = "0ksh41vzwfz9gx5z0a69f8214dyhkf9p6598fyvizy7zr5d1hgzs";
- };
- oc_4_6 = makeOverridable ocGen {
- version = "4.6.40";
- sha256 = "05ml6jwzghgpxlbxr6x45xzh86ncfq2s5xpwailhfj0pdw36a76i";
- };
- oc_4_5 = makeOverridable ocGen {
- version = "4.5.41";
- sha256 = "01m7iak83md7y1nfdywizr5sxk3kd8543ahzqh2ncj9sqmjraw0r";
- };
- oc_4_4 = makeOverridable ocGen {
- version = "4.4.33";
- sha256 = "1bf34331c7wixb1kmabp93sdpp4ihlyigx7nhmy71ffp7j82n419";
- };
- oc_4_3 = makeOverridable ocGen {
- version = "4.3.40";
- sha256 = "04dkmw78dwniyjdvqyig7hafcicrn2ixg6bvqsy1y2plm0gsjmbz";
- };
- oc_4_2 = makeOverridable ocGen {
- version = "4.2.36";
- sha256 = "1f9h58mx0a3zhpx11gim13hd3m4yzwa6ipbp1gwlghmhjz1jh35v";
- };
- oc_4_1 = makeOverridable ocGen {
- version = "4.1.41";
- sha256 = "06wphg4vddhvavhxn07iq6pi3gq7ljbcdsgldwhyrjy8gx50bp47";
- };
-}
diff --git a/nix/packages/odo/default.nix b/nix/packages/odo/default.nix
@@ -1,58 +0,0 @@
-{ stdenv, lib, fetchurl }:
-
-with lib;
-rec {
- odoGen =
- { version
- , sha256
- }:
-
- stdenv.mkDerivation rec {
- pname = "odo";
- name = "${pname}-${version}";
-
- src = fetchurl {
- url = "https://mirror.openshift.com/pub/openshift-v4/clients/odo/v${version}/odo-linux-amd64.tar.gz";
- sha256 = "${sha256}";
- };
-
- phases = " unpackPhase installPhase fixupPhase ";
-
- unpackPhase = ''
- runHook preUnpack
- mkdir ${name}
- tar -C ${name} -xzf $src
- '';
-
- installPhase = ''
- runHook preInstall
- install -D ${name}/odo $out/bin/odo
- patchelf \
- --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
- $out/bin/odo
- # completions
- mkdir -p $out/share/bash-completion/completions/
- $out/bin/odo utils terminal bash > $out/share/bash-completion/completions/odo
- mkdir -p $out/share/zsh/site-functions
- $out/bin/odo utils terminal zsh > $out/share/zsh/site-functions/_odo
- '';
- };
-
- odo = odo_2_2;
- odo_2_2 = makeOverridable odoGen {
- version = "2.2.3";
- sha256 = "1rbq532pzxh806m544wf8s79mk9fc3np5701df1kmjjdmlwhfmjj";
- };
- odo_2_1 = makeOverridable odoGen {
- version = "2.1.0";
- sha256 = "1jy79wg7war7i1hnlnzxcs2nj81r5zyk9sr2vc6knwxjg5cllis6";
- };
- odo_2_0 = makeOverridable odoGen {
- version = "2.0.7";
- sha256 = "05mxdxy8llava10sq9b111xq2bd5ywlw80s3zkwk8nzikhjjfvg3";
- };
- odo_1_2 = makeOverridable odoGen {
- version = "1.2.6";
- sha256 = "0dhnc413sgymwy8df27diz7bkpkckgm6jws88na4mg82jffnyn1w";
- };
-}
diff --git a/nix/packages/openshift-install/default.nix b/nix/packages/openshift-install/default.nix
@@ -1,69 +0,0 @@
-{ stdenv, lib, fetchurl }:
-
-with lib;
-rec {
- openshiftInstallGen =
- { version
- , sha256
- }:
-
- stdenv.mkDerivation rec {
- pname = "openshift-install";
- name = "${pname}-${version}";
-
- src = fetchurl {
- inherit sha256;
- url = "https://mirror.openshift.com/pub/openshift-v4/clients/ocp/${version}/openshift-install-linux-${version}.tar.gz";
- };
-
- phases = " unpackPhase installPhase fixupPhase ";
-
- unpackPhase = ''
- runHook preUnpack
- mkdir ${name}
- tar -C ${name} -xzf $src
- '';
-
- installPhase = ''
- runHook preInstall
- install -D ${name}/openshift-install $out/bin/openshift-install
- # completions
- mkdir -p $out/share/bash-completion/completions/
- $out/bin/openshift-install completion bash > $out/share/bash-completion/completions/openshift-install
- #mkdir -p $out/share/zsh/site-functions
- #$out/bin/openshift-install completion zsh > $out/share/zsh/site-functions/_openshift-install
- '';
-
- meta = {
- description = "Install an OpenShift cluster";
- homepage = https://github.com/openshift/installer;
- license = lib.licenses.asl20;
- };
- };
-
- openshift-install = openshift-install_4_8;
- openshift-install_4_8 = makeOverridable openshiftInstallGen {
- version = "4.8.2";
- sha256 = "0c6df6iaxlh4blyb6n54qci0m2mx2n24xygqgp313hav4008y5yn";
- };
- openshift-install_4_7 = makeOverridable openshiftInstallGen {
- version = "4.7.21";
- sha256 = "0y38h71n19cav33dbzn7pcgqjqai613f14n53m2lpsm0w3xm58d1";
- };
- openshift-install_4_6 = makeOverridable openshiftInstallGen {
- version = "4.6.40";
- sha256 = "0z92v8yaxnackyisz5czihk8ja0cpbnicfi813b6s9yjlwkbvd19";
- };
- openshift-install_4_5 = makeOverridable openshiftInstallGen {
- version = "4.5.41";
- sha256 = "1356q49bhl0bkqspalh2xymma8rlr5v8xdcfmhflisim930iimw3";
- };
- openshift-install_4_4 = makeOverridable openshiftInstallGen {
- version = "4.4.33";
- sha256 = "1mdjccyz4wbcwvg4ax2wr3x52cx5h8a0i25n1a7aawsni6z5261m";
- };
- openshift-install_4_3 = makeOverridable openshiftInstallGen {
- version = "4.3.40";
- sha256 = "02in21q7d2bazrgkksk0vy2rflxqssayjjlz43k65cnrk8nnv1sm";
- };
-}
diff --git a/nix/packages/openshift/oc.nix b/nix/packages/openshift/oc.nix
@@ -0,0 +1,74 @@
+{ stdenv, lib, fetchurl }:
+
+with lib;
+rec {
+ ocGen =
+ { version
+ , sha256
+ }:
+
+ stdenv.mkDerivation rec {
+ pname = "oc";
+ name = "${pname}-${version}";
+
+ src = fetchurl {
+ url = "https://mirror.openshift.com/pub/openshift-v4/clients/ocp/${version}/openshift-client-linux-${version}.tar.gz";
+ sha256 = "${sha256}";
+ };
+
+ phases = " unpackPhase installPhase fixupPhase ";
+
+ unpackPhase = ''
+ runHook preUnpack
+ mkdir ${name}
+ tar -C ${name} -xzf $src
+ '';
+
+ installPhase = ''
+ runHook preInstall
+ install -D ${name}/oc $out/bin/oc
+ patchelf \
+ --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
+ $out/bin/oc
+ # completions
+ mkdir -p $out/share/bash-completion/completions/
+ $out/bin/oc completion bash > $out/share/bash-completion/completions/oc
+ mkdir -p $out/share/zsh/site-functions
+ $out/bin/oc completion zsh > $out/share/zsh/site-functions/_oc
+ '';
+ };
+
+ oc = oc_4_8;
+ oc_4_8 = makeOverridable ocGen {
+ version = "4.8.14";
+ sha256 = "14685hgipbrzymjfgh2aa2y47l67vw018sdvmd140xcp3syp2y4l";
+ };
+ oc_4_7 = makeOverridable ocGen {
+ version = "4.7.33";
+ sha256 = "1253rpbcls6xd6hzss8wwgphw7w4sc4x3pvy8vrzzpzl7g99zvcx";
+ };
+ oc_4_6 = makeOverridable ocGen {
+ version = "4.6.47";
+ sha256 = "0gipr5wlblwcc53lm97l4pq14fs93b9hi1jg1kc68bh1ivpbfil7";
+ };
+ oc_4_5 = makeOverridable ocGen {
+ version = "4.5.41";
+ sha256 = "01m7iak83md7y1nfdywizr5sxk3kd8543ahzqh2ncj9sqmjraw0r";
+ };
+ oc_4_4 = makeOverridable ocGen {
+ version = "4.4.33";
+ sha256 = "1bf34331c7wixb1kmabp93sdpp4ihlyigx7nhmy71ffp7j82n419";
+ };
+ oc_4_3 = makeOverridable ocGen {
+ version = "4.3.40";
+ sha256 = "04dkmw78dwniyjdvqyig7hafcicrn2ixg6bvqsy1y2plm0gsjmbz";
+ };
+ oc_4_2 = makeOverridable ocGen {
+ version = "4.2.36";
+ sha256 = "1f9h58mx0a3zhpx11gim13hd3m4yzwa6ipbp1gwlghmhjz1jh35v";
+ };
+ oc_4_1 = makeOverridable ocGen {
+ version = "4.1.41";
+ sha256 = "06wphg4vddhvavhxn07iq6pi3gq7ljbcdsgldwhyrjy8gx50bp47";
+ };
+}
diff --git a/nix/packages/openshift/odo.nix b/nix/packages/openshift/odo.nix
@@ -0,0 +1,62 @@
+{ stdenv, lib, fetchurl }:
+
+with lib;
+rec {
+ odoGen =
+ { version
+ , sha256
+ }:
+
+ stdenv.mkDerivation rec {
+ pname = "odo";
+ name = "${pname}-${version}";
+
+ src = fetchurl {
+ url = "https://mirror.openshift.com/pub/openshift-v4/clients/odo/v${version}/odo-linux-amd64.tar.gz";
+ sha256 = "${sha256}";
+ };
+
+ phases = " unpackPhase installPhase fixupPhase ";
+
+ unpackPhase = ''
+ runHook preUnpack
+ mkdir ${name}
+ tar -C ${name} -xzf $src
+ '';
+
+ installPhase = ''
+ runHook preInstall
+ install -D ${name}/odo $out/bin/odo
+ patchelf \
+ --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
+ $out/bin/odo
+ # completions
+ mkdir -p $out/share/bash-completion/completions/
+ $out/bin/odo utils terminal bash > $out/share/bash-completion/completions/odo
+ mkdir -p $out/share/zsh/site-functions
+ $out/bin/odo utils terminal zsh > $out/share/zsh/site-functions/_odo
+ '';
+ };
+
+ odo = odo_2_3;
+ odo_2_3 = makeOverridable odoGen {
+ version = "2.3.1";
+ sha256 = "13frxa5mf52j08mica4j9v6zdrqxhccx0injz860fywbcsz0x67p";
+ };
+ odo_2_2 = makeOverridable odoGen {
+ version = "2.2.4";
+ sha256 = "1ma0q79s85dy23b4ygjm67dm05i7clm39h5p86sdz4wz63amiqcg";
+ };
+ odo_2_1 = makeOverridable odoGen {
+ version = "2.1.0";
+ sha256 = "1jy79wg7war7i1hnlnzxcs2nj81r5zyk9sr2vc6knwxjg5cllis6";
+ };
+ odo_2_0 = makeOverridable odoGen {
+ version = "2.0.7";
+ sha256 = "05mxdxy8llava10sq9b111xq2bd5ywlw80s3zkwk8nzikhjjfvg3";
+ };
+ odo_1_2 = makeOverridable odoGen {
+ version = "1.2.6";
+ sha256 = "0dhnc413sgymwy8df27diz7bkpkckgm6jws88na4mg82jffnyn1w";
+ };
+}
diff --git a/nix/packages/openshift/openshift-install.nix b/nix/packages/openshift/openshift-install.nix
@@ -0,0 +1,69 @@
+{ stdenv, lib, fetchurl }:
+
+with lib;
+rec {
+ openshiftInstallGen =
+ { version
+ , sha256
+ }:
+
+ stdenv.mkDerivation rec {
+ pname = "openshift-install";
+ name = "${pname}-${version}";
+
+ src = fetchurl {
+ inherit sha256;
+ url = "https://mirror.openshift.com/pub/openshift-v4/clients/ocp/${version}/openshift-install-linux-${version}.tar.gz";
+ };
+
+ phases = " unpackPhase installPhase fixupPhase ";
+
+ unpackPhase = ''
+ runHook preUnpack
+ mkdir ${name}
+ tar -C ${name} -xzf $src
+ '';
+
+ installPhase = ''
+ runHook preInstall
+ install -D ${name}/openshift-install $out/bin/openshift-install
+ # completions
+ mkdir -p $out/share/bash-completion/completions/
+ $out/bin/openshift-install completion bash > $out/share/bash-completion/completions/openshift-install
+ #mkdir -p $out/share/zsh/site-functions
+ #$out/bin/openshift-install completion zsh > $out/share/zsh/site-functions/_openshift-install
+ '';
+
+ meta = {
+ description = "Install an OpenShift cluster";
+ homepage = https://github.com/openshift/installer;
+ license = lib.licenses.asl20;
+ };
+ };
+
+ openshift-install = openshift-install_4_8;
+ openshift-install_4_8 = makeOverridable openshiftInstallGen {
+ version = "4.8.14";
+ sha256 = "03n71m4bdsjwfc5ynvbyvvfdnrvrbsa9kn5yd6gaaql0y591ya90";
+ };
+ openshift-install_4_7 = makeOverridable openshiftInstallGen {
+ version = "4.7.33";
+ sha256 = "19ivnppp9k7z71fnv05n0axhkr7srsb26jgri9gx7g1g33q945gz";
+ };
+ openshift-install_4_6 = makeOverridable openshiftInstallGen {
+ version = "4.6.47";
+ sha256 = "0z0kfiq5yavll9zkp7cv3ki936bzjcmxim8di7lbv0wknb405i9a";
+ };
+ openshift-install_4_5 = makeOverridable openshiftInstallGen {
+ version = "4.5.41";
+ sha256 = "1356q49bhl0bkqspalh2xymma8rlr5v8xdcfmhflisim930iimw3";
+ };
+ openshift-install_4_4 = makeOverridable openshiftInstallGen {
+ version = "4.4.33";
+ sha256 = "1mdjccyz4wbcwvg4ax2wr3x52cx5h8a0i25n1a7aawsni6z5261m";
+ };
+ openshift-install_4_3 = makeOverridable openshiftInstallGen {
+ version = "4.3.40";
+ sha256 = "02in21q7d2bazrgkksk0vy2rflxqssayjjlz43k65cnrk8nnv1sm";
+ };
+}
diff --git a/nix/packages/operator-sdk/default.nix b/nix/packages/operator-sdk/default.nix
@@ -60,4 +60,11 @@ rec {
sha256 = "0prwdsxm8sldzdn7r9k1yw2q4asz90n25g4zcfaq23vs6fkxch9b";
vendorSha256 = "0k6xrd1ahic89l821qvh3rr8k203ab6fmj7v4flkv889xaajjxb0";
};
+ operator-sdk_1_13 = makeOverridable operatorSdkGen {
+ version = "1.13.0";
+ sha256 = "107rkh11qql77i0ahgipfgih843zfrbvf1k7gfrmvp2avns98m3x";
+ vendorSha256 = "1mvwrnik3mapghvi41zdxfd6d2d08hafnghypqqjwgdnin06bg98";
+ };
+ operator-sdk_1 = operator-sdk_1_13;
+ operator-sdk = operator-sdk_1;
}
