From 3e83806771437717bd407230c4147ef306affc20 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sun, 2 Feb 2020 17:14:55 -0600 Subject: [PATCH] moby: remove, merged into linuxkit in 2018 Don't alias linuxkit, as linuxkit is not a drop-in replacement. Instead, throw with an explanation. (thanks reviewers!) --- pkgs/development/tools/misc/moby/default.nix | 27 -------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 1 insertion(+), 29 deletions(-) delete mode 100644 pkgs/development/tools/misc/moby/default.nix diff --git a/pkgs/development/tools/misc/moby/default.nix b/pkgs/development/tools/misc/moby/default.nix deleted file mode 100644 index a5e4572d18dd..000000000000 --- a/pkgs/development/tools/misc/moby/default.nix +++ /dev/null @@ -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; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 2bcfb2b0047c..4f3bed9e877b 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -252,6 +252,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 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 98e878a8d79e..c9b9f7d8461c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10339,8 +10339,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 { };