From 066af291c44f8246efee7863fe1c75d66813b6f8 Mon Sep 17 00:00:00 2001 From: Michael Daniels Date: Sat, 30 May 2026 12:51:59 -0400 Subject: [PATCH] {cni-plugin-,}flannel: move to by-name --- .../plugin.nix => by-name/cn/cni-plugin-flannel/package.nix} | 0 .../flannel/default.nix => by-name/fl/flannel/package.nix} | 0 pkgs/top-level/all-packages.nix | 3 --- 3 files changed, 3 deletions(-) rename pkgs/{tools/networking/flannel/plugin.nix => by-name/cn/cni-plugin-flannel/package.nix} (100%) rename pkgs/{tools/networking/flannel/default.nix => by-name/fl/flannel/package.nix} (100%) diff --git a/pkgs/tools/networking/flannel/plugin.nix b/pkgs/by-name/cn/cni-plugin-flannel/package.nix similarity index 100% rename from pkgs/tools/networking/flannel/plugin.nix rename to pkgs/by-name/cn/cni-plugin-flannel/package.nix diff --git a/pkgs/tools/networking/flannel/default.nix b/pkgs/by-name/fl/flannel/package.nix similarity index 100% rename from pkgs/tools/networking/flannel/default.nix rename to pkgs/by-name/fl/flannel/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9ed7c40eaf96..741f4dfe7394 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2172,9 +2172,6 @@ with pkgs; fcitx5-lua = callPackage ../tools/inputmethods/fcitx5/fcitx5-lua.nix { lua = lua5_3; }; - flannel = callPackage ../tools/networking/flannel { }; - cni-plugin-flannel = callPackage ../tools/networking/flannel/plugin.nix { }; - flatpak-builder = callPackage ../development/tools/flatpak-builder { binutils = binutils-unwrapped; };