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

wpa_supplicant: copy sample config into output #50038

Merged
merged 2 commits into from Nov 23, 2018
Merged

wpa_supplicant: copy sample config into output #50038

merged 2 commits into from Nov 23, 2018

Conversation

lheckemann
Copy link
Member

Motivation for this change

The manpage is useless.

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)
  • Fits CONTRIBUTING.md.

@lheckemann
Copy link
Member Author

cc @hschaeidt

@davidak
Copy link
Member

davidak commented Nov 16, 2018

I'm not sure if the information is really accessible there. Maybe it should be part of some kind of documentation?

@Ma27
Copy link
Member

Ma27 commented Nov 23, 2018

I just skimmed through the exemplary wpa_supplicant.conf and I'm not sure if we really want the entire configuration as default as it defines several example networks to show how to configure Wifi networks.

In case there's a use-case when you need some of the defaults I'd vote for patching this file and commenting out everything except the most sensitive values you may want to have as default :)

@lheckemann
Copy link
Member Author

not really sure if we really want the entire configuration as default

Yes, this wouldn't actually make it default. But that is indeed a bit incongruous with the path, so I'll move it to share/doc.

@lheckemann
Copy link
Member Author

@davidak

Maybe it should be part of some kind of documentation?

It's mentioned in the manpage for wpa_supplicant.conf:

See the example configuration file, probably in /usr/share/doc/wpa_supplicant/, for detailed information about the configuration format and supported fields.

I suppose maybe we should patch this to have the store path.

@lheckemann
wpa_supplicant: improve manpage
83e93f2 
Now points to the store path of the sample config rather than
/usr/share/doc.
@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: wpa_supplicant

Partial log (click to expand)


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

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

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: wpa_supplicant

Partial log (click to expand)

