From c7788a8fecb1c719e2665a513e54cda847eb1239 Mon Sep 17 00:00:00 2001
From: rembo10 <801525+rembo10@users.noreply.github.com>
Date: Sun, 24 Oct 2021 22:01:35 +0530
Subject: [PATCH] barman: 2.12 -> 2.15 (#142098)

Co-authored-by: rembo10 <rembo10@users.noreply.github.com>
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
---
 pkgs/tools/misc/barman/default.nix | 43 ++++++++++++++++++------------
 pkgs/top-level/all-packages.nix    |  2 +-
 2 files changed, 27 insertions(+), 18 deletions(-)

diff --git a/pkgs/tools/misc/barman/default.nix b/pkgs/tools/misc/barman/default.nix
index ef84981a9d95..048fbeba6ffb 100644
--- a/pkgs/tools/misc/barman/default.nix
+++ b/pkgs/tools/misc/barman/default.nix
@@ -1,29 +1,38 @@
-{ buildPythonApplication, fetchurl, lib
-, python-dateutil, argcomplete, argh, psycopg2, boto3
+{ fetchFromGitHub
+, lib
+, python3Packages
 }:
-
-buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
   pname = "barman";
-  version = "2.12";
+  version = "2.15";
 
-  outputs = [ "out" "man" ];
-  src = fetchurl {
-    url = "mirror://sourceforge/pgbarman/${version}/barman-${version}.tar.gz";
-    sha256 = "Ts8I6tlP2GRp90OIIKXy+cRWWvUO3Sm86zq2dtVP5YE=";
+  src = fetchFromGitHub {
+    owner = "EnterpriseDB";
+    repo = pname;
+    rev = "release/${version}";
+    sha256 = "127cqndg0405rad9jzba1mfhpqmyfa3kx16w345kd4n822w17ak9";
   };
 
-  propagatedBuildInputs = [ python-dateutil argh psycopg2 boto3 argcomplete ];
+  checkInputs = with python3Packages; [
+    mock
+    pytestCheckHook
+  ];
 
-  # Tests are not present in tarball
-  checkPhase = ''
-    $out/bin/barman --help > /dev/null
-  '';
+  propagatedBuildInputs = with python3Packages; [
+    argcomplete
+    argh
+    azure-identity
+    azure-storage-blob
+    boto3
+    psycopg2
+    python-dateutil
+  ];
 
   meta = with lib; {
-    homepage = "https://www.2ndquadrant.com/en/resources/barman/";
-    description = "Backup and Disaster Recovery Manager for PostgreSQL";
+    homepage = "https://www.pgbarman.org/";
+    description = "Backup and Recovery Manager for PostgreSQL";
     maintainers = with maintainers; [ freezeboy ];
-    license = licenses.gpl2;
+    license = licenses.gpl3Plus;
     platforms = platforms.unix;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 38296fc95369..5170b6bbdd42 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1432,7 +1432,7 @@ with pkgs;
 
   automirror = callPackage ../tools/misc/automirror { };
 
-  barman = python3Packages.callPackage ../tools/misc/barman { };
+  barman = callPackage ../tools/misc/barman { };
 
   base16-universal-manager = callPackage ../applications/misc/base16-universal-manager { };