public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Consistently use 'lib' instead of 'stdenv.lib' in the Haskell infrastructure. 

Part of https://github.com/NixOS/nixpkgs/issues/108938.
This commit is contained in:
Peter Simons 2021-01-19 19:26:01 +01:00
parent 71e660bb8d
commit c3792f6cdd
3 changed files with 24185 additions and 24181 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48354
pkgs/development/haskell-modules/hackage-packages.nix generated
View File

File diff suppressed because it is too large Load Diff

2
pkgs/development/haskell-modules/initial-packages.nix
View File

@ -1,2 +1,2 @@
args@{ pkgs, stdenv, callPackage }: self:
args@{ pkgs, lib, callPackage }: self:
(import ./hackage-packages.nix args self)

10
pkgs/development/haskell-modules/make-package-set.nix
View File

@ -11,9 +11,13 @@
, # package-set used for non-haskell dependencies (all of nixpkgs)
pkgs
, # stdenv to use for building haskell packages
, # stdenv provides our build and host platforms
stdenv
, # this module provides the list of known licenses and maintainers
lib
# needed for overrideCabal & packageSourceOverrides
, haskellLib
, # hashes for downloading Hackage packages
@ -22,7 +26,7 @@
, # compiler to use
ghc
, # A function that takes `{ pkgs, stdenv, callPackage }` as the first arg and
, # A function that takes `{ pkgs, lib, callPackage }` as the first arg and
# `self` as second, and returns a set of haskell packages
package-set
@ -169,7 +173,7 @@ let
};
});
in package-set { inherit pkgs stdenv callPackage; } self // {
in package-set { inherit pkgs lib callPackage; } self // {
inherit mkDerivation callPackage haskellSrc2nix hackage2nix buildHaskellPackages;