Merge pull request #274858 from r-ryantm/auto-update/moarvm

moarvm: 2023.10 -> 2024.01
This commit is contained in:
Weijia Wang 2024-01-28 13:13:15 +01:00 committed by GitHub
commit 8e817a95a4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 5 additions and 11 deletions

View File

@ -1,7 +1,6 @@
{ lib
, stdenv
, fetchFromGitHub
, cctools-port
, perl
, CoreServices
, ApplicationServices
@ -9,13 +8,13 @@
stdenv.mkDerivation rec {
pname = "moarvm";
version = "2023.10";
version = "2024.01";
src = fetchFromGitHub {
owner = "moarvm";
repo = "moarvm";
rev = version;
hash = "sha256-1w6oMoxDro/AHE+QvjKUx9cxNpYuVSXYrRMh31ksgoQ=";
hash = "sha256-vU1fhR6pKz2qnznrJ/mknt9DVx+I1kLaPStXKQvp59g=";
fetchSubmodules = true;
};
@ -27,13 +26,9 @@ stdenv.mkDerivation rec {
--replace '/usr/bin/arch' "$(type -P true)" \
--replace '/usr/' '/nope/'
substituteInPlace 3rdparty/dyncall/configure \
--replace '`sw_vers -productVersion`' '"$MACOSX_DEPLOYMENT_TARGET"'
--replace '`sw_vers -productVersion`' '"11.0"'
'';
nativeBuildInputs = lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [
cctools-port
];
buildInputs = [ perl ] ++ lib.optionals stdenv.isDarwin [ CoreServices ApplicationServices ];
doCheck = false; # MoarVM does not come with its own test suite

View File

@ -17955,9 +17955,8 @@ with pkgs;
racket-minimal = callPackage ../development/interpreters/racket/minimal.nix { };
rakudo = callPackage ../development/interpreters/rakudo { };
moarvm = callPackage ../development/interpreters/rakudo/moarvm.nix {
inherit (darwin) cctools-port;
inherit (darwin.apple_sdk.frameworks) CoreServices ApplicationServices;
moarvm = darwin.apple_sdk_11_0.callPackage ../development/interpreters/rakudo/moarvm.nix {
inherit (darwin.apple_sdk_11_0.frameworks) CoreServices ApplicationServices;
};
nqp = callPackage ../development/interpreters/rakudo/nqp.nix { };
zef = callPackage ../development/interpreters/rakudo/zef.nix { };