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

Jump to bottom

mpw: point upgrade and minor cleanups #55105

Merged
merged 1 commit into from Mar 18, 2019
Merged

mpw: point upgrade and minor cleanups #55105

merged 1 commit into from Mar 18, 2019

Conversation

peterhoeg
Copy link
Member

Motivation for this change
  • Upstream changed to gitlab
  • Tidy up the build process
  • Package documentation and bash command completion
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 nox --run "nox-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)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@peterhoeg peterhoeg added this to the 19.03 milestone Feb 3, 2019
lheckemann
lheckemann reviewed Feb 18, 2019
View reviewed changes
pkgs/tools/security/mpw/default.nix Outdated
echo ${name} > VERSION
postPatch = ''
rm build
sed -i '5iset(mpw_version ${version})' CMakeLists.txt
Copy link
Member

Choose a reason for hiding this comment

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

Any reason not to do this via a cmake flag (cmakeFlags = ["-Dmpw_version=${version}"])?

Copy link
Member Author

Choose a reason for hiding this comment

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

I believe that was one of the things I tried (I tried many...) before resorting to the ugly sed hack to get things working.

Copy link
Member Author

Choose a reason for hiding this comment

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

You were right @lheckemann - thanks!

@peterhoeg peterhoeg removed this from the 19.03 milestone Mar 18, 2019
@peterhoeg peterhoeg merged commit b0a571b into NixOS:master Mar 18, 2019
@peterhoeg peterhoeg deleted the u/mpw branch March 18, 2019 04:26
@peterhoeg peterhoeg restored the u/mpw branch March 18, 2019 09:46
@peterhoeg peterhoeg deleted the u/mpw branch April 7, 2019 13:18
@peterhoeg peterhoeg restored the u/mpw branch April 8, 2019 03:34
@peterhoeg peterhoeg deleted the u/mpw branch April 8, 2019 11:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lheckemann lheckemann lheckemann left review comments

Assignees
No one assigned
Labels
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
@peterhoeg @lheckemann @GrahamcOfBorg