hvm: 1.0.0 -> 1.0.8

Diff: https://diff.rs/hvm/1.0.0/1.0.8
This commit is contained in:
figsoda 2023-05-12 11:40:18 -04:00
parent 9eff6f4469
commit 187c93d636
2 changed files with 20 additions and 9 deletions

View File

@ -1,25 +1,36 @@
{ lib { lib
, rustPlatform , rustPlatform
, fetchCrate , fetchCrate
, fetchpatch
, stdenv , stdenv
, darwin , darwin
}: }:
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "hvm"; pname = "hvm";
version = "1.0.0"; version = "1.0.8";
src = fetchCrate { src = fetchCrate {
inherit pname version; inherit pname version;
sha256 = "sha256-nPkUGUcekZ2fvQgiVTNvt8vfQsNMyqsrkT2zqEfu/bE="; hash = "sha256-dPO3GWDojuz7nilOr09xC6tPhBZ95wjAk0ErItzAbxw=";
}; };
cargoSha256 = "sha256-EaZTpKFZPfDlP/2XylhJHznvlah7VNw4snrKDmT7ecw="; cargoHash = "sha256-XsKVXlceg3HHGalHcXfmJPKhAQm4DqdsJ2c+NF+AOI4=";
buildInputs = lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ patches = [
darwin.apple_sdk.frameworks.IOKit # see https://github.com/higherorderco/hvm/pull/220
] ++ lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ # this commit removes the feature to fix build with rust nightly
darwin.apple_sdk_11_0.frameworks.Foundation # but this feature is required with rust stable
(fetchpatch {
name = "revert-fix-remove-feature-automic-mut-ptr.patch";
url = "https://github.com/higherorderco/hvm/commit/c0e35c79b4e31c266ad33beadc397c428e4090ee.patch";
hash = "sha256-9xxu7NOtz3Tuzf5F0Mi4rw45Xnyh7h9hbTrzq4yfslg=";
revert = true;
})
];
buildInputs = lib.optionals stdenv.isDarwin [
darwin.apple_sdk_11_0.frameworks.IOKit
]; ];
# tests are broken # tests are broken
@ -30,7 +41,7 @@ rustPlatform.buildRustPackage rec {
meta = with lib; { meta = with lib; {
description = "A pure functional compile target that is lazy, non-garbage-collected, and parallel"; description = "A pure functional compile target that is lazy, non-garbage-collected, and parallel";
homepage = "https://github.com/kindelia/hvm"; homepage = "https://github.com/higherorderco/hvm";
license = licenses.mit; license = licenses.mit;
maintainers = with maintainers; [ figsoda ]; maintainers = with maintainers; [ figsoda ];
}; };

View File

@ -15378,7 +15378,7 @@ with pkgs;
gwt240 = callPackage ../development/compilers/gwt/2.4.0.nix { }; gwt240 = callPackage ../development/compilers/gwt/2.4.0.nix { };
hvm = callPackage ../development/compilers/hvm { }; hvm = darwin.apple_sdk_11_0.callPackage ../development/compilers/hvm { };
iay = callPackage ../tools/misc/iay { iay = callPackage ../tools/misc/iay {
inherit (darwin.apple_sdk.frameworks) AppKit Security Foundation Cocoa; inherit (darwin.apple_sdk.frameworks) AppKit Security Foundation Cocoa;