From bf2d0fcde3a3dd6caf38ba2a763bc5f879a3f756 Mon Sep 17 00:00:00 2001 From: Alexander Date: Wed, 30 Apr 2025 00:01:56 -0500 Subject: [PATCH] python312Packages.xeddsa: init at 1.1.0 --- .../li/libxeddsa/package.nix} | 2 +- .../python-modules/xeddsa/default.nix | 55 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 - pkgs/top-level/python-packages.nix | 2 + 4 files changed, 58 insertions(+), 3 deletions(-) rename pkgs/{development/libraries/libxeddsa/default.nix => by-name/li/libxeddsa/package.nix} (94%) create mode 100644 pkgs/development/python-modules/xeddsa/default.nix diff --git a/pkgs/development/libraries/libxeddsa/default.nix b/pkgs/by-name/li/libxeddsa/package.nix similarity index 94% rename from pkgs/development/libraries/libxeddsa/default.nix rename to pkgs/by-name/li/libxeddsa/package.nix index 94375ee932b2..7b33a5a3f02a 100644 --- a/pkgs/development/libraries/libxeddsa/default.nix +++ b/pkgs/by-name/li/libxeddsa/package.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: { changelog = "https://github.com/Syndace/libxeddsa/blob/v${finalAttrs.version}/CHANGELOG.md"; license = lib.licenses.mit; teams = with lib.teams; [ ngi ]; - maintainers = with lib.maintainers; [ axler1 ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.all; }; }) diff --git a/pkgs/development/python-modules/xeddsa/default.nix b/pkgs/development/python-modules/xeddsa/default.nix new file mode 100644 index 000000000000..fba8c0793e66 --- /dev/null +++ b/pkgs/development/python-modules/xeddsa/default.nix @@ -0,0 +1,55 @@ +{ + buildPythonPackage, + lib, + fetchFromGitHub, + setuptools, + cffi, + libsodium, + libxeddsa, + pytestCheckHook, + nix-update-script, +}: + +buildPythonPackage rec { + pname = "xeddsa"; + version = "1.1.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "Syndace"; + repo = "python-xeddsa"; + tag = "v${version}"; + hash = "sha256-636zsJXD8EtLDXMIkJTON0g3sg0EPrMzcfR7SUrURac="; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "setuptools<74" "setuptools" + ''; + + passthru.updateScript = nix-update-script { }; + + build-system = [ setuptools ]; + + buildInputs = [ + libsodium + libxeddsa + ]; + + dependencies = [ cffi ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "xeddsa" ]; + + meta = { + description = "Python bindings to libxeddsa"; + homepage = "https://github.com/Syndace/python-xeddsa"; + changelog = "https://github.com/Syndace/python-xeddsa/blob/v${version}/CHANGELOG.md"; + license = lib.licenses.mit; + teams = with lib.teams; [ ngi ]; + maintainers = with lib.maintainers; [ ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dcf2d2b007de..b76f5e434c84 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10273,8 +10273,6 @@ with pkgs; }; libxcrypt-legacy = libxcrypt.override { enableHashes = "all"; }; - libxeddsa = callPackage ../development/libraries/libxeddsa { }; - libxkbcommon = libxkbcommon_8; libxml2 = callPackage ../development/libraries/libxml2 { python = python3; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index abbdf0421c2f..98d903137a08 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -19110,6 +19110,8 @@ self: super: with self; { xdxf2html = callPackage ../development/python-modules/xdxf2html { }; + xeddsa = toPythonModule (callPackage ../development/python-modules/xeddsa { }); + xen = toPythonModule (pkgs.xen.override { python3Packages = self; }); xformers = callPackage ../development/python-modules/xformers { };