Fix evaluation error for license field

Fixes #96

project0/README.md

@@ -373,15 +373,15 @@ $ cabal2nix . > project0.nix
 ... and the generated `project0.nix` file for this project is:
 
 ```nix
-{ mkDerivation, base, stdenv }:
+{ mkDerivation, base, lib }:
 mkDerivation {
   pname = "project0";
   version = "1.0.0";
   src = ./.;
   isLibrary = false;
   isExecutable = true;
   executableHaskellDepends = [ base ];
-  license = stdenv.lib.licenses.bsd3;
+  license = lib.licenses.bsd3;
 }
 ```
 

project0/project0.nix

@@ -1,10 +1,10 @@
-{ mkDerivation, base, stdenv }:
+{ mkDerivation, base, lib }:
 mkDerivation {
   pname = "project0";
   version = "1.0.0";
   src = ./.;
   isLibrary = false;
   isExecutable = true;
   executableHaskellDepends = [ base ];
-  license = stdenv.lib.licenses.bsd3;
+  license = lib.licenses.bsd3;
 }

project1/QuickCheck.nix

@@ -1,4 +1,4 @@
-{ mkDerivation, base, containers, random, stdenv, template-haskell
+{ mkDerivation, base, containers, random, lib, template-haskell
 , test-framework, tf-random, transformers
 }:
 mkDerivation {
@@ -13,5 +13,5 @@ mkDerivation {
   ];
   homepage = "https://github.com/nick8325/quickcheck";
   description = "Automatic testing of Haskell programs";
-  license = stdenv.lib.licenses.bsd3;
+  license = lib.licenses.bsd3;
 }

project1/README.md

@@ -49,15 +49,15 @@ We'll see the corresponding change in the `project1.nix` generated by
 `cabal2nix`:
 
 ```nix
-{ mkDerivation, base, stdenv, turtle }:
+{ mkDerivation, base, lib, turtle }:
 mkDerivation {
   pname = "project1";
   version = "1.0.0";
   src = ./.;
   isLibrary = false;
   isExecutable = true;
   executableHaskellDepends = [ base turtle ];
-  license = stdenv.lib.licenses.bsd3;
+  license = lib.licenses.bsd3;
 }
 ```
 
@@ -169,7 +169,7 @@ The generated `turtle.nix` file looks like this:
 ```nix
 { mkDerivation, ansi-wl-pprint, async, base, bytestring, clock
 , directory, doctest, foldl, hostname, managed, optional-args
-, optparse-applicative, process, stdenv, stm, system-fileio
+, optparse-applicative, process, lib, stm, system-fileio
 , system-filepath, temporary, text, time, transformers, unix
 , unix-compat
 }:
@@ -185,7 +185,7 @@ mkDerivation {
   ];
   testHaskellDepends = [ base doctest ];
   description = "Shell programming, Haskell-style";
-  license = stdenv.lib.licenses.bsd3;
+  license = lib.licenses.bsd3;
 }
 ```
 
@@ -499,7 +499,7 @@ Result looks like this `turtle-2.nix`:
 ```nix
 { mkDerivation, ansi-wl-pprint, async, base, bytestring, clock
 , directory, doctest, fetchgit, foldl, hostname, managed
-, optional-args, optparse-applicative, process, stdenv, stm
+, optional-args, optparse-applicative, process, lib, stm
 , system-fileio, system-filepath, temporary, text, time
 , transformers, unix, unix-compat
 }:
@@ -519,7 +519,7 @@ mkDerivation {
   ];
   testHaskellDepends = [ base doctest ];
   description = "Shell programming, Haskell-style";
-  license = stdenv.lib.licenses.bsd3;
+  license = lib.licenses.bsd3;
 }
 ```
 
@@ -541,12 +541,12 @@ repository:
 ```diff
 2,5c2,5
 < , directory, doctest, foldl, hostname, managed, optional-args
-< , optparse-applicative, process, stdenv, stm, system-fileio
+< , optparse-applicative, process, lib, stm, system-fileio
 < , system-filepath, temporary, text, time, transformers, unix
 < , unix-compat
 ---
 > , directory, doctest, fetchgit, foldl, hostname, managed
-> , optional-args, optparse-applicative, process, stdenv, stm
+> , optional-args, optparse-applicative, process, lib, stm
 > , system-fileio, system-filepath, temporary, text, time
 > , transformers, unix, unix-compat
 10c10,14

project1/optparse-applicative-2.nix

@@ -1,4 +1,4 @@
-{ mkDerivation, ansi-wl-pprint, base, process, QuickCheck, stdenv
+{ mkDerivation, ansi-wl-pprint, base, process, QuickCheck, lib
 , transformers, transformers-compat
 }:
 mkDerivation {
@@ -12,5 +12,5 @@ mkDerivation {
   doCheck = false;
   homepage = "https://github.com/pcapriotti/optparse-applicative";
   description = "Utilities and combinators for parsing command line options";
-  license = stdenv.lib.licenses.bsd3;
+  license = lib.licenses.bsd3;
 }

project1/optparse-applicative.nix

@@ -1,4 +1,4 @@
-{ mkDerivation, ansi-wl-pprint, base, process, QuickCheck, stdenv
+{ mkDerivation, ansi-wl-pprint, base, process, QuickCheck, lib
 , transformers, transformers-compat
 }:
 mkDerivation {
@@ -11,5 +11,5 @@ mkDerivation {
   testHaskellDepends = [ base QuickCheck ];
   homepage = "https://github.com/pcapriotti/optparse-applicative";
   description = "Utilities and combinators for parsing command line options";
-  license = stdenv.lib.licenses.bsd3;
+  license = lib.licenses.bsd3;
 }

project1/project1.nix

@@ -1,10 +1,10 @@
-{ mkDerivation, base, stdenv, turtle }:
+{ mkDerivation, base, lib, turtle }:
 mkDerivation {
   pname = "project1";
   version = "1.0.0";
   src = ./.;
   isLibrary = false;
   isExecutable = true;
   executableHaskellDepends = [ base turtle ];
-  license = stdenv.lib.licenses.bsd3;
+  license = lib.licenses.bsd3;
 }

project1/turtle-2.nix

@@ -1,6 +1,6 @@
 { mkDerivation, ansi-wl-pprint, async, base, bytestring, clock
 , directory, doctest, fetchgit, foldl, hostname, managed
-, optional-args, optparse-applicative, process, stdenv, stm
+, optional-args, optparse-applicative, process, lib, stm
 , system-fileio, system-filepath, temporary, text, time
 , transformers, unix, unix-compat
 }:
@@ -20,5 +20,5 @@ mkDerivation {
   ];
   testHaskellDepends = [ base doctest ];
   description = "Shell programming, Haskell-style";
-  license = stdenv.lib.licenses.bsd3;
+  license = lib.licenses.bsd3;
 }

project1/turtle.nix

@@ -1,6 +1,6 @@
 { mkDerivation, ansi-wl-pprint, async, base, bytestring, clock
 , directory, doctest, foldl, hostname, managed, optional-args
-, optparse-applicative, process, stdenv, stm, system-fileio
+, optparse-applicative, process, lib, stm, system-fileio
 , system-filepath, temporary, text, time, transformers, unix
 , unix-compat
 }:
@@ -16,5 +16,5 @@ mkDerivation {
   ];
   testHaskellDepends = [ base doctest ];
   description = "Shell programming, Haskell-style";
-  license = stdenv.lib.licenses.bsd3;
+  license = lib.licenses.bsd3;
 }

project2/README.md

@@ -77,7 +77,7 @@ $ cabal2nix . > project2.nix
 `project2.nix`:
 
 ```nix
-{ mkDerivation, base, stdenv, tar }:
+{ mkDerivation, base, lib, tar }:
 mkDerivation {
   pname = "project2";
   version = "1.0.0";
@@ -86,7 +86,7 @@ mkDerivation {
   isExecutable = true;
   executableHaskellDepends = [ base ];
   executableSystemDepends = [ tar ];
-  license = stdenv.lib.licenses.bsd3;
+  license = lib.licenses.bsd3;
 }
 ```
 

project2/project2.nix

@@ -1,4 +1,4 @@
-{ mkDerivation, base, stdenv, tar }:
+{ mkDerivation, base, lib, tar }:
 mkDerivation {
   pname = "project2";
   version = "1.0.0";
@@ -7,5 +7,5 @@ mkDerivation {
   isExecutable = true;
   executableHaskellDepends = [ base ];
   executableSystemDepends = [ tar ];
-  license = stdenv.lib.licenses.bsd3;
+  license = lib.licenses.bsd3;
 }

project3/project3.nix

@@ -1,4 +1,4 @@
-{ mkDerivation, base, stdenv, tar, turtle }:
+{ mkDerivation, base, lib, tar, turtle }:
 mkDerivation {
   pname = "project3";
   version = "1.0.0";
@@ -9,5 +9,5 @@ mkDerivation {
   librarySystemDepends = [ tar ];
   executableHaskellDepends = [ base ];
   testHaskellDepends = [ base turtle ];
-  license = stdenv.lib.licenses.bsd3;
+  license = lib.licenses.bsd3;
 }

project4/nix/foldl.nix

@@ -1,6 +1,6 @@
 { mkDerivation, base, bytestring, comonad, containers
 , contravariant, criterion, hashable, mwc-random, primitive
-, profunctors, stdenv, text, transformers, unordered-containers
+, profunctors, lib, text, transformers, unordered-containers
 , vector, vector-builder
 }:
 mkDerivation {
@@ -14,5 +14,5 @@ mkDerivation {
   ];
   benchmarkHaskellDepends = [ base criterion ];
   description = "Composable, streaming, and efficient left folds";
-  license = stdenv.lib.licenses.bsd3;
+  license = lib.licenses.bsd3;
 }

project4/nix/managed.nix

@@ -1,9 +1,9 @@
-{ mkDerivation, base, stdenv, transformers }:
+{ mkDerivation, base, lib, transformers }:
 mkDerivation {
   pname = "managed";
   version = "1.0.4";
   sha256 = "1nf38g8r9s8b37f6yw9w21b28pd6nvlxfl3gzfbn89m0zswrwv0v";
   libraryHaskellDepends = [ base transformers ];
   description = "A monad for managed values";
-  license = stdenv.lib.licenses.bsd3;
+  license = lib.licenses.bsd3;
 }

project4/nix/optparse-applicative.nix

@@ -1,4 +1,4 @@
-{ mkDerivation, ansi-wl-pprint, base, process, QuickCheck, stdenv
+{ mkDerivation, ansi-wl-pprint, base, process, QuickCheck, lib
 , transformers, transformers-compat
 }:
 mkDerivation {
@@ -11,5 +11,5 @@ mkDerivation {
   testHaskellDepends = [ base QuickCheck ];
   homepage = "https://github.com/pcapriotti/optparse-applicative";
   description = "Utilities and combinators for parsing command line options";
-  license = stdenv.lib.licenses.bsd3;
+  license = lib.licenses.bsd3;
 }

project4/nix/project4.nix

@@ -1,10 +1,10 @@
-{ mkDerivation, base, foldl, stdenv, text, turtle }:
+{ mkDerivation, base, foldl, lib, text, turtle }:
 mkDerivation {
   pname = "project4";
   version = "1.0.0";
   src = ../.;
   isLibrary = false;
   isExecutable = true;
   executableHaskellDepends = [ base foldl text turtle ];
-  license = stdenv.lib.licenses.bsd3;
+  license = lib.licenses.bsd3;
 }

project4/nix/turtle.nix

@@ -1,6 +1,6 @@
 { mkDerivation, ansi-wl-pprint, async, base, bytestring, clock
 , directory, doctest, foldl, hostname, managed, optional-args
-, optparse-applicative, process, stdenv, stm, system-fileio
+, optparse-applicative, process, lib, stm, system-fileio
 , system-filepath, temporary, text, time, transformers, unix
 , unix-compat
 }:
@@ -16,5 +16,5 @@ mkDerivation {
   ];
   testHaskellDepends = [ base doctest ];
   description = "Shell programming, Haskell-style";
-  license = stdenv.lib.licenses.bsd3;
+  license = lib.licenses.bsd3;
 }