From 5a98ab8c0e4debd75a3de6341ad7d3a1eec106e2 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Wed, 17 Apr 2024 08:45:38 +0300
Subject: [PATCH 1/2] xdg-utils: don't infrec in xdg-screensaver

Before:

```bash
lockfile_command=`command -v /nix/store/8l572fp5svwp2x1izz2avji8l0ysxkq4-procmail-3.24/bin/lockfile`

lockfile()
{
  if [ -n "lockfile" ] ; then
     lockfile -1 -l 10 -s 3 "$screensaver_file".lock
```

After:

```bash
lockfile_command=`command -v /nix/store/4ka6z06bvxbcz98m0wy5m1m04f8ppkgw-procmail-3.24/bin/lockfile`

lockfile()
{
  if [ -n "$lockfile_command" ] ; then
     $lockfile_command -1 -l 10 -s 3 "$screensaver_file".lock
```

Fixes #304308
---
 pkgs/tools/X11/xdg-utils/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/X11/xdg-utils/default.nix b/pkgs/tools/X11/xdg-utils/default.nix
index d033e0ecde08..03965a5c0557 100644
--- a/pkgs/tools/X11/xdg-utils/default.nix
+++ b/pkgs/tools/X11/xdg-utils/default.nix
@@ -175,10 +175,10 @@ let
         "xscreensaver-command"      # Xscreensaver
         "xset"                      # generic-ish X
       ];
-      fix."$lockfile_command" = [ "lockfile" ];
       keep = {
         "$MV" = true;
         "$XPROP" = true;
+        "$lockfile_command" = true;
       };
       execer = [
         "cannot:${perl}/bin/perl"

From d65dbfbcbab2d2ef8bdf56538e8965a74ab03520 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Wed, 17 Apr 2024 07:53:23 +0200
Subject: [PATCH 2/2] python3Packages.scikit-learn: upstream patch for tests

Originally I wanted to update to 1.4.2, but that complained:
 > ERROR Missing dependencies:
 >        numpy==2.0.0rc1
---
 pkgs/development/python-modules/scikit-learn/default.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/development/python-modules/scikit-learn/default.nix b/pkgs/development/python-modules/scikit-learn/default.nix
index 7ffe72261f44..bbcb44de2c02 100644
--- a/pkgs/development/python-modules/scikit-learn/default.nix
+++ b/pkgs/development/python-modules/scikit-learn/default.nix
@@ -2,6 +2,7 @@
 , lib
 , buildPythonPackage
 , fetchPypi
+, fetchpatch
 
 # build-system
 , cython
@@ -34,6 +35,14 @@ buildPythonPackage rec {
     hash = "sha256-k9PUlv8ZZUcPmXfQXl7DN2+x5jsQ5P2l450jwtiWmjA=";
   };
 
+  patches = [
+    (fetchpatch { # included in >= 1.4.2
+      name = "test_standard_scaler_dtype.patch";
+      url = "https://github.com/jeremiedbb/scikit-learn/commit/87c32d35eeb8f6f7fec63dc3d97d9c416545f053.diff";
+      hash = "sha256-iOBOoWHuWChCTnZ5go7MobPcHRGMChROpCI7V/5ik1Y=";
+    })
+  ];
+
   buildInputs = [
     pillow
     glibcLocales