From df73d2d4c79eb6dddaaf341a85e6c890eb16f26f Mon Sep 17 00:00:00 2001
From: ghpzin <ghpzin@gmail.com>
Date: Wed, 24 Jul 2024 17:28:09 +0300
Subject: [PATCH] python3Packages.etebase: 0.31.6 -> 0.31.7, fix build with
Python 3.12
- update to 0.31.7 for patches to apply
- add patch updating cpython to 0.7.2 to fix build
with Python 3.12
- add patch updating flapigen to 0.6.1 to remove
git dependency from Cargo.lock
---
.../python-modules/etebase/default.nix | 22 ++++++++++++++++---
1 file changed, 19 insertions(+), 3 deletions(-)
diff --git a/pkgs/development/python-modules/etebase/default.nix b/pkgs/development/python-modules/etebase/default.nix
index bb23e85534b8..ffdad6347628 100644
--- a/pkgs/development/python-modules/etebase/default.nix
+++ b/pkgs/development/python-modules/etebase/default.nix
@@ -12,23 +12,39 @@
openssl,
Security,
msgpack,
+ fetchpatch,
}:
buildPythonPackage rec {
pname = "etebase";
- version = "0.31.6";
+ version = "0.31.7";
src = fetchFromGitHub {
owner = "etesync";
repo = "etebase-py";
rev = "v${version}";
- hash = "sha256-T61nPW3wjBRjmJ81w59T1b/Kxrwwqvyj3gILE9OF/5Q=";
+ hash = "sha256-ZNUUp/0fGJxL/Rt8sAZ864rg8uCcNybIYSk4POt0vqg=";
};
+ # https://github.com/etesync/etebase-py/pull/54
+ patches = [
+ # fix python 3.12 build
+ (fetchpatch {
+ url = "https://github.com/etesync/etebase-py/commit/898eb3aca1d4eb30d4aeae15e35d0bc45dd7b3c8.patch";
+ hash = "sha256-0BDUTztiC4MiwwNEDFtfc5ruc69Qk+svepQZRixNJgA=";
+ })
+ # replace flapigen git dependency in Cargo.lock
+ (fetchpatch {
+ url = "https://github.com/etesync/etebase-py/commit/7e9e4244a144dd46383d8be950d3df79e28eb069.patch";
+ hash = "sha256-8EH8Sc3UnmuCrSwDf3+as218HiG2Ed3r+FCMrUi5YrI=";
+ })
+ ];
+
cargoDeps = rustPlatform.fetchCargoTarball {
inherit src;
name = "${pname}-${version}";
- hash = "sha256-wrMNtcaLAsWBVeJbYbYo+Xmobl01lnUbR9NUqqUzUgU=";
+ hash = "sha256-We19laZd6b2fLSPNLegyNp0eQSeCvUJeTIXqvG7o08c=";
+ inherit patches;
};
format = "pyproject";