From 0d76ae1c625fe6e4be7aa8300419bbd1d1f1d049 Mon Sep 17 00:00:00 2001 From: Sizhe Zhao Date: Sun, 22 Jun 2025 14:05:26 +0800 Subject: [PATCH 1/4] barman: fix changelog --- pkgs/by-name/ba/barman/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ba/barman/package.nix b/pkgs/by-name/ba/barman/package.nix index f5696dcab8f5..0883a8a0b7df 100644 --- a/pkgs/by-name/ba/barman/package.nix +++ b/pkgs/by-name/ba/barman/package.nix @@ -62,7 +62,7 @@ python3Packages.buildPythonApplication rec { meta = { description = "Backup and Recovery Manager for PostgreSQL"; homepage = "https://www.pgbarman.org/"; - changelog = "https://github.com/EnterpriseDB/barman/blob/release/${src.tag}/NEWS"; + changelog = "https://github.com/EnterpriseDB/barman/blob/${src.tag}/RELNOTES.md"; mainProgram = "barman"; license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ freezeboy ]; From 7fe12ac61bddad80916c555293c0f591be78f81d Mon Sep 17 00:00:00 2001 From: Sizhe Zhao Date: Sun, 22 Jun 2025 14:09:07 +0800 Subject: [PATCH 2/4] barman: add update script --- pkgs/by-name/ba/barman/package.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/by-name/ba/barman/package.nix b/pkgs/by-name/ba/barman/package.nix index 0883a8a0b7df..b2d1aab44320 100644 --- a/pkgs/by-name/ba/barman/package.nix +++ b/pkgs/by-name/ba/barman/package.nix @@ -4,6 +4,7 @@ fetchFromGitHub, python3Packages, versionCheckHook, + nix-update-script, }: python3Packages.buildPythonApplication rec { @@ -59,6 +60,15 @@ python3Packages.buildPythonApplication rec { "test_get_file_mode" ]; + passthru = { + updateScript = nix-update-script { + extraArgs = [ + "--version-regex" + "^release/(\\d+\\.\\d+\\.\\d+)$" + ]; + }; + }; + meta = { description = "Backup and Recovery Manager for PostgreSQL"; homepage = "https://www.pgbarman.org/"; From 8816ae8e9c492a2c5a205d7f1c4edfbba4fa6e70 Mon Sep 17 00:00:00 2001 From: Sizhe Zhao Date: Sun, 22 Jun 2025 14:11:21 +0800 Subject: [PATCH 3/4] barman: fix building with python 3.13 --- pkgs/by-name/ba/barman/package.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/ba/barman/package.nix b/pkgs/by-name/ba/barman/package.nix index b2d1aab44320..5303f302fa88 100644 --- a/pkgs/by-name/ba/barman/package.nix +++ b/pkgs/by-name/ba/barman/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + fetchpatch2, python3Packages, versionCheckHook, nix-update-script, @@ -19,7 +20,14 @@ python3Packages.buildPythonApplication rec { hash = "sha256-ffedLH7b/Z1y+yL5EkFJIGdksQZEKc3uu3KOyNc2plw="; }; - patches = [ ./unwrap-subprocess.patch ]; + patches = [ + ./unwrap-subprocess.patch + # fix building with Python 3.13 + (fetchpatch2 { + url = "https://github.com/EnterpriseDB/barman/commit/931f997f1d73bbe360abbca737bea9ae93172989.patch?full_index=1"; + hash = "sha256-0aqyjsEabxLf4dpC4DeepmypAl7QfCedh7vy98iVifU="; + }) + ]; build-system = with python3Packages; [ distutils From d00bf419a2822f8d9c23af5d76086d48978c74a4 Mon Sep 17 00:00:00 2001 From: Sizhe Zhao Date: Sun, 22 Jun 2025 14:11:21 +0800 Subject: [PATCH 4/4] barman: 3.13.3 -> 3.14.1 --- pkgs/by-name/ba/barman/package.nix | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/ba/barman/package.nix b/pkgs/by-name/ba/barman/package.nix index 5303f302fa88..22a7882acb61 100644 --- a/pkgs/by-name/ba/barman/package.nix +++ b/pkgs/by-name/ba/barman/package.nix @@ -4,20 +4,21 @@ fetchFromGitHub, fetchpatch2, python3Packages, + rsync, versionCheckHook, nix-update-script, }: python3Packages.buildPythonApplication rec { pname = "barman"; - version = "3.13.3"; + version = "3.14.1"; pyproject = true; src = fetchFromGitHub { owner = "EnterpriseDB"; repo = "barman"; tag = "release/${version}"; - hash = "sha256-ffedLH7b/Z1y+yL5EkFJIGdksQZEKc3uu3KOyNc2plw="; + hash = "sha256-Z3+PgUJcyG/M05hMmIhRr3HttzHUDx7BGIs44LA/qE4="; }; patches = [ @@ -49,12 +50,13 @@ python3Packages.buildPythonApplication rec { python-snappy ]; - nativeCheckInputs = with python3Packages; [ - mock - pytestCheckHook + nativeCheckInputs = [ + python3Packages.lz4 + python3Packages.mock + python3Packages.pytestCheckHook + python3Packages.zstandard + rsync versionCheckHook - zstandard - lz4 ]; disabledTests =