From 31da059615a82e9a4e33bebd5d31d52d7f4efee9 Mon Sep 17 00:00:00 2001 From: natsukium Date: Sun, 5 Nov 2023 13:50:22 +0900 Subject: [PATCH] python311Packages.zxing-cpp: rename from zxing_cpp --- pkgs/applications/misc/yubioath-flutter/helper.nix | 4 ++-- pkgs/applications/office/paperless-ngx/default.nix | 2 +- pkgs/development/libraries/zxing-cpp/default.nix | 2 +- .../python-modules/{zxing_cpp => zxing-cpp}/default.nix | 6 +++--- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 4 +++- 6 files changed, 11 insertions(+), 8 deletions(-) rename pkgs/development/python-modules/{zxing_cpp => zxing-cpp}/default.nix (79%) diff --git a/pkgs/applications/misc/yubioath-flutter/helper.nix b/pkgs/applications/misc/yubioath-flutter/helper.nix index ca0bf4472a4c..7f6bb6095dbe 100644 --- a/pkgs/applications/misc/yubioath-flutter/helper.nix +++ b/pkgs/applications/misc/yubioath-flutter/helper.nix @@ -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 ]; diff --git a/pkgs/applications/office/paperless-ngx/default.nix b/pkgs/applications/office/paperless-ngx/default.nix index 7c5a3dc93276..d98958a8dfba 100644 --- a/pkgs/applications/office/paperless-ngx/default.nix +++ b/pkgs/applications/office/paperless-ngx/default.nix @@ -215,7 +215,7 @@ python.pkgs.buildPythonApplication rec { whoosh zipp zope_interface - zxing_cpp + zxing-cpp ] ++ redis.optional-dependencies.hiredis ++ twisted.optional-dependencies.tls diff --git a/pkgs/development/libraries/zxing-cpp/default.nix b/pkgs/development/libraries/zxing-cpp/default.nix index 9cd78b7b56a1..1c010638693e 100644 --- a/pkgs/development/libraries/zxing-cpp/default.nix +++ b/pkgs/development/libraries/zxing-cpp/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: { passthru = { tests = { - inherit (python3.pkgs) zxing_cpp; + inherit (python3.pkgs) zxing-cpp; }; updateScript = gitUpdater { rev-prefix = "v"; diff --git a/pkgs/development/python-modules/zxing_cpp/default.nix b/pkgs/development/python-modules/zxing-cpp/default.nix similarity index 79% rename from pkgs/development/python-modules/zxing_cpp/default.nix rename to pkgs/development/python-modules/zxing-cpp/default.nix index b876ab05af3f..02ff95588d70 100644 --- a/pkgs/development/python-modules/zxing_cpp/default.nix +++ b/pkgs/development/python-modules/zxing-cpp/default.nix @@ -4,12 +4,12 @@ , numpy , pillow , pybind11 -, zxing-cpp +, libzxing-cpp }: buildPythonPackage rec { - pname = "zxing_cpp"; - inherit (zxing-cpp) src version meta; + pname = "zxing-cpp"; + inherit (libzxing-cpp) src version meta; sourceRoot = "${src.name}/wrappers/python"; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 39577ac30411..8d683207ebe8 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -448,4 +448,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 }) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0bd217ad4ee1..9315299277ba 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -16111,5 +16111,7 @@ self: super: with self; { zxcvbn = callPackage ../development/python-modules/zxcvbn { }; - zxing_cpp = callPackage ../development/python-modules/zxing_cpp { }; + zxing-cpp = callPackage ../development/python-modules/zxing-cpp { + libzxing-cpp = pkgs.zxing-cpp; + }; }