From 4e5b16c1cc7eaa0ebb196d2bbdbac02b89970809 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Sun, 8 Oct 2023 00:17:41 +0000 Subject: [PATCH 1/3] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'filter': 'github:numtide/nix-filter/d90c75e8319d0dd9be67d933d8eb9d0894ec9174' (2023-06-19) → 'github:numtide/nix-filter/41fd48e00c22b4ced525af521ead8792402de0ea' (2023-09-16) • Updated input 'flake-compat': 'github:edolstra/flake-compat/35bb57c0c8d8b62bbfd284272c928ceb64ddbde9' (2023-01-17) → 'github:edolstra/flake-compat/0f9255e01c2351cc7d116c072cb317785dd33b33' (2023-10-04) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/0d2fb29f5071a12d7983319c2c2576be6a130582' (2023-08-05) → 'github:NixOS/nixpkgs/2de1be5b51c3d6fa833f1c1f222dc867dd054b31' (2023-10-07) • Updated input 'unblob-native': 'github:onekey-sec/unblob-native/3844f4fd5ffd5a3befcd25e8176eb889237b8eb4' (2023-07-31) → 'github:onekey-sec/unblob-native/0dd9f53474970175d32be8760f897306d872a1de' (2023-09-25) • Updated input 'unblob-native/advisory-db': 'github:rustsec/advisory-db/98e8483ac17d42eeeeee51d4d02ad8a690bd12c7' (2023-07-29) → 'github:rustsec/advisory-db/81594d9fd5b32c3eaa199812475498b47fc98742' (2023-09-21) • Updated input 'unblob-native/crane': 'github:ipetkov/crane/8b08e96c9af8c6e3a2b69af5a7fa168750fcf88e' (2023-07-07) → 'github:ipetkov/crane/3de322e06fc88ada5e3589dc8a375b73e749f512' (2023-09-23) • Updated input 'unblob-native/crane/flake-utils': 'github:numtide/flake-utils/dbabf0ca0c0c4bce6ea5eaf65af5cb694d2082c7' (2023-06-25) → 'github:numtide/flake-utils/ff7b65b44d01cf9ba6a71320833626af21126384' (2023-09-12) • Updated input 'unblob-native/crane/rust-overlay': 'github:oxalica/rust-overlay/f9b92316727af9e6c7fee4a761242f7f46880329' (2023-07-03) → 'github:oxalica/rust-overlay/b87a14abea512d956f0b89d0d8a1e9b41f3e20ff' (2023-09-18) • Updated input 'unblob-native/flake-utils': 'github:numtide/flake-utils/919d646de7be200f3bf08cb76ae1f09402b6f9b4' (2023-07-11) → 'github:numtide/flake-utils/ff7b65b44d01cf9ba6a71320833626af21126384' (2023-09-12) • Updated input 'unblob-native/nix-filter': 'github:numtide/nix-filter/d90c75e8319d0dd9be67d933d8eb9d0894ec9174' (2023-06-19) → 'github:numtide/nix-filter/41fd48e00c22b4ced525af521ead8792402de0ea' (2023-09-16) • Updated input 'unblob-native/rust-overlay': 'github:oxalica/rust-overlay/5c06b0ed7bfb00f3a925af6c4acd1636596381c1' (2023-07-29) → 'github:oxalica/rust-overlay/c0ad320f9aadcc3cb1e62794cb950fe243e077d6' (2023-09-23) --- flake.lock | 72 +++++++++++++++++++++++++++--------------------------- 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/flake.lock b/flake.lock index e29f977365..b5e351d594 100644 --- a/flake.lock +++ b/flake.lock @@ -19,11 +19,11 @@ "advisory-db_2": { "flake": false, "locked": { - "lastModified": 1690651200, - "narHash": "sha256-0aDZUueboXYxKy/ckHQYA6zkvLOVsb2wyzJjSuEdJzE=", + "lastModified": 1696341198, + "narHash": "sha256-AgAcrT3+22QZiHxapKIt8drtP3hacNmyxFneD/Jsp8I=", "owner": "rustsec", "repo": "advisory-db", - "rev": "98e8483ac17d42eeeeee51d4d02ad8a690bd12c7", + "rev": "da470caa84d3dd3be02657a9cb35bd5269636127", "type": "github" }, "original": { @@ -67,11 +67,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1688772518, - "narHash": "sha256-ol7gZxwvgLnxNSZwFTDJJ49xVY5teaSvF7lzlo3YQfM=", + "lastModified": 1696384830, + "narHash": "sha256-j8ZsVqzmj5sOm5MW9cqwQJUZELFFwOislDmqDDEMl6k=", "owner": "ipetkov", "repo": "crane", - "rev": "8b08e96c9af8c6e3a2b69af5a7fa168750fcf88e", + "rev": "f2143cd27f8bd09ee4f0121336c65015a2a0a19c", "type": "github" }, "original": { @@ -106,11 +106,11 @@ }, "filter": { "locked": { - "lastModified": 1687178632, - "narHash": "sha256-HS7YR5erss0JCaUijPeyg2XrisEb959FIct3n2TMGbE=", + "lastModified": 1694857738, + "narHash": "sha256-bxxNyLHjhu0N8T3REINXQ2ZkJco0ABFPn6PIe2QUfqo=", "owner": "numtide", "repo": "nix-filter", - "rev": "d90c75e8319d0dd9be67d933d8eb9d0894ec9174", + "rev": "41fd48e00c22b4ced525af521ead8792402de0ea", "type": "github" }, "original": { @@ -122,11 +122,11 @@ "flake-compat": { "flake": false, "locked": { - "lastModified": 1673956053, - "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", "owner": "edolstra", "repo": "flake-compat", - "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", "type": "github" }, "original": { @@ -154,11 +154,11 @@ "flake-compat_3": { "flake": false, "locked": { - "lastModified": 1673956053, - "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", + "lastModified": 1696267196, + "narHash": "sha256-AAQ/2sD+0D18bb8hKuEEVpHUYD1GmO2Uh/taFamn6XQ=", "owner": "edolstra", "repo": "flake-compat", - "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", + "rev": "4f910c9827911b1ec2bf26b5a062cd09f8d89f85", "type": "github" }, "original": { @@ -208,11 +208,11 @@ "systems": "systems_3" }, "locked": { - "lastModified": 1687709756, - "narHash": "sha256-Y5wKlQSkgEK2weWdOu4J3riRd+kV/VCgHsqLNTTWQ/0=", + "lastModified": 1694529238, + "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", "owner": "numtide", "repo": "flake-utils", - "rev": "dbabf0ca0c0c4bce6ea5eaf65af5cb694d2082c7", + "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", "type": "github" }, "original": { @@ -226,11 +226,11 @@ "systems": "systems_4" }, "locked": { - "lastModified": 1689068808, - "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=", + "lastModified": 1694529238, + "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", "owner": "numtide", "repo": "flake-utils", - "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4", + "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", "type": "github" }, "original": { @@ -259,11 +259,11 @@ }, "nix-filter": { "locked": { - "lastModified": 1687178632, - "narHash": "sha256-HS7YR5erss0JCaUijPeyg2XrisEb959FIct3n2TMGbE=", + "lastModified": 1694857738, + "narHash": "sha256-bxxNyLHjhu0N8T3REINXQ2ZkJco0ABFPn6PIe2QUfqo=", "owner": "numtide", "repo": "nix-filter", - "rev": "d90c75e8319d0dd9be67d933d8eb9d0894ec9174", + "rev": "41fd48e00c22b4ced525af521ead8792402de0ea", "type": "github" }, "original": { @@ -274,11 +274,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1691218994, - "narHash": "sha256-46GJ5vLf9H+Oh7Jii2gJI9GATJHGbx2iQpon5nUSFPI=", + "lastModified": 1696725822, + "narHash": "sha256-B7uAOS7TkLlOg1aX01rQlYbydcyB6ZnLJSfaYbKVww8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0d2fb29f5071a12d7983319c2c2576be6a130582", + "rev": "5aabb5780a11c500981993d49ee93cfa6df9307b", "type": "github" }, "original": { @@ -366,11 +366,11 @@ ] }, "locked": { - "lastModified": 1688351637, - "narHash": "sha256-CLTufJ29VxNOIZ8UTg0lepsn3X03AmopmaLTTeHDCL4=", + "lastModified": 1696299134, + "narHash": "sha256-RS77cAa0N+Sfj5EmKbm5IdncNXaBCE1BSSQvUE8exvo=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "f9b92316727af9e6c7fee4a761242f7f46880329", + "rev": "611ccdceed92b4d94ae75328148d84ee4a5b462d", "type": "github" }, "original": { @@ -388,11 +388,11 @@ ] }, "locked": { - "lastModified": 1690596958, - "narHash": "sha256-SWqxUiEP9O2gvlWtR4Ku6rIMGM7PuNZreAPrU2yAjsk=", + "lastModified": 1696731188, + "narHash": "sha256-EL0iBBEUEV2oVygwv31C2+3w63826yEUN3LfIHAR0jo=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "5c06b0ed7bfb00f3a925af6c4acd1636596381c1", + "rev": "6528a18a62d817200099c520b6eea7833ade9a9a", "type": "github" }, "original": { @@ -508,11 +508,11 @@ "rust-overlay": "rust-overlay_3" }, "locked": { - "lastModified": 1690811550, - "narHash": "sha256-Q0B0GwXuzAmOFz9jEK6XvoaGer6q7117ayxTO60tqeM=", + "lastModified": 1696777518, + "narHash": "sha256-D2C4NFWKlb6DjBIXWHjEFl3d29kryDinJ3xU+5s31Qw=", "owner": "onekey-sec", "repo": "unblob-native", - "rev": "3844f4fd5ffd5a3befcd25e8176eb889237b8eb4", + "rev": "042a7fea29d295d04877b31c41d9ebd5166e354f", "type": "github" }, "original": { From d612cff2af2aa798504130eb4a83d3d116525a96 Mon Sep 17 00:00:00 2001 From: Quentin Kaiser Date: Sun, 8 Oct 2023 16:57:48 +0200 Subject: [PATCH 2/3] chore(deps): adapt nix derivation for pyfatfs. --- nix/pyfatfs/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nix/pyfatfs/default.nix b/nix/pyfatfs/default.nix index 5dd32a25fc..15377866e6 100644 --- a/nix/pyfatfs/default.nix +++ b/nix/pyfatfs/default.nix @@ -9,7 +9,7 @@ python3.pkgs.buildPythonApplication rec { nativeBuildInputs = with python3.pkgs; [ pytest-runner setuptools-scm ]; - propagatedBuildInputs = with python3.pkgs; [ fs ]; + propagatedBuildInputs = with python3.pkgs; [ pip fs ]; postPatch = '' substituteInPlace ./setup.py --replace 'setuptools_scm~=5.0.0' setuptools_scm From a4186237eee4b27d27dd761e3c4a4a9a0e917ac3 Mon Sep 17 00:00:00 2001 From: Quentin Kaiser Date: Sun, 8 Oct 2023 19:37:18 +0200 Subject: [PATCH 3/3] chore(deps): trying to fix lief. --- overlay.nix | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/overlay.nix b/overlay.nix index 1b19017a5a..cc658ace18 100644 --- a/overlay.nix +++ b/overlay.nix @@ -11,14 +11,8 @@ inputs: final: prev: hardeningDisable = (super.hardeningDisable or [ ]) ++ [ "fortify3" ]; }); - # Lief 12.3 incompatibility with Cmake 3.26 lief = prev.lief.overrideAttrs (super: { - postPatch = '' - substituteInPlace setup.py \ - --replace \ - 'cmake_args = ["-DLIEF_FORCE_API_EXPORTS=ON", "-DLIEF_PYTHON_API=on"]' \ - 'cmake_args = ["-DLIEF_FORCE_API_EXPORTS=ON", "-DLIEF_PYTHON_API=on", "-DLIEF_EXAMPLES=off"]' - ''; + meta.platform = super.meta.platform ++ [ final.lib.platforms.darwin ]; }); # Own package updated independently of nixpkgs @@ -44,6 +38,7 @@ inputs: final: prev: # Own package updated independently of nixpkgs unblob-native = inputs.unblob-native.packages.${final.system}.default; + }); };