From ef8fab1b2c8cc6220c368e47bb28ca373efcc59f Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Thu, 2 Jan 2025 14:32:23 +0100 Subject: [PATCH] zfs-replicate: move to by-name --- .../zf/zfs-replicate/package.nix} | 16 +++++----------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 5 insertions(+), 13 deletions(-) rename pkgs/{tools/backup/zfs-replicate/default.nix => by-name/zf/zfs-replicate/package.nix} (72%) diff --git a/pkgs/tools/backup/zfs-replicate/default.nix b/pkgs/by-name/zf/zfs-replicate/package.nix similarity index 72% rename from pkgs/tools/backup/zfs-replicate/default.nix rename to pkgs/by-name/zf/zfs-replicate/package.nix index 37781400c15b..9accd9234462 100644 --- a/pkgs/tools/backup/zfs-replicate/default.nix +++ b/pkgs/by-name/zf/zfs-replicate/package.nix @@ -1,16 +1,10 @@ { - buildPythonApplication, - click, + python3Packages, fetchPypi, - hypothesis, lib, - poetry-core, - pytest-cov-stub, - pytestCheckHook, - stringcase, }: -buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "zfs_replicate"; version = "4.0.0"; pyproject = true; @@ -20,17 +14,17 @@ buildPythonApplication rec { hash = "sha256-9WD2IW7GRxMF7hOa8HTI/+cuOjVaYMT4OnrYU/xFgME="; }; - nativeBuildInputs = [ + nativeBuildInputs = with python3Packages; [ poetry-core ]; - nativeCheckInputs = [ + nativeCheckInputs = with python3Packages; [ pytestCheckHook hypothesis pytest-cov-stub ]; - propagatedBuildInputs = [ + propagatedBuildInputs = with python3Packages; [ click stringcase ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index faf644bc957b..fef19d6a26ff 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18571,8 +18571,6 @@ with pkgs; wfuzz = with python3Packages; toPythonApplication wfuzz; - zfs-replicate = python3Packages.callPackage ../tools/backup/zfs-replicate { }; - kodelife = callPackage ../applications/graphics/kodelife { inherit (gst_all_1) gstreamer gst-plugins-base; };