git.iko.soy/haskell.nix
on iko/ghcjs-patch-master help sign in
Fix evaluation of haskellLib.collectComponents (#479)
commit0933c58908816bca525fbf8873abdbc3e072a87e authorRodney Lorrimar <rodney.lorrimar@iohk.io> dateMon 9 Mar 2020, 20:47 (7 years ago) parent89e3e78
4 files changed+6−6
compare with iko/ghcjs-patch-master
unifiedsplit
lib/default.nix+3−3 overlays/haskell.nix+1−1 package-set.nix+1−1 test/cabal-22/default.nix+1−1
lib/default.nix+3−3
@@ -1,4 +1,4 @@
1−{ stdenv, lib, haskellLib, runCommand, git, srcOnly }:
1+{ stdenv, lib, haskellLib, runCommand, git, recurseIntoAttrs, srcOnly }:
22
33with haskellLib;
44
@@ -145,12 +145,12 @@ with haskellLib;
145145 # set recurseForDerivations unless it's a derivation itself (e.g. the "library" component) or an empty set
146146 in if lib.isDerivation components || components == {}
147147 then components
148− else pkgs.recurseIntoAttrs components;
148+ else recurseIntoAttrs components;
149149 packageFilter = name: package: (package.isHaskell or false) && packageSel package;
150150 filteredPkgs = lib.filterAttrs packageFilter haskellPackages;
151151 # at this point we can filter out packages that don't have any of the given kind of component
152152 packagesByComponent = lib.filterAttrs (_: components: components != {}) (lib.mapAttrs packageToComponents filteredPkgs);
153− in pkgs.recurseIntoAttrs packagesByComponent;
153+ in recurseIntoAttrs packagesByComponent;
154154
155155 # Equivalent to collectComponents with (_: true) as selection function.
156156 # Useful for pre-filtered package-set.
overlays/haskell.nix+1−1
@@ -59,7 +59,7 @@ self: super: {
5959
6060 # Utility functions for working with the component builder.
6161 haskellLib = let hl = import ../lib {
62− inherit (self) stdenv lib runCommand srcOnly;
62+ inherit (self) stdenv lib runCommand recurseIntoAttrs srcOnly;
6363 inherit (self.buildPackages) git;
6464 haskellLib = hl;
6565 }; in hl;
package-set.nix+1−1
@@ -7,7 +7,7 @@ in pkgs.lib.evalModules {
77 _module.args = {
88 # this is *not* the hasekllLib from nixpkgs; it is rather our own
99 # library from haskell.nix
10− haskellLib = let hl = import ./lib { inherit lib; inherit (pkgs) stdenv runCommand git srcOnly; haskellLib = hl; }; in hl;
10+ haskellLib = let hl = import ./lib { inherit lib; inherit (pkgs) stdenv runCommand recurseIntoAttrs git srcOnly; haskellLib = hl; }; in hl;
1111
1212 # The package descriptions depend on pkgs, which are used to resolve system package dependencies
1313 # as well as pkgconfPkgs, which are used to resolve pkgconfig name to nixpkgs names. We simply
test/cabal-22/default.nix+1−1
@@ -63,7 +63,7 @@ in recurseIntoAttrs {
6363
6464 meta.platforms = platforms.all;
6565 passthru = {
66− inherit (packages) project;
66+ inherit project;
6767 };
6868 };
6969}