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

openshift: 3.9.0 -> 3.10.0 (#44484)

Browse Source
This commit is contained in:
Jens Binkert 2018-08-05 16:28:45 +02:00 committed by xeji
parent 62d0b676dd
commit f5cf11b2f1
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -9,15 +9,17 @@
with lib; with lib;
let let
version = "3.9.0"; version = "3.10.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;
versionPatch = ver 2; versionPatch = ver 2;
gitCommit = "191fece"; gitCommit = "dd10d17";
# version is in vendor/k8s.io/kubernetes/pkg/version/base.go # version is in vendor/k8s.io/kubernetes/pkg/version/base.go
k8sversion = "v1.9.1"; k8sversion = "v1.10.0";
k8sgitcommit = "a0ce1bc657"; k8sgitcommit = "b81c8f8";
k8sgitMajor = "0";
k8sgitMinor = "1";
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
name = "openshift-origin-${version}"; name = "openshift-origin-${version}";
inherit version; inherit version;
@ -26,7 +28,7 @@ in stdenv.mkDerivation rec {
owner = "openshift"; owner = "openshift";
repo = "origin"; repo = "origin";
rev = "v${version}"; rev = "v${version}";
sha256 = "06k0zilfyvll7z34yirraslgpwgah9k6y5i6wgi7f00a79k76k78"; sha256 = "13aglz005jl48z17vnggkvr39l5h6jcqgkfyvkaz4c3jakms1hi9";
}; };
# go > 1.10 # go > 1.10
@ -38,15 +40,15 @@ in stdenv.mkDerivation rec {
patchPhase = '' patchPhase = ''
patchShebangs ./hack patchShebangs ./hack
substituteInPlace pkg/oc/bootstrap/docker/host/host.go \ substituteInPlace pkg/oc/clusterup/docker/host/host.go \
--replace 'nsenter --mount=/rootfs/proc/1/ns/mnt findmnt' \ --replace 'nsenter --mount=/rootfs/proc/1/ns/mnt findmnt' \
'nsenter --mount=/rootfs/proc/1/ns/mnt ${utillinux}/bin/findmnt' 'nsenter --mount=/rootfs/proc/1/ns/mnt ${utillinux}/bin/findmnt'
substituteInPlace pkg/oc/bootstrap/docker/host/host.go \ substituteInPlace pkg/oc/clusterup/docker/host/host.go \
--replace 'nsenter --mount=/rootfs/proc/1/ns/mnt mount' \ --replace 'nsenter --mount=/rootfs/proc/1/ns/mnt mount' \
'nsenter --mount=/rootfs/proc/1/ns/mnt ${utillinux}/bin/mount' 'nsenter --mount=/rootfs/proc/1/ns/mnt ${utillinux}/bin/mount'
substituteInPlace pkg/oc/bootstrap/docker/host/host.go \ substituteInPlace pkg/oc/clusterup/docker/host/host.go \
--replace 'nsenter --mount=/rootfs/proc/1/ns/mnt mkdir' \ --replace 'nsenter --mount=/rootfs/proc/1/ns/mnt mkdir' \
'nsenter --mount=/rootfs/proc/1/ns/mnt ${coreutils}/bin/mkdir' 'nsenter --mount=/rootfs/proc/1/ns/mnt ${coreutils}/bin/mkdir'
''; '';
@ -61,6 +63,8 @@ in stdenv.mkDerivation rec {
echo "OS_GIT_COMMIT=${gitCommit}" >> os-version-defs echo "OS_GIT_COMMIT=${gitCommit}" >> os-version-defs
echo "KUBE_GIT_VERSION=${k8sversion}" >> os-version-defs echo "KUBE_GIT_VERSION=${k8sversion}" >> os-version-defs
echo "KUBE_GIT_COMMIT=${k8sgitcommit}" >> os-version-defs echo "KUBE_GIT_COMMIT=${k8sgitcommit}" >> os-version-defs
echo "KUBE_GIT_MAJOR=${k8sgitMajor}" >> os-version-defs
echo "KUBE_GIT_MINOR=${k8sgitMinor}" >> os-version-defs
export OS_VERSION_FILE="os-version-defs" export OS_VERSION_FILE="os-version-defs"
export CC=clang export CC=clang
make all WHAT='${concatStringsSep " " components}' make all WHAT='${concatStringsSep " " components}'