mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-09-22 21:18:28 +03:00
Remove obsolete Haskell attribute name compatibility layer.
This commit is contained in:
parent
acb628a07f
commit
7299118724
File diff suppressed because it is too large
Load Diff
@ -1,7 +1,6 @@
|
|||||||
{ pkgs, stdenv, ghc
|
{ pkgs, stdenv, ghc
|
||||||
, packageSetConfig ? (self: super: {})
|
, packageSetConfig ? (self: super: {})
|
||||||
, overrides ? (self: super: {})
|
, overrides ? (self: super: {})
|
||||||
, provideOldAttributeNames ? false
|
|
||||||
}:
|
}:
|
||||||
|
|
||||||
with ./lib.nix;
|
with ./lib.nix;
|
||||||
@ -63,9 +62,8 @@ let
|
|||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
compatLayer = if provideOldAttributeNames then import ./compat-layer.nix else (self: super: {});
|
|
||||||
commonConfiguration = import ./configuration-common.nix { inherit pkgs; };
|
commonConfiguration = import ./configuration-common.nix { inherit pkgs; };
|
||||||
|
|
||||||
in
|
in
|
||||||
|
|
||||||
fix (extend (extend (extend (extend haskellPackages commonConfiguration) packageSetConfig) overrides) compatLayer)
|
fix (extend (extend (extend haskellPackages commonConfiguration) packageSetConfig) overrides)
|
||||||
|
@ -3779,7 +3779,6 @@ let
|
|||||||
|
|
||||||
haskellPackages = haskell.packages.ghc7101.override {
|
haskellPackages = haskell.packages.ghc7101.override {
|
||||||
overrides = config.haskellPackageOverrides or (self: super: {});
|
overrides = config.haskellPackageOverrides or (self: super: {});
|
||||||
provideOldAttributeNames = config.provideOldHaskellAttributeNames or false;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
haxe = callPackage ../development/compilers/haxe { };
|
haxe = callPackage ../development/compilers/haxe { };
|
||||||
|
Loading…
Reference in New Issue
Block a user