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: 63279e2ce2af
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: b16f32acd426
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Mar 16, 2019

  1. nmap: lua scripting support is optional

    @illegalprime
    illegalprime committed Mar 16, 2019

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Learn about vigilant mode
    Copy the full SHA
    e532d29 View commit details

Commits on Mar 18, 2019

  1. Merge pull request #57822 from illegalprime/nmap-optional-lua 

    nmap: lua scripting support is optional
    @Mic92
    Mic92 authored Mar 18, 2019
    Copy the full SHA
    b16f32a View commit details
Showing with 4 additions and 1 deletion.
  1. +4 −1 pkgs/tools/security/nmap/default.nix
5 changes: 4 additions & 1 deletion pkgs/tools/security/nmap/default.nix
View file
Original file line number Diff line number Diff line change
@@ -5,6 +5,7 @@
, withPython ? false # required for the `ndiff` binary
, python2Packages ? null
, makeWrapper ? null
, withLua ? true
}:

assert withPython -> python2Packages != null;
@@ -35,7 +36,9 @@ in stdenv.mkDerivation rec {
--replace 'ARFLAGS="-o"' 'ARFLAGS="-r"'
'';

configureFlags = [ "--with-liblua=${lua5_3}" ]
configureFlags = [
(if withLua then "--with-liblua=${lua5_3}" else "--without-liblua")
]
++ optional (!pythonSupport) "--without-ndiff"
++ optional (!graphicalSupport) "--without-zenmap"
;