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

Revert patch: add "doc" to ghc wrapper #77442

Merged
merged 1 commit into from Jan 10, 2020
Merged

Conversation

@peti
Copy link
Member

@peti peti commented Jan 10, 2020

Reverts #76842. This change breaks ghcWithHoogle:

$ nix-build --no-out-link -E 'with import <nixpkgs> {}; haskellPackages.ghcWithHoogle (pkgs: with pkgs; [aeson cabal-plan])'
these derivations will be built:
  /nix/store/hq66xwgclahnv7qlhqhqxd9n81fv8f5s-ghc-8.6.5-with-packages.drv
building '/nix/store/hq66xwgclahnv7qlhqhqxd9n81fv8f5s-ghc-8.6.5-with-packages.drv'...
collision between `/nix/store/ds8hl24am8gmgx1dlzy7fmpjymdw5q99-uuid-types-1.0.3-doc/share/doc/uuid-types-1.0.3/html/uuid-types.haddock' and `/nix/store/v7lspi47i8xf8wkgqww4k3d1ps871ajd-uuid-types-1.0.3-doc/share/doc/uuid-types-1.0.3/html/uuid-types.haddock'
builder for '/nix/store/hq66xwgclahnv7qlhqhqxd9n81fv8f5s-ghc-8.6.5-with-packages.drv' failed with exit code 255

Apparently, the change causes file conflicts that did not occur before.

Ping @matthewbauer.

@peti peti self-assigned this Jan 10, 2020
@peti peti mentioned this pull request Jan 10, 2020
3 of 3 tasks complete
@peti peti merged commit d1bd0fb into master Jan 10, 2020
13 checks passed
13 checks passed
Evaluation Performance Report Evaluator Performance Report
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
@peti peti deleted the revert-76842-add-doc-to-ghc-wrapper branch Jan 10, 2020
@cdepillabout
Copy link
Member

@cdepillabout cdepillabout commented Jan 11, 2020

Also cc @GuillaumeDesforges who opened the originally issue (#76837) that triggered the fix (#76842) from @matthewbauer.

@matthewbauer
Copy link
Member

@matthewbauer matthewbauer commented Jan 11, 2020

My bad! I think we just need allowCollisions but I can reopen with that.

matthewbauer added a commit that referenced this pull request Jan 11, 2020
This reverts commit 93aabab.
This reverts commit e915608.

Based on change in master at d1bd0fb
opened in #77442
matthewbauer added a commit to matthewbauer/nixpkgs that referenced this pull request Jan 11, 2020
This reverts commit 2395ac6.

Added allowCollisions to fix the issue mentioned in NixOS#77442
matthewbauer added a commit to matthewbauer/nixpkgs that referenced this pull request Jan 11, 2020
This reverts commit 2395ac6.

Added allowCollisions to fix the issue mentioned in NixOS#77442
@peti
Copy link
Member Author

@peti peti commented Jan 12, 2020

I don't like the notion of allowing collisions very much, to be honest.

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

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