diff options
Diffstat (limited to 'nixpkgs/pkgs/development/interpreters')
11 files changed, 32 insertions, 122 deletions
diff --git a/nixpkgs/pkgs/development/interpreters/erlang/23.nix b/nixpkgs/pkgs/development/interpreters/erlang/23.nix deleted file mode 100644 index 89faebdde128..000000000000 --- a/nixpkgs/pkgs/development/interpreters/erlang/23.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ mkDerivation }: - -mkDerivation { - version = "23.3.4.18"; - sha256 = "sha256-sxNVu/52kOMFKQYPLi5uXnR1mYTF2KlHUo4T7kh0KoY="; -} diff --git a/nixpkgs/pkgs/development/interpreters/erlang/25.nix b/nixpkgs/pkgs/development/interpreters/erlang/25.nix index 3644c12fd4b2..ee9a58c4e427 100644 --- a/nixpkgs/pkgs/development/interpreters/erlang/25.nix +++ b/nixpkgs/pkgs/development/interpreters/erlang/25.nix @@ -1,6 +1,6 @@ { mkDerivation }: mkDerivation { - version = "25.3.2.5"; - sha256 = "fnyWyJ+QsaJk2/LK8jOuxZmt3AFXmeubdeoYSGid/0A="; + version = "25.3.2.6"; + sha256 = "iImrVaoS5bajaZZQoZoG3VzWHFmWvId8xQPKLhl9iQo="; } diff --git a/nixpkgs/pkgs/development/interpreters/expr/default.nix b/nixpkgs/pkgs/development/interpreters/expr/default.nix index a037d306af13..dd5f26d60cfd 100644 --- a/nixpkgs/pkgs/development/interpreters/expr/default.nix +++ b/nixpkgs/pkgs/development/interpreters/expr/default.nix @@ -5,18 +5,18 @@ buildGoModule rec { pname = "expr"; - version = "1.15.1"; + version = "1.15.2"; src = fetchFromGitHub { owner = "antonmedv"; repo = "expr"; rev = "v${version}"; - hash = "sha256-ILa+PG2UU/qgLvcsEoC0rHIeQvKRMUfW60AT6wjApZg="; + hash = "sha256-cPgVpoixZKFVquT2XehVn+j288HWuWKeGeAaTKfoQs4="; }; sourceRoot = "${src.name}/repl"; - vendorHash = "sha256-jdf3MPix+nDr2X6se4I8SNMUCd/Ndr9PvJZgJEk+cL4="; + vendorHash = "sha256-bmWaSemyihr/zTQ1BE/dzCrCYdOWGzs3W3+kwrV5N0U="; ldflags = [ "-s" "-w" ]; diff --git a/nixpkgs/pkgs/development/interpreters/luajit/2.0.nix b/nixpkgs/pkgs/development/interpreters/luajit/2.0.nix index 78abb742c407..29ad88f0ec16 100644 --- a/nixpkgs/pkgs/development/interpreters/luajit/2.0.nix +++ b/nixpkgs/pkgs/development/interpreters/luajit/2.0.nix @@ -1,13 +1,15 @@ { self, callPackage, fetchFromGitHub, lib, passthruFun }: -callPackage ./default.nix { - version = "2.0.5-2022-09-13"; +callPackage ./default.nix rec { + # The patch version is the timestamp of the git commit, + # obtain via `cat $(nix-build -A luajit_2_0.src)/.relver` + version = "2.0.1693340858"; src = fetchFromGitHub { owner = "LuaJIT"; repo = "LuaJIT"; - rev = "46e62cd963a426e83a60f691dcbbeb742c7b3ba2"; - hash = "sha256-/XR9+6NjXs2TrUVKJNkH2h970BkDNFqMDJTWcy/bswU="; + rev = "c6ee7e19d107b4f9a140bb2ccf99162e26318c69"; + hash = "sha256-3/7ASZRniytw5RkOy0F9arHkZevq6dxmya+Ba3A5IIA="; }; extraMeta = { # this isn't precise but it at least stops the useless Hydra build diff --git a/nixpkgs/pkgs/development/interpreters/luajit/2.1.nix b/nixpkgs/pkgs/development/interpreters/luajit/2.1.nix index 8efb86ab0174..cf8531b7352d 100644 --- a/nixpkgs/pkgs/development/interpreters/luajit/2.1.nix +++ b/nixpkgs/pkgs/development/interpreters/luajit/2.1.nix @@ -1,13 +1,15 @@ { self, callPackage, fetchFromGitHub, passthruFun }: -callPackage ./default.nix { - version = "2.1.0-2022-10-04"; +callPackage ./default.nix rec { + # The patch version is the timestamp of the git commit, + # obtain via `cat $(nix-build -A luajit_2_1.src)/.relver` + version = "2.1.1693350652"; src = fetchFromGitHub { owner = "LuaJIT"; repo = "LuaJIT"; - rev = "6c4826f12c4d33b8b978004bc681eb1eef2be977"; - hash = "sha256-GMgoSVHrfIuLdk8mW9XgdemNFsAkkQR4wiGGjaAXAKg="; + rev = "41fb94defa8f830ce69a8122b03f6ac3216d392a"; + hash = "sha256-iY80CA97RqJ9gF1Kl7ms/lC6m6KScjxWmljh5Gy7Brg="; }; inherit self passthruFun; diff --git a/nixpkgs/pkgs/development/interpreters/luajit/default.nix b/nixpkgs/pkgs/development/interpreters/luajit/default.nix index 16c2876f9f25..28493cc48aec 100644 --- a/nixpkgs/pkgs/development/interpreters/luajit/default.nix +++ b/nixpkgs/pkgs/development/interpreters/luajit/default.nix @@ -24,6 +24,7 @@ , enableGDBJITSupport ? false , enableAPICheck ? false , enableVMAssertions ? false +, enableRegisterAllocationRandomization ? false , useSystemMalloc ? false # Upstream generates randomized string id's by default for security reasons # https://github.com/LuaJIT/LuaJIT/issues/626. Deterministic string id's should @@ -50,6 +51,7 @@ let ++ optional enableGDBJITSupport "-DLUAJIT_USE_GDBJIT" ++ optional enableAPICheck "-DLUAJIT_USE_APICHECK" ++ optional enableVMAssertions "-DLUAJIT_USE_ASSERT" + ++ optional enableRegisterAllocationRandomization "-DLUAJIT_RANDOM_RA" ++ optional deterministicStringIds "-DLUAJIT_SECURITY_STRID=0" ; diff --git a/nixpkgs/pkgs/development/interpreters/mujs/default.nix b/nixpkgs/pkgs/development/interpreters/mujs/default.nix index f937a71fbd47..9b9c21f86b6f 100644 --- a/nixpkgs/pkgs/development/interpreters/mujs/default.nix +++ b/nixpkgs/pkgs/development/interpreters/mujs/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchurl +, fixDarwinDylibNames , readline , gitUpdater }: @@ -16,6 +17,8 @@ stdenv.mkDerivation rec { buildInputs = [ readline ]; + nativeBuildInputs = lib.optionals stdenv.isDarwin [ fixDarwinDylibNames ]; + makeFlags = [ "prefix=$(out)" ]; installFlags = [ "install-shared" ]; diff --git a/nixpkgs/pkgs/development/interpreters/oak/default.nix b/nixpkgs/pkgs/development/interpreters/oak/default.nix index eda0450be428..734576d862b0 100644 --- a/nixpkgs/pkgs/development/interpreters/oak/default.nix +++ b/nixpkgs/pkgs/development/interpreters/oak/default.nix @@ -14,7 +14,7 @@ buildGoModule rec { sha256 = "sha256-DK5n8xK57CQiukyBt9+CFK1j8+nphP//T2jTXq64VH8="; }; - vendorSha256 = "sha256-iQtb3zNa57nB6x4InVPw7FCmW7XPw5yuz0OcfASXPD8="; + vendorHash = "sha256-iQtb3zNa57nB6x4InVPw7FCmW7XPw5yuz0OcfASXPD8="; meta = with lib; { description = "Expressive, simple, dynamic programming language"; diff --git a/nixpkgs/pkgs/development/interpreters/python/cpython/default.nix b/nixpkgs/pkgs/development/interpreters/python/cpython/default.nix index a1de2a55d986..6778dc460e05 100644 --- a/nixpkgs/pkgs/development/interpreters/python/cpython/default.nix +++ b/nixpkgs/pkgs/development/interpreters/python/cpython/default.nix @@ -454,8 +454,6 @@ in with passthru; stdenv.mkDerivation { done touch $out/lib/${libPrefix}/test/__init__.py - ln -s "$out/include/${executable}m" "$out/include/${executable}" - # Determinism: Windows installers were not deterministic. # We're also not interested in building Windows installers. find "$out" -name 'wininst*.exe' | xargs -r rm -f @@ -483,6 +481,9 @@ in with passthru; stdenv.mkDerivation { # This allows build Python to import host Python's sysconfigdata mkdir -p "$out/${sitePackages}" ln -s "$out/lib/${libPrefix}/"_sysconfigdata*.py "$out/${sitePackages}/" + '' + lib.optionalString (pythonOlder "3.8") '' + # This is gone in Python >= 3.8 + ln -s "$out/include/${executable}m" "$out/include/${executable}" '' + optionalString stripConfig '' rm -R $out/bin/python*-config $out/lib/python*/config-* '' + optionalString stripIdlelib '' diff --git a/nixpkgs/pkgs/development/interpreters/python/default.nix b/nixpkgs/pkgs/development/interpreters/python/default.nix index fb504c5043c8..f80f2f16ccd4 100644 --- a/nixpkgs/pkgs/development/interpreters/python/default.nix +++ b/nixpkgs/pkgs/development/interpreters/python/default.nix @@ -57,10 +57,10 @@ in { sourceVersion = { major = "3"; minor = "8"; - patch = "17"; + patch = "18"; suffix = ""; }; - hash = "sha256-LlSwxoGR8WVS9t4ul6I5ZUBXKiGfa7soWRoTfOzEkKk="; + hash = "sha256-P/txzTSaMmunsvrcfn34a6V33ZxJF+UqhAGtvadAXj8="; inherit (darwin) configd; inherit passthruFun; }; @@ -70,10 +70,10 @@ in { sourceVersion = { major = "3"; minor = "9"; - patch = "17"; + patch = "18"; suffix = ""; }; - hash = "sha256-MM4FfETyg/jtk2Bsy9uNUd1Sa9xMYszl4Nwhe/o+jO4="; + hash = "sha256-AVl9sBMsHPezMe/2iuCbWiNaPDyqnJRMKcrH0cTEwAo="; inherit (darwin) configd; inherit passthruFun; }; @@ -96,9 +96,9 @@ in { major = "3"; minor = "12"; patch = "0"; - suffix = "b4"; + suffix = "rc2"; }; - hash = "sha256-8FcQw2ruWFD1wnab52uAvyEq7DUUOP34rcIMOMg2H6w="; + hash = "sha256-EesQN25rr3vqUwAfUYHq7heXeIxNtug6Bh5CI1eSdnQ="; inherit (darwin) configd; inherit passthruFun; }; diff --git a/nixpkgs/pkgs/development/interpreters/trealla/default.nix b/nixpkgs/pkgs/development/interpreters/trealla/default.nix deleted file mode 100644 index 34b722d9dcf9..000000000000 --- a/nixpkgs/pkgs/development/interpreters/trealla/default.nix +++ /dev/null @@ -1,94 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, libffi -, openssl -, readline -, valgrind -, xxd -, gitUpdater -, checkLeaks ? false -, enableFFI ? true -, enableSSL ? true -, enableThreads ? true -, lineEditingLibrary ? "isocline" -}: - -assert lib.elem lineEditingLibrary [ "isocline" "readline" ]; -stdenv.mkDerivation (finalAttrs: { - pname = "trealla"; - version = "2.25.2"; - - src = fetchFromGitHub { - owner = "trealla-prolog"; - repo = "trealla"; - rev = "v${finalAttrs.version}"; - hash = "sha256-3NBrJFSTcjftvTYn26SMeU2HtR81J2qlDAwAZRdis4M="; - }; - - postPatch = '' - substituteInPlace Makefile \ - --replace '-I/usr/local/include' "" \ - --replace '-L/usr/local/lib' "" \ - --replace 'GIT_VERSION :=' 'GIT_VERSION ?=' - ''; - - nativeBuildInputs = [ - xxd - ]; - - buildInputs = - lib.optional enableFFI libffi - ++ lib.optional enableSSL openssl - ++ lib.optional (lineEditingLibrary == "readline") readline; - - nativeCheckInputs = lib.optionals finalAttrs.doCheck [ valgrind ]; - - strictDeps = true; - - makeFlags = [ - "GIT_VERSION=\"v${finalAttrs.version}\"" - ] - ++ lib.optional (lineEditingLibrary == "isocline") "ISOCLINE=1" - ++ lib.optional (!enableFFI) "NOFFI=1" - ++ lib.optional (!enableSSL) "NOSSL=1" - ++ lib.optional enableThreads "THREADS=1"; - - enableParallelBuilding = true; - - installPhase = '' - runHook preInstall - install -Dm755 -t $out/bin tpl - runHook postInstall - ''; - - doCheck = !valgrind.meta.broken; - - checkFlags = [ - "test" - ] ++ lib.optional checkLeaks "leaks"; - - passthru.updateScript = gitUpdater { }; - - meta = { - homepage = "https://trealla-prolog.github.io/trealla/"; - description = "A compact, efficient Prolog interpreter written in ANSI C"; - longDescription = '' - Trealla is a compact, efficient Prolog interpreter with ISO Prolog - aspirations. - Trealla is not WAM-based. It uses tree-walking, structure-sharing and - deep-binding. Source is byte-code compiled to an AST that is interpreted - at runtime. The intent and continued aim of Trealla is to be a small, - easily ported, Prolog core. - The name Trealla comes from the Liaden Universe books by Lee & Miller - (where it doesn't seem to mean anything) and also a reference to the - Trealla region of Western Australia. - ''; - changelog = "https://github.com/trealla-prolog/trealla/releases/tag/v${finalAttrs.version}"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ siraben AndersonTorres ]; - mainProgram = "tpl"; - platforms = lib.platforms.all; - broken = stdenv.isDarwin && stdenv.isx86_64; - }; -}) |