diff --git a/pkgs/by-name/do/dotbot/0001-fix-build.patch b/pkgs/by-name/do/dotbot/0001-fix-build.patch deleted file mode 100644 index d960db1a5846..000000000000 --- a/pkgs/by-name/do/dotbot/0001-fix-build.patch +++ /dev/null @@ -1,30 +0,0 @@ -From c82a6e988594e6bb703df1f39d31451ea5be6967 Mon Sep 17 00:00:00 2001 -From: wxt <3264117476@qq.com> -Date: Sun, 3 Nov 2024 16:23:50 +0800 -Subject: [PATCH] fix build - ---- - tests/conftest.py | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/tests/conftest.py b/tests/conftest.py -index 162781b..d13808d 100644 ---- a/tests/conftest.py -+++ b/tests/conftest.py -@@ -47,11 +47,12 @@ def wrap_function(function, function_path, arg_index, kwarg_key, root): - - msg = "The '{0}' argument to {1}() must be an absolute path" - msg = msg.format(kwarg_key, function_path) -+ value = os.path.join(value) - assert value == os.path.abspath(value), msg - - msg = "The '{0}' argument to {1}() must be rooted in {2}" - msg = msg.format(kwarg_key, function_path, root) -- assert value[: len(str(root))] == str(root), msg -+ assert value[: len(str(root))] == str(root) or value.find("pytest-cache")!=-1, msg - - return function(*args, **kwargs) - --- -2.46.1 - diff --git a/pkgs/by-name/do/dotbot/package.nix b/pkgs/by-name/do/dotbot/package.nix index bdf9ecd8eeaf..7bb4b99872d5 100644 --- a/pkgs/by-name/do/dotbot/package.nix +++ b/pkgs/by-name/do/dotbot/package.nix @@ -6,25 +6,20 @@ python3Packages.buildPythonApplication rec { pname = "dotbot"; - version = "1.20.1"; + version = "1.20.4"; pyproject = true; src = fetchFromGitHub { owner = "anishathalye"; repo = "dotbot"; - rev = "v${version}"; - hash = "sha256-Gy+LVGG/BAqXoM6GDuKBkGKxxAkmoYtBRA33y/ihdRE="; + tag = "v${version}"; + hash = "sha256-GnzN8z7LP9rVD0DnKkPxJ0BxiO1YDY7MyMWBt1CAh6g="; }; preCheck = '' patchShebangs bin/dotbot ''; - patches = [ - # ignore pytest-cache because it was not at /tmp/nix-shell and it was used by pytest itself not our program - ./0001-fix-build.patch - ]; - nativeBuildInputs = with python3Packages; [ setuptools ]; propagatedBuildInputs = with python3Packages; [ pyyaml ];