diff options
Diffstat (limited to 'pkgs/development/tools')
-rw-r--r-- | pkgs/development/tools/build-managers/bear/default.nix | 6 | ||||
-rw-r--r-- | pkgs/development/tools/dep/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/tools/gotools/default.nix | 8 | ||||
-rw-r--r-- | pkgs/development/tools/profiling/pyflame/default.nix | 33 | ||||
-rw-r--r-- | pkgs/development/tools/rust/maturin/default.nix | 6 |
5 files changed, 42 insertions, 15 deletions
diff --git a/pkgs/development/tools/build-managers/bear/default.nix b/pkgs/development/tools/build-managers/bear/default.nix index c095f8c695c4..ec1577c51079 100644 --- a/pkgs/development/tools/build-managers/bear/default.nix +++ b/pkgs/development/tools/build-managers/bear/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "bear"; - version = "2.4.1"; + version = "2.4.2"; src = fetchFromGitHub { owner = "rizsotto"; - repo = "Bear"; + repo = pname; rev = version; - sha256 = "0fqhhavyz9ddjc3wgb2ng47bfgk1q4w5bwah74nsa02k8r22pbch"; + sha256 = "1w1kyjzvvy5lj16kn3yyf7iil2cqlfkszi8kvagql7f5h5l6w9b1"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/tools/dep/default.nix b/pkgs/development/tools/dep/default.nix index 456948a97955..d807e79f9edf 100644 --- a/pkgs/development/tools/dep/default.nix +++ b/pkgs/development/tools/dep/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "dep"; - version = "0.5.1"; + version = "0.5.4"; rev = "v${version}"; goPackagePath = "github.com/golang/dep"; @@ -12,7 +12,7 @@ buildGoPackage rec { inherit rev; owner = "golang"; repo = "dep"; - sha256 = "1a5vq5v3ikg6iysbywxr5hcjnbv76nzhk50rd3iq3v2fnyq38dv2"; + sha256 = "02akzbjar1v01rdal746vk6mklff29yk2mqfyjk1zrs0mlg38ygd"; }; buildFlagsArray = ("-ldflags=-s -w -X main.commitHash=${rev} -X main.version=${version}"); diff --git a/pkgs/development/tools/gotools/default.nix b/pkgs/development/tools/gotools/default.nix index be7db5e8b8a6..4c662f9b5c0e 100644 --- a/pkgs/development/tools/gotools/default.nix +++ b/pkgs/development/tools/gotools/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "gotools-unstable"; - version = "2019-07-06"; - rev = "72ffa07ba3db8d09f5215feec0f89464f3028f8e"; + version = "2019-09-05"; + rev = "6b3d1c9ba8bf7ce410f6b490852ec54953383362"; src = fetchgit { inherit rev; url = "https://go.googlesource.com/tools"; - sha256 = "0c0s5aiwj807vxfzwrah32spwq8cnxvy0j117i5cbsqw2df80pgv"; + sha256 = "0a2xjx9hqkash7fd2qv9hd93wcqdbfrmsdzjd91dwvnk48j61daf"; }; # Build of golang.org/x/tools/gopls fails with: @@ -21,7 +21,7 @@ buildGoModule rec { rm -rf gopls ''; - modSha256 = "16nkrpki9fnxsrxxxs9ljz49plcz393z0sqq2knkk30pmncpwd3q"; + modSha256 = "16cfzmfr9jv8wz0whl433xdm614dk63fzjxv6l1xvkagjmki49iy"; postConfigure = '' # Make the builtin tools available here diff --git a/pkgs/development/tools/profiling/pyflame/default.nix b/pkgs/development/tools/profiling/pyflame/default.nix index acb5d9d943cb..2467769ad3de 100644 --- a/pkgs/development/tools/profiling/pyflame/default.nix +++ b/pkgs/development/tools/profiling/pyflame/default.nix @@ -1,4 +1,4 @@ -{ stdenv, autoreconfHook, coreutils, fetchFromGitHub, fetchpatch, pkgconfig +{ stdenv, autoreconfHook, coreutils, fetchFromGitHub, fetchpatch, pkgconfig, procps # pyflame needs one python version per ABI # are currently supported # * 2.6 or 2.7 for 2.x ABI @@ -67,11 +67,12 @@ stdenv.mkDerivation rec { full-ptrace-seize-errors ]; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkgconfig procps ]; buildInputs = [ python37 python36 python2 python35 ]; postPatch = '' patchShebangs . + # some tests will fail in the sandbox substituteInPlace tests/test_end_to_end.py \ --replace 'skipif(IS_DOCKER' 'skipif(True' @@ -79,6 +80,32 @@ stdenv.mkDerivation rec { # don't use patchShebangs here to be explicit about the python version substituteInPlace utils/flame-chart-json \ --replace '#!usr/bin/env python' '#!${python3.interpreter}' + + # Many tests require the build machine to have kernel.yama.ptrace_scope = 0, + # but hardened machines have it set to 1. On build machines that cannot run + # these tests, skip them to avoid breaking the build. + if [[ $(sysctl -n kernel.yama.ptrace_scope || echo 0) != "0" ]]; then + for test in \ + test_monitor \ + test_non_gil \ + test_threaded \ + test_unthreaded \ + test_legacy_pid_handling \ + test_exclude_idle \ + test_exit_early \ + test_sample_not_python \ + test_include_ts \ + test_include_ts_exclude_idle \ + test_thread_dump \ + test_no_line_numbers \ + test_utf8_output; do + + substituteInPlace tests/test_end_to_end.py \ + --replace "def $test(" "\ +@pytest.mark.skip('build machine had kernel.yama.ptrace_scope != 0') +def $test(" + done + fi ''; postInstall = '' @@ -94,7 +121,7 @@ stdenv.mkDerivation rec { PYMAJORVERSION=${lib.substring 0 1 python.version} \ PATH=${lib.makeBinPath [ coreutils ]}\ PYTHONPATH= \ - ${python.pkgs.pytest}/bin/pytest tests/ + ${python.pkgs.pytest}/bin/pytest -v tests/ set +x '') (lib.filter (x: x != null) buildInputs); diff --git a/pkgs/development/tools/rust/maturin/default.nix b/pkgs/development/tools/rust/maturin/default.nix index 7bd49132d0ef..b152be414dac 100644 --- a/pkgs/development/tools/rust/maturin/default.nix +++ b/pkgs/development/tools/rust/maturin/default.nix @@ -5,16 +5,16 @@ let inherit (darwin.apple_sdk.frameworks) Security; in rustPlatform.buildRustPackage rec { name = "maturin-${version}"; - version = "0.7.1"; + version = "0.7.2"; src = fetchFromGitHub { owner = "PyO3"; repo = "maturin"; rev = "v${version}"; - sha256 = "0srsb305gld6zmz7qm5zk4gawqqlywdpray04z8xcij146mccci2"; + sha256 = "180dynm9qy3mliqai4jfwxbg01jdz2a95bfyar880qmp75f35wi8"; }; - cargoSha256 = "0bscwbrzjaps4yqcrqhan56kdmh0n014w4ldsbv3sbhpw5izz335"; + cargoSha256 = "1x61kxmbk5mazi3lmzfnixjl584cxkfv16si2smh8d9xhhz6gvpw"; nativeBuildInputs = [ pkgconfig ]; |