summaryrefslogtreecommitdiffstats
path: root/pkgs/applications/networking/cluster/openshift
diff options
context:
space:
mode:
authorMaarten Hoogendoorn <maarten@moretea.nl>2017-08-17 16:57:43 +0200
committerMaarten Hoogendoorn <maarten@moretea.nl>2017-08-17 16:57:43 +0200
commitf8a72662cf1ca0717f1007d26a3d789f088c5c47 (patch)
tree50d79ccbb32ba672b67cc97fcfad594d14a6fab0 /pkgs/applications/networking/cluster/openshift
parentef026e02fcaa92323be875d8c7146b0b86e31880 (diff)
openshift: 1.5.0 -> 3.6.0
- 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.
Diffstat (limited to 'pkgs/applications/networking/cluster/openshift')
-rw-r--r--pkgs/applications/networking/cluster/openshift/default.nix8
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 6ade5bab70e8..ca4793251499 100644
--- a/pkgs/applications/networking/cluster/openshift/default.nix
+++ b/pkgs/applications/networking/cluster/openshift/default.nix
@@ -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;
@@ -14,7 +14,7 @@ in buildGoPackage rec {
owner = "openshift";
repo = "origin";
rev = "v${version}";
- sha256 = "0qvyxcyca3888nkgvyvqcmybm95ncwxb3zvrzbg2gz8kx6g6350v";
+ sha256 = "08bdqvsjl6c7dmllyz8n4akb7gyn91znvbph5cgmmk1bhskycy1r";
};
buildInputs = [ which ];
@@ -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
@@ -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;
};
}