From 7314b1949aae9dc0ebf6105b2329bf1bb3161d51 Mon Sep 17 00:00:00 2001 From: Dmitry Moskowski Date: Fri, 19 Jan 2018 20:18:03 +0000 Subject: [PATCH 1/2] i2pd: 2.15.0 -> 2.17.0 --- pkgs/tools/networking/i2pd/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/networking/i2pd/default.nix b/pkgs/tools/networking/i2pd/default.nix index 66057e5c76e7..f736ca089bf9 100644 --- a/pkgs/tools/networking/i2pd/default.nix +++ b/pkgs/tools/networking/i2pd/default.nix @@ -1,19 +1,19 @@ -{ stdenv, fetchFromGitHub, fetchpatch, boost, zlib, openssl }: +{ stdenv, fetchFromGitHub, fetchpatch, boost165, zlib, openssl }: stdenv.mkDerivation rec { name = pname + "-" + version; pname = "i2pd"; - version = "2.15.0"; + version = "2.17.0"; src = fetchFromGitHub { owner = "PurpleI2P"; repo = pname; rev = version; - sha256 = "02nyk76q2ag0495ph62i0jij27nxpy6qvryjp25wah8f69k7bgfs"; + sha256 = "1yl5h7mls50vkg7x5510mljmgsm02arqhcanwkrqw4ilwvcp1mgz"; }; - buildInputs = [ boost zlib openssl ]; + buildInputs = [ boost165 zlib openssl ]; makeFlags = [ "USE_AESNI=no" "USE_AVX=no" ]; installPhase = '' From b45a117bd37204f6a6307907bbe7c94f0eb70f35 Mon Sep 17 00:00:00 2001 From: Dmitry Moskowski Date: Fri, 19 Jan 2018 23:47:00 +0000 Subject: [PATCH 2/2] i2pd: override boost derivation on the top-level --- pkgs/tools/networking/i2pd/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/i2pd/default.nix b/pkgs/tools/networking/i2pd/default.nix index f736ca089bf9..251268b6f304 100644 --- a/pkgs/tools/networking/i2pd/default.nix +++ b/pkgs/tools/networking/i2pd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, boost165, zlib, openssl }: +{ stdenv, fetchFromGitHub, fetchpatch, boost, zlib, openssl }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "1yl5h7mls50vkg7x5510mljmgsm02arqhcanwkrqw4ilwvcp1mgz"; }; - buildInputs = [ boost165 zlib openssl ]; + buildInputs = [ boost zlib openssl ]; makeFlags = [ "USE_AESNI=no" "USE_AVX=no" ]; installPhase = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 788d40747fd5..efb144813e3a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2737,7 +2737,9 @@ with pkgs; i2p = callPackage ../tools/networking/i2p {}; - i2pd = callPackage ../tools/networking/i2pd {}; + i2pd = callPackage ../tools/networking/i2pd { + boost = boost165; + }; i-score = libsForQt5.callPackage ../applications/audio/i-score { };