From 8593cb1c462728c03cabfb98ab686e562b5506e6 Mon Sep 17 00:00:00 2001 From: Ben Brown Date: Wed, 8 Jul 2026 00:28:22 +0100 Subject: [PATCH] marge-bot: specify correct dependencies marge-bot migrated to uv back in 0.15.1: https://gitlab.com/marge-org/marge-bot/-/compare/0.15.0...0.15.1 maya and pendulum were removed back in 0.14.2: https://gitlab.com/marge-org/marge-bot/-/compare/0.14.1...0.14.2 --- pkgs/by-name/ma/marge-bot/package.nix | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/ma/marge-bot/package.nix b/pkgs/by-name/ma/marge-bot/package.nix index 5f0978768384..ba7cc4b5a31a 100644 --- a/pkgs/by-name/ma/marge-bot/package.nix +++ b/pkgs/by-name/ma/marge-bot/package.nix @@ -1,13 +1,13 @@ { lib, - python3, fetchFromGitLab, + python3Packages, git, openssh, nix-update-script, }: -python3.pkgs.buildPythonApplication (finalAttrs: { +python3Packages.buildPythonApplication (finalAttrs: { pname = "marge-bot"; version = "1.1.0"; pyproject = true; @@ -19,18 +19,17 @@ python3.pkgs.buildPythonApplication (finalAttrs: { hash = "sha256-nTVfsprCTa2S/F8GDdDw5SwQw+OrGkHrX/QwU1FZDsw="; }; - nativeBuildInputs = [ - python3.pkgs.setuptools + build-system = with python3Packages; [ + hatchling + uv-build ]; - propagatedBuildInputs = - (with python3.pkgs; [ + dependencies = + (with python3Packages; [ configargparse - maya pyyaml requests python-gitlab - hatchling ]) ++ [ git @@ -38,10 +37,11 @@ python3.pkgs.buildPythonApplication (finalAttrs: { ]; nativeCheckInputs = - (with python3.pkgs; [ + (with python3Packages; [ pytest-cov-stub pytestCheckHook - pendulum + python-dateutil + time-machine ]) ++ [ git