From 2689297c50e2041d7f1846580f6bd4d784cd45f9 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Tue, 7 Mar 2023 04:20:00 +0000 Subject: [PATCH 1/2] rustpython: 2022-10-11 -> 0.2.0 --- .../interpreters/python/rustpython/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/interpreters/python/rustpython/default.nix b/pkgs/development/interpreters/python/rustpython/default.nix index e3e2ca8c18cd..36ce552d7a3a 100644 --- a/pkgs/development/interpreters/python/rustpython/default.nix +++ b/pkgs/development/interpreters/python/rustpython/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "rustpython"; - version = "unstable-2022-10-11"; + version = "0.2.0"; src = fetchFromGitHub { owner = "RustPython"; repo = "RustPython"; - rev = "273ffd969ca6536df06d9f69076c2badb86f8f8c"; - sha256 = "sha256-t/3++EeP7a8t2H0IEPLogBri7+6u+2+v+lNb4/Ty1/w="; + rev = "v${version}"; + hash = "sha256-RNUOBBbq4ca9yEKNj5TZTOQW0hruWOIm/G+YCHoJ19U="; }; - cargoHash = "sha256-Pv7SK64+eoK1VUxDh1oH0g1veWoIvBhiZE9JI/alXJ4="; + cargoHash = "sha256-PYSsv/dZ3dxferTDbRLF9T8GGj9kZ3ixWNglQKtA3pE="; # freeze the stdlib into the rustpython binary cargoBuildFlags = [ "--features=freeze-stdlib" ]; From bb5edc482e691dbf9d0a28348684b2af611c6711 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Tue, 7 Mar 2023 04:20:00 +0000 Subject: [PATCH 2/2] rustpython: fix build on aarch64-linux --- .../interpreters/python/rustpython/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/development/interpreters/python/rustpython/default.nix b/pkgs/development/interpreters/python/rustpython/default.nix index 36ce552d7a3a..b00631ad71a4 100644 --- a/pkgs/development/interpreters/python/rustpython/default.nix +++ b/pkgs/development/interpreters/python/rustpython/default.nix @@ -4,6 +4,7 @@ , fetchFromGitHub , SystemConfiguration , python3 +, fetchpatch }: rustPlatform.buildRustPackage rec { @@ -19,6 +20,14 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-PYSsv/dZ3dxferTDbRLF9T8GGj9kZ3ixWNglQKtA3pE="; + patches = [ + # Fix aarch64 compatibility for sqlite. Remove with the next release. https://github.com/RustPython/RustPython/pull/4499 + (fetchpatch { + url = "https://github.com/RustPython/RustPython/commit/9cac89347e2276fcb309f108561e99f4be5baff2.patch"; + hash = "sha256-vUPQI/5ec6/36Vdtt7/B2unPDsVrGh5iEiSMBRatxWU="; + }) + ]; + # freeze the stdlib into the rustpython binary cargoBuildFlags = [ "--features=freeze-stdlib" ];