histausse
/
test_flake_poetry2nix
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix (?) flake

main
Histausse 2023-05-20 15:03:17 +02:00
parent 5db94471a6
commit 11e4aed516
3 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
flake.nix
View File

@ -11,12 +11,32 @@
outputs = { self, nixpkgs, flake-utils, poetry2nix }: outputs = { self, nixpkgs, flake-utils, poetry2nix }:
flake-utils.lib.eachDefaultSystem (system: flake-utils.lib.eachDefaultSystem (system:
let let
inherit (poetry2nix.legacyPackages.${system}) mkPoetryApplication; inherit (poetry2nix.legacyPackages.${system}) mkPoetryApplication overrides;
pkgs = nixpkgs.legacyPackages.${system}; pkgs = nixpkgs.legacyPackages.${system};
in in
{ {
packages = { packages = {
test_flake_poetry2nix = mkPoetryApplication { projectDir = self; }; test_flake_poetry2nix = mkPoetryApplication {
projectDir = self;
overrides = overrides.withDefaults (self: super: {
pillow = super.pillow.overridePythonAttrs(old: {
# Use preConfigure from nixpkgs to fix library detection issues and
# impurities which can break the build process; this also requires
# adding propagatedBuildInputs and buildInputs from the same source.
# propagatedBuildInputs = (old.buildInputs or []) ++ pkgs.python3.pkgs.pillow.propagatedBuildInputs;
# buildInputs = (old.buildInputs or []) ++ pkgs.python3.pkgs.pillow.buildInputs;
# preConfigure = (old.preConfigure or "") + pkgs.python3.pkgs.pillow.preConfigure;
# https://github.com/nix-community/poetry2nix/issues/1139
patches = (old.patches or []) ++ nixpkgs.lib.optionals (old.version == "9.5.0") [
(pkgs.fetchpatch {
url = "https://github.com/python-pillow/Pillow/commit/0ec0a89ead648793812e11739e2a5d70738c6be5.diff";
sha256 = "sha256-rZfk+OXZU6xBpoumIW30E80gRsox/Goa3hMDxBUkTY0=";
})
];
});
});
};
docker = pkgs.dockerTools.buildImage { docker = pkgs.dockerTools.buildImage {
name = "test_flake_poetry2nix"; name = "test_flake_poetry2nix";
copyToRoot = pkgs.buildEnv { copyToRoot = pkgs.buildEnv {

2
pyproject.toml
View File

@ -17,7 +17,7 @@ numpy = "^1.24.3"
matplotlib = "^3.7.1" matplotlib = "^3.7.1"
[tool.poetry.scripts] [tool.poetry.scripts]
test = "test_flake_poetry2nix.cli:main" test_p2n = "test_flake_poetry2nix.cli:main"
[tool.poetry.group.dev.dependencies] [tool.poetry.group.dev.dependencies]
pytest = "*" pytest = "*"

1
test_flake_poetry2nix/cli.py
View File

@ -3,6 +3,7 @@ import matplotlib.pyplot as plt
def main(): def main():
print("plop")
fig, (ax1, ax2) = plt.subplots(2, 1) fig, (ax1, ax2) = plt.subplots(2, 1)
# make a little extra space between the subplots # make a little extra space between the subplots
fig.subplots_adjust(hspace=0.5) fig.subplots_adjust(hspace=0.5)