hiro/poetry2nix
1
0
Fork 0
mirror of https://github.com/vale981/poetry2nix synced 2025-03-07 02:01:40 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1107 from K900/fix-flake

Browse source 
More overrides-leaking-around fixes
This commit is contained in:
adisbladis 2023-04-05 19:58:23 +12:00 • committed by GitHub
commit 6765e4d807
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
default.nix
View file

@ -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 != { };
@ -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

2
overlay.nix
View file

@ -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; };
}

2
overrides/default.nix
View file

@ -1,7 +1,5 @@
{ pkgs ? import <nixpkgs> { }
, lib ? pkgs.lib
, stdenv ? pkgs.stdenv
, poetryLib
}:
let