Merge remote-tracking branch 'upstream/master' into HEAD

8 files changed, 63 insertions, 25 deletions

diff --git a/pkgs/development/tools/devpi-client/default.nix b/pkgs/development/tools/devpi-client/default.nix
index 6a98befd346e..905314efe5a9 100644
--- a/pkgs/development/tools/devpi-client/default.nix
+++ b/pkgs/development/tools/devpi-client/default.nix
@@ -29,8 +29,9 @@ pythonPackages.buildPythonApplication rec {
     # setuptools do not get propagated into the tox call (cannot import setuptools)
     rm testing/test_test.py
 
-    # test tries to connect to upstream pypi
-    py.test -k 'not test_pypi_index_attributes' testing
+    # test_pypi_index_attributes tries to connect to upstream pypi
+    # test_download_release_error is fixed in the next release
+    py.test -k 'not test_pypi_index_attributes and not test_download_release_error' testing
   '';
 
   LC_ALL = "en_US.UTF-8";
diff --git a/pkgs/development/tools/devpi-server/default.nix b/pkgs/development/tools/devpi-server/default.nix
index 275e411fc8d7..6823ae3372cb 100644
--- a/pkgs/development/tools/devpi-server/default.nix
+++ b/pkgs/development/tools/devpi-server/default.nix
@@ -3,17 +3,24 @@
 pythonPackages.buildPythonApplication rec {
   name = "${pname}-${version}";
   pname = "devpi-server";
-  version = "4.3.1";
+  version = "4.4.0";
 
   src = pythonPackages.fetchPypi {
     inherit pname version;
-    sha256 = "0x6ks2sbpknznxaqlh0gf5hcvhkmgixixq2zs91wgfqxk4vi4s6n";
+    sha256 = "0y77kcnk26pfid8vsw07v2k61x9sdl6wbmxg5qxnz3vd7703xpkl";
   };
 
   propagatedBuildInputs = with pythonPackages;
     [ devpi-common execnet itsdangerous pluggy waitress pyramid passlib ];
-  checkInputs = with pythonPackages; [ nginx webtest pytest beautifulsoup4 pytest-timeout pytest-catchlog mock pyyaml ];
+  checkInputs = with pythonPackages; [ nginx webtest pytest beautifulsoup4 pytest-timeout mock pyyaml ];
+  preCheck = ''
+    # These tests pass with pytest 3.3.2 but not with pytest 3.4.0.
+    sed -i 's/test_basic/noop/' test_devpi_server/test_log.py
+    sed -i 's/test_new/noop/' test_devpi_server/test_log.py
+    sed -i 's/test_thread_run_try_again/noop/' test_devpi_server/test_replica.py
+  '';
   checkPhase = ''
+    runHook preCheck
     cd test_devpi_server/
     PATH=$PATH:$out/bin pytest --slow -rfsxX
   '';
diff --git a/pkgs/development/tools/flock/default.nix b/pkgs/development/tools/flock/default.nix
new file mode 100644
index 000000000000..ac145fae7efe
--- /dev/null
+++ b/pkgs/development/tools/flock/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, lib, fetchFromGitHub, autoreconfHook, ronn }:
+
+stdenv.mkDerivation rec {
+  pname = "flock";
+  name = "${pname}-${version}";
+  version = "0.2.3";
+
+  src = fetchFromGitHub {
+    owner = "discoteq";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "1vdq22zhdfi7wwndsd6s7fwmz02fsn0x04d7asq4hslk7bjxjjzn";
+  };
+
+  nativeBuildInputs = [ autoreconfHook ];
+  buildInputs = [ ronn ];
+
+  meta = with lib; {
+    description = "Cross-platform version of flock(1)";
+    maintainers = [ maintainers.matthewbauer ];
+    platforms = platforms.all;
+    license = licenses.isc;
+  };
+}
diff --git a/pkgs/development/tools/haskell/multi-ghc-travis/default.nix b/pkgs/development/tools/haskell/multi-ghc-travis/default.nix
index ae78774f8f38..a259fd7d76ba 100644
--- a/pkgs/development/tools/haskell/multi-ghc-travis/default.nix
+++ b/pkgs/development/tools/haskell/multi-ghc-travis/default.nix
@@ -6,10 +6,10 @@ mkDerivation {
   pname = "make-travis-yml";
   version = "0";
   src = fetchFromGitHub {
-    owner = "hvr";
-    repo = "multi-ghc-travis";
-    rev = "612a29439ba61b01efb98ea6d36b7ffd987dc5a0";
-    sha256 = "0q416rzzwipbnvslhwmm43w38dwma3lks12fghb0svcwj5lzgxsf";
+    owner = "haskell-CI";
+    repo = "haskell-ci";
+    rev = "36b2ee58b9fd160d606608832625b2b6c32aec43";
+    sha256 = "16g99jh5bszvfvb7mmyhl95mkf1l3ydyax8d9py91hi3m8r0c2x0";
   };
   isLibrary = true;
   isExecutable = true;
@@ -22,7 +22,7 @@ mkDerivation {
     base bytestring Diff directory filepath tasty tasty-golden
     transformers
   ];
-  homepage = "https://github.com/hvr/multi-ghc-travis";
+  homepage = "https://github.com/haskell-CI/haskell-ci";
   description = "Script generator for Travis-CI";
   license = stdenv.lib.licenses.bsd3;
 }
diff --git a/pkgs/development/tools/misc/strace/default.nix b/pkgs/development/tools/misc/strace/default.nix
index 6c19c51c8c86..e5f298a1cabc 100644
--- a/pkgs/development/tools/misc/strace/default.nix
+++ b/pkgs/development/tools/misc/strace/default.nix
@@ -13,6 +13,8 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ libunwind ]; # support -k
 
