diff options
author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2024-06-11 09:32:12 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-06-11 09:32:12 +0200 |
commit | 8e5bca2ebf8d62f8cb15270874fa1d565a6a8d9f (patch) | |
tree | 8e76a83497fdd2d61816f911cced8736f0d5b22c | |
parent | d15bc101a437f4cde76c11b36e7f47673239c777 (diff) | |
parent | 23930cb86701bc673fb6c8615a5c9a4fc19ab87e (diff) |
Merge pull request #318571 from msanft/containerpilot/remove
containerpilot: remove
-rw-r--r-- | pkgs/applications/networking/cluster/containerpilot/default.nix | 25 | ||||
-rw-r--r-- | pkgs/applications/networking/cluster/containerpilot/deps.nix | 173 | ||||
-rw-r--r-- | pkgs/top-level/aliases.nix | 1 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
4 files changed, 1 insertions, 200 deletions
diff --git a/pkgs/applications/networking/cluster/containerpilot/default.nix b/pkgs/applications/networking/cluster/containerpilot/default.nix deleted file mode 100644 index eab6288dc65df..0000000000000 --- a/pkgs/applications/networking/cluster/containerpilot/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ lib, buildGoPackage, fetchFromGitHub }: - -buildGoPackage rec { - version = "3.9.0pre"; - pname = "containerpilot"; - - src = fetchFromGitHub { - owner = "joyent"; - repo = pname; - rev = "d999b632b0c96d9e27f092dc9f81a9d82dfe0106"; - sha256 = "0wsc8canr1c9wzr1lv40yixj9l10c66i6d14yrljsyagl2z02v4n"; - }; - - goPackagePath = "github.com/joyent/${pname}"; - goDeps = ./deps.nix; - - meta = with lib; { - homepage = "https://www.joyent.com/containerpilot"; - description = "Application centric micro-orchestrator"; - mainProgram = "containerpilot"; - platforms = platforms.unix; - license = licenses.mpl20; - maintainers = with maintainers; [ cpcloud ]; - }; -} diff --git a/pkgs/applications/networking/cluster/containerpilot/deps.nix b/pkgs/applications/networking/cluster/containerpilot/deps.nix deleted file mode 100644 index 9df154389cbc6..0000000000000 --- a/pkgs/applications/networking/cluster/containerpilot/deps.nix +++ /dev/null @@ -1,173 +0,0 @@ -# file generated from go.mod using vgo2nix (https://github.com/nix-community/vgo2nix) -[ - { - goPackagePath = "github.com/beorn7/perks"; - fetch = { - type = "git"; - url = "https://github.com/beorn7/perks"; - rev = "4c0e84591b9a"; - sha256 = "1hrybsql68xw57brzj805xx2mghydpdiysv3gbhr7f5wlxj2514y"; - moduleDir = ""; - }; - } - { - goPackagePath = "github.com/client9/reopen"; - fetch = { - type = "git"; - url = "https://github.com/client9/reopen"; - rev = "1a6ccbeaae3f"; - sha256 = "0iarv0sn9hb26sr75bwilz3m86kcfad4m5klmzixbd4yw1ipnffa"; - moduleDir = ""; - }; - } - { - goPackagePath = "github.com/flynn/json5"; - fetch = { - type = "git"; - url = "https://github.com/flynn/json5"; - rev = "7620272ed633"; - sha256 = "1l3rqfis8b72mqwm88lx78d0mbdihyamj8cgg2pa5vfbq49cpydf"; - moduleDir = ""; - }; - } - { - goPackagePath = "github.com/golang/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/golang/protobuf"; - rev = "6a1fa9404c0a"; - sha256 = "0dsd6vlfdyarn3v822x9p2s94gfi5lhvqc2vm3bqmqjgcik3c51z"; - moduleDir = ""; - }; - } - { - goPackagePath = "github.com/hashicorp/consul"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/consul"; - rev = "v1.0.1-rc1"; - sha256 = "10xqi86n2h39q3qlkxfhnrqwm1bgijs5n2kryaq9yalv5p3qxczg"; - moduleDir = ""; - }; - } - { - goPackagePath = "github.com/hashicorp/go-cleanhttp"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/go-cleanhttp"; - rev = "3573b8b52aa7"; - sha256 = "1pbl6p7w5wp1c70x7fp94h4ynk2ajfa76rqin3d2hq1w2fcb7byr"; - moduleDir = ""; - }; - } - { - goPackagePath = "github.com/hashicorp/go-rootcerts"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/go-rootcerts"; - rev = "6bb64b370b90"; - sha256 = "1a81fcm1i0ji2iva0dcimiichgwpbcb7lx0vyaks87zj5wf04qy9"; - moduleDir = ""; - }; - } - { - goPackagePath = "github.com/hashicorp/serf"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/serf"; - rev = "91fd53b1d3e6"; - sha256 = "0p9mhv6w85cxxl95kvl3rk04yif6v5bhf5kxw8i1cphv5kddv7j9"; - moduleDir = ""; - }; - } - { - goPackagePath = "github.com/matttproud/golang_protobuf_extensions"; - fetch = { - type = "git"; - url = "https://github.com/matttproud/golang_protobuf_extensions"; - rev = "v1.0.1"; - sha256 = "1d0c1isd2lk9pnfq2nk0aih356j30k3h1gi2w0ixsivi5csl7jya"; - moduleDir = ""; - }; - } - { - goPackagePath = "github.com/mitchellh/go-homedir"; - fetch = { - type = "git"; - url = "https://github.com/mitchellh/go-homedir"; - rev = "b8bc1bf76747"; - sha256 = "13ry4lylalkh4g2vny9cxwvryslzyzwp9r92z0b10idhdq3wad1q"; - moduleDir = ""; - }; - } - { - goPackagePath = "github.com/mitchellh/mapstructure"; - fetch = { - type = "git"; - url = "https://github.com/mitchellh/mapstructure"; - rev = "d2dd02622084"; - sha256 = "1idj9h0g9z3s21y2hivaf1dknxhpd7yy0kn6wk3311hlr7s543j5"; - moduleDir = ""; - }; - } - { - goPackagePath = "github.com/prometheus/client_golang"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/client_golang"; - rev = "v0.8.0"; - sha256 = "1xqny3147g12n4j03kxm8s9mvdbs3ln6i56c655mybrn9jjy48kd"; - moduleDir = ""; - }; - } - { - goPackagePath = "github.com/prometheus/client_model"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/client_model"; - rev = "6f3806018612"; - sha256 = "1413ibprinxhni51p0755dp57r9wvbw7xgj9nmdaxmhzlqhc86j4"; - moduleDir = ""; - }; - } - { - goPackagePath = "github.com/prometheus/common"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/common"; - rev = "0866df4b85a1"; - sha256 = "0zw4rxs6zh9vgxz5wwhjnwa6mgac8jh7mb63viircgh08r889chp"; - moduleDir = ""; - }; - } - { - goPackagePath = "github.com/prometheus/procfs"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/procfs"; - rev = "e645f4e5aaa8"; - sha256 = "18hwygbawbqilz7h8fl25xpbciwalkslb4igqn4cr9d8sqp7d3np"; - moduleDir = ""; - }; - } - { - goPackagePath = "github.com/sirupsen/logrus"; - fetch = { - type = "git"; - url = "https://github.com/sirupsen/logrus"; - rev = "v1.0.0"; - sha256 = "0kyvaa4m8w5wijjvrh0amd9bl3sci1vj4y9v9a97sx3rf7xww52l"; - moduleDir = ""; - }; - } - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "94b76065f2d2"; - sha256 = "0lxd3gmkvza3mah5m8nncdsgd1y6r25vaz4wzdmrs3i1ikzknn93"; - moduleDir = ""; - }; - } -] diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 4282ea28a4b0a..94b8b48995e5e 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -203,6 +203,7 @@ mapAliases ({ compton = throw "'compton' has been renamed to/replaced by 'picom'"; # Converted to throw 2023-09-10 concurrencykit = libck; # Added 2021-03 connmanPackages = throw "'connmanPackages' was removed and their subpackages/attributes were promoted to top level."; # Added 2023-10-08 + containerpilot = throw "'containerpilot' has been removed from nixpkgs, as it was broken and unmaintained"; # Added 2024-06-09 convoy = throw "'convoy' has been removed from nixpkgs, as it was archived upstream"; # Added 2023-12-27 crda = throw "'crda' has been removed from nixpkgs, as it is needed only for kernels before 4.16"; # Added 2024-02-06 cups-kyodialog3 = cups-kyodialog; # Added 2022-11-12 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 198d047c41d5b..a1ebe974ef933 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -525,8 +525,6 @@ with pkgs; containerlab = callPackage ../tools/networking/containerlab { }; - containerpilot = callPackage ../applications/networking/cluster/containerpilot { }; - coolercontrol = recurseIntoAttrs (callPackage ../applications/system/coolercontrol { }); confetty = callPackage ../applications/misc/confetty { }; |