Commit Graph

62 Commits

Author SHA1 Message Date
Ben Siraphob
76f93cc731 pkgs/tools: pkgconfig -> pkg-config 2021-01-16 23:49:59 -08:00
Ben Siraphob
8c5d37129f pkgs/tools: stdenv.lib -> lib 2021-01-15 17:12:36 +07:00
Profpatsch
4a7f99d55d treewide: with stdenv.lib; in meta -> with lib;
Part of: https://github.com/NixOS/nixpkgs/issues/108938

meta = with stdenv.lib;

is a widely used pattern. We want to slowly remove
the `stdenv.lib` indirection and encourage people
to use `lib` directly. Thus let’s start with the meta
field.

This used a rewriting script to mostly automatically
replace all occurances of this pattern, and add the
`lib` argument to the package header if it doesn’t
exist yet.

The script in its current form is available at
https://cs.tvl.fyi/depot@2f807d7f141068d2d60676a89213eaa5353ca6e0/-/blob/users/Profpatsch/nixpkgs-rewriter/default.nix
2021-01-11 10:38:22 +01:00
Ben Siraphob
3ae5e6ce03 treewide: remove enableParallelBuilding = true if using cmake 2021-01-03 18:37:40 +07:00
Maximilian Bosch
fcbedf65aa
Revert "nmap: 7.80 -> 7.90"
This reverts commit c426ccf116.

License has changed in 7.90 and we should decide first how to proceed.
See #105119 for further context.
2020-11-27 11:05:15 +01:00
Peter Hoeg
05659a44ce nmapsi4: 0.4.80-20180430 -> 0.5-alpha2 2020-10-30 06:35:17 +08:00
Martin Weinelt
c426ccf116
nmap: 7.80 -> 7.90 2020-10-04 15:42:16 +02:00
Michael Reilly
84cf00f980
treewide: Per RFC45, remove all unquoted URLs 2020-04-10 17:54:53 +01:00
Jörg Thalheim
c08aa3c2a8
nmap: fix zenmap, reduce vendored libraries 2020-01-15 13:20:25 +00:00
Jörg Thalheim
4d7da1d72d
nmapsi4: fix startup by adding wrapQtAppsHook 2020-01-15 10:58:54 +00:00
Vladimír Čunát
985d1ac425
Merge branch 'master' into staging-next
There were several more conflicts from name -> pname+version;
all auto-solved by kdiff3, hopefully OK.

Hydra nixpkgs: ?compare=1538611
2019-08-25 14:57:11 +02:00
Vladimír Čunát
2e6bf42a22
Merge branch 'master' into staging-next
There ver very many conflicts, basically all due to
name -> pname+version.  Fortunately, almost everything was auto-resolved
by kdiff3, and for now I just fixed up a couple evaluation problems,
as verified by the tarball job.  There might be some fallback to these
conflicts, but I believe it should be minimal.

