From e54611e680df88017e4ce87b19c49fcb76b8b2f5 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Sun, 17 Dec 2023 00:19:15 +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 'lzallright': 'github:vlaci/lzallright/ed5314d505881850626398184d772f4c8ab4cb0a' (2023-12-15) → 'github:vlaci/lzallright/e5ec79a854902eda600529c54be298b76da2d8cf' (2023-12-15) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/e97b3e4186bcadf0ef1b6be22b8558eab1cdeb5d' (2023-12-11) → 'github:NixOS/nixpkgs/aa9d4729cbc99dabacb50e3994dcefb3ea0f7447' (2023-12-14) • Updated input 'pyperscan': 'github:vlaci/pyperscan/ea38e0770de2fa175d0f5fbe09861bb51742762f' (2023-12-15) → 'github:vlaci/pyperscan/76f07b61c91309084a121bee292c138a8f96474a' (2023-12-15) --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index 9d3ee48fb9..0de8cb8615 100644 --- a/flake.lock +++ b/flake.lock @@ -237,11 +237,11 @@ ] }, "locked": { - "lastModified": 1702642458, - "narHash": "sha256-S2AQHuR7UnOCXfXN7tY66Nq/BOBDwzluN40wCL3kvWQ=", + "lastModified": 1702646142, + "narHash": "sha256-6Dez14qlZ7cnVQfaiTHGuiTSAHvBoKtolgKF7ne9ASw=", "owner": "vlaci", "repo": "lzallright", - "rev": "ed5314d505881850626398184d772f4c8ab4cb0a", + "rev": "e5ec79a854902eda600529c54be298b76da2d8cf", "type": "github" }, "original": { @@ -267,11 +267,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1702272962, - "narHash": "sha256-D+zHwkwPc6oYQ4G3A1HuadopqRwUY/JkMwHz1YF7j4Q=", + "lastModified": 1702539185, + "narHash": "sha256-KnIRG5NMdLIpEkZTnN5zovNYc0hhXjAgv6pfd5Z4c7U=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e97b3e4186bcadf0ef1b6be22b8558eab1cdeb5d", + "rev": "aa9d4729cbc99dabacb50e3994dcefb3ea0f7447", "type": "github" }, "original": { @@ -291,11 +291,11 @@ ] }, "locked": { - "lastModified": 1702643335, - "narHash": "sha256-3yBBz4lCU3namRlYhSt1vH6WcIo1sbwpgNabV0idF6Q=", + "lastModified": 1702653667, + "narHash": "sha256-gmKcqoSo+0LTbcOU6GRsMjmF4Qr28zOfJbTFIb1dHEU=", "owner": "vlaci", "repo": "pyperscan", - "rev": "ea38e0770de2fa175d0f5fbe09861bb51742762f", + "rev": "76f07b61c91309084a121bee292c138a8f96474a", "type": "github" }, "original": { From 918e00fcda21d4bb95c055f5c0bf6df5709fb85f 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, 18 Dec 2023 13:00:24 +0100 Subject: [PATCH 2/3] nix: custom lief override is no longer needed --- overlay.nix | 59 ----------------------------------------------------- 1 file changed, 59 deletions(-) diff --git a/overlay.nix b/overlay.nix index 1eba434b05..52e7f811f0 100644 --- a/overlay.nix +++ b/overlay.nix @@ -15,65 +15,6 @@ final: prev: # Own package updated independently of nixpkgs jefferson = final.callPackage ./nix/jefferson { }; - lief = prev.lief.overrideAttrs (super: with final; { - - outputs = [ "out" "py" ]; - - nativeBuildInputs = [ - cmake - ninja - ]; - - # Not a propagatedBuildInput because only the $py output needs it; $out is - # just the library itself (e.g. C/C++ headers). - buildInputs = with python3.pkgs; [ - python3 - setuptools - tomli - ]; - - env.CXXFLAGS = toString (lib.optional stdenv.isLinux [ "-ffunction-sections" "-fdata-sections" "-fvisibility-inlines-hidden" "-static-libstdc++" "-static-libgcc" ] - ++ lib.optional stdenv.isDarwin [ "-faligned-allocation" "-fno-aligned-new" "-fvisibility=hidden" ]); - - env.CFLAGS = toString (lib.optional stdenv.isLinux [ "-ffunction-sections" "-fdata-sections" "-static-libstdc++" "-static-libgcc" ]); - env.LDFLAGS = toString (lib.optional stdenv.isLinux [ "-Wl,--gc-sections" "-Wl,--exclude-libs,ALL" ]); - - - dontUseCmakeConfigure = true; - - buildPhase = '' - runHook preBuild - - mkdir -p build - cmake -S . -B build -GNinja -DCMAKE_LINK_WHAT_YOU_USE=on -DBUILD_SHARED_LIBS=on -DLIEF_INSTALL_COMPILED_EXAMPLES=off -DCMAKE_INSTALL_PREFIX=$out -DCMAKE_BUILD_TYPE=Release - - cmake --build build --target all - - runHook postBuild - ''; - - postBuild = '' - pushd api/python - ${python3.interpreter} setup.py build --parallel=$NIX_BUILD_CORES - popd - ''; - - installPhase = '' - runHook preInstall - - cmake --build build --target install - - runHook postInstall - ''; - - postInstall = '' - pushd api/python - ${python3.interpreter} setup.py install --skip-build --root=/ --prefix=$py - popd - ''; - - }); - pythonPackagesExtensions = prev.pythonPackagesExtensions ++ [ (python-final: python-prev: { # Missing from nixpkgs From 345ec5e9ebc039e5e3c1ea37cf34c80bcb10780b Mon Sep 17 00:00:00 2001 From: Quentin Kaiser Date: Wed, 20 Dec 2023 10:19:32 +0100 Subject: [PATCH 3/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 'nixpkgs': 'github:NixOS/nixpkgs/aa9d4729cbc99dabacb50e3994dcefb3ea0f7447' (2023-12-14) → 'github:NixOS/nixpkgs/dd8e82f3b4017b8faa52c2b1897a38d53c3c26cb' (2023-12-18) • Updated input 'unblob-native': 'github:onekey-sec/unblob-native/73fcc0b11f3055acc1025275ebb9756a634d8e8a' (2023-12-14) → 'github:onekey-sec/unblob-native/09e273e1c6969fd299eb34d2b54d17679650b364' (2023-12-20) • Updated input 'unblob-native/advisory-db': 'github:rustsec/advisory-db/6ef1d1fd84c57e46253ff16bf7379c115e1062eb' (2023-12-09) → 'github:rustsec/advisory-db/bc17aeb6838cfc331384dc4360a98ca4d56f2320' (2023-12-18) • Updated input 'unblob-native/crane': 'github:ipetkov/crane/62fc1a0cbe144c1014d956e603d56bf1ffe69c7d' (2023-12-09) → 'github:ipetkov/crane/537ebb11db883f9076e37d83e3c7ee69a4abb48c' (2023-12-19) --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index 0de8cb8615..21691e7785 100644 --- a/flake.lock +++ b/flake.lock @@ -35,11 +35,11 @@ "advisory-db_3": { "flake": false, "locked": { - "lastModified": 1702116332, - "narHash": "sha256-Qzx1cRU8QnCmbEp0LJFoEzm7tetiNTc+wRTJTzPo2ko=", + "lastModified": 1702914599, + "narHash": "sha256-QYwzxCTyW5cEmBOZuikoBs7pO4H6TkC6oikLxIxuzyk=", "owner": "rustsec", "repo": "advisory-db", - "rev": "6ef1d1fd84c57e46253ff16bf7379c115e1062eb", + "rev": "bc17aeb6838cfc331384dc4360a98ca4d56f2320", "type": "github" }, "original": { @@ -98,11 +98,11 @@ ] }, "locked": { - "lastModified": 1702141249, - "narHash": "sha256-8wDpJKbDTDqFmyJfNEJOLrHYDoEzCjCbmz+lSRoU3CI=", + "lastModified": 1702956644, + "narHash": "sha256-6XxZSkhb/OkxIx705RHTTLYZ2qemmEC7tODD8f21gKw=", "owner": "ipetkov", "repo": "crane", - "rev": "62fc1a0cbe144c1014d956e603d56bf1ffe69c7d", + "rev": "537ebb11db883f9076e37d83e3c7ee69a4abb48c", "type": "github" }, "original": { @@ -267,11 +267,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1702539185, - "narHash": "sha256-KnIRG5NMdLIpEkZTnN5zovNYc0hhXjAgv6pfd5Z4c7U=", + "lastModified": 1702938738, + "narHash": "sha256-O7Vb0xC9s4Dmgxj8APEpuuMj7HsLgPbpy1UKvNVJp7o=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "aa9d4729cbc99dabacb50e3994dcefb3ea0f7447", + "rev": "dd8e82f3b4017b8faa52c2b1897a38d53c3c26cb", "type": "github" }, "original": { @@ -376,11 +376,11 @@ ] }, "locked": { - "lastModified": 1702559080, - "narHash": "sha256-RyLUjE+X3aINHrjzFDYITjX85UM+crEDpT9Fz5NHaJs=", + "lastModified": 1703063893, + "narHash": "sha256-EhATu75J0+VjdpGaso2J/Fc1+TBLpQVO7n0E19yZ7Xg=", "owner": "onekey-sec", "repo": "unblob-native", - "rev": "73fcc0b11f3055acc1025275ebb9756a634d8e8a", + "rev": "09e273e1c6969fd299eb34d2b54d17679650b364", "type": "github" }, "original": {