diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2024-05-11 12:47:40 +0200 |
---|---|---|
committer | Jan Tojnar <jtojnar@gmail.com> | 2024-05-11 12:47:40 +0200 |
commit | 4be4408157159e40a946af47bb2f646efbbc5519 (patch) | |
tree | 4ad14315153832c4ff287a8239b876e02b08b75e /pkgs/development/interpreters | |
parent | 9a226faa3885169ccb8d9677d57aa27b000786c7 (diff) | |
parent | 435233f4d1f4f592716f661d9c5657b40e78bfc1 (diff) |
Merge branch 'master' into staging-next
; Conflicts: ; maintainers/scripts/luarocks-packages.csv ; pkgs/development/lua-modules/generated-packages.nix
Diffstat (limited to 'pkgs/development/interpreters')
4 files changed, 43 insertions, 40 deletions
diff --git a/pkgs/development/interpreters/emilua/default.nix b/pkgs/development/interpreters/emilua/default.nix index 97fc3089404aa..e71c47ae59cbc 100644 --- a/pkgs/development/interpreters/emilua/default.nix +++ b/pkgs/development/interpreters/emilua/default.nix @@ -1,46 +1,47 @@ -{ lib -, stdenv -, meson -, ninja -, fetchFromGitHub -, fetchFromGitLab -, re2c -, gperf -, gawk -, pkg-config -, boost182 -, fmt -, luajit_openresty -, ncurses -, serd -, sord -, libcap -, liburing -, openssl -, cereal -, cmake -, asciidoctor -, makeWrapper +{ + lib, + stdenv, + meson, + ninja, + fetchFromGitHub, + fetchFromGitLab, + re2c, + gperf, + gawk, + pkg-config, + boost182, + fmt, + luajit_openresty, + ncurses, + serd, + sord, + libcap, + liburing, + openssl, + cereal, + cmake, + asciidoctor, + makeWrapper, }: let trial-protocol-wrap = fetchFromGitHub { - owner = "breese"; - repo = "trial.protocol"; - rev = "79149f604a49b8dfec57857ca28aaf508069b669"; - name = "trial-protocol"; - hash = "sha256-Xd8bX3z9PZWU17N9R95HXdj6qo9at5FBL/+PTVaJgkw="; + owner = "breese"; + repo = "trial.protocol"; + rev = "79149f604a49b8dfec57857ca28aaf508069b669"; + name = "trial-protocol"; + hash = "sha256-Xd8bX3z9PZWU17N9R95HXdj6qo9at5FBL/+PTVaJgkw="; }; in stdenv.mkDerivation rec { pname = "emilua"; - version = "0.7.2"; + version = "0.7.3"; src = fetchFromGitLab { - owner = "emilua"; - repo = "emilua"; - rev = "v${version}"; - hash = "sha256-gt+THEr3nilweDEDmEMwIsU4i9own4ICJlZD+z8XWRQ="; + owner = "emilua"; + repo = "emilua"; + rev = "v${version}"; + hash = "sha256-j8ohhqHjSBgc4Xk9PcQNrbADmsz4VH2zCv+UNqiCv4I="; }; buildInputs = [ @@ -83,7 +84,6 @@ stdenv.mkDerivation rec { (lib.mesonBool "enable_tests" true) (lib.mesonBool "enable_manpages" true) (lib.mesonOption "version_suffix" "-nixpkgs1") - (lib.mesonOption "ipc_actor_msg_max_members_number" "40") ]; postPatch = '' diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index 4cc3f6f4e59eb..86eaf142d9205 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -93,9 +93,9 @@ in { major = "3"; minor = "13"; patch = "0"; - suffix = "a6"; + suffix = "b1"; }; - hash = "sha256-S+85PXKygaz4HTnXRV8AA26GYZPfohpO05cP0PTLoEg="; + hash = "sha256-unFqxWsDm1Ra1KkM5Yaleql4aTZFU3Ru8kRXKM7sGY4="; inherit (darwin) configd; inherit passthruFun; }; diff --git a/pkgs/development/interpreters/python/python-packages-base.nix b/pkgs/development/interpreters/python/python-packages-base.nix index e2bd6cd5a5ab6..2306292eb8c8f 100644 --- a/pkgs/development/interpreters/python/python-packages-base.nix +++ b/pkgs/development/interpreters/python/python-packages-base.nix @@ -68,7 +68,10 @@ let passthru = (oldAttrs.passthru or {})// { pythonModule = python; pythonPath = [ ]; # Deprecated, for compatibility. - requiredPythonModules = requiredPythonModules drv.propagatedBuildInputs; + requiredPythonModules = + builtins.addErrorContext + "while calculating requiredPythonModules for ${drv.name or drv.pname}:" + (requiredPythonModules drv.propagatedBuildInputs); }; }); diff --git a/pkgs/development/interpreters/wasmtime/default.nix b/pkgs/development/interpreters/wasmtime/default.nix index 088ef8ba9a90d..fafe521fbde19 100644 --- a/pkgs/development/interpreters/wasmtime/default.nix +++ b/pkgs/development/interpreters/wasmtime/default.nix @@ -2,19 +2,19 @@ rustPlatform.buildRustPackage rec { pname = "wasmtime"; - version = "20.0.1"; + version = "20.0.2"; src = fetchFromGitHub { owner = "bytecodealliance"; repo = pname; rev = "v${version}"; - hash = "sha256-Qgeg/TYjbfzDEXTPqS6GkTOQrLMGc6D3vochuJSqas0="; + hash = "sha256-zXBVqSBq/dLY8oEs0dNZxtjs4H1aKTJYeeazysHvh3w="; fetchSubmodules = true; }; # Disable cargo-auditable until https://github.com/rust-secure-code/cargo-auditable/issues/124 is solved. auditable = false; - cargoHash = "sha256-HfTwN53j60sG3mcWPEKeveyf7sEbI2746pTJSn6Zlp0="; + cargoHash = "sha256-jFqLUWdW/UfOc843aWO7RNDx1E6sBhUWB5Xw2+A2u90="; cargoBuildFlags = [ "--package" "wasmtime-cli" "--package" "wasmtime-c-api" ]; outputs = [ "out" "dev" ]; |