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

Make default overrides extensible in a way that's also composable

Browse source
This commit is contained in:
adisbladis 2020-07-21 20:45:03 +02:00
parent 6abe06ed6c
commit 2a907cd9a9
No known key found for this signature in database
GPG key ID: 110BFAD44C6249B7
1 changed files with 26 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
default.nix
View file

@ -33,7 +33,7 @@ lib.makeScope pkgs.newScope (self: {
{ projectDir ? null
, pyproject ? projectDir + "/pyproject.toml"
, poetrylock ? projectDir + "/poetry.lock"
, overrides ? [ self.defaultPoetryOverrides ]
, overrides ? self.defaultPoetryOverrides
, python ? pkgs.python3
, pwd ? projectDir
, preferWheels ? false
@ -122,7 +122,7 @@ lib.makeScope pkgs.newScope (self: {
# Create poetry2nix layer
baseOverlay
] ++ # User provided overrides
overrides
(if builtins.typeOf overrides == "list" then overrides else [ overrides ])
);
packageOverrides = lib.foldr lib.composeExtensions (self: super: { }) overlays;
py = python.override { inherit packageOverrides; self = py; };
@ -145,7 +145,7 @@ lib.makeScope pkgs.newScope (self: {
{ projectDir ? null
, pyproject ? projectDir + "/pyproject.toml"
, poetrylock ? projectDir + "/poetry.lock"
, overrides ? [ self.defaultPoetryOverrides ]
, overrides ? self.defaultPoetryOverrides
, pwd ? projectDir
, python ? pkgs.python3
, preferWheels ? false
@ -179,7 +179,7 @@ lib.makeScope pkgs.newScope (self: {
, src ? self.cleanPythonSources { src = projectDir; }
, pyproject ? projectDir + "/pyproject.toml"
, poetrylock ? projectDir + "/poetry.lock"
, overrides ? [ self.defaultPoetryOverrides ]
, overrides ? self.defaultPoetryOverrides
, meta ? { }
, python ? pkgs.python3
, pwd ? projectDir
@ -283,24 +283,33 @@ lib.makeScope pkgs.newScope (self: {
inherit (poetryLib) cleanPythonSources;
/*
Create a new default set of overrides with the same structure as the built-in ones
*/
mkDefaultPoetryOverrides = defaults: {
__functor = defaults;
extend = overlay:
let
composed = lib.foldr lib.composeExtensions overlay [ defaults ];
in
self.mkDefaultPoetryOverrides composed;
overrideOverlay = fn: self: super:
let
defaultSet = defaults self super;
customSet = fn self super;
in
defaultSet // customSet;
};
/*
The default list of poetry2nix override overlays
Can be overriden by calling defaultPoetryOverrides.overrideOverlay which takes an overlay function
*/
defaultPoetryOverrides =
let
defaults = import ./overrides.nix { inherit pkgs lib; };
in
{
__functor = defaults;
overrideOverlay = fn: self: super:
let
defaultSet = defaults self super;
customSet = fn self super;
in
defaultSet // customSet;
};
defaultPoetryOverrides = self.mkDefaultPoetryOverrides (import ./overrides.nix { inherit pkgs lib; });
/*
Convenience functions for specifying overlays with or without the poerty2nix default overrides