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

Merge master into staging-next

parents bb7e0374 fb132593

maintainers/maintainer-list.nix

+6 −0
Original line number Diff line number Diff line
@@ -15265,6 +15265,12 @@ 
    githubId = 1755789;

    name = "Robert Irelan";

  };

  tennox = {

    email = "tennox+nix@txlab.io";

    github = "tennox";

    githubId = 2084639;

    name = "Manu";

  };

  teozkr = {

    email = "teo@nullable.se";

    github = "nightkr";

pkgs/development/python-modules/ansible-later/default.nix

+3 −3
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ 


buildPythonPackage rec {

  pname = "ansible-later";

  version = "3.2.2";

  version = "3.3.1";

  format = "pyproject";



  disabled = pythonOlder "3.8";
@@ -33,13 +33,13 @@ buildPythonPackage rec { 
    owner = "thegeeklab";

    repo = pname;

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

    hash = "sha256-kqvWrNygriFG+jVjezJNe5CwUix38Ge0hQgu351Qyjw=";

    hash = "sha256-7k81eEcM+BXNrln6+Lu0+1LjsZdYkUidrRQCdlBbQB8=";

  };



  postPatch = ''

    substituteInPlace pyproject.toml \

      --replace 'version = "0.0.0"' 'version = "${version}"' \

      --replace " --cov=ansiblelater --cov-report=xml:coverage.xml --cov-report=term --cov-append --no-cov-on-fail" ""

      --replace " --cov=ansiblelater --cov-report=xml:coverage.xml --cov-report=term --no-cov-on-fail" ""

  '';



  pythonRelaxDeps = [

pkgs/development/python-modules/appthreat-vulnerability-db/default.nix

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


buildPythonPackage rec {

  pname = "appthreat-vulnerability-db";

  version = "5.0.4";

  version = "5.1.1";

  format = "setuptools";



  disabled = pythonOlder "3.7";
@@ -24,7 +24,7 @@ buildPythonPackage rec { 
    owner = "AppThreat";

    repo = "vulnerability-db";

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

    hash = "sha256-MdjzQsZfMU295aQt9SepRCwutihidya3Dga/E1fFL9o=";

    hash = "sha256-lbaDoLEOMzMGwqBx6gBynVpXz/NM/uCJELwd4d1IEwk=";

  };



  propagatedBuildInputs = [

pkgs/development/python-modules/bc-detect-secrets/default.nix

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


buildPythonPackage rec {

  pname = "bc-detect-secrets";

  version = "1.4.21";

  version = "1.4.23";

  format = "setuptools";



  disabled = pythonOlder "3.8";
@@ -24,7 +24,7 @@ buildPythonPackage rec { 
    owner = "bridgecrewio";

    repo = "detect-secrets";

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

    hash = "sha256-yidDRKG0Lko+aqoCX7sBKsoOUOTEk3GX/gEx8oTCNSc=";

    hash = "sha256-lMsGcCD7Qz8OMge6URtrARiR6YPRZRN87dbIlpFdvhY=";

  };



  propagatedBuildInputs = [

pkgs/development/python-modules/cirq-core/default.nix

+12 −1
Original line number Diff line number Diff line
@@ -45,11 +45,20 @@ buildPythonPackage rec { 


  sourceRoot = "source/${pname}";



  patches = [

    # https://github.com/quantumlib/Cirq/pull/5991

    (fetchpatch {

      url = "https://build.opensuse.org/public/source/openSUSE:Factory/python-cirq/cirq-pr5991-np1.24.patch?rev=8";

      stripLen = 1;

      hash = "sha256-d2FpaxM1PsPWT9ZM9v2gVrnLCy9zmvkkyAVgo85eL3U=";

    })

  ];



  postPatch = ''

    substituteInPlace requirements.txt \

      --replace "matplotlib~=3.0" "matplotlib" \

      --replace "networkx~=2.4" "networkx" \

      --replace "numpy~=1.16" "numpy"

      --replace "numpy>=1.16,<1.24" "numpy"

  '';



  propagatedBuildInputs = [
@@ -91,6 +100,8 @@ buildPythonPackage rec { 
    "test_metadata_search_path"

    # Fails due pandas MultiIndex. Maybe issue with pandas version in nix?

    "test_benchmark_2q_xeb_fidelities"

    # https://github.com/quantumlib/Cirq/pull/5991

    "test_json_and_repr_data"

  ];



  meta = with lib; {