diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2021-01-24 20:41:42 +0100 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2021-01-24 20:41:42 +0100 |
| commit | cc8fd11ffb7fe5cd7f1cfa75ea987429f1b2e77d (patch) | |
| tree | e72cb717dfc1161f4a6a2218cc11dc6a07bdec05 /pkgs/development/interpreters | |
| parent | 09e2990117c2eb0f9ab054ecf65cda7d55ca0dfc (diff) | |
| parent | 27955d37e97b5a35c83222345f057b322334c7ac (diff) | |
| download | nixlib-cc8fd11ffb7fe5cd7f1cfa75ea987429f1b2e77d.tar nixlib-cc8fd11ffb7fe5cd7f1cfa75ea987429f1b2e77d.tar.gz nixlib-cc8fd11ffb7fe5cd7f1cfa75ea987429f1b2e77d.tar.bz2 nixlib-cc8fd11ffb7fe5cd7f1cfa75ea987429f1b2e77d.tar.lz nixlib-cc8fd11ffb7fe5cd7f1cfa75ea987429f1b2e77d.tar.xz nixlib-cc8fd11ffb7fe5cd7f1cfa75ea987429f1b2e77d.tar.zst nixlib-cc8fd11ffb7fe5cd7f1cfa75ea987429f1b2e77d.zip | |
Merge branch 'master' into staging-next
Diffstat (limited to 'pkgs/development/interpreters')
4 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/development/interpreters/janet/default.nix b/pkgs/development/interpreters/janet/default.nix index aefc158b000c..9f8ab5a849ff 100644 --- a/pkgs/development/interpreters/janet/default.nix +++ b/pkgs/development/interpreters/janet/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "janet"; - version = "1.13.1"; + version = "1.14.1"; src = fetchFromGitHub { owner = "janet-lang"; repo = pname; rev = "v${version}"; - sha256 = "sha256-JXRPW1PYhVe2Qu8SAmcLgtwf8u3sb43H7AFeW7EqPZo="; + sha256 = "sha256-cI0kcY8aYDkmitoju/C6Ule5gzflIe0nLVxZp4iHXnc="; }; nativeBuildInputs = [ meson ninja ]; diff --git a/pkgs/development/interpreters/lua-5/build-lua-package.nix b/pkgs/development/interpreters/lua-5/build-lua-package.nix index 98a98c0dd348..74f5b2b7b395 100644 --- a/pkgs/development/interpreters/lua-5/build-lua-package.nix +++ b/pkgs/development/interpreters/lua-5/build-lua-package.nix @@ -207,7 +207,7 @@ builtins.removeAttrs attrs ["disabled" "checkInputs" "externalDeps" "extraVariab postFixup = lib.optionalString (!dontWrapLuaPrograms) '' wrapLuaPrograms - '' + attrs.postFixup or ''''; + '' + attrs.postFixup or ""; installPhase = attrs.installPhase or '' runHook preInstall diff --git a/pkgs/development/interpreters/python/mk-python-derivation.nix b/pkgs/development/interpreters/python/mk-python-derivation.nix index 670c870f1077..175454ea0559 100644 --- a/pkgs/development/interpreters/python/mk-python-derivation.nix +++ b/pkgs/development/interpreters/python/mk-python-derivation.nix @@ -162,7 +162,7 @@ let postFixup = lib.optionalString (!dontWrapPythonPrograms) '' wrapPythonPrograms - '' + attrs.postFixup or ''''; + '' + attrs.postFixup or ""; # Python packages built through cross-compilation are always for the host platform. disallowedReferences = lib.optionals (python.stdenv.hostPlatform != python.stdenv.buildPlatform) [ python.pythonForBuild ]; diff --git a/pkgs/development/interpreters/quickjs/default.nix b/pkgs/development/interpreters/quickjs/default.nix index b9d2b9deb797..23fe1dc78008 100644 --- a/pkgs/development/interpreters/quickjs/default.nix +++ b/pkgs/development/interpreters/quickjs/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "13hlx6qwrrxmlvvqcr3irxba6zmf05cf54l32vj50wc66s1qd41p"; }; - makeFlags = [ "prefix=${placeholder ''out''}" ]; + makeFlags = [ "prefix=${placeholder "out"}" ]; enableParallelBuilding = true; doInstallCheck = true; |