diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2024-05-05 14:20:07 +0200 |
---|---|---|
committer | Jan Tojnar <jtojnar@gmail.com> | 2024-05-05 14:50:32 +0200 |
commit | 100509c030faf7cca1582c5a7197b8d3a815d600 (patch) | |
tree | d55f8944fd90a3dd0d86e0f495f3d0bbdf795060 /pkgs/development/libraries/protolock | |
parent | 5434ca3ba0d0db2de14cfb9a0818ea8718f696ad (diff) | |
parent | 5dc079ed333c755fe000f2b86e97bf11f6f069a4 (diff) |
Merge branch 'staging-next' into staging
Conflicts in luaPackages.luarocks-nix: - 8b563cd9f923cdf009b3864a358d912103703320 switched to the new version format (prefixed by 0 since there was no relevant last tag in the branch). bc4f6fa54321533b250984f7b3813f8d343dfde1 bumped version and switched to the new version format. But the tag used is not part of the branch the commit comes from (master). Used the new version but replaced the tag prefix with 0. - b73ec84b9eed8de7e9095e779ee3d4066ceb091e removed meta (it is already set in the overridden luarocks). But that would cause the update script to try to update the overridden luarocks (as did the previously used old.meta). bf311d950e4c5d65fae66717c7c3d4f085ff6415 modified meta to fix the update script properly. Kept the meta from the latter since it allows update script to work.
Diffstat (limited to 'pkgs/development/libraries/protolock')
0 files changed, 0 insertions, 0 deletions