From 5dd664e33001a57adcb8a2376d4ab3ab32fdd760 Mon Sep 17 00:00:00 2001 From: Harinn Date: Thu, 26 Mar 2026 18:57:43 +0700 Subject: [PATCH 1/5] maturin.passthru.tests.pyo3: 0.27.2 -> 0.28.2 --- pkgs/by-name/ma/maturin/pyo3-test/Cargo.lock | 77 +++++-------------- pkgs/by-name/ma/maturin/pyo3-test/default.nix | 6 +- 2 files changed, 22 insertions(+), 61 deletions(-) diff --git a/pkgs/by-name/ma/maturin/pyo3-test/Cargo.lock b/pkgs/by-name/ma/maturin/pyo3-test/Cargo.lock index 49ae79ecbca4..1fb0bcec71ae 100644 --- a/pkgs/by-name/ma/maturin/pyo3-test/Cargo.lock +++ b/pkgs/by-name/ma/maturin/pyo3-test/Cargo.lock @@ -2,12 +2,6 @@ # It is not intended for manual editing. version = 4 -[[package]] -name = "autocfg" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8" - [[package]] name = "crossbeam-deque" version = "0.8.6" @@ -45,41 +39,23 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" -[[package]] -name = "indoc" -version = "2.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79cf5c93f93228cf8efb3ba362535fb11199ac548a09ce117c9b1adc3030d706" -dependencies = [ - "rustversion", -] - [[package]] name = "libc" -version = "0.2.180" +version = "0.2.183" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcc35a38544a891a5f7c865aca548a982ccb3b8650a5b06d0fd33a10283c56fc" - -[[package]] -name = "memoffset" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" -dependencies = [ - "autocfg", -] +checksum = "b5b646652bf6661599e1da8901b3b9522896f01e736bad5f723fe7a3a27f899d" [[package]] name = "once_cell" -version = "1.21.3" +version = "1.21.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d" +checksum = "9f7c3e4beb33f85d45ae3e3a1792185706c8e16d043238c593331cc7cd313b50" [[package]] name = "portable-atomic" -version = "1.13.0" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f89776e4d69bb58bc6993e99ffa1d11f228b839984854c7daeb5d37f87cbe950" +checksum = "c33a9471896f1c69cecef8d20cbe2f7accd12527ce60845ff44c153bb2a21b49" [[package]] name = "proc-macro2" @@ -92,29 +68,26 @@ dependencies = [ [[package]] name = "pyo3" -version = "0.27.2" +version = "0.28.2" dependencies = [ - "indoc", "libc", - "memoffset", "once_cell", "portable-atomic", "pyo3-build-config", "pyo3-ffi", "pyo3-macros", - "unindent", ] [[package]] name = "pyo3-build-config" -version = "0.27.2" +version = "0.28.2" dependencies = [ "target-lexicon", ] [[package]] name = "pyo3-ffi" -version = "0.27.2" +version = "0.28.2" dependencies = [ "libc", "pyo3-build-config", @@ -122,7 +95,7 @@ dependencies = [ [[package]] name = "pyo3-macros" -version = "0.27.2" +version = "0.28.2" dependencies = [ "proc-macro2", "pyo3-macros-backend", @@ -132,7 +105,7 @@ dependencies = [ [[package]] name = "pyo3-macros-backend" -version = "0.27.2" +version = "0.28.2" dependencies = [ "heck", "proc-macro2", @@ -143,9 +116,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.44" +version = "1.0.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21b2ebcf727b7760c461f091f9f0f539b77b8e87f2fd88131e7f1b433b3cece4" +checksum = "41f2619966050689382d2b44f664f4bc593e129785a36d6ee376ddf37259b924" dependencies = [ "proc-macro2", ] @@ -170,17 +143,11 @@ dependencies = [ "crossbeam-utils", ] -[[package]] -name = "rustversion" -version = "1.0.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d" - [[package]] name = "syn" -version = "2.0.114" +version = "2.0.117" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4d107df263a3013ef9b1879b0df87d706ff80f65a86ea879bd9c31f9b307c2a" +checksum = "e665b8803e7b1d2a727f4023456bbbbe74da67099c585258af0ad9c5013b9b99" dependencies = [ "proc-macro2", "quote", @@ -189,21 +156,15 @@ dependencies = [ [[package]] name = "target-lexicon" -version = "0.13.4" +version = "0.13.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1dd07eb858a2067e2f3c7155d54e929265c264e6f37efe3ee7a8d1b5a1dd0ba" +checksum = "adb6935a6f5c20170eeceb1a3835a49e12e19d792f6dd344ccc76a985ca5a6ca" [[package]] name = "unicode-ident" -version = "1.0.22" +version = "1.0.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9312f7c4f6ff9069b165498234ce8be658059c6728633667c526e27dc2cf1df5" - -[[package]] -name = "unindent" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7264e107f553ccae879d21fbea1d6724ac785e8c3bfc762137959b5802826ef3" +checksum = "e6e4313cd5fcd3dad5cafa179702e2b244f760991f45397d14d4ebf38247da75" [[package]] name = "word-count" diff --git a/pkgs/by-name/ma/maturin/pyo3-test/default.nix b/pkgs/by-name/ma/maturin/pyo3-test/default.nix index d5083caf0b06..0063ebb44e3e 100644 --- a/pkgs/by-name/ma/maturin/pyo3-test/default.nix +++ b/pkgs/by-name/ma/maturin/pyo3-test/default.nix @@ -13,13 +13,13 @@ buildPythonPackage rec { pname = "word-count"; - version = "0.27.2"; + version = "0.28.2"; src = fetchFromGitHub { owner = "PyO3"; repo = "pyo3"; - rev = "v${version}"; - hash = "sha256-xuC/7rynufWCHBnMiJny4m1Y1aaogdv/5UsafpmZLAw="; + tag = "v${version}"; + hash = "sha256-Jg+eni7I0jVUFViWbgj5F094ksvyuvF4mdgGzh0PMaQ="; }; cargoDeps = rustPlatform.importCargoLock { lockFile = ./Cargo.lock; }; From a79e72c66f001fe13e724d40ba7e3582f5691f5f Mon Sep 17 00:00:00 2001 From: Harinn Date: Thu, 26 Mar 2026 18:58:25 +0700 Subject: [PATCH 2/5] maturin.passthru.tests.pyo3: use finalAttrs --- pkgs/by-name/ma/maturin/pyo3-test/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ma/maturin/pyo3-test/default.nix b/pkgs/by-name/ma/maturin/pyo3-test/default.nix index 0063ebb44e3e..d0ea229176d8 100644 --- a/pkgs/by-name/ma/maturin/pyo3-test/default.nix +++ b/pkgs/by-name/ma/maturin/pyo3-test/default.nix @@ -11,14 +11,14 @@ preConfigure, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "word-count"; version = "0.28.2"; src = fetchFromGitHub { owner = "PyO3"; repo = "pyo3"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-Jg+eni7I0jVUFViWbgj5F094ksvyuvF4mdgGzh0PMaQ="; }; @@ -43,4 +43,4 @@ buildPythonPackage rec { license = lib.licenses.asl20; maintainers = [ ]; }; -} +}) From 6bee2eff2463ce4f3e9b8c1131a75c1f79a927e0 Mon Sep 17 00:00:00 2001 From: Harinn Date: Thu, 26 Mar 2026 19:01:23 +0700 Subject: [PATCH 3/5] maturin: 1.11.5 -> 1.12.6 --- pkgs/by-name/ma/maturin/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ma/maturin/package.nix b/pkgs/by-name/ma/maturin/package.nix index e40797f08d13..f504daf1a798 100644 --- a/pkgs/by-name/ma/maturin/package.nix +++ b/pkgs/by-name/ma/maturin/package.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "maturin"; - version = "1.11.5"; + version = "1.12.6"; src = fetchFromGitHub { owner = "PyO3"; repo = "maturin"; rev = "v${version}"; - hash = "sha256-OTL6Poz6FIR+zpKiaCDGsUGkm2/jMVAuOS0bV/o4F3M="; + hash = "sha256-NQ94RdQTQlRR5+2dC95cFNhwYliHmkD11JWyGt6BV6g="; }; - cargoHash = "sha256-pBhKuVfq9x4kHYmE2p5ly1EXG2Sr8hHQ7pHCaERqsw0="; + cargoHash = "sha256-9VqS9wvQAsSYNhH7B9WlD6SZjXR4S2sYzYoNy6vbYBM="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv From 1e93f3520f906e31afc3e080e99a03d21310df8e Mon Sep 17 00:00:00 2001 From: Harinn Date: Thu, 26 Mar 2026 19:02:18 +0700 Subject: [PATCH 4/5] maturin: use finalAttrs --- pkgs/by-name/ma/maturin/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ma/maturin/package.nix b/pkgs/by-name/ma/maturin/package.nix index f504daf1a798..f6662f87b3b2 100644 --- a/pkgs/by-name/ma/maturin/package.nix +++ b/pkgs/by-name/ma/maturin/package.nix @@ -10,14 +10,14 @@ python3, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "maturin"; version = "1.12.6"; src = fetchFromGitHub { owner = "PyO3"; repo = "maturin"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-NQ94RdQTQlRR5+2dC95cFNhwYliHmkD11JWyGt6BV6g="; }; @@ -59,7 +59,7 @@ rustPlatform.buildRustPackage rec { Python and can upload them to PyPI. ''; homepage = "https://github.com/PyO3/maturin"; - changelog = "https://github.com/PyO3/maturin/blob/v${version}/Changelog.md"; + changelog = "https://github.com/PyO3/maturin/blob/v${finalAttrs.version}/Changelog.md"; license = with lib.licenses; [ asl20 # or mit @@ -67,4 +67,4 @@ rustPlatform.buildRustPackage rec { maintainers = with lib.maintainers; [ getchoo ]; mainProgram = "maturin"; }; -} +}) From 18b7ef197ef5b81b084caf5d1b8e1d4f5e08e8f5 Mon Sep 17 00:00:00 2001 From: Harinn Date: Thu, 26 Mar 2026 19:02:55 +0700 Subject: [PATCH 5/5] maturin: add miniharinn as a maintainer --- pkgs/by-name/ma/maturin/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/ma/maturin/package.nix b/pkgs/by-name/ma/maturin/package.nix index f6662f87b3b2..8c08f6a0643f 100644 --- a/pkgs/by-name/ma/maturin/package.nix +++ b/pkgs/by-name/ma/maturin/package.nix @@ -64,7 +64,10 @@ rustPlatform.buildRustPackage (finalAttrs: { asl20 # or mit ]; - maintainers = with lib.maintainers; [ getchoo ]; + maintainers = with lib.maintainers; [ + getchoo + miniharinn + ]; mainProgram = "maturin"; }; })