Merge branch 'staging' into openssl-1.1

Let's try reducing the total work for Hydra.
NixOS · Feb 11, 2018 · 1a9cf26 · 1a9cf26
2 parents b9dd79d + 48f3036
commit 1a9cf26
Show file tree

Hide file tree

Showing 16 changed files with 51 additions and 253 deletions.
diff --git a/nixos/doc/manual/release-notes/rl-1803.xml b/nixos/doc/manual/release-notes/rl-1803.xml
@@ -133,6 +133,17 @@ following incompatible changes:</para>
       <link xlink:href="https://search.nix.gsc.io/?q=stateVersion">here</link>.
     </para>
   </listitem>
+  <listitem>
+    <para>
+      The <literal>openssh</literal> package
+      now includes Kerberos support by default;
+      the <literal>openssh_with_kerberos</literal> package
+      is now a deprecated alias.
+      If you do not want Kerberos support,
+      you can do <literal>openssh.override { withKerboros = false; }</literal>.
+      Note, this also applies to the <literal>openssh_hpn</literal> package.
+    </para>
+  </listitem>
   <listitem>
     <para>
       <literal>cc-wrapper</literal> has been split in two; there is now also a <literal>bintools-wrapper</literal>.

diff --git a/pkgs/applications/networking/syncthing012/default.nix b/pkgs/applications/networking/syncthing012/default.nix
diff --git a/pkgs/applications/networking/syncthing012/deps.nix b/pkgs/applications/networking/syncthing012/deps.nix
diff --git a/pkgs/applications/networking/syncthing013/default.nix b/pkgs/applications/networking/syncthing013/default.nix
diff --git a/pkgs/development/java-modules/build-maven-package.nix b/pkgs/development/java-modules/build-maven-package.nix
@@ -13,8 +13,8 @@ in stdenv.mkDerivation rec {
 
   propagatedBuildInput = [ maven ] ++ flatDeps;
 
-  find = ''find ${foldl' (x: y: x + " " + y) "" (map (x: x + "/m2") flatDeps)} -type d -printf '%P\n' | xargs -I {} mkdir -p $out/m2/{}'';
-  copy = ''cp -rsfu ${foldl' (x: y: x + " " + y) "" (map (x: x + "/m2/*") flatDeps)} $out/m2'';
+  find = ''find ${concatStringsSep " " (map (x: x + "/m2") flatDeps)} -type d -printf '%P\n' | xargs -I {} mkdir -p $out/m2/{}'';
+  copy = ''cp -rsfu ${concatStringsSep " " (map (x: x + "/m2/*") flatDeps)} $out/m2'';
 
   phases = [ "unpackPhase" "buildPhase" ];
 

diff --git a/pkgs/development/python-modules/aiohttp/default.nix b/pkgs/development/python-modules/aiohttp/default.nix
@@ -9,7 +9,6 @@
 , idna-ssl
 , pytest
 , gunicorn
-, pytest-raisesregexp
 , pytest-mock
 }:
 
@@ -24,7 +23,7 @@ buildPythonPackage rec {
 
   disabled = pythonOlder "3.4";
 
-  checkInputs = [ pytest gunicorn pytest-raisesregexp pytest-mock ];
+  checkInputs = [ pytest gunicorn pytest-mock ];
 
   propagatedBuildInputs = [ async-timeout chardet multidict yarl ]
     ++ lib.optional (pythonOlder "3.7") idna-ssl;

diff --git a/pkgs/development/python-modules/async_timeout/default.nix b/pkgs/development/python-modules/async_timeout/default.nix
@@ -1,22 +1,19 @@
 { lib
-, fetchurl
+, fetchPypi
 , buildPythonPackage
 , pytestrunner
 , pythonOlder
 }:
 
-let
+buildPythonPackage rec {
   pname = "async-timeout";
   version = "2.0.0";
-in buildPythonPackage rec {
-  name = "${pname}-${version}";
 
-  src = fetchurl {
-    url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz";
+  src = fetchPypi {
+    inherit pname version;
     sha256 = "c17d8ac2d735d59aa62737d76f2787a6c938f5a944ecf768a8c0ab70b0dea566";
   };
 
-  buildInputs = [ pytestrunner ];
   # Circular dependency on aiohttp
   doCheck = false;
 
@@ -27,4 +24,4 @@ in buildPythonPackage rec {
     homepage = https://github.com/aio-libs/async_timeout/;
     license = lib.licenses.asl20;
   };
-}
+}
diff --git a/pkgs/development/python-modules/chardet/default.nix b/pkgs/development/python-modules/chardet/default.nix
@@ -2,7 +2,6 @@
 , pytest, pytestrunner, hypothesis }:
 
 buildPythonPackage rec {
-  name = "${pname}-${version}";
   pname = "chardet";
   version = "3.0.4";
 
@@ -11,7 +10,7 @@ buildPythonPackage rec {
     sha256 = "1bpalpia6r5x1kknbk11p1fzph56fmmnp405ds8icksd3knr5aw4";
   };
 
-  buildInputs = [ pytest pytestrunner hypothesis ];
+  checkInputs = [ pytest pytestrunner hypothesis ];
 
   meta = with stdenv.lib; {
     homepage = https://github.com/chardet/chardet;

diff --git a/pkgs/development/python-modules/multidict/default.nix b/pkgs/development/python-modules/multidict/default.nix
@@ -1,8 +1,7 @@
 { lib
 , fetchPypi
 , buildPythonPackage
-, cython
-, pytest, psutil, pytestrunner
+, pytest, pytestrunner
 , isPy3k
 }:
 
@@ -15,8 +14,7 @@ buildPythonPackage rec {
     sha256 = "0liazqlyk2nmr82nhiw2z72j7bjqxaisifkj476msw140d4i4i7v";
   };
 
-  buildInputs = [ cython ];
-  checkInputs = [ pytest psutil pytestrunner ];
+  checkInputs = [ pytest pytestrunner ];
 
   disabled = !isPy3k;
 

diff --git a/pkgs/development/python-modules/pytest-xdist/default.nix b/pkgs/development/python-modules/pytest-xdist/default.nix
@@ -1,7 +1,6 @@
 { stdenv, fetchPypi, buildPythonPackage, isPy3k, execnet, pytest, setuptools_scm, pytest-forked }:
 
 buildPythonPackage rec {
-  name = "${pname}-${version}";
   pname = "pytest-xdist";
   version = "1.22.0";
 
@@ -10,21 +9,19 @@ buildPythonPackage rec {
     sha256 = "65228a859191f2c74ee68c127317eefe35eedd3d43fc1431f19240663b0cafcd";
   };
 
-  buildInputs = [ pytest setuptools_scm pytest-forked];
+  nativeBuildInputs = [ setuptools_scm ];
+  buildInputs = [ pytest pytest-forked ];
   propagatedBuildInputs = [ execnet ];
 
-  postPatch = ''
-    rm testing/acceptance_test.py testing/test_remote.py testing/test_slavemanage.py
-  '';
-
   checkPhase = ''
-    py.test testing
+    # Excluded tests access file system
+    py.test testing -k "not test_distribution_rsyncdirs_example \
+                    and not test_rsync_popen_with_path \
+                    and not test_popen_rsync_subdir \
+                    and not test_init_rsync_roots \
+                    and not test_rsyncignore"
   '';
 
-  # Only test on 3.x
-  # INTERNALERROR> AttributeError: 'NoneType' object has no attribute 'getconsumer'
-  doCheck = isPy3k;
-
   meta = with stdenv.lib; {
     description = "py.test xdist plugin for distributed testing and loop-on-failing modes";
     homepage = https://github.com/pytest-dev/pytest-xdist;