Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[20.03] dhall-nix: Fix build #81970

Merged
merged 1 commit into from Mar 7, 2020
Merged

Conversation

@Infinisil
Copy link
Member

Infinisil commented Mar 7, 2020

Motivation for this change

Fixes #81834

The fix on master is different, but I'll do that too once haskell-nix/hnix-store#55 (comment) is ready

I also simplified some related overrides using overrideScope

I updated haskell-packages.nix to unmark it as broken, since it doesn't get updates anymore on this branch

Things done
  • Built dhall-nix and haskellPackages.dhall-nix successfully on NixOS
@Infinisil Infinisil changed the title dhall-nix: Fix build [20.03] dhall-nix: Fix build Mar 7, 2020
@Infinisil
Copy link
Member Author

Infinisil commented Mar 7, 2020

@GrahamcOfBorg build dhall-nix

@Infinisil Infinisil merged commit 8b85be4 into NixOS:release-20.03 Mar 7, 2020
16 checks passed
16 checks passed
dhall-nix on aarch64-linux Failure
Details
Evaluation Performance Report Evaluator Performance Report
Details
dhall-nix on x86_64-darwin Success
Details
dhall-nix on x86_64-linux Success
Details
grahamcofborg-eval ^.^!
Details
grahamcofborg-eval-check-maintainers matching changed paths to changed attrs...
Details
grahamcofborg-eval-check-meta config.nix: checkMeta = true
Details
grahamcofborg-eval-darwin nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A darwin-tested
Details
grahamcofborg-eval-nixos nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release-combined.nix -A tested
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A manual
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A options
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A manual
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A tarball
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A unstable
Details
grahamcofborg-eval-package-list nix-env -qa --json --file .
Details
grahamcofborg-eval-package-list-no-aliases nix-env -qa --json --file . --arg config { allowAliases = false; }
Details
@Infinisil Infinisil deleted the Infinisil:dhall-nix-fix branch Mar 7, 2020
dontCheck (super.dhall_1_29_0.overrideScope (self: super: {
prettyprinter = self.prettyprinter_1_6_0;
prettyprinter-ansi-terminal =
self.prettyprinter-ansi-terminal.override {
prettyprinter = self.prettyprinter_1_6_0;
};
});
}));
Comment on lines +1054 to +1056

This comment has been minimized.

Copy link
@cdepillabout

cdepillabout Mar 7, 2020

Member

Thanks for cleaning this up.

I didn't realize that overrideScope was the tool to use here, but after seeing this example, I'll try to use it when appropriate!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

2 participants
You can’t perform that action at this time.