Skip to content
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.

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

ruff: Build as a standalone without Python #358029

Merged
merged 1 commit into from
Dec 28, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion pkgs/by-name/ru/ruff-lsp/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ python3Packages.buildPythonApplication rec {
pytestCheckHook
pytest-asyncio
python-lsp-jsonrpc
ruff.bin
ruff
versionCheckHook
];
versionCheckProgramArg = [ "--version" ];
Expand Down
57 changes: 17 additions & 40 deletions pkgs/by-name/ru/ruff/package.nix
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
{
lib,
stdenv,
python3Packages,
fetchFromGitHub,
rustPlatform,
fetchFromGitHub,
installShellFiles,

rust-jemalloc-sys,
buildPackages,
versionCheckHook,

# passthru
Expand All @@ -14,15 +15,9 @@
nix-update-script,
}:

python3Packages.buildPythonPackage rec {
rustPlatform.buildRustPackage rec {
pname = "ruff";
version = "0.8.4";
pyproject = true;

outputs = [
"bin"
"out"
];

src = fetchFromGitHub {
owner = "astral-sh";
Expand All @@ -31,46 +26,29 @@ python3Packages.buildPythonPackage rec {
hash = "sha256-c5d2XaoEjCHWMdjTLD6CnwP8rpSXTUrmKSs0QWQ6UG0=";
};

# Do not rely on path lookup at runtime to find the ruff binary
postPatch = ''
substituteInPlace python/ruff/__main__.py \
--replace-fail \
'ruff_exe = "ruff" + sysconfig.get_config_var("EXE")' \
'return "${placeholder "bin"}/bin/ruff"'
'';
useFetchCargoVendor = true;
cargoHash = "sha256-jbUjsIJRpkKYc+qHN8tkcZrcjPTFJfdCsatezzdX4Ss=";

cargoDeps = rustPlatform.fetchCargoVendor {
inherit pname version src;
hash = "sha256-jbUjsIJRpkKYc+qHN8tkcZrcjPTFJfdCsatezzdX4Ss=";
};

nativeBuildInputs =
[ installShellFiles ]
++ (with rustPlatform; [
cargoSetupHook
maturinBuildHook
cargoCheckHook
]);
nativeBuildInputs = [ installShellFiles ];

buildInputs = [
rust-jemalloc-sys
];

postInstall =
let
emulator = stdenv.hostPlatform.emulator buildPackages;
in
''
mkdir -p $bin/bin
mv $out/bin/ruff $bin/bin/
rmdir $out/bin
''
+ lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
installShellCompletion --cmd ruff \
--bash <($bin/bin/ruff generate-shell-completion bash) \
--fish <($bin/bin/ruff generate-shell-completion fish) \
--zsh <($bin/bin/ruff generate-shell-completion zsh)
--bash <(${emulator} $out/bin/ruff generate-shell-completion bash) \
--fish <(${emulator} $out/bin/ruff generate-shell-completion fish) \
--zsh <(${emulator} $out/bin/ruff generate-shell-completion zsh)
'';

# Run cargo tests
cargoCheckType = "debug";
checkType = "debug";

# tests do not appear to respect linker options on doctests
# Upstream issue: https://github.com/rust-lang/cargo/issues/14189
# This causes errors like "error: linker `cc` not found" on static builds
Expand Down Expand Up @@ -106,12 +84,11 @@ python3Packages.buildPythonPackage rec {
"--skip=unix::symlink_inside_workspace"
];

nativeCheckInputs = [
nativeInstallCheckInputs = [
versionCheckHook
];
versionCheckProgramArg = [ "--version" ];

pythonImportsCheck = [ "ruff" ];
doInstallCheck = true;

passthru = {
tests =
Expand Down
35 changes: 35 additions & 0 deletions pkgs/development/python-modules/ruff/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
{
buildPythonPackage,
pkgs,
Copy link
Member

Choose a reason for hiding this comment

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

This effectively breaks cross-compilation.

Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
pkgs,
ruff,

rustPlatform,
installShellFiles,
}:

buildPythonPackage {
inherit (pkgs.ruff)
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
inherit (pkgs.ruff)
inherit (ruff)

pname
version
src
cargoDeps
postInstall
meta
;

# Do not rely on path lookup at runtime to find the ruff binary
postPatch = ''
substituteInPlace python/ruff/__main__.py \
--replace-fail \
'ruff_exe = "ruff" + sysconfig.get_config_var("EXE")' \
'return "${placeholder "out"}/bin/ruff"'
'';

pyproject = true;

nativeBuildInputs = [
installShellFiles
rustPlatform.cargoSetupHook
rustPlatform.maturinBuildHook
];

pythonImportsCheck = [ "ruff" ];
}
4 changes: 1 addition & 3 deletions pkgs/top-level/python-packages.nix
Original file line number Diff line number Diff line change
Expand Up @@ -14282,9 +14282,7 @@ self: super: with self; {

rubymarshal = callPackage ../development/python-modules/rubymarshal { };

ruff = toPythonModule (pkgs.ruff.override {
python3Packages = self;
});
ruff = callPackage ../development/python-modules/ruff { };
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
ruff = callPackage ../development/python-modules/ruff { };
ruff = callPackage ../development/python-modules/ruff {
inherit (pkgs) ruff;
};


ruff-api = callPackage ../development/python-modules/ruff-api { };

Expand Down
Loading