Merge branch 'master' into closure-size

Beware that stdenv doesn't build. It seems something more will be needed than just resolution of merge conflicts.
2016-04-01 10:06:01 +02:00
parent c643ccaa8c a26357eefe
commit ab15a62c68
1108 changed files with 76254 additions and 11297 deletions
@@ -1,30 +0,0 @@
-{ fetchFromGitHub, pythonPackages, stdenv }:
-
-stdenv.mkDerivation rec {
-  name = "b2-${version}";
-  version = "git-26.01.2016";
-
-  src = fetchFromGitHub {
-    owner = "Backblaze";
-    repo = "B2_Command_Line_Tool";
-    rev = "b3f06fd53eb1c9a07740b962284753cba413a7b8";
-    sha256 = "0kn2lkh8hp6g8q88glyz03z1r8a47pqm91dc5w083i334swqkjp2";
-  };
-
-  buildInputs = [ pythonPackages.wrapPython ];
-
-  installPhase = ''
-    mkdir -p $out/bin
-    cp b2 $out/bin
-  '';
-
-  postInstall = "wrapPythonPrograms";
-
-  meta = with stdenv.lib; {
-    homepage = https://github.com/Backblaze/B2_Command_Line_Tool;
-    description = "CLI for accessing Backblaze's B2 Cloud Storage";
-    license = licenses.mit;
-    platforms = platforms.all;
-    maintainers = with maintainers; [ hrdinka ];
-  };
-}
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, pkgconfig, nettools, gettext, libtool, flex
-, readline ? null, openssl ? null, python ? null, ncurses ? null
+, readline ? null, openssl ? null, python ? null, ncurses ? null, rocksdb
 , sqlite ? null, postgresql ? null, libmysql ? null, zlib ? null, lzo ? null
 , jansson ? null, acl ? null, glusterfs ? null, libceph ? null, libcap ? null
 }:
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
  nativeBuildInputs = [ pkgconfig ];
  buildInputs = [
    nettools gettext readline openssl python flex ncurses sqlite postgresql
-    libmysql zlib lzo jansson acl glusterfs libceph libcap
+    libmysql zlib lzo jansson acl glusterfs libceph libcap rocksdb
  ];

  postPatch = ''
@@ -0,0 +1,39 @@
+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
+
@@ -0,0 +1,25 @@
+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
+
@@ -0,0 +1,52 @@
+{ stdenv, fetchurl, coreutils, bash, btrfs-progs, perl, perlPackages, makeWrapper }:
+
+stdenv.mkDerivation rec {
+  name = "btrbk-${version}";
+  version = "0.22.2";
+
+  src = fetchurl {
+    url = "http://digint.ch/download/btrbk/releases/${name}.tar.xz";
+    sha256 = "1gbgi0dp62wlw7y72pgxjs6byxkrk73g35kqxzw0gjf32r5i4sb8";
+  };
+
+  patches = [
+    # https://github.com/digint/btrbk/pull/74
+    ./btrbk-Prefix-PATH-instead-of-resetting-it.patch
+    # https://github.com/digint/btrbk/pull/73
+    ./btrbk-mail-Use-btrbk-instead-of-unbound-variable-btr.patch
+  ];
+
+  buildInputs = with perlPackages; [ makeWrapper perl DateCalc ];
+
+  preInstall = ''
+    substituteInPlace Makefile \
+      --replace "/usr" "$out" \
+      --replace "/etc" "$out/etc"
+
+    # Tainted Mode disables PERL5LIB
+    substituteInPlace btrbk --replace "perl -T" "perl"
+
+    # Fix btrbk-mail
+    substituteInPlace contrib/cron/btrbk-mail \
+      --replace "/bin/date" "${coreutils}/bin/date" \
+      --replace "/bin/echo" "${coreutils}/bin/echo" \
+      --replace '$btrbk' 'btrbk'
+  '';
+
+  fixupPhase = ''
+    patchShebangs $out/
+
+    wrapProgram $out/sbin/btrbk \
+      --set PERL5LIB $PERL5LIB \
+      --prefix PATH ':' "${btrfs-progs}/bin:${bash}/bin/"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A backup tool for btrfs subvolumes";
+    homepage = http://digint.ch/btrbk;
+    license = licenses.gpl3;
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ the-kenny ];
+    inherit version;
+  };
+}
@@ -3,21 +3,21 @@
 python3Packages.buildPythonApplication rec {
  name = "${pname}-${version}";
  pname = "s3ql";
-  version = "2.13";
+  version = "2.17.1";

  src = fetchurl {
    url = "https://bitbucket.org/nikratio/${pname}/downloads/${name}.tar.bz2";
-    sha256 = "0bxps1iq0rv7bg2b8mys6zyjp912knm6zmafhid1jhsv3xyby4my";
+    sha256 = "049vpvvkyia7v4v97rg2l01n43shrdxc1ik38bmjb2q4fvsh1pgx";
  };

  propagatedBuildInputs = with python3Packages;
-    [ sqlite apsw pycrypto requests defusedxml dugong llfuse ];
+    [ sqlite apsw pycrypto requests2 defusedxml dugong llfuse ];

  meta = with stdenv.lib; {
    description = "A full-featured file system for online data storage";
    homepage = "https://bitbucket.org/nikratio/s3ql";
    license = licenses.gpl3;
    maintainers = with maintainers; [ rushmorem ];
-    platforms = platforms.unix;
+    platforms = platforms.linux;
  };
 }
