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.hakyll: fix build on release-19.09 #70936

Merged
merged 1 commit into from
Oct 13, 2019
Merged

haskellPackages.hakyll: fix build on release-19.09 #70936

merged 1 commit into from
Oct 13, 2019
+4 −12

Conversation

erictapen
Copy link
Member

Motivation for this change

hakyll is still broken on nixos-19.09, as #69095 was not backported.

Things done

I removed the outdated patch and also edited hackage-packages.nix to bump the package and unbreak it. The update is the same that was applied in 0d67be0#diff-e4ed6fefa9564bfd27ee249e42e145e2R104785 to master. I know that I shouldn't edit it on haskell-updates, but as this branch won't see an hackage update, I think it's fine?

@GrahamcOfBorg build haskellPackages.hakyll

  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • 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 nix-review --run "nix-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.
Notify maintainers

cc @

Sorry, something went wrong.

@erictapen erictapen requested a review from basvandijk as a code owner October 10, 2019 21:58
@ofborg ofborg bot added 6.topic: haskell 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux labels Oct 10, 2019
@erictapen
Copy link
Member Author

@GrahamcOfBorg build haskellPackages.hakyll

@cdepillabout
Copy link
Member

@erictapen Thanks for this fix.

Like you say, hackage-packages.nix shouldn't be edited on the master or haskell-updates branches. But I'm not sure what the policy is for the release branches.

Maybe @peti could help us out and let us know how the hackage-packages.nix file is managed on the release branches?

@erictapen erictapen force-pushed the hakyll-4.13.0.1-release-19.09 branch from 0da89b3 to 6592882 Compare October 11, 2019 15:41
@erictapen
hakyll: fix build on nixos-19.09

Verified

This commit was signed with the committer’s verified signature. The key has expired.
erictapen Kerstin
GPG key ID: 5F24E3BD56617EB2
Expired
Verified
Learn about vigilant mode
f360d67 
This essentially repeats steps already done on nixos-unstable:
- update to 4.13.0.1
- remove outdatet patch
- unmark as broken
@erictapen erictapen force-pushed the hakyll-4.13.0.1-release-19.09 branch from 6592882 to f360d67 Compare October 11, 2019 15:43
@ofborg ofborg bot added 8.has: package (new) This PR adds a new package 10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10 and removed 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux labels Oct 11, 2019
@peti
Copy link
Member

peti commented Oct 13, 2019

let us know how the hackage-packages.nix file is managed on the release branches?

On the release branches, no automatic updates takes place, so it's fine to edit the file manually. I do think it's a good idea to make the necessary changes in configuration-hackage2nix.yaml too -- like this PR does -- so that we still can re-generate the file if we ever want to.

@peti peti merged commit 4774920 into NixOS:release-19.09 Oct 13, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@cdepillabout cdepillabout

@basvandijk basvandijk

Assignees
No one assigned
Labels
6.topic: haskell 8.has: package (new) This PR adds a new package 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
3 participants
@erictapen @cdepillabout @peti