cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

openshift: 1.5.0 -> 3.6.0

Browse source 
- 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.
This commit is contained in:
Maarten Hoogendoorn 2017-08-17 16:57:43 +02:00
parent ef026e02fc
commit f8a72662cf
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
pkgs/applications/networking/cluster/openshift/default.nix
View file

@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, which, buildGoPackage }: { stdenv, fetchFromGitHub, which, buildGoPackage }:
let let
version = "1.5.0"; version = "3.6.0";
ver = stdenv.lib.elemAt (stdenv.lib.splitString "." version); ver = stdenv.lib.elemAt (stdenv.lib.splitString "." version);
versionMajor = ver 0; versionMajor = ver 0;
versionMinor = ver 1; versionMinor = ver 1;
@ -14,7 +14,7 @@ in buildGoPackage rec {
owner = "openshift"; owner = "openshift";
repo = "origin"; repo = "origin";
rev = "v${version}"; rev = "v${version}";
sha256 = "0qvyxcyca3888nkgvyvqcmybm95ncwxb3zvrzbg2gz8kx6g6350v"; sha256 = "08bdqvsjl6c7dmllyz8n4akb7gyn91znvbph5cgmmk1bhskycy1r";
}; };
buildInputs = [ which ]; buildInputs = [ which ];
@ -28,7 +28,7 @@ in buildGoPackage rec {
cd go/src/origin-v${version}-src cd go/src/origin-v${version}-src
# Openshift build require this variables to be set # Openshift build require this variables to be set
# unless there is a .git folder which is not the case with fetchFromGitHub # 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_MAJOR=${versionMajor}
export OS_GIT_MINOR=${versionMinor} export OS_GIT_MINOR=${versionMinor}
make build make build
@ -43,7 +43,7 @@ in buildGoPackage rec {
description = "Build, deploy, and manage your applications with Docker and Kubernetes"; description = "Build, deploy, and manage your applications with Docker and Kubernetes";
license = licenses.asl20; license = licenses.asl20;
homepage = http://www.openshift.org; homepage = http://www.openshift.org;
maintainers = with maintainers; [offline bachp]; maintainers = with maintainers; [offline bachp moretea];
platforms = platforms.linux; platforms = platforms.linux;
}; };
} }