Skip to content

Commit e094e27

Browse files
Try #1036:
2 parents 7ea4746 + 1615545 commit e094e27

File tree

88 files changed

+370
-379
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

88 files changed

+370
-379
lines changed

builder/shell-for.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,8 @@ let
5959
# Given a list of derivations, removes those which are components of packages which were selected as part of the shell.
6060
removeSelectedInputs =
6161
# All the components of the selected packages: we shouldn't add any of these as dependencies
62-
let selectedPackageComponents = lib.concatMap haskellLib.getAllComponents selectedPackages;
63-
in lib.filter (input: !(builtins.elem input selectedPackageComponents));
62+
let selectedPackageComponents = map (x: x.name) (lib.concatMap haskellLib.getAllComponents selectedPackages);
63+
in lib.filter (input: !(builtins.elem input.name selectedPackageComponents));
6464

6565
# We need to remove any dependencies which are selected packages (see above).
6666
# `depends` contains packages so we use 'removeSelectedPackages`.

ci.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
# We need to use the actual nixpkgs version we're working with here, since the values
4444
# of 'lib.systems.examples' are not understood between all versions
4545
let lib = nixpkgs.lib;
46-
in lib.optionalAttrs (nixpkgsName == "R2009" && (__elem compiler-nix-name ["ghc865" "ghc884"])) {
46+
in lib.optionalAttrs (nixpkgsName == "unstable" && (__elem compiler-nix-name ["ghc865" "ghc884"])) {
4747
inherit (lib.systems.examples) ghcjs;
4848
} // lib.optionalAttrs (system == "x86_64-linux" && (
4949
(nixpkgsName == "R2009" && __elem compiler-nix-name ["ghc8101" "ghc8102" "ghc8103" "ghc8104" "ghc810220201118"])

lib/materialize.nix

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,14 @@ let
5656
builtins.trace sha256message (builtins.trace materializeMessage calculateNoHash);
5757

5858
# Build fully and check the hash and materialized versions
59-
checked = runCommand name {} (''
59+
checked =
60+
# Let the user know what we are checking. This is useful for debugging issues
61+
# where materialization fails to prevent infinite recurstion when:
62+
# checkMaterialization = true;
63+
(if materialized != null
64+
then __trace "Checking materialization in ${toString materialized}"
65+
else x: x)
66+
runCommand name {} (''
6067
ERR=$(mktemp -d)/errors.txt
6168
''
6269
+ (pkgs.lib.optionalString (sha256 != null) ''

materialized/bootstrap/ghc844/alex/.plan.nix/alex.nix

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

materialized/bootstrap/ghc844/happy-1.19.11/.plan.nix/happy.nix

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

materialized/bootstrap/ghc844/happy-1.19.12/.plan.nix/happy.nix

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

materialized/bootstrap/ghc844/hscolour/.plan.nix/hscolour.nix

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)