From 23a9b9b88a06923f1afc0eede65f2c0b73125886 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sun, 7 Feb 2016 17:16:30 +0100
Subject: [PATCH 1/2] rrdtool: move perl libraries to the expected place

closes #12801
---
 pkgs/tools/misc/rrdtool/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/rrdtool/default.nix b/pkgs/tools/misc/rrdtool/default.nix
index 11f9d32b154..524e61dfaf3 100644
--- a/pkgs/tools/misc/rrdtool/default.nix
+++ b/pkgs/tools/misc/rrdtool/default.nix
@@ -9,8 +9,9 @@ stdenv.mkDerivation rec {
   buildInputs = [ gettext perl pkgconfig libxml2 pango cairo groff ];
   
   postInstall = ''
-    # for munin support
-    mv $out/lib/perl/5*/*/*.pm $out/lib/perl/5*/
+    # for munin and rrdtool support
+    mkdir -p $out/lib/perl5/site_perl/
+    mv $out/lib/perl/5* $out/lib/perl5/site_perl/
   '';
 
   meta = with stdenv.lib; {

From 9a5a967d0d7bdaf729679d1e66717a56c106d12f Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Sun, 7 Feb 2016 16:41:16 +0000
Subject: [PATCH 2/2] nodePackages.oauth: pin url to version

---
 pkgs/top-level/node-packages-generated.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/node-packages-generated.nix b/pkgs/top-level/node-packages-generated.nix
index 6a3cdd9f7de..1c68d1badc8 100644
--- a/pkgs/top-level/node-packages-generated.nix
+++ b/pkgs/top-level/node-packages-generated.nix
@@ -29315,7 +29315,7 @@
     version = "0.9.12";
     bin = false;
     src = fetchurl {
-      url = "https://github.com/ciaranj/node-oauth/tarball/master";
+      url = "https://github.com/ciaranj/node-oauth/tarball/0.9.12";
       name = "oauth-0.9.12.tgz";
       sha256 = "e06c3c3537e9c802c8ad00640b9f91bf2857cf8cc91209e355b5646f4da8b3e7";
     };