From 80b1908800768cb22bdf5e2387ce6f5d931af45d Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Tue, 16 Oct 2018 12:42:37 -0400 Subject: [PATCH] pythonPackages.ssdeep: refactor move to python-modules fixed package that was originally broken. --- .../python-modules/ssdeep/default.nix | 33 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 13 +------- 2 files changed, 34 insertions(+), 12 deletions(-) create mode 100644 pkgs/development/python-modules/ssdeep/default.nix diff --git a/pkgs/development/python-modules/ssdeep/default.nix b/pkgs/development/python-modules/ssdeep/default.nix new file mode 100644 index 000000000000..f06138b4c255 --- /dev/null +++ b/pkgs/development/python-modules/ssdeep/default.nix @@ -0,0 +1,33 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, pkgs +, cffi +, six +, pytest +, pytestrunner +}: + +buildPythonPackage rec { + pname = "ssdeep"; + version = "3.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "255de1f034652b3ed21920221017e70e570b1644f9436fea120ae416175f4ef5"; + }; + + buildInputs = [ pkgs.ssdeep pytestrunner ]; + checkInputs = [ pytest ]; + propagatedBuildInputs = [ cffi six ]; + + # tests repository does not include required files + doCheck = false; + + meta = with stdenv.lib; { + homepage = http://github.com/DinoTools/python-ssdeep; + description = "Python wrapper for the ssdeep library"; + license = licenses.lgpl3; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a18523ae31c3..44259b08af32 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2157,18 +2157,7 @@ in { zope_copy = callPackage ../development/python-modules/zope_copy {}; - ssdeep = buildPythonPackage rec { - name = "ssdeep-3.1.1"; - - src = pkgs.fetchurl { - url = "mirror://pypi/s/ssdeep/${name}.tar.gz"; - sha256 = "1p9dpykmnfb73cszdiic5wbz5bmbbmkiih08pb4dah5mwq4n7im6"; - }; - - buildInputs = with pkgs; [ ssdeep ]; - propagatedBuildInputs = with self; [ cffi six ]; - meta.broken = true; # Tests fail, and no reverse-dependencies anyway - }; + ssdeep = callPackage ../development/python-modules/ssdeep { }; s2clientprotocol = callPackage ../development/python-modules/s2clientprotocol { };