Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 727246c44076
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 87c7d2da80f1
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Mar 8, 2019

  1. buildLuarocksPackage: adjust the manifest path 

    the new luarocks 3.0.4 uses different paths for the manifests, hence creating new collisions.
    @teto
    teto committed Mar 8, 2019
    Copy the full SHA
    16e3574 View commit details

  2. Merge pull request #57060 from teto/fix/buildLuarocksPackage 

    buildLuarocksPackage: adjust the manifest path
    @Mic92
    Mic92 authored Mar 8, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    87c7d2d View commit details
Showing with 1 addition and 1 deletion.
  1. +1 −1 pkgs/development/interpreters/lua-5/build-lua-package.nix
2 changes: 1 addition & 1 deletion pkgs/development/interpreters/lua-5/build-lua-package.nix
View file
Original file line number Diff line number Diff line change
@@ -165,7 +165,7 @@ builtins.removeAttrs attrs ["disabled" "checkInputs"] // {
# to prevent collisions when creating environments
# also added -f as it doesn't always exist
# don't remove the whole directory as
rm -rf $out/lib/luarocks/rocks/manifest
rm -rf $out/lib/luarocks/rocks-${lua.luaversion}/manifest
runHook postInstall
'';