JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

openshift: 3.10 -> 3.11

Browse Source 
Using go 1.10 instead of 1.9

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
This commit is contained in:
Vincent Demeester 2018-11-01 20:51:22 +01:00
parent 3ec657ab0c
commit 1ccea556a1
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pkgs/applications/networking/cluster/openshift/default.nix
View File

@ -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; {