summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorannalee <150648636+a-n-n-a-l-e-e@users.noreply.github.com>2023-11-22 21:47:44 +0000
committergithub-actions[bot] <github-actions[bot]@users.noreply.github.com>2023-11-23 03:50:57 +0000
commit1fea86fa72f6f65142271f87afcad40cc74d7c73 (patch)
treea8e8ba6eb39c763c082f756a68df8db5665ecb7f
parent[Backport release-23.11] python311Packages.homeassistant-stubs: 2023.11.2 -> ... (diff)
downloadnixpkgs-origin/backport-269309-to-release-23.11.tar.gz
python311Packages.polars: remove patch for rustc < 1.73; fix buildorigin/backport-269309-to-release-23.11
(cherry picked from commit ea4c2e92bcdd19d2df5490d441f11141e3e98b29)
-rw-r--r--pkgs/development/python-modules/polars/all_horizontal.patch13
-rw-r--r--pkgs/development/python-modules/polars/default.nix7
2 files changed, 0 insertions, 20 deletions
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