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: e57cbfc04847
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 05659a44ceb0
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Oct 29, 2020

  1. nmapsi4: 0.4.80-20180430 -> 0.5-alpha2

    @peterhoeg
    peterhoeg committed Oct 29, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    alyssais Alyssa Ross
    GPG key ID: F9DBED4859B271C0
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    05659a4 View commit details
Showing with 15 additions and 7 deletions.
  1. +15 −7 pkgs/tools/security/nmap/qt.nix
22 changes: 15 additions & 7 deletions pkgs/tools/security/nmap/qt.nix
View file
Original file line number Diff line number Diff line change
@@ -1,16 +1,24 @@
{ stdenv, fetchFromGitHub, cmake, pkgconfig, wrapQtAppsHook
, dnsutils, nmap
, qtbase, qtscript, qtwebengine }:
{ stdenv
, fetchFromGitHub
, cmake
, pkgconfig
, wrapQtAppsHook
, dnsutils
, nmap
, qtbase
, qtscript
, qtwebengine
}:

stdenv.mkDerivation rec {
pname = "nmapsi4";
version = "0.4.80-20180430";
version = "0.5-alpha2";

src = fetchFromGitHub {
owner = "nmapsi4";
repo = "nmapsi4";
rev = "d7f18e4c1e38dcf9c29cb4496fe14f9ff172861a";
sha256 = "10wqyrjzmad1g7lqa65rymbkna028xbp4xcpj442skw8gyrs3994";
rev = "v${version}";
sha256 = "sha256-q3XfwJ4TGK4E58haN0Q0xRH4GDpKD8VZzyxHe/VwBqY=";
};

nativeBuildInputs = [ cmake pkgconfig wrapQtAppsHook ];
@@ -47,7 +55,7 @@ stdenv.mkDerivation rec {

meta = with stdenv.lib; {
description = "Qt frontend for nmap";
license = licenses.gpl2;
license = licenses.gpl2;
maintainers = with maintainers; [ peterhoeg ];
inherit (src.meta) homepage;
};