Merge pull request #954 from onekey-sec/update_flake_lock_action

Update flake.lock
onekey-sec · Sep 25, 2024 · 697d988 · 697d988
2 parents 3dbd309 + 9d09a72
commit 697d988
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 52 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/nix/_sources/generated.json b/nix/_sources/generated.json
@@ -34,26 +34,6 @@
         },
         "version": "0.4.5"
     },
-    "lief": {
-        "cargoLocks": null,
-        "date": null,
-        "extract": null,
-        "name": "lief",
-        "passthru": null,
-        "pinned": false,
-        "src": {
-            "deepClone": false,
-            "fetchSubmodules": false,
-            "leaveDotGit": false,
-            "name": null,
-            "owner": "lief-project",
-            "repo": "LIEF",
-            "rev": "0.14.1",
-            "sha256": "sha256-briOqt/S3YUl6Aon5sKXhutL8VFUSgnK2Wy4UKnHE20=",
-            "type": "github"
-        },
-        "version": "0.14.1"
-    },
     "pyfatfs": {
         "cargoLocks": null,
         "date": null,
@@ -63,11 +43,11 @@
         "pinned": false,
         "src": {
             "name": null,
-            "sha256": "sha256-5J6gYhGf32GYx7u8/ghYnYkZ40rCH19gTQ7YtcREly0=",
+            "sha256": "sha256-lyXM0KTaHAnCc1irvxDwjAQ6yEIQr1doA+CH9RorMOA=",
             "type": "url",
-            "url": "https://pypi.org/packages/source/p/pyfatfs/pyfatfs-1.0.5.tar.gz"
+            "url": "https://pypi.org/packages/source/p/pyfatfs/pyfatfs-1.1.0.tar.gz"
         },
-        "version": "1.0.5"
+        "version": "1.1.0"
     },
     "treelib": {
         "cargoLocks": null,

diff --git a/nix/_sources/generated.nix b/nix/_sources/generated.nix
@@ -16,42 +16,31 @@
     pname = "jefferson";
     version = "0.4.5";
     src = fetchurl {
-      url = "https://files.pythonhosted.org/packages/source/j/jefferson/jefferson-0.4.5.tar.gz";
+      url = "https://pypi.org/packages/source/j/jefferson/jefferson-0.4.5.tar.gz";
       sha256 = "sha256-+cPOzzO3bCQAu8LrbjUJ5S/SR5OFitOYLIu5L9t/q+k=";
     };
   };
-  lief = {
-    pname = "lief";
-    version = "0.13.2";
-    src = fetchFromGitHub {
-      owner = "lief-project";
-      repo = "LIEF";
-      rev = "0.13.2";
-      fetchSubmodules = false;
-      sha256 = "sha256-lH4SqwPB2Jp/wUI2Cll67PQbHbwMqpNuLy/ei8roiHg=";
-    };
-  };
   pyfatfs = {
     pname = "pyfatfs";
-    version = "1.0.5";
+    version = "1.1.0";
     src = fetchurl {
-      url = "https://files.pythonhosted.org/packages/source/p/pyfatfs/pyfatfs-1.0.5.tar.gz";
-      sha256 = "sha256-5J6gYhGf32GYx7u8/ghYnYkZ40rCH19gTQ7YtcREly0=";
+      url = "https://pypi.org/packages/source/p/pyfatfs/pyfatfs-1.1.0.tar.gz";
+      sha256 = "sha256-lyXM0KTaHAnCc1irvxDwjAQ6yEIQr1doA+CH9RorMOA=";
     };
   };
   treelib = {
     pname = "treelib";
     version = "1.7.0";
     src = fetchurl {
-      url = "https://files.pythonhosted.org/packages/source/t/treelib/treelib-1.7.0.tar.gz";
+      url = "https://pypi.org/packages/source/t/treelib/treelib-1.7.0.tar.gz";
       sha256 = "sha256-m/8a9Ba55kKmzQ4EMdFe3yaiS40MiuaK+9OAG14w+2E=";
     };
   };
   ubi_reader = {
     pname = "ubi_reader";
     version = "0.8.9";
     src = fetchurl {
-      url = "https://files.pythonhosted.org/packages/source/u/ubi_reader/ubi_reader-0.8.9.tar.gz";
+      url = "https://pypi.org/packages/source/u/ubi_reader/ubi_reader-0.8.9.tar.gz";
       sha256 = "sha256-b6Jp8xB6jie35F/oLEea1RF+F8J64AiiQE3/ufwu1mE=";
     };
   };

diff --git a/nix/pyfatfs/default.nix b/nix/pyfatfs/default.nix
@@ -3,16 +3,17 @@
 python3.pkgs.buildPythonApplication rec {
   inherit (_sources.pyfatfs) pname version src;
 
-  format = "setuptools";
+  format = "pyproject";
 
   doCheck = false;
 
-  nativeBuildInputs = with python3.pkgs; [ pytest-runner setuptools-scm ];
-
-  propagatedBuildInputs = with python3.pkgs; [ pip fs ];
+  nativeBuildInputs = with python3.pkgs; [ setuptools setuptools-scm ];
+  propagatedBuildInputs = with python3.pkgs; [ fs ];
 
   postPatch = ''
-    substituteInPlace ./setup.py --replace 'setuptools_scm~=5.0.0' setuptools_scm
+    substituteInPlace ./pyproject.toml \
+       --replace-fail 'setuptools ~= 67.8' setuptools \
+       --replace-fail '"setuptools_scm[toml] ~= 7.1"' ""
   '';
 
   env.SETUPTOOLS_SCM_PRETEND_VERSION = version;

diff --git a/nvfetcher.toml b/nvfetcher.toml
@@ -14,10 +14,6 @@ fetch.pypi = "treelib"
 src.pypi = "pyfatfs"
 fetch.pypi = "pyfatfs"
 
-[lief]
-src.github_tag = "lief-project/LIEF"
-fetch.github = "lief-project/LIEF"
-
 [e2fsprogs]
 src.github_tag = "onekey-sec/e2fsprogs"
 fetch.github =  "onekey-sec/e2fsprogs"