diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-12-20 18:00:56 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-20 18:00:56 +0000 |
| commit | a1cd7ca1463dc9dc0f26a0354d8bac5a3da7cc0a (patch) | |
| tree | d89a9c8bcbb59af0aed4b96d9e1358c112bb15a5 /pkgs/development/tools | |
| parent | 176c80219db0befaadf84838560f59f088f49646 (diff) | |
| parent | 3d19c43d6045093cc29ab251ad9919fe0296e6c5 (diff) | |
Merge master into staging-next
Diffstat (limited to 'pkgs/development/tools')
| -rw-r--r-- | pkgs/development/tools/analysis/checkov/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/tools/electron/common.nix | 10 |
2 files changed, 11 insertions, 3 deletions
diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix index 482b0f092bb8b..cddd059fdd610 100644 --- a/pkgs/development/tools/analysis/checkov/default.nix +++ b/pkgs/development/tools/analysis/checkov/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "checkov"; - version = "3.1.38"; + version = "3.1.40"; pyproject = true; src = fetchFromGitHub { owner = "bridgecrewio"; repo = "checkov"; rev = "refs/tags/${version}"; - hash = "sha256-03tukEuNaQP3YNv66FuDKzeTPcPfPY4PT6ZWRLFDu6c="; + hash = "sha256-KnkaE40NVcZAM9U/WmifM9D7xOTRV1Mi7lFIh/r4WJQ="; }; patches = [ diff --git a/pkgs/development/tools/electron/common.nix b/pkgs/development/tools/electron/common.nix index 497a321c3f140..749aafc449241 100644 --- a/pkgs/development/tools/electron/common.nix +++ b/pkgs/development/tools/electron/common.nix @@ -174,8 +174,12 @@ in (chromium.override { upstream-info = info.chromium; }).mkDerivation (base: { }; installPhase = '' + runHook preInstall + mkdir -p $libExecPath unzip -d $libExecPath out/Release/dist.zip + + runHook postInstall ''; requiredSystemFeatures = [ "big-parallel" ]; @@ -183,14 +187,18 @@ in (chromium.override { upstream-info = info.chromium; }).mkDerivation (base: { passthru = { inherit info; headers = stdenv.mkDerivation rec { - name = "node-v${info.node}-headers.tar.xz"; + name = "node-v${info.node}-headers.tar.gz"; nativeBuildInputs = [ python3 ]; src = fetchdep info.deps."src/third_party/electron_node"; buildPhase = '' + runHook preBuild make tar-headers + runHook postBuild ''; installPhase = '' + runHook preInstall mv ${name} $out + runHook postInstall ''; }; }; |