From b262b2ea2ced5cd880acb9516682f2135cfc26a4 Mon Sep 17 00:00:00 2001 From: Dee Anzorge Date: Wed, 27 Mar 2024 01:42:08 +0100 Subject: [PATCH] nix: update poetry overrides --- nix/default.nix | 30 +++++++++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/nix/default.nix b/nix/default.nix index 803aab542..4e255c90e 100644 --- a/nix/default.nix +++ b/nix/default.nix @@ -56,7 +56,35 @@ let nativeBuildInputs = (prevAttrs.nativeBuildInputs or []) ++ [ final.setuptools-scm ]; } ); - })); + + marshmallow = prev.marshmallow.overridePythonAttrs ( + prevAttrs: { + format = "pyproject"; + nativeBuildInputs = (prevAttrs.nativeBuildInputs or []) ++ [ final.flit-core ]; + } + ); + + django-pgtrigger = prev.django-pgtrigger.overridePythonAttrs ( + prevAttrs: { + format = "pyproject"; + nativeBuildInputs = (prevAttrs.nativeBuildInputs or []) ++ [ final.poetry-core ]; + } + ); + })) ++ [ (final: prev: { + # current poetry2nix does not have cargo hashes for the locked versu of + # cryptography but it does override it. We need to append this overlay + # here to ensure it goes after the defaults. + cryptography = prev.cryptography.overridePythonAttrs ( + prevAttrs: { + cargoDeps = pkgs.rustPlatform.fetchCargoTarball { + inherit (prevAttrs) src; + name = "${prevAttrs.pname}-${prevAttrs.version}"; + sourceRoot = "${prevAttrs.pname}-${prevAttrs.version}/${prevAttrs.cargoRoot}"; + sha256 = "sha256-Pw3ftpcDMfZr/w6US5fnnyPVsFSB9+BuIKazDocYjTU="; #v42.0.5 + }; + } + ); + }) ]; meta = with lib; { homepage = "https://bookwyrm.social/";