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

Jump to bottom

polysemy-plugin: fix build #83294

Merged
merged 1 commit into from Mar 27, 2020
Merged

polysemy-plugin: fix build #83294

merged 1 commit into from Mar 27, 2020

Conversation

mikesperber
Copy link
Contributor

@mikesperber mikesperber commented Mar 24, 2020 •
edited

This needs a slightly older version of ghc-tcplugins-extra.
Include that, too.

Motivation for this change
Configuring polysemy-plugin-0.2.5.0...
CallStack (from HasCallStack):
  die', called at libraries/Cabal/Cabal/Distribution/Simple/Configure.hs:1022:20 in Cabal-3.0.1.0:Distribution.Simple.Configure
  configureFinalizedPackage, called at libraries/Cabal/Cabal/Distribution/Simple/Configure.hs:475:12 in Cabal-3.0.1.0:Distribution.Simple.Configure
  configure, called at libraries/Cabal/Cabal/Distribution/Simple.hs:625:20 in Cabal-3.0.1.0:Distribution.Simple
  confHook, called at libraries/Cabal/Cabal/Distribution/Simple/UserHooks.hs:65:5 in Cabal-3.0.1.0:Distribution.Simple.UserHooks
  confHook, called at libraries/Cabal/Cabal/Distribution/Simple/UserHooks.hs:65:5 in Cabal-3.0.1.0:Distribution.Simple.UserHooks
  configureAction, called at libraries/Cabal/Cabal/Distribution/Simple.hs:180:19 in Cabal-3.0.1.0:Distribution.Simple
  defaultMainHelper, called at libraries/Cabal/Cabal/Distribution/Simple.hs:125:42 in Cabal-3.0.1.0:Distribution.Simple
  defaultMainWithHooks, called at src/Distribution/Extra/Doctest.hs:170:27 in cabal-doctest-1.0.8-2wQRz9ec1yB5lMDRmEgBWB:Distribution.Extra.Doctest
Setup: Encountered missing or private dependencies:
ghc-tcplugins-extra ==0.3.
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 via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

cdepillabout
cdepillabout requested changes Mar 25, 2020
View reviewed changes
Copy link
Member

@cdepillabout cdepillabout left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please see the following post for tips when updating haskell packages:

https://discourse.nixos.org/t/call-to-action-for-updating-haskell-packages-after-bump-to-lts-15/6071

@mikesperber
Copy link
Contributor Author

Thanks for the feedback!

As per this discussion on Discourse, I'm initially including the patch to include the required version of ghc-tcplugins-extra, in the hope that hackage-packages.nix will be automatically updated tomorrow. I'll then do the second part of actually getting polysemy-plugin to use that version.

cdepillabout
cdepillabout reviewed Mar 26, 2020
View reviewed changes
pkgs/development/haskell-modules/configuration-hackage2nix.yaml Outdated
@@ -846,6 +846,7 @@ default-package-overrides:
- ghc-source-gen ==0.3.0.0
- ghc-syntax-highlighter ==0.0.5.0
- ghc-tcplugins-extra ==0.4
- ghc-tcplugins-extra ==0.3.2
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should actually go in this list:

nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix.yaml

Line 2356 in 89bcf4b

extra-packages:

Also, please rebase this on top of haskell-updates.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done. (Was already rebased.)

@mikesperber
ghc-tcplugins-extra: include version 0.3.2
3fe55e1 
This is slightly outdated, required by polysemy-plugin, the actual fix
for this will be forthcoming as soon as hackage-packages.nix is
updated.
@mikesperber
Copy link
Contributor Author

Ah, thanks - done.

It was already rebased on top of haskell-updates, though.

@ofborg ofborg bot requested review from kosmikus and peti March 26, 2020 10:39
@cdepillabout
Copy link
Member

Please change the base branch of the PR to be haskell-updates, not master.

@mikesperber
Copy link
Contributor Author

It is branched off haskell-updates:

sperber@valmont ~/b/nixpkgs (unbreak-polysemy-plugin)> git log
commit 3fe55e10b39497c6df3b79883a3a25a5109cb21a (HEAD -> unbreak-polysemy-plugin, mikesperber/unbreak-polysemy-plugin)
Author: Mike Sperber <sperber@deinprogramm.de>
Date:   Tue Mar 24 15:37:55 2020 +0100

    ghc-tcplugins-extra: include version 0.3.2

    This is slightly outdated, required by polysemy-plugin, the actual fix
    for this will be forthcoming as soon as hackage-packages.nix is
    updated.

commit 218a3b3651cff1c830927beb504c78f992c08d35 (origin/haskell-updates, haskell-updates)
Author: Peter Simons <simons@cryp.to>
Date:   Thu Mar 26 02:30:38 2020 +0100

    hackage-packages.nix: automatic Haskell package set update

    This update was generated by hackage2nix v2.15.1 from Hackage revision
    https://github.com/commercialhaskell/all-cabal-hashes/commit/69adf93bec1ae46d9a8d9f964897237d565109fa.

Is there some confusion?

@cdepillabout
Copy link
Member

@mikesperber

Right under the title of this PR, there is a line that says:

mikesperber wants to merge 17 commits into NixOS:master from mikesperber:unbreak-polysemy-plugin

You need to click the Edit button next to that line, and change the base branch from NixOS:master to NixOS:haskell-updates.

@mikesperber mikesperber changed the base branch from master to haskell-updates March 27, 2020 07:05
@mikesperber
Copy link
Contributor Author

Ah, sorry. Done.

@cdepillabout
Copy link
Member

@mikesperber Looks good! Thanks for working through this with me.

@cdepillabout cdepillabout merged commit a81dfe9 into NixOS:haskell-updates Mar 27, 2020
@mikesperber
Copy link
Contributor Author

@cdepillabout I appreciate your patience!

@mikesperber mikesperber mentioned this pull request Mar 30, 2020
Merged
10 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@cdepillabout cdepillabout cdepillabout requested changes

@infinisil infinisil Awaiting requested review from infinisil

@kosmikus kosmikus Awaiting requested review from kosmikus

@peti peti Awaiting requested review from peti

Assignees
No one assigned
Labels
6.topic: haskell 8.has: clean-up 8.has: package (new) 10.rebuild-darwin: 0 10.rebuild-linux: 0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@mikesperber @cdepillabout