Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

nmap: 7.93 -> 7.94 #238960

Merged
merged 2 commits into from
Jun 22, 2023
Merged

nmap: 7.93 -> 7.94 #238960

merged 2 commits into from
Jun 22, 2023

Conversation

fpletz
Copy link
Member

@fpletz fpletz commented Jun 21, 2023

Description of changes

Package bump and remove last traces of zenmap support which hasn't been enabled for a while.

Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 23.11 Release Notes (or backporting 23.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

@Ma27 Ma27 merged commit 60fb686 into NixOS:master Jun 22, 2023
11 checks passed
@fpletz fpletz deleted the pkgs/nmap-7.94 branch June 23, 2023 21:19
@uninsane
Copy link
Contributor

this breaks cross compilation:

$ git show ddf2d4e8ea0109225caaea58c5e666a38c492279
nmap: 7.93 -> 7.94
$ git checkout ddf2d4e8ea0109225caaea58c5e666a38c492279~1
$ nix build '.#pkgsCross.aarch64-multiplatform.nmap'
<success>
$ git checkout ddf2d4e8ea0109225caaea58c5e666a38c492279
$ nix build '.#pkgsCross.aarch64-multiplatform.nmap'
...
make[1]: Leaving directory '/build/nmap-7.94/libnetutil'
aarch64-unknown-linux-gnu-g++ -c -I./liblinear -I./liblua -I/nix/store/b6dc0lljn4lkylyrv3mj8z4bfslafxj1-lua-aarch64-unknown-linux-gnu-5.3.6/include -I./libdnet-stripped/include -I./libz  -I./nbase -I./nsock/include -DHAVE_CONFIG_H -DNMAP_PLATFORM=\"aarch64-unknown-linux-gnu\" -DNMAPDATADIR=\"/nix/store/885x4inw6hqnxwmyzanp5cyh9gs9cdiq-nmap-aarch64-unknown-linux-gnu-7.94/share/nmap\" -D_FORTIFY_SOURCE=2 -g -O2 -Wall -fno-strict-aliasing   TargetGroup.cc -o TargetGroup.o
aarch64-unknown-linux-gnu-gcc -O2 -Wall -Wextra -DLUA_COMPAT_5_3  -g -O2 -Wall   -DLUA_USE_POSIX -DLUA_USE_DLOPEN   -c -o linit.o linit.c
aarch64-unknown-linux-gnu-ar liblua.a lapi.o lcode.o lctype.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o lmem.o lobject.o lopcodes.o lparser.o lstate.o lstring.o ltable.o ltm.o lundump.o lvm.o lzio.o lauxlib.o lbaselib.o lcorolib.o ldblib.o liolib.o lmathlib.o loadlib.o loslib.o lstrlib.o ltablib.o lutf8lib.o linit.o 
aarch64-unknown-linux-gnu-ar: libdeps specified more than once
make[1]: *** [Makefile:60: liblua.a] Error 1
make[1]: Leaving directory '/build/nmap-7.94/liblua'
make: *** [Makefile:166: build-lua] Error 2
make: *** Waiting for unfinished jobs....

uninsane added a commit to uninsane/nixpkgs that referenced this pull request Jun 28, 2023
nmap was updated from 7.93 -> 7.94 in
<NixOS#238960>

as part of that update, upstream migrated from lua5.3 to lua5.4, see:
<nmap/nmap@7d57e7d>

nmap's configure script falls back to its vendored liblua if it can't
find the expected lua version (silently). that means we lost all
nix-specific lua patches that make things like cross compilation work.
this patch brings the lua versions back in line to fix that regression.
@uninsane uninsane mentioned this pull request Jun 29, 2023
12 tasks
@uninsane
Copy link
Contributor

@fpletz please see #240440 for the cross compilation fix. also consider linking or inlining upstream changelogs into future PRs: it makes it easier for reviewers to spot this sort of thing (dependency changes/mismatches) in advance.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants