Skip to content

Commit

Permalink
openshift: 1.5.0 -> 3.6.0
Browse files Browse the repository at this point in the history
- Updated from 1.5.0 to 3.6.0 (this is just the next version, but Red
  Hat did quite the version bump there)
- Added 'v' to the version; it is used by `oc cluster up` to determine
  which image should be downloaded.
- Added myself as a maintainer.
  • Loading branch information
moretea committed Aug 17, 2017
1 parent ef026e0 commit f8a7266
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions pkgs/applications/networking/cluster/openshift/default.nix
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, which, buildGoPackage }:

let
version = "1.5.0";
version = "3.6.0";
ver = stdenv.lib.elemAt (stdenv.lib.splitString "." version);
versionMajor = ver 0;
versionMinor = ver 1;
Expand All @@ -14,7 +14,7 @@ in buildGoPackage rec {
owner = "openshift";
repo = "origin";
rev = "v${version}";
sha256 = "0qvyxcyca3888nkgvyvqcmybm95ncwxb3zvrzbg2gz8kx6g6350v";
sha256 = "08bdqvsjl6c7dmllyz8n4akb7gyn91znvbph5cgmmk1bhskycy1r";
};

buildInputs = [ which ];
Expand All @@ -28,7 +28,7 @@ in buildGoPackage rec {
cd go/src/origin-v${version}-src
# Openshift build require this variables to be set
# unless there is a .git folder which is not the case with fetchFromGitHub
export OS_GIT_VERSION=${version}
export OS_GIT_VERSION=v${version}
export OS_GIT_MAJOR=${versionMajor}
export OS_GIT_MINOR=${versionMinor}
make build
Expand All @@ -43,7 +43,7 @@ in buildGoPackage rec {
description = "Build, deploy, and manage your applications with Docker and Kubernetes";
license = licenses.asl20;
homepage = http://www.openshift.org;
maintainers = with maintainers; [offline bachp];
maintainers = with maintainers; [offline bachp moretea];
platforms = platforms.linux;
};
}

0 comments on commit f8a7266

Please sign in to comment.