From 93dac9e13005d26fcaf97cf7753d00d85fd1f482 Mon Sep 17 00:00:00 2001 From: Phillip Cloud <417981+cpcloud@users.noreply.github.com> Date: Sat, 28 Oct 2023 05:59:43 -0400 Subject: [PATCH] fix: use poetry2nix from top-level when importing `./tools` --- flake.nix | 7 +++++-- tools/default.nix | 9 ++------- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/flake.nix b/flake.nix index 94d580346..09109897e 100644 --- a/flake.nix +++ b/flake.nix @@ -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; diff --git a/tools/default.nix b/tools/default.nix index 8e675b819..2759874d3 100644 --- a/tools/default.nix +++ b/tools/default.nix @@ -1,9 +1,4 @@ -{ pkgs ? import { - overlays = [ - (import ../overlay.nix) - ]; - } -}: +{ pkgs, poetry2nix }: let inherit (pkgs) lib; @@ -36,7 +31,7 @@ in flamegraph.pl $workdir/traceFile.folded > poetry2nix-flamegraph.svg ''; - env = pkgs.poetry2nix.mkPoetryEnv { + env = poetry2nix.mkPoetryEnv { projectDir = ./.; };