From c3b38dfd06e1c10330393c2ed3879262aa3050a5 Mon Sep 17 00:00:00 2001 From: quantenzitrone Date: Mon, 26 Jan 2026 01:10:53 +0100 Subject: [PATCH] cdist: move to pkgs/by-name this shouldn't create any rebuilds --- .../cdist/default.nix => by-name/cd/cdist/package.nix} | 9 +++------ pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 3 insertions(+), 8 deletions(-) rename pkgs/{tools/admin/cdist/default.nix => by-name/cd/cdist/package.nix} (92%) diff --git a/pkgs/tools/admin/cdist/default.nix b/pkgs/by-name/cd/cdist/package.nix similarity index 92% rename from pkgs/tools/admin/cdist/default.nix rename to pkgs/by-name/cd/cdist/package.nix index 239e611e5b6a..893438b6c7ca 100644 --- a/pkgs/tools/admin/cdist/default.nix +++ b/pkgs/by-name/cd/cdist/package.nix @@ -1,13 +1,10 @@ { lib, - buildPythonApplication, + python3Packages, fetchFromGitea, - six, - sphinxHook, - sphinx-rtd-theme, }: -buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "cdist"; version = "7.0.0"; format = "setuptools"; @@ -25,7 +22,7 @@ buildPythonApplication rec { hash = "sha256-lIx0RtGQJdY2e00azI9yS6TV+5pCegpKOOD0dQmgMqA="; }; - nativeBuildInputs = [ + nativeBuildInputs = with python3Packages; [ six sphinxHook sphinx-rtd-theme diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0acf541c941a..44b34d531d40 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2059,8 +2059,6 @@ with pkgs; davix-copy = davix.override { enableThirdPartyCopy = true; }; - cdist = python3Packages.callPackage ../tools/admin/cdist { }; - cemu-ti = qt5.callPackage ../applications/science/math/cemu-ti { }; libceph = ceph.lib;