pkgs/development/compilers: stdenv.lib -> lib

pkgs/development/compilers/chicken/5/chicken.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, makeWrapper, darwin, bootstrap-chicken ? null }:
+{ lib, stdenv, fetchurl, makeWrapper, darwin, bootstrap-chicken ? null }:
 
 let
   version = "5.2.0";
@@ -8,7 +8,6 @@ let
     else if (isFreeBSD || isOpenBSD) then "bsd"
     else if isSunOS then "solaris"
     else "linux"; # Should be a sane default
-  lib = stdenv.lib;
 in
 stdenv.mkDerivation {
   pname = "chicken";
@@ -51,9 +50,9 @@ stdenv.mkDerivation {
 
   meta = {
     homepage = "http://www.call-cc.org/";
-    license = stdenv.lib.licenses.bsd3;
-    maintainers = with stdenv.lib.maintainers; [ corngood ];
-    platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; # Maybe other Unix
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ corngood ];
+    platforms = lib.platforms.linux ++ lib.platforms.darwin; # Maybe other Unix
     description = "A portable compiler for the Scheme programming language";
     longDescription = ''
       CHICKEN is a compiler for the Scheme programming language.

pkgs/development/compilers/chicken/5/egg2nix.nix

@@ -1,4 +1,4 @@
-{ stdenv, eggDerivation, fetchFromGitHub, chickenEggs }:
+{ lib, stdenv, eggDerivation, fetchFromGitHub, chickenEggs }:
 
 # Note: This mostly reimplements the default.nix already contained in
 # the tarball. Is there a nicer way than duplicating code?
@@ -22,8 +22,8 @@ eggDerivation {
   meta = {
     description = "Generate nix-expression from CHICKEN scheme eggs";
     homepage = "https://github.com/the-kenny/egg2nix";
-    license = stdenv.lib.licenses.bsd3;
-    platforms = stdenv.lib.platforms.unix;
-    maintainers = with stdenv.lib.maintainers; [ corngood ];
+    license = lib.licenses.bsd3;
+    platforms = lib.platforms.unix;
+    maintainers = with lib.maintainers; [ corngood ];
   };
 }

pkgs/development/compilers/chicken/5/eggDerivation.nix

@@ -1,4 +1,4 @@
-{ stdenv, chicken, makeWrapper }:
+{ lib, stdenv, chicken, makeWrapper }:
 { name, src
 , buildInputs ? []
 , chickenInstallFlags ? []
@@ -7,7 +7,7 @@
 
 let
   overrides = import ./overrides.nix;
-  baseName = stdenv.lib.getName name;
+  baseName = lib.getName name;
   override = if builtins.hasAttr baseName overrides
    then
      builtins.getAttr baseName overrides
@@ -19,14 +19,14 @@ stdenv.mkDerivation ({
   propagatedBuildInputs = buildInputs;
   buildInputs = [ makeWrapper chicken ];
 
-  CSC_OPTIONS = stdenv.lib.concatStringsSep " " cscOptions;
+  CSC_OPTIONS = lib.concatStringsSep " " cscOptions;
 
   installPhase = ''
     runHook preInstall
 
     export CHICKEN_INSTALL_PREFIX=$out
     export CHICKEN_INSTALL_REPOSITORY=$out/lib/chicken/${toString chicken.binaryVersion}
-    chicken-install ${stdenv.lib.concatStringsSep " " chickenInstallFlags}
+    chicken-install ${lib.concatStringsSep " " chickenInstallFlags}
 
     for f in $out/bin/*
     do