Unverified Commit eecc8450 authored by OTABI Tomoya's avatar OTABI Tomoya Committed by GitHub
Browse files

Merge pull request #265575 from natsukium/zxing-cpp 

python311Packages.zxing-cpp: rename from zxing_cpp
parents ae52f963 60404c1e

pkgs/applications/misc/yubioath-flutter/helper.nix

+2 −2
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
, yubikey-manager

, fido2

, mss

, zxing_cpp

, zxing-cpp

, pillow

, cryptography
@@ -43,7 +43,7 @@ buildPythonApplication { 
    yubikey-manager

    fido2

    mss

    zxing_cpp

    zxing-cpp

    pillow

    cryptography

  ];

pkgs/applications/office/paperless-ngx/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -215,7 +215,7 @@ python.pkgs.buildPythonApplication rec { 
    whoosh

    zipp

    zope_interface

    zxing_cpp

    zxing-cpp

  ]

  ++ redis.optional-dependencies.hiredis

  ++ twisted.optional-dependencies.tls

pkgs/development/libraries/zxing-cpp/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: { 


  passthru = {

    tests = {

      inherit (python3.pkgs) zxing_cpp;

      inherit (python3.pkgs) zxing-cpp;

    };

    updateScript = gitUpdater {

      rev-prefix = "v";

pkgs/development/python-modules/zxing_cpp/default.nix→pkgs/development/python-modules/zxing-cpp/default.nix

+53 −0
Original line number Diff line number Diff line 
{ lib

, buildPythonPackage

, cmake

, setuptools-scm

, numpy

, pillow

, pybind11

, zxing-cpp

, libzxing-cpp

, pytestCheckHook

}:



buildPythonPackage rec {

  pname = "zxing_cpp";

  inherit (zxing-cpp) src version meta;

  pname = "zxing-cpp";

  inherit (libzxing-cpp) src version meta;

  pyproject = true;



  sourceRoot = "${src.name}/wrappers/python";



  # we don't need pybind11 in the root environment

  # https://pybind11.readthedocs.io/en/stable/installing.html#include-with-pypi

  postPatch = ''

    substituteInPlace pyproject.toml \

      --replace "pybind11[global]" "pybind11"

  '';



  dontUseCmakeConfigure = true;



  propagatedBuildInputs = [

    pybind11

    numpy

  ];



  buildInputs = [

    pybind11

  ];



  nativeBuildInputs = [

    cmake

    setuptools-scm

  ];



  nativeCheckInputs = [

    pillow

    pytestCheckHook

  ];



  pytestFlagsArray = [

    "test.py"

  ];



  pythonImportsCheck = [

    "zxingcpp"

  ];

}

pkgs/top-level/python-aliases.nix

+1 −0
Original line number Diff line number Diff line
@@ -450,4 +450,5 @@ mapAliases ({ 
  zope_i18nmessageid = zope-i18nmessageid; # added 2023-07-29

  zope_lifecycleevent = zope-lifecycleevent; # added 2023-10-11

  zope_proxy = zope-proxy; # added 2023-10-07

  zxing_cpp = zxing-cpp; # added 2023-11-05

})