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

universum 1.6.0 is no longer broken #71094

Merged
merged 2 commits into from
Oct 18, 2019
Merged

universum 1.6.0 is no longer broken #71094

merged 2 commits into from
Oct 18, 2019
+4 −1

Conversation

serhiip
Copy link
Contributor

@serhiip serhiip commented Oct 13, 2019

Motivation for this change

I tried to build my project using Nixpkgs. Got an error saying package is broken. Followed this tutorial https://youtu.be/KLhkAEk8I20. Managed to build locally the newer version of the library

Things done
  • 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 @gromakovsky

Sorry, something went wrong.

@serhiip serhiip requested a review from basvandijk as a code owner October 13, 2019 21:28
@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 13, 2019
cdepillabout
cdepillabout requested changes Oct 14, 2019
View reviewed changes
Copy link
Member

@cdepillabout cdepillabout left a comment •
edited
Loading

Choose a reason for hiding this comment

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

@serhiip Thanks for fixing universum!

I made two suggestions above. After you make those two corrections, we should be able to get this merged.

Also, I've tested that universum-1.5.0 does actually compile (other than the broken doctests).

edit: Oh yeah, also it looks like there is a merge conflict in pkgs/development/haskell-modules/configuration-common.nix. Can you rebase this PR back on the top of the haskell-updates branch?

@ofborg ofborg bot added 2.status: merge conflict This PR has merge conflicts with the target branch and removed 2.status: merge conflict This PR has merge conflicts with the target branch labels Oct 14, 2019
@serhiip serhiip closed this Oct 14, 2019
@serhiip serhiip reopened this Oct 14, 2019
@serhiip
Copy link
Contributor Author

serhiip commented Oct 14, 2019

Accidentally closed the PR - now reopened and fixed outlined issues. Thanks for review and let me know if anything else should be changed

@ofborg ofborg bot added 6.topic: haskell and removed 6.topic: haskell 2.status: merge conflict This PR has merge conflicts with the target branch labels Oct 14, 2019
@grahamc
Copy link
Member

grahamc commented Oct 14, 2019

@ofborg build universum

@cdepillabout
Copy link
Member

@serhiip Thanks for fixing this up.

@peti This should be ready to be merged. I've confirmed that universum-1.5.0 successfully builds locally.

@peti peti merged this pull request into NixOS:haskell-updates Oct 18, 2019
@serhiip serhiip deleted the haskell-updates branch October 18, 2019 21:23
@Janik-Haag Janik-Haag added the 12. first-time contribution This PR is the author's first one; please be gentle! label Jun 12, 2023
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 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 12. first-time contribution This PR is the author's first one; please be gentle!
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@serhiip @grahamc @cdepillabout @peti @Janik-Haag