From 12738e2571a4ae82a3b86c04b93ce1ec47ee3bcf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A1szl=C3=B3=20Vask=C3=B3?=
 <1771332+vlaci@users.noreply.github.com>
Date: Mon, 11 Dec 2023 16:13:29 +0100
Subject: [PATCH] nix: properly override python3 package set

---
 overlay.nix | 33 ++++++++++++++++-----------------
 1 file changed, 16 insertions(+), 17 deletions(-)

diff --git a/overlay.nix b/overlay.nix
index 61faaa3a3b..ece967e880 100644
--- a/overlay.nix
+++ b/overlay.nix
@@ -13,7 +13,7 @@ inputs: final: prev:
       version = "1.47.0-3.ok1";
       src = prev.fetchurl {
         url = "https://github.com/onekey-sec/e2fsprogs/archive/refs/tags/v1.47.0-3.ok1.tar.gz";
-        hash = "sha256-fsLUySjAdgnRp5m405a4Egso+LXNLxR9Y7WHt8qAvFM=";
+        hash = "sha256-y3eq2gbgfGhSGe1uS+QAI2YjK8QiOgv7iYC+8RAe1FM=";
       };
     });
 
@@ -79,27 +79,26 @@ inputs: final: prev:
 
   });
 
-  python3 = prev.python3 // {
-    pkgs = prev.python3.pkgs.overrideScope
-      (pyFinal: pyPrev: {
-        # Own package updated independently of nixpkgs
-        lzallright = pyFinal.callPackage ./nix/lzallright { };
+  python3 = prev.python3.override {
+    packageOverrides = pyFinal: pyPrev: {
+      # Own package updated independently of nixpkgs
+      lzallright = pyFinal.callPackage ./nix/lzallright { };
 
-        # Own package updated independently of nixpkgs
-        pyperscan = inputs.pyperscan.packages.${final.system}.default.vectorscan;
+      # Own package updated independently of nixpkgs
+      pyperscan = inputs.pyperscan.packages.${final.system}.default.vectorscan;
 
-        # Missing from nixpkgs
-        treelib = pyFinal.callPackage ./nix/treelib { };
+      # Missing from nixpkgs
+      treelib = pyFinal.callPackage ./nix/treelib { };
 
-        # Missing from nixpkgs
-        pyfatfs = pyFinal.callPackage ./nix/pyfatfs { };
+      # Missing from nixpkgs
+      pyfatfs = pyFinal.callPackage ./nix/pyfatfs { };
 
-        # The reason for everything
-        unblob = pyFinal.callPackage ./nix/unblob { };
+      # The reason for everything
+      unblob = pyFinal.callPackage ./nix/unblob { };
 
-        # Own package updated independently of nixpkgs
-        unblob-native = inputs.unblob-native.packages.${final.system}.default;
-      });
+      # Own package updated independently of nixpkgs
+      unblob-native = inputs.unblob-native.packages.${final.system}.default;
+    };
   };
 
   # Existing alias is rebound to the updated package set for consistence