@@ -8,11 +8,11 @@ let
 in
 stdenv.mkDerivation rec {
  name = "tarsnap-${version}";
-  version = "1.0.36.1";
+  version = "1.0.37";

  src = fetchurl {
    url = "https://www.tarsnap.com/download/tarsnap-autoconf-${version}.tgz";
-    sha256 = "1446l8g39bi5xxk4x1ijc1qjrj824729887gcffig0zrw80rx452";
+    sha256 = "1ynv323qi6775lzjb6hvifl8ajkv2bizy43sajadjfqvcl9r96gs";
  };

  preConfigure = ''
@@ -0,0 +1,72 @@
+{ stdenv, fetchFromGitHub, zfs, mbuffer, perl, perlPackages, wget, autoconf, automake }:
+
+let
+  version = "0.15.3";
+  checksum = "1xk0lgb23kv1cl0wc2rav75hjrjigd0cp3hjw9gxab835vsvnkq0";
+in
+stdenv.mkDerivation rec {
+  name = "znapzend-${version}";
+
+  src = fetchFromGitHub{
+    owner = "oetiker";
+    repo = "znapzend";
+    rev = "v${version}";
+    sha256 = checksum;
+  };
+
+  buildInputs = [ perl perlPackages.TestHarness perlPackages.Mojolicious
+                  perlPackages.TAPParserSourceHandlerpgTAP perlPackages.MojoIOLoopForkCall
+                  perlPackages.IOPipely wget ];
+
+  nativeBuildInputs = [ autoconf automake ];
+
+  preConfigure = ''
+    sed -i 's/^SUBDIRS =.*$/SUBDIRS = lib/' Makefile.am
+
+    grep -v thirdparty/Makefile configure.ac > configure.ac.tmp
+    mv configure.ac.tmp configure.ac
+
+    autoconf
+  '';
+
+  preBuild = ''
+    aclocal
+    automake
+  '';
+
+  postInstall = ''
+    substituteInPlace $out/bin/znapzend --replace "${perl}/bin/perl" \
+      "${perl}/bin/perl \
+      -I${perlPackages.TestHarness}/${perl.libPrefix} \
+      -I${perlPackages.Mojolicious}/${perl.libPrefix} \
+      -I${perlPackages.TAPParserSourceHandlerpgTAP}/${perl.libPrefix} \
+      -I${perlPackages.MojoIOLoopForkCall}/${perl.libPrefix} \
+      -I${perlPackages.IOPipely}/${perl.libPrefix} \
+      "
+    substituteInPlace $out/bin/znapzendzetup --replace "${perl}/bin/perl" \
+      "${perl}/bin/perl \
+      -I${perlPackages.TestHarness}/${perl.libPrefix} \
+      -I${perlPackages.Mojolicious}/${perl.libPrefix} \
+      -I${perlPackages.TAPParserSourceHandlerpgTAP}/${perl.libPrefix} \
+      -I${perlPackages.MojoIOLoopForkCall}/${perl.libPrefix} \
+      -I${perlPackages.IOPipely}/${perl.libPrefix} \
+      "
+    substituteInPlace $out/bin/znapzendztatz --replace "${perl}/bin/perl" \
+      "${perl}/bin/perl \
+      -I${perlPackages.TestHarness}/${perl.libPrefix} \
+      -I${perlPackages.Mojolicious}/${perl.libPrefix} \
+      -I${perlPackages.TAPParserSourceHandlerpgTAP}/${perl.libPrefix} \
+      -I${perlPackages.MojoIOLoopForkCall}/${perl.libPrefix} \
+      -I${perlPackages.IOPipely}/${perl.libPrefix} \
+      "
+  '';
+
+
+  meta = with stdenv.lib; {
+    description = "High performance open source ZFS backup with mbuffer and ssh support";
+    homepage    = http://www.znapzend.org;
+    license     = licenses.gpl3;
+    maintainers = with maintainers; [ otwieracz ];
+    platforms   = platforms.all;
+  };
+}