diff options
| author | figsoda <figsoda@pm.me> | 2023-01-14 18:28:49 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-14 18:28:49 -0500 |
| commit | 1e47b50d856a165f93fb83f4d360e4ff5407651b (patch) | |
| tree | db320ea952ec351c1839b194754bbe18850ce1c7 | |
| parent | 932d315a5a982f482fa63edda24334ccb133aae7 (diff) | |
| parent | 57b8910e152183c6d3addf4b1e12d9fc4c1ed7c4 (diff) | |
Merge pull request #210587 from figsoda/hvm
hvm: 0.1.89 -> 1.0.0
| -rw-r--r-- | pkgs/development/compilers/hvm/default.nix | 23 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 14 insertions, 13 deletions
diff --git a/pkgs/development/compilers/hvm/default.nix b/pkgs/development/compilers/hvm/default.nix index e314e52a0523..1d60a610729d 100644 --- a/pkgs/development/compilers/hvm/default.nix +++ b/pkgs/development/compilers/hvm/default.nix @@ -1,30 +1,33 @@ { lib , rustPlatform , fetchCrate -, pkg-config -, openssl , stdenv -, Security +, darwin }: rustPlatform.buildRustPackage rec { pname = "hvm"; - version = "0.1.89"; + version = "1.0.0"; src = fetchCrate { inherit pname version; - sha256 = "sha256-xPF8HW4QFXLLjg2HO5Pl+uQ44XCdAHc6koVpVXxN6dE="; + sha256 = "sha256-nPkUGUcekZ2fvQgiVTNvt8vfQsNMyqsrkT2zqEfu/bE="; }; - cargoSha256 = "sha256-dDSmiMwDbVDfStXamQvOMBBO5MiuDFhgzWPx0oYwzcM="; + cargoSha256 = "sha256-EaZTpKFZPfDlP/2XylhJHznvlah7VNw4snrKDmT7ecw="; - nativeBuildInputs = [ pkg-config ]; + buildInputs = lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ + darwin.apple_sdk.frameworks.IOKit + ] ++ lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ + darwin.apple_sdk_11_0.frameworks.Foundation + ]; - buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin Security; - - # memory allocation of 34359738368 bytes failed + # tests are broken doCheck = false; + # enable nightly features + RUSTC_BOOTSTRAP = true; + meta = with lib; { description = "A pure functional compile target that is lazy, non-garbage-collected, and parallel"; homepage = "https://github.com/kindelia/hvm"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d260b44f76ac..648286837d61 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14753,9 +14753,7 @@ with pkgs; gwt240 = callPackage ../development/compilers/gwt/2.4.0.nix { }; - hvm = callPackage ../development/compilers/hvm { - inherit (darwin.apple_sdk.frameworks) Security; - }; + hvm = callPackage ../development/compilers/hvm { }; iay = callPackage ../tools/misc/iay { inherit (darwin.apple_sdk.frameworks) AppKit Security Foundation Cocoa; |