Skip to content

poetry2nix: 1.31.0 -> 1.33.0 #194865

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
adisbladis merged 3 commits into from
Oct 7, 2022
Merged

poetry2nix: 1.31.0 -> 1.33.0 #194865

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
aa463a0
poetry2nix: 1.31.0 -> 1.33.0
adisbladis Oct 7, 2022
8710df5
nixopsUnstable: update
adisbladis Oct 7, 2022
f439af5
nixopsUnstable: fix build
adisbladis Oct 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 18 additions & 3 deletions pkgs/applications/networking/cluster/nixops/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ let
interpreter = (
poetry2nix.mkPoetryPackages {
projectDir = ./.;
python = pkgs.python39;
python = pkgs.python310;
overrides = [
poetry2nix.defaultPoetryOverrides
(import ./poetry-git-overlay.nix { inherit pkgs; })
Expand Down Expand Up @@ -42,18 +42,33 @@ let
overrides

# Make nixops pluginable
(self: super: {
(self: super: let
# Create a fake sphinx directory that doesn't pull the entire setup hook and incorrect python machinery
sphinx = pkgs.runCommand "sphinx" {} ''
mkdir -p $out/bin
for f in ${pkgs.python3.pkgs.sphinx}/bin/*; do
ln -s $f $out/bin/$(basename $f)
done
'';

in {
nixops = super.__toPluginAble {
drv = super.nixops;
finalDrv = self.nixops;

nativeBuildInputs = [ self.sphinx ];
nativeBuildInputs = [ sphinx ];

postInstall = ''
doc_cache=$(mktemp -d)
sphinx-build -b man -d $doc_cache doc/ $out/share/man/man1

html=$(mktemp -d)
sphinx-build -b html -d $doc_cache doc/ $out/share/nixops/doc

# Override buggy nixpkgs function
pythonOutputDistPhase() {
echo "no-op output dist phase"
}
Comment on lines +68 to +71
Copy link
Member

@SuperSandro2000 SuperSandro2000 Oct 7, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What is wrong with the dist phase? Can we try to fix it, please.

'';

};
Expand Down
12 changes: 6 additions & 6 deletions pkgs/applications/networking/cluster/nixops/poetry-git-overlay.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ self: super: {
_: {
src = pkgs.fetchgit {
url = "https://github.com/NixOS/nixops.git";
rev = "7220cbdc8a1cf2db5b3ad75b525faf145a5560a3";
sha256 = "199cw25cvjb8gxs56nc8ilq7v4560c6vgi1sh1vqrsqxayq1g4cs";
rev = "683baa66c613216a662aad3fd58b0cdc5cd41adb";
sha256 = "00yyzsybn1fjhkar64albxqp46d1v9c6lf1gd10lh9q72xq979sf";
};
}
);
Expand All @@ -15,8 +15,8 @@ self: super: {
_: {
src = pkgs.fetchgit {
url = "https://github.com/NixOS/nixops-aws.git";
rev = "bc9de10b77aa74c9b245fd533f829e4307b984e8";
sha256 = "12qsaxwlk67q04g13sqs4bxscpjspip5yphx6d8rq3iqki8yg4z9";
rev = "d8a6679c413edd1a7075b2fe08017b4c7fa3b3ce";
sha256 = "0aqkaskp6nkcnfxxf1n294xp4ggk36qldj5c3kzfgxim06jap7n5";
};
}
);
Expand All @@ -25,8 +25,8 @@ self: super: {
_: {
src = pkgs.fetchgit {
url = "https://github.com/nix-community/nixops-digitalocean.git";
rev = "b527b4bd27a419753e38c8231fd7528b3ea33886";
sha256 = "069jlgcjqgyb1v3dnrp2h0w4gv5hfx624iq2xazaix2wxpx9w7f8";
rev = "e977b7f11e264a6a2bff2dcbc7b94c6a97b92fff";
sha256 = "020fg1kjh3x57dj95micpq6mxjg5j50jy6cs5f10i33ayy3556v8";
};
}
);
Expand Down
Loading