Merge master into staging-next

2020-11-03 12:06:06 +01:00
parent fe9f55907e 72c32ad3d7
commit 237966224d
317 changed files with 3210 additions and 2827 deletions
@@ -15,13 +15,13 @@

 buildPythonPackage rec {
  pname = "ansible-lint";
-  version = "4.3.5";
+  version = "4.3.6";
  # pip is not able to import version info on raumel.yaml
  disabled = isPy27;

  src = fetchPypi {
    inherit pname version;
-    sha256 = "0mjn0drw3cx4pfl9qll5j7wib5r8msihs5yl8ri9fkfcbz7k1hmy";
+    sha256 = "1fn7mdykm4id78k4faibi92q9yxbjbyxb90ww0by03c31m8z5348";
  };

  format = "pyproject";
@@ -2,11 +2,11 @@

 buildPythonPackage rec {
  pname = "css-parser";
-  version = "1.0.5";
+  version = "1.0.6";

  src = fetchPypi {
    inherit pname version;
-    sha256 = "665b7965bef0c9b86955be7a3383ca44e519b46affc7c6bca5002cbdbd0bf19f";
+    sha256 = "4ed448a8a5622edb1d30d616bbc4bd3d30f11be922343d7a92d7e418e324af2e";
  };

  # Test suite not included in tarball yet
@@ -16,7 +16,7 @@ buildPythonPackage rec {

  src = fetchFromGitHub {
    owner = "jimfunk";
-    repo = "${pname}";
+    repo = pname;
    rev = "v${version}";
    sha256 = "1rrh38f3zl3jk5ijs6g75dxxvxygf4lczbgc7ahrgzf58g4a48lm";
  };
@@ -20,10 +20,14 @@ buildPythonPackage rec {
  checkInputs = [ pytest mock ];
  propagatedBuildInputs = [ enum34 grpc_google_iam_v1 google_api_core ];

+  # tests don't clean up file descriptors correctly
+  doCheck = false;
  checkPhase = ''
    pytest tests/unit
  '';

+  pythonImportsCheck = [ "google.cloud.pubsub" ];
+
  meta = with stdenv.lib; {
    description = "Google Cloud Pub/Sub API client library";
    homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python";
@@ -2,11 +2,11 @@

 buildPythonPackage rec {
  pname = "grpcio-tools";
-  version = "1.32.0";
+  version = "1.33.2";

  src = fetchPypi {
    inherit pname version;
-    sha256 = "28547272c51e1d2d343685b9f531e85bb90ad7bd93e726ba646b5627173cbc47";
+    sha256 = "af40774c0275f5465f49fd92bfcd9831b19b013de4cc77b8fb38aea76fa6dce3";
  };

  enableParallelBuilding = true;
@@ -1,6 +1,6 @@
 { stdenv
 , buildPythonPackage
-, fetchgit
+, fetchFromGitHub
 , requests
 , webob
 }:
@@ -9,8 +9,9 @@ buildPythonPackage rec {
  pname = "hawkauthlib";
  version = "0.1.1";

-  src = fetchgit {
-    url = "https://github.com/mozilla-services/hawkauthlib.git";
+  src = fetchFromGitHub {
+    owner = "mozilla-services";
+    repo = pname;
    rev = "refs/tags/v${version}";
    sha256 = "0mr1mpx4j9q7sch9arwfvpysnpf2p7ijy7072wilxm8pnj0bwvsi";
  };
@@ -6,11 +6,11 @@

 buildPythonPackage rec {
  pname = "hg-evolve";
-  version = "10.0.2";
+  version = "10.1.0";

  src = fetchPypi {
    inherit pname version;
-    sha256 = "75892623258339613528df45dcd1004786bf73e8d95407886d79bc4567fbde4d";
+    sha256 = "a386e6ee2d9a0e332a49f1cb210c4c11ba9844bcd52808270f48e688314783d8";
  };

  doCheck = false;
@@ -15,11 +15,11 @@

 buildPythonPackage rec {
  pname = "nix-prefetch-github";
-  version = "3.0";
+  version = "4.0";

  src = fetchPypi {
    inherit pname version;
-    sha256 = "sha256-EN+EbVXUaf+id5UsK4EBm/9k9FYaH79g08kblvW60XA=";
+    sha256 = "sha256-STUyMUCWAHfDA6dkpiOqSRBL3/tubedUbWa94Kp/764=";
  };

  propagatedBuildInputs = [
@@ -1,23 +1,33 @@
-{ stdenv, fetchgit
+{ stdenv
+, fetchFromGitLab
 , cmake
-, libav, netcdf, qscintilla, zlib, boost, git, fftw, hdf5, libssh
-, pythonPackages
+, ffmpeg
+, netcdf
+, qscintilla
+, zlib
+, boost
+, git
+, fftw
+, hdf5
+, libssh
+, qt5
+, python
 }:

-stdenv.mkDerivation {
-  # compilation error in 2.9.0 https://gitlab.com/stuko/ovito/issues/40
-  # This is not the "released" 3.0.0 just a commit
-  version = "3.0.0";
+stdenv.mkDerivation rec {
+  version = "3.3.1";
  pname = "ovito";

-  src = fetchgit {
-    url = "https://gitlab.com/stuko/ovito";
-    rev = "a28c28182a879d2a1b511ec56f9845306dd8a4db";
-    sha256 = "1vqzv3gzwf8r0g05a7fj8hdyvnzq2h3wdfck7j6n1av6rvp7hi5r";
+  src = fetchFromGitLab {
+    owner = "stuko";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "0rm1qxa0fanaaqg0idr6rf2s2xlbyn1dzjzwh3rddy9mgl60lj2h";
  };

-  buildInputs = [ cmake libav netcdf qscintilla zlib boost zlib git fftw hdf5 libssh ];
-  propagatedBuildInputs = with pythonPackages; [ sphinx numpy sip pyqt5 matplotlib ase ];
+  buildInputs = [ cmake ffmpeg netcdf qscintilla zlib boost zlib git fftw hdf5 libssh qt5.qtbase qt5.qtsvg ];
+
+  propagatedBuildInputs = with python.pkgs; [ sphinx numpy sip pyqt5 matplotlib ase ];

  enableParallelBuilding = true;

@@ -25,10 +35,9 @@ stdenv.mkDerivation {
    description = "Scientific visualization and analysis software for atomistic simulation data";
    homepage = "https://www.ovito.org";
    license = licenses.gpl3;
-    maintainers = [ maintainers.costrouc ];
+    maintainers = with maintainers; [ costrouc ];
    # ensures not built on hydra
    # https://github.com/NixOS/nixpkgs/pull/46846#issuecomment-436388048
    hydraPlatforms = [ ];
-    broken = true; # cmake unable to find Qt5Core and other dependencies
  };
 }
@@ -7,7 +7,7 @@ buildPythonPackage rec {
  src = fetchFromGitHub {
    owner = "spatialaudio";
    repo = "python-pa-ringbuffer";
-    rev = "${version}";
+    rev = version;
    sha256 = "0afpydy1l20hd1xncjppjhqa2c8dj5h9nlv4z8m55cs9hc9h1mxv";
  };

@@ -11,7 +11,7 @@ buildPythonPackage rec {
  src = fetchFromGitHub {
    owner = "olucurious";
    repo = "pyfcm";
-    rev = "${version}";
+    rev = version;
    sha256 = "0aj10yvjsc04j15zbn403i83j7ra5yg35pi3ywkyakk8n1s0s3qg";
  };

@@ -1,14 +1,15 @@
 { stdenv
 , buildPythonPackage
-, fetchgit
+, fetchFromGitHub
 }:

 buildPythonPackage rec {
  pname = "pykka";
  version = "2.0.1";

-  src = fetchgit {
-    url = "https://github.com/jodal/pykka.git";
+  src = fetchFromGitHub {
+    owner = "jodal";
+    repo = pname;
    rev = "refs/tags/v${version}";
    sha256 = "011rvv3vzj9rpwaq6vfpz9hfwm6gx1jmad4iri6z12g8nnlpydhs";
  };
@@ -1,6 +1,6 @@
 { stdenv
 , buildPythonPackage
-, fetchgit
+, fetchFromGitHub
 , pyramid
 , hawkauthlib
 , tokenlib
@@ -8,11 +8,12 @@
 }:

 buildPythonPackage rec {
-  pname = "pyramidhawkauth";
+  pname = "pyramid_hawkauth";
  version = "0.1.0";

-  src = fetchgit {
-    url = "https://github.com/mozilla-services/pyramid_hawkauth.git";
+  src = fetchFromGitHub {
+    owner = "mozilla-services";
+    repo = pname;
    rev = "refs/tags/v${version}";
    sha256 = "038ign7qlavlmvrhb2y8bygbxvy4j7bx2k1zg0i3wblg2ja50w7h";
  };
@@ -7,13 +7,13 @@ buildPythonPackage rec {

  disabled = !isPy3k; # Doesn't support python older than 3.4

-  buildInputs = [ pyserial ];
-
  src = fetchPypi {
    inherit pname version;
    sha256 = "1vlsb0d03krxlj7vpvyhpinnyxyy8s3lk5rs8ba2932dhyl7f1n4";
  };

+  propagatedBuildInputs = [ pyserial ];
+
  meta = with stdenv.lib; {
    description = "asyncio extension package for pyserial";
    homepage = "https://github.com/pyserial/pyserial-asyncio";
@@ -1,8 +1,8 @@
-{ stdenv, fetchurl, cmake, libxml2, libxslt, python2, qt4 }:
+{ stdenv, fetchurl, cmake, libxml2, libxslt, python3, qt4 }:

 # This derivation does not provide any Python module and should therefore be called via `all-packages.nix`.
 let
-  pythonEnv = python2.withPackages(ps: with ps; [  sphinx ]);
+  pythonEnv = python3.withPackages(ps: with ps; [  sphinx ]);
 in stdenv.mkDerivation {
  name = "pyside-apiextractor-0.10.10";

@@ -13,7 +13,14 @@ in stdenv.mkDerivation {

  enableParallelBuilding = true;

-  buildInputs = [ cmake qt4 pythonEnv libxml2 libxslt ];
+  outputs = [ "out" "dev" ];
+
+  preConfigure = ''
+    cmakeFlagsArray=("-DCMAKE_INSTALL_PREFIX=$dev")
+  '';
+
+  nativeBuildInputs = [ cmake pythonEnv ];
+  buildInputs = [ qt4 libxml2 libxslt ];

  meta = {
    description = "Eases the development of bindings of Qt-based libraries for high level languages by automating most of the process";
@@ -13,6 +13,12 @@ buildPythonPackage rec {

  enableParallelBuilding = true;

+  outputs = [ "out" "dev" ];
+
+  preConfigure = ''
+    cmakeFlagsArray=("-DCMAKE_INSTALL_PREFIX=$dev")
+  '';
+
  nativeBuildInputs = [ cmake pysideGeneratorrunner pysideShiboken qt4 ];

  buildInputs = [ mesa libGL ];
@@ -1,8 +1,8 @@
-{ stdenv, fetchurl, cmake, pysideApiextractor, python2, qt4 }:
+{ stdenv, fetchurl, cmake, pysideApiextractor, python3, qt4 }:

 # This derivation does not provide any Python module and should therefore be called via `all-packages.nix`.
 let
-  pythonEnv = python2.withPackages(ps: with ps; [ sphinx ]);
+  pythonEnv = python3.withPackages(ps: with ps; [ sphinx ]);
  pname = "pyside-generatorrunner";
  version = "0.6.16";
 in stdenv.mkDerivation {
@@ -15,7 +15,14 @@ in stdenv.mkDerivation {

  enableParallelBuilding = true;

-  buildInputs = [ cmake pysideApiextractor qt4 pythonEnv ];
+  outputs = [ "out" "dev" ];
+
+  preConfigure = ''
+    cmakeFlagsArray=("-DCMAKE_INSTALL_PREFIX=$dev")
+  '';
+
+  nativeBuildInputs = [ cmake pythonEnv ];
+  buildInputs = [ pysideApiextractor qt4 ];

  meta = {
    description = "Eases the development of binding generators for C++ and Qt-based libraries by providing a framework to help automating most of the process";
@@ -33,7 +33,10 @@ buildPythonPackage rec {

  buildInputs = [ python libxml2 libxslt ];

+  outputs = [ "out" "dev" ];
+
  preConfigure = ''
+    cmakeFlagsArray=("-DCMAKE_INSTALL_PREFIX=$dev")
    echo "preConfigure: Fixing shiboken_generator install target."
    substituteInPlace generator/CMakeLists.txt --replace \
      \"$\{GENERATORRUNNER_PLUGIN_DIR}\" lib/generatorrunner/
@@ -12,6 +12,12 @@ buildPythonPackage rec {
    sha256 = "017i2yxgjrisaifxqnl3ym8ijl63l2yl6a3474dsqhlyqz2nx2ll";
  };

+  outputs = [ "out" "dev" ];
+
+  preConfigure = ''
+    cmakeFlagsArray=("-DCMAKE_INSTALL_PREFIX=$dev")
+  '';
+
  nativeBuildInputs = [ cmake ];

  buildInputs = [ qt4 ];
@@ -17,7 +17,7 @@ buildPythonPackage rec {
  src = fetchFromGitHub {
    owner = "spatialaudio";
    repo = "python-rtmixer";
-    rev = "${version}";
+    rev = version;
    sha256 = "1bvgzzxiypvvb3qacbcry6761x9sk3dnx7jga7pli63f69vakg4y";
    fetchSubmodules = true;
  };
@@ -15,7 +15,7 @@ buildPythonPackage rec {
  src = fetchFromGitHub {
    owner = "alvations";
    repo = pname;
-    rev = "${version}";
+    rev = version;
    sha256 = "1gzr56w8yx82mn08wax5m0xyg15ym4ri5l80gmagp8r53443j770";
  };

@@ -1,6 +1,6 @@
 { stdenv
 , buildPythonPackage
-, fetchgit
+, fetchFromGitHub
 , canonicaljson
 , unpaddedbase64
 , pynacl
@@ -11,8 +11,9 @@ buildPythonPackage rec {
  pname = "signedjson";
  version = "1.1.0";

-  src = fetchgit {
-    url = "https://github.com/matrix-org/python-signedjson.git";
+  src = fetchFromGitHub {
+    owner = "matrix-org";
+    repo = "python-${pname}";
    rev = "refs/tags/v${version}";
    sha256 = "18s388hm3babnvakbbgfqk0jzq25nnznvhygywd3azp9b4yzmd5c";
  };
@@ -13,13 +13,13 @@

 buildPythonPackage rec {
  pname = "srsly";
-  version = "2.3.0";
+  version = "2.3.1";

  disabled = pythonOlder "3.6";

  src = fetchPypi {
    inherit pname version;
-    sha256 = "f994a266f6e547c8ffe803cb90baed7ca566831f924e0491402564ba0d185e66";
+    sha256 = "3dcce93c69ff18e8a8d7decfdfdf8e1fd44c4446cdee8d0e5d545d6b172dc377";
  };

  nativeBuildInputs = [ cython ];
@@ -5,12 +5,12 @@
 }:

 buildPythonPackage rec {
-  version = "0.1.5";
+  version = "0.2.1";
  pname = "sshtunnel";

  src = fetchPypi {
    inherit pname version;
-    sha256 = "0jcjppp6mdfsqrbfc3ddfxg1ybgvkjv7ri7azwv3j778m36zs4y8";
+    sha256 = "ce28bf9abe6c6b00c5d10343a68c1325f8409ebfb9bf1c1d863a31afa3983cd7";
  };

  propagatedBuildInputs = [ paramiko ];
@@ -2,13 +2,13 @@

 buildPythonPackage rec {
  pname = "telethon-session-sqlalchemy";
-  version = "0.2.15";
+  version = "0.2.16";

  disabled = !isPy3k;

  src = fetchPypi {
    inherit pname version;
-    sha256 = "2ba603d95d5be6ddecd8ecaeaffba00b75b49dd80eb77f6228dd7b793ca67fd2";
+    sha256 = "f847c57302a102eb88e29ed95b8f4efa69582db2966fd806c21376b9a66ad4a8";
  };

  propagatedBuildInputs = [
@@ -31,7 +31,7 @@ let
    src = fetchFromGitHub {
      owner = "tensorflow";
      repo = "probability";
-      rev = "${version}";
+      rev = version;
      sha256 = "07cm8zba8n0ihzdm3k4a4rsg5v62xxsfvcw4h0niz91c0parqjqy";
    };

@@ -1,6 +1,6 @@
 { stdenv
 , buildPythonPackage
-, fetchgit
+, fetchFromGitHub
 , requests
 , webob
 }:
@@ -9,8 +9,9 @@ buildPythonPackage rec {
  pname = "tokenlib";
  version = "0.3.1";

-  src = fetchgit {
-    url = "https://github.com/mozilla-services/tokenlib.git";
+  src = fetchFromGitHub {
+    owner = "mozilla-services";
+    repo = pname;
    rev = "refs/tags/${version}";
    sha256 = "0bq6dqyfwh29pg8ngmrm4mx4q27an9lsj0p9l79p9snn4g2rxzc8";
  };
@@ -5,7 +5,7 @@ buildPythonPackage rec {
  version = stdenv.lib.getVersion unicorn-emu;

  src = unicorn-emu.src;
-  sourceRoot = "unicorn-${version}/bindings/python";
+  sourceRoot = "source/bindings/python";

  prePatch = ''
    ln -s ${unicorn-emu}/lib/libunicorn${stdenv.targetPlatform.extensions.sharedLibrary} prebuilt/
@@ -1,14 +1,15 @@
 { stdenv
 , buildPythonPackage
-, fetchgit
+, fetchFromGitHub
 }:

 buildPythonPackage rec {
  pname = "unpaddedbase64";
  version = "1.1.0";

-  src = fetchgit {
-    url = "https://github.com/matrix-org/python-unpaddedbase64.git";
+  src = fetchFromGitHub {
+    owner = "matrix-org";
+    repo = "python-${pname}";
    rev = "refs/tags/v${version}";
    sha256 = "0if3fjfxga0bwdq47v77fs9hrcqpmwdxry2i2a7pdqsp95258nxd";
  };