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

Make overrides export the overlay function

Browse source 
This is preparation work for providing a function that allows
customising the overrides.
This commit is contained in:
adisbladis 2020-01-02 18:07:14 +00:00
parent e121613551
commit 9b33e9e3b6
No known key found for this signature in database
GPG key ID: 110BFAD44C6249B7
3 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
default.nix
View file

@ -11,7 +11,7 @@ let
version = "1.0.0"; version = "1.0.0";
/* The default list of poetry2nix override overlays */ /* The default list of poetry2nix override overlays */
defaultPoetryOverrides = [ (import ./overrides.nix { inherit pkgs; }) ]; defaultPoetryOverrides = (import ./overrides.nix { inherit pkgs lib; });
mkEvalPep508 = import ./pep508.nix { mkEvalPep508 = import ./pep508.nix {
inherit lib; inherit lib;
@ -35,7 +35,7 @@ let
mkPoetryPython = mkPoetryPython =
{ poetrylock { poetrylock
, poetryPkg , poetryPkg
, overrides ? defaultPoetryOverrides , overrides ? [ defaultPoetryOverrides ]
, meta ? {} , meta ? {}
, python ? pkgs.python3 , python ? pkgs.python3
, pwd ? null , pwd ? null
@ -115,7 +115,7 @@ let
*/ */
mkPoetryEnv = mkPoetryEnv =
{ poetrylock { poetrylock
, overrides ? defaultPoetryOverrides , overrides ? [ defaultPoetryOverrides ]
, meta ? {} , meta ? {}
, pwd ? null , pwd ? null
, python ? pkgs.python3 , python ? pkgs.python3
@ -135,7 +135,7 @@ let
{ src { src
, pyproject , pyproject
, poetrylock , poetrylock
, overrides ? defaultPoetryOverrides , overrides ? [ defaultPoetryOverrides ]
, meta ? {} , meta ? {}
, python ? pkgs.python3 , python ? pkgs.python3
, pwd ? null , pwd ? null

3
tests/git-deps-pinned/default.nix
View file

@ -6,7 +6,8 @@ poetry2nix.mkPoetryApplication {
poetrylock = ./poetry.lock; poetrylock = ./poetry.lock;
src = lib.cleanSource ./.; src = lib.cleanSource ./.;
overrides = poetry2nix.defaultPoetryOverrides ++ [ overrides = [
poetry2nix.defaultPoetryOverrides
(import ./poetry-git-overlay.nix { inherit pkgs; }) (import ./poetry-git-overlay.nix { inherit pkgs; })
]; ];

3
tests/override-support/default.nix
View file

@ -6,7 +6,8 @@ let
src = ./.; src = ./.;
poetrylock = ./poetry.lock; poetrylock = ./poetry.lock;
pyproject = ./pyproject.toml; pyproject = ./pyproject.toml;
overrides = poetry2nix.defaultPoetryOverrides ++ [ overrides = [
poetry2nix.defaultPoetryOverrides
( (
self: super: { self: super: {
alembic = super.alembic.overrideAttrs ( alembic = super.alembic.overrideAttrs (