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: 59670b0c561a
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 2913973aa7b8
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Jan 4, 2020

  1. nixos/gnunet: Add types to the options

    Louis Bettens committed Jan 4, 2020
    Copy the full SHA
    d497378 View commit details

Commits on Jan 9, 2020

  1. Merge pull request #76938 from lourkeur/fix_76184_gnunet 

    nixos/gnunet: Add types to the options
    @markuskowa
    markuskowa authored Jan 9, 2020
    Copy the full SHA
    2913973 View commit details
Showing with 8 additions and 0 deletions.
  1. +8 −0 nixos/modules/services/networking/gnunet.nix
8 changes: 8 additions & 0 deletions nixos/modules/services/networking/gnunet.nix
View file
Original file line number Diff line number Diff line change
@@ -42,6 +42,7 @@ in
services.gnunet = {

enable = mkOption {
type = types.bool;
default = false;
description = ''
Whether to run the GNUnet daemon. GNUnet is GNU's anonymous
@@ -51,6 +52,7 @@ in

fileSharing = {
quota = mkOption {
type = types.int;
default = 1024;
description = ''
Maximum file system usage (in MiB) for file sharing.
@@ -60,6 +62,7 @@ in

udp = {
port = mkOption {
type = types.port;
default = 2086; # assigned by IANA
description = ''
The UDP port for use by GNUnet.
@@ -69,6 +72,7 @@ in

tcp = {
port = mkOption {
type = types.port;
default = 2086; # assigned by IANA
description = ''
The TCP port for use by GNUnet.
@@ -78,6 +82,7 @@ in

load = {
maxNetDownBandwidth = mkOption {
type = types.int;
default = 50000;
description = ''
Maximum bandwidth usage (in bits per second) for GNUnet
@@ -86,6 +91,7 @@ in
};

maxNetUpBandwidth = mkOption {
type = types.int;
default = 50000;
description = ''
Maximum bandwidth usage (in bits per second) for GNUnet
@@ -94,6 +100,7 @@ in
};

hardNetUpBandwidth = mkOption {
type = types.int;
default = 0;
description = ''
Hard bandwidth limit (in bits per second) when uploading
@@ -111,6 +118,7 @@ in
};

extraOptions = mkOption {
type = types.lines;
default = "";
description = ''
Additional options that will be copied verbatim in `gnunet.conf'.