diff options
Diffstat (limited to 'pkgs/development/interpreters')
25 files changed, 163 insertions, 142 deletions
diff --git a/pkgs/development/interpreters/femtolisp/default.nix b/pkgs/development/interpreters/femtolisp/default.nix index 33066d97ef64d..7bf0ea7c75404 100644 --- a/pkgs/development/interpreters/femtolisp/default.nix +++ b/pkgs/development/interpreters/femtolisp/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation { pname = "femtolisp"; - version = "0-unstable-2023-07-12"; + version = "0-unstable-2024-06-18"; src = fetchFromSourcehut { owner = "~ft"; repo = "femtolisp"; - rev = "b3a21a0ff408e559639f6c31e1a2ab970787567f"; - hash = "sha256-PE/xYhfhn0xv/kJWsS07fOF2n5sXP666vy7OVaNxc7Y="; + rev = "ee58f398fec62d3096b0e01da51a3969ed37a32d"; + hash = "sha256-pfPD9TNLmrqhvJS/aVVmziMVApsiU5v1nAMqU+Kduzw="; }; strictDeps = true; diff --git a/pkgs/development/interpreters/groovy/default.nix b/pkgs/development/interpreters/groovy/default.nix index 30f85baa364ec..8ed9bfe117366 100644 --- a/pkgs/development/interpreters/groovy/default.nix +++ b/pkgs/development/interpreters/groovy/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "groovy"; - version = "4.0.21"; + version = "4.0.22"; src = fetchurl { url = "mirror://apache/groovy/${version}/distribution/apache-groovy-binary-${version}.zip"; - sha256 = "sha256-Xvh49w24tkLSBOmkEMUZwRMaPnqd20tpENIUkJyy6Yo="; + sha256 = "sha256-2Ro93+NThx1MJlbT0KBcgovD/zbp1J29vsE9zZjwWHc="; }; nativeBuildInputs = [ makeWrapper unzip ]; diff --git a/pkgs/development/interpreters/guile/3.0.nix b/pkgs/development/interpreters/guile/3.0.nix index fb788377107e1..7eb0f1abc4cff 100644 --- a/pkgs/development/interpreters/guile/3.0.nix +++ b/pkgs/development/interpreters/guile/3.0.nix @@ -26,11 +26,11 @@ let in builder rec { pname = "guile"; - version = "3.0.9"; + version = "3.0.10"; src = fetchurl { url = "mirror://gnu/${pname}/${pname}-${version}.tar.xz"; - sha256 = "sha256-GiYlrHKyNm6VeS8/51j9Lfd1tARKkKSpeHMm5mwNdQ0="; + sha256 = "sha256-vXFoUX/VJjM0RtT3q4FlJ5JWNAlPvTcyLhfiuNjnY4g="; }; outputs = [ "out" "dev" "info" ]; @@ -74,7 +74,6 @@ builder rec { patches = [ ./eai_system.patch - ./guile-hurd-posix-spawn.patch ] ++ lib.optional (coverageAnalysis != null) ./gcov-file-name.patch ++ lib.optional stdenv.isDarwin (fetchpatch { diff --git a/pkgs/development/interpreters/guile/guile-hurd-posix-spawn.patch b/pkgs/development/interpreters/guile/guile-hurd-posix-spawn.patch deleted file mode 100644 index 7cf600b4c2aa5..0000000000000 --- a/pkgs/development/interpreters/guile/guile-hurd-posix-spawn.patch +++ /dev/null @@ -1,44 +0,0 @@ -Fix <https://issues.guix.gnu.org/61095>, which affects GNU/Hurd. - -diff --git a/libguile/posix.c b/libguile/posix.c -index 3a8be94e4..f5fdc544c 100644 ---- a/libguile/posix.c -+++ b/libguile/posix.c -@@ -1326,7 +1326,14 @@ static void - close_inherited_fds_slow (posix_spawn_file_actions_t *actions, int max_fd) - { - while (--max_fd > 2) -- posix_spawn_file_actions_addclose (actions, max_fd); -+ { -+ /* Adding invalid file descriptors to an 'addclose' action leads -+ to 'posix_spawn' failures on some operating systems: -+ <https://bugs.gnu.org/61095>. Hence the extra check. */ -+ int flags = fcntl (max_fd, F_GETFD, NULL); -+ if ((flags >= 0) && ((flags & FD_CLOEXEC) == 0)) -+ posix_spawn_file_actions_addclose (actions, max_fd); -+ } - } - - static void - -Fix <https://issues.guix.gnu.org/62501>. - -diff --git a/test-suite/tests/posix.test b/test-suite/tests/posix.test -index f20e04453..d5cf47cda 100644 ---- a/test-suite/tests/posix.test -+++ b/test-suite/tests/posix.test -@@ -431,7 +431,13 @@ - (let ((str (get-string-all (car input+output)))) - (close-port (car input+output)) - (waitpid pid) -- str))) -+ -+ ;; On GNU/Hurd, the exec server prepends 'LD_ORIGIN_PATH' for -+ ;; every program: <https://bugs.gnu.org/62501>. Strip it. -+ (if (and (string=? "GNU" (utsname:sysname (uname))) -+ (string-prefix? "LD_ORIGIN_PATH=" str)) -+ (string-drop str (+ 1 (string-index str #\newline))) -+ str)))) - - (pass-if-equal "ls /proc/self/fd" - "0\n1\n2\n3\n" ;fourth FD is for /proc/self/fd diff --git a/pkgs/development/interpreters/io/default.nix b/pkgs/development/interpreters/io/default.nix index 8a6de1f094d25..64e5b7c4d8279 100644 --- a/pkgs/development/interpreters/io/default.nix +++ b/pkgs/development/interpreters/io/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, fetchpatch, cmake, zlib, sqlite, gmp, libffi, cairo, ncurses, freetype, libGLU, libGL, libpng, libtiff, libjpeg, readline, libsndfile, - libxml2, freeglut, libsamplerate, pcre, libevent, libedit, yajl, + libxml2, libglut, libsamplerate, pcre, libevent, libedit, yajl, python3, openssl, glfw, pkg-config, libpthreadstubs, libXdmcp, libmemcached }: @@ -30,7 +30,7 @@ stdenv.mkDerivation { buildInputs = [ zlib sqlite gmp libffi cairo ncurses freetype libGLU libGL libpng libtiff libjpeg readline libsndfile libxml2 - freeglut libsamplerate pcre libevent libedit yajl + libglut libsamplerate pcre libevent libedit yajl glfw openssl libpthreadstubs libXdmcp libmemcached python3 ]; diff --git a/pkgs/development/interpreters/lua-5/build-luarocks-package.nix b/pkgs/development/interpreters/lua-5/build-luarocks-package.nix index 6f3342d057bd1..55bd577e46d1a 100644 --- a/pkgs/development/interpreters/lua-5/build-luarocks-package.nix +++ b/pkgs/development/interpreters/lua-5/build-luarocks-package.nix @@ -132,6 +132,8 @@ let generatedConfig = luaLib.generateLuarocksConfig { externalDeps = lib.unique (self.externalDeps ++ externalDepsGenerated); + local_cache = ""; + # Filter out the lua derivation itself from the Lua module dependency # closure, as it doesn't have a rock tree :) # luaLib.hasLuaModule diff --git a/pkgs/development/interpreters/lua-5/interpreter.nix b/pkgs/development/interpreters/lua-5/interpreter.nix index 7775fa5c84939..497307d57b3f3 100644 --- a/pkgs/development/interpreters/lua-5/interpreter.nix +++ b/pkgs/development/interpreters/lua-5/interpreter.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: LuaCPathSearchPaths = luaPackages.luaLib.luaCPathList; setupHook = builtins.toFile "lua-setup-hook" '' source @out@/nix-support/utils.sh - addEnvHooks "$hostOffset" addToLuaPath + addEnvHooks "$hostOffset" luaEnvHook ''; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/interpreters/lua-5/tests/default.nix b/pkgs/development/interpreters/lua-5/tests/default.nix index c95d11aefc967..768f07cb84003 100644 --- a/pkgs/development/interpreters/lua-5/tests/default.nix +++ b/pkgs/development/interpreters/lua-5/tests/default.nix @@ -96,4 +96,17 @@ in touch $out ''); + + + /* + Check that a lua package's propagatedBuildInputs end up in LUA_PATH + */ + checkPropagatedBuildInputs = pkgs.runCommandLocal "test-${lua.name}-setup-hook" ({ + # lua-curl is a propagatedBuildInput of rest-nvim has + buildInputs = [ lua.pkgs.rest-nvim ]; + }) ('' + ${lua}/bin/lua -e "require'cURL'" + touch $out + ''); + }) diff --git a/pkgs/development/interpreters/lua-5/utils.sh b/pkgs/development/interpreters/lua-5/utils.sh index 5491f8f7ad2d5..2365af08dc9cb 100644 --- a/pkgs/development/interpreters/lua-5/utils.sh +++ b/pkgs/development/interpreters/lua-5/utils.sh @@ -1,4 +1,8 @@ -#!/bin/sh +#!/bin/bash + +declare -gA luaPathsSeen=() + +# shellcheck disable=SC2164,SC2041 nix_print() { if [ ${NIX_DEBUG:-0} -ge $1 ]; then echo "$2" @@ -33,13 +37,53 @@ addToLuaSearchPathWithCustomDelimiter() { shopt -u globstar } +# used in setup Hooks to load LUA_PATH and LUA_CPATH +# luaEnvHook +luaEnvHook() { + _addToLuaPath "$1" +} + addToLuaPath() { local dir="$1" + if [ ! -d "$dir" ]; then + nix_debug "$dir not a directory abort" + return 0 + fi + cd "$dir" + for pattern in @luapathsearchpaths@; do + addToLuaSearchPathWithCustomDelimiter LUA_PATH "$PWD/$pattern" + done + + # LUA_CPATH + for pattern in @luacpathsearchpaths@; do + addToLuaSearchPathWithCustomDelimiter LUA_CPATH "$PWD/$pattern" + done + cd - >/dev/null +} + + +_addToLuaPath() { + local dir="$1" + + echo "_addToLuaPath called for dir $dir" + if [[ ! -d "$dir" ]]; then nix_debug "$dir not a directory abort" return 0 fi + +# set -x + # if [ -n "${pythonPathsSeen[$dir]}" ]; then return; fi + if [[ -n "${luaPathsSeen[$dir]:-}" ]]; then + # if [ -n "${luaPathsSeen[$dir]}" ]; then + echo "$dir already parsed" + return + fi + + luaPathsSeen["$dir"]=true + + # shellcheck disable=SC2164 cd "$dir" for pattern in @luapathsearchpaths@; do addToLuaSearchPathWithCustomDelimiter LUA_PATH "$PWD/$pattern" @@ -49,6 +93,43 @@ addToLuaPath() { for pattern in @luacpathsearchpaths@; do addToLuaSearchPathWithCustomDelimiter LUA_CPATH "$PWD/$pattern" done + cd - >/dev/null + + addToSearchPath program_PATH "$dir"/bin + + # Inspect the propagated inputs (if they exist) and recur on them. + local prop="$dir/nix-support/propagated-build-inputs" + if [ -e "$prop" ]; then + local new_path + for new_path in $(cat $prop); do + echo "newpath: $new_path" + _addToLuaPath "$new_path" + done + fi + } +# Builds environment variables like LUA_PATH and PATH walking through closure +# of dependencies. +buildLuaPath() { + local luaPath="$1" + local path + + echo "BUILD_LUA_PATH" + +# # set -x +# # Create an empty table of paths (see doc on loadFromPropagatedInputs +# # for how this is used). Build up the program_PATH and program_LUA_PATH +# # variables. + # declare -gA luaPathsSeen=() +# # shellcheck disable=SC2034 + program_PATH= + luaPathsSeen["@lua@"]=1 +# addToSearchPath program_PATH @lua@/bin + for path in $luaPath; do + _addToLuaPath "$path" + done +} + + diff --git a/pkgs/development/interpreters/lua-5/wrap.sh b/pkgs/development/interpreters/lua-5/wrap.sh index 7d59cf6095775..f6868e6faac56 100644 --- a/pkgs/development/interpreters/lua-5/wrap.sh +++ b/pkgs/development/interpreters/lua-5/wrap.sh @@ -9,24 +9,6 @@ wrapLuaPrograms() { wrapLuaProgramsIn "$out/bin" "$out $luaPath" } -# Builds environment variables like LUA_PATH and PATH walking through closure -# of dependencies. -buildLuaPath() { - local luaPath="$1" - local path - - # Create an empty table of paths (see doc on loadFromPropagatedInputs - # for how this is used). Build up the program_PATH and program_LUA_PATH - # variables. - declare -A luaPathsSeen=() - program_PATH= - luaPathsSeen["@lua@"]=1 - addToSearchPath program_PATH @lua@/bin - for path in $luaPath; do - addToLuaPath "$path" - done -} - # with an executable shell script which will set some environment variables # and then call into the original binary (which has been given a .wrapped suffix). # luaPath is a list of directories @@ -47,7 +29,6 @@ wrapLuaProgramsIn() { # Find all regular files in the output directory that are executable. find "$dir" -type f -perm -0100 -print0 | while read -d "" f; do # Rewrite "#! .../env lua" to "#! /nix/store/.../lua". - # Strip suffix, like "3" or "2.7m" -- we don't have any choice on which # Lua to use besides one with this hook anyway. if head -n1 "$f" | grep -q '#!.*/env.*\(lua\)'; then sed -i "$f" -e "1 s^.*/env[ ]*\(lua\)[^ ]*^#! @executable@^" @@ -73,28 +54,3 @@ wrapLuaProgramsIn() { done } - -# Adds the lib and bin directories to the LUA_PATH and PATH variables, -# respectively. Recurses on any paths declared in -# `propagated-native-build-inputs`, while avoiding duplicating paths by -# flagging the directories it has visited in `luaPathsSeen`. -loadFromPropagatedInputs() { - local dir="$1" - # Stop if we've already visited here. - if [ -n "${luaPathsSeen[$dir]}" ]; then - return - fi - luaPathsSeen[$dir]=1 - - addToLuaPath "$dir" - addToSearchPath program_PATH $dir/bin - - # Inspect the propagated inputs (if they exist) and recur on them. - local prop="$dir/nix-support/propagated-native-build-inputs" - if [ -e "$prop" ]; then - local new_path - for new_path in $(cat $prop); do - loadFromPropagatedInputs "$new_path" - done - fi -} diff --git a/pkgs/development/interpreters/lua-5/wrapper.nix b/pkgs/development/interpreters/lua-5/wrapper.nix index 07ea75605c0f9..6eb94b60360bb 100644 --- a/pkgs/development/interpreters/lua-5/wrapper.nix +++ b/pkgs/development/interpreters/lua-5/wrapper.nix @@ -30,7 +30,7 @@ let fi mkdir -p "$out/bin" - addToLuaPath "$out" + buildLuaPath "$out" # take every binary from lua packages and put them into the env for path in ${lib.concatStringsSep " " paths}; do diff --git a/pkgs/development/interpreters/luajit/default.nix b/pkgs/development/interpreters/luajit/default.nix index 3b98e8c790148..25f3332b2602a 100644 --- a/pkgs/development/interpreters/luajit/default.nix +++ b/pkgs/development/interpreters/luajit/default.nix @@ -114,7 +114,7 @@ stdenv.mkDerivation (finalAttrs: { setupHook = builtins.toFile "lua-setup-hook" '' source @out@/nix-support/utils.sh - addEnvHooks "$hostOffset" addToLuaPath + addEnvHooks "$hostOffset" luaEnvHook ''; # copied from python diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix index ab5960b5ea610..0f989419b1288 100644 --- a/pkgs/development/interpreters/python/cpython/default.nix +++ b/pkgs/development/interpreters/python/cpython/default.nix @@ -417,6 +417,9 @@ in with passthru; stdenv.mkDerivation (finalAttrs: { (enableFeature enableGIL "gil") ] ++ optionals enableOptimizations [ "--enable-optimizations" + ] ++ optionals (stdenv.isDarwin && configd == null) [ + # Make conditional on Darwin for now to avoid causing Linux rebuilds. + "py_cv_module__scproxy=n/a" ] ++ optionals (sqlite != null) [ "--enable-loadable-sqlite-extensions" ] ++ optionals (libxcrypt != null) [ diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index 08e017fb06e8f..c406780e83fc0 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -16,14 +16,14 @@ passthruFun = import ./passthrufun.nix args; sources = { - python311 = { + python312 = { sourceVersion = { major = "3"; - minor = "11"; - patch = "9"; + minor = "12"; + patch = "4"; suffix = ""; }; - hash = "sha256-mx6JZSP8UQaREmyGRAbZNgo9Hphqy9pZzaV7Wr2kW4c="; + hash = "sha256-9tQZpth0OrJnAIAbSQjSbZfouYbhT5XeMbMt4rDnlVQ="; }; }; @@ -68,25 +68,25 @@ in { inherit passthruFun; }; - python311 = callPackage ./cpython ({ + python311 = callPackage ./cpython { self = __splicedPackages.python311; - inherit (darwin) configd; - inherit passthruFun; - } // sources.python311); - - python312 = callPackage ./cpython { - self = __splicedPackages.python312; sourceVersion = { major = "3"; - minor = "12"; - patch = "3"; + minor = "11"; + patch = "9"; suffix = ""; }; - hash = "sha256-Vr/vH9/BIhzmcg5DpmHj60F4XdkUzplpjYx4lq9L2qE="; + hash = "sha256-mx6JZSP8UQaREmyGRAbZNgo9Hphqy9pZzaV7Wr2kW4c="; inherit (darwin) configd; inherit passthruFun; }; + python312 = callPackage ./cpython ({ + self = __splicedPackages.python312; + inherit (darwin) configd; + inherit passthruFun; + } // sources.python312); + python313 = callPackage ./cpython { self = __splicedPackages.python313; sourceVersion = { @@ -123,7 +123,7 @@ in { enableOptimizations = false; enableLTO = false; mimetypesSupport = false; - } // sources.python311)).overrideAttrs(old: { + } // sources.python312)).overrideAttrs(old: { # TODO(@Artturin): Add this to the main cpython expr strictDeps = true; pname = "python3-minimal"; diff --git a/pkgs/development/interpreters/python/hooks/python-imports-check-hook.sh b/pkgs/development/interpreters/python/hooks/python-imports-check-hook.sh index 7172ac4985451..b65d6e745247e 100644 --- a/pkgs/development/interpreters/python/hooks/python-imports-check-hook.sh +++ b/pkgs/development/interpreters/python/hooks/python-imports-check-hook.sh @@ -6,8 +6,13 @@ pythonImportsCheckPhase () { if [ -n "$pythonImportsCheck" ]; then echo "Check whether the following modules can be imported: $pythonImportsCheck" - export PYTHONPATH="$out/@pythonSitePackages@:$PYTHONPATH" - ( cd $out && eval "@pythonCheckInterpreter@ -c 'import os; import importlib; list(map(lambda mod: importlib.import_module(mod), os.environ[\"pythonImportsCheck\"].split()))'" ) + pythonImportsCheckOutput=$out + if [ -n "$python" ]; then + echo "Using python specific output \$python for imports check" + pythonImportsCheckOutput=$python + fi + export PYTHONPATH="$pythonImportsCheckOutput/@pythonSitePackages@:$PYTHONPATH" + ( cd $pythonImportsCheckOutput && eval "@pythonCheckInterpreter@ -c 'import os; import importlib; list(map(lambda mod: importlib.import_module(mod), os.environ[\"pythonImportsCheck\"].split()))'" ) fi } diff --git a/pkgs/development/interpreters/python/mk-python-derivation.nix b/pkgs/development/interpreters/python/mk-python-derivation.nix index 4c45d9603be82..0d6ab22249916 100644 --- a/pkgs/development/interpreters/python/mk-python-derivation.nix +++ b/pkgs/development/interpreters/python/mk-python-derivation.nix @@ -17,6 +17,7 @@ , pythonImportsCheckHook , pythonNamespacesHook , pythonOutputDistHook +, pythonRelaxDepsHook , pythonRemoveBinBytecodeHook , pythonRemoveTestsDirHook , pythonRuntimeDepsCheckHook @@ -144,7 +145,7 @@ in , meta ? {} -, doCheck ? config.doCheckByDefault or false +, doCheck ? true , disabledTestPaths ? [] @@ -252,6 +253,8 @@ let # because the hook that checks for conflicts uses setuptools. # pythonCatchConflictsHook + ] ++ optionals (attrs ? pythonRelaxDeps || attrs ? pythonRemoveDeps) [ + pythonRelaxDepsHook ] ++ optionals removeBinBytecode [ pythonRemoveBinBytecodeHook ] ++ optionals (hasSuffix "zip" (attrs.src.name or "")) [ diff --git a/pkgs/development/interpreters/python/python2/mk-python-derivation.nix b/pkgs/development/interpreters/python/python2/mk-python-derivation.nix index 1a6f9c784cf67..d0d8a9d0dca8f 100644 --- a/pkgs/development/interpreters/python/python2/mk-python-derivation.nix +++ b/pkgs/development/interpreters/python/python2/mk-python-derivation.nix @@ -92,7 +92,7 @@ , passthru ? {} -, doCheck ? config.doCheckByDefault or false +, doCheck ? true , disabledTestPaths ? [] diff --git a/pkgs/development/interpreters/python/update-python-libraries/update-python-libraries.py b/pkgs/development/interpreters/python/update-python-libraries/update-python-libraries.py index fbc096502fa7e..555d15b8ca4dc 100755 --- a/pkgs/development/interpreters/python/update-python-libraries/update-python-libraries.py +++ b/pkgs/development/interpreters/python/update-python-libraries/update-python-libraries.py @@ -319,14 +319,17 @@ def _get_latest_version_github(attr_path, package, extension, current_version, t tag_url = str(release["tarball_url"]).replace( "tarball", "tarball/refs/tags" ) - hash = ( - subprocess.check_output( - ["nix-prefetch-url", "--type", "sha256", "--unpack", tag_url], - stderr=subprocess.DEVNULL, + try: + hash = ( + subprocess.check_output( + ["nix-prefetch-url", "--type", "sha256", "--unpack", tag_url], + stderr=subprocess.DEVNULL, + ) + .decode("utf-8") + .strip() ) - .decode("utf-8") - .strip() - ) + except subprocess.CalledProcessError: + raise ValueError("nix-prefetch-url failed") return version, hash, prefix diff --git a/pkgs/development/interpreters/rakudo/default.nix b/pkgs/development/interpreters/rakudo/default.nix index bb0b8bcdcae8a..8ea91a46dd57c 100644 --- a/pkgs/development/interpreters/rakudo/default.nix +++ b/pkgs/development/interpreters/rakudo/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "rakudo"; - version = "2024.01"; + version = "2024.06"; src = fetchFromGitHub { owner = "rakudo"; repo = "rakudo"; rev = version; - hash = "sha256-E4YwLds0eoh8PxcACntynQKeg8lRIsEy+JOiv8nF2t0="; + hash = "sha256-6XWfM7KJB+lMf/YFLaQ71DMa8owZtjjuMEyWY++CJnM="; fetchSubmodules = true; }; diff --git a/pkgs/development/interpreters/rakudo/moarvm.nix b/pkgs/development/interpreters/rakudo/moarvm.nix index dbe678079f023..704d75b73bbc3 100644 --- a/pkgs/development/interpreters/rakudo/moarvm.nix +++ b/pkgs/development/interpreters/rakudo/moarvm.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "moarvm"; - version = "2024.01"; + version = "2024.06"; src = fetchFromGitHub { owner = "moarvm"; repo = "moarvm"; rev = version; - hash = "sha256-vU1fhR6pKz2qnznrJ/mknt9DVx+I1kLaPStXKQvp59g="; + hash = "sha256-y+xtJ4YbzPr1168tu+148Co7Ke/iC68aOQBwTINlp2Y="; fetchSubmodules = true; }; diff --git a/pkgs/development/interpreters/rakudo/nqp.nix b/pkgs/development/interpreters/rakudo/nqp.nix index 75d4964d15b9c..fafc53267dd8d 100644 --- a/pkgs/development/interpreters/rakudo/nqp.nix +++ b/pkgs/development/interpreters/rakudo/nqp.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "nqp"; - version = "2024.01"; + version = "2024.06"; src = fetchFromGitHub { owner = "raku"; repo = "nqp"; rev = version; - hash = "sha256-vcGj+PKCpCRLyjS158+U42BppJ0Yl53srZCde+fng0c="; + hash = "sha256-FqZPUtzlS+ZSlyuCFMWHofLXPuXCWAT6Oak0g3o8cgM="; fetchSubmodules = true; }; diff --git a/pkgs/development/interpreters/rune/default.nix b/pkgs/development/interpreters/rune/default.nix index 93a102da07d1f..e6bdf5ea059db 100644 --- a/pkgs/development/interpreters/rune/default.nix +++ b/pkgs/development/interpreters/rune/default.nix @@ -7,15 +7,15 @@ rustPlatform.buildRustPackage rec { pname = "rune"; - version = "0.13.2"; + version = "0.13.3"; src = fetchCrate { pname = "rune-cli"; inherit version; - hash = "sha256-Xk4gUBxDdnW2AIEvMaEjzVsqCQFK9B/Wyg7RpJ/hbrA="; + hash = "sha256-nrHduxHSX31nwqcBbgPT4WH64LXTruScocpqex4zxf4="; }; - cargoHash = "sha256-hpJ++mzP2QFE/iHZQvcjT03xPnyPYw7EgsL8NwxrZVQ="; + cargoHash = "sha256-EjUzXb2r6lKV1fBL7KdseC9vmW2L0AjpowYo4j8Xpv8="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.CoreServices diff --git a/pkgs/development/interpreters/supercollider/default.nix b/pkgs/development/interpreters/supercollider/default.nix index 79cad7fe64478..b69658ff03c74 100644 --- a/pkgs/development/interpreters/supercollider/default.nix +++ b/pkgs/development/interpreters/supercollider/default.nix @@ -71,7 +71,7 @@ mkDerivation rec { description = "Programming language for real time audio synthesis"; homepage = "https://supercollider.github.io"; changelog = "https://github.com/supercollider/supercollider/blob/Version-${version}/CHANGELOG.md"; - maintainers = with maintainers; [ lilyinstarlight ]; + maintainers = with maintainers; [ ]; license = licenses.gpl3Plus; platforms = platforms.linux; }; diff --git a/pkgs/development/interpreters/supercollider/plugins/sc3-plugins.nix b/pkgs/development/interpreters/supercollider/plugins/sc3-plugins.nix index 2881922aa1b22..492033c52c70d 100644 --- a/pkgs/development/interpreters/supercollider/plugins/sc3-plugins.nix +++ b/pkgs/development/interpreters/supercollider/plugins/sc3-plugins.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Community plugins for SuperCollider"; homepage = "https://supercollider.github.io/sc3-plugins/"; - maintainers = with maintainers; [ lilyinstarlight ]; + maintainers = with maintainers; [ ]; license = licenses.gpl2Plus; platforms = platforms.linux; }; diff --git a/pkgs/development/interpreters/wasmer/default.nix b/pkgs/development/interpreters/wasmer/default.nix index 4b855186bc312..b021c43ab9d73 100644 --- a/pkgs/development/interpreters/wasmer/default.nix +++ b/pkgs/development/interpreters/wasmer/default.nix @@ -14,16 +14,16 @@ rustPlatform.buildRustPackage rec { pname = "wasmer"; - version = "4.3.2"; + version = "4.3.3"; src = fetchFromGitHub { owner = "wasmerio"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-FxbODuIWGHdhGAt6EFDwrashmYFy+ldkfUucUkLzyms="; + hash = "sha256-k0XyVdSbb0sP4CwU6q0yiY+Ki6don742hCmL0zaj1tQ="; }; - cargoHash = "sha256-ZPYqMXzX7yMaNrFUKuvUPyfQovd/E5/3T3n535oD+Tw="; + cargoHash = "sha256-5OxBrYCNBBr7d+wdnJma/RJ3P9vc+nRVrzFGu8UmPWc="; nativeBuildInputs = [ rustPlatform.bindgenHook |