This reverts commit fb6d63f3fd.
I really hope this finally fixes#99236: evaluation on Hydra.
This time I really did check basically the same commit on Hydra:
https://hydra.nixos.org/eval/1618011
Right now I don't have energy to find what exactly is wrong in the
commit, and it doesn't seem important in comparison to nixos-unstable
channel being stuck on a commit over one week old.
https://github.com/iputils/iputils/releases/tag/s20190709
See release notes for details,
but of particular note is that
this expression is now quite simpler
due to the following:
* ninfod now builds w/nettle!
* update includes patches we fetched from upstream
* cross should be handled now, during move to meson
* prelim testing confirms, meson makes it much easier
to get things right re:explanation given in comment
(not propagating host/target info)
* issue re:musl+idn2 appears resolved re:compilation,
but results in unclear runtime errors regarding
"invalid flags". Keep disabled as before as this
is clearer at the expression level and reports
failure to resolve instead which is a bit clearer.
(testing with systemd-less iputils)
This also means our iputils is openssl-free,
which if nothing else is a nice reduction in trans. size :).
(quick imperfect comparison shows:
39MB -> 35MB w/glibc
11.4 -> 7.9 w/musl
)
iputils: nvm no IDN w/musl
iputils: nvm keep idn disabled w/musl
Important changes:
- Two files where removed in [0]:
- bin/ipg
- share/man/man8/pg3.8.gz
- The build system changed from Autotools to Meson.
- New: systemd units and Japanese translations
- "It is probable that within in many many changes a regression may have
slipped in" [1]
[0]: 45a1d39b0c
[1]: https://github.com/iputils/iputils/releases/tag/s20190324
Co-authored-by: Will Dietz <github@wdtz.org>
I *want* cross-specific overrides to be verbose, so I rather not have
this shorthand. This makes the syntactic overhead more proportional to
the maintainence cost. Hopefully this pushes people towards fewer
conditionals and more abstractions.
This makes the command ‘nix-env -qa -f. --arg config '{skipAliases =
true;}'’ work in Nixpkgs.
Misc...
- qtikz: use libsForQt5.callPackage
This ensures we get the right poppler.
- rewrites:
docbook5_xsl -> docbook_xsl_ns
docbook_xml_xslt -> docbook_xsl
diffpdf: fixup
URLs to http://nix.cs.uu.nl/dist/tarballs. With content-addressable
mirror support (r9190, NIXPKGS-70) this is no longer necessary:
fetchurl will try to download from that location automatically. So
we can keep the original URLs.
svn path=/nixpkgs/trunk/; revision=9192
*** BIG FAT WARNING ***
Right now these tools can only be used as root, because they are normally
installed SUID root!
svn path=/nixpkgs/trunk/; revision=1234
