From e60afe781c548cf5b8e9339f468033a75f4ef28c Mon Sep 17 00:00:00 2001 From: K900 Date: Wed, 5 Apr 2023 10:40:08 +0300 Subject: [PATCH 1/2] overrides: remove more dead code --- default.nix | 2 +- overrides/default.nix | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/default.nix b/default.nix index 73d56e6..318d303 100644 --- a/default.nix +++ b/default.nix @@ -505,7 +505,7 @@ lib.makeScope pkgs.newScope (self: { Can be overriden by calling defaultPoetryOverrides.overrideOverlay which takes an overlay function */ - defaultPoetryOverrides = self.mkDefaultPoetryOverrides (import ./overrides { inherit pkgs lib poetryLib; }); + defaultPoetryOverrides = self.mkDefaultPoetryOverrides (import ./overrides { inherit pkgs lib; }); /* Convenience functions for specifying overlays with or without the poerty2nix default overrides diff --git a/overrides/default.nix b/overrides/default.nix index 5621e6c..8e7bba4 100644 --- a/overrides/default.nix +++ b/overrides/default.nix @@ -1,7 +1,5 @@ { pkgs ? import { } , lib ? pkgs.lib -, stdenv ? pkgs.stdenv -, poetryLib }: let From 47e42a4cf10ebdaa4fef6f5ed57dad4282dbcc00 Mon Sep 17 00:00:00 2001 From: K900 Date: Wed, 5 Apr 2023 10:39:25 +0300 Subject: [PATCH 2/2] fix: always build poetry with current poetry2nix So nothing leaks through from nixpkgs --- default.nix | 2 +- overlay.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/default.nix b/default.nix index 318d303..64308c5 100644 --- a/default.nix +++ b/default.nix @@ -156,7 +156,7 @@ lib.makeScope pkgs.newScope (self: { }; getFunctorFn = fn: if builtins.typeOf fn == "set" then fn.__functor else fn; - poetryPkg = pkgs.callPackage ./pkgs/poetry { inherit python; }; + poetryPkg = pkgs.callPackage ./pkgs/poetry { inherit python; poetry2nix = self; }; scripts = pyProject.tool.poetry.scripts or { }; hasScripts = scripts != { }; diff --git a/overlay.nix b/overlay.nix index b8c48c1..802504a 100644 --- a/overlay.nix +++ b/overlay.nix @@ -2,6 +2,6 @@ final: prev: { poetry2nix = import ./default.nix { pkgs = final; }; - poetry = prev.callPackage ./pkgs/poetry { python = final.python3; }; + poetry = prev.callPackage ./pkgs/poetry { python = final.python3; inherit (final) poetry2nix; }; }