Skip to content
This repository was 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
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 2df17ecf1b74
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
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

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
  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
  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 authored May 7, 2019
    Copy the full SHA
    3e7300c View commit details
Showing with 10 additions and 7 deletions.
  1. +8 −5 pkgs/applications/window-managers/awesome/default.nix
  2. +2 −2 pkgs/tools/package-management/nix-review/default.nix
13 changes: 8 additions & 5 deletions pkgs/applications/window-managers/awesome/default.nix
Original file line number Diff line number Diff line change
@@ -42,17 +42,20 @@ with luaPackages; stdenv.mkDerivation rec {
cmakeFlags = "-DOVERRIDE_VERSION=${version}";

GI_TYPELIB_PATH = "${pango.out}/lib/girepository-1.0";
# LUA_CPATH and LUA_PATH are used only for *building*, see the --search flags
# below for how awesome finds the libraries it needs at runtime.
LUA_CPATH = "${lgi}/lib/lua/${lua.luaversion}/?.so";
LUA_PATH = "?.lua;${lgi}/share/lua/${lua.luaversion}/?.lua;${lgi}/share/lua/${lua.luaversion}/lgi/?.lua";
LUA_PATH = "${lgi}/share/lua/${lua.luaversion}/?.lua;;";

postInstall = ''
wrapProgram $out/bin/awesome \
# Don't use wrapProgram or or the wrapper will duplicate the --search
# arguments every restart
mv "$out/bin/awesome" "$out/bin/.awesome-wrapped"
makeWrapper "$out/bin/.awesome-wrapped" "$out/bin/awesome" \
--set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
--add-flags '--search ${lgi}/lib/lua/${lua.luaversion}' \
--add-flags '--search ${lgi}/share/lua/${lua.luaversion}' \
--prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
--prefix LUA_PATH ';' "${lgi}/share/lua/${lua.luaversion}/?.lua;${lgi}/share/lua/${lua.luaversion}/lgi/?.lua" \
--prefix LUA_CPATH ';' "${lgi}/lib/lua/${lua.luaversion}/?.so"
--prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH"
wrapProgram $out/bin/awesome-client \
--prefix PATH : "${which}/bin"
4 changes: 2 additions & 2 deletions pkgs/tools/package-management/nix-review/default.nix
Original file line number Diff line number Diff line change
@@ -8,13 +8,13 @@

python3.pkgs.buildPythonApplication rec {
pname = "nix-review";
version = "2.0.0";
version = "2.0.1";

src = fetchFromGitHub {
owner = "Mic92";
repo = "nix-review";
rev = version;
sha256 = "1hichipf02yz9n2n1fnky5rm9wxwcd04xlr0y05y78ixw8xb5ah0";
sha256 = "19x0wbb8annmzi67r79112j9kjzz99n3qd6adh80iqx2dh47pk5g";
};

makeWrapperArgs = [