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

termonad: fix pcre dependency #70833

Closed
wants to merge 4 commits into from
Closed

termonad: fix pcre dependency #70833

wants to merge 4 commits into from
+255 −107

Conversation

mdorman
Copy link
Contributor

@mdorman mdorman commented Oct 9, 2019

Motivation for this change

Fix currently broken build

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 @peti

Sorry, something went wrong.

peti and others added 4 commits October 8, 2019 02:30
@peti
hackage-packages.nix: automatic Haskell package set update
311945c 
This update was generated by hackage2nix v2.15.0-2-ge15d08c from Hackage revision
commercialhaskell/all-cabal-hashes@0667bdb.
@luke-clifton @cdepillabout @peti
haskellPackages: fix barbly (NixOS#70222)
be8f006 
* haskellPackages: fix barbly

Co-Authored-By: Dennis Gosnell <cdep.illabout@gmail.com>
@peti
hackage-packages.nix: automatic Haskell package set update
0354e2d 
This update was generated by hackage2nix v2.15.0-2-ge15d08c from Hackage revision
commercialhaskell/all-cabal-hashes@cb92be9.
@mdorman
termonad: fix pcre dependency
4724782
@mdorman mdorman requested a review from basvandijk as a code owner October 9, 2019 06:37
@samdoshi
Copy link
Contributor

samdoshi commented Oct 9, 2019 •
edited
Loading

Tested with nix-review pr 70833 on NixOS.

Have run haskellPackages.termonad/bin/termonad and termonad-with-packages/bin/termonad

jonringer
jonringer approved these changes Oct 9, 2019
View reviewed changes
Copy link
Contributor

@jonringer jonringer left a comment

Choose a reason for hiding this comment

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

nix-review passes on NixOS
diff LGTM (don't package haskell much)
fixes broken build

[4 built, 308 copied (3028.9 MiB), 165.2 MiB DL]
https://github.com/NixOS/nixpkgs/pull/70833
2 package were build:
haskellPackages.termonad termonad-with-packages

cc @peti for haskell input

@jonringer
Copy link
Contributor

@GrahamcOfBorg build haskellPackages.termonad termonad-with-packages

cdepillabout
cdepillabout approved these changes Oct 10, 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.

This looks good to me.

@mdorman Thanks for this fix.

Thanks everyone else for the quick reviews.

An alternative fix for this would be to send a PR to cabal2nix teaching it about the libpcre2 library:

https://github.com/NixOS/cabal2nix/blob/5325ccdedb0604d71aac2213fa0d2d018ef02e07/src/Distribution/Nixpkgs/Haskell/FromCabal/Name.hs#L16-L26

(I think this is the correct place, although there might be another list for pkg-config dependencies...)

@peti peti force-pushed the haskell-updates branch 2 times, most recently from c8bddf3 to 81082c7 Compare October 10, 2019 17:42
@cdepillabout
Copy link
Member

@peti Thanks for NixOS/cabal2nix@e60526d. In the future, I'll try to recommend people send these kinds of update to cabal2nix instead of fixing it here in nixpkgs.

@peti
Copy link
Member

peti commented Oct 10, 2019

I made the necessary changes in cabal2nix. Thanks for pointing out that this mapping was missing. :-)

@mdorman mdorman deleted the termonad-fix branch December 20, 2019 14:40
Profpatsch pushed a commit to Profpatsch/cabal2nix that referenced this pull request Mar 7, 2022
@peti @Profpatsch
Add name mapping for libpcre2 to pcre2.
1c21366 
Fixes NixOS/nixpkgs#70833.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@cdepillabout cdepillabout

@jonringer jonringer

@basvandijk basvandijk

Assignees
No one assigned
Labels
6.topic: haskell 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
6 participants
@mdorman @samdoshi @jonringer @cdepillabout @peti @luke-clifton