From a4eee8f7f0713e1df5bf31f07e2ed9cee5f4f65a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 7 Mar 2026 17:37:11 +0100 Subject: [PATCH 1/2] jj-pre-push: relax uv_build --- pkgs/by-name/jj/jj-pre-push/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/jj/jj-pre-push/package.nix b/pkgs/by-name/jj/jj-pre-push/package.nix index 375a201bbda3..e6e1193c74a5 100644 --- a/pkgs/by-name/jj/jj-pre-push/package.nix +++ b/pkgs/by-name/jj/jj-pre-push/package.nix @@ -24,11 +24,11 @@ python3Packages.buildPythonApplication rec { postPatch = '' substituteInPlace pyproject.toml \ --replace-fail "typer-slim" "typer" + substituteInPlace pyproject.toml \ + --replace-fail "uv_build>=0.8.2,<0.10.0" "uv_build" ''; - build-system = [ - python3Packages.uv-build - ]; + build-system = with python3Packages; [ uv-build ]; dependencies = with python3Packages; From 55b6c7e8ed7d713cf7a225c9b955bec246fe82ef Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 7 Mar 2026 17:49:59 +0100 Subject: [PATCH 2/2] jj-pre-push: 0.3.3 -> 0.3.4 Changelog: https://github.com/acarapetis/jj-pre-push/releases/tag/vv0.3.4 --- pkgs/by-name/jj/jj-pre-push/package.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/jj/jj-pre-push/package.nix b/pkgs/by-name/jj/jj-pre-push/package.nix index e6e1193c74a5..b59a82ba12cb 100644 --- a/pkgs/by-name/jj/jj-pre-push/package.nix +++ b/pkgs/by-name/jj/jj-pre-push/package.nix @@ -9,23 +9,23 @@ pre-commit, }: -python3Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication (finalAttrs: { pname = "jj-pre-push"; - version = "0.3.3"; + version = "0.3.4"; pyproject = true; src = fetchFromGitHub { owner = "acarapetis"; repo = "jj-pre-push"; - tag = "v${version}"; - hash = "sha256-dZrZjzygT6Q7jIPkasYgJ2uN3eyPQXsg0opksookLYI="; + tag = "v${finalAttrs.version}"; + hash = "sha256-sj1JM2gcwTRMeEXSozI73LCwxSf69t4u/SmovV7Cyeg="; }; postPatch = '' substituteInPlace pyproject.toml \ --replace-fail "typer-slim" "typer" substituteInPlace pyproject.toml \ - --replace-fail "uv_build>=0.8.2,<0.10.0" "uv_build" + --replace-fail "uv_build>=0.8.2,<0.11.0" "uv_build" ''; build-system = with python3Packages; [ uv-build ]; @@ -38,6 +38,7 @@ python3Packages.buildPythonApplication rec { ++ lib.optionals withPrecommit [ pre-commit ]; nativeBuildInputs = [ installShellFiles ]; + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd jj-pre-push \ --bash <($out/bin/jj-pre-push --show-completion bash) \ @@ -45,15 +46,14 @@ python3Packages.buildPythonApplication rec { --zsh <($out/bin/jj-pre-push --show-completion zsh) ''; - pythonImportsCheck = [ - "jj_pre_push" - ]; + pythonImportsCheck = [ "jj_pre_push" ]; meta = { description = "Run pre-commit.com before `jj git push`"; homepage = "https://github.com/acarapetis/jj-pre-push"; + changelog = "https://github.com/acarapetis/jj-pre-push/releases/tag/v${finalAttrs.src.tag}"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ xanderio ]; mainProgram = "jj-pre-push"; }; -} +})