git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #50477 from mayflower/minishift-openshift

minishift: add openshift input

commit617132eba723b79f69d1e8cc51f675f7cccd1452 authorFranz Pletz <fpletz@fnordicwalking.de> dateSat 17 Nov 2018, 07:33 (8 years ago) parentff15da0264346b
1 file changed+10−5
pkgs/applications/networking/cluster/minishift/default.nix+10−5
pkgs/applications/networking/cluster/minishift/default.nix+10−5
@@ -1,14 +1,14 @@
11{ lib, buildGoPackage, fetchFromGitHub, go-bindata, pkgconfig, makeWrapper
2−, glib, gtk3, libappindicator-gtk3, gpgme, ostree, libselinux, btrfs-progs
2+, glib, gtk3, libappindicator-gtk3, gpgme, openshift, ostree, libselinux, btrfs-progs
33, lvm2, docker-machine-kvm
44}:
55
66let
7− version = "1.25.0";
7+ version = "1.27.0";
88
99 # Update these on version bumps according to Makefile
1010 b2dIsoVersion = "v1.3.0";
11− centOsIsoVersion = "v1.12.0";
11+ centOsIsoVersion = "v1.13.0";
1212 openshiftVersion = "v3.11.0";
1313
1414in buildGoPackage rec {
@@ -19,7 +19,7 @@ in buildGoPackage rec {
1919 owner = "minishift";
2020 repo = "minishift";
2121 rev = "v${version}";
22− sha256 = "12a1irj92lplzkr88g049blpjsdsfwfihs2xix971cq7v0w38fkf";
22+ sha256 = "1zd9fjw90h8dlr5w7pdf1agvm51b1zckf3grwwjdg64jqpzdwg9f";
2323 };
2424
2525 nativeBuildInputs = [ pkgconfig go-bindata makeWrapper ];
@@ -31,6 +31,11 @@ in buildGoPackage rec {
3131 postPatch = ''
3232 substituteInPlace vendor/github.com/containers/image/storage/storage_image.go \
3333 --replace 'nil, diff' 'diff'
34+
35+ # minishift downloads openshift if not found therefore set the cache to /nix/store/...
36+ substituteInPlace pkg/minishift/cache/oc_caching.go \
37+ --replace 'filepath.Join(oc.MinishiftCacheDir, OC_CACHE_DIR, oc.OpenShiftVersion, runtime.GOOS)' '"${openshift}/bin"' \
38+ --replace '"runtime"' ""
3439 '';
3540
3641 buildFlagsArray = ''
@@ -49,7 +54,7 @@ in buildGoPackage rec {
4954
5055 postInstall = ''
5156 wrapProgram "$bin/bin/minishift" \
52− --prefix PATH ':' '${lib.makeBinPath [ docker-machine-kvm ]}'
57+ --prefix PATH ':' '${lib.makeBinPath [ docker-machine-kvm openshift ]}'
5358 '';
5459
5560 meta = with lib; {