From a5645c589644a19ee45201e22fa39cdba637560e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 11 Aug 2015 11:52:13 +0200
Subject: [PATCH] Let's not have a package named "lib"

See https://github.com/NixOS/nixpkgs/commit/fb24c7c95b586678c2b65e6751a7797844c44e28.

The "_" suffix follows the convention of the "if" package.
---
 nixos/lib/testing.nix            | 2 +-
 pkgs/top-level/perl-packages.nix | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/lib/testing.nix b/nixos/lib/testing.nix
index d9b4ec89ce7..59d05f87d5f 100644
--- a/nixos/lib/testing.nix
+++ b/nixos/lib/testing.nix
@@ -28,7 +28,7 @@ rec {
 
         wrapProgram $out/bin/nixos-test-driver \
           --prefix PATH : "${qemu_kvm}/bin:${vde2}/bin:${netpbm}/bin:${coreutils}/bin" \
-          --prefix PERL5LIB : "${with perlPackages; pkgs.lib.makePerlPath [ TermReadLineGnu XMLWriter IOTty FileSlurp ]}:$out/lib/perl5/site_perl"
+          --prefix PERL5LIB : "${with perlPackages; lib.makePerlPath [ TermReadLineGnu XMLWriter IOTty FileSlurp ]}:$out/lib/perl5/site_perl"
       '';
   };
 
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index c9b26985780..d8d66ff1cd4 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -5739,7 +5739,7 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
-  lib = buildPerlPackage {
+  lib_ = buildPerlPackage {
     name = "lib-0.63";
     src = fetchurl {
       url = mirror://cpan/authors/id/S/SM/SMUELLER/lib-0.63.tar.gz;