Unverified Commit 3c5cc34f authored by Fabian Affolter's avatar Fabian Affolter Committed by GitHub
Browse files

Merge pull request #201900 from tjni/filemagic 

python310Packages.filemagic: remove
parents 2714a225 a2972fca

pkgs/development/python-modules/filemagic/default.nix

deleted100644 → 0
+0 −30
Original line number Diff line number Diff line 
{ stdenv, lib, buildPythonPackage, fetchFromGitHub, file

, isPy3k, mock, unittest2 }:



buildPythonPackage {

  pname = "filemagic";

  version = "1.6";

  disabled = !isPy3k; # asserts on ResourceWarning



  # Don't use the PyPI source because it's missing files required for testing

  src = fetchFromGitHub {

    owner = "aliles";

    repo = "filemagic";

    rev = "138649062f769fb10c256e454a3e94ecfbf3017b";

    sha256 = "1jxf928jjl2v6zv8kdnfqvywdwql1zqkm1v5xn1d5w0qjcg38d4n";

  };



  postPatch = ''

    substituteInPlace magic/api.py --replace "ctypes.util.find_library('magic')" \

      "'${file}/lib/libmagic${stdenv.hostPlatform.extensions.sharedLibrary}'"

  '';



  checkInputs = [ mock ] ++ lib.optionals (!isPy3k) [ unittest2 ];



  meta = with lib; {

    description = "File type identification using libmagic";

    homepage = "https://github.com/aliles/filemagic";

    license = licenses.asl20;

    maintainers = with maintainers; [ erikarvstedt ];

  };

}

pkgs/development/tools/poetry2nix/poetry2nix/overrides/build-systems.json

+0 −3
Original line number Diff line number Diff line
@@ -4816,9 +4816,6 @@ 
    "setuptools",

    "setuptools-scm"

  ],

  "filemagic": [

    "setuptools"

  ],

  "filetype": [

    "setuptools"

  ],

pkgs/top-level/python-aliases.nix

+1 −0
Original line number Diff line number Diff line
@@ -77,6 +77,7 @@ mapAliases ({ 
  face_recognition_models = face-recognition-models; # added 2022-10-15

  fake_factory = throw "fake_factory has been removed because it is unused and deprecated by upstream since 2016."; # added 2022-05-30

  faulthandler = throw "faulthandler is built into ${python.executable}"; # added 2021-07-12

  filemagic = throw "inactive since 2014, so use python-magic instead"; # added 2022-11-19

  flask_login = flask-login; # added 2022-10-17

  flask_sqlalchemy = flask-sqlalchemy; # added 2022-07-20

  flask_testing = flask-testing; # added 2022-04-25

pkgs/top-level/python-packages.nix

+0 −2
Original line number Diff line number Diff line
@@ -3228,8 +3228,6 @@ self: super: with self; { 


  filelock = callPackage ../development/python-modules/filelock { };



  filemagic = callPackage ../development/python-modules/filemagic { };



  filetype = callPackage ../development/python-modules/filetype { };



  filterpy = callPackage ../development/python-modules/filterpy { };