From f0a8b57de8766a90a0a85e00f05e6697305ef443 Mon Sep 17 00:00:00 2001
From: Georges Dubus <georges.dubus@numergy.com>
Date: Wed, 24 Sep 2014 13:58:41 +0200
Subject: [PATCH] Updated nox

---
 pkgs/tools/package-management/nox/default.nix | 12 +++++++-----
 pkgs/top-level/python-packages.nix            | 16 ++++++++++++++++
 2 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/package-management/nox/default.nix b/pkgs/tools/package-management/nox/default.nix
index 0bd10dd66d3..a25ef6e9580 100644
--- a/pkgs/tools/package-management/nox/default.nix
+++ b/pkgs/tools/package-management/nox/default.nix
@@ -6,16 +6,18 @@ pythonPackages.buildPythonPackage rec {
 
   src = fetchgit {
     url = "git://github.com/madjar/nox.git";
-    rev = "49e4bb7de473ac5e446a76c292bdaefa7e20a1c6";
-    sha256 = "0rsw0hs5swv6lwkfmj5fw3j22ah8g5gdb0hb5ikk321c6ww5dm5p";
+    rev = "088249aa766c9fa929aa08a60f1a7eb41008da40";
+    sha256 = "0dscnmhm1va2h0jz7hh60nvjwxv5a92n5pp8c0g7hz76g67mi5xs";
     leaveDotGit = true; # required by pbr
   };
 
   buildInputs = [ git pythonPackages.pbr makeWrapper ];
 
-  pythonPath =
-    [ pythonPackages.dogpile_cache
-      pythonPackages.click
+  pythonPath = with pythonPackages; [
+      dogpile_cache
+      click
+      requests2
+      characteristic
     ];
 
   postInstall = "wrapProgram $out/bin/nox --prefix PATH : ${nix}/bin";
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 878adc72cfd..845c42868ee 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1166,6 +1166,22 @@ let
   };
 
 
+  characteristic = buildPythonPackage rec {
+    name = "characteristic-14.1.0";
+    src = fetchurl {
+      url = "https://pypi.python.org/packages/source/c/characteristic/${name}.tar.gz";
+      md5 = "68ea7e28997fc57d3631791ec0567a05";
+    };
+
+    buildInputs = [ pythonPackages.pytest ];
+
+    meta = {
+      description = "Python attributes without boilerplate";
+      homepage = https://characteristic.readthedocs.org;
+    };
+  };
+
+
   cheetah = buildPythonPackage rec {
     version = "2.4.4";
     name = "cheetah-${version}";