diff --git a/mk-poetry-dep.nix b/mk-poetry-dep.nix index 22f8e34..857a824 100644 --- a/mk-poetry-dep.nix +++ b/mk-poetry-dep.nix @@ -94,7 +94,8 @@ pythonPackages.callPackage pname = normalizePackageName name; version = version; - inherit format; + # Circumvent output separation (https://github.com/NixOS/nixpkgs/pull/190487) + format = if format == "pyproject" then "poetry2nix" else format; doCheck = false; # We never get development deps @@ -108,6 +109,7 @@ pythonPackages.callPackage ++ lib.optionals (format == "pyproject") [ pythonPackages.removePathDependenciesHook pythonPackages.removeGitDependenciesHook + pythonPackages.pipBuildHook ]; buildInputs = ( diff --git a/shell-scripts.nix b/shell-scripts.nix index cbaa443..23362a2 100644 --- a/shell-scripts.nix +++ b/shell-scripts.nix @@ -34,6 +34,8 @@ python.pkgs.buildPythonPackage { dontConfigure = true; dontUseSetuptoolsCheck = true; + format = "poetry2nix"; + installPhase = '' mkdir -p $out/bin ${lib.concatStringsSep "\n" (lib.mapAttrsToList mkScript scripts)}