From 47382056c7da00c5094f7e4873d3e4bb36efa04d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A1szl=C3=B3=20Vask=C3=B3?= Date: Wed, 11 Sep 2024 21:13:39 +0200 Subject: [PATCH] nix: move to sasquatch from nixpkgs NOTE: as of now, it requires overriding nixpkgs to https://github.com/NixOS/nixpkgs/pull/219169 --- flake.lock | 21 --------------------- flake.nix | 7 +------ nix/unblob/default.nix | 2 ++ 3 files changed, 3 insertions(+), 27 deletions(-) diff --git a/flake.lock b/flake.lock index 4b91d1e6b0..cc7494637f 100644 --- a/flake.lock +++ b/flake.lock @@ -311,30 +311,9 @@ "lzallright": "lzallright", "nixpkgs": "nixpkgs", "pyperscan": "pyperscan", - "sasquatch": "sasquatch", "unblob-native": "unblob-native" } }, - "sasquatch": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1686077968, - "narHash": "sha256-0itva+j5WMKvueiUaO253UQ1S6W29xgtFvV4i3yvMtU=", - "owner": "onekey-sec", - "repo": "sasquatch", - "rev": "8d7b1edef55c9e7d995fcdd3bd3f0db1b3fac83f", - "type": "github" - }, - "original": { - "owner": "onekey-sec", - "repo": "sasquatch", - "type": "github" - } - }, "systems": { "locked": { "lastModified": 1681028828, diff --git a/flake.nix b/flake.nix index 10f9ba68a6..7b924add4a 100644 --- a/flake.nix +++ b/flake.nix @@ -15,10 +15,6 @@ url = "github:vlaci/pyperscan"; inputs.nixpkgs.follows = "nixpkgs"; }; - inputs.sasquatch = { - url = "github:onekey-sec/sasquatch"; - inputs.nixpkgs.follows = "nixpkgs"; - }; inputs.flake-compat = { url = "github:edolstra/flake-compat"; flake = false; @@ -31,7 +27,7 @@ ]; }; - outputs = { self, nixpkgs, filter, unblob-native, lzallright, pyperscan, sasquatch, ... }: + outputs = { self, nixpkgs, filter, unblob-native, lzallright, pyperscan, ... }: let # System types to support. supportedSystems = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ]; @@ -50,7 +46,6 @@ { overlays.default = nixpkgs.lib.composeManyExtensions [ filter.overlays.default - sasquatch.overlays.default unblob-native.overlays.default lzallright.overlays.default pyperscan.overlays.default diff --git a/nix/unblob/default.nix b/nix/unblob/default.nix index cd2055cdef..78636da4d1 100644 --- a/nix/unblob/default.nix +++ b/nix/unblob/default.nix @@ -33,6 +33,7 @@ , lzop , p7zip , sasquatch +, sasquatch-v4be , simg2img , unar }: @@ -49,6 +50,7 @@ let lzop p7zip sasquatch + sasquatch-v4be simg2img unar # shadowed by python packages of the same name