diff options
| author | Rickard Nilsson <rickard.nilsson@telia.com> | 2012-06-04 05:02:31 +0000 |
|---|---|---|
| committer | Rickard Nilsson <rickard.nilsson@telia.com> | 2012-06-04 05:02:31 +0000 |
| commit | 0d719146a20449491a4ad21826122c3290716b36 (patch) | |
| tree | 9988585d3eb9a3debe583437389f99618e390d2c /pkgs/top-level | |
| parent | 887c89cc33706d47351fa143626d5af2bc48f210 (diff) | |
| download | nixlib-0d719146a20449491a4ad21826122c3290716b36.tar nixlib-0d719146a20449491a4ad21826122c3290716b36.tar.gz nixlib-0d719146a20449491a4ad21826122c3290716b36.tar.bz2 nixlib-0d719146a20449491a4ad21826122c3290716b36.tar.lz nixlib-0d719146a20449491a4ad21826122c3290716b36.tar.xz nixlib-0d719146a20449491a4ad21826122c3290716b36.tar.zst nixlib-0d719146a20449491a4ad21826122c3290716b36.zip | |
Moved obnam from pythonPackages to pkgs.
svn path=/nixpkgs/trunk/; revision=34336
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 21 |
2 files changed, 2 insertions, 21 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 510e7f057eac..9850ce2b00e3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1143,6 +1143,8 @@ let obexftp = callPackage ../tools/bluetooth/obexftp { }; + obnam = callPackage ../tools/backup/obnam { }; + odt2txt = callPackage ../tools/text/odt2txt { }; offlineimap = callPackage ../tools/networking/offlineimap { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 119e2f71c304..cfd15c7105f4 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2678,25 +2678,4 @@ let pythonPackages = python.modules // rec { }; }; - obnam = buildPythonPackage rec { - name = "obnam-1.0"; - - src = fetchurl rec { - url = "http://code.liw.fi/debian/pool/main/o/obnam/obnam_1.0.orig.tar.gz"; - sha256 = "b3589aac8d97283e44ed8e8c8cf751c4e9cc0677d433a85e27bd42f0d54da623"; - }; - - buildInputs = [ sphinx pkgs.attr ]; - propagatedBuildInputs = [ paramiko tracing ttystatus cliapp larch ]; - - doCheck = false; - - meta = { - homepage = http://liw.fi/obnam/; - description = "A backup program supporting deduplication, compression and encryption."; - maintainers = [ stdenv.lib.maintainers.rickynils ]; - platforms = python.meta.platforms; - }; - }; - }; in pythonPackages |