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] haskellPackages.ghcide: Fix build #86659

Merged
merged 1 commit into from May 4, 2020

Conversation

@maralorn
Copy link
Contributor

maralorn commented May 3, 2020

Motivation for this change

ghcide is marked as broken and is not building. With these changes it builds.

Please let me know if I should structure the overrides in a different way.
When this PR is approved I will port it to the haskell-updates branch. But first I wanna know if I did this right.
I am especially confused by the recursive library overrides. It‘s not pretty this way. e.g. the override for regex-tdfa_1_3_1_0 which needs a pinned regex-base version is now twice in the file.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.
@maralorn maralorn changed the title haskellPackages.ghcide: Fix build [20.03] haskellPackages.ghcide: Fix build May 3, 2020
@cdepillabout
Copy link
Member

cdepillabout commented May 4, 2020

@maralorn Thanks for working on this. I think a lot of Haskellers have been trying out ghcide. It'd be nice if people could just get it from nixpkgs.

@maralorn maralorn force-pushed the maralorn:fix-ghcide branch from 642055b to f094486 May 4, 2020
@maralorn
Copy link
Contributor Author

maralorn commented May 4, 2020

@cdepillabout I do believe I have now fixed all your concerns and all my concerns.

  • Moved the lsp stuff to hackage-packages and put that in the yaml, so that it doesn‘t get lost.
  • Activated hydra builds.
  • figured out the use of self, so that I need to do less overrides on my own.
@cdepillabout
Copy link
Member

cdepillabout commented May 4, 2020

@maralorn

One more change and this can be merged in:

haddock-library_1_8_0 needs to have the hydraPlatforms = stdenv.lib.platforms.none line removed.

Once that is done, I will merge this in. I have confirmed that ghcide was able to build.

@maralorn maralorn force-pushed the maralorn:fix-ghcide branch from 9b2ad29 to 4363f71 May 4, 2020
@maralorn maralorn requested a review from cdepillabout May 4, 2020
maralorn added a commit to maralorn/nixpkgs that referenced this pull request May 4, 2020
This is the haskell-updates version of NixOS#86659
@cdepillabout cdepillabout merged commit 410cf9e into NixOS:release-20.03 May 4, 2020
15 of 16 checks passed
15 of 16 checks passed
haskellPackages.ghcide, haskellPackages.ghcide.passthru.tests on aarch64-linux
Details
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="4363f71"; rev="4363f710e38384c9ff1f553ab05549a5a1ce868e"; } ./pkgs/t
Details
grahamcofborg-eval-lib-tests nix-build --arg pkgs import ./. {} ./lib/tests/release.nix
Details
grahamcofborg-eval-nixos nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="4363f71"; rev="4363f710e38384c9ff1f553ab05549a5a1ce868e"; } ./nixos/
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="4363f71"; rev="4363f710e38384c9ff1f553ab05549a5a1ce868e"; } ./nixos/
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="4363f71"; rev="4363f710e38384c9ff1f553ab05549a5a1ce868e"; } ./nixos/
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="4363f71"; rev="4363f710e38384c9ff1f553ab05549a5a1ce868e"; } ./pkgs/t
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="4363f71"; rev="4363f710e38384c9ff1f553ab05549a5a1ce868e"; } ./pkgs/t
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="4363f71"; rev="4363f710e38384c9ff1f553ab05549a5a1ce868e"; } ./pkgs/t
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
haskellPackages.ghcide, haskellPackages.ghcide.passthru.tests on x86_64-linux Success
Details
@maralorn maralorn deleted the maralorn:fix-ghcide branch May 4, 2020
maralorn added a commit to maralorn/nixpkgs that referenced this pull request May 4, 2020
This is the haskell-updates version of NixOS#86659
peti added a commit that referenced this pull request May 5, 2020
This is the haskell-updates version of #86659
peti added a commit that referenced this pull request May 5, 2020
This is the haskell-updates version of #86659
peti added a commit that referenced this pull request May 8, 2020
This is the haskell-updates version of #86659
peti added a commit that referenced this pull request May 8, 2020
This is the haskell-updates version of #86659
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.