diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2024-03-07 12:01:24 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-07 12:01:24 +0000 |
| commit | 590e65a7b3a132f3b54145cd714749ea214f333b (patch) | |
| tree | 0f455407a0bea30a696ba0535832482c17596ed9 /pkgs/development/interpreters | |
| parent | 5e0cda94371075bead6d953e8a60a717ec022524 (diff) | |
| parent | 413506a7ca983170cc8c7bc47f0845a2e6e03e95 (diff) | |
| download | nixlib-590e65a7b3a132f3b54145cd714749ea214f333b.tar nixlib-590e65a7b3a132f3b54145cd714749ea214f333b.tar.gz nixlib-590e65a7b3a132f3b54145cd714749ea214f333b.tar.bz2 nixlib-590e65a7b3a132f3b54145cd714749ea214f333b.tar.lz nixlib-590e65a7b3a132f3b54145cd714749ea214f333b.tar.xz nixlib-590e65a7b3a132f3b54145cd714749ea214f333b.tar.zst nixlib-590e65a7b3a132f3b54145cd714749ea214f333b.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/development/interpreters')
| -rw-r--r-- | pkgs/development/interpreters/luau/default.nix | 14 | ||||
| -rw-r--r-- | pkgs/development/interpreters/rakudo/zef.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/interpreters/rascal/default.nix | 4 |
3 files changed, 15 insertions, 7 deletions
diff --git a/pkgs/development/interpreters/luau/default.nix b/pkgs/development/interpreters/luau/default.nix index 2341f8a5c70e..8f1f854c5763 100644 --- a/pkgs/development/interpreters/luau/default.nix +++ b/pkgs/development/interpreters/luau/default.nix @@ -1,16 +1,24 @@ -{ lib, stdenv, fetchFromGitHub, cmake, llvmPackages }: +{ lib, stdenv, fetchFromGitHub, cmake, llvmPackages, fetchpatch }: stdenv.mkDerivation rec { pname = "luau"; - version = "614"; + version = "0.615"; src = fetchFromGitHub { owner = "luau-lang"; repo = "luau"; rev = version; - hash = "sha256-pM+KSb5jsoPLu2paQYNSdqly0ndbw98Sj2dvMZ7XqhQ="; + hash = "sha256-IwiPUiw3bH+9CzIAJqLjGpIBLQ+T0xW7c4jVXoxVZPc="; }; + patches = [ + # Fix linker errors. Remove with the next release. + (fetchpatch { + url = "https://github.com/luau-lang/luau/commit/9323be6110beda90ef9d9dcb43e49b9acdc224e5.patch"; + hash = "sha256-/uWXbv3ZSpGJ4Q9MYixz50o5HIp5keSaqMSlOq0TbzE="; + }) + ]; + nativeBuildInputs = [ cmake ]; buildInputs = lib.optionals stdenv.cc.isClang [ llvmPackages.libunwind ]; diff --git a/pkgs/development/interpreters/rakudo/zef.nix b/pkgs/development/interpreters/rakudo/zef.nix index 60c14d9d4641..158fd6df4eb5 100644 --- a/pkgs/development/interpreters/rakudo/zef.nix +++ b/pkgs/development/interpreters/rakudo/zef.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "zef"; - version = "0.21.2"; + version = "0.21.4"; src = fetchFromGitHub { owner = "ugexe"; repo = "zef"; rev = "v${finalAttrs.version}"; - hash = "sha256-7mqKcioMal4OR/xlzQ/EgGICau7Ijc13j4pSfu4/74E="; + hash = "sha256-k6jihTDbaSXv+XvfqxGIyCdD005tG8l3mSIkNG6FwPQ="; }; nativeBuildInputs = [ diff --git a/pkgs/development/interpreters/rascal/default.nix b/pkgs/development/interpreters/rascal/default.nix index aab9fffcd605..409a34d8cfe6 100644 --- a/pkgs/development/interpreters/rascal/default.nix +++ b/pkgs/development/interpreters/rascal/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "rascal"; - version = "0.28.2"; + version = "0.33.8"; src = fetchurl { url = "https://update.rascal-mpl.org/console/${pname}-${version}.jar"; - sha256 = "sha256-KMoGTegjXuGSzNnwH6SkcM5GC/F3oluvFrlJ51Pms3M="; + sha256 = "sha256-8m7+ME0mu9LEMzklkz1CZ9s7ZCMjoA5oreICFSpb4S8="; }; nativeBuildInputs = [ makeWrapper ]; |