home

commit 1ec9862f100d1280ab377485412747b8adfa2e4b
parent e5049e059611531bb078866b9bd19070e398aa57
Author: Vincent Demeester <vincent@sbr.pm>
Date:   Fri, 23 Jul 2021 10:59:41 +0200

nix/packages: bump oc and openshift-install versions

Signed-off-by: Vincent Demeester <vincent@sbr.pm>

Diffstat:
M
flake.nix
 | 
3
++-
M
nix/packages/default.nix
 | 
2
++
M
nix/packages/oc/default.nix
 | 
22
+++++++++++-----------
M
nix/packages/openshift-install/default.nix
 | 
18
+++++++++++-------

4 files changed, 26 insertions(+), 19 deletions(-)
diff --git a/flake.nix b/flake.nix
@@ -406,7 +406,7 @@
               oc_4_5
               oc_4_6
               oc_4_7
-              #oc_4_8
+              oc_4_8
               oc
               ;
             inherit (pkgs.callPackage ./nix/packages/openshift-install { })
@@ -415,6 +415,7 @@
               openshift-install_4_5
               openshift-install_4_6
               openshift-install_4_7
+              openshift-install_4_8
               openshift-install
               ;
           });
diff --git a/nix/packages/default.nix b/nix/packages/default.nix
@@ -77,6 +77,7 @@ rec {
     oc_4_5
     oc_4_6
     oc_4_7
+    oc_4_8
     oc
     ;
   inherit (pkgs.callPackage ./openshift-install { })
@@ -85,6 +86,7 @@ rec {
     openshift-install_4_5
     openshift-install_4_6
     openshift-install_4_7
+    openshift-install_4_8
     openshift-install
     ;
 
diff --git a/nix/packages/oc/default.nix b/nix/packages/oc/default.nix
@@ -38,22 +38,22 @@ rec {
       '';
     };
 
-  oc = oc_4_7;
-  # oc_4_8 = makeOverridable ocGen {
-  #   version = "4.6.6";
-  #   sha256 = "10q449fygw5qi9spg1jls6j425fdrrmyvcq6p8z91bwyzn67fds9";
-  # };
+  oc = oc_4_8;
+  oc_4_8 = makeOverridable ocGen {
+    version = "4.8.2";
+    sha256 = "1s8ihny9aj3s3gfp2p3yp8r2p5ak48fwq99524pvjxdnicf3ssvm";
+  };
   oc_4_7 = makeOverridable ocGen {
-    version = "4.7.9";
-    sha256 = "0ns121x3s8jf2mdswss388c187snlpn0bh7pc34qmx0xb1974vhk";
+    version = "4.7.21";
+    sha256 = "0ksh41vzwfz9gx5z0a69f8214dyhkf9p6598fyvizy7zr5d1hgzs";
   };
   oc_4_6 = makeOverridable ocGen {
-    version = "4.6.26";
-    sha256 = "0jk3ghb3ln88ryxm6ab1dixd7321vjqd77hsp42zf5q7fwzxs6sv";
+    version = "4.6.40";
+    sha256 = "05ml6jwzghgpxlbxr6x45xzh86ncfq2s5xpwailhfj0pdw36a76i";
   };
   oc_4_5 = makeOverridable ocGen {
-    version = "4.5.38";
-    sha256 = "13lnldf4vv73y4hdzalnp6c16f1mwq662diliq69krlcbjfr6y6x";
+    version = "4.5.41";
+    sha256 = "01m7iak83md7y1nfdywizr5sxk3kd8543ahzqh2ncj9sqmjraw0r";
   };
   oc_4_4 = makeOverridable ocGen {
     version = "4.4.33";
diff --git a/nix/packages/openshift-install/default.nix b/nix/packages/openshift-install/default.nix
@@ -41,18 +41,22 @@ rec {
       };
     };
 
-  openshift-install = openshift-install_4_7;
+  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.9";
-    sha256 = "0q27wgak4a8qp7bckssz555mrnxrj5ngf2561h6nxnxb194q45m4";
+    version = "4.7.21";
+    sha256 = "0y38h71n19cav33dbzn7pcgqjqai613f14n53m2lpsm0w3xm58d1";
   };
   openshift-install_4_6 = makeOverridable openshiftInstallGen {
-    version = "4.6.26";
-    sha256 = "1l65ggfz249885cj63i415j51n8pmvlc65xnjfcacdyiv9s17915";
+    version = "4.6.40";
+    sha256 = "0z92v8yaxnackyisz5czihk8ja0cpbnicfi813b6s9yjlwkbvd19";
   };
   openshift-install_4_5 = makeOverridable openshiftInstallGen {
-    version = "4.5.38";
-    sha256 = "03nylxdk4iihf246ihvszdbbxp2dbdv7yjp0jrkq42pfb638qzv1";
+    version = "4.5.41";
+    sha256 = "1356q49bhl0bkqspalh2xymma8rlr5v8xdcfmhflisim930iimw3";
   };
   openshift-install_4_4 = makeOverridable openshiftInstallGen {
     version = "4.4.33";