From d4a9198797bf92b6fbbde689ed15fbb35807158e Mon Sep 17 00:00:00 2001 From: Jeremy Schlatter Date: Fri, 21 Jun 2024 12:34:21 -0700 Subject: [PATCH] bend: 0.2.22 -> 0.2.34, hvm: 2.0.17 -> 2.0.19 These updates are coupled because bend depends on exact hvm version. Also removes IOKit from hvm's buildInputs on darwin. This was a holdover from HVM1, which needed it. HVM2 does not. Also deletes unused unused arguments from the hvm derivation. Also migrates hvm to pkgs/by-name. --- pkgs/by-name/be/bend/package.nix | 6 +++--- .../hvm/default.nix => by-name/hv/hvm/package.nix} | 12 +++--------- pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 6 insertions(+), 14 deletions(-) rename pkgs/{development/compilers/hvm/default.nix => by-name/hv/hvm/package.nix} (60%) diff --git a/pkgs/by-name/be/bend/package.nix b/pkgs/by-name/be/bend/package.nix index d904cd852874..bd2dd197f87b 100644 --- a/pkgs/by-name/be/bend/package.nix +++ b/pkgs/by-name/be/bend/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "Bend"; - version = "0.2.22"; + version = "0.2.34"; src = fetchFromGitHub { owner = "HigherOrderCO"; repo = "Bend"; rev = "refs/tags/${version}"; - hash = "sha256-5qcj3KfgcB5tbVSJUSOVQDAhEpPE8SFoT0g9syHbFCA="; + hash = "sha256-3leAt1M3Six5+KcCcz7sorpVHGkKj7xGWZ0KJnh+bNs="; }; - cargoHash = "sha256-gSAIidMEYJDZHgIWNgYJVqyhpD7M+CMCD+1mEXGztIk="; + cargoHash = "sha256-VynLnpZLUCqclIlbt7y6kd8ZJQGLa892J2UjDATgAhE="; nativeBuildInputs = [ hvm diff --git a/pkgs/development/compilers/hvm/default.nix b/pkgs/by-name/hv/hvm/package.nix similarity index 60% rename from pkgs/development/compilers/hvm/default.nix rename to pkgs/by-name/hv/hvm/package.nix index 1399717994b3..b5f1725d7113 100644 --- a/pkgs/development/compilers/hvm/default.nix +++ b/pkgs/by-name/hv/hvm/package.nix @@ -1,24 +1,18 @@ { lib , rustPlatform , fetchCrate -, stdenv -, darwin }: rustPlatform.buildRustPackage rec { pname = "hvm"; - version = "2.0.17"; + version = "2.0.19"; src = fetchCrate { inherit pname version; - hash = "sha256-UzPEupmUnph7SjCc/T4sBSGXj8yLVdQlw+X9iM16zD8="; + hash = "sha256-+Cx+2v4JrQflDBaNZ9Fu8734Zr4rrgtnojUS4dkx7Ck="; }; - cargoHash = "sha256-AchVbf+mn4qQtzWu84Dqek+btCm6BA9mcY+8iHWqdiw="; - - buildInputs = lib.optionals stdenv.isDarwin [ - darwin.apple_sdk_11_0.frameworks.IOKit - ]; + cargoHash = "sha256-crVEtMzjg9T0oiS13URevPuRYqod4d2Ylb1IWRPVpa8="; meta = with lib; { description = "Massively parallel, optimal functional runtime in Rust"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6e0db78d9023..08bf65044644 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15959,8 +15959,6 @@ with pkgs; gwt240 = callPackage ../development/compilers/gwt/2.4.0.nix { }; - hvm = darwin.apple_sdk_11_0.callPackage ../development/compilers/hvm { }; - iay = callPackage ../tools/misc/iay { inherit (darwin.apple_sdk.frameworks) AppKit Security Foundation Cocoa; };