From 4b9f7df4f69ba3550aafe8e914f762a096c2d7e0 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Sun, 22 Sep 2024 00:21:17 +0000 Subject: [PATCH 1/5] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/01f064c99c792715054dc7a70e4c1626dbbec0c3?narHash=sha256-3//V84fYaGVncFImitM6lSAliRdrGayZLdxWlpcuGk0%3D' (2024-09-13) → 'github:NixOS/nixpkgs/a1d92660c6b3b7c26fb883500a80ea9d33321be2?narHash=sha256-V5LpfdHyQkUF7RfOaDPrZDP%2Boqz88lTJrMT1%2BstXNwo%3D' (2024-09-20) --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 09fd287c18..856ce3c6d5 100644 --- a/flake.lock +++ b/flake.lock @@ -267,11 +267,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1726238386, - "narHash": "sha256-3//V84fYaGVncFImitM6lSAliRdrGayZLdxWlpcuGk0=", + "lastModified": 1726871744, + "narHash": "sha256-V5LpfdHyQkUF7RfOaDPrZDP+oqz88lTJrMT1+stXNwo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "01f064c99c792715054dc7a70e4c1626dbbec0c3", + "rev": "a1d92660c6b3b7c26fb883500a80ea9d33321be2", "type": "github" }, "original": { From 704d7beacefe2eb65cf82c8fbe6db40c16fd0923 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: Wed, 25 Sep 2024 13:14:35 +0200 Subject: [PATCH 2/5] nvfetcher: pyfatfs 1.0.5 -> 1.1.0 to match with poetry.lock --- nix/_sources/generated.json | 6 +++--- nix/_sources/generated.nix | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/nix/_sources/generated.json b/nix/_sources/generated.json index 04cab85c55..6d8cb3ea76 100644 --- a/nix/_sources/generated.json +++ b/nix/_sources/generated.json @@ -63,11 +63,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 index 1464fb4189..078d83938f 100644 --- a/nix/_sources/generated.nix +++ b/nix/_sources/generated.nix @@ -33,10 +33,10 @@ }; 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 = { From 102b34531c93cfcde273a24b5de0c0fcdaa527c6 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: Wed, 25 Sep 2024 13:15:51 +0200 Subject: [PATCH 3/5] =?UTF-8?q?nvfetcher:=20lief:=200.15.1=20=E2=86=92=20?= =?UTF-8?q?=E2=88=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We use lief from nixpkgs --- nix/_sources/generated.json | 20 -------------------- nix/_sources/generated.nix | 11 ----------- nvfetcher.toml | 4 ---- 3 files changed, 35 deletions(-) diff --git a/nix/_sources/generated.json b/nix/_sources/generated.json index 6d8cb3ea76..b740fc3db8 100644 --- 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, diff --git a/nix/_sources/generated.nix b/nix/_sources/generated.nix index 078d83938f..fb7f5a9a82 100644 --- a/nix/_sources/generated.nix +++ b/nix/_sources/generated.nix @@ -20,17 +20,6 @@ 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.1.0"; diff --git a/nvfetcher.toml b/nvfetcher.toml index f9750e71fb..29f8e12fd0 100644 --- 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" From 4b286659680d6916a6648fdc489ae916f8b18e55 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: Wed, 25 Sep 2024 13:16:22 +0200 Subject: [PATCH 4/5] nvfetcher: run update to refresh download urls --- nix/_sources/generated.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nix/_sources/generated.nix b/nix/_sources/generated.nix index fb7f5a9a82..5156177e8b 100644 --- a/nix/_sources/generated.nix +++ b/nix/_sources/generated.nix @@ -16,7 +16,7 @@ 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="; }; }; @@ -32,7 +32,7 @@ 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="; }; }; @@ -40,7 +40,7 @@ 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="; }; }; From 9d09a72bda9b4989f8eb28fce584a0985c0c793b 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: Wed, 25 Sep 2024 13:16:40 +0200 Subject: [PATCH 5/5] nix: adapt packaging of pyfatfs --- nix/pyfatfs/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/nix/pyfatfs/default.nix b/nix/pyfatfs/default.nix index 15377866e6..d4bf3139a5 100644 --- 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;