Merge pull request #79135 from dtzWill/fix/moby-now-linuxkit

moby: remove, merged into linuxkit in 2018
This commit is contained in:
Florian Klink 2020-02-05 01:09:15 +01:00 committed by GitHub
commit cbbb81c830
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 1 additions and 29 deletions

View File

@ -1,27 +0,0 @@
{ lib, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
pname = "moby";
version = "2017-07-06";
rev = "d87a3f9990ed24ebbb51695879cd640cb07a4b40";
goPackagePath = "github.com/moby/tool";
src = fetchFromGitHub {
owner = "moby";
repo = "tool";
inherit rev;
sha256 = "0xhasm69g5gwihcm8g7rff9nkx7iffvd642bknky6j3w133gs5lp";
};
preBuild = ''
buildFlagsArray+=("-ldflags" "-X main.GitCommit=${builtins.substring 0 7 rev} -X main.Version=0.0.0")
'';
meta = {
description = "Assembly tool for the Moby project, an open framework to assemble specialized container systems without reinventing the wheel";
license = lib.licenses.asl20;
homepage = https://mobyproject.org;
platforms = lib.platforms.unix;
};
}

View File

@ -254,6 +254,7 @@ mapAliases ({
midoriWrapper = midori; # added 2015-01
mlt-qt5 = libsForQt5.mlt; # added 2015-12-19
mobile_broadband_provider_info = mobile-broadband-provider-info; # added 2018-02-25
moby = throw "moby has been removed, merged into linuxkit in 2018. Use linuxkit instead.";
module_init_tools = kmod; # added 2016-04-22
mono-zeroconf = throw "deprecated 2019-09-20: abandoned by upstream.";
mozart = mozart2-binary; # added 2019-09-23

View File

@ -10336,8 +10336,6 @@ in
mkdocs = callPackage ../development/tools/documentation/mkdocs { };
moby = callPackage ../development/tools/misc/moby { };
modd = callPackage ../development/tools/modd { };
msgpack-tools = callPackage ../development/tools/msgpack-tools { };