From 34dbc6c01cc0adb64f2e825032ba63e8670c113b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sun, 29 Oct 2017 14:42:50 +0100 Subject: [PATCH] pythonPackages.dpkt: move to python-modules/ --- .../python-modules/dpkt/default.nix | 22 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 21 +----------------- 2 files changed, 23 insertions(+), 20 deletions(-) create mode 100644 pkgs/development/python-modules/dpkt/default.nix diff --git a/pkgs/development/python-modules/dpkt/default.nix b/pkgs/development/python-modules/dpkt/default.nix new file mode 100644 index 000000000000..87b5bd6b8128 --- /dev/null +++ b/pkgs/development/python-modules/dpkt/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchurl, buildPythonPackage, isPy3k }: + +buildPythonPackage rec { + name = "dpkt-1.8"; + disabled = isPy3k; + + src = fetchurl { + url = "https://dpkt.googlecode.com/files/${name}.tar.gz"; + sha256 = "01q5prynymaqyfsfi2296xncicdpid2hs3yyasim8iigvkwy4vf5"; + }; + + # error: invalid command 'test' + doCheck = false; + + meta = with stdenv.lib; { + description = "Fast, simple packet creation / parsing, with definitions for the basic TCP/IP protocols"; + homepage = https://code.google.com/p/dpkt/; + license = licenses.bsd3; + maintainers = with maintainers; [ bjornfor ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index bfaae8485a38..02b4239349c3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4906,26 +4906,7 @@ in { }; }; - dpkt = buildPythonPackage rec { - name = "dpkt-1.8"; - disabled = isPy3k; - - src = pkgs.fetchurl { - url = "https://dpkt.googlecode.com/files/${name}.tar.gz"; - sha256 = "01q5prynymaqyfsfi2296xncicdpid2hs3yyasim8iigvkwy4vf5"; - }; - - # error: invalid command 'test' - doCheck = false; - - meta = { - description = "Fast, simple packet creation / parsing, with definitions for the basic TCP/IP protocols"; - homepage = https://code.google.com/p/dpkt/; - license = licenses.bsd3; - maintainers = with maintainers; [ bjornfor ]; - platforms = platforms.all; - }; - }; + dpkt = callPackage ../development/python-modules/dpkt {}; urllib3 = callPackage ../development/python-modules/urllib3 {};