Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: a9dc3c44d727
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 580304ea90d1
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Apr 10, 2020

  1. Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    veprbl Dmitry Kalinkin
    Copy the full SHA
    759ac32 View commit details
  2. Merge pull request #84887 from danieldk/maturin-0.8.0

    maturin: 0.7.9 -> 0.8.0
    marsam authored Apr 10, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    Ma27 Maximilian Bosch
    Copy the full SHA
    580304e View commit details
Showing with 21 additions and 3 deletions.
  1. +13 −0 pkgs/development/tools/rust/maturin/Cargo.lock.patch
  2. +8 −3 pkgs/development/tools/rust/maturin/default.nix
13 changes: 13 additions & 0 deletions pkgs/development/tools/rust/maturin/Cargo.lock.patch

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 8 additions & 3 deletions pkgs/development/tools/rust/maturin/default.nix
Original file line number Diff line number Diff line change
@@ -5,16 +5,21 @@ let
inherit (darwin.apple_sdk.frameworks) Security;
in rustPlatform.buildRustPackage rec {
name = "maturin-${version}";
version = "0.7.9";
version = "0.8.0";

src = fetchFromGitHub {
owner = "PyO3";
repo = "maturin";
rev = "v${version}";
sha256 = "1l8i1mz97zsc8kayvryv6xznwpby9k9jxy7lsx45acs5yksqchrv";
sha256 = "1fjai0c0j8zzaj4c186dkbvx6cpj0vi3sc1qbjbgn2cm8azsd6m6";
};

cargoSha256 = "0ly0f64acn1hxnj7vg1m860xpl06rklwqh545c386nnxaj839b0r";
# The maturin 0.8.0 lockfile has an incorrect version for maturin
# itself. The upstream lockfiles are normally correct, so this
# should be removed post-0.8.0.
cargoPatches = [ ./Cargo.lock.patch ];

cargoSha256 = "01sh523fi46k5xwdslhnmjz128jkdw47gp9bd8gim3ay13zkcn1i";

nativeBuildInputs = [ pkgconfig ];