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
base: 6eaf73868bb5
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 5f7f4e39d10a
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Apr 27, 2019

  1. awesome: refactor LUA_PATH env var and don't expose it at runtime

    This commit partly reinstates changes from 5465d6f that had been somehow
    reverted in 17d3eb2.  Also, a comment has been added in the hope that future
    changes won't do the same.
    
    Additionally, refactor the LUA_PATH env var to ensure that the internal lgi lua
    files can't be required explicitly and to avoid possible name clashes (this
    fixes issue #60232).
    
    Finally, rather than using prepending `?.lua` append `;;` to LUA_PATH. Quoting
    @psychon:
    
    > This is interpreted by Lua as "add the default search path here" (which does
    > indeed contain ?.lua, but also contains more).
    
    Testing done:
    
    - Build with `nix-build -I /path/to/repo -A awesome`
    - Start an X session with xterm only
    - Start xephyr, e.g. `Xephyr :1 -name xephyr -screen 512x384 -ac -br -noreset &`
    - Run awesome like `DISPLAY=:1.0 ./result/bin/awesome`. Additionally, add
      `--search` options to expose lua modules that have a name clash with lgi's
      internal ones (see #60232 for more details) and `require` them in `rc.lua` to
      prove that they are loaded correctly
    stefano-m committed Apr 27, 2019
    Copy the full SHA
    c973e15 View commit details
    Browse the repository at this point in the history

Commits on Apr 28, 2019

  1. Merge pull request #60329 from stefano-m/awesome-fix-60232

    awesome: refactor LUA_PATH env var and don't expose it at runtime
    dtzWill committed Apr 28, 2019
    Copy the full SHA
    5f7f4e3 View commit details
    Browse the repository at this point in the history