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

Merge master into staging-next

parents c993acaa 2cee23fb

pkgs/by-name/ca/cargo-mobile2/package.nix

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


let

  pname = "cargo-mobile2";

  version = "0.20.4";

  version = "0.20.7";

in

rustPlatform.buildRustPackage {

  inherit pname version;
@@ -18,14 +18,14 @@ rustPlatform.buildRustPackage { 
    owner = "tauri-apps";

    repo = "cargo-mobile2";

    rev = "cargo-mobile2-v${version}";

    hash = "sha256-qd7UrbAZOl1seVVfO/qzvXq/+mfOwX3Xq+s4XuzxYiM=";

    hash = "sha256-aQLFYnPY6V8+GcK0YGR11RAaqEOxlSpRjzpy7cCSSz8=";

  };



  # Manually specify the sourceRoot since this crate depends on other crates in the workspace. Relevant info at

  # https://discourse.nixos.org/t/difficulty-using-buildrustpackage-with-a-src-containing-multiple-cargo-workspaces/10202

  # sourceRoot = "${src.name}/tooling/cli";



  cargoHash = "sha256-Cqv1Mcfd8uKuSVlqUeHDvCjwuubl2kY9zTeiQ3LF6Z4=";

  cargoHash = "sha256-2ecNknkFFnqllCPxiIZY5LpVugiEyIY3P6ouNiv/aZc=";



  preBuild = ''

    mkdir -p $out/share/

pkgs/by-name/xm/xmountains/package.nix

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


stdenv.mkDerivation (finalAttrs: {

  pname = "xmountains";

  version = "2.11";

  version = "2.13";



  src = fetchFromGitHub {

    owner = "spbooth";

    repo = "xmountains";

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

    hash = "sha256-q2+aJ5ISoSXUW4BaAf9Qq/d+DEBSylceZNKKmN4SbQQ=";

    hash = "sha256-8phhsC2LJc1StnTAFzOBGxbo0kL3G10XJMmOL3jIcS0=";

  };



  buildInputs = [

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

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


buildPythonPackage rec {

  pname = "azure-mgmt-netapp";

  version = "13.6.0";

  version = "13.7.0";

  pyproject = true;



  disabled = pythonOlder "3.8";
@@ -19,7 +19,7 @@ buildPythonPackage rec { 
  src = fetchPypi {

    pname = "azure_mgmt_netapp";

    inherit version;

    hash = "sha256-2ieBtC4NL/6N+ijF+0nxH1LVus3wmAy90Th2GCgt+5U=";

    hash = "sha256-A5BeDGy81YdWnVhl44U8r91FUGFADIxotgNAewa1zTo=";

  };



  build-system = [ setuptools ];

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

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


buildPythonPackage rec {

  pname = "docx2python";

  version = "3.0.0";

  version = "3.3.0";

  pyproject = true;



  disabled = pythonOlder "3.8";
@@ -22,7 +22,7 @@ buildPythonPackage rec { 
    owner = "ShayHill";

    repo = "docx2python";

    tag = version;

    hash = "sha256-ucLDdfmLAWcGunOKvh8tBQknXTPI1qOqyXgVGjQOGoQ=";

    hash = "sha256-u1zOMfYMhmBsvUcfG7UEMvKT9U5XEkBalGtMOgN8RCU=";

  };



  build-system = [

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

+2 −2
Original line number Diff line number Diff line
@@ -14,14 +14,14 @@ 


buildPythonPackage rec {

  pname = "pyannote-core";

  version = "5.0.0";

  version = "5.0.1";

  pyproject = true;



  src = fetchFromGitHub {

    owner = "pyannote";

    repo = "pyannote-core";

    tag = version;

    hash = "sha256-XQVEMy60LkfFr2TKXTeg6cGHRx5BUZ5qDgzIdKy/19Y=";

    hash = "sha256-28LVgI5bDFv71co/JsSrPrAcdugXiMRe6T1Jp0CO0XY=";

  };



  postPatch = ''