From ea4c2e92bcdd19d2df5490d441f11141e3e98b29 Mon Sep 17 00:00:00 2001 From: annalee <150648636+a-n-n-a-l-e-e@users.noreply.github.com> Date: Wed, 22 Nov 2023 21:47:44 +0000 Subject: [PATCH] python311Packages.polars: remove patch for rustc < 1.73; fix build --- .../python-modules/polars/all_horizontal.patch | 13 ------------- pkgs/development/python-modules/polars/default.nix | 7 ------- 2 files changed, 20 deletions(-) delete mode 100644 pkgs/development/python-modules/polars/all_horizontal.patch diff --git a/pkgs/development/python-modules/polars/all_horizontal.patch b/pkgs/development/python-modules/polars/all_horizontal.patch deleted file mode 100644 index 3caf548d4ac0..000000000000 --- a/pkgs/development/python-modules/polars/all_horizontal.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/crates/polars-lazy/src/frame/mod.rs b/crates/polars-lazy/src/frame/mod.rs -index 2d2ede651..be24b8809 100644 ---- a/crates/polars-lazy/src/frame/mod.rs -+++ b/crates/polars-lazy/src/frame/mod.rs -@@ -25,7 +25,7 @@ pub use parquet::*; - use polars_core::frame::explode::MeltArgs; - use polars_core::prelude::*; - use polars_io::RowCount; --use polars_plan::dsl::all_horizontal; -+use polars_plan::dsl::functions::all_horizontal; - pub use polars_plan::frame::{AllowedOptimizations, OptState}; - use polars_plan::global::FETCH_ROWS; - #[cfg(any(feature = "ipc", feature = "parquet", feature = "csv"))] diff --git a/pkgs/development/python-modules/polars/default.nix b/pkgs/development/python-modules/polars/default.nix index fc82d8638569..991a3a3684cd 100644 --- a/pkgs/development/python-modules/polars/default.nix +++ b/pkgs/development/python-modules/polars/default.nix @@ -32,13 +32,6 @@ buildPythonPackage { disabled = pythonOlder "3.6"; src = rootSource; - patches = [ - # workaround for apparent rustc bug - # remove when we're at Rust 1.73 - # https://github.com/pola-rs/polars/issues/12050 - ./all_horizontal.patch - ]; - # Cargo.lock file is sometimes behind actual release which throws an error, # thus the `sed` command # Make sure to check that the right substitutions are made when updating the package