Merge branch 'master' into staging

Haskell rebuild :-)
Hydra: ?compare=1421865

3 files changed, 10 insertions, 76 deletions

diff --git a/pkgs/tools/backup/btrbk/btrbk-Prefix-PATH-instead-of-resetting-it.patch b/pkgs/tools/backup/btrbk/btrbk-Prefix-PATH-instead-of-resetting-it.patch
deleted file mode 100644
index 1ebb34ded9ea..000000000000
--- a/pkgs/tools/backup/btrbk/btrbk-Prefix-PATH-instead-of-resetting-it.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From d5978c207f2b266165140dd21e9746ace5792daf Mon Sep 17 00:00:00 2001
-From: Moritz Ulrich <moritz@tarn-vedra.de>
-Date: Fri, 18 Mar 2016 14:01:22 +0100
-Subject: [PATCH] btrbk: Prefix PATH instead of resetting it.
-
-Some distros don't even install use /usr/bin, /sbin, etc. (notably
-NixOS). Instead, they use PATH to specify which programs are available
-to a given executable.
-
-This patch changes the behavior or `btrbk` so it extends PATH with its
-own search paths instead of resetting it. This allows users and distros
-to specify their own custom location for `btrfs` via `PATH`.
----
- btrbk | 9 +++++----
- 1 file changed, 5 insertions(+), 4 deletions(-)
-
-diff --git a/btrbk b/btrbk
-index ab15858..0b91cbe 100755
---- a/btrbk
-+++ b/btrbk
-@@ -2464,10 +2464,11 @@ sub exit_status
- 
- MAIN:
- {
--  # set PATH instead of using absolute "/sbin/btrfs" (for now), as
--  # different distros (and even different versions of btrfs-progs)
--  # install the "btrfs" executable to different locations.
--  $ENV{PATH} = '/sbin:/bin:/usr/sbin:/usr/bin';
-+  # Prefix PATH with /sbin etc. instead of using absolute
-+  # "/sbin/btrfs" (for now), as different distros (and even different
-+  # versions of btrfs-progs) install the "btrfs" executable to
-+  # different locations.
-+  $ENV{PATH} .= '/sbin:/bin:/usr/sbin:/usr/bin';
- 
-   Getopt::Long::Configure qw(gnu_getopt);
-   $Data::Dumper::Sortkeys = 1;
--- 
-2.7.3
-
diff --git a/pkgs/tools/backup/btrbk/btrbk-mail-Use-btrbk-instead-of-unbound-variable-btr.patch b/pkgs/tools/backup/btrbk/btrbk-mail-Use-btrbk-instead-of-unbound-variable-btr.patch
deleted file mode 100644
index 050f1a6c4303..000000000000
--- a/pkgs/tools/backup/btrbk/btrbk-mail-Use-btrbk-instead-of-unbound-variable-btr.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 8abe8a915aa2d0c79c4dbe00dc7d255c32b7b85d Mon Sep 17 00:00:00 2001
-From: Moritz Ulrich <moritz@tarn-vedra.de>
-Date: Fri, 18 Mar 2016 13:20:48 +0100
-Subject: [PATCH] btrbk-mail: Use `btrbk` instead of unbound variable `$btrbk`
-
----
- contrib/cron/btrbk-mail | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/contrib/cron/btrbk-mail b/contrib/cron/btrbk-mail
-index f7e4f12..9143f2d 100755
---- a/contrib/cron/btrbk-mail
-+++ b/contrib/cron/btrbk-mail
-@@ -113,7 +113,7 @@ case $exitcode in
- 	;;
-     10) status="ERROR: At least one backup task aborted!"
- 	;;
--    *)  status="ERROR: $btrbk failed with error code $exitcode"
-+    *)  status="ERROR: btrbk failed with error code $exitcode"
- 	;;
- esac
- 
--- 
-2.7.3
-
diff --git a/pkgs/tools/backup/btrbk/default.nix b/pkgs/tools/backup/btrbk/default.nix
index f9feaf40ec2f..e68bf8463637 100644
--- a/pkgs/tools/backup/btrbk/default.nix
+++ b/pkgs/tools/backup/btrbk/default.nix
@@ -1,25 +1,23 @@
-{ stdenv, fetchurl, coreutils, bash, btrfs-progs, openssh, perl, perlPackages, makeWrapper }:
+{ stdenv, fetchurl, coreutils, bash, btrfs-progs, openssh, perl, perlPackages
+, asciidoc-full, makeWrapper }:
 
 stdenv.mkDerivation rec {
   name = "btrbk-${version}";
-  version = "0.25.1";
+  version = "0.26.0";
 
   src = fetchurl {
     url = "http://digint.ch/download/btrbk/releases/${name}.tar.xz";
-    sha256 = "02qc9vbd5l0ywnv01p60v9q3dcx2z92dfaf95qf7ccxqaa9zxfr5";
+    sha256 = "1brnh5x3fd91j3v8rz3van08m9i0ym4lv4hqz274s86v1kx4k330";
   };
 
-  patches = [
-    # https://github.com/digint/btrbk/pull/74
-    ./btrbk-Prefix-PATH-instead-of-resetting-it.patch
-  ];
-
-  buildInputs = with perlPackages; [ makeWrapper perl DateCalc ];
+  buildInputs = with perlPackages; [ asciidoc-full makeWrapper perl DateCalc ];
 
   preInstall = ''
-    substituteInPlace Makefile \
-      --replace "/usr" "$out" \
-      --replace "/etc" "$out/etc"
+    for f in $(find . -name Makefile); do
+      substituteInPlace "$f" \
+        --replace "/usr" "$out" \
+        --replace "/etc" "$out/etc"
+    done
 
     # Tainted Mode disables PERL5LIB
     substituteInPlace btrbk --replace "perl -T" "perl"