Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bump luarocks packages #258819

Merged
merged 11 commits into from
Oct 22, 2023
Merged

bump luarocks packages #258819

merged 11 commits into from
Oct 22, 2023

Conversation

teto
Copy link
Member

@teto teto commented Oct 3, 2023

Description of changes

WIP: bump luarocks package-set . Waiting to fix several luarocks upstream
before starting

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 23.11 Release Notes (or backporting 23.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

@teto
Copy link
Member Author

teto commented Oct 18, 2023

current status:

32 packages marked as broken and skipped:
lua51Packages.digestif lua51Packages.lmpfrlib lua52Packages.digestif lua52Packages.gitsigns-nvim lua52Packages.lmpfrlib lua52Packages.telescope-manix lua52Packages.telescope-nvim lua53Packages.gitsigns-nvim lua53Packages.telescope-manix lua53Packages.telescope-nvim lua54Packages.cyan lua54Packages.gitsigns-nvim lua54Packages.haskell-tools-nvim lua54Packages.http lua54Packages.ldoc lua54Packages.luaevent lua54Packages.lush-nvim lua54Packages.nvim-cmp lua54Packages.plenary-nvim lua54Packages.readline lua54Packages.sqlite lua54Packages.teal-language-server lua54Packages.telescope-manix lua54Packages.telescope-nvim lua54Packages.tl luaPackages.digestif luaPackages.gitsigns-nvim luaPackages.lmpfrlib luaPackages.telescope-manix luaPackages.telescope-nvim luajitPackages.digestif luajitPackages.lmpfrlib

12 packages failed to build:
lua51Packages.lua-resty-openidc lua51Packages.std-normalize luaPackages.lua-resty-openidc luaPackages.std-normalize lua53Packages.lua-resty-openidc lua53Packages.std-normalize lua54Packages.lua-resty-openidc lua54Packages.std-normalize luajitPackages.lua-resty-openidc luajitPackages.std-normalize nelua openrussian-cli

1889 packages built:

I am tempted to merge this as is, as among the build failures, I am pretty sure most of them already fail on master, and it's simpler to fix the leaf packages with small rebuilds on master.

@teto teto force-pushed the bump-luarocks-packages branch from d205e00 to 3b5cbef Compare October 19, 2023 08:07
@teto teto changed the base branch from master to staging October 19, 2023 08:08
@teto teto requested a review from mrcjkb October 19, 2023 08:10
@ofborg ofborg bot added 2.status: merge conflict This PR has merge conflicts with the target branch and removed 2.status: merge conflict This PR has merge conflicts with the target branch labels Oct 19, 2023
@mrcjkb
Copy link
Member

mrcjkb commented Oct 19, 2023

I am tempted to merge this as is, as among the build failures, I am pretty sure most of them already fail on master, and it's simpler to fix the leaf packages with small rebuilds on master.

Took a closer look at the broken packages (on x86_64-linux) on master:

  • lua*Packages.lua-resty-openidc is marked as broken.
  • lua*Packages.std-normalize builds.
  • nelua builds (only has luacheck as a lua dependency).
  • openrussian-cli isn't marked as broken, but fails to build.

suggestions:

  • nelua builds if updated to the latest revision.
  • std-normalize is failing because it has a new build_dependency that isn't packaged and that luarocks-nix doesn't pick up.
    • For now, I would suggest just to pin the previous version.
    • In the long term, luarocks-nix would need an update to support build_dependencies.
  • openrussian-cli hasn't been touched in 2 years. Maybe it should be marked as broken/unmaintained?
    The repo only has 6 stars.

@teto teto force-pushed the bump-luarocks-packages branch 2 times, most recently from 99eb504 to 205c7dc Compare October 22, 2023 01:24
@teto teto marked this pull request as ready for review October 22, 2023 01:25
@teto
Copy link
Member Author

teto commented Oct 22, 2023

thanks for the thoughtful review, as a follow up I've:

  • marked openrussian-cli as broken
  • updated nelua
  • tried to fix std._normalize but the build failed even then, we were using an unstable version that is broken so instead I told it to use the stable version and opened feat: support rockspec's build_dependencies nix-community/luarocks-nix#32 to prepare for the next release. I've packaged ldoc anyway
  • lua*Packages.lua-resty-openidc can be adjusted easily once this reaches master for ZHF, but I wanted to have this PR in staging before 23.11 release.

@teto teto marked this pull request as draft October 22, 2023 10:44
teto added 2 commits October 22, 2023 12:45
- luaPackages.basexx: use upstream
- luaPackages.nui-nvim: fix name in csv file
teto and others added 9 commits October 22, 2023 12:45
else nixpkgs-review fails
openrussian-cli breaks on master previous to this PR with:

> patching sources
> updateAutotoolsGnuConfigScriptsPhase
> building
> build flags: SHELL=/nix/store/xdqlrixlspkks50m9b0mpvag65m3pf2w-bash-5.2-p15/bin/bash LUA=/nix/store/qx7i2wd5clvzislr1ix5j6173kryj1ln-lua-5.3.6-env/bin/lua LUAC=/nix/store/qx7i2wd5clvzislr1ix5j6173kryj1ln-lua-5.3.6-env/bin/luac
> echo "#!/nix/store/qx7i2wd5clvzislr1ix5j6173kryj1ln-lua-5.3.6-env/bin/lua" >openrussian
> /nix/store/qx7i2wd5clvzislr1ix5j6173kryj1ln-lua-5.3.6-env/bin/luac -o - openrussian.lua >>openrussian
> chmod a+x openrussian
> rm -f openrussian-sqlite3.db
> unzip -p openrussian-sql.zip openrussian.sql | awk -f ./mysql2sqlite - | sqlite3 openrussian-sqlite3.db
> awk: ./mysql2sqlite:214: warning: regexp escape sequence `\"' is not a known regexp operator
> memory
> sqlite3 openrussian-sqlite3.db -batch <postprocess.sql
> Parse error near line 21: no such column: '
>   TO bare_inflections SELECT word_id, REPLACE(temp, "'", "") AS bare FROM (  --
>                                       error here ---^
@teto teto force-pushed the bump-luarocks-packages branch from 205c7dc to 0853514 Compare October 22, 2023 10:45
@teto teto marked this pull request as ready for review October 22, 2023 10:45
@teto teto merged commit 19c24b6 into NixOS:staging Oct 22, 2023
9 of 12 checks passed
@teto teto deleted the bump-luarocks-packages branch October 22, 2023 12:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants