From 3fd22af3cad5cfb560f3dae0da90bd3339ddd140 Mon Sep 17 00:00:00 2001 From: Adam Stephens Date: Tue, 23 Apr 2024 08:59:00 -0400 Subject: [PATCH] openvswitch*: move to by-name --- .../{os-specific/linux => by-name/op}/openvswitch/generic.nix | 0 pkgs/{os-specific/linux => by-name/op}/openvswitch/lts.nix | 0 .../default.nix => by-name/op/openvswitch/package.nix} | 0 .../patches/disable-bash-arg-completion-test.patch | 0 pkgs/{os-specific/linux => by-name/op}/openvswitch/update.nu | 0 pkgs/top-level/all-packages.nix | 4 +--- 6 files changed, 1 insertion(+), 3 deletions(-) rename pkgs/{os-specific/linux => by-name/op}/openvswitch/generic.nix (100%) rename pkgs/{os-specific/linux => by-name/op}/openvswitch/lts.nix (100%) rename pkgs/{os-specific/linux/openvswitch/default.nix => by-name/op/openvswitch/package.nix} (100%) rename pkgs/{os-specific/linux => by-name/op}/openvswitch/patches/disable-bash-arg-completion-test.patch (100%) rename pkgs/{os-specific/linux => by-name/op}/openvswitch/update.nu (100%) diff --git a/pkgs/os-specific/linux/openvswitch/generic.nix b/pkgs/by-name/op/openvswitch/generic.nix similarity index 100% rename from pkgs/os-specific/linux/openvswitch/generic.nix rename to pkgs/by-name/op/openvswitch/generic.nix diff --git a/pkgs/os-specific/linux/openvswitch/lts.nix b/pkgs/by-name/op/openvswitch/lts.nix similarity index 100% rename from pkgs/os-specific/linux/openvswitch/lts.nix rename to pkgs/by-name/op/openvswitch/lts.nix diff --git a/pkgs/os-specific/linux/openvswitch/default.nix b/pkgs/by-name/op/openvswitch/package.nix similarity index 100% rename from pkgs/os-specific/linux/openvswitch/default.nix rename to pkgs/by-name/op/openvswitch/package.nix diff --git a/pkgs/os-specific/linux/openvswitch/patches/disable-bash-arg-completion-test.patch b/pkgs/by-name/op/openvswitch/patches/disable-bash-arg-completion-test.patch similarity index 100% rename from pkgs/os-specific/linux/openvswitch/patches/disable-bash-arg-completion-test.patch rename to pkgs/by-name/op/openvswitch/patches/disable-bash-arg-completion-test.patch diff --git a/pkgs/os-specific/linux/openvswitch/update.nu b/pkgs/by-name/op/openvswitch/update.nu similarity index 100% rename from pkgs/os-specific/linux/openvswitch/update.nu rename to pkgs/by-name/op/openvswitch/update.nu diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e5fd7bf1f458..855ace3681fb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11567,9 +11567,7 @@ with pkgs; opentelemetry-collector = callPackage ../tools/misc/opentelemetry-collector { }; opentelemetry-collector-contrib = callPackage ../tools/misc/opentelemetry-collector/contrib.nix { }; - openvswitch = callPackage ../os-specific/linux/openvswitch { }; - - openvswitch-lts = callPackage ../os-specific/linux/openvswitch/lts.nix { }; + openvswitch-lts = callPackage ../by-name/op/openvswitch/lts.nix { }; ovn-lts = callPackage ../by-name/ov/ovn/lts.nix { };