diff --git a/flake.lock b/flake.lock index 0738e90..bd9b739 100644 --- a/flake.lock +++ b/flake.lock @@ -1,16 +1,16 @@ { "nodes": { - "cclyzerpp": { + "cclyzerpp-flake": { "inputs": { "flake-utils": "flake-utils", "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1680025655, - "narHash": "sha256-ZZLoXDLxBaUW3P72cO/YW0jskFX9XnUlwpBSQp//aXg=", + "lastModified": 1680202577, + "narHash": "sha256-q8qsqR8EropYGCXuU+6HQN7w3hkfnLfhRiQo8RAJvSw=", "owner": "peperunas", "repo": "cclyzerpp", - "rev": "684bf8c679f66bf2e4ce92f3108cd588acc57690", + "rev": "f421b1ef48a7c815963b35b880c01b1c3ac86515", "type": "github" }, "original": { @@ -20,6 +20,25 @@ "type": "github" } }, + "edk2-vulnerable": { + "inputs": { + "flake-utils": "flake-utils_2", + "nixpkgs": "nixpkgs_2" + }, + "locked": { + "lastModified": 1680201683, + "narHash": "sha256-oHkLLNztqpJeloDHUulp+VmQ8vKy0mjGH2MU156+Tow=", + "ref": "refs/heads/main", + "rev": "6f81ac8bbc10a4691301c086ba002a845e6d7e4d", + "revCount": 30105, + "type": "git", + "url": "ssh://git@github.com/BreakingBoot/edk2-vulnerable" + }, + "original": { + "type": "git", + "url": "ssh://git@github.com/BreakingBoot/edk2-vulnerable" + } + }, "flake-utils": { "locked": { "lastModified": 1678901627, @@ -36,6 +55,21 @@ } }, "flake-utils_2": { + "locked": { + "lastModified": 1676283394, + "narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "3db36a8b464d0c4532ba1c7dda728f4576d6d073", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_3": { "locked": { "lastModified": 1678901627, "narHash": "sha256-U02riOqrKKzwjsxc/400XnElV+UtPUQWpANPlyazjH0=", @@ -52,11 +86,27 @@ }, "nixpkgs": { "locked": { - "lastModified": 1679553901, - "narHash": "sha256-OhmJc18XNIj0wVC4ZoPnCVoY3SGfcPxaeKJOz1WHo5M=", + "lastModified": 1679966490, + "narHash": "sha256-k0jV+y1jawE6w4ZvKgXDNg4+O9NNtcaWwzw8gufv0b4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "09ad6a72359f6aff0f96ce8e4d1ec2d1271ad15d", + "rev": "5b7cd5c39befee629be284970415b6eb3b0ff000", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-22.11", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_2": { + "locked": { + "lastModified": 1676790509, + "narHash": "sha256-W9uWAWokgS8US8rJf79qBLS2M+ZgIscfoz+KsNE7VGQ=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "a1291d0d020a200c7ce3c48e96090bfa4890a475", "type": "github" }, "original": { @@ -66,13 +116,13 @@ "type": "github" } }, - "nixpkgs_2": { + "nixpkgs_3": { "locked": { - "lastModified": 1679793451, - "narHash": "sha256-JafTtgMDATE8dZOImBhWMA9RCn9AP8FVOpN+9K/tTlg=", + "lastModified": 1680151711, + "narHash": "sha256-7vMCXF4t7E07C1jDNzLMDXvPDAuDjNFMX3Zin+8nYY4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "0cd51a933d91078775b300cf0f29aa3495231aa2", + "rev": "e608c90a1cf381dde6ac9e0f085337150f2af3e2", "type": "github" }, "original": { @@ -84,9 +134,10 @@ }, "root": { "inputs": { - "cclyzerpp": "cclyzerpp", - "flake-utils": "flake-utils_2", - "nixpkgs": "nixpkgs_2" + "cclyzerpp-flake": "cclyzerpp-flake", + "edk2-vulnerable": "edk2-vulnerable", + "flake-utils": "flake-utils_3", + "nixpkgs": "nixpkgs_3" } } }, diff --git a/flake.nix b/flake.nix index af4fd5b..e2f857f 100644 --- a/flake.nix +++ b/flake.nix @@ -1,13 +1,17 @@ { inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable"; - cclyzerpp.url = "github:peperunas/cclyzerpp/flake"; + cclyzerpp-flake.url = "github:peperunas/cclyzerpp/flake"; + edk2-vulnerable.url = "git+ssh://git@github.com/BreakingBoot/edk2-vulnerable"; flake-utils.url = "github:numtide/flake-utils"; }; - outputs = { self, nixpkgs, flake-utils, cclyzerpp }: + outputs = { self, nixpkgs, flake-utils, cclyzerpp-flake, edk2-vulnerable }: flake-utils.lib.eachDefaultSystem (system: let + inherit (edk2-vulnerable.packages.${system}) bitcodeEDK2; + inherit (cclyzerpp-flake.packages.${system}) cclyzerpp; + pkgs = import nixpkgs { inherit system; config.allowUnfree = true; @@ -17,16 +21,14 @@ inherit packages; }; - cclyzer = cclyzerpp.defaultPackage.${system}; - - shell = with pkgs; shellWithPkgs [ codeql klee souffle cclyzer ]; + shell = with pkgs; shellWithPkgs [ codeql klee souffle cclyzerpp bitcodeEDK2 ]; in { packages = rec { workbench = { - files_handling = pkgs.callPackage ./workbench/files_handling/default.nix { cclyzerpp = cclyzer; }; + files_handling = pkgs.callPackage ./workbench/files_handling/default.nix { }; }; - + default = workbench.files_handling; }; devShell = shell;