From f28de9c95057821c72c10e3b76427103bff12ef4 Mon Sep 17 00:00:00 2001 From: Frank Doepper Date: Wed, 30 Sep 2020 22:28:35 +0200 Subject: [PATCH] btrbk: 0.29.1 -> 0.31.3 - add updateScript - work around non-working --argv0 when wrapping perl or shell scripts - change license to gpl3Only --- pkgs/tools/backup/btrbk/default.nix | 41 ++++++++++++++++++++++++----- 1 file changed, 34 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/backup/btrbk/default.nix b/pkgs/tools/backup/btrbk/default.nix index 12308b240450..69f745ecc1bd 100644 --- a/pkgs/tools/backup/btrbk/default.nix +++ b/pkgs/tools/backup/btrbk/default.nix @@ -1,13 +1,29 @@ -{ lib, stdenv, fetchurl, bash, btrfs-progs, openssh, perl, perlPackages -, util-linux, asciidoc, asciidoctor, mbuffer, makeWrapper, nixosTests }: +{ lib +, stdenv +, fetchurl +, bash +, btrfs-progs +, openssh +, perl +, perlPackages +, util-linux +, asciidoc +, asciidoctor +, mbuffer +, makeWrapper +, genericUpdater +, curl +, writeShellScript +, nixosTests +}: stdenv.mkDerivation rec { pname = "btrbk"; - version = "0.29.1"; + version = "0.31.3"; src = fetchurl { url = "https://digint.ch/download/btrbk/releases/${pname}-${version}.tar.xz"; - sha256 = "153inyvvnl17hq1w3nsa783havznaykdam2yrj775bmi2wg6fvwn"; + sha256 = "1lx7vnf386nsik8mxrrfyx1h7mkqk5zs26sy0s0lynfxcm4lkxb2"; }; nativeBuildInputs = [ asciidoc asciidoctor makeWrapper ]; @@ -22,7 +38,9 @@ stdenv.mkDerivation rec { done # Tainted Mode disables PERL5LIB - substituteInPlace btrbk --replace "perl -T" "perl" + substituteInPlace btrbk \ + --replace "perl -T" "perl" \ + --replace "\$0" "\$ENV{'program_name'}" # Fix SSH filter script sed -i '/^export PATH/d' ssh_filter_btrbk.sh @@ -30,17 +48,26 @@ stdenv.mkDerivation rec { ''; preFixup = '' - wrapProgram $out/sbin/btrbk \ + wrapProgram $out/bin/btrbk \ --set PERL5LIB $PERL5LIB \ + --run 'export program_name=$0' \ --prefix PATH ':' "${lib.makeBinPath [ btrfs-progs bash mbuffer openssh ]}" ''; passthru.tests.btrbk = nixosTests.btrbk; + passthru.updateScript = genericUpdater { + inherit pname version; + versionLister = writeShellScript "btrbk-versionLister" '' + echo "# Versions for $1:" >> "$2" + ${curl}/bin/curl -s https://digint.ch/download/btrbk/releases/ | ${perl}/bin/perl -lne 'print $1 if /btrbk-([0-9.]*)\.tar/' + ''; + }; + meta = with lib; { description = "A backup tool for btrfs subvolumes"; homepage = "https://digint.ch/btrbk"; - license = licenses.gpl3; + license = licenses.gpl3Only; platforms = platforms.unix; maintainers = with maintainers; [ asymmetric ]; };