diff options
| author | Vincent Demeester <vincent@sbr.pm> | 2018-11-12 18:17:33 +0100 |
|---|---|---|
| committer | Vincent Demeester <vincent@sbr.pm> | 2018-11-12 18:17:33 +0100 |
| commit | 37b50c08eb6f7016944c5ca702f8303d819314dd (patch) | |
| tree | ede2c54af9bef30a60451134f55f25cd1d5f333b /pkgs | |
| parent | 1ccea556a1b8a7154fcba0c5716484fb3fba5aa7 (diff) | |
| download | nixpkgs-37b50c08eb6f7016944c5ca702f8303d819314dd.tar nixpkgs-37b50c08eb6f7016944c5ca702f8303d819314dd.tar.gz nixpkgs-37b50c08eb6f7016944c5ca702f8303d819314dd.tar.bz2 nixpkgs-37b50c08eb6f7016944c5ca702f8303d819314dd.tar.lz nixpkgs-37b50c08eb6f7016944c5ca702f8303d819314dd.tar.xz nixpkgs-37b50c08eb6f7016944c5ca702f8303d819314dd.tar.zst nixpkgs-37b50c08eb6f7016944c5ca702f8303d819314dd.zip | |
openshift: use go instead of go_1_10
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/networking/cluster/openshift/default.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/applications/networking/cluster/openshift/default.nix b/pkgs/applications/networking/cluster/openshift/default.nix index 9640df6acfe..a34c728da16 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_10, go-bindata, makeWrapper, rsync, utillinux +{ stdenv, lib, fetchFromGitHub, removeReferencesTo, which, go, go-bindata, makeWrapper, rsync, utillinux , coreutils, kerberos, clang , components ? [ "cmd/oc" @@ -32,8 +32,8 @@ in stdenv.mkDerivation rec { }; # go > 1.10 - # [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 ]; + # [FATAL] [14:44:02+0000] Please install Go version go or use PERMISSIVE_GO=y to bypass this check. + buildInputs = [ removeReferencesTo makeWrapper which go 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_10} '{}' + + find $out/bin -type f -exec remove-references-to -t ${go} '{}' + ''; meta = with stdenv.lib; { |