pyrox.dev
Merge pull request #231490 from figsoda/hvm
hvm: 1.0.0 -> 1.0.8
authored by Martin Weinelt and committed by GitHub 2ee9aa3a 028f97e3
+19
-8
pkgs/development/compilers/hvm/default.nix
+19
-8
pkgs/development/compilers/hvm/default.nix
···
1
1
{ lib
2
2
, rustPlatform
3
3
, fetchCrate
4
+
, fetchpatch
4
5
, stdenv
5
6
, darwin
6
7
}:
7
8
8
9
rustPlatform.buildRustPackage rec {
9
10
pname = "hvm";
10
-
version = "1.0.0";
11
+
version = "1.0.8";
11
12
12
13
src = fetchCrate {
13
14
inherit pname version;
14
-
sha256 = "sha256-nPkUGUcekZ2fvQgiVTNvt8vfQsNMyqsrkT2zqEfu/bE=";
15
+
hash = "sha256-dPO3GWDojuz7nilOr09xC6tPhBZ95wjAk0ErItzAbxw=";
15
16
};
16
17
17
-
cargoSha256 = "sha256-EaZTpKFZPfDlP/2XylhJHznvlah7VNw4snrKDmT7ecw=";
18
+
cargoHash = "sha256-XsKVXlceg3HHGalHcXfmJPKhAQm4DqdsJ2c+NF+AOI4=";
19
+
20
+
patches = [
21
+
# see https://github.com/higherorderco/hvm/pull/220
22
+
# this commit removes the feature to fix build with rust nightly
23
+
# but this feature is required with rust stable
24
+
(fetchpatch {
25
+
name = "revert-fix-remove-feature-automic-mut-ptr.patch";
26
+
url = "https://github.com/higherorderco/hvm/commit/c0e35c79b4e31c266ad33beadc397c428e4090ee.patch";
27
+
hash = "sha256-9xxu7NOtz3Tuzf5F0Mi4rw45Xnyh7h9hbTrzq4yfslg=";
28
+
revert = true;
29
+
})
30
+
];
18
31
19
-
buildInputs = lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [
20
-
darwin.apple_sdk.frameworks.IOKit
21
-
] ++ lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [
22
-
darwin.apple_sdk_11_0.frameworks.Foundation
32
+
buildInputs = lib.optionals stdenv.isDarwin [
33
+
darwin.apple_sdk_11_0.frameworks.IOKit
23
34
];
24
35
25
36
# tests are broken
···
30
41
31
42
meta = with lib; {
32
43
description = "A pure functional compile target that is lazy, non-garbage-collected, and parallel";
33
-
homepage = "https://github.com/kindelia/hvm";
44
+
homepage = "https://github.com/higherorderco/hvm";
34
45
license = licenses.mit;
35
46
maintainers = with maintainers; [ figsoda ];
36
47
};
+1
-1
pkgs/top-level/all-packages.nix
+1
-1
pkgs/top-level/all-packages.nix
···
15377
15377
15378
15378
gwt240 = callPackage ../development/compilers/gwt/2.4.0.nix { };
15379
15379
15380
-
hvm = callPackage ../development/compilers/hvm { };
15380
+
hvm = darwin.apple_sdk_11_0.callPackage ../development/compilers/hvm { };
15381
15381
15382
15382
iay = callPackage ../tools/misc/iay {
15383
15383
inherit (darwin.apple_sdk.frameworks) AppKit Security Foundation Cocoa;