From 88dae1a1c8e37029dd678f901962d1588a2ed39b Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Sun, 11 Feb 2018 10:25:38 +0900 Subject: [PATCH] protocol: module to application protocol really is a "buildPythonApplication" rather than a buildPythonPackage". --- .../networking}/protocol/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 2 ++ pkgs/top-level/python-packages.nix | 2 -- 3 files changed, 4 insertions(+), 4 deletions(-) rename pkgs/{development/python-modules => applications/networking}/protocol/default.nix (85%) diff --git a/pkgs/development/python-modules/protocol/default.nix b/pkgs/applications/networking/protocol/default.nix similarity index 85% rename from pkgs/development/python-modules/protocol/default.nix rename to pkgs/applications/networking/protocol/default.nix index f8ff177437c..305aceec62b 100644 --- a/pkgs/development/python-modules/protocol/default.nix +++ b/pkgs/applications/networking/protocol/default.nix @@ -1,6 +1,6 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub }: +{ stdenv, buildPythonApplication, fetchFromGitHub }: -buildPythonPackage rec { +buildPythonApplication rec { pname = "protocol"; version = "20171226"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 55b51326859..a05fe8b759b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20118,6 +20118,8 @@ with pkgs; pt = callPackage ../applications/misc/pt { }; + protocol = python3Packages.callPackage ../applications/networking/protocol { }; + pykms = callPackage ../tools/networking/pykms { }; pyload = callPackage ../applications/networking/pyload {}; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5608cd85ef2..4fd50fc053c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -20998,8 +20998,6 @@ EOF trezor = callPackage ../development/python-modules/trezor { }; - protocol = callPackage ../development/python-modules/protocol { }; - trezor_agent = buildPythonPackage rec{ name = "${pname}-${version}"; pname = "trezor_agent";