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

Commits on Nov 27, 2020

  1. Revert "nmap: 7.80 -> 7.90" 

    This reverts commit c426ccf.

License has changed in 7.90 and we should decide first how to proceed.
See #105119 for further context.
    @Ma27
    Ma27 committed Nov 27, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    kurtmckee Kurt McKee
    GPG key ID: 64713C0B5BA8E1C2
    Verified
    Learn about vigilant mode
    Copy the full SHA
    fcbedf6 View commit details

  2. Merge pull request #105129 from Ma27/nmap-780 

    Revert "nmap: 7.80 -> 7.90"
    @etu
    etu authored Nov 27, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    kurtmckee Kurt McKee
    GPG key ID: 64713C0B5BA8E1C2
    Verified
    Learn about vigilant mode
    Copy the full SHA
    144a972 View commit details
Showing with 2 additions and 2 deletions.
  1. +2 −2 pkgs/tools/security/nmap/default.nix
4 changes: 2 additions & 2 deletions pkgs/tools/security/nmap/default.nix
View file
Original file line number Diff line number Diff line change
@@ -12,11 +12,11 @@ with stdenv.lib;

stdenv.mkDerivation rec {
name = "nmap${optionalString graphicalSupport "-graphical"}-${version}";
version = "7.90";
version = "7.80";

src = fetchurl {
url = "https://nmap.org/dist/nmap-${version}.tar.bz2";
sha256 = "1s20i84m9bci70lrl0p2j7h3kpbi9snmvyhc3lzc9s3mh92w6msm";
sha256 = "1aizfys6l9f9grm82bk878w56mg0zpkfns3spzj157h98875mypw";
};

patches = [ ./zenmap.patch ]