Skip to content
This repository has been archived by the owner on Apr 12, 2021. It is now read-only.
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-channels
base: 2df17ecf1b74
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
compare: 3e7300cf0498
Choose a head ref
  • 4 commits
  • 2 files changed
  • 3 contributors

Commits on May 6, 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 May 6, 2019
    Copy the full SHA
    8b5ec80 View commit details
    Browse the repository at this point in the history

Commits on May 7, 2019

  1. awesome: use makeWrapper rather than wrapProgram

    Using wrapProgram makes so that the generated "awesome" wrapper duplicates its
    command line options at every restart.
    
    As @psychon puts it:
    
    > AwesomeWM restarts via execvp(argv[0], argv). In NixOS, wrapProgram is used
    > to generate a wrapper around the real binary. wrapProgram calls makeWrapper
    > with --argv0 '$0'. I guess this is what makes awesomeWM run the wrapper again
    > on restart. Without this --argv0 awesomeWM would directly restart itself
    > instead of the wrapper, I think.
    
    (cherry picked from commit 88f84c0)
    stefano-m authored and Mic92 committed May 7, 2019
    Copy the full SHA
    49a9155 View commit details
    Browse the repository at this point in the history
  2. nix-review: 2.0.0 -> 2.0.1

    (cherry picked from commit cf5ed1d)
    Mic92 committed May 7, 2019
    Copy the full SHA
    2dcbd44 View commit details
    Browse the repository at this point in the history
  3. Merge pull request #61043 from stefano-m/release-19.03

    awesome: refactor LUA_PATH env var and don't expose it at runtime (19.03 branch)
    rasendubi committed May 7, 2019
    Copy the full SHA
    3e7300c View commit details
    Browse the repository at this point in the history