diff options
| author | Vincent Demeester <vincent@sbr.pm> | 2018-11-01 20:51:22 +0100 |
|---|---|---|
| committer | Vincent Demeester <vincent@sbr.pm> | 2018-11-12 18:16:57 +0100 |
| commit | 1ccea556a1b8a7154fcba0c5716484fb3fba5aa7 (patch) | |
| tree | e4b82d25989c07d61abe9ca70f41faf107e6a67b /pkgs | |
| parent | 3ec657ab0c4bc271e685f9be025b2c17df83ba22 (diff) | |
| download | nixpkgs-1ccea556a1b8a7154fcba0c5716484fb3fba5aa7.tar nixpkgs-1ccea556a1b8a7154fcba0c5716484fb3fba5aa7.tar.gz nixpkgs-1ccea556a1b8a7154fcba0c5716484fb3fba5aa7.tar.bz2 nixpkgs-1ccea556a1b8a7154fcba0c5716484fb3fba5aa7.tar.lz nixpkgs-1ccea556a1b8a7154fcba0c5716484fb3fba5aa7.tar.xz nixpkgs-1ccea556a1b8a7154fcba0c5716484fb3fba5aa7.tar.zst nixpkgs-1ccea556a1b8a7154fcba0c5716484fb3fba5aa7.zip | |
openshift: 3.10 -> 3.11
Using go 1.10 instead of 1.9 Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/networking/cluster/openshift/default.nix | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/pkgs/applications/networking/cluster/openshift/default.nix b/pkgs/applications/networking/cluster/openshift/default.nix index 0f137a872da..9640df6acfe 100644 --- a/pkgs/applications/networking/cluster/openshift/default.nix +++ b/pkgs/applications/networking/cluster/openshift/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, removeReferencesTo, which, go_1_9, go-bindata, makeWrapper, rsync, utillinux +{ stdenv, lib, fetchFromGitHub, removeReferencesTo, which, go_1_10, go-bindata, makeWrapper, rsync, utillinux , coreutils, kerberos, clang , components ? [ "cmd/oc" @@ -9,15 +9,15 @@ with lib; let - version = "3.10.0"; + version = "3.11.0"; ver = stdenv.lib.elemAt (stdenv.lib.splitString "." version); versionMajor = ver 0; versionMinor = ver 1; versionPatch = ver 2; - gitCommit = "dd10d17"; + gitCommit = "0cbc58b"; # version is in vendor/k8s.io/kubernetes/pkg/version/base.go - k8sversion = "v1.10.0"; - k8sgitcommit = "b81c8f8"; + k8sversion = "v1.11.1"; + k8sgitcommit = "b1b2997"; k8sgitMajor = "0"; k8sgitMinor = "1"; in stdenv.mkDerivation rec { @@ -28,12 +28,12 @@ in stdenv.mkDerivation rec { owner = "openshift"; repo = "origin"; rev = "v${version}"; - sha256 = "13aglz005jl48z17vnggkvr39l5h6jcqgkfyvkaz4c3jakms1hi9"; + sha256 = "06q4v2a1mm6c659ab0rzkqz6b66vx4avqfg0s9xckwhq420lzgka"; }; # go > 1.10 - # [FATAL] [14:44:02+0000] Please install Go version go1.9 or use PERMISSIVE_GO=y to bypass this check. - buildInputs = [ removeReferencesTo makeWrapper which go_1_9 rsync go-bindata kerberos clang ]; + # [FATAL] [14:44:02+0000] Please install Go version go1.10 or use PERMISSIVE_GO=y to bypass this check. + buildInputs = [ removeReferencesTo makeWrapper which go_1_10 rsync go-bindata kerberos clang ]; outputs = [ "out" ]; @@ -78,7 +78,7 @@ in stdenv.mkDerivation rec { ''; preFixup = '' - find $out/bin -type f -exec remove-references-to -t ${go_1_9} '{}' + + find $out/bin -type f -exec remove-references-to -t ${go_1_10} '{}' + ''; meta = with stdenv.lib; { |