From 08c3c0094aa6492d1ba396f15201ab1ae00b588f Mon Sep 17 00:00:00 2001
From: Christian Albrecht <christian.albrecht@mayflower.de>
Date: Fri, 16 Nov 2018 23:18:51 +0100
Subject: [PATCH 1/2] minishift: add openshift input

minishift depdends on oc to control the openshift installation.
---
 .../networking/cluster/minishift/default.nix             | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/cluster/minishift/default.nix b/pkgs/applications/networking/cluster/minishift/default.nix
index 13f73f51a319..d5f16ab4ff01 100644
--- a/pkgs/applications/networking/cluster/minishift/default.nix
+++ b/pkgs/applications/networking/cluster/minishift/default.nix
@@ -1,5 +1,5 @@
 { lib, buildGoPackage, fetchFromGitHub, go-bindata, pkgconfig, makeWrapper
-, glib, gtk3, libappindicator-gtk3, gpgme, ostree, libselinux, btrfs-progs
+, glib, gtk3, libappindicator-gtk3, gpgme, openshift, ostree, libselinux, btrfs-progs
 , lvm2, docker-machine-kvm
 }:
 
@@ -31,6 +31,11 @@ in buildGoPackage rec {
   postPatch = ''
     substituteInPlace vendor/github.com/containers/image/storage/storage_image.go \
       --replace 'nil, diff' 'diff'
+
+    # minishift downloads openshift if not found therefore set the cache to /nix/store/...
+    substituteInPlace pkg/minishift/cache/oc_caching.go \
+      --replace 'filepath.Join(oc.MinishiftCacheDir, OC_CACHE_DIR, oc.OpenShiftVersion, runtime.GOOS)' '"${openshift}/bin"' \
+      --replace '"runtime"' ""
   '';
 
   buildFlagsArray = ''
@@ -49,7 +54,7 @@ in buildGoPackage rec {
 
   postInstall = ''
     wrapProgram "$bin/bin/minishift" \
-      --prefix PATH ':' '${lib.makeBinPath [ docker-machine-kvm ]}'
+      --prefix PATH ':' '${lib.makeBinPath [ docker-machine-kvm openshift ]}'
   '';
 
   meta = with lib; {

From 264346bd8c0c5aa863eade5512c70fce00608199 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Fri, 16 Nov 2018 23:32:06 +0100
Subject: [PATCH 2/2] minishift: 1.25.0 -> 1.27.0

---
 pkgs/applications/networking/cluster/minishift/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/cluster/minishift/default.nix b/pkgs/applications/networking/cluster/minishift/default.nix
index d5f16ab4ff01..c07be777de0e 100644
--- a/pkgs/applications/networking/cluster/minishift/default.nix
+++ b/pkgs/applications/networking/cluster/minishift/default.nix
@@ -4,11 +4,11 @@
 }:
 
 let
-  version = "1.25.0";
+  version = "1.27.0";
 
   # Update these on version bumps according to Makefile
   b2dIsoVersion = "v1.3.0";
-  centOsIsoVersion = "v1.12.0";
+  centOsIsoVersion = "v1.13.0";
   openshiftVersion = "v3.11.0";
 
 in buildGoPackage rec {
@@ -19,7 +19,7 @@ in buildGoPackage rec {
     owner = "minishift";
     repo = "minishift";
     rev = "v${version}";
-    sha256 = "12a1irj92lplzkr88g049blpjsdsfwfihs2xix971cq7v0w38fkf";
+    sha256 = "1zd9fjw90h8dlr5w7pdf1agvm51b1zckf3grwwjdg64jqpzdwg9f";
   };
 
   nativeBuildInputs = [ pkgconfig go-bindata makeWrapper ];