Merge master into staging-next

This commit is contained in:
Frederik Rietdijk
2019-08-18 12:53:44 +02:00
125 changed files with 3217 additions and 885 deletions
+4 -4
View File
@@ -1,16 +1,16 @@
{ stdenv, fetchurl, coreutils, bash, btrfs-progs, openssh, perl, perlPackages
, utillinux, asciidoc, makeWrapper }:
, utillinux, asciidoc, asciidoctor, makeWrapper }:
stdenv.mkDerivation rec {
pname = "btrbk";
version = "0.28.0";
version = "0.28.3";
src = fetchurl {
url = "https://digint.ch/download/btrbk/releases/${pname}-${version}.tar.xz";
sha256 = "1bqgcbkdd5s3l3ba1ifa9l523r8cr5y3arjdy9f6rmm840kn7xzf";
sha256 = "0s69pcjkjxg77cgyjahwyg2w81ckgzwz1ds4ifjw7z0zhjxy7miz";
};
nativeBuildInputs = [ asciidoc makeWrapper ];
nativeBuildInputs = [ asciidoc asciidoctor makeWrapper ];
buildInputs = with perlPackages; [ perl DateCalc ];