Merge remote-tracking branch 'upstream/master' into staging

2018-08-04 15:17:42 +03:00
parent 7a337cde31 20f1388c3f
commit 008fd5fcf5
132 changed files with 6166 additions and 2582 deletions
@@ -1,23 +0,0 @@
-{ stdenv, fetchurl, pythonPackages, attr }:
-
-pythonPackages.buildPythonApplication rec {
-  name = "obnam-${version}";
-  version = "1.22";
-
-  src = fetchurl rec {
-    url = "http://code.liw.fi/debian/pool/main/o/obnam/obnam_${version}.orig.tar.xz";
-    sha256 = "0z3absbcpdk8zmmi6n3vwmwyv0pnzy7lp1rcsymb292p04alcn3x";
-  };
-
-  buildInputs = [ pythonPackages.sphinx attr ];
-  propagatedBuildInputs = with pythonPackages; [ pycrypto paramiko tracing ttystatus cliapp larch pyyaml fuse ];
-
-  doCheck = false;
-
-  meta = {
-    homepage = http://obnam.org;
-    description = "Backup program supporting deduplication, compression and encryption";
-    maintainers = [ stdenv.lib.maintainers.rickynils ];
-    platforms = stdenv.lib.platforms.linux;
-  };
-}