nixpkgs: merge nixos-unstable

1 files changed, 4 insertions, 4 deletions

diff --git a/nixpkgs/pkgs/build-support/fetchsvn/default.nix b/nixpkgs/pkgs/build-support/fetchsvn/default.nix
index 06f0ea0a3d1f..82dececc124a 100644
--- a/nixpkgs/pkgs/build-support/fetchsvn/default.nix
+++ b/nixpkgs/pkgs/build-support/fetchsvn/default.nix
@@ -1,4 +1,4 @@
-{ stdenvNoCC, buildPackages
+{ lib, stdenvNoCC, buildPackages
 , subversion, glibcLocales, sshSupport ? true, openssh ? null
 }:
 
@@ -10,7 +10,7 @@
 assert sshSupport -> openssh != null;
 
 let
-  repoName = with stdenvNoCC.lib;
+  repoName = with lib;
     let
       fst = head;
       snd = l: head (tail l);
@@ -39,7 +39,7 @@ stdenvNoCC.mkDerivation {
   name = name_;
   builder = ./builder.sh;
   nativeBuildInputs = [ subversion glibcLocales ]
-    ++ stdenvNoCC.lib.optional sshSupport openssh;
+    ++ lib.optional sshSupport openssh;
 
   SVN_SSH = if sshSupport then "${buildPackages.openssh}/bin/ssh" else null;
 
@@ -49,6 +49,6 @@ stdenvNoCC.mkDerivation {
 
   inherit url rev ignoreExternals ignoreKeywords;
 
-  impureEnvVars = stdenvNoCC.lib.fetchers.proxyImpureEnvVars;
+  impureEnvVars = lib.fetchers.proxyImpureEnvVars;
   inherit preferLocalBuild;
 }