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

Use nixpkgs as a base to build Unblob from #970

Draft
wants to merge 3 commits into
base: main
Choose a base branch
from
Draft

Use nixpkgs as a base to build Unblob from #970

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
313501c
nix: point lzallright and pyperscan to nixpkgs versions
vlaci Oct 1, 2024
f21fa1a
nix: base building of unblob on upstream version from nixpkgs
vlaci Oct 1, 2024
9c83aee
DROP ME: point to nixpkgs containing unblob PR
vlaci Oct 1, 2024
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
222 changes: 9 additions & 213 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.

16 changes: 2 additions & 14 deletions flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,12 @@
{
description = "Extract files from any kind of container formats";

inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
inputs.nixpkgs.url = "github:vlaci/nixpkgs/unblob";
inputs.filter.url = "github:numtide/nix-filter";
inputs.unblob-native = {
url = "github:onekey-sec/unblob-native";
inputs.nixpkgs.follows = "nixpkgs";
};
inputs.lzallright = {
url = "github:vlaci/lzallright";
inputs.nixpkgs.follows = "nixpkgs";
};
inputs.pyperscan = {
url = "github:vlaci/pyperscan";
inputs.nixpkgs.follows = "nixpkgs";
};
inputs.flake-compat = {
url = "github:edolstra/flake-compat";
flake = false;
Expand All @@ -27,7 +19,7 @@
];
};

outputs = { self, nixpkgs, filter, unblob-native, lzallright, pyperscan, ... }:
outputs = { self, nixpkgs, filter, unblob-native, ... }:
let
# System types to support.
supportedSystems = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ];
Expand All @@ -47,8 +39,6 @@
overlays.default = nixpkgs.lib.composeManyExtensions [
filter.overlays.default
unblob-native.overlays.default
lzallright.overlays.default
pyperscan.overlays.default
(import ./overlay.nix)
];
packages = forAllSystems (system: rec {
Expand Down Expand Up @@ -81,8 +71,6 @@
python3Packages.pytest
python3Packages.pytest-cov
poetry

nvfetcher
];

postVenvCreation =
Expand Down
Loading
Loading