Unverified Commit 7842b6ba authored by github-actions[bot]'s avatar github-actions[bot] Committed by GitHub
Browse files

Merge staging-next into staging

parents f993ea65 f3ea10ae

.git-blame-ignore-revs

+3 −0
Original line number Diff line number Diff line
@@ -30,3 +30,6 @@ 


# nixos: fix module paths in rename.nix

d08ede042b74b8199dc748323768227b88efcf7c



# fix indentation in mk-python-derivation.nix

d1c1a0c656ccd8bd3b25d3c4287f2d075faf3cf3

pkgs/development/interpreters/python/default.nix

+0 −3
Original line number Diff line number Diff line
@@ -234,9 +234,6 @@ in { 
    # TODO(@Artturin): Add this to the main cpython expr

    strictDeps = true;

    pname = "python3-minimal";

    meta = old.meta // {

      maintainers = [];

    };

  });



  pypy27 = callPackage ./pypy {

pkgs/development/python-modules/azure-mgmt-batch/default.nix

+7 −7
Original line number Diff line number Diff line
@@ -5,18 +5,20 @@ 
, msrestazure

, azure-common

, azure-mgmt-core

, azure-mgmt-nspkg

, isPy3k

, pythonOlder

}:



buildPythonPackage rec {

  pname = "azure-mgmt-batch";

  version = "16.1.0";

  version = "16.2.0";

  format = "setuptools";



  disabled = pythonOlder "3.6";



  src = fetchPypi {

    inherit pname version;

    extension = "zip";

    sha256 = "sha256-9J0VQ3uAsi4kuEe9UG4xpcEV1Sc+nkjECgVfzG7j5jk=";

    hash = "sha256-aWkQZs1aLIbo/arvu4DilAOBrO38gFPfGTtSFNLs5oI=";

  };



  propagatedBuildInputs = [
@@ -24,11 +26,9 @@ buildPythonPackage rec { 
    msrestazure

    azure-common

    azure-mgmt-core

  ] ++ lib.optionals (!isPy3k) [

    azure-mgmt-nspkg

  ];



  # has no tests

  # Module has no tests

  doCheck = false;



  meta = with lib; {

pkgs/development/python-modules/fastcore/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ 


buildPythonPackage rec {

  pname = "fastcore";

  version = "1.4.3";

  version = "1.4.4";

  format = "setuptools";



  disabled = pythonOlder "3.8";
@@ -17,7 +17,7 @@ buildPythonPackage rec { 
    owner = "fastai";

    repo = pname;

    rev = "refs/tags/${version}";

    sha256 = "sha256-3l5bELb5f/cvh4gF2kJZEX6kAK9achTerIIplMuesTk=";

    sha256 = "sha256-2lV96QOlXfQ8PjSW45u9ZyXpssDgLyiUgmIC0VLOGus=";

  };



  propagatedBuildInputs = [

pkgs/development/python-modules/greeneye-monitor/default.nix

+5 −0
Original line number Diff line number Diff line
@@ -22,6 +22,11 @@ buildPythonPackage rec { 
    hash = "sha256-weZTOVFBlB6TxFs8pLWfyB7WD/bn3ljBjX2tVi1Zc/I=";

  };



  postPatch = ''

    substituteInPlace setup.py \

      --replace "siobrultech_protocols==" "siobrultech_protocols>="

  '';



  propagatedBuildInputs = [

    aiohttp

    siobrultech-protocols