diff options
author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2018-02-20 10:38:54 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-02-20 10:38:54 +0000 |
commit | 263a8c721d4ccfc60e49438db9c78fb5b9313d07 (patch) | |
tree | 78853d1f81347f59a59cab8fa4e4c9b312073451 | |
parent | 6f0405c42aa8a4149f30e8b2961c621c98930cc6 (diff) | |
parent | 663d6e8f9d020a74a2d4a606223d04dcf85135c2 (diff) | |
download | nixlib-263a8c721d4ccfc60e49438db9c78fb5b9313d07.tar nixlib-263a8c721d4ccfc60e49438db9c78fb5b9313d07.tar.gz nixlib-263a8c721d4ccfc60e49438db9c78fb5b9313d07.tar.bz2 nixlib-263a8c721d4ccfc60e49438db9c78fb5b9313d07.tar.lz nixlib-263a8c721d4ccfc60e49438db9c78fb5b9313d07.tar.xz nixlib-263a8c721d4ccfc60e49438db9c78fb5b9313d07.tar.zst nixlib-263a8c721d4ccfc60e49438db9c78fb5b9313d07.zip |
Merge pull request #35180 from dotlambda/attic
attic: uninit
-rw-r--r-- | nixos/doc/manual/release-notes/rl-1803.xml | 8 | ||||
-rw-r--r-- | pkgs/tools/backup/attic/default.nix | 56 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
3 files changed, 8 insertions, 60 deletions
diff --git a/nixos/doc/manual/release-notes/rl-1803.xml b/nixos/doc/manual/release-notes/rl-1803.xml index 09d34b6f0356..ce58c4dc95b0 100644 --- a/nixos/doc/manual/release-notes/rl-1803.xml +++ b/nixos/doc/manual/release-notes/rl-1803.xml @@ -231,6 +231,14 @@ following incompatible changes:</para> <literal>Option "XkbRules" "base"</literal> may result in broken keyboard layout. </para> </listitem> + <listitem> + <para> + The <literal>attic</literal> package was removed. A maintained fork called + <link xlink:href="https://www.borgbackup.org/">Borg</link> should be used instead. + Migration instructions can be found + <link xlink:href="http://borgbackup.readthedocs.io/en/stable/usage/upgrade.html#attic-and-borg-0-xx-to-borg-1-x">here</link>. + </para> + </listitem> </itemizedlist> </section> diff --git a/pkgs/tools/backup/attic/default.nix b/pkgs/tools/backup/attic/default.nix deleted file mode 100644 index 754e12e7f776..000000000000 --- a/pkgs/tools/backup/attic/default.nix +++ /dev/null @@ -1,56 +0,0 @@ -{ stdenv, fetchzip, python3Packages, openssl, acl, fetchurl, pkgconfig, fuse, attr, which }: - -let - - # Old version needed for attic (backup program) due to breaking change in - # llfuse >= 0.42. - llfuse-0-41 = python3Packages.buildPythonPackage rec { - name = "llfuse-0.41.1"; - src = fetchurl { - url = "mirror://pypi/l/llfuse/${name}.tar.bz2"; - sha256 = "1imlqw9b73086y97izr036f58pgc5akv4ihc2rrf8j5h75jbrlaa"; - }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = with python3Packages; [ pytest fuse attr which ]; - propagatedBuildInputs = with python3Packages; [ contextlib2 ]; - checkPhase = '' - py.test - ''; - # FileNotFoundError: [Errno 2] No such file or directory: '/usr/bin' - doCheck = false; - meta = { - description = "Python bindings for the low-level FUSE API"; - homepage = https://code.google.com/p/python-llfuse/; - license = stdenv.lib.licenses.lgpl2Plus; - platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ bjornfor ]; - }; - }; - -in python3Packages.buildPythonApplication rec { - name = "attic-${version}"; - version = "0.16"; - namePrefix = ""; - - src = fetchzip { - name = "${name}-src"; - url = "https://github.com/jborg/attic/archive/${version}.tar.gz"; - sha256 = "008566hhsd3ck70ql0fdn4vaqjfcnf493gwd49d6294f8r7qn06z"; - }; - - propagatedBuildInputs = with python3Packages; - [ cython msgpack openssl acl llfuse-0-41 ]; - - preConfigure = '' - export ATTIC_OPENSSL_PREFIX="${openssl.dev}" - substituteInPlace setup.py --replace "version=versioneer.get_version()" "version='${version}'" - ''; - - meta = with stdenv.lib; { - description = "A deduplicating backup program"; - homepage = https://attic-backup.org; - license = licenses.bsd3; - maintainers = [ maintainers.wscott ]; - platforms = platforms.unix; # Darwin and FreeBSD mentioned on homepage - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ec861058266d..9836161b8120 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -546,10 +546,6 @@ with pkgs; atomicparsley = callPackage ../tools/video/atomicparsley { }; - attic = callPackage ../tools/backup/attic { - python3Packages = python34Packages; - }; - autoflake = callPackage ../development/tools/analysis/autoflake { }; avfs = callPackage ../tools/filesystems/avfs { }; |