about summary refs log tree commit diff
path: root/pkgs/development/interpreters
diff options
context:
space:
mode:
authorgithub-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>2024-03-01 12:00:58 +0000
committerGitHub <noreply@github.com>2024-03-01 12:00:58 +0000
commit18bc3c64e66d0fd2bb4b4fbfbc8e9b80e4c58734 (patch)
tree7f09de5aac11016e7dd8a89567547a43148ec71f /pkgs/development/interpreters
parentee08be2ebdb497d3149ccdc3927f714a3640f6fd (diff)
parentdbc93a12161bff01eba5902fbba6d539dd6c7b0c (diff)
downloadnixlib-18bc3c64e66d0fd2bb4b4fbfbc8e9b80e4c58734.tar
nixlib-18bc3c64e66d0fd2bb4b4fbfbc8e9b80e4c58734.tar.gz
nixlib-18bc3c64e66d0fd2bb4b4fbfbc8e9b80e4c58734.tar.bz2
nixlib-18bc3c64e66d0fd2bb4b4fbfbc8e9b80e4c58734.tar.lz
nixlib-18bc3c64e66d0fd2bb4b4fbfbc8e9b80e4c58734.tar.xz
nixlib-18bc3c64e66d0fd2bb4b4fbfbc8e9b80e4c58734.tar.zst
nixlib-18bc3c64e66d0fd2bb4b4fbfbc8e9b80e4c58734.zip
Merge master into staging-next
Diffstat (limited to 'pkgs/development/interpreters')
-rw-r--r--pkgs/development/interpreters/clisp/default.nix1
-rw-r--r--pkgs/development/interpreters/wasmtime/default.nix6
2 files changed, 4 insertions, 3 deletions
diff --git a/pkgs/development/interpreters/clisp/default.nix b/pkgs/development/interpreters/clisp/default.nix
index 0ff0f6a49816..f6218ef8f3b2 100644
--- a/pkgs/development/interpreters/clisp/default.nix
+++ b/pkgs/development/interpreters/clisp/default.nix
@@ -126,6 +126,7 @@ stdenv.mkDerivation {
   meta = {
     description = "ANSI Common Lisp Implementation";
     homepage = "http://clisp.org";
+    mainProgram = "clisp";
     maintainers = lib.teams.lisp.members;
     license = lib.licenses.gpl2Plus;
     platforms = with lib.platforms; linux ++ darwin;
diff --git a/pkgs/development/interpreters/wasmtime/default.nix b/pkgs/development/interpreters/wasmtime/default.nix
index 3247b7eb7dee..72f1d6eb4a12 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 = "18.0.1";
+  version = "18.0.2";
 
   src = fetchFromGitHub {
     owner = "bytecodealliance";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-wCaDwaD/Xvm++PCrDmXo2Nqn9z07et8AhSI1e1527vc=";
+    hash = "sha256-R/emS2h9YM9LwgQARphFPaX1S62T8Rwqs0uLq1y929o=";
     fetchSubmodules = true;
   };
 
   # Disable cargo-auditable until https://github.com/rust-secure-code/cargo-auditable/issues/124 is solved.
   auditable = false;
-  cargoHash = "sha256-4fKJD3YmwFrHk38PUrpn4BDFkByylqRgPmuVHcVxdSI=";
+  cargoHash = "sha256-r7fmKriChDvd09eynpxVOywBMkArMR4epsmtY6U6JI4=";
   cargoBuildFlags = [ "--package" "wasmtime-cli" "--package" "wasmtime-c-api" ];
 
   outputs = [ "out" "dev" ];