diff options
| author | Jens Binkert <jensbin+git@pm.me> | 2018-08-05 16:28:45 +0200 |
|---|---|---|
| committer | xeji <36407913+xeji@users.noreply.github.com> | 2018-08-05 16:28:45 +0200 |
| commit | f5cf11b2f13bf67e01b65a9a9f0d3413190c235f (patch) | |
| tree | 2ad6635af9385a7d0d924332811dd924b7589791 /pkgs/applications/networking/cluster/openshift | |
| parent | 62d0b676dd242174102cf70f1d9ff5b50a69ce96 (diff) | |
| download | nixlib-f5cf11b2f13bf67e01b65a9a9f0d3413190c235f.tar nixlib-f5cf11b2f13bf67e01b65a9a9f0d3413190c235f.tar.gz nixlib-f5cf11b2f13bf67e01b65a9a9f0d3413190c235f.tar.bz2 nixlib-f5cf11b2f13bf67e01b65a9a9f0d3413190c235f.tar.lz nixlib-f5cf11b2f13bf67e01b65a9a9f0d3413190c235f.tar.xz nixlib-f5cf11b2f13bf67e01b65a9a9f0d3413190c235f.tar.zst nixlib-f5cf11b2f13bf67e01b65a9a9f0d3413190c235f.zip | |
openshift: 3.9.0 -> 3.10.0 (#44484)
Diffstat (limited to 'pkgs/applications/networking/cluster/openshift')
| -rw-r--r-- | pkgs/applications/networking/cluster/openshift/default.nix | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/pkgs/applications/networking/cluster/openshift/default.nix b/pkgs/applications/networking/cluster/openshift/default.nix index 6f836d27357a..0f137a872da6 100644 --- a/pkgs/applications/networking/cluster/openshift/default.nix +++ b/pkgs/applications/networking/cluster/openshift/default.nix @@ -9,15 +9,17 @@ with lib; let - version = "3.9.0"; + version = "3.10.0"; ver = stdenv.lib.elemAt (stdenv.lib.splitString "." version); versionMajor = ver 0; versionMinor = ver 1; versionPatch = ver 2; - gitCommit = "191fece"; + gitCommit = "dd10d17"; # version is in vendor/k8s.io/kubernetes/pkg/version/base.go - k8sversion = "v1.9.1"; - k8sgitcommit = "a0ce1bc657"; + k8sversion = "v1.10.0"; + k8sgitcommit = "b81c8f8"; + k8sgitMajor = "0"; + k8sgitMinor = "1"; in stdenv.mkDerivation rec { name = "openshift-origin-${version}"; inherit version; @@ -26,7 +28,7 @@ in stdenv.mkDerivation rec { owner = "openshift"; repo = "origin"; rev = "v${version}"; - sha256 = "06k0zilfyvll7z34yirraslgpwgah9k6y5i6wgi7f00a79k76k78"; + sha256 = "13aglz005jl48z17vnggkvr39l5h6jcqgkfyvkaz4c3jakms1hi9"; }; # go > 1.10 @@ -38,15 +40,15 @@ in stdenv.mkDerivation rec { patchPhase = '' 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' \ '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' \ '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' \ '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 "KUBE_GIT_VERSION=${k8sversion}" >> 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 CC=clang make all WHAT='${concatStringsSep " " components}' |