diff --git a/analysis.nix b/analysis.nix deleted file mode 100644 index 3929d678e..000000000 --- a/analysis.nix +++ /dev/null @@ -1,38 +0,0 @@ -let - # Use `niv update` to update nixpkgs. - # See https://github.com/nmattia/niv/ - sources = import ./nix/sources.nix; - - pkgs = import sources.nixpkgs { config.allowUnfree = true; overlays = []; }; - - my-python = pkgs.python39.withPackages (p: with p; [ - cve-bin-tool - deepdiff - defusedxml - dockerfile-parse - elasticsearch - icalendar - kaitaistruct - parameterized - pdfminer - psycopg2 - pytest - pyyaml - tinycss2 - tlsh - yara-python - ]); - -in -pkgs.mkShell { - buildInputs = with pkgs; [ - apkid - binutils - libxml2 - openjdk8 - openssl - my-python - qemu - utillinux - ]; -} diff --git a/flake.lock b/flake.lock new file mode 100644 index 000000000..6c49d1d49 --- /dev/null +++ b/flake.lock @@ -0,0 +1,26 @@ +{ + "nodes": { + "nixpkgs": { + "locked": { + "lastModified": 1630338749, + "narHash": "sha256-J1LsmwGtlYpqIMYEi/amMKkk0VfRrwHaEs/uylugGnE=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "8a2ec31e224de9461390cdd03e5e0b0290cdad0b", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "ref": "nixos-unstable", + "type": "indirect" + } + }, + "root": { + "inputs": { + "nixpkgs": "nixpkgs" + } + } + }, + "root": "root", + "version": 7 +} diff --git a/flake.nix b/flake.nix new file mode 100644 index 000000000..58d71c207 --- /dev/null +++ b/flake.nix @@ -0,0 +1,133 @@ +{ + description = "Binary Analysis Next Generation (BANG)"; + + inputs.nixpkgs.url = "nixpkgs/nixos-unstable"; + + outputs = { self, nixpkgs }: + + let + supportedSystems = [ "x86_64-linux" "i686-linux" "aarch64-linux" ]; + forAllSystems = f: nixpkgs.lib.genAttrs supportedSystems (system: f system); + nixpkgsFor = forAllSystems (system: import nixpkgs { + inherit system; + config.allowUnfree = true; + }); + in { + devShells = forAllSystems (system: + with nixpkgsFor.${system}; + + { + default = + let + my-python = pkgs.python3.withPackages (p: with p; [ + brotli + deepdiff + defusedxml + kaitaistruct + leb128 + lz4 + mutf8 + python-lzo + parameterized + pdfminer + pefile + pillow + protobuf + pyaxmlparser + pytest + python-snappy + pyyaml + telfhash + tlsh + zstd + ]); + in pkgs.mkShell { + buildInputs = with pkgs; [ + binutils + cabextract + e2tools + innoextract + libxml2 + lz4 + mailcap + ncompress + openjdk8 + openssl + my-python + protobuf + qemu + rzip + sasquatch + squashfsTools + unrar + unshield + utillinux + zchunk + zstd + ]; + }; + + analysis = + let + my-python = pkgs.python39.withPackages (p: with p; [ + cve-bin-tool + deepdiff + defusedxml + dockerfile-parse + elasticsearch + icalendar + kaitaistruct + parameterized + pdfminer + psycopg2 + pytest + pyyaml + tinycss2 + tlsh + yara-python + ]); + in pkgs.mkShell { + buildInputs = with pkgs; [ + apkid + binutils + libxml2 + openjdk8 + openssl + my-python + qemu + utillinux + ]; + }; + + maintenance = + let + my-python = pkgs.python39.withPackages (p: with p; [ + click + cxxfilt + defusedxml + packageurl-python + psycopg2 + pytest + python-ctags3 + pyyaml + requests + telfhash + tlsh + woodblock + ]); + in pkgs.mkShell { + buildInputs = with pkgs; [ + gettext + my-python + universal-ctags + yara + ]; + }; + + }); + + devShell = forAllSystems (system: self.devShells.${system}.default); + + }; + +} diff --git a/maintenance.nix b/maintenance.nix deleted file mode 100644 index c03f8372b..000000000 --- a/maintenance.nix +++ /dev/null @@ -1,31 +0,0 @@ -let - # Use `niv update` to update nixpkgs. - # See https://github.com/nmattia/niv/ - sources = import ./nix/sources.nix; - - pkgs = import sources.nixpkgs { config.allowUnfree = true; overlays = []; }; - - my-python = pkgs.python39.withPackages (p: with p; [ - click - cxxfilt - defusedxml - packageurl-python - psycopg2 - pytest - python-ctags3 - pyyaml - requests - telfhash - tlsh - woodblock - ]); - -in -pkgs.mkShell { - buildInputs = with pkgs; [ - gettext - my-python - universal-ctags - yara - ]; -} diff --git a/nix/sources.json b/nix/sources.json deleted file mode 100644 index dc488f72c..000000000 --- a/nix/sources.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "nixpkgs": { - "branch": "nixos-unstable", - "description": "Nixpkgs/NixOS branches that track the Nixpkgs/NixOS channels", - "homepage": "https://github.com/NixOS/nixpkgs", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "88226ea038e538e09c272a7c56ba73c3f5eed57f", - "sha256": "1lg68wys30p8f2d6mkh7ivr7gkxs4zyq64rxxhwk15462f8mbv0w", - "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/88226ea038e538e09c272a7c56ba73c3f5eed57f.tar.gz", - "url_template": "https://github.com///archive/.tar.gz" - } -} diff --git a/nix/sources.nix b/nix/sources.nix deleted file mode 100644 index 1938409dd..000000000 --- a/nix/sources.nix +++ /dev/null @@ -1,174 +0,0 @@ -# This file has been generated by Niv. - -let - - # - # The fetchers. fetch_ fetches specs of type . - # - - fetch_file = pkgs: name: spec: - let - name' = sanitizeName name + "-src"; - in - if spec.builtin or true then - builtins_fetchurl { inherit (spec) url sha256; name = name'; } - else - pkgs.fetchurl { inherit (spec) url sha256; name = name'; }; - - fetch_tarball = pkgs: name: spec: - let - name' = sanitizeName name + "-src"; - in - if spec.builtin or true then - builtins_fetchTarball { name = name'; inherit (spec) url sha256; } - else - pkgs.fetchzip { name = name'; inherit (spec) url sha256; }; - - fetch_git = name: spec: - let - ref = - if spec ? ref then spec.ref else - if spec ? branch then "refs/heads/${spec.branch}" else - if spec ? tag then "refs/tags/${spec.tag}" else - abort "In git source '${name}': Please specify `ref`, `tag` or `branch`!"; - in - builtins.fetchGit { url = spec.repo; inherit (spec) rev; inherit ref; }; - - fetch_local = spec: spec.path; - - fetch_builtin-tarball = name: throw - ''[${name}] The niv type "builtin-tarball" is deprecated. You should instead use `builtin = true`. - $ niv modify ${name} -a type=tarball -a builtin=true''; - - fetch_builtin-url = name: throw - ''[${name}] The niv type "builtin-url" will soon be deprecated. You should instead use `builtin = true`. - $ niv modify ${name} -a type=file -a builtin=true''; - - # - # Various helpers - # - - # https://github.com/NixOS/nixpkgs/pull/83241/files#diff-c6f540a4f3bfa4b0e8b6bafd4cd54e8bR695 - sanitizeName = name: - ( - concatMapStrings (s: if builtins.isList s then "-" else s) - ( - builtins.split "[^[:alnum:]+._?=-]+" - ((x: builtins.elemAt (builtins.match "\\.*(.*)" x) 0) name) - ) - ); - - # The set of packages used when specs are fetched using non-builtins. - mkPkgs = sources: system: - let - sourcesNixpkgs = - import (builtins_fetchTarball { inherit (sources.nixpkgs) url sha256; }) { inherit system; }; - hasNixpkgsPath = builtins.any (x: x.prefix == "nixpkgs") builtins.nixPath; - hasThisAsNixpkgsPath = == ./.; - in - if builtins.hasAttr "nixpkgs" sources - then sourcesNixpkgs - else if hasNixpkgsPath && ! hasThisAsNixpkgsPath then - import {} - else - abort - '' - Please specify either (through -I or NIX_PATH=nixpkgs=...) or - add a package called "nixpkgs" to your sources.json. - ''; - - # The actual fetching function. - fetch = pkgs: name: spec: - - if ! builtins.hasAttr "type" spec then - abort "ERROR: niv spec ${name} does not have a 'type' attribute" - else if spec.type == "file" then fetch_file pkgs name spec - else if spec.type == "tarball" then fetch_tarball pkgs name spec - else if spec.type == "git" then fetch_git name spec - else if spec.type == "local" then fetch_local spec - else if spec.type == "builtin-tarball" then fetch_builtin-tarball name - else if spec.type == "builtin-url" then fetch_builtin-url name - else - abort "ERROR: niv spec ${name} has unknown type ${builtins.toJSON spec.type}"; - - # If the environment variable NIV_OVERRIDE_${name} is set, then use - # the path directly as opposed to the fetched source. - replace = name: drv: - let - saneName = stringAsChars (c: if isNull (builtins.match "[a-zA-Z0-9]" c) then "_" else c) name; - ersatz = builtins.getEnv "NIV_OVERRIDE_${saneName}"; - in - if ersatz == "" then drv else - # this turns the string into an actual Nix path (for both absolute and - # relative paths) - if builtins.substring 0 1 ersatz == "/" then /. + ersatz else /. + builtins.getEnv "PWD" + "/${ersatz}"; - - # Ports of functions for older nix versions - - # a Nix version of mapAttrs if the built-in doesn't exist - mapAttrs = builtins.mapAttrs or ( - f: set: with builtins; - listToAttrs (map (attr: { name = attr; value = f attr set.${attr}; }) (attrNames set)) - ); - - # https://github.com/NixOS/nixpkgs/blob/0258808f5744ca980b9a1f24fe0b1e6f0fecee9c/lib/lists.nix#L295 - range = first: last: if first > last then [] else builtins.genList (n: first + n) (last - first + 1); - - # https://github.com/NixOS/nixpkgs/blob/0258808f5744ca980b9a1f24fe0b1e6f0fecee9c/lib/strings.nix#L257 - stringToCharacters = s: map (p: builtins.substring p 1 s) (range 0 (builtins.stringLength s - 1)); - - # https://github.com/NixOS/nixpkgs/blob/0258808f5744ca980b9a1f24fe0b1e6f0fecee9c/lib/strings.nix#L269 - stringAsChars = f: s: concatStrings (map f (stringToCharacters s)); - concatMapStrings = f: list: concatStrings (map f list); - concatStrings = builtins.concatStringsSep ""; - - # https://github.com/NixOS/nixpkgs/blob/8a9f58a375c401b96da862d969f66429def1d118/lib/attrsets.nix#L331 - optionalAttrs = cond: as: if cond then as else {}; - - # fetchTarball version that is compatible between all the versions of Nix - builtins_fetchTarball = { url, name ? null, sha256 }@attrs: - let - inherit (builtins) lessThan nixVersion fetchTarball; - in - if lessThan nixVersion "1.12" then - fetchTarball ({ inherit url; } // (optionalAttrs (!isNull name) { inherit name; })) - else - fetchTarball attrs; - - # fetchurl version that is compatible between all the versions of Nix - builtins_fetchurl = { url, name ? null, sha256 }@attrs: - let - inherit (builtins) lessThan nixVersion fetchurl; - in - if lessThan nixVersion "1.12" then - fetchurl ({ inherit url; } // (optionalAttrs (!isNull name) { inherit name; })) - else - fetchurl attrs; - - # Create the final "sources" from the config - mkSources = config: - mapAttrs ( - name: spec: - if builtins.hasAttr "outPath" spec - then abort - "The values in sources.json should not have an 'outPath' attribute" - else - spec // { outPath = replace name (fetch config.pkgs name spec); } - ) config.sources; - - # The "config" used by the fetchers - mkConfig = - { sourcesFile ? if builtins.pathExists ./sources.json then ./sources.json else null - , sources ? if isNull sourcesFile then {} else builtins.fromJSON (builtins.readFile sourcesFile) - , system ? builtins.currentSystem - , pkgs ? mkPkgs sources system - }: rec { - # The sources, i.e. the attribute set of spec name to spec - inherit sources; - - # The "pkgs" (evaluated nixpkgs) to use for e.g. non-builtin fetchers - inherit pkgs; - }; - -in -mkSources (mkConfig {}) // { __functor = _: settings: mkSources (mkConfig settings); } diff --git a/shell.nix b/shell.nix index 0e4d13be0..db84e3d07 100644 --- a/shell.nix +++ b/shell.nix @@ -1,56 +1,3 @@ -let - # Use `niv update` to update nixpkgs. - # See https://github.com/nmattia/niv/ - sources = import ./nix/sources.nix; - - pkgs = import sources.nixpkgs { config.allowUnfree = true; overlays = []; }; - - my-python = pkgs.python3.withPackages (p: with p; [ - brotli - deepdiff - defusedxml - kaitaistruct - leb128 - lz4 - mutf8 - python-lzo - parameterized - pdfminer - pefile - pillow - protobuf - pyaxmlparser - pytest - python-snappy - pyyaml - telfhash - tlsh - zstd - ]); - -in -pkgs.mkShell { - buildInputs = with pkgs; [ - binutils - cabextract - e2tools - innoextract - libxml2 - lz4 - mailcap - ncompress - openjdk8 - openssl - my-python - protobuf - qemu - rzip - sasquatch - squashfsTools - unrar - unshield - utillinux - zchunk - zstd - ]; -} +(import (fetchTarball https://github.com/edolstra/flake-compat/archive/master.tar.gz) { + src = builtins.fetchGit ./.; +}).shellNix