From 1393d7ec99be1c0d15d32daf77e3ea015ffec6eb Mon Sep 17 00:00:00 2001 From: airone01 Date: Tue, 8 Sep 2026 15:07:31 +0200 Subject: [PATCH 1/4] docker-compose: move to by-name --- .../cli-system-plugin-dir-from-env.patch | 31 +++++++++++++++++++ .../do/docker-compose/package.nix} | 0 pkgs/top-level/all-packages.nix | 1 - 3 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 pkgs/by-name/do/docker-compose/cli-system-plugin-dir-from-env.patch rename pkgs/{applications/virtualization/docker/compose.nix => by-name/do/docker-compose/package.nix} (100%) diff --git a/pkgs/by-name/do/docker-compose/cli-system-plugin-dir-from-env.patch b/pkgs/by-name/do/docker-compose/cli-system-plugin-dir-from-env.patch new file mode 100644 index 000000000000..4e0705df3b2d --- /dev/null +++ b/pkgs/by-name/do/docker-compose/cli-system-plugin-dir-from-env.patch @@ -0,0 +1,31 @@ +diff --git a/cli-plugins/manager/manager_unix.go b/cli-plugins/manager/manager_unix.go +index f546dc3849..5e3ae08dbc 100644 +--- a/cli-plugins/manager/manager_unix.go ++++ b/cli-plugins/manager/manager_unix.go +@@ -2,6 +2,11 @@ + + package manager + ++import ( ++ "os" ++ "path/filepath" ++) ++ + // defaultSystemPluginDirs are the platform-specific locations to search + // for plugins in order of preference. + // +@@ -12,9 +17,8 @@ + // 3. Platform-specific defaultSystemPluginDirs (as defined below). + // + // [ConfigFile.CLIPluginsExtraDirs]: https://pkg.go.dev/github.com/docker/cli@v26.1.4+incompatible/cli/config/configfile#ConfigFile.CLIPluginsExtraDirs +-var defaultSystemPluginDirs = []string{ +- "/usr/local/lib/docker/cli-plugins", +- "/usr/local/libexec/docker/cli-plugins", +- "/usr/lib/docker/cli-plugins", +- "/usr/libexec/docker/cli-plugins", ++var defaultSystemPluginDirs []string ++ ++func init() { ++ defaultSystemPluginDirs = filepath.SplitList(os.Getenv("DOCKER_CLI_PLUGIN_DIRS")) + } + diff --git a/pkgs/applications/virtualization/docker/compose.nix b/pkgs/by-name/do/docker-compose/package.nix similarity index 100% rename from pkgs/applications/virtualization/docker/compose.nix rename to pkgs/by-name/do/docker-compose/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 20b23db3339a..9b203b6ffea1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8375,7 +8375,6 @@ with pkgs; docker-gc = callPackage ../applications/virtualization/docker/gc.nix { }; docker-buildx = callPackage ../applications/virtualization/docker/buildx.nix { }; - docker-compose = callPackage ../applications/virtualization/docker/compose.nix { }; docker-sbom = callPackage ../applications/virtualization/docker/sbom.nix { }; drawpile-server-headless = drawpile.override { From 8ada5d6c96198fabf9257ca2b506572c410dc2de Mon Sep 17 00:00:00 2001 From: airone01 Date: Tue, 8 Sep 2026 16:03:35 +0200 Subject: [PATCH 2/4] docker-sbom: move to by-name --- .../docker/sbom.nix => by-name/do/docker-sbom/package.nix} | 0 .../docker => by-name/do/docker-sbom}/sbom-disable-tests.patch | 0 pkgs/top-level/all-packages.nix | 1 - 3 files changed, 1 deletion(-) rename pkgs/{applications/virtualization/docker/sbom.nix => by-name/do/docker-sbom/package.nix} (100%) rename pkgs/{applications/virtualization/docker => by-name/do/docker-sbom}/sbom-disable-tests.patch (100%) diff --git a/pkgs/applications/virtualization/docker/sbom.nix b/pkgs/by-name/do/docker-sbom/package.nix similarity index 100% rename from pkgs/applications/virtualization/docker/sbom.nix rename to pkgs/by-name/do/docker-sbom/package.nix diff --git a/pkgs/applications/virtualization/docker/sbom-disable-tests.patch b/pkgs/by-name/do/docker-sbom/sbom-disable-tests.patch similarity index 100% rename from pkgs/applications/virtualization/docker/sbom-disable-tests.patch rename to pkgs/by-name/do/docker-sbom/sbom-disable-tests.patch diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9b203b6ffea1..b459bcb65453 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8375,7 +8375,6 @@ with pkgs; docker-gc = callPackage ../applications/virtualization/docker/gc.nix { }; docker-buildx = callPackage ../applications/virtualization/docker/buildx.nix { }; - docker-sbom = callPackage ../applications/virtualization/docker/sbom.nix { }; drawpile-server-headless = drawpile.override { buildClient = false; From 4c37c8d26224fdc315ed76366a37c79b9a878bbc Mon Sep 17 00:00:00 2001 From: airone01 Date: Tue, 8 Sep 2026 16:07:43 +0200 Subject: [PATCH 3/4] docker-gc: move to by-name --- .../docker/gc.nix => by-name/do/docker-gc/package.nix} | 0 pkgs/top-level/all-packages.nix | 1 - 2 files changed, 1 deletion(-) rename pkgs/{applications/virtualization/docker/gc.nix => by-name/do/docker-gc/package.nix} (100%) diff --git a/pkgs/applications/virtualization/docker/gc.nix b/pkgs/by-name/do/docker-gc/package.nix similarity index 100% rename from pkgs/applications/virtualization/docker/gc.nix rename to pkgs/by-name/do/docker-gc/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b459bcb65453..b4d7b8ababc7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8373,7 +8373,6 @@ with pkgs; docker = docker_29; docker-client = docker.override { clientOnly = true; }; - docker-gc = callPackage ../applications/virtualization/docker/gc.nix { }; docker-buildx = callPackage ../applications/virtualization/docker/buildx.nix { }; drawpile-server-headless = drawpile.override { From 212d76d06b79bba54f1c4017c08039949149214f Mon Sep 17 00:00:00 2001 From: airone01 Date: Tue, 8 Sep 2026 17:45:46 +0200 Subject: [PATCH 4/4] docker-buildx: move to by-name --- .../docker/buildx.nix => by-name/do/docker-buildx/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{applications/virtualization/docker/buildx.nix => by-name/do/docker-buildx/package.nix} (100%) diff --git a/pkgs/applications/virtualization/docker/buildx.nix b/pkgs/by-name/do/docker-buildx/package.nix similarity index 100% rename from pkgs/applications/virtualization/docker/buildx.nix rename to pkgs/by-name/do/docker-buildx/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b4d7b8ababc7..74dd2eea29cd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8373,8 +8373,6 @@ with pkgs; docker = docker_29; docker-client = docker.override { clientOnly = true; }; - docker-buildx = callPackage ../applications/virtualization/docker/buildx.nix { }; - drawpile-server-headless = drawpile.override { buildClient = false; buildServerGui = false;