Skip to content

Commit

Permalink
fix: use poetry2nix from top-level when importing ./tools
Browse files Browse the repository at this point in the history
  • Loading branch information
cpcloud committed Oct 28, 2023
1 parent 365879d commit 93dac9e
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 9 deletions.
7 changes: 5 additions & 2 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -72,11 +72,14 @@
let
pkgs = import nixpkgs {
inherit system;
config.allowAliases = false;
config = {
allowAliases = false;
allowInsecure = true;
};
};

poetry2nix = import ./default.nix { inherit pkgs; };
p2nix-tools = pkgs.callPackage ./tools { };
p2nix-tools = pkgs.callPackage ./tools { inherit poetry2nix; };
in
rec {
formatter = treefmtEval.${system}.config.build.wrapper;
Expand Down
9 changes: 2 additions & 7 deletions tools/default.nix
Original file line number Diff line number Diff line change
@@ -1,9 +1,4 @@
{ pkgs ? import <nixpkgs> {
overlays = [
(import ../overlay.nix)
];
}
}:
{ pkgs, poetry2nix }:
let
inherit (pkgs) lib;

Expand Down Expand Up @@ -36,7 +31,7 @@ in
flamegraph.pl $workdir/traceFile.folded > poetry2nix-flamegraph.svg
'';

env = pkgs.poetry2nix.mkPoetryEnv {
env = poetry2nix.mkPoetryEnv {
projectDir = ./.;
};

Expand Down

0 comments on commit 93dac9e

Please sign in to comment.