Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update flake.lock #643

Merged
merged 3 commits into from
Oct 8, 2023
Merged

Update flake.lock #643

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4e5b16c
flake.lock: Update
github-actions[bot] Oct 8, 2023
d612cff
chore(deps): adapt nix derivation for pyfatfs.
qkaiser Oct 8, 2023
a418623
chore(deps): trying to fix lief.
qkaiser Oct 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
72 changes: 36 additions & 36 deletions flake.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion nix/pyfatfs/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
9 changes: 2 additions & 7 deletions overlay.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -44,6 +38,7 @@ inputs: final: prev:

# Own package updated independently of nixpkgs
unblob-native = inputs.unblob-native.packages.${final.system}.default;

});
};

Expand Down
Loading