Skip to content

Commit 49cd963

Browse files
authored
Merge pull request #625 from onekey-sec/update_flake_lock_action
Update flake.lock
2 parents 1facc7d + 37bc2d1 commit 49cd963

File tree

3 files changed

+90
-57
lines changed

3 files changed

+90
-57
lines changed

flake.lock

+52-52
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

nix/unblob/default.nix

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
, treelib
2727
# Runtime dependencies (extractors)
2828
, pkgs
29-
, e2fsprogs
29+
, e2fsprogs-nofortify
3030
, lziprecover
3131
, lzop
3232
, p7zip
@@ -42,7 +42,7 @@ let
4242

4343
# These dependencies are only added to PATH
4444
runtimeDeps = [
45-
e2fsprogs
45+
e2fsprogs-nofortify
4646
lziprecover
4747
lzop
4848
p7zip

overlay.nix

+36-3
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,50 @@ inputs: final: prev:
33
{
44
inherit (final.python3.pkgs) unblob;
55
_sources = final.callPackage ./nix/_sources/generated.nix { };
6-
ubi_reader = final.callPackage ./nix/ubi_reader { };
6+
7+
# https://github.com/tytso/e2fsprogs/issues/152
8+
e2fsprogs-nofortify = prev.e2fsprogs.overrideAttrs
9+
(super: {
10+
pname = "e2fsprogs-nofortify";
11+
hardeningDisable = (super.hardeningDisable or [ ]) ++ [ "fortify3" ];
12+
});
13+
14+
# Lief 12.3 incompatibility with Cmake 3.26
15+
lief = prev.lief.overrideAttrs (super: {
16+
postPatch = ''
17+
substituteInPlace setup.py \
18+
--replace \
19+
'cmake_args = ["-DLIEF_FORCE_API_EXPORTS=ON", "-DLIEF_PYTHON_API=on"]' \
20+
'cmake_args = ["-DLIEF_FORCE_API_EXPORTS=ON", "-DLIEF_PYTHON_API=on", "-DLIEF_EXAMPLES=off"]'
21+
'';
22+
});
23+
24+
# Own package updated independently of nixpkgs
725
jefferson = final.callPackage ./nix/jefferson { };
26+
827
python3 = prev.python3 // {
928
pkgs = prev.python3.pkgs.overrideScope
1029
(pyFinal: pyPrev: {
30+
# Own package updated independently of nixpkgs
31+
lzallright = pyFinal.callPackage ./nix/lzallright { };
32+
33+
# Own package updated independently of nixpkgs
1134
pyperscan = inputs.pyperscan.packages.${final.system}.default.vectorscan;
12-
unblob-native = inputs.unblob-native.packages.${final.system}.default;
35+
36+
# Missing from nixpkgs
1337
treelib = pyFinal.callPackage ./nix/treelib { };
14-
lzallright = pyFinal.callPackage ./nix/lzallright { };
38+
39+
# The reason for everything
1540
unblob = pyFinal.callPackage ./nix/unblob { };
41+
42+
# Own package updated independently of nixpkgs
43+
unblob-native = inputs.unblob-native.packages.${final.system}.default;
1644
});
1745
};
46+
47+
# Existing alias is rebound to the updated package set for consistence
1848
python3Packages = final.python3.pkgs;
49+
50+
# Own package updated independently of nixpkgs
51+
ubi_reader = final.callPackage ./nix/ubi_reader { };
1952
}

0 commit comments

Comments
 (0)