Skip to content

Commit

Permalink
mk-poetry-dep: prevent use of output separation
Browse files Browse the repository at this point in the history
this doesn't work in a lot of cases and I don't see the point for us
to have the split output behaviour.
  • Loading branch information
adisbladis committed Oct 7, 2022
1 parent 799cd0c commit e31b5e4
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 1 deletion.
4 changes: 3 additions & 1 deletion mk-poetry-dep.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -108,6 +109,7 @@ pythonPackages.callPackage
++ lib.optionals (format == "pyproject") [
pythonPackages.removePathDependenciesHook
pythonPackages.removeGitDependenciesHook
pythonPackages.pipBuildHook
];

buildInputs = (
Expand Down
2 changes: 2 additions & 0 deletions shell-scripts.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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)}
Expand Down

0 comments on commit e31b5e4

Please sign in to comment.