From 0d719146a20449491a4ad21826122c3290716b36 Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickard.nilsson@telia.com>
Date: Mon, 4 Jun 2012 05:02:31 +0000
Subject: [PATCH] Moved obnam from pythonPackages to pkgs.

svn path=/nixpkgs/trunk/; revision=34336
---
 pkgs/tools/backup/obnam/default.nix | 23 +++++++++++++++++++++++
 pkgs/top-level/all-packages.nix     |  2 ++
 pkgs/top-level/python-packages.nix  | 21 ---------------------
 tools/backup/obnam/default.nix      |  0
 4 files changed, 25 insertions(+), 21 deletions(-)
 create mode 100644 pkgs/tools/backup/obnam/default.nix
 create mode 100644 tools/backup/obnam/default.nix

diff --git a/pkgs/tools/backup/obnam/default.nix b/pkgs/tools/backup/obnam/default.nix
new file mode 100644
index 000000000000..c70e8054c7c7
--- /dev/null
+++ b/pkgs/tools/backup/obnam/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchurl, python, pythonPackages, pycrypto, attr }:
+
+pythonPackages.buildPythonPackage {
+  name = "obnam-1.0";
+  namePrefix = "";
+
+  src = fetchurl rec {
+    url = "http://code.liw.fi/debian/pool/main/o/obnam/obnam_1.0.orig.tar.gz";
+    sha256 = "b3589aac8d97283e44ed8e8c8cf751c4e9cc0677d433a85e27bd42f0d54da623";
+  };
+
+  buildInputs = [ pythonPackages.sphinx attr ];
+  propagatedBuildInputs = [ pycrypto pythonPackages.paramiko pythonPackages.tracing pythonPackages.ttystatus pythonPackages.cliapp pythonPackages.larch ];
+
+  doCheck = false;
+
+  meta = {
+    homepage = http://liw.fi/obnam/;
+    description = "A backup program supporting deduplication, compression and encryption.";
+    maintainers = [ stdenv.lib.maintainers.rickynils ];
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
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
diff --git a/tools/backup/obnam/default.nix b/tools/backup/obnam/default.nix
new file mode 100644
index 000000000000..e69de29bb2d1