Merge master into staging-next

This commit is contained in:
Frederik Rietdijk
2019-08-31 09:50:38 +02:00
364 changed files with 8989 additions and 6877 deletions

View File

@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-bloat";
version = "0.8.2";
version = "0.8.3";
src = fetchFromGitHub {
owner = "RazrFalcon";
repo = pname;
rev = "v${version}";
sha256 = "1r8d3mqzaiasvhxmry8va55ggq817y82x8yb3vzih84lxq134y8n";
sha256 = "088px2kdcfjdb8zfmk7g409h7ij9dngywz336hj2ny82lrdjzazc";
};
cargoSha256 = "1ys3wd1k39vkll25c56sfv767rcd53yb46adwgzdkkyl2pjphf1r";
cargoSha256 = "11q8j8y7m59gc8047qhz6pp2825qjcpg9xwgj09l8a5aijf25avb";
meta = with lib; {
description = "A tool and Cargo subcommand that helps you find out what takes most of the space in your executable";

View File

@@ -4,17 +4,17 @@
let
inherit (darwin.apple_sdk.frameworks) Security;
in rustPlatform.buildRustPackage rec {
name = "pyo3-pack-${version}";
version = "0.6.1";
name = "maturin-${version}";
version = "0.7.0";
src = fetchFromGitHub {
owner = "PyO3";
repo = "pyo3-pack";
repo = "maturin";
rev = "v${version}";
sha256 = "0zk0jhr7lnl9z6c8pbk7si3wa8b1kqzj3wrslc1n5fjla7xx8fzn";
sha256 = "1qscn8ycyg9ldkp1v5178mlw8r5ak2p12x52c0w4hgij7y1q5s39";
};
cargoSha256 = "13gycipxc17baxg8nvjzkw96i1pxgncx7qjcrm9aab7p9vi2vrih";
cargoSha256 = "0fk9dgwkgkkmxxd8ydl0vp14jhzi65pkz36v5h3nkp4cb4n4cvdj";
nativeBuildInputs = [ pkgconfig ];
@@ -27,7 +27,7 @@ in rustPlatform.buildRustPackage rec {
meta = with stdenv.lib; {
description = "Build and publish crates with pyo3 bindings as python packages";
homepage = https://github.com/PyO3/pyo3-pack;
homepage = https://github.com/PyO3/maturin;
license = licenses.mit;
maintainers = [ maintainers.danieldk ];
platforms = platforms.all;