Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 3ad520626308
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 59670b0c561a
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Jan 4, 2020

  1. nixos/tsocks: Add types to the options

    Louis Bettens committed Jan 4, 2020

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Learn about vigilant mode
    Copy the full SHA
    caa9ce1 View commit details

Commits on Jan 9, 2020

  1. Merge pull request #76939 from lourkeur/fix_76184_tsocks 

    nixos/tsocks: Add types to the options
    @markuskowa
    markuskowa authored Jan 9, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    Ma27 Maximilian Bosch
    GPG key ID: 091DBF4D1FC46B8E
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    59670b0 View commit details
Showing with 3 additions and 0 deletions.
  1. +3 −0 nixos/modules/services/security/torify.nix
3 changes: 3 additions & 0 deletions nixos/modules/services/security/torify.nix
View file
Original file line number Diff line number Diff line change
@@ -25,6 +25,7 @@ in
services.tor.tsocks = {

enable = mkOption {
type = types.bool;
default = false;
description = ''
Whether to build tsocks wrapper script to relay application traffic via Tor.
@@ -40,6 +41,7 @@ in
};

server = mkOption {
type = types.str;
default = "localhost:9050";
example = "192.168.0.20";
description = ''
@@ -48,6 +50,7 @@ in
};

config = mkOption {
type = types.lines;
default = "";
description = ''
Extra configuration. Contents will be added verbatim to TSocks