Unverified Commit 15bec519 authored by Fabian Affolter's avatar Fabian Affolter Committed by GitHub
Browse files

Merge pull request #266978 from natsukium/sorl-thumbnail 

python311Packages.sorl-thumbnail: 12.9.0 -> 12.10.0; rename from sorl_thumbnail
parents 5d2dcbc2 823b2d0b

pkgs/development/python-modules/sorl_thumbnail/default.nix→pkgs/development/python-modules/sorl-thumbnail/default.nix

+24 −6
Original line number Diff line number Diff line 
{ lib

, buildPythonPackage

, fetchPypi

, isPy27

, pythonOlder

, setuptools

, setuptools-scm

, django

}:



buildPythonPackage rec {

  pname = "sorl-thumbnail";

  version = "12.9.0";

  disabled = isPy27;

  version = "12.10.0";

  pyproject = true;



  disabled = pythonOlder "3.8";



  src = fetchPypi {

    inherit pname version;

    hash = "sha256-DLwvUhUufyJm48LLSuXYOv0ulv1eHELlZnNiuqo9LbM=";

    hash = "sha256-3pWkkhf9/s7SIvo86qAdMS7i+KrVa6NNbHDy3umoSTg=";

  };



  nativeBuildInputs = [ setuptools-scm ];

  nativeBuildInputs = [

    setuptools

    setuptools-scm

  ];



  buildInputs = [

    django

  ];



  env.DJANGO_SETTINGS_MODULE = "sorl.thumbnail.conf.defaults";



  # Disabled due to an improper configuration error when tested against django. This looks like something broken in the test cases for sorl.

  doCheck = false;



  pythonImportsCheck = [

    "sorl.thumbnail"

  ];



  meta = with lib; {

    homepage = "https://sorl-thumbnail.readthedocs.org/en/latest/";

    description = "Thumbnails for Django";

    changelog = "https://github.com/jazzband/sorl-thumbnail/blob/${version}/CHANGES.rst";

    license = licenses.bsd3;

  };



}

pkgs/top-level/python-aliases.nix

+1 −0
Original line number Diff line number Diff line
@@ -402,6 +402,7 @@ mapAliases ({ 
  smart_open = smart-open; # added 2021-03-14

  smmap2 = throw "smmap2 has been deprecated, use smmap instead."; # added 2020-03-14

  somecomfort = throw "somecomfort was removed because Home Assistant switched to aiosomecomfort"; # added 2023-02-01

  sorl_thumbnail = sorl-thumbnail; # added 2023-11-12

  SPARQLWrapper = sparqlwrapper;

  sphinx-jquery = sphinxcontrib-jquery; # added 2023-02-24

  sphinx_pypi_upload = throw "sphinx_pypi_upload has been removed since it is abandoned."; # added 2023-10-11

pkgs/top-level/python-packages.nix

+1 −1
Original line number Diff line number Diff line
@@ -13094,7 +13094,7 @@ self: super: with self; { 














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



























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













  sorl-thumbnail = callPackage ../development/python-modules/sorl-thumbnail { };





























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