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

haskellPackages.splot: fix build #93557

Merged

Conversation

basvandijk
Copy link
Member

@basvandijk basvandijk commented Jul 20, 2020

Motivation for this change

I needed a working version of the old Haskell-based splot tool.

Also introduce the top-level splot package which only provides the statically linked splot binary.

Things done

This commit fixes the splot haskell package and also introduces the top-level splot package which only provides the statically linked splot binary.

  • 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.

@basvandijk
Copy link
Member Author

@GrahamcOfBorg build splot

@@ -1391,4 +1391,9 @@ self: super: {
gi-soup = doJailbreak super.gi-soup;
gi-webkit2 = doJailbreak super.gi-webkit2;

# Upstream PR: https://github.com/jkff/splot/pull/9
splot = appendPatch (unmarkBroken super.splot) (pkgs.fetchpatch {
Copy link
Member

Choose a reason for hiding this comment

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

@basvandijk Thanks for trying to fix this up.

However, instead of using unmarkBroken here, can you rebase this change on the haskell-updates branch, and remove splot from the list of broken-packages in configuration-hackage2nix.yaml?

Copy link
Member Author

Choose a reason for hiding this comment

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

Sure thing.

Copy link
Member Author

Choose a reason for hiding this comment

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

@basvandijk basvandijk changed the base branch from master to haskell-updates July 22, 2020 06:49
Also introduce the top-level `splot` package which only provides the
statically linked `splot` binary.
@cdepillabout
Copy link
Member

Builds for me, thanks!

@cdepillabout cdepillabout merged commit c42ddea into NixOS:haskell-updates Jul 22, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants