Unverified Commit 44c75334 authored by nixpkgs-ci[bot]'s avatar nixpkgs-ci[bot] Committed by GitHub
Browse files

Merge staging-next into staging

parents df490f67 549d2dba

pkgs/applications/science/chemistry/autodock-vina/python-bindings.nix

+2 −2
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ buildPythonPackage { 
    meta

    ;



  format = "pyproject";

  pyproject = true;



  sourceRoot = "${autodock-vina.src.name}/build/python";
@@ -29,7 +29,7 @@ buildPythonPackage { 
    substituteInPlace setup.py \

      --replace "python_requires='>=3.5.*'" "python_requires='>=3.5'"



    # setupPyBuildFlags are not applied with `format = "pyproject"`

    # setupPyBuildFlags are not applied with `pyproject = true`

    substituteInPlace setup.py \

      --replace "= locate_boost()" "= '${lib.getDev boost}/include', '${boost}/lib'"

pkgs/by-name/al/alerta/package.nix

+0 −2
Original line number Diff line number Diff line
@@ -25,8 +25,6 @@ python3.pkgs.buildPythonApplication rec { 


  doCheck = false;



  disabled = python3.pythonOlder "3.6";



  meta = {

    homepage = "https://alerta.io";

    description = "Alerta Monitoring System command-line interface";

pkgs/by-name/fl/flow/package.nix

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ 
let

  ocamlPackages = ocaml-ng.ocamlPackages.overrideScope (

    self: super: {

      ppxlib = super.ppxlib.override { version = "0.33.0"; };

      ppxlib = super.ppxlib.override { version = "0.34.0"; };

    }

  );

in

pkgs/by-name/go/gorilla-cli/package.nix

+0 −2
Original line number Diff line number Diff line
@@ -17,8 +17,6 @@ python3.pkgs.buildPythonApplication rec { 
    hash = "sha256-3h3QtBDKswTDL7zNM2C4VWiGCqknm/bxhP9sw4ieIcQ=";

  };



  disabled = python3.pythonOlder "3.6";



  build-system = with python3.pkgs; [

    setuptools

  ];

pkgs/by-name/li/libdaq/package.nix

+2 −2
Original line number Diff line number Diff line
@@ -10,13 +10,13 @@ 


stdenv.mkDerivation (finalAttrs: {

  pname = "libdaq";

  version = "3.0.23";

  version = "3.0.24";



  src = fetchFromGitHub {

    owner = "snort3";

    repo = "libdaq";

    tag = "v${finalAttrs.version}";

    hash = "sha256-P57eH301oOSY43LyryFar1aoPcDrd+WNxTResWGOD/I=";

    hash = "sha256-LIdELWQZ76bA0GZne0IMr+GHisUksBYXwzSqVB5nMsA=";

  };



  nativeBuildInputs = [