public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into hardened-stdenv

This commit is contained in:
Robin Gloster 2016-02-07 16:43:30 +00:00
parent 321c57d69e 9a5a967d0d
commit e308f67e2a
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/tools/misc/rrdtool/default.nix
View File

@ -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; {

2
pkgs/top-level/node-packages-generated.nix
View File

@ -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";
};