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: f16a9f694e97
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 01ef91aa045b
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Jun 2, 2017

  1. i2pd: correct docs about bandwidth setting

    @zetok @edwtjo
    zetok authored and edwtjo committed Jun 2, 2017

    Verified

    This commit was signed with the committer’s verified signature.
    edwtjo Edward Tjörnhammar
    GPG key ID: 7B82CE4A866B6845
    Verified
    Learn about vigilant mode
    Copy the full SHA
    92b923b View commit details

  2. i2pd: 2.13.0 -> 2.14.0

    @edwtjo
    edwtjo committed Jun 2, 2017

    Verified

    This commit was signed with the committer’s verified signature.
    edwtjo Edward Tjörnhammar
    GPG key ID: 7B82CE4A866B6845
    Verified
    Learn about vigilant mode
    Copy the full SHA
    01ef91a View commit details
Showing with 4 additions and 3 deletions.
  1. +2 −1 nixos/modules/services/networking/i2pd.nix
  2. +2 −2 pkgs/tools/networking/i2pd/default.nix
3 changes: 2 additions & 1 deletion nixos/modules/services/networking/i2pd.nix
View file
Original file line number Diff line number Diff line change
@@ -212,7 +212,8 @@ in
type = with types; nullOr int;
default = null;
description = ''
Set a router bandwidth limit integer in kbps or letters: L (32), O (256), P (2048), X (>9000)
Set a router bandwidth limit integer in KBps.
If not set, i2pd defaults to 32KBps.
'';
};

4 changes: 2 additions & 2 deletions pkgs/tools/networking/i2pd/default.nix
View file
Original file line number Diff line number Diff line change
@@ -4,13 +4,13 @@ stdenv.mkDerivation rec {

name = pname + "-" + version;
pname = "i2pd";
version = "2.13.0";
version = "2.14.0";

src = fetchFromGitHub {
owner = "PurpleI2P";
repo = pname;
rev = version;
sha256 = "1gz8jmy2vq520w642jiff1zg4qpgpm2qkad5dgrq9f14ri14lkpp";
sha256 = "1nlnzvb4n351zwg4vd15qjmm8xvbmn2350vfnd249q06va62fqjk";
};

buildInputs = [ boost zlib openssl ];