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

Merge pull request #1106 from K900/fix-flake

Browse source 
fix(flake): build poetry with correct poetry2nix
This commit is contained in:
adisbladis 2023-04-05 19:24:29 +12:00 • committed by GitHub
commit 5b14c87117
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
default.nix
View file

@ -1,6 +1,5 @@
{ pkgs ? import <nixpkgs> { } { pkgs ? import <nixpkgs> { }
, lib ? pkgs.lib , lib ? pkgs.lib
, poetry ? null
, poetryLib ? import ./lib.nix { inherit lib pkgs; stdenv = pkgs.stdenv; } , poetryLib ? import ./lib.nix { inherit lib pkgs; stdenv = pkgs.stdenv; }
}: }:
let let

4
flake.nix
View file

@ -19,8 +19,8 @@
} // (flake-utils.lib.eachDefaultSystem (system: } // (flake-utils.lib.eachDefaultSystem (system:
let let
pkgs = nixpkgs.legacyPackages.${system}; pkgs = nixpkgs.legacyPackages.${system};
poetry = pkgs.callPackage ./pkgs/poetry { python = pkgs.python3; }; poetry2nix = import ./default.nix { inherit pkgs; };
poetry2nix = import ./default.nix { inherit pkgs poetry; }; poetry = pkgs.callPackage ./pkgs/poetry { python = pkgs.python3; inherit poetry2nix; };
in in
rec { rec {
packages = { packages = {

2
overlay.nix
View file

@ -1,6 +1,6 @@
final: prev: { final: prev: {
poetry2nix = import ./default.nix { pkgs = final; poetry = final.poetry; }; poetry2nix = import ./default.nix { pkgs = final; };
poetry = prev.callPackage ./pkgs/poetry { python = final.python3; }; poetry = prev.callPackage ./pkgs/poetry { python = final.python3; };

2
tests/default.nix
View file

@ -13,7 +13,7 @@ in
}: }:
let let
poetry = pkgs.callPackage ../pkgs/poetry { python = pkgs.python3; inherit poetry2nix; }; poetry = pkgs.callPackage ../pkgs/poetry { python = pkgs.python3; inherit poetry2nix; };
poetry2nix = import ./.. { inherit pkgs; inherit poetry; }; poetry2nix = import ./.. { inherit pkgs; };
poetryLib = import ../lib.nix { inherit pkgs; lib = pkgs.lib; stdenv = pkgs.stdenv; }; poetryLib = import ../lib.nix { inherit pkgs; lib = pkgs.lib; stdenv = pkgs.stdenv; };
pep425 = pkgs.callPackage ../pep425.nix { inherit poetryLib; python = pkgs.python3; }; pep425 = pkgs.callPackage ../pep425.nix { inherit poetryLib; python = pkgs.python3; };
pep425PythonOldest = pkgs.callPackage ../pep425.nix { inherit poetryLib; python = pkgs.python38; }; pep425PythonOldest = pkgs.callPackage ../pep425.nix { inherit poetryLib; python = pkgs.python38; };