Skip to content

nixos/tsocks: Add types to the options #76939

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

Merged
merged 1 commit into from
Jan 9, 2020

Conversation

bbjubjub2494
Copy link
Member

Motivation for this change

In response to #76184.

Things done

Type-infer the options, trying to be most reasonable.
enable is treated as a boolean in the code.
server has to be a string and it doesn't make sense to merge multiple values.
config is text. Oddly enough the existing code causes a merge with any user-selected value under the deprecated types.string rules. I decided types.lines was a safe enough replacement since blank lines aren't significant in the tsocks.conf format.

  • 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) don't think there are any
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip" inapplicable
  • Tested execution of all binary files (usually in ./result/bin/) inapplicable
  • Determined the impact on package closure size (by running nix path-info -S before and after) inapplicable
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.
Notify maintainers

unclear: Module is deprecated and abandonned.

Sorry, something went wrong.

@ofborg ofborg bot added 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux labels Jan 4, 2020

Verified

This commit was signed with the committer’s verified signature.
jtojnar Jan Tojnar
@markuskowa markuskowa merged commit 59670b0 into NixOS:master Jan 9, 2020
@bbjubjub2494 bbjubjub2494 deleted the fix_76184_tsocks branch March 29, 2022 21:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants