swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-10-02 10:00:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #167956 from cdepillabout/haskell-bignum-dont-lose-overrides

Browse source 
haskell: don't lose packageOverrides for native-bignum and integer-simple
This commit is contained in:
sternenseemann 2022-04-12 12:06:23 +02:00 committed by GitHub
parent 51131f7203 1be5cae549
commit 88d8a0fa60
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 30 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
pkgs/top-level/haskell-packages.nix
View file

@ -245,29 +245,36 @@ in {
# The integer-simple attribute set contains package sets for all the GHC compilers # The integer-simple attribute set contains package sets for all the GHC compilers
# using integer-simple instead of integer-gmp. # using integer-simple instead of integer-gmp.
integer-simple = let integer-simple =
integerSimpleGhcNames = pkgs.lib.filter let
(name: ! builtins.elem name integerSimpleExcludes) integerSimpleGhcNames = pkgs.lib.filter
(pkgs.lib.attrNames packages); (name: ! builtins.elem name integerSimpleExcludes)
in pkgs.lib.genAttrs integerSimpleGhcNames (name: packages.${name}.override { (pkgs.lib.attrNames packages);
ghc = bh.compiler.integer-simple.${name}; in
buildHaskellPackages = bh.packages.integer-simple.${name}; pkgs.lib.genAttrs integerSimpleGhcNames
overrides = _self : _super : { (name:
integer-simple = null; packages.${name}.override (oldAttrs: {
integer-gmp = null; ghc = bh.compiler.integer-simple.${name};
}; buildHaskellPackages = bh.packages.integer-simple.${name};
}); overrides =
pkgs.lib.composeExtensions
(oldAttrs.overrides or (_: _: {}))
(_: _: { integer-simple = null; });
})
);
native-bignum = let native-bignum =
nativeBignumGhcNames = pkgs.lib.filter let
(name: builtins.elem name nativeBignumIncludes) nativeBignumGhcNames = pkgs.lib.filter
(pkgs.lib.attrNames compiler); (name: builtins.elem name nativeBignumIncludes)
in pkgs.lib.genAttrs nativeBignumGhcNames (name: packages.${name}.override { (pkgs.lib.attrNames compiler);
ghc = bh.compiler.native-bignum.${name}; in
buildHaskellPackages = bh.packages.native-bignum.${name}; pkgs.lib.genAttrs nativeBignumGhcNames
overrides = _self : _super : { (name:
integer-gmp = null; packages.${name}.override {
}; ghc = bh.compiler.native-bignum.${name};
}); buildHaskellPackages = bh.packages.native-bignum.${name};
}
);
}; };
} }