Merge branch 'replace-dependency' of https://github.com/roconnor/nixpkgs

When replace-dependency is given a drv that doesn't actually depend on
oldDependency, then just return back the original drv but also issue a
warning.