+  configureFlags = stdenv.lib.optional stdenv.hostPlatform.isAarch64 "--enable-mpers=check";
+
   meta = with stdenv.lib; {
     homepage = http://strace.sourceforge.net/;
     description = "A system call tracer for Linux";
diff --git a/pkgs/development/tools/profiling/systemtap/default.nix b/pkgs/development/tools/profiling/systemtap/default.nix
index b397f02665bc..7b313f301413 100644
--- a/pkgs/development/tools/profiling/systemtap/default.nix
+++ b/pkgs/development/tools/profiling/systemtap/default.nix
@@ -1,5 +1,5 @@
 { fetchgit, pkgconfig, gettext, runCommand, makeWrapper
-, elfutils, kernel, gnumake, python2, pythonPackages
+, elfutils, kernel, gnumake, python2, python2Packages
 }:
 
 let
@@ -17,7 +17,7 @@ let
     name = "systemtap-${version}";
     src = fetchgit { inherit url rev sha256; };
   nativeBuildInputs = [ pkgconfig ];
-    buildInputs = [ elfutils gettext python2 pythonPackages.setuptools ];
+    buildInputs = [ elfutils gettext python2 python2Packages.setuptools ];
     # FIXME: Workaround for bug in kbuild, where quoted -I"/foo" flags would get mangled in out-of-tree kbuild dirs
     postPatch = ''
       substituteInPlace buildrun.cxx --replace \
@@ -39,6 +39,8 @@ let
     done
   '';
 
+  pypkgs = with python2Packages; makePythonPath [ pyparsing ];
+
 in runCommand "systemtap-${kernel.version}-${version}" {
   inherit stapBuild kernelBuildDir;
   buildInputs = [ makeWrapper ];
@@ -54,8 +56,10 @@ in runCommand "systemtap-${kernel.version}-${version}" {
   for bin in $stapBuild/bin/*; do # hello emacs */
     ln -s $bin $out/bin
   done
-  rm $out/bin/stap
+  rm $out/bin/stap $out/bin/dtrace
   makeWrapper $stapBuild/bin/stap $out/bin/stap \
     --add-flags "-r $kernelBuildDir" \
     --prefix PATH : ${lib.makeBinPath [ stdenv.cc.cc stdenv.cc.bintools elfutils gnumake ]}
+  makeWrapper $stapBuild/bin/dtrace $out/bin/dtrace \
+    --prefix PYTHONPATH : ${pypkgs}
 ''
diff --git a/pkgs/development/tools/rust/racerd/default.nix b/pkgs/development/tools/rust/racerd/default.nix
index f3cb4e789502..058185acdbe4 100644
--- a/pkgs/development/tools/rust/racerd/default.nix
+++ b/pkgs/development/tools/rust/racerd/default.nix
@@ -4,17 +4,17 @@ with rustPlatform;
 
 buildRustPackage rec {
   name = "racerd-${version}";
-  version = "2017-02-17";
+  version = "2017-09-15";
   src = fetchFromGitHub {
     owner = "jwilm";
     repo = "racerd";
-    rev = "e3f3ff010fce2c67195750d9a6a669ffb3c2ac5f";
-    sha256 = "125pmbkjnjh83xwikcwfbb8g150nldz7wh0ly1gv9kl1b521dydk";
+    rev = "29cd4c6fd2a9301e49931c2e065b2e10c4b587e4";
+    sha256 = "0knz881mjhd8q2i8ydggaa7lfpiqy11wjmnv5p80n1d8zca6yb7z";
   };
 
   doCheck = false;
 
-  cargoSha256 = "1h7hm7vkk1grah6pn5ydfi5pzc2kd48lh2kxim5jlvrxhd2dingg";
+  cargoSha256 = "00gxj98zdkbrc5cxd4w5hk7iwv9a1kwa535hhspx9xd02r4d8rzl";
 
   buildInputs = [ makeWrapper ];
 
diff --git a/pkgs/development/tools/rust/rustup/default.nix b/pkgs/development/tools/rust/rustup/default.nix
index 6a2d5758f1fb..65a4a05633c0 100644
--- a/pkgs/development/tools/rust/rustup/default.nix
+++ b/pkgs/development/tools/rust/rustup/default.nix
@@ -4,15 +4,15 @@
 
 rustPlatform.buildRustPackage rec {
   name = "rustup-${version}";
-  version = "2017-10-29";
+  version = "1.11.0";
 
-  cargoSha256 = "1xwxv8y9xjgdmm92ldrn9m9fml2zb5h7qqm7dhw63j6psb3ajqrw";
+  cargoSha256 = "1r9mnj3x9sn16hi1r09gl5q0cnsa2g6kbjw2g115858i2a9k6hkr";
 
   src = fetchFromGitHub {
     owner = "rust-lang-nursery";
     repo = "rustup.rs";
-    rev = "13c8092507bf646f3ef6a621fe2c5a68212e800f";
-    sha256 = "1qd01rjk9qpfzgqs35f5nxrcf00kmf76zwmgj3yzdig9zymjwndg";
+    rev = version;
+    sha256 = "05rbgkz4fk6c1x6bpmpx108bg2qcrf6vv3yfz378s7bmr3l319iz";
   };
 
   nativeBuildInputs = [ pkgconfig ];
@@ -35,23 +35,23 @@ rustPlatform.buildRustPackage rec {
   postInstall = ''
     pushd $out/bin
     mv rustup-init rustup
-    for link in cargo rustc rustdoc rust-gdb rust-lldb; do
+    for link in cargo rustc rustdoc rust-gdb rust-lldb rls rustfmt cargo-fmt; do
       ln -s rustup $link
     done
     popd
 
     # tries to create .rustup
     export HOME=$(mktemp -d)
-    mkdir -p "$out/share/"{bash-completion/completions,fish/completions,zsh/site-functions}
+    mkdir -p "$out/share/"{bash-completion/completions,fish/vendor_completions.d,zsh/site-functions}
     $out/bin/rustup completions bash > "$out/share/bash-completion/completions/rustup"
-    $out/bin/rustup completions fish > "$out/share/fish/completions/rustup.fish"
+    $out/bin/rustup completions fish > "$out/share/fish/vendor_completions.d/rustup.fish"
     $out/bin/rustup completions zsh >  "$out/share/zsh/site-functions/_rustup"
   '';
 
   meta = with stdenv.lib; {
     description = "The Rust toolchain installer";
     homepage = https://www.rustup.rs/;
-    license = licenses.mit;
+    license = with licenses; [ asl20 /* or */ mit ];
     maintainers = [ maintainers.mic92 ];
   };
 }