Hydra nixpkgs: ?compare=1538299
2019-08-24 08:55:37 +02:00
Andrew Childs
de1e3c9aee nmap: update clang specific patch
The upstream PR had two parts: adding a missing include and resolving
an ambiguous reference. The upstream project fixed the first but not
the second. We still need the second part, so extract it by filtering
the patch.
2019-08-24 13:57:35 +09:00
R. RyanTM
d15de57f66 nmap: 7.70 -> 7.80
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/nmap/versions
2019-08-19 16:56:10 -07:00
volth
46420bbaa3 treewide: name -> pname (easy cases) (#66585)
treewide replacement of

stdenv.mkDerivation rec {
  name = "*-${version}";
  version = "*";

to pname
2019-08-15 13:41:18 +01:00
Andrew Childs
652045176c nmap: fix build with new Darwin stdenv 2019-05-21 11:24:26 +09:00
Peter Hoeg
687609adca nmapsi4: 0.5.0-alpha1 -> 0.4.80-20180430 2019-04-10 21:26:05 +08:00
Michael Eden
e532d292d7 nmap: lua scripting support is optional 2019-03-16 16:35:12 -04:00
volth
f90009cbd7 nmap: fix cross-build (#48264) 2018-10-19 09:30:36 +01:00
Jan Malakhovski
7438083a4d tree-wide: disable doCheck and doInstallCheck where it fails (the trivial part) 2018-04-25 04:18:46 +00:00
Franz Pletz
f2fea9042e
nmap: 7.60 -> 7.70 2018-03-22 01:05:31 +01:00
Peter Hoeg
ae604faabb nmapsi4: init at 0.5-alpha1 2018-02-06 14:41:21 +08:00
Yegor Timoshenko
506c89c30a maintainers: remove mornfall from packages 2018-01-17 05:17:33 +00:00
John Ericson
531e4b80c9 misc pkgs: Basic sed to get fix pkgconfig and autoreconfHook buildInputs
Only acts on one-line dependency lists.
2017-09-21 15:49:53 -04:00
Daiderd Jordan
6b7e103870
nmap: patch vendored libz for darwin 2017-09-18 22:02:58 +02:00
Franz Pletz
94cadf33ba
nmap: 7.50 -> 7.60 2017-08-12 11:05:22 +02:00
Franz Pletz
7272f8096e
nmap: 7.40 -> 7.50 2017-06-16 06:17:36 +02:00
Robin Gloster
e3d9f438c3
nmap: 7.31 -> 7.40 2017-02-02 19:33:21 +01:00
Bjørn Forsman
2bf0fd0f29 Revert "nmap: use python infra's .withPackages"
This reverts commit 278d3050ae because it
breaks zenmap:

$ zenmap
Could not import the zenmapGUI.App module: 'No module named zenmapGUI.App'.
I checked in these directories:
    /nix/store/2hiz11plgjdrk2mziwc2jcxqalqh9hii-nmap-graphical-7.12/bin
    /home/bfo/forks/nixpkgs
    /nix/store/0l4lriqf07qah8c0kh9kcyc8l5iyij16-python-2.7.12/lib/python27.zip
    /nix/store/0l4lriqf07qah8c0kh9kcyc8l5iyij16-python-2.7.12/lib/python2.7
    /nix/store/0l4lriqf07qah8c0kh9kcyc8l5iyij16-python-2.7.12/lib/python2.7/plat-linux2
    /nix/store/0l4lriqf07qah8c0kh9kcyc8l5iyij16-python-2.7.12/lib/python2.7/lib-tk
    /nix/store/0l4lriqf07qah8c0kh9kcyc8l5iyij16-python-2.7.12/lib/python2.7/lib-old
    /nix/store/0l4lriqf07qah8c0kh9kcyc8l5iyij16-python-2.7.12/lib/python2.7/lib-dynload
    /nix/store/0l4lriqf07qah8c0kh9kcyc8l5iyij16-python-2.7.12/lib/python2.7/site-packages
If you installed Zenmap in another directory, you may have to add the
modules directory to the PYTHONPATH environment variable.
2017-02-01 20:39:11 +01:00
Zero King
c9204f7206 nmap: 7.12 -> 7.31 (#19923) 2016-10-27 13:55:08 +02:00
Aneesh Agrawal
278d3050ae nmap: use python infra's .withPackages 2016-09-24 15:05:28 +02:00
Aneesh Agrawal
6321a1b67c nmap: pin to Python 2, make Python optional
Python 3 is not supported, so use python2Packages.

Python is only required for the `ndiff` and `zenmap` binaries, not the
main `nmap` binary, so disable Python by default to reduce the default
closure size, and add a `withPython` arg to re-enable it. Note that
Zenmap is the graphical program, so passing `graphicalSupport = true`
will also automatically enable Python support.
2016-09-24 15:05:28 +02:00
Kirill Boltaev
0f37287df5 treewide: explicitly specify gtk version 2016-09-13 21:09:24 +03:00
Kirill Boltaev
bccd75094f treewide: explicitly specify gtk and related package versions 2016-09-12 18:26:06 +03:00
Frederik Rietdijk
7986b718f3 Remove pycairo from top-level
See #11567.
2016-08-14 13:52:42 +02:00
Franz Pletz
c66814d9ce nmap: 7.01 -> 7.12 2016-08-07 16:52:07 +02:00
koral
e007b1b764 nmap: 7.00 -> 7.01 2015-12-16 23:21:19 +00:00
Franz Pletz
991407f858 nmap: 6.49BETA4 -> 7.00 2015-11-20 21:04:49 +01:00
Austin Seipp
e84c8772c9 nixpkgs: nmap 6.47 -> 6.49BETA4
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2015-08-31 03:17:16 -05:00
Vladimír Čunát
80c7a6f107 nmap: extend platforms
Tested briefly by @jcf on darwin, web site claims BSDs are also supported.
2015-03-18 23:51:19 +01:00
Austin Seipp
c619e54e60 nmap: fix dependencies on makeWrapper/python
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-12-29 12:55:14 -06:00
Austin Seipp
baa2e7326f nixpkgs: nmap 6.40 -> 6.47
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-12-28 23:41:54 -06:00
Pascal Wittmann
8df0e0b151 Fixed many descriptions 2014-11-11 14:36:34 +01:00
William A. Kennington III
47f0f34fca nmap: Build the non-graphical version by default 2014-04-05 14:58:49 -05:00
Austin Seipp
4c04474c27 nmap: add myself to maintainers, add homepage/description
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-03-16 16:53:08 -05:00
Petr Rockai
4124bb9ff5 Adopt more packages. 2014-01-28 18:11:00 +01:00
Jaka Hudoklin
ffb359cb57 nmap: update to 6.40. close #1368. 2013-12-13 21:11:51 +02:00
Sergey Mironov
ea82f6d0e9 nmap: help zenmap to find it's templates in nix-store
Zenamp wrapper confuses python so it thinks that zenmap is launched as a script
and not as an executable. This leads to incorrect /share path and missing
templates. ./zenmap.patch cures that (a bit hacky as usual).
2013-06-06 12:09:19 +04:00
Michael Raskin
3e005d363a Update nmap
svn path=/nixpkgs/trunk/; revision=27315
2011-05-30 06:25:38 +00:00
Eelco Dolstra
6faed26c43 * nmap: apply a patch to remove md2 support.
svn path=/nixpkgs/branches/x-updates/; revision=22701
2010-07-22 10:31:39 +00:00