home

commit 1d0d115b53a63190aea0e3d9ab9b6ac522ef5766
parent 3ad5819db8b4c213791f5869ec91ed8167a003bc
Author: Vincent Demeester <vincent@sbr.pm>
Date:   Wed,  2 Dec 2020 18:25:34 +0100

pkgs: openshift-install updates

- Add openshift-install 4.6
- Move openshift-install default into openshift-install/default.nix
- Temporarly disabling completion as it fails on recent ones

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

Diffstat:
M
pkgs/default.nix
 | 
3
++-
D
pkgs/openshift-install/0001-Do-not-call-git.patch
 | 
27
---------------------------
M
pkgs/openshift-install/default.nix
 | 
25
+++++++++++++++----------

3 files changed, 17 insertions(+), 38 deletions(-)
diff --git a/pkgs/default.nix b/pkgs/default.nix
@@ -82,8 +82,9 @@ rec {
     openshift-install_4_3
     openshift-install_4_4
     openshift-install_4_5
+    openshift-install_4_6
+    openshift-install
     ;
-  openshift-install = openshift-install_4_4;
 
   inherit (pkgs.callPackage ./crc { oc_4_4 = oc_4_4; oc_4_3 = oc_4_3; })
     crc_1_9
diff --git a/pkgs/openshift-install/0001-Do-not-call-git.patch b/pkgs/openshift-install/0001-Do-not-call-git.patch
@@ -1,27 +0,0 @@
-From 6bdcff59696e85efbbe2fff816386829b4a2390b Mon Sep 17 00:00:00 2001
-From: Vincent Demeester <vdemeest@redhat.com>
-Date: Tue, 9 Apr 2019 11:18:13 +0200
-Subject: [PATCH] Do not call git
-
-Signed-off-by: Vincent Demeester <vdemeest@redhat.com>
----
- hack/build.sh | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/hack/build.sh b/hack/build.sh
-index 6213aae14..8ef0c27c1 100755
---- a/hack/build.sh
-+++ b/hack/build.sh
-@@ -31,7 +31,8 @@ then
- fi
- 
- MODE="${MODE:-release}"
--LDFLAGS="${LDFLAGS} -X github.com/openshift/installer/pkg/version.Raw=$(git describe --always --abbrev=40 --dirty) -X github.com/openshift/installer/pkg/version.Commit=$(git rev-parse --verify 'HEAD^{commit}')"
-+GITCOMMIT="${GITCOMMIT:-unknown}"
-+LDFLAGS="${LDFLAGS} -X github.com/openshift/installer/pkg/version.Raw=${GITCOMMIT} -X github.com/openshift/installer/pkg/version.Commit=${GITCOMMIT}"
- TAGS="${TAGS:-}"
- OUTPUT="${OUTPUT:-bin/openshift-install}"
- export CGO_ENABLED=0
--- 
-2.19.2
-
diff --git a/pkgs/openshift-install/default.nix b/pkgs/openshift-install/default.nix
@@ -28,10 +28,10 @@ rec {
         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
+        #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 = {
@@ -41,16 +41,21 @@ rec {
       };
     };
 
+  openshift-install = openshift-install_4_6;
+  openshift-install_4_6 = makeOverridable openshiftInstallGen {
+    version = "4.6.6";
+    sha256 = "0r4cj8iz76cy3zv80j8l0lfmimqk80lfnqxm412dh9qmnc5xsl62";
+  };
   openshift-install_4_5 = makeOverridable openshiftInstallGen {
-    version = "4.5.2";
-    sha256 = "0apb94914y9g2driwbnbcgd3y60jwsnpmb0n8nlzrshbfmkvp7l7";
+    version = "4.5.22";
+    sha256 = "1na3kp7v6gqk2wr1w5gpr9dy9nr1vw4z3kka776sxmc082bamg1f";
   };
   openshift-install_4_4 = makeOverridable openshiftInstallGen {
-    version = "4.4.13";
-    sha256 = "10n2i0wkzay277cixc3qifag8l0pqba31ljvczx5m8bi06hnnsni";
+    version = "4.4.31";
+    sha256 = "11iykrkgx3f085vcnk5gl9ia2263ryffpvrz3rj1zgpgpdir6m45";
   };
   openshift-install_4_3 = makeOverridable openshiftInstallGen {
-    version = "4.3.29";
-    sha256 = "0rrzmc8pkks8k3ar834z6k5nl0mgpi8llyb14slcn7mwilwg9024";
+    version = "4.3.40";
+    sha256 = "02in21q7d2bazrgkksk0vy2rflxqssayjjlz43k65cnrk8nnv1sm";
   };
 }