diff options
author | Alyssa Ross <hi@alyssa.is> | 2020-01-26 22:39:25 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2020-01-26 22:39:25 +0000 |
commit | bd2ad77e38991af0d7a3a5d82bd3f41a077ce401 (patch) | |
tree | d1e26d039eb5004eb7c836aafff259cc198626d4 /pkgs/development/tools/analysis | |
parent | e5d8381542a8d084371d26013fab199f52474be7 (diff) | |
parent | ad3f0d9829119b611350a9be1c226fb625f1f310 (diff) | |
download | nixpkgs-bd2ad77e38991af0d7a3a5d82bd3f41a077ce401.tar nixpkgs-bd2ad77e38991af0d7a3a5d82bd3f41a077ce401.tar.gz nixpkgs-bd2ad77e38991af0d7a3a5d82bd3f41a077ce401.tar.bz2 nixpkgs-bd2ad77e38991af0d7a3a5d82bd3f41a077ce401.tar.lz nixpkgs-bd2ad77e38991af0d7a3a5d82bd3f41a077ce401.tar.xz nixpkgs-bd2ad77e38991af0d7a3a5d82bd3f41a077ce401.tar.zst nixpkgs-bd2ad77e38991af0d7a3a5d82bd3f41a077ce401.zip |
Merge remote-tracking branch 'nixpkgs/master' into master
Diffstat (limited to 'pkgs/development/tools/analysis')
4 files changed, 11 insertions, 19 deletions
diff --git a/pkgs/development/tools/analysis/coz/default.nix b/pkgs/development/tools/analysis/coz/default.nix index 1ef3457e8e9..3775d09b27d 100644 --- a/pkgs/development/tools/analysis/coz/default.nix +++ b/pkgs/development/tools/analysis/coz/default.nix @@ -7,13 +7,13 @@ }: stdenv.mkDerivation rec { pname = "coz"; - version = "0.2.0"; + version = "0.2.1"; src = fetchFromGitHub { owner = "plasma-umass"; repo = "coz"; rev = version; - sha256 = "0a55q3s8ih1r9x6fp7wkg3n5h1yd9pcwg74k33d1r94y3j3m0znr"; + sha256 = "0val36yw987b1558iiyk3nqg0yy5k9y5wh49v91zj3cs58mmfyhc"; }; postConfigure = '' diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix index ecd8f3a17ec..c0b9dff3183 100644 --- a/pkgs/development/tools/analysis/flow/default.nix +++ b/pkgs/development/tools/analysis/flow/default.nix @@ -1,14 +1,14 @@ -{ stdenv, fetchFromGitHub, ocamlPackages, CoreServices, fetchpatch }: +{ stdenv, fetchFromGitHub, ocamlPackages, CoreServices }: stdenv.mkDerivation rec { pname = "flow"; - version = "0.114.0"; + version = "0.117.0"; src = fetchFromGitHub { owner = "facebook"; repo = "flow"; rev = "refs/tags/v${version}"; - sha256 = "1dkp3v898b5vd0a9fl5xknwbbqv23v0icqml8ypyhzrv6wz5qiy3"; + sha256 = "1s3qlq0jfx94fr7vzzc7jw8l5mvsrrxhq9mcf50aq0ipz0fz0il9"; }; installPhase = '' @@ -16,17 +16,9 @@ stdenv.mkDerivation rec { install -Dm644 resources/shell/bash-completion $out/share/bash-completion/completions/flow ''; - buildInputs = (with ocamlPackages; [ ocaml findlib ocamlbuild dtoa core_kernel sedlex ocaml_lwt lwt_log lwt_ppx ppx_deriving ppx_gen_rec ppx_tools_versioned visitors wtf8 ocaml-migrate-parsetree ]) + buildInputs = (with ocamlPackages; [ ocaml findlib ocamlbuild dtoa core_kernel sedlex_2 ocaml_lwt lwt_log lwt_ppx ppx_deriving ppx_gen_rec ppx_tools_versioned visitors wtf8 ocaml-migrate-parsetree ]) ++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices ]; - patches = [ - # Fix List.compare labeled argument. Remove when https://github.com/facebook/flow/pull/8191 is merged - (fetchpatch { - url = "https://github.com/facebook/flow/commit/1625664ec7290d4128587d96cb878571751f8881.patch"; - sha256 = "18fan0d2xa6z4ilbr7ha3vhnfqlr2s6mb02sgpv8ala99b0mcgmn"; - }) - ]; - meta = with stdenv.lib; { description = "A static type checker for JavaScript"; homepage = https://flow.org/; diff --git a/pkgs/development/tools/analysis/frama-c/default.nix b/pkgs/development/tools/analysis/frama-c/default.nix index 701db7a158f..7d24bf5e0d5 100644 --- a/pkgs/development/tools/analysis/frama-c/default.nix +++ b/pkgs/development/tools/analysis/frama-c/default.nix @@ -23,12 +23,12 @@ in stdenv.mkDerivation rec { pname = "frama-c"; - version = "19.1"; - slang = "Potassium"; + version = "20.0"; + slang = "Calcium"; src = fetchurl { url = "http://frama-c.com/download/frama-c-${version}-${slang}.tar.gz"; - sha256 = "16xsc4jv3ycs5dqprpkh9isr6l2w6i4bq83msqmkdc7l7hf53vrd"; + sha256 = "03dvn162djylj2skmk6vv75gh87mm4s5cspkzcrlm5x0rlla2yqn"; }; preConfigure = lib.optionalString stdenv.cc.isClang "configureFlagsArray=(\"--with-cpp=clang -E -C\")"; diff --git a/pkgs/development/tools/analysis/snowman/default.nix b/pkgs/development/tools/analysis/snowman/default.nix index f8f2f55c5aa..2f7ff219081 100644 --- a/pkgs/development/tools/analysis/snowman/default.nix +++ b/pkgs/development/tools/analysis/snowman/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchFromGitHub, cmake, boost, qtbase }: +{ stdenv, mkDerivation, fetchFromGitHub, cmake, boost, qtbase }: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "snowman"; version = "0.1.3"; |