shrinking /nix/store/5i0qw5sbz4m50dv5bv0qviravbg4xlaj-wpa_supplicant-2.6/sbin/wpa_passphrase
shrinking /nix/store/5i0qw5sbz4m50dv5bv0qviravbg4xlaj-wpa_supplicant-2.6/sbin/wpa_cli
shrinking /nix/store/5i0qw5sbz4m50dv5bv0qviravbg4xlaj-wpa_supplicant-2.6/sbin/wpa_supplicant
gzipping man pages under /nix/store/5i0qw5sbz4m50dv5bv0qviravbg4xlaj-wpa_supplicant-2.6/share/man/
strip is /nix/store/6dpnd5aniypn8124mmy8f88s4mq2zl07-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/5i0qw5sbz4m50dv5bv0qviravbg4xlaj-wpa_supplicant-2.6/sbin
patching script interpreter paths in /nix/store/5i0qw5sbz4m50dv5bv0qviravbg4xlaj-wpa_supplicant-2.6
checking for references to /build in /nix/store/5i0qw5sbz4m50dv5bv0qviravbg4xlaj-wpa_supplicant-2.6...
moving /nix/store/5i0qw5sbz4m50dv5bv0qviravbg4xlaj-wpa_supplicant-2.6/sbin/* to /nix/store/5i0qw5sbz4m50dv5bv0qviravbg4xlaj-wpa_supplicant-2.6/bin
/nix/store/5i0qw5sbz4m50dv5bv0qviravbg4xlaj-wpa_supplicant-2.6

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: wpa_supplicant

Partial log (click to expand)

shrinking /nix/store/rkys8p9jqvvyi78vbmrwp4q5ajjwnjas-wpa_supplicant-2.6/sbin/wpa_cli
shrinking /nix/store/rkys8p9jqvvyi78vbmrwp4q5ajjwnjas-wpa_supplicant-2.6/sbin/wpa_supplicant
shrinking /nix/store/rkys8p9jqvvyi78vbmrwp4q5ajjwnjas-wpa_supplicant-2.6/sbin/wpa_passphrase
gzipping man pages under /nix/store/rkys8p9jqvvyi78vbmrwp4q5ajjwnjas-wpa_supplicant-2.6/share/man/
strip is /nix/store/rpbg8gmqxhz8g61p1plz5d2srs84pvmv-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/rkys8p9jqvvyi78vbmrwp4q5ajjwnjas-wpa_supplicant-2.6/sbin
patching script interpreter paths in /nix/store/rkys8p9jqvvyi78vbmrwp4q5ajjwnjas-wpa_supplicant-2.6
checking for references to /build in /nix/store/rkys8p9jqvvyi78vbmrwp4q5ajjwnjas-wpa_supplicant-2.6...
moving /nix/store/rkys8p9jqvvyi78vbmrwp4q5ajjwnjas-wpa_supplicant-2.6/sbin/* to /nix/store/rkys8p9jqvvyi78vbmrwp4q5ajjwnjas-wpa_supplicant-2.6/bin
/nix/store/rkys8p9jqvvyi78vbmrwp4q5ajjwnjas-wpa_supplicant-2.6

@lheckemann
Copy link
Member Author

When do we get nixos tests for wpa_supplicant with a physics simulation? :D

@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: wpa_supplicant

Partial log (click to expand)


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

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

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: wpa_supplicant

Partial log (click to expand)

shrinking /nix/store/av03w63p5zzgxawgmq9pm9idn6wvrwfz-wpa_supplicant-2.6/sbin/wpa_passphrase
shrinking /nix/store/av03w63p5zzgxawgmq9pm9idn6wvrwfz-wpa_supplicant-2.6/sbin/wpa_cli
shrinking /nix/store/av03w63p5zzgxawgmq9pm9idn6wvrwfz-wpa_supplicant-2.6/sbin/wpa_supplicant
gzipping man pages under /nix/store/av03w63p5zzgxawgmq9pm9idn6wvrwfz-wpa_supplicant-2.6/share/man/
strip is /nix/store/6dpnd5aniypn8124mmy8f88s4mq2zl07-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/av03w63p5zzgxawgmq9pm9idn6wvrwfz-wpa_supplicant-2.6/sbin
patching script interpreter paths in /nix/store/av03w63p5zzgxawgmq9pm9idn6wvrwfz-wpa_supplicant-2.6
checking for references to /build in /nix/store/av03w63p5zzgxawgmq9pm9idn6wvrwfz-wpa_supplicant-2.6...
moving /nix/store/av03w63p5zzgxawgmq9pm9idn6wvrwfz-wpa_supplicant-2.6/sbin/* to /nix/store/av03w63p5zzgxawgmq9pm9idn6wvrwfz-wpa_supplicant-2.6/bin
/nix/store/av03w63p5zzgxawgmq9pm9idn6wvrwfz-wpa_supplicant-2.6

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: wpa_supplicant

Partial log (click to expand)

shrinking /nix/store/j32pv9xwbpf2aa49504h6l10vqj91zn3-wpa_supplicant-2.6/sbin/wpa_cli
shrinking /nix/store/j32pv9xwbpf2aa49504h6l10vqj91zn3-wpa_supplicant-2.6/sbin/wpa_supplicant
shrinking /nix/store/j32pv9xwbpf2aa49504h6l10vqj91zn3-wpa_supplicant-2.6/sbin/wpa_passphrase
gzipping man pages under /nix/store/j32pv9xwbpf2aa49504h6l10vqj91zn3-wpa_supplicant-2.6/share/man/
strip is /nix/store/rpbg8gmqxhz8g61p1plz5d2srs84pvmv-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/j32pv9xwbpf2aa49504h6l10vqj91zn3-wpa_supplicant-2.6/sbin
patching script interpreter paths in /nix/store/j32pv9xwbpf2aa49504h6l10vqj91zn3-wpa_supplicant-2.6
checking for references to /build in /nix/store/j32pv9xwbpf2aa49504h6l10vqj91zn3-wpa_supplicant-2.6...
moving /nix/store/j32pv9xwbpf2aa49504h6l10vqj91zn3-wpa_supplicant-2.6/sbin/* to /nix/store/j32pv9xwbpf2aa49504h6l10vqj91zn3-wpa_supplicant-2.6/bin
/nix/store/j32pv9xwbpf2aa49504h6l10vqj91zn3-wpa_supplicant-2.6

@globin globin merged commit 6845ebb into NixOS:master Nov 23, 2018
@globin globin deleted the wpa-sample branch November 23, 2018 17:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
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
5 participants
@lheckemann @davidak @Ma27 @GrahamcOfBorg @globin