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

[20.09] fierce: fix build #98579

Merged
merged 1 commit into from Sep 25, 2020
Merged

[20.09] fierce: fix build #98579

merged 1 commit into from Sep 25, 2020

Conversation

risicle
Copy link
Contributor

@risicle risicle commented Sep 23, 2020

Motivation for this change

ZHF: #97479

Backport of #98238

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.

@risicle
fierce: fix build
2e19fee 
because we're playing with its install requirements, add a
pythonImportsCheck to give us a chance to discover brokenness. technically
this isn't a realistic test of end user behaviour as this is really an
application, not a python module, but it seems to have a pretty stable
import name of `fierce`, so it works.

(cherry picked from commit 1aa888b)
@ofborg ofborg bot requested a review from c0bw3b September 23, 2020 20:02
cole-h
cole-h approved these changes Sep 24, 2020
View reviewed changes
Copy link
Member

@cole-h cole-h left a comment

Choose a reason for hiding this comment

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

Diff LGTM and fierce --help displays help info.

[2 built, 15 copied (11.6 MiB), 2.3 MiB DL]
https://github.com/NixOS/nixpkgs/pull/98579
1 package built:
fierce

@risicle risicle merged commit 883b340 into NixOS:release-20.09 Sep 25, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@cole-h cole-h cole-h approved these changes

@c0bw3b c0bw3b Awaiting requested review from c0bw3b

Assignees
No one assigned
Labels
10.rebuild-darwin: 1-10 10.rebuild-darwin: 1 10.rebuild-linux: 1-10 10.rebuild-linux: 1
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@risicle @cole-h