Unverified Commit b0d99987 authored by Weijia Wang's avatar Weijia Wang Committed by GitHub
Browse files

Merge pull request #299511 from 06kellyjac/semgrep_update 

semgrep{,-core}: 1.63.0 -> 1.66.2
parents 4c364b7c fe6b8ada

pkgs/tools/security/semgrep/common.nix

+7 −7
Original line number Diff line number Diff line 
{ lib }:



rec {

  version = "1.63.0";

  version = "1.66.2";



  srcHash = "sha256-VMB+slexCXxv9z6kOxbYQrnet6sb4ZKTATXWkLix9u4=";

  srcHash = "sha256-xonZzZsAkAPMVINGEA10CvQ1diYgHBowNsR2pk4tYr8=";



  # submodule dependencies

  # these are fetched so we:
@@ -13,8 +13,8 @@ rec { 
    "cli/src/semgrep/semgrep_interfaces" = {

      owner = "semgrep";

      repo = "semgrep-interfaces";

      rev = "8751faab89f23f7af3a92f5d4d4e6451ccaa205a";

      hash = "sha256-0Si4wUymwA2k/u953GifYgHKi6gvu3FiaDHm1Kj30sA=";

      rev = "215a54782174de84f97188632b4a37e35ba0f827";

      hash = "sha256-Q8E5LkC/NV0wvt9ZwhkoPGjPlDavVHHMnX0sVNK3dAM=";

    };

  };
@@ -25,15 +25,15 @@ rec { 
  core = {

    x86_64-linux = {

      platform = "any";

      hash = "sha256-KBiYd1zWDxs5T2AGR49o/X2J6espuqi7ykCh3Zsg8i4=";

      hash = "sha256-f/RcuJyd8y2bMclMxZ1BdNTVixhjLz0UxSKGZm+H8yI=";

    };

    x86_64-darwin = {

      platform = "macosx_10_14_x86_64";

      hash = "sha256-EfVpKdRE5qvEVMGu8QUM183YPNDjgxQlca3nUb3m1tw=";

      hash = "sha256-4H9PT41lPydMFl51O2CgeMQiTE66fZ8RP26CVT7Y7Ok=";

    };

    aarch64-darwin = {

      platform = "macosx_11_0_arm64";

      hash = "sha256-ksqkVdE7aIbeETSxLpDXef6Hmv7G5LxQ0+v+/G9OpKk=";

      hash = "sha256-WxQ0ohojzhWmPo208xN98F5GwbNzQuxCjSwP7h3rBGA=";

    };

  };

pkgs/tools/security/semgrep/default.nix

+6 −16
Original line number Diff line number Diff line
@@ -27,14 +27,6 @@ buildPythonApplication rec { 
    hash = common.srcHash;

  };



  patches = [

    (fetchpatch {

      name = "fix-test_dump_engine-test-for-nix-store-path.patch";

      url = "https://github.com/semgrep/semgrep/commit/c7553c1a61251146773617f80a2d360e6b6ab3f9.patch";

      hash = "sha256-A3QdL0DDh/pbDpRIBACUie7PEvC17iG4t6qTnmPIwA4=";

    })

  ];



  # prepare a subset of the submodules as we only need a handful

  # and there are many many submodules total

  postPatch = (lib.concatStringsSep "\n" (lib.mapAttrsToList
@@ -94,6 +86,12 @@ buildPythonApplication rec { 
    types-freezegun

  ]);



  disabledTestPaths = [

    "tests/default/e2e"

    "tests/default/e2e-pro"

    "tests/default/e2e-pysemgrep"

  ];



  disabledTests = [

    # requires networking

    "test_send"
@@ -117,14 +115,6 @@ buildPythonApplication rec { 
    # replace old semgrep with wrapped one

    rm ./bin/semgrep

    ln -s $out/bin/semgrep ./bin/semgrep



    # disabledTestPaths doesn't manage to avoid the e2e tests

    # remove them from pyproject.toml

    # and remove need for pytest-split

    substituteInPlace pyproject.toml \

      --replace '"tests/e2e",' "" \

      --replace '"tests/e2e-pro",' "" \

      --replace 'addopts = "--splitting-algorithm=least_duration"' ""

  '';



  postCheck = ''