From 10516a7c63d41b4c1c3f77f9c9fee458bc79a524 Mon Sep 17 00:00:00 2001 From: seth Date: Tue, 11 Jun 2024 20:11:41 -0400 Subject: [PATCH] maturin: don't overuse `with lib` https://github.com/NixOS/nixpkgs/issues/208242 --- pkgs/by-name/ma/maturin/package.nix | 8 ++++---- pkgs/by-name/ma/maturin/pyo3-test/generic.nix | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/ma/maturin/package.nix b/pkgs/by-name/ma/maturin/package.nix index 725cc84ac4e3..029e6efb8bca 100644 --- a/pkgs/by-name/ma/maturin/package.nix +++ b/pkgs/by-name/ma/maturin/package.nix @@ -31,9 +31,8 @@ rustPlatform.buildRustPackage rec { passthru.tests.pyo3 = callPackage ./pyo3-test { }; - meta = with lib; { + meta = { description = "Build and publish Rust crates Python packages"; - mainProgram = "maturin"; longDescription = '' Build and publish Rust crates with PyO3, rust-cpython, and cffi bindings as well as Rust binaries as Python packages. @@ -44,10 +43,11 @@ rustPlatform.buildRustPackage rec { ''; homepage = "https://github.com/PyO3/maturin"; changelog = "https://github.com/PyO3/maturin/blob/v${version}/Changelog.md"; - license = with licenses; [ + license = with lib.licenses; [ asl20 # or mit ]; - maintainers = with maintainers; [ getchoo ]; + maintainers = with lib.maintainers; [ getchoo ]; + mainProgram = "maturin"; }; } diff --git a/pkgs/by-name/ma/maturin/pyo3-test/generic.nix b/pkgs/by-name/ma/maturin/pyo3-test/generic.nix index f32d616e361e..aed3e8a00770 100644 --- a/pkgs/by-name/ma/maturin/pyo3-test/generic.nix +++ b/pkgs/by-name/ma/maturin/pyo3-test/generic.nix @@ -40,10 +40,10 @@ python.pkgs.buildPythonPackage rec { pythonImportsCheck = [ "word_count" ]; - meta = with lib; { + meta = { description = "PyO3 word count example"; homepage = "https://github.com/PyO3/pyo3"; - license = licenses.asl20; + license = lib.licenses.asl20; maintainers = [ ]; }; }