Merge pull request #1881 from mmsqe/eth_utils

fix: rm override workaround for eth-utils
nix-community · Jan 7, 2025 · 058cce6 · 058cce6
2 parents a495865 + 8ce31f2
commit 058cce6
Show file tree

Hide file tree

Showing 5 changed files with 231 additions and 3 deletions.
diff --git a/overrides/default.nix b/overrides/default.nix
@@ -883,9 +883,6 @@ lib.composeManyExtensions [
         '';
       };
 
-      # FIXME: this is a workaround for https://github.com/nix-community/poetry2nix/issues/1161
-      eth-utils = prev.eth-utils.override { preferWheel = true; };
-
       evdev = prev.evdev.overridePythonAttrs (_old: {
         preConfigure = ''
           substituteInPlace setup.py --replace-warn /usr/include/linux ${pkgs.linuxHeaders}/include/linux

diff --git a/tests/default.nix b/tests/default.nix
@@ -259,4 +259,5 @@ in
   # sandboxing issue?
   dependency-environment = callTest ./dependency-environment { };
   editable-egg = callTest ./editable-egg { };
+  eth-utils= callTest ./eth-utils { };
 }
diff --git a/tests/eth-utils/default.nix b/tests/eth-utils/default.nix
@@ -0,0 +1,13 @@
+{ poetry2nix, python311, runCommand }:
+let
+  env = poetry2nix.mkPoetryEnv {
+    python = python311;
+    pyproject = ./pyproject.toml;
+    poetrylock = ./poetry.lock;
+  };
+in
+runCommand "eth-utils-test"
+{ } ''
+  ${env}/bin/python -c 'import eth_utils'
+  touch $out
+''