diff --git a/pkgs/development/compilers/hvm/default.nix b/pkgs/development/compilers/hvm/default.nix index 1d60a610729d..cf3f515a53f5 100644 --- a/pkgs/development/compilers/hvm/default.nix +++ b/pkgs/development/compilers/hvm/default.nix @@ -1,25 +1,36 @@ { lib , rustPlatform , fetchCrate +, fetchpatch , stdenv , darwin }: rustPlatform.buildRustPackage rec { pname = "hvm"; - version = "1.0.0"; + version = "1.0.8"; src = fetchCrate { 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) [ - darwin.apple_sdk.frameworks.IOKit - ] ++ lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ - darwin.apple_sdk_11_0.frameworks.Foundation + patches = [ + # see https://github.com/higherorderco/hvm/pull/220 + # this commit removes the feature to fix build with rust nightly + # 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 @@ -30,7 +41,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { 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; maintainers = with maintainers; [ figsoda ]; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index de42c90e2d1c..6b2ba5cc2f7f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15377,7 +15377,7 @@ with pkgs; 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 { inherit (darwin.apple_sdk.frameworks) AppKit Security Foundation Cocoa;