From 1415d964abfc7da55ddb3156e1aa4d64f7169d85 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 22 Mar 2023 21:31:02 -0400 Subject: [PATCH] gnu: python-pre-commit: Move deprecated variable next to replacement. This fixes a module import dependency cycle, which was introduced in 831baaf81e57ce9d9053ba6f9e0653a2d27298c4 ("gnu: python-pre-commit: Replace with pre-commit."). The rule of thumb to avoid these is that the deprecated package should live next to the replacement package (in the same module). * gnu/packages/python-xyz.scm (python-pre-commit): Move to... * gnu/packages/version-control.scm (python-pre-commit): ... here. --- gnu/packages/python-xyz.scm | 3 --- gnu/packages/version-control.scm | 3 +++ 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 0f3f85e376..8f86af5c54 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -24312,9 +24312,6 @@ (define-public python-retrying @end itemize") (license license:asl2.0))) -(define-public python-pre-commit - (deprecated-package "python-pre-commit" pre-commit)) - (define-public python-precis-i18n (package (name "python-precis-i18n") diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index c9fb66c8c9..c270b4257b 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -1757,6 +1757,9 @@ (define-public pre-commit execution of any hook written in any language before every commit.") (license license:expat))) +(define-public python-pre-commit + (deprecated-package "python-pre-commit" pre-commit)) + (define-public mercurial (package (name "mercurial")