From c83b707f2f6795eeeed7d3f24bb21de3a20531a7 Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Sat, 30 Dec 2023 11:31:53 +0100 Subject: [PATCH] minishift: remove --- .../networking/cluster/minishift/default.nix | 66 ------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 - 3 files changed, 1 insertion(+), 68 deletions(-) delete mode 100644 pkgs/applications/networking/cluster/minishift/default.nix diff --git a/pkgs/applications/networking/cluster/minishift/default.nix b/pkgs/applications/networking/cluster/minishift/default.nix deleted file mode 100644 index bee4d4785293..000000000000 --- a/pkgs/applications/networking/cluster/minishift/default.nix +++ /dev/null @@ -1,66 +0,0 @@ -{ lib, buildGoPackage, fetchFromGitHub, go-bindata, pkg-config, makeWrapper -, glib, gtk3, libappindicator-gtk3, gpgme, openshift, ostree, libselinux, btrfs-progs -, lvm2, docker-machine-kvm -}: - -let - version = "1.34.3"; - - # Update these on version bumps according to Makefile - centOsIsoVersion = "v1.17.0"; - openshiftVersion = "v3.11.0"; - -in buildGoPackage rec { - pname = "minishift"; - inherit version; - - src = fetchFromGitHub { - owner = "minishift"; - repo = "minishift"; - rev = "v${version}"; - sha256 = "0yhln3kyc0098hbnjyxhbd915g6j7s692c0z8yrhh9gdpc5cr2aa"; - }; - - nativeBuildInputs = [ pkg-config go-bindata makeWrapper ]; - buildInputs = [ glib gtk3 libappindicator-gtk3 gpgme ostree libselinux btrfs-progs lvm2 ]; - - goPackagePath = "github.com/minishift/minishift"; - subPackages = [ "cmd/minishift" ]; - - postPatch = '' - # 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"' "" - ''; - - ldflags = [ - "-X ${goPackagePath}/pkg/version.minishiftVersion=${version}" - "-X ${goPackagePath}/pkg/version.centOsIsoVersion=${centOsIsoVersion}" - "-X ${goPackagePath}/pkg/version.openshiftVersion=${openshiftVersion}" - ]; - - preBuild = '' - (cd go/src/github.com/minishift/minishift - mkdir -p out/bindata - go-bindata -prefix addons -o out/bindata/addon_assets.go -pkg bindata addons/...) - ''; - - postInstall = '' - wrapProgram "$out/bin/minishift" \ - --prefix PATH ':' '${lib.makeBinPath [ docker-machine-kvm openshift ]}' - ''; - - meta = with lib; { - description = "Run OpenShift locally"; - longDescription = '' - Minishift is a tool that helps you run OpenShift locally by running - a single-node OpenShift cluster inside a VM. You can try out OpenShift - or develop with it, day-to-day, on your local host. - ''; - homepage = "https://github.com/minishift/minishift"; - maintainers = with maintainers; [ vdemeester ]; - platforms = platforms.linux; - license = licenses.asl20; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 300b15940cdf..174f613930dc 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -601,6 +601,7 @@ mapAliases ({ mess = throw "'mess' has been renamed to/replaced by 'mame'"; # Converted to throw 2023-09-10 microsoft_gsl = microsoft-gsl; # Added 2023-05-26 migraphx = throw "'migraphx' has been replaced with 'rocmPackages.migraphx'"; # Added 2023-10-08 + minishift = throw "'minishift' has been removed as it was discontinued upstream. Use 'crc' to setup a microshift cluster instead"; # Added 2023-12-30 miopen = throw "'miopen' has been replaced with 'rocmPackages.miopen'"; # Added 2023-10-08 miopengemm = throw "'miopengemm' has been replaced with 'rocmPackages.miopengemm'"; # Added 2023-10-08 miopen-hip = throw "'miopen-hip' has been replaced with 'rocmPackages.miopen-hip'"; # Added 2023-10-08 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9498eeb390a6..053e2175f83a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -33683,8 +33683,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) vmnet; }; - minishift = callPackage ../applications/networking/cluster/minishift { }; - minitube = libsForQt5.callPackage ../applications/video/minitube { }; mimic = callPackage ../applications/audio/mimic { };