diff options
Diffstat (limited to 'pkgs/development/tools/analysis')
26 files changed, 115 insertions, 120 deletions
diff --git a/pkgs/development/tools/analysis/actionlint/default.nix b/pkgs/development/tools/analysis/actionlint/default.nix index 7b525b412054a..a2c1e0a06c0b8 100644 --- a/pkgs/development/tools/analysis/actionlint/default.nix +++ b/pkgs/development/tools/analysis/actionlint/default.nix @@ -13,7 +13,7 @@ buildGoModule rec { sha256 = "sha256-wjLY40bxpoMk6YIG/4KbjxSWUDVNn3cX5OcsgfEPjzk="; }; - vendorSha256 = "sha256-J/DlugisnCvbYpqMQuyISyiKHB0hepHrQKsnzSes2zs="; + vendorSha256 = "sha256-0tytdTZxnWYl8AxaquF0ArY3dy51j8H2kzw69qcSHzk="; nativeBuildInputs = [ ronn installShellFiles ]; diff --git a/pkgs/development/tools/analysis/bingrep/default.nix b/pkgs/development/tools/analysis/bingrep/default.nix index d354b71fc9f3f..2d8348bfc9bc3 100644 --- a/pkgs/development/tools/analysis/bingrep/default.nix +++ b/pkgs/development/tools/analysis/bingrep/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "bingrep"; - version = "0.8.5"; + version = "0.9.0"; src = fetchFromGitHub { owner = "m4b"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ayA3aEidZPa5GJgbbm5K3X2Xgd5Eb6TgUU80Gw/p07w="; + hash = "sha256-M3BYj1SKQKjEqP9cxaVlh7UeleDbcx6JN+UI6Ez+QJ8="; }; - cargoSha256 = "sha256-XcXllex7UEufV5URhH7aqln1tNxwaiAETO3fUKmHf7s="; + cargoHash = "sha256-botAoLNg/qTh+cjPXcjo/Ol2Vktj/c5130k5falEuLY="; meta = with lib; { description = "Greps through binaries from various OSs and architectures, and colors them"; diff --git a/pkgs/development/tools/analysis/binlore/default.nix b/pkgs/development/tools/analysis/binlore/default.nix index aba1c59b979d9..ac46bd4c41851 100644 --- a/pkgs/development/tools/analysis/binlore/default.nix +++ b/pkgs/development/tools/analysis/binlore/default.nix @@ -30,8 +30,8 @@ let src = fetchFromGitHub { owner = "abathur"; repo = "binlore"; - rev = "v0.1.3"; - hash = "sha256-+rgv8gAQ3ptOpL/EhbKr/jq+k/4Lpn06/2qON+Ps2wE="; + rev = "v0.1.4"; + hash = "sha256-+N0Bqyaj/mAwrcgFtUI8czmKo3VW6J8ZRxaPEghp7QM="; }; /* binlore has one one more yallbacks responsible for diff --git a/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix b/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix index 6402f90d56762..101a4f948fce4 100644 --- a/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix +++ b/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "cargo-tarpaulin"; - version = "0.18.3"; + version = "0.19.1"; src = fetchFromGitHub { owner = "xd009642"; repo = "tarpaulin"; rev = version; - sha256 = "sha256-n43n9rmLWmGF7JXz/jspT6Stn0fQnkbkxqbuqXiZLHA="; + sha256 = "sha256-H/EQTS+d317icCZdOWTvykzIFQC7ia7/jYFkImgogps="; }; nativeBuildInputs = [ @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ curl Security ]; - cargoSha256 = "sha256-dJey7z0gRUu5MRKOfR909eQNTt3zpZnoWYvRhHzZlGs="; + cargoSha256 = "sha256-A3J5od6yT7eVU66WfvG/umne0RDBZCf8IvQpW6OTZSE="; #checkFlags = [ "--test-threads" "1" ]; doCheck = false; diff --git a/pkgs/development/tools/analysis/cccc/default.nix b/pkgs/development/tools/analysis/cccc/default.nix index bcbda8ad7e605..dc7cccd9dc1db 100644 --- a/pkgs/development/tools/analysis/cccc/default.nix +++ b/pkgs/development/tools/analysis/cccc/default.nix @@ -1,14 +1,11 @@ { lib, stdenv, fetchurl }: -let - name = "cccc"; +stdenv.mkDerivation rec { + pname = "cccc"; version = "3.1.4"; -in -stdenv.mkDerivation { - name = "${name}-${version}"; src = fetchurl { - url = "mirror://sourceforge/${name}/${version}/${name}-${version}.tar.gz"; + url = "mirror://sourceforge/cccc/${version}/cccc-${version}.tar.gz"; sha256 = "1gsdzzisrk95kajs3gfxks3bjvfd9g680fin6a9pjrism2lyrcr7"; }; diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix index fdd6fefd76005..6224a10ca7c23 100644 --- a/pkgs/development/tools/analysis/checkov/default.nix +++ b/pkgs/development/tools/analysis/checkov/default.nix @@ -6,36 +6,22 @@ let py = python3.override { packageOverrides = self: super: { - boto3 = super.boto3.overridePythonAttrs (oldAttrs: rec { - version = "1.17.112"; - src = oldAttrs.src.override { - inherit version; - sha256 = "1byqrffbgpp1mq62gnn3w3hnm54dfar0cwgvmkl7mrgbwz5xmdh8"; - }; - }); - - botocore = super.botocore.overridePythonAttrs (oldAttrs: rec { - version = "1.20.112"; - src = oldAttrs.src.override { - inherit version; - sha256 = "1ksdjh3mwbzgqgfj58vyrhann23b9gqam8id2svmpdmmdq5vgffh"; - }; - }); - - s3transfer = super.s3transfer.overridePythonAttrs (oldAttrs: rec { - version = "0.4.2"; + dpath = super.dpath.overridePythonAttrs (oldAttrs: rec { + version = "1.5.0"; src = oldAttrs.src.override { inherit version; - sha256 = "1cp169vz9rvng7dwbn33fgdbl3b014zpsdqsnfxxw7jm2r5jy0nb"; + sha256 = "06rn91n2izw7czncgql71w7acsa8wwni51njw0c6s8w4xas1arj9"; }; + doCheck = false; }); - dpath = super.dpath.overridePythonAttrs (oldAttrs: rec { - version = "1.5.0"; + jsonschema = super.jsonschema.overridePythonAttrs (oldAttrs: rec { + version = "3.2.0"; src = oldAttrs.src.override { inherit version; - sha256 = "06rn91n2izw7czncgql71w7acsa8wwni51njw0c6s8w4xas1arj9"; + sha256 = "sha256-yKhbKNN3zHc35G4tnytPRO48Dh3qxr9G3e/HGH0weXo="; }; + SETUPTOOLS_SCM_PRETEND_VERSION = version; doCheck = false; }); @@ -46,13 +32,13 @@ with py.pkgs; buildPythonApplication rec { pname = "checkov"; - version = "2.0.701"; + version = "2.0.873"; src = fetchFromGitHub { owner = "bridgecrewio"; repo = pname; rev = version; - sha256 = "sha256-jhMhi+72lB70WXzPRWfhZjqmkEjvBMjKcnVic41PDJk="; + hash = "sha256-81gNvfaFqTEGReOP7LgcN5OLU3xeO62r/45b5lEEgow="; }; nativeBuildInputs = with py.pkgs; [ @@ -78,10 +64,13 @@ buildPythonApplication rec { dpath GitPython jmespath + jsonpath-ng + jsonschema junit-xml networkx packaging policyuniverse + prettytable pyyaml semantic-version tabulate @@ -93,7 +82,6 @@ buildPythonApplication rec { checkInputs = with py.pkgs; [ aioresponses - jsonschema mock pytest-asyncio pytest-mock @@ -101,11 +89,28 @@ buildPythonApplication rec { pytestCheckHook ]; + postPatch = '' + substituteInPlace setup.py \ + --replace "cyclonedx-python-lib>=0.11.0,<1.0.0" "cyclonedx-python-lib>=0.11.0" \ + --replace "prettytable>=3.0.0" "prettytable" + ''; + + preCheck = '' + export HOME=$(mktemp -d); + ''; + disabledTests = [ # No API key available "api_key" # Requires network access "TestSarifReport" + # Will probably be fixed in one of the next releases + "test_valid_cyclonedx_bom" + "test_record_relative_path_with_direct_oberlay" + "test_record_relative_path_with_direct_prod2_oberlay" + # Requires prettytable release which is only available in staging + "test_skipped_check_exists" + "test_record_relative_path_with_relative_dir" ]; disabledTestPaths = [ @@ -115,6 +120,9 @@ buildPythonApplication rec { "tests/terraform/" # Performance tests have no value for us "performance_tests/test_checkov_performance.py" + # Requires prettytable release which is only available in staging + "tests/sca_package/" + "tests/test_runner_filter.py" ]; pythonImportsCheck = [ diff --git a/pkgs/development/tools/analysis/checkstyle/default.nix b/pkgs/development/tools/analysis/checkstyle/default.nix index c22f25fbc9383..6c135beea4582 100644 --- a/pkgs/development/tools/analysis/checkstyle/default.nix +++ b/pkgs/development/tools/analysis/checkstyle/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl, makeWrapper, jre }: stdenv.mkDerivation rec { - version = "8.45.1"; + version = "9.3"; pname = "checkstyle"; src = fetchurl { url = "https://github.com/checkstyle/checkstyle/releases/download/checkstyle-${version}/checkstyle-${version}-all.jar"; - sha256 = "sha256-H4w/rjVBhZCfBzLavd4/BkojwhCu05VsxrtzyS0wyk4="; + sha256 = "sha256-Aq0zB+RgWafE+K9sX2H0d7xf2RDlavsUXEWQTJXSE6w="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/analysis/codeql/default.nix b/pkgs/development/tools/analysis/codeql/default.nix index 7491b5892744e..8bf2ed7c04ec8 100644 --- a/pkgs/development/tools/analysis/codeql/default.nix +++ b/pkgs/development/tools/analysis/codeql/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "codeql"; - version = "2.7.3"; + version = "2.8.0"; dontConfigure = true; dontBuild = true; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { src = fetchzip { url = "https://github.com/github/codeql-cli-binaries/releases/download/v${version}/codeql.zip"; - sha256 = "sha256-wvN9NODw8JV30mDGhs7qlCoyp3Z3bJSGUfQ6+GtE5kE="; + sha256 = "sha256-IcYD9o6rv1ti4IvTEEJ5iV1OdJP7cHN0vetrvabxeas="; }; nativeBuildInputs = [ diff --git a/pkgs/development/tools/analysis/cppcheck/default.nix b/pkgs/development/tools/analysis/cppcheck/default.nix index f7e6f040ba2e9..7f9e82162ea47 100644 --- a/pkgs/development/tools/analysis/cppcheck/default.nix +++ b/pkgs/development/tools/analysis/cppcheck/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "cppcheck"; - version = "2.6"; + version = "2.7"; src = fetchurl { url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.bz2"; - sha256 = "sha256-rQuvhVgpVBdwCCekraG+cqxR9PUs/wm5pjVQHzTpaKI="; + sha256 = "sha256-rHTAlzxGoFJ2D0/3ymqEYWyleVUQVC0ZWm8SLFMHkpE="; }; buildInputs = [ pcre ] ++ lib.optionals withZ3 [ z3 ]; diff --git a/pkgs/development/tools/analysis/dotenv-linter/default.nix b/pkgs/development/tools/analysis/dotenv-linter/default.nix index 983dd2c2a999d..49331dbfceb52 100644 --- a/pkgs/development/tools/analysis/dotenv-linter/default.nix +++ b/pkgs/development/tools/analysis/dotenv-linter/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "dotenv-linter"; - version = "3.1.1"; + version = "3.2.0"; src = fetchFromGitHub { owner = "dotenv-linter"; repo = "dotenv-linter"; rev = "v${version}"; - sha256 = "sha256-kBBn8Lgb3427K00Ag35Ei9oBD7L0Zp/lr0cAKqZpULo="; + sha256 = "sha256-YWL1aPcMdU4lo7h/T2sdl2H6qnx3lfMtV39Ak4yP88w="; }; - cargoSha256 = "sha256-7Porqqh6lYeBCK2pAtbL9nxtORB9rqSyVdJDoy1/ZDo="; + cargoSha256 = "sha256-q59hpnXc00OzrJk1KOWbIPQYfIE+7ku9XtTDXHgwQBg="; meta = with lib; { description = "Lightning-fast linter for .env files. Written in Rust"; diff --git a/pkgs/development/tools/analysis/eresi/default.nix b/pkgs/development/tools/analysis/eresi/default.nix index b8abad44f241c..158f6545b714b 100644 --- a/pkgs/development/tools/analysis/eresi/default.nix +++ b/pkgs/development/tools/analysis/eresi/default.nix @@ -59,8 +59,8 @@ stdenv.mkDerivation rec { meta = { description = "The ERESI Reverse Engineering Software Interface"; - license = lib.licenses.gpl2; - homepage = "http://www.eresi-project.org/"; + license = lib.licenses.gpl2Only; + homepage = "https://github.com/thorkill/eresi"; # Formerly http://www.eresi-project.org/ platforms = lib.platforms.linux; }; } diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix index 56929f16c4777..36c8528570419 100644 --- a/pkgs/development/tools/analysis/flow/default.nix +++ b/pkgs/development/tools/analysis/flow/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "flow"; - version = "0.168.0"; + version = "0.172.0"; src = fetchFromGitHub { owner = "facebook"; repo = "flow"; rev = "v${version}"; - sha256 = "sha256:0bd5xja547gwjh7zn26l52mssp6l9djd0lfc581zj30yx07aimi5"; + sha256 = "sha256-N3mP1dhul7Ljn278CJmge4IrVllQJsc73A3/7mTSU70="; }; installPhase = '' diff --git a/pkgs/development/tools/analysis/frama-c/default.nix b/pkgs/development/tools/analysis/frama-c/default.nix index 1b627376aca02..b5ae5055d02d9 100644 --- a/pkgs/development/tools/analysis/frama-c/default.nix +++ b/pkgs/development/tools/analysis/frama-c/default.nix @@ -44,8 +44,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoconf wrapGAppsHook ]; buildInputs = with ocamlPackages; [ - ncurses ocaml findlib ltl2ba ocamlgraph ocamlgraph_gtk yojson menhirLib camlzip - lablgtk coq graphviz zarith apron why3 mlgmpidl doxygen + ncurses ocaml findlib ltl2ba ocamlgraph yojson menhirLib camlzip + lablgtk3 lablgtk3-sourceview3 coq graphviz zarith apron why3 mlgmpidl doxygen gdk-pixbuf ]; diff --git a/pkgs/development/tools/analysis/ikos/default.nix b/pkgs/development/tools/analysis/ikos/default.nix index 26c7b6dd0b700..a1eec36204bf7 100644 --- a/pkgs/development/tools/analysis/ikos/default.nix +++ b/pkgs/development/tools/analysis/ikos/default.nix @@ -10,12 +10,12 @@ let in stdenv.mkDerivation rec { - name = "ikos"; + pname = "ikos"; version = "3.0"; src = fetchFromGitHub { owner = "NASA-SW-VnV"; - repo = name; + repo = "ikos"; rev = "v${version}"; sha256 = "0k3kp1af0qx3l1x6a4sl4fm8qlwchjvwkvs2ck0fhfnc62q2im5f"; }; diff --git a/pkgs/development/tools/analysis/oclgrind/default.nix b/pkgs/development/tools/analysis/oclgrind/default.nix index 72154e909b65d..3752fa8e251db 100644 --- a/pkgs/development/tools/analysis/oclgrind/default.nix +++ b/pkgs/development/tools/analysis/oclgrind/default.nix @@ -1,18 +1,18 @@ -{ lib, stdenv, fetchFromGitHub, cmake, llvmPackages, readline, python }: +{ lib, stdenv, fetchFromGitHub, cmake, llvmPackages, readline, python2 }: stdenv.mkDerivation rec { pname = "oclgrind"; - version = "19.10"; + version = "21.10"; src = fetchFromGitHub { owner = "jrprice"; repo = "oclgrind"; rev = "v${version}"; - sha256 = "12v5z5x3ls26p3y3yc4mqmh12cazc0nlrwvmfbn6cyg4af9dp0zn"; + sha256 = "sha256-DGCF7X2rPV1w9guxg2bMylRirXQgez24sG7Unlct3ow="; }; nativeBuildInputs = [ cmake ]; - buildInputs = [ llvmPackages.llvm llvmPackages.clang-unwrapped readline python ]; + buildInputs = [ llvmPackages.llvm llvmPackages.clang-unwrapped readline python2 ]; cmakeFlags = [ "-DCLANG_ROOT=${llvmPackages.clang-unwrapped}" diff --git a/pkgs/development/tools/analysis/pmd/default.nix b/pkgs/development/tools/analysis/pmd/default.nix index 64ab4a315de11..da73737530ed7 100644 --- a/pkgs/development/tools/analysis/pmd/default.nix +++ b/pkgs/development/tools/analysis/pmd/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "pmd"; - version = "6.41.0"; + version = "6.42.0"; src = fetchurl { url = "mirror://sourceforge/pmd/pmd-bin-${version}.zip"; - sha256 = "sha256-kXyUukqLFIdaBpO+oimyrzmGm6bNwoQaRDIoMtZq45k="; + sha256 = "sha256-rVqHMhiuFLVTz/J9TGnA/42m9GaGORsf+CrUUqsdUfs="; }; nativeBuildInputs = [ unzip makeWrapper ]; @@ -24,6 +24,6 @@ stdenv.mkDerivation rec { homepage = "https://pmd.github.io/"; changelog = "https://pmd.github.io/pmd-${version}/pmd_release_notes.html"; platforms = platforms.unix; - license = with licenses; [ bsdOriginal asl20 lgpl3Plus ]; + license = with licenses; [ bsdOriginal asl20 ]; }; } diff --git a/pkgs/development/tools/analysis/qcachegrind/default.nix b/pkgs/development/tools/analysis/qcachegrind/default.nix index 1f7c6641b1cc3..5ce79a0924883 100644 --- a/pkgs/development/tools/analysis/qcachegrind/default.nix +++ b/pkgs/development/tools/analysis/qcachegrind/default.nix @@ -1,14 +1,12 @@ -{ lib, stdenv, qmake, qtbase, perl, python, php, kcachegrind, wrapQtAppsHook }: +{ lib, stdenv, qmake, qtbase, perl, python2, php, kcachegrind, wrapQtAppsHook }: -let - name = lib.replaceStrings ["kcachegrind"] ["qcachegrind"] kcachegrind.name; - -in stdenv.mkDerivation { - inherit name; +stdenv.mkDerivation { + pname = "qcachegrind"; + version = kcachegrind.version; src = kcachegrind.src; - buildInputs = [ qtbase perl python php ]; + buildInputs = [ qtbase perl python2 php ]; nativeBuildInputs = [ qmake wrapQtAppsHook ]; diff --git a/pkgs/development/tools/analysis/radare2/default.nix b/pkgs/development/tools/analysis/radare2/default.nix index c50f75c154eac..f37d6a6ef82a7 100644 --- a/pkgs/development/tools/analysis/radare2/default.nix +++ b/pkgs/development/tools/analysis/radare2/default.nix @@ -44,13 +44,13 @@ let in stdenv.mkDerivation rec { pname = "radare2"; - version = "5.5.4"; + version = "5.6.0"; src = fetchFromGitHub { owner = "radare"; repo = "radare2"; rev = version; - sha256 = "sha256-zELmNpbT1JCt0UAzHwzcTDN9QZTLQY0+rG9zVRWxiFg="; + sha256 = "sha256-AhO7Ev/4M9dtogNIMWOc03ARD5H2gdlRXR4Qpnkf7bw="; }; preBuild = '' @@ -62,15 +62,11 @@ stdenv.mkDerivation rec { ''; postFixup = lib.optionalString stdenv.isDarwin '' - for file in $out/bin/rasm2 $out/bin/ragg2 $out/bin/rabin2 $out/lib/libr_asm.${version}.dylib; do + for file in $out/bin/rasm2 $out/bin/ragg2 $out/bin/rabin2 $out/lib/libr_asm.${version}.dylib $out/lib/libr_anal.${version}.dylib; do install_name_tool -change libcapstone.4.dylib ${capstone}/lib/libcapstone.4.dylib $file done ''; - postInstall = '' - install -D -m755 $src/binr/r2pm/r2pm $out/bin/r2pm - ''; - WITHOUT_PULL = "1"; makeFlags = [ "GITTAP=${version}" diff --git a/pkgs/development/tools/analysis/randoop/default.nix b/pkgs/development/tools/analysis/randoop/default.nix index 5ea43e5555bc1..4c33ef57a47d0 100644 --- a/pkgs/development/tools/analysis/randoop/default.nix +++ b/pkgs/development/tools/analysis/randoop/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl, unzip }: stdenv.mkDerivation rec { - version = "4.2.6"; + version = "4.3.0"; pname = "randoop"; src = fetchurl { url = "https://github.com/randoop/randoop/releases/download/v${version}/${pname}-${version}.zip"; - sha256 = "sha256-69cKAyMwORG4A91OARmY4uQKgBZIx9N/zc7TZ086CK0="; + sha256 = "sha256-3svBmXcRvscaK8YD4qm/geQSJ6cAm0en/d7H09h41PQ="; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/development/tools/analysis/rizin/cutter.nix b/pkgs/development/tools/analysis/rizin/cutter.nix index 3082d9d4f8299..a6ac4fbce12fd 100644 --- a/pkgs/development/tools/analysis/rizin/cutter.nix +++ b/pkgs/development/tools/analysis/rizin/cutter.nix @@ -11,13 +11,13 @@ mkDerivation rec { pname = "cutter"; - version = "2.0.3"; + version = "2.0.5"; src = fetchFromGitHub { owner = "rizinorg"; repo = "cutter"; rev = "v${version}"; - sha256 = "sha256-OC04d3j8Dfsob1dUjNBc1pSQFxJlexzWJ4v0V3QNkno="; + sha256 = "sha256-ljws9S7ZxZK/Ou8jgGSoR++vtzFTEBywHMhCC/UOLEs="; fetchSubmodules = true; }; diff --git a/pkgs/development/tools/analysis/rizin/default.nix b/pkgs/development/tools/analysis/rizin/default.nix index d76c63044ccd4..c4cdf85a7d8a3 100644 --- a/pkgs/development/tools/analysis/rizin/default.nix +++ b/pkgs/development/tools/analysis/rizin/default.nix @@ -23,11 +23,11 @@ stdenv.mkDerivation rec { pname = "rizin"; - version = "0.3.0"; + version = "0.3.4"; src = fetchurl { url = "https://github.com/rizinorg/rizin/releases/download/v${version}/rizin-src-v${version}.tar.xz"; - sha256 = "sha256-+XW12VIaRfRkLc3Li6ItF4VQfWLNRvxZW2VGtxVYJxY="; + sha256 = "sha256-7qSbOWOHwJ0ZcFqrAqYXzbFWgvymfxAf8rJ+75SnEOk="; }; mesonFlags = [ diff --git a/pkgs/development/tools/analysis/spin/default.nix b/pkgs/development/tools/analysis/spin/default.nix index 5f0c7bffe94fe..62026d527810e 100644 --- a/pkgs/development/tools/analysis/spin/default.nix +++ b/pkgs/development/tools/analysis/spin/default.nix @@ -1,46 +1,42 @@ -{ stdenv, lib, fetchurl, makeWrapper, bison, gcc -, withISpin ? true, tk, swarm, graphviz }: +{ stdenv, lib, fetchFromGitHub, makeWrapper, bison, gcc, tk, swarm, graphviz }: let - binPath = lib.makeBinPath [ gcc ]; - ibinPath = lib.makeBinPath [ gcc tk swarm graphviz tk ]; + binPath = lib.makeBinPath [ gcc graphviz tk swarm ]; +in -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { pname = "spin"; - version = "6.4.9"; - url-version = lib.replaceChars ["."] [""] version; - - src = fetchurl { - # The homepage is behind CloudFlare anti-DDoS protection, which blocks cURL. - # Dropbox mirror from developers: - # https://www.dropbox.com/sh/fgzipzp4wpo3qc1/AADZPqS4aoR-pjNF6OQXRLQHa - # (note that this URL doesn't work aross versions and hash should come from official site) - url = "https://www.dropbox.com/sh/fgzipzp4wpo3qc1/AABtxFePMJmPxsxSvU5cpxh8a/spin${url-version}.tar.gz?raw=1"; - sha256 = "07b7wk3qyfnp4pgwicqd33l7i1krzyihx0cf9zkv81ywaklf5vll"; + version = "6.5.2"; + + src = fetchFromGitHub { + owner = "nimble-code"; + repo = "Spin"; + rev = "version-${version}"; + sha256 = "sha256-drvQXfDZCZRycBZt/VNngy8zs4XVJg+d1b4dQXVcyFU="; }; nativeBuildInputs = [ makeWrapper ]; buildInputs = [ bison ]; - sourceRoot = "Spin/Src${version}"; + sourceRoot = "source/Src"; + + preBuild = '' + mkdir -p $out/bin + mkdir -p $out/share/man/man1 + ''; - installPhase = '' - install -Dm644 ../Man/spin.1 $out/share/man/man1/spin.1 + enableParallelBuilding = true; + makeFlags = [ "DESTDIR=$(out)" ]; - install -Dm755 spin $out/bin/spin - wrapProgram $out/bin/spin \ - --prefix PATH : ${binPath} - '' + lib.optionalString withISpin '' - install -Dm755 ../iSpin/ispin.tcl $out/bin/ispin - wrapProgram $out/bin/ispin \ - --prefix PATH ':' "$out/bin:${ibinPath}" + postInstall = '' + wrapProgram $out/bin/spin --prefix PATH : ${binPath} ''; meta = with lib; { description = "Formal verification tool for distributed software systems"; homepage = "https://spinroot.com/"; - license = licenses.free; - platforms = platforms.linux ++ platforms.darwin; - maintainers = with maintainers; [ pSub ]; + license = licenses.bsd3; + platforms = platforms.unix; + maintainers = with maintainers; [ pSub siraben ]; }; } diff --git a/pkgs/development/tools/analysis/svlint/default.nix b/pkgs/development/tools/analysis/svlint/default.nix index dc38728a44a26..ef4e31e9481f3 100644 --- a/pkgs/development/tools/analysis/svlint/default.nix +++ b/pkgs/development/tools/analysis/svlint/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "svlint"; - version = "0.4.18"; + version = "0.5.1"; src = fetchFromGitHub { owner = "dalance"; repo = "svlint"; rev = "v${version}"; - sha256 = "sha256-p002oWwTQxesWLgLq8oKKzuZKXUdO4C1TZ7lR/Mh1PA="; + sha256 = "sha256-BgkzbKRcZkot3qkwPqSE9QkH3A3HNDuLjpFzKsU+Wb0="; }; - cargoSha256 = "sha256-1WEPJpU/hLn+qjU+ETkmbfZIJTORe3OUdyl605JnYmU="; + cargoSha256 = "sha256-HeFh8H7IN3m4HiEH1QbCBROslzVCzYxGIaeyM4K7gcs="; meta = with lib; { description = "SystemVerilog linter"; diff --git a/pkgs/development/tools/analysis/tflint/default.nix b/pkgs/development/tools/analysis/tflint/default.nix index 951e95b1477c0..869d7e464a528 100644 --- a/pkgs/development/tools/analysis/tflint/default.nix +++ b/pkgs/development/tools/analysis/tflint/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-ltxFduUr+poi4tEjViQXCbe+j3fUdvBG8CTaM7VdpK0="; }; - vendorSha256 = "sha256-iZdWCSkdKG0SXcUtZ0DgDGk25vESlv2dSbcK1gUVTV8="; + vendorSha256 = "sha256-xEmDOP2DbTZ8bpK4OCabIpOwORB8EOJZkHCxL5wBeEU="; doCheck = false; diff --git a/pkgs/development/tools/analysis/tfsec/default.nix b/pkgs/development/tools/analysis/tfsec/default.nix index 75d1b3035ee31..c71df0842cc13 100644 --- a/pkgs/development/tools/analysis/tfsec/default.nix +++ b/pkgs/development/tools/analysis/tfsec/default.nix @@ -5,13 +5,13 @@ buildGoPackage rec { pname = "tfsec"; - version = "0.63.1"; + version = "1.1.5"; src = fetchFromGitHub { owner = "aquasecurity"; repo = pname; rev = "v${version}"; - sha256 = "sha256-khAVb+uwr3qyAWjvMjPG//+FKQJ9qoVwmhsej++IQhs="; + sha256 = "sha256-33NrUav+JljP4keivnVirP7uWojD91cPb+uvOyQDKqs="; }; goPackagePath = "github.com/aquasecurity/tfsec"; diff --git a/pkgs/development/tools/analysis/yallback/default.nix b/pkgs/development/tools/analysis/yallback/default.nix index 17263d1766a80..4e62ff5b9ed87 100644 --- a/pkgs/development/tools/analysis/yallback/default.nix +++ b/pkgs/development/tools/analysis/yallback/default.nix @@ -7,13 +7,13 @@ }: stdenv.mkDerivation rec { - version = "0.1.0"; + version = "0.2.0"; pname = "yallback"; src = fetchFromGitHub { owner = "abathur"; repo = "yallback"; rev = "v${version}"; - hash = "sha256-FaPqpxstKMhqLPFLIdenHgwzDE3gspBbJUSY95tblgI="; + hash = "sha256-t+fdnDJMFiFqN23dSY3TnsZsIDcravtwdNKJ5MiZosE="; }; buildInputs = [ coreutils bashInteractive ]; |