From 09cdafcb5b27497b14114b343c14474841db050d Mon Sep 17 00:00:00 2001
From: Florent Becker <florent.becker@ens-lyon.org>
Date: Fri, 23 Oct 2015 11:36:19 +0200
Subject: [PATCH 1/4] python-joblib: init at 0.9.0b4

---
 pkgs/top-level/python-packages.nix | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 8d2b85b5ad67..010a1706d1a4 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4912,6 +4912,21 @@ let
   };
 
 
+  joblib = buildPythonPackage rec {
+    name = "joblib-${version}";
+    version = "0.9.0b4";
+    src = pkgs.fetchurl {
+      url = https://pypi.python.org/packages/source/j/joblib/joblib-0.9.0b4.tar.gz;
+      md5 = "e0d79a085d4773c7a61cd38b4fb6dad5";
+    };
+
+    buildInputs = with self; with pkgs;  [ ];
+
+    propagatedBuildInputs = with self; [ ];
+
+  };
+
+
   hypatia = buildPythonPackage rec {
     name = "hypatia-0.3";
 

From 130ad71f76a285bcf49a3e114e8d62c627a4f279 Mon Sep 17 00:00:00 2001
From: Florent Becker <florent.becker@ens-lyon.org>
Date: Fri, 23 Oct 2015 11:43:39 +0200
Subject: [PATCH 2/4] python-samplerate: init at 0.3.3

---
 pkgs/top-level/python-packages.nix | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 010a1706d1a4..617230302c99 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4926,6 +4926,31 @@ let
 
   };
 
+  samplerate = buildPythonPackage rec {
+    name = "scikits.samplerate-${version}";
+    version = "0.3.3";
+    src = pkgs.fetchgit {
+      url = https://github.com/ThomasLecocq/samplerate;
+      rev = "7edb22b23f5aa8e7342aea0b538bdd0434988510";
+      sha256 = "ec2a09819c38028283505090ee9839963d3557e73f6e8eb3348ff8884d0d67ed";
+      };
+    buildInputs = with self;  [ pkgs.libsamplerate ];
+
+    propagatedBuildInputs = with self; [ numpy ];
+
+
+    preConfigure = ''
+       cat > site.cfg << END
+       [samplerate]
+       library_dirs=${pkgs.libsamplerate}/lib
+       include_dirs=${pkgs.libsamplerate}/include
+       END
+    '';
+
+    doCheck = false;
+
+  };
+
 
   hypatia = buildPythonPackage rec {
     name = "hypatia-0.3";

From cb6cf34431945129818c55526de2701f864cde5c Mon Sep 17 00:00:00 2001
From: Florent Becker <florent.becker@ens-lyon.org>
Date: Sat, 24 Oct 2015 16:14:24 +0200
Subject: [PATCH 3/4] python-librosa: init at 0.4.0

---
 pkgs/top-level/python-packages.nix | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 617230302c99..a3f60c1c00ad 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4912,6 +4912,24 @@ let
   };
 
 
+
+  librosa = buildPythonPackage rec {
+    name = "librosa-${version}";
+    version = "0.4.0";
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/l/librosa/librosa-0.4.0.tar.gz";
+      md5 = "8149a70a5a5783c3cceeb69de3e07458";
+    };
+
+    buildInputs = with self; with pkgs;
+      [ ];
+
+    propagatedBuildInputs = with self;
+      [ joblib matplotlib six scikitlearn decorator audioread samplerate ];
+
+  };
+
+
   joblib = buildPythonPackage rec {
     name = "joblib-${version}";
     version = "0.9.0b4";

From 11aa24c0344d8948530c9494aac6282735d71188 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 11 Nov 2015 13:35:37 +0100
Subject: [PATCH 4/4] librosa and related: remove empty input lists

---
 pkgs/top-level/python-packages.nix | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index a3f60c1c00ad..56b5d0a8ed55 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4921,15 +4921,10 @@ let
       md5 = "8149a70a5a5783c3cceeb69de3e07458";
     };
 
-    buildInputs = with self; with pkgs;
-      [ ];
-
     propagatedBuildInputs = with self;
       [ joblib matplotlib six scikitlearn decorator audioread samplerate ];
-
   };
 
-
   joblib = buildPythonPackage rec {
     name = "joblib-${version}";
     version = "0.9.0b4";
@@ -4937,11 +4932,6 @@ let
       url = https://pypi.python.org/packages/source/j/joblib/joblib-0.9.0b4.tar.gz;
       md5 = "e0d79a085d4773c7a61cd38b4fb6dad5";
     };
-
-    buildInputs = with self; with pkgs;  [ ];
-
-    propagatedBuildInputs = with self; [ ];
-
   };
 
   samplerate = buildPythonPackage rec {
@@ -4966,7 +4956,6 @@ let
     '';
 
     doCheck = false;
-
   };