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

compactor: init at 0.11.0 #37680

Merged
merged 3 commits into from Mar 28, 2018
Merged

compactor: init at 0.11.0 #37680

merged 3 commits into from Mar 28, 2018

Conversation

fdns
Copy link
Contributor

@fdns fdns commented Mar 23, 2018

Motivation for this change

Adding compactor, a DNS traffic capturer

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-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/)
  • Fits CONTRIBUTING.md.

@7c6f434c
Copy link
Member

@GrahamcOfBorg build compactor

@GrahamcOfBorg
Copy link

No attempt on x86_64-darwin (full log)

The following builds were skipped because they don't evaluate on x86_64-darwin: compactor

Partial log (click to expand)


a) For `nixos-rebuild` you can set
  { nixpkgs.config.allowBroken = true; }
in configuration.nix to override this.

b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
  { allowBroken = true; }
to ~/.config/nixpkgs/config.nix.

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: compactor

Partial log (click to expand)

make[1]: Leaving directory '/build/source'
post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/pxapak96772vc2m5qmlfmzs2chz33fzm-compactor-0.11.0
shrinking /nix/store/pxapak96772vc2m5qmlfmzs2chz33fzm-compactor-0.11.0/bin/inspector
shrinking /nix/store/pxapak96772vc2m5qmlfmzs2chz33fzm-compactor-0.11.0/bin/compactor
strip is /nix/store/3zq400fri5dv7d30lpxlqm2v9y1iis6j-binutils-2.28.1/bin/strip
stripping (with command strip and flags -S) in /nix/store/pxapak96772vc2m5qmlfmzs2chz33fzm-compactor-0.11.0/bin
patching script interpreter paths in /nix/store/pxapak96772vc2m5qmlfmzs2chz33fzm-compactor-0.11.0
checking for references to /build in /nix/store/pxapak96772vc2m5qmlfmzs2chz33fzm-compactor-0.11.0...
/nix/store/pxapak96772vc2m5qmlfmzs2chz33fzm-compactor-0.11.0

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: compactor

Partial log (click to expand)

make[1]: Leaving directory '/build/source'
post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/1zsj1bmb65slsiknbki6k8ybvx8rd7mk-compactor-0.11.0
shrinking /nix/store/1zsj1bmb65slsiknbki6k8ybvx8rd7mk-compactor-0.11.0/bin/compactor
shrinking /nix/store/1zsj1bmb65slsiknbki6k8ybvx8rd7mk-compactor-0.11.0/bin/inspector
strip is /nix/store/fzcs0fn6bb04m82frhlb78nc03ny3w55-binutils-2.28.1/bin/strip
stripping (with command strip and flags -S) in /nix/store/1zsj1bmb65slsiknbki6k8ybvx8rd7mk-compactor-0.11.0/bin
patching script interpreter paths in /nix/store/1zsj1bmb65slsiknbki6k8ybvx8rd7mk-compactor-0.11.0
checking for references to /build in /nix/store/1zsj1bmb65slsiknbki6k8ybvx8rd7mk-compactor-0.11.0...
/nix/store/1zsj1bmb65slsiknbki6k8ybvx8rd7mk-compactor-0.11.0

@7c6f434c
Copy link
Member

@zimbatm This is the bundlerEnv used as expected, right?

@fdns
Copy link
Contributor Author

fdns commented Mar 25, 2018

As a quick note, I used bundix to generate cbor-diag and cddl. I based them on other tools already in nixpkgs like https://github.com/NixOS/nixpkgs/blob/3ed5af74a5a07e7d38588acbaa02bf921112c068/pkgs/development/tools/cucumber/default.nix

zimbatm
zimbatm reviewed Mar 25, 2018
View reviewed changes
pkgs/development/tools/cddl/default.nix Outdated

bundlerEnv rec {
name = "cddl-${version}";
version = (import gemset).cddl.version;
Copy link
Member

Choose a reason for hiding this comment

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

using pname = "cddl" should be enough

zimbatm
zimbatm reviewed Mar 25, 2018
View reviewed changes
pkgs/development/tools/cddl/default.nix Outdated
@@ -0,0 +1,18 @@
{ lib, bundlerEnv, ruby }:

bundlerEnv rec {
Copy link
Member

Choose a reason for hiding this comment

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

this should be a bundlerApp if it just exports a bin

Copy link
Member

Choose a reason for hiding this comment

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

@fdns is it used just for the command in bin?

@zimbatm
Copy link
Member

zimbatm commented Mar 25, 2018

@7c6f434c the general rule is that a bundlerEnv is permeable and use to expose libraries to the app. A bundlerApp is sealed and used to expose binaries to the user.

@fdns
Copy link
Contributor Author

fdns commented Mar 27, 2018 via email •
edited

@fdns
Copy link
Contributor Author

fdns commented Mar 28, 2018

I changed the bundlerEnv to bundlerApp to seal the binaries. I also tested again and all checks are passing.

@7c6f434c 7c6f434c merged commit df5f67d into NixOS:master Mar 28, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@zimbatm zimbatm zimbatm left review comments

@7c6f434c 7c6f434c 7c6f434c approved these changes

Assignees
No one assigned
Labels
8.has: package (new) 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
4 participants
@fdns @7c6f434c @GrahamcOfBorg @zimbatm