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: a36bf6faf96e
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 3768b6f03aa8
Choose a head ref
  • 4 commits
  • 3 files changed
  • 3 contributors

Commits on Jan 24, 2021

  1. maturin: 0.8.3 -> 0.9.0

    @r-ryantm @danieldk
    r-ryantm authored and danieldk committed Jan 24, 2021

    Verified

    This commit was signed with the committer’s verified signature.
    infinisil Silvan Mosberger
    GPG key ID: 9424360B4B85C9E7
    Verified
    Learn about vigilant mode
    Copy the full SHA
    02380d7 View commit details

  2. python3Packages.johnnycanencrypt: maturin 0.9.0 compatibility fix

    @danieldk
    danieldk committed Jan 24, 2021
    Copy the full SHA
    e645c16 View commit details

  3. python3Packages.wasmer: 1.0.0-beta1 -> 1.0.0

    @danieldk
    danieldk committed Jan 24, 2021
    Copy the full SHA
    c81a5d9 View commit details

Commits on Jan 25, 2021

  1. Merge pull request #110095 from r-ryantm/auto-update/maturin

    @SuperSandro2000
    SuperSandro2000 authored Jan 25, 2021
    Copy the full SHA
    3768b6f View commit details
6 changes: 6 additions & 0 deletions pkgs/development/python-modules/johnnycanencrypt/default.nix
View file
Original file line number Diff line number Diff line change
@@ -61,6 +61,12 @@ rustPlatform.buildRustPackage rec {
numpy
];

# Remove with the next release after 0.5.0. This change is required
# for compatibility with maturin 0.9.0.
postPatch = ''
sed '/project-url = /d' -i Cargo.toml
'';

buildPhase = ''
runHook preBuild
maturin build --release --manylinux off --strip --cargo-extra-args="-j $NIX_BUILD_CORES --frozen"
6 changes: 3 additions & 3 deletions pkgs/development/python-modules/wasmer/default.nix
View file
Original file line number Diff line number Diff line change
@@ -8,7 +8,7 @@
}:
let
pname = "wasmer";
version = "1.0.0-beta1";
version = "1.0.0";

wheel = rustPlatform.buildRustPackage rec {
inherit pname version;
@@ -17,10 +17,10 @@ let
owner = "wasmerio";
repo = "wasmer-python";
rev = version;
sha256 = "0302lcfjlw7nz18nf86z6swhhpp1qnpwcsm2fj4avl22rsv0h78j";
hash = "sha256-I1GfjLaPYMIHKh2m/5IQepUsJNiVUEJg49wyuuzUYtY=";
};

cargoHash = "sha256-Rq5m9Lu6kePvohfhODLMOpGPFtCh0woTsQY2TufoiNQ=";
cargoHash = "sha256-txOOia1C4W+nsXuXp4EytEn82CFfSmiOYwRLC4WPImc=";

nativeBuildInputs = [ maturin python ];

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

src = fetchFromGitHub {
owner = "PyO3";
repo = "maturin";
rev = "v${version}";
sha256 = "08l5r7d75id6qzf8xhkjv4hkdr64cq4dbcmdjywmvf9szjbnr65z";
sha256 = "sha256-X5/1zEVhhdTuyXcUwC3jVv9Gblmv8LT+ftsVo8BnnZs=";
};

cargoSha256 = "1n0sxkhcdg2rbzqd7826pa7sxlnn0c2sc8l6lc98xw21vvqisc8n";
cargoSha256 = "sha256-PBmuPIpCwC7fr/MKFaeSd/0avoEATlxoeMHisjouAeI=";

nativeBuildInputs = [ pkg-config ];