dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #52761 from vdemeester/update-minishift

Browse Source 
minishift: 1.27.0 -> 1.29.0
This commit is contained in:
lewo 2018-12-26 17:42:31 +01:00 committed by GitHub
commit 1223d9f479
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/applications/networking/cluster/minishift/default.nix
View File

@ -4,10 +4,9 @@
}: }:
let let
version = "1.27.0"; version = "1.29.0";
# Update these on version bumps according to Makefile # Update these on version bumps according to Makefile
b2dIsoVersion = "v1.3.0";
centOsIsoVersion = "v1.13.0"; centOsIsoVersion = "v1.13.0";
openshiftVersion = "v3.11.0"; openshiftVersion = "v3.11.0";
@ -19,7 +18,7 @@ in buildGoPackage rec {
owner = "minishift"; owner = "minishift";
repo = "minishift"; repo = "minishift";
rev = "v${version}"; rev = "v${version}";
sha256 = "1zd9fjw90h8dlr5w7pdf1agvm51b1zckf3grwwjdg64jqpzdwg9f"; sha256 = "17scvv60hgk7s9fy4s9z26sc8a69ryh33rhr1f7p92kb5wfh2x40";
}; };
nativeBuildInputs = [ pkgconfig go-bindata makeWrapper ]; nativeBuildInputs = [ pkgconfig go-bindata makeWrapper ];
@ -41,7 +40,6 @@ in buildGoPackage rec {
buildFlagsArray = '' buildFlagsArray = ''
-ldflags= -ldflags=
-X ${goPackagePath}/pkg/version.minishiftVersion=${version} -X ${goPackagePath}/pkg/version.minishiftVersion=${version}
-X ${goPackagePath}/pkg/version.b2dIsoVersion=${b2dIsoVersion}
-X ${goPackagePath}/pkg/version.centOsIsoVersion=${centOsIsoVersion} -X ${goPackagePath}/pkg/version.centOsIsoVersion=${centOsIsoVersion}
-X ${goPackagePath}/pkg/version.openshiftVersion=${openshiftVersion} -X ${goPackagePath}/pkg/version.openshiftVersion=${openshiftVersion}
''; '';
@ -65,7 +63,7 @@ in buildGoPackage rec {
or develop with it, day-to-day, on your local host. or develop with it, day-to-day, on your local host.
''; '';
homepage = https://github.com/minishift/minishift; homepage = https://github.com/minishift/minishift;
maintainers = with maintainers; [ fpletz ]; maintainers = with maintainers; [ fpletz vdemeester ];
platforms = platforms.linux; platforms = platforms.linux;
license = licenses.asl20; license = licenses.asl20;
}; };