NixOS · Jan 19, 2021 · Jan 19, 2021
Showing 361 changed files with 1,001 additions and 1,024 deletions.
diff --git a/README.md b/README.md
@@ -10,15 +10,15 @@ Cabal2nix
 For example:
 
     $ cabal2nix cabal://mtl
-    { mkDerivation, base, stdenv, transformers }:
+    { mkDerivation, base, lib, transformers }:
     mkDerivation {
       pname = "mtl";
       version = "2.2.1";
       sha256 = "1icdbj2rshzn0m1zz5wa7v3xvkf6qw811p4s7jgqwvx1ydwrvrfa";
       libraryHaskellDepends = [ base transformers ];
       homepage = "http://github.com/ekmett/mtl";
       description = "Monad classes, using functional dependencies";
-      license = stdenv.lib.licenses.bsd3;
+      license = lib.licenses.bsd3;
     }
 
 Cabal files can be referred to using the magic URL `cabal://NAME-VERSION`,
@@ -40,15 +40,15 @@ project on the local file system:
 
     $ cabal get mtl-2.2.1 && cd mtl-2.2.1
     $ cabal2nix .
-    { mkDerivation, base, stdenv, transformers }:
+    { mkDerivation, base, lib, transformers }:
     mkDerivation {
       pname = "mtl";
       version = "2.2.1";
       src = ./.;
       libraryHaskellDepends = [ base transformers ];
       homepage = "http://github.com/ekmett/mtl";
       description = "Monad classes, using functional dependencies";
-      license = stdenv.lib.licenses.bsd3;
+      license = lib.licenses.bsd3;
     }
 
 This derivation will not fetch from hackage, but instead use the directory which

diff --git a/doc/01-use-function-application-to-escape-override-hell.md b/doc/01-use-function-application-to-escape-override-hell.md
@@ -60,7 +60,7 @@ defines builds for versions 0.3.13, 0.4.0, and 0.4.1. Those definitions look
 all quite similar, so we'll omit the third definition for brevity:
 
     "hslua_0_3_13" = callPackage
-      ({ mkDerivation, base, lua5_1, mtl }:
+      ({ mkDerivation, base, lib, lua5_1, mtl }:
        mkDerivation {
          pname = "hslua";
          version = "0.3.13";
@@ -70,13 +70,13 @@ all quite similar, so we'll omit the third definition for brevity:
          libraryPkgconfigDepends = [ lua5_1 ];
          testHaskellDepends = [ base ];
          description = "A Lua language interpreter embedding in Haskell";
-         license = stdenv.lib.licenses.mit;
-         hydraPlatforms = stdenv.lib.platforms.none;
+         license = lib.licenses.mit;
+         hydraPlatforms = lib.platforms.none;
        }) { inherit (pkgs) lua5_1; };
 
     "hslua" = callPackage
       ({ mkDerivation, base, bytestring, hspec, hspec-contrib, HUnit
-       , lua5_1, QuickCheck, quickcheck-instances, text
+       , lib, lua5_1, QuickCheck, quickcheck-instances, text
        }:
        mkDerivation {
          pname = "hslua";
@@ -90,7 +90,7 @@ all quite similar, so we'll omit the third definition for brevity:
            quickcheck-instances text
          ];
          description = "A Lua language interpreter embedding in Haskell";
-         license = stdenv.lib.licenses.mit;
+         license = lib.licenses.mit;
        }) { inherit (pkgs) lua5_1; };
 
 Let's go through that code step by step. The basic structure of those
@@ -124,11 +124,11 @@ is that our package set knows its final value already while we're still
 defining it! This allows for the existence of the `callPackage` function:
 
     self: let
-            callPackage = stdenv.lib.callPackageWith self;
+            callPackage = lib.callPackageWith self;
           in
             self // { ... Haskell package definitions here ... }
 
-The expression `callPackage f args` translates to `stdenv.lib.callPackageWith
+The expression `callPackage f args` translates to `lib.callPackageWith
 self f args`. [`callPackageWith`][2] then uses reflection to determine the
 names of all arguments expected by `f`. It finds those names that don't exist
 in `args` in `self` and adds them to `args` to complete the function call. In
@@ -172,7 +172,7 @@ package set use the older version instead of the latest one. Furthermore, we
 would like Hydra builds of `haskell.packages.lts-2_8.hslua` enabled. The
 original definition from `hackage-packages.nix` disabled those builds via
 
-    hydraPlatforms = stdenv.lib.platforms.none
+    hydraPlatforms = lib.platforms.none
 
 which makes sense in `haskellPackages`, because it prefers the latest version
 of the package, but the older LTS set isn't happy with that choice, so it uses
@@ -247,10 +247,10 @@ but this adds a dozen highly redundant arguments to every single definition!
 There might be clever ways around mentioning each of them explicitly, like:
 
     "hslua" =
-       { mkDerivation, base, bytestring, [... more inputs omitted ...]
+       { mkDerivation, base, bytestring, lib, [... more inputs omitted ...]
        , ...
        } @ args:
-       stdenv.lib.callPackageWith args mkDerivation {
+       lib.callPackageWith args mkDerivation {
          pname = "hslua";
          version = "0.4.1";
          [... more attributes omitted ...]

diff --git a/doc/03-map-cabal-files-to-nix-without-information-loss.md b/doc/03-map-cabal-files-to-nix-without-information-loss.md
@@ -95,7 +95,7 @@ specifies. In case of the `conduit` example, the generated code should say:
     libraryHaskellDepends = [
       base exceptions lifted-base mmorph mtl resourcet transformers
       transformers-base
-    ] ++ stdenv.lib.optional (stdenv.lib.versionOlder ghc.version "7.9") void;
+    ] ++ lib.optional (lib.versionOlder ghc.version "7.9") void;
 
 Furthermore, Cabal flags should be mapped to boolean function arguments that
 enable/disable the underlying feature and thereby modify how the Nix expression

diff --git a/hackage2nix/Main.hs b/hackage2nix/Main.hs
@@ -175,7 +175,7 @@ main = do
   withFile hackagePackagesFile WriteMode $ \h -> do
     hPutStrLn h "/* hackage-packages.nix is an auto-generated file -- DO NOT EDIT! */"
     hPutStrLn h ""
-    hPutStrLn h "{ pkgs, stdenv, callPackage }:"
+    hPutStrLn h "{ pkgs, lib, callPackage }:"
     hPutStrLn h ""
     hPutStrLn h "self: {"
     hPutStrLn h ""

diff --git a/src/Cabal2nix.hs b/src/Cabal2nix.hs
@@ -238,7 +238,7 @@ processPackage Options{..} pkg = do
 --            & metaSection.platforms .~ Set.fromList optPlatform
               & doCheck &&~ optDoCheck
               & doBenchmark ||~ optDoBenchmark
-              & extraFunctionArgs %~ Set.union (Set.fromList ("inherit stdenv":map (fromString . ("inherit " ++)) optExtraArgs))
+              & extraFunctionArgs %~ Set.union (Set.fromList ("inherit lib":map (fromString . ("inherit " ++)) optExtraArgs))
 
       shell :: Doc
       shell = vcat