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: aef662d2eb53
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: 2ae455069b89
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Jul 5, 2019

  1. knot-resolver: add a check for correct lua paths 

    (cherry picked from commit 6fdd315)
It seems unlikely we would hit such a problem on a stable branch,
but I see no risk in adding the check anyway.
    @vcunat
    vcunat committed Jul 5, 2019
    Copy the full SHA
    2ae4550 View commit details
Showing with 4 additions and 0 deletions.
  1. +4 −0 pkgs/servers/dns/knot-resolver/default.nix
4 changes: 4 additions & 0 deletions pkgs/servers/dns/knot-resolver/default.nix
View file
Original file line number Diff line number Diff line change
@@ -95,6 +95,10 @@ wrapped-full = with luajitPackages; let
--set LUA_CPATH '${concatStringsSep ";" (map getLuaCPath luaPkgs)}'
ln -sr '${unwrapped}/share/man' "$out"/share/
ln -sr "$out"/{sbin,bin}
echo "Checking that 'http' module loads, i.e. lua search paths work:"
echo "modules.load('http')" > test-http.lua
echo -e 'quit()' | env -i "$out"/bin/kresd -a 127.0.0.1#53535 -c test-http.lua
'';

in result