diff --git a/doc/release-notes/rl-2611.section.md b/doc/release-notes/rl-2611.section.md index 9cc8a76445be..627d57573989 100644 --- a/doc/release-notes/rl-2611.section.md +++ b/doc/release-notes/rl-2611.section.md @@ -125,6 +125,8 @@ - `librest` providing 0.7 ABI was removed. `librest_1_0` providing 1.0 ABI was renamed to `librest` and `librest_1_0` was kept as an alias. +- `luaPackages.lrexlib-pcre` has been removed as part of the process to fully migrate from the end-of-life PRCE library to PCRE2. `luaPackages.lrexlib-pcre2` and multiple other versions of lrexlib can be used instead. + - `pnpm_10` was upgraded to version 10.34.1+, which introduced stricter integrity checks. If you encounter `ERR_PNPM_MISSING_TARBALL_INTEGRITY`, you can fall back to the older `pnpm_10_34_0`. - `fetchPnpmDeps`' `fetcherVersion = 1` and `fetcherVersion = 2` have been diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv index 3c509e9e2f52..dd50dc7154e1 100644 --- a/maintainers/scripts/luarocks-packages.csv +++ b/maintainers/scripts/luarocks-packages.csv @@ -51,7 +51,6 @@ lpeg_patterns,,,,,, lpeglabel,,,,1.6.0,, lrexlib-gnu,,,,,, lrexlib-oniguruma,,,,,,junestepp -lrexlib-pcre,,,,,, lrexlib-pcre2,,,,,,wishstudio lrexlib-posix,,,,,, lsp-progress.nvim,,,,,5.1,gepbird diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index 2760474d071f..12eb150be38c 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -1922,45 +1922,6 @@ final: prev: { } ) { }; - lrexlib-pcre = callPackage ( - { - buildLuarocksPackage, - fetchFromGitHub, - fetchurl, - luaOlder, - }: - buildLuarocksPackage { - pname = "lrexlib-pcre"; - version = "2.9.3-1"; - knownRockspec = - (fetchurl { - url = "mirror://luarocks/lrexlib-pcre-2.9.3-1.rockspec"; - sha256 = "1pwwzc12a6dl5i4i8gl5i0r8aabqfpmdfrlj0fkvj5v56v9bkw09"; - }).outPath; - src = fetchFromGitHub { - owner = "rrthomas"; - repo = "lrexlib"; - tag = "rel-2-9-3"; - hash = "sha256-7lybrMvNk2YhXish01PQlMpRVW+qlFj03RO33zmgGp4="; - }; - - disabled = luaOlder "5.1"; - - meta = { - homepage = "https://github.com/rrthomas/lrexlib"; - license = lib.licenses.AND [ - lib.licenses.mit - lib.licenses.x11 - ]; - description = "Regular expression library binding (PCRE flavour)."; - longDescription = '' - Lrexlib is a regular expression library for Lua 5.1-5.4, which - provides bindings for several regular expression libraries. - This rock provides the PCRE bindings.''; - }; - } - ) { }; - lrexlib-pcre2 = callPackage ( { buildLuarocksPackage, diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix index 0bbadc0ac269..0b584b579851 100644 --- a/pkgs/development/lua-modules/overrides.nix +++ b/pkgs/development/lua-modules/overrides.nix @@ -1,6 +1,7 @@ # do not add pkgs, it messes up splicing { stdenv, + config, cargo, cmake, @@ -44,7 +45,6 @@ oniguruma, openldap, openssl, - pcre, pcre2, pkg-config, readline, @@ -427,15 +427,6 @@ in ]; }; - lrexlib-pcre = prev.lrexlib-pcre.overrideAttrs { - externalDeps = [ - { - name = "PCRE"; - dep = pcre; - } - ]; - }; - lrexlib-pcre2 = prev.lrexlib-pcre2.overrideAttrs { externalDeps = [ { @@ -1344,3 +1335,6 @@ in # keep-sorted end } +// lib.optionalAttrs config.allowAliases { + lrexlib-pcre = throw "lrexlib-pcre was removed as the PCRE library is end-of-life"; # added 2026-08-03 +}