diff --git a/pkgs/by-name/py/pyspread/package.nix b/pkgs/by-name/py/pyspread/package.nix
index 6bb3b984431e..ea2b080a080b 100644
--- a/pkgs/by-name/py/pyspread/package.nix
+++ b/pkgs/by-name/py/pyspread/package.nix
@@ -1,7 +1,7 @@
 {
   lib,
   python3Packages,
-  fetchPypi,
+  fetchFromGitLab,
   qt6,
   R,
   copyDesktopItems,
@@ -10,14 +10,19 @@
 python3Packages.buildPythonApplication (finalAttrs: {
   pname = "pyspread";
   version = "2.4.5";
+  pyproject = true;
+  __structuredAttrs = true;
 
-  src = fetchPypi {
-    pname = "pyspread";
-    inherit (finalAttrs) version;
-    hash = "sha256-7Nurn9OmK6LEz5TT543JUYKc/LjpkwfN/7r0ebS1PfY=";
+  src = fetchFromGitLab {
+    owner = "pyspread";
+    repo = "pyspread";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-3DAoRIzwFxOEIXSCO+MyCAZ92Y57AD9Z9oq6ps1Ck0k=";
   };
 
-  pyproject = true;
+  build-system = with python3Packages; [
+    setuptools
+  ];
 
   nativeBuildInputs = [
     R
@@ -67,7 +72,11 @@ python3Packages.buildPythonApplication (finalAttrs: {
     })
   ];
 
-  makeWrapperArgs = [ "--set R_HOME ${lib.getLib R}/lib/R" ];
+  makeWrapperArgs = [
+    "--set"
+    "R_HOME"
+    "${lib.getLib R}/lib/R"
+  ];
 
   preFixup = ''
     makeWrapperArgs+=("''${qtWrapperArgs[@]}")
diff --git a/pkgs/development/python-modules/plotnine/default.nix b/pkgs/development/python-modules/plotnine/default.nix
index 0ff799eade41..78787065e881 100644
--- a/pkgs/development/python-modules/plotnine/default.nix
+++ b/pkgs/development/python-modules/plotnine/default.nix
@@ -64,6 +64,11 @@ buildPythonPackage (finalAttrs: {
     # After manually checking, this is caused by extremely subtle differences in label placement.
     # See https://github.com/has2k1/plotnine/issues/627
     "test_aesthetics"
+    "test_after_scale_mapping"
+    "test_annotate_faceting"
+    "test_inserting_layers"
+    "test_multiple_annotation_geoms"
+    "test_to_pandas"
   ];
 
   disabledTestPaths = [
@@ -72,40 +77,56 @@ buildPythonPackage (finalAttrs: {
     # After manually checking, this is caused by extremely subtle differences in label placement.
     "tests/test_aes.py"
     "tests/test_annotation_logticks.py"
+    "tests/test_annotation_stripes.py"
     "tests/test_coords.py"
     "tests/test_facet_labelling.py"
     "tests/test_facets.py"
+    "tests/test_geom_abline.py"
     "tests/test_geom_bar_col_histogram.py"
     "tests/test_geom_bin_2d.py"
+    "tests/test_geom_blank.py"
     "tests/test_geom_boxplot.py"
     "tests/test_geom_count.py"
-    "tests/test_geom_density_2d.py"
     "tests/test_geom_density.py"
+    "tests/test_geom_density_2d.py"
     "tests/test_geom_dotplot.py"
+    "tests/test_geom_errorbar_errorbarh.py"
     "tests/test_geom_freqpoly.py"
+    "tests/test_geom_linerange_pointrange.py"
     "tests/test_geom_map.py"
     "tests/test_geom_path_line_step.py"
     "tests/test_geom_point.py"
     "tests/test_geom_pointdensity.py"
     "tests/test_geom_polygon.py"
+    "tests/test_geom_qq_qq_line.py"
+    "tests/test_geom_quantile.py"
     "tests/test_geom_raster.py"
     "tests/test_geom_rect_tile.py"
     "tests/test_geom_ribbon_area.py"
+    "tests/test_geom_rug.py"
+    "tests/test_geom_segment.py"
     "tests/test_geom_sina.py"
     "tests/test_geom_smooth.py"
+    "tests/test_geom_spoke.py"
     "tests/test_geom_text_label.py"
     "tests/test_geom_violin.py"
+    "tests/test_guide_internals.py"
     "tests/test_layout.py"
     "tests/test_plot_composition.py"
     "tests/test_position.py"
     "tests/test_qplot.py"
     "tests/test_scale_internals.py"
     "tests/test_scale_labelling.py"
+    "tests/test_scale_linetype.py"
+    "tests/test_scale_symlog.py"
     "tests/test_stat_ecdf.py"
     "tests/test_stat_ellipse.py"
     "tests/test_stat_function.py"
+    "tests/test_stat_hull.py"
     "tests/test_stat_summary.py"
+    "tests/test_stat_summary_bin.py"
     "tests/test_theme.py"
+    "tests/test_watermark.py"
 
     # Linting / formatting: useless as it has nothing to do with the package functioning
     # Disabling this prevents adding a dependency on 'ruff' and 'black'.