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.

Sign up for GitHub

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

haskellPackages.stylish-haskell: fix broken dependencies #85656

Merged
merged 2 commits into from May 1, 2020
Merged

haskellPackages.stylish-haskell: fix broken dependencies #85656

merged 2 commits into from May 1, 2020

Conversation

samuelrivas
Copy link
Contributor

@samuelrivas samuelrivas commented Apr 21, 2020 •
edited

stylish-haskell depends on a more modern HsYAML version than available in
stackage. Updated to use the hackage version.

Note that stylish-haskell builds in master, possibly because master uses a more modern stackage LTS. I am not sure if I should pull request this to the 20.03 branch or just wait until the whole stackage version is updated for 20.03

Motivation for this change
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 reviewed Apr 21, 2020
View reviewed changes
pkgs/development/haskell-modules/configuration-common.nix Outdated
Comment on lines 1426 to 1430
HsYAML-aeson = unmarkBroken (super.HsYAML-aeson.override {
HsYAML = self.HsYAML_0_2_1_0;
});

stylish-haskell = (unmarkBroken super.stylish-haskell).override {
Copy link
Member

Choose a reason for hiding this comment

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

Unstead of using unmarkBroken, it is easier just to edit pkgs/development/haskell-modules/hackage-packages.nix and mark the two derivations as not broken. (Be sure to also remove the line setting the Hydra platforms as well.)

Note that this shouldn't be done on master, but the released branches don't get updates from Hackage anymore, so it is fine to directly edit those files.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Ok, done then.

@cdepillabout
Copy link
Member

I am not sure if I should pull request this to the 20.03 branch or just wait until the whole stackage version is updated for 20.03

The release branches don't have the Hackage package sets updated automatically, so just targeting the 20.03 release with this PR is fine!

@cdepillabout
Copy link
Member

Builds on x86_64 linux, so looks good to me!

Thanks for fixing this up!

cdepillabout
cdepillabout requested changes Apr 27, 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.

Oh sorry, one more thing. Can you rebase this on the release-20.03 branch instead of nixos-20.03, and change the base branch on github?

The nixos-20.03 branch is just a copy of the 20.03 channel, while release-20.03 is the actual branch that changes go into.

Once you do this, I'll merge this in.

@samuelrivas samuelrivas force-pushed the fix-stylish-haskell-for-20-03 branch from e7a0b53 to dd1f0a1 Compare April 28, 2020 05:12
@samuelrivas samuelrivas changed the base branch from nixos-20.03 to release-20.03 April 28, 2020 05:14
@ofborg ofborg bot requested a review from vanschelven April 28, 2020 05:20
@peti peti merged commit 0602ea9 into NixOS:release-20.03 May 1, 2020
@monadplus
Copy link

monadplus commented May 2, 2020 •
edited

In order to have this fix on my nixos-20.03 channel, should I change the channel to release-20.30 ? @peti

@cdepillabout
Copy link
Member

cdepillabout commented May 3, 2020 •
edited

@monadplus If you go to https://status.nixos.org/, you get some links at the top explaining how channels are updated.

Basically, once Hydra builds most of the derivations from the release-20.03 branch, it updates the nixos-20.03 channel. So the nixos-20.03 channel is normally slightly "lagging behind" the release-20.03 branch. https://status.nixos.org/ shows you just how far it is lagging behind.

If you wait a few days, you should find stylish-haskell on the nixos-20.03 channel, but if you don't want to wait, there are a few ways to install stuff from other channels/repos. Please open an issue on here (or somewhere like stackoverflow / NixOS discourse) if you can't figure this out.

@monadplus
Copy link

monadplus commented May 3, 2020 •
edited

@cdepillabout Thanks for taking your time to explain this to me.

If you wait a few days, you should find stylish-haskell on the nixos-20.03 channel, but if you don't want to wait, there are a few ways to install stuff from other channels/repos. Please open an issue on here (or somewhere like stackoverflow / NixOS discourse) if you can't figure this out.

I have fixed it on my local nix so everything is cool, thanks again!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@cdepillabout cdepillabout cdepillabout requested changes

@basvandijk basvandijk Awaiting requested review from basvandijk

@infinisil infinisil Awaiting requested review from infinisil infinisil is a code owner

@FRidh FRidh Awaiting requested review from FRidh

@jonringer jonringer Awaiting requested review from jonringer

@peti peti Awaiting requested review from peti

@vanschelven vanschelven Awaiting requested review from vanschelven

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

Successfully merging this pull request may close these issues.

None yet
4 participants
@samuelrivas @cdepillabout @monadplus @peti