From dea03915c6beb52bb50b9dc526ac8adc43594b01 Mon Sep 17 00:00:00 2001 From: Dee Anzorge Date: Sun, 9 Jun 2024 22:03:34 +0200 Subject: [PATCH] nix: update poetry overrides --- nix/default.nix | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/nix/default.nix b/nix/default.nix index 3a04b740d..f8cf751b7 100644 --- a/nix/default.nix +++ b/nix/default.nix @@ -70,21 +70,13 @@ let 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 ( + + s3-tar = prev.s3-tar.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 - }; + format = "setuptools"; } ); - }) ]; + })); meta = with lib; { homepage = "https://bookwyrm.social/";