Commit e3551b7a2dc4

Vincent Demeester <vincent@sbr.pm>
2021-10-11 17:56:55
nix/packages: move some openshift specifics in the same folder
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
main
1 parent 96f9602
Changed files (5)
nix
packages
openshift
oc.nix
odo.nix
openshift-install.nix
operator-sdk
default.nix
default.nix
nix/packages/oc/default.nix → nix/packages/openshift/oc.nix
@@ -40,16 +40,16 @@ rec {
 
   oc = oc_4_8;
   oc_4_8 = makeOverridable ocGen {
-    version = "4.8.2";
-    sha256 = "1s8ihny9aj3s3gfp2p3yp8r2p5ak48fwq99524pvjxdnicf3ssvm";
+    version = "4.8.14";
+    sha256 = "14685hgipbrzymjfgh2aa2y47l67vw018sdvmd140xcp3syp2y4l";
   };
   oc_4_7 = makeOverridable ocGen {
-    version = "4.7.21";
-    sha256 = "0ksh41vzwfz9gx5z0a69f8214dyhkf9p6598fyvizy7zr5d1hgzs";
+    version = "4.7.33";
+    sha256 = "1253rpbcls6xd6hzss8wwgphw7w4sc4x3pvy8vrzzpzl7g99zvcx";
   };
   oc_4_6 = makeOverridable ocGen {
-    version = "4.6.40";
-    sha256 = "05ml6jwzghgpxlbxr6x45xzh86ncfq2s5xpwailhfj0pdw36a76i";
+    version = "4.6.47";
+    sha256 = "0gipr5wlblwcc53lm97l4pq14fs93b9hi1jg1kc68bh1ivpbfil7";
   };
   oc_4_5 = makeOverridable ocGen {
     version = "4.5.41";
nix/packages/odo/default.nix → nix/packages/openshift/odo.nix
@@ -38,10 +38,14 @@ rec {
       '';
     };
 
-  odo = odo_2_2;
+  odo = odo_2_3;
+  odo_2_3 = makeOverridable odoGen {
+    version = "2.3.1";
+    sha256 = "13frxa5mf52j08mica4j9v6zdrqxhccx0injz860fywbcsz0x67p";
+  };
   odo_2_2 = makeOverridable odoGen {
-    version = "2.2.3";
-    sha256 = "1rbq532pzxh806m544wf8s79mk9fc3np5701df1kmjjdmlwhfmjj";
+    version = "2.2.4";
+    sha256 = "1ma0q79s85dy23b4ygjm67dm05i7clm39h5p86sdz4wz63amiqcg";
   };
   odo_2_1 = makeOverridable odoGen {
     version = "2.1.0";
nix/packages/openshift-install/default.nix → nix/packages/openshift/openshift-install.nix
@@ -43,16 +43,16 @@ rec {
 
   openshift-install = openshift-install_4_8;
   openshift-install_4_8 = makeOverridable openshiftInstallGen {
-    version = "4.8.2";
-    sha256 = "0c6df6iaxlh4blyb6n54qci0m2mx2n24xygqgp313hav4008y5yn";
+    version = "4.8.14";
+    sha256 = "03n71m4bdsjwfc5ynvbyvvfdnrvrbsa9kn5yd6gaaql0y591ya90";
   };
   openshift-install_4_7 = makeOverridable openshiftInstallGen {
-    version = "4.7.21";
-    sha256 = "0y38h71n19cav33dbzn7pcgqjqai613f14n53m2lpsm0w3xm58d1";
+    version = "4.7.33";
+    sha256 = "19ivnppp9k7z71fnv05n0axhkr7srsb26jgri9gx7g1g33q945gz";
   };
   openshift-install_4_6 = makeOverridable openshiftInstallGen {
-    version = "4.6.40";
-    sha256 = "0z92v8yaxnackyisz5czihk8ja0cpbnicfi813b6s9yjlwkbvd19";
+    version = "4.6.47";
+    sha256 = "0z0kfiq5yavll9zkp7cv3ki936bzjcmxim8di7lbv0wknb405i9a";
   };
   openshift-install_4_5 = makeOverridable openshiftInstallGen {
     version = "4.5.41";
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;
 }
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