The install script was escaping the Nix environment on Mac OS by using
`xcrun -sdk macos clang` as its C compiler. Using the Nix compiler
required declaring the necessary frameworks as inputs and patching
build scripts to assume MacOS 10.12 (and not try to detect).
So cached derivations prior to this would probably not work on all
intended target machines.
This *might* also fix installCheck on Darwin on Hydra.
Other minor fixes:
* Disable parallel building due to a race with a missing y.tab.h
* Use NIX_CFLAGS_COMPILE/NIX_LDFLAGS instead of trying to synthesize
something like them.
* X11 dependencies aren't used on Darwin when the windowing system
is correctly detected
- mark osquery as broken
- mark ceph as broken
both osquery and ceph packages are outdated. furthermore, ceph has its
own inline rocksdb source tree which isn't use in the current nixpkg.
this needs to be fixed.
- Use the right variables and `make install` to ensure all products are
installed.
- Remove unneeded build inputs: we don't need systemd or polkit to
install the service or polkit rules.
A commit in 2014 (see #2266) disabled building parts which depended on
X11 on Mac OS. There's no explanation given in the pull request. In
any case, many people install plan9port on Darwin specifically to use
the UI components.
Aside from this, the derivation was broken on Mac OS, probably because
people put the `which` and `perl` dependencies inside the !isDarwin
conditional. Some programs worked, however the static libraries did
not build, so this could not be used as a buildInput to build programs
which need the libraries. This fixes that.
The most immediate motivation for the source/patch reworking is to
upgrade the tree without needing to provide an updated version
with the fix and the upgrade as well.
Naturally the patch won't necessarily apply to all future versions,
but that's easy enough to check and happily appears to have no trouble
with this upgrade.
A recent upgrade of cargo-vendor changed its output slightly, which
broke all cargoSha256 hashes in nixpkgs.
See https://github.com/NixOS/nixpkgs/issues/60668 for more information.
Since then, a few hashes have been fixed in master by hand, but there
were a lot still to do, so I did all of the ones left over with some
scripts I wrote.
The one hash I wasn’t able to update was habitat's, because it’s
currently broken and the build doesn’t get far enough to produce a
hash anyway.
We use `dpkg` 1.19.2 since 23661254e4.
This version dropped pkg_db_reset` in `<dpkg/dpkg_db.h>` which broke compilation with the
following errors:
```
/build/source/osquery/tables/system/linux/deb_packages.cpp: In function 'void osquery::tables::dpkg_setup(pkg_array*)':
/build/source/osquery/tables/system/linux/deb_packages.cpp:83:3: error: 'pkg_array_init_from_db' was not declared in this scope
pkg_array_init_from_db(packages);
^~~~~~~~~~~~~~~~~~~~~~
/build/source/osquery/tables/system/linux/deb_packages.cpp:83:3: note: suggested alternative: 'pkg_array_init_from_hash'
pkg_array_init_from_db(packages);
^~~~~~~~~~~~~~~~~~~~~~
pkg_array_init_from_hash
/build/source/osquery/tables/system/linux/deb_packages.cpp: In function 'void osquery::tables::dpkg_teardown(pkg_array*)':
/build/source/osquery/tables/system/linux/deb_packages.cpp:93:3: error: 'pkg_db_reset' was not declared in this scope
pkg_db_reset();
^~~~~~~~~~~~
/build/source/osquery/tables/system/linux/deb_packages.cpp:93:3: note: suggested alternative: 'pkg_hash_reset'
pkg_db_reset();
^~~~~~~~~~~~
pkg_hash_reset
make[2]: *** [osquery/tables/CMakeFiles/osquery_system_tables.dir/build.make:115: osquery/tables/CMakeFiles/osquery_system_tables.dir/system/linux/deb_packages.cpp.o] Error 1
```
As there's currently no upstream fix, it's better to use an older
version of `dpkg` for now.
Comments on conflicts:
- llvm: d6f401e1 vs. 469ecc70 - docs for 6 and 7 say the default is
to build all targets, so we should be fine
- some pypi hashes: they were equivalent, just base16 vs. base32
He prefers to contribute to his own nixpkgs fork triton.
Since he is still marked as maintainer in many packages
this leaves the wrong impression he still maintains those.
It seems as without the appropriate linker flag `-lcrypto` the
`libcrypto.sh` can't be found by `ld` which broke one of the linker
processes during compilation.
See also https://hydra.nixos.org/build/87208819
As discussed in #51756, recently packaged versions of `lvm2` miss the
`lvm2app.h` header which breaks the osquery build.
Please note that this simply fixes the build and is not an upgrade. The
CMake patches are fairly diverged in constrast to the current upstream
packaging which requires a lot more effort I can't provide ATM.
cc @markuskowa @hedning
Nixpkgs is meant to link everything dynamically. We don’t want to
expose static packages at the top level. If some package needs
statically built binaries, it should use a custom override.
Otherwise netdata will not find python modules.
To make sure netdata still pick up our setuid version of apps.plugin
we rename the original executable.
Introduce a `skawarePackages.buildPackage` function that contains the
common setup, removing a lot of duplication.
In particular, we require that the build directory has to be empty
after the `fixupPhase`, to make sure every relevant file is moved to
the outputs.
A next step would be to deduplicate the `configureFlags` attributes
and only require a `skawareInputs` field.
The web_access.patch would no longer apply.
It disabled a check that required the static files
for the web UI to be owned by the user the daemon runs as
(not root, so it doesn't work well with nix).
Besides updating netdata, this commit removes that patch,
changes the netdata service config to set the "web files owner/group"
option to "root" and adds a test that checks that the web UI is being served.
This allows the web files to be owned by root without patching.
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.
* substitute(): --subst-var was silently coercing to "" if the variable does not exist.
* libffi: simplify using `checkInputs`
* pythonPackges.hypothesis, pythonPackages.pytest: simpify dependency cycle fix
* utillinux: 2.32 -> 2.32.1
https://lkml.org/lkml/2018/7/16/532
* busybox: 1.29.0 -> 1.29.1
* bind: 9.12.1-P2 -> 9.12.2
https://ftp.isc.org/isc/bind9/9.12.2/RELEASE-NOTES-bind-9.12.2.html
* curl: 7.60.0 -> 7.61.0
* gvfs: make tests run, but disable
* ilmbase: disable tests on i686. Spooky!
* mdds: fix tests
* git: disable checks as tests are run in installcheck
* ruby: disable tests
* libcommuni: disable checks as tests are run in installcheck
* librdf: make tests run, but disable
* neon, neon_0_29: make tests run, but disable
* pciutils: 3.6.0 -> 3.6.1
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/pciutils/versions.
* mesa: more include fixes
mostly from void-linux (thanks!)
* npth: 1.5 -> 1.6
minor bump
* boost167: Add lockfree next_prior patch
* stdenv: cleanup darwin bootstrapping
Also gets rid of the full python and some of it's dependencies in the
stdenv build closure.
* Revert "pciutils: use standardized equivalent for canonicalize_file_name"
This reverts commit f8db20fb3a.
Patching should no longer be needed with 3.6.1.
* binutils-wrapper: Try to avoid adding unnecessary -L flags
(cherry picked from commit f3758258b8895508475caf83e92bfb236a27ceb9)
Signed-off-by: Domen Kožar <domen@dev.si>
* libffi: don't check on darwin
libffi usages in stdenv broken darwin. We need to disable doCheck for that case.
* "rm $out/share/icons/hicolor/icon-theme.cache" -> hicolor-icon-theme setup-hook
* python.pkgs.pytest: setupHook to prevent creation of .pytest-cache folder, fixes#40273
When `py.test` was run with a folder as argument, it would not only
search for tests in that folder, but also create a .pytest-cache folder.
Not only is this state we don't want, but it was also causing
collisions.
* parity-ui: fix after merge
* python.pkgs.pytest-flake8: disable test, fix build
* Revert "meson: 0.46.1 -> 0.47.0"
With meson 0.47.0 (or 0.47.1, or git)
things are very wrong re:rpath handling
resulting in at best missing libs but
even corrupt binaries :(.
When we run patchelf it masks the problem
by removing obviously busted paths.
Which is probably why this wasn't noticed immediately.
Unfortunately the binary already
has a long series of paths scribbled
in a space intended for a much smaller string;
in my testing it was something like
lengths were 67 with 300+ written to it.
I think we've reported the relevant issues upstream,
but unfortunately it appears our patches
are what introduces the overwrite/corruption
(by no longer being correct in what they assume)
This doesn't look so bad to fix but it's
not something I can spend more time on
at the moment.
--
Interestingly the overwritten string data
(because it is scribbled past the bounds)
remains in the binary and is why we're suddenly
seeing unexpected references in various builds
-- notably this is is the reason we're
seeing the "extra-utils" breakage
that entirely crippled NixOS on master
(and probably on staging before?).
Fixes#43650.
This reverts commit 305ac4dade.
(cherry picked from commit 273d68eff8f7b6cd4ebed3718e5078a0f43cb55d)
Signed-off-by: Domen Kožar <domen@dev.si>
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
Latest bugfix release with the following notable changes:
* Memory leak resolve for dispatcher
(06d4865445)
* Fix include path on status.h
(5bd4984f2a)
Additionally the patch had to be rebased onto the 3.2.9 branch as it
added XCode support including some CLang flags (namely `-fno-limit-debug-info`)
which are unsupported on GCC.
(see bccc28dd98)
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.
This update was made based on information from https://repology.org/metapackage/acpica-tools/versions.
These checks were done:
- built on NixOS
- /nix/store/dc5gdvaij7aajyirdny91s0whbspwjgn-acpica-tools-20180629/bin/acpibin passed the binary check.
- /nix/store/dc5gdvaij7aajyirdny91s0whbspwjgn-acpica-tools-20180629/bin/acpidump passed the binary check.
- /nix/store/dc5gdvaij7aajyirdny91s0whbspwjgn-acpica-tools-20180629/bin/acpiexec passed the binary check.
- /nix/store/dc5gdvaij7aajyirdny91s0whbspwjgn-acpica-tools-20180629/bin/acpihelp passed the binary check.
- /nix/store/dc5gdvaij7aajyirdny91s0whbspwjgn-acpica-tools-20180629/bin/acpinames passed the binary check.
- /nix/store/dc5gdvaij7aajyirdny91s0whbspwjgn-acpica-tools-20180629/bin/acpixtract passed the binary check.
- 6 of 6 passed binary check by having a zero exit code.
- 0 of 6 passed binary check by having the new version present in output.
- directory tree listing: https://gist.github.com/9296aa5d91d9452a3a1d83b0168e6b8d
- du listing: https://gist.github.com/e7225e6df139c9308cd612a5fcba8acf
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.
This update was made based on information from https://repology.org/metapackage/hwinfo/versions.
These checks were done:
- built on NixOS
- /nix/store/vdfyjf4l15gl2mqav1239p3324nxc1cx-hwinfo-21.56/bin/hwinfo passed the binary check.
- /nix/store/vdfyjf4l15gl2mqav1239p3324nxc1cx-hwinfo-21.56/bin/check_hd passed the binary check.
- Warning: no invocation of /nix/store/vdfyjf4l15gl2mqav1239p3324nxc1cx-hwinfo-21.56/bin/mk_isdnhwdb had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/vdfyjf4l15gl2mqav1239p3324nxc1cx-hwinfo-21.56/bin/convert_hd had a zero exit code or showed the expected version
- /nix/store/vdfyjf4l15gl2mqav1239p3324nxc1cx-hwinfo-21.56/bin/getsysinfo passed the binary check.
- 3 of 5 passed binary check by having a zero exit code.
- 1 of 5 passed binary check by having the new version present in output.
- found 21.56 with grep in /nix/store/vdfyjf4l15gl2mqav1239p3324nxc1cx-hwinfo-21.56
- directory tree listing: https://gist.github.com/b9d5b7de5962022ef010b2d4f42810c1
- du listing: https://gist.github.com/1d6be034568191041d6d6c11b601a8e9
* treewide: http -> https sources
This updates the source urls of all top-level packages from http to
https where possible.
* buildtorrent: fix url and tab -> spaces
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.
This update was made based on information from https://repology.org/metapackage/hwinfo/versions.
These checks were done:
- built on NixOS
- /nix/store/hl1s37xgnvmc7i9qixpfpmib9h1xb9m5-hwinfo-21.55/bin/hwinfo passed the binary check.
- /nix/store/hl1s37xgnvmc7i9qixpfpmib9h1xb9m5-hwinfo-21.55/bin/check_hd passed the binary check.
- Warning: no invocation of /nix/store/hl1s37xgnvmc7i9qixpfpmib9h1xb9m5-hwinfo-21.55/bin/mk_isdnhwdb had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/hl1s37xgnvmc7i9qixpfpmib9h1xb9m5-hwinfo-21.55/bin/convert_hd had a zero exit code or showed the expected version
- /nix/store/hl1s37xgnvmc7i9qixpfpmib9h1xb9m5-hwinfo-21.55/bin/getsysinfo passed the binary check.
- 3 of 5 passed binary check by having a zero exit code.
- 1 of 5 passed binary check by having the new version present in output.
- found 21.55 with grep in /nix/store/hl1s37xgnvmc7i9qixpfpmib9h1xb9m5-hwinfo-21.55
- directory tree listing: https://gist.github.com/75d50331352f1d07e8c3bb5ed608c696
- du listing: https://gist.github.com/91d956e9c9e9765872e9d3c7f33d72f0
The 3.2.2 build fails ATM on Hydra: https://hydra.nixos.org/build/75998362
Bumping to 3.2.8 and rebasing `osquery/CMakeLists.txt` with `misc.patch`
fixes the issue. Additionally the NixOS test remains functional.
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.
This update was made based on information from https://repology.org/metapackage/acpica-tools/versions.
These checks were done:
- built on NixOS
- /nix/store/x1sw7fxqaqayhy9hyvh57xc2zjg5d4yw-acpica-tools-20180531/bin/acpibin passed the binary check.
- /nix/store/x1sw7fxqaqayhy9hyvh57xc2zjg5d4yw-acpica-tools-20180531/bin/acpidump passed the binary check.
- /nix/store/x1sw7fxqaqayhy9hyvh57xc2zjg5d4yw-acpica-tools-20180531/bin/acpiexec passed the binary check.
- /nix/store/x1sw7fxqaqayhy9hyvh57xc2zjg5d4yw-acpica-tools-20180531/bin/acpihelp passed the binary check.
- /nix/store/x1sw7fxqaqayhy9hyvh57xc2zjg5d4yw-acpica-tools-20180531/bin/acpinames passed the binary check.
- /nix/store/x1sw7fxqaqayhy9hyvh57xc2zjg5d4yw-acpica-tools-20180531/bin/acpixtract passed the binary check.
- 6 of 6 passed binary check by having a zero exit code.
- 0 of 6 passed binary check by having the new version present in output.
- directory tree listing: https://gist.github.com/0bdfbe66fba66901dbdc08214997cf2d
- du listing: https://gist.github.com/28d13e951134d3565b807bef5d9610ec
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.
This update was made based on information from https://repology.org/metapackage/fio/versions.
These checks were done:
- built on NixOS
- /nix/store/1q2bln9rv2q8sym6zvgavzqk2w8hpc1x-fio-3.7/bin/fio passed the binary check.
- Warning: no invocation of /nix/store/1q2bln9rv2q8sym6zvgavzqk2w8hpc1x-fio-3.7/bin/fio-genzipf had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/1q2bln9rv2q8sym6zvgavzqk2w8hpc1x-fio-3.7/bin/fio-btrace2fio had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/1q2bln9rv2q8sym6zvgavzqk2w8hpc1x-fio-3.7/bin/fio-dedupe had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/1q2bln9rv2q8sym6zvgavzqk2w8hpc1x-fio-3.7/bin/fio-verify-state had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/1q2bln9rv2q8sym6zvgavzqk2w8hpc1x-fio-3.7/bin/fio_generate_plots had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/1q2bln9rv2q8sym6zvgavzqk2w8hpc1x-fio-3.7/bin/fio2gnuplot had a zero exit code or showed the expected version
- /nix/store/1q2bln9rv2q8sym6zvgavzqk2w8hpc1x-fio-3.7/bin/genfio passed the binary check.
- /nix/store/1q2bln9rv2q8sym6zvgavzqk2w8hpc1x-fio-3.7/bin/fiologparser.py passed the binary check.
- Warning: no invocation of /nix/store/1q2bln9rv2q8sym6zvgavzqk2w8hpc1x-fio-3.7/bin/fiologparser_hist.py had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/1q2bln9rv2q8sym6zvgavzqk2w8hpc1x-fio-3.7/bin/fio_jsonplus_clat2csv had a zero exit code or showed the expected version
- 3 of 11 passed binary check by having a zero exit code.
- 1 of 11 passed binary check by having the new version present in output.
- found 3.7 with grep in /nix/store/1q2bln9rv2q8sym6zvgavzqk2w8hpc1x-fio-3.7
- directory tree listing: https://gist.github.com/bd1f8351a206f7ab3391b9aaf656b1cf
- du listing: https://gist.github.com/f8ccaaf11e78def220b20bc5d0fcfa4a
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.
This update was made based on information from https://repology.org/metapackage/ipmiutil/versions.
These checks were done:
- built on NixOS
- Warning: no invocation of /nix/store/g5xqcpmd9m47yc23dsdczapwlmw56b9a-ipmiutil-3.1.1/bin/ipmiutil had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/g5xqcpmd9m47yc23dsdczapwlmw56b9a-ipmiutil-3.1.1/bin/ievents had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/g5xqcpmd9m47yc23dsdczapwlmw56b9a-ipmiutil-3.1.1/bin/idiscover had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/g5xqcpmd9m47yc23dsdczapwlmw56b9a-ipmiutil-3.1.1/bin/ialarms had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/g5xqcpmd9m47yc23dsdczapwlmw56b9a-ipmiutil-3.1.1/bin/icmd had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/g5xqcpmd9m47yc23dsdczapwlmw56b9a-ipmiutil-3.1.1/bin/iconfig had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/g5xqcpmd9m47yc23dsdczapwlmw56b9a-ipmiutil-3.1.1/bin/ifirewall had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/g5xqcpmd9m47yc23dsdczapwlmw56b9a-ipmiutil-3.1.1/bin/ifru had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/g5xqcpmd9m47yc23dsdczapwlmw56b9a-ipmiutil-3.1.1/bin/ifwum had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/g5xqcpmd9m47yc23dsdczapwlmw56b9a-ipmiutil-3.1.1/bin/igetevent had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/g5xqcpmd9m47yc23dsdczapwlmw56b9a-ipmiutil-3.1.1/bin/ihealth had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/g5xqcpmd9m47yc23dsdczapwlmw56b9a-ipmiutil-3.1.1/bin/ihpm had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/g5xqcpmd9m47yc23dsdczapwlmw56b9a-ipmiutil-3.1.1/bin/ilan had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/g5xqcpmd9m47yc23dsdczapwlmw56b9a-ipmiutil-3.1.1/bin/ipicmg had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/g5xqcpmd9m47yc23dsdczapwlmw56b9a-ipmiutil-3.1.1/bin/ipmi_port had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/g5xqcpmd9m47yc23dsdczapwlmw56b9a-ipmiutil-3.1.1/bin/ireset had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/g5xqcpmd9m47yc23dsdczapwlmw56b9a-ipmiutil-3.1.1/bin/isel had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/g5xqcpmd9m47yc23dsdczapwlmw56b9a-ipmiutil-3.1.1/bin/iseltime had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/g5xqcpmd9m47yc23dsdczapwlmw56b9a-ipmiutil-3.1.1/bin/isensor had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/g5xqcpmd9m47yc23dsdczapwlmw56b9a-ipmiutil-3.1.1/bin/iserial had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/g5xqcpmd9m47yc23dsdczapwlmw56b9a-ipmiutil-3.1.1/bin/isol had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/g5xqcpmd9m47yc23dsdczapwlmw56b9a-ipmiutil-3.1.1/bin/iuser had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/g5xqcpmd9m47yc23dsdczapwlmw56b9a-ipmiutil-3.1.1/bin/iwdt had a zero exit code or showed the expected version
- 0 of 23 passed binary check by having a zero exit code.
- 0 of 23 passed binary check by having the new version present in output.
- directory tree listing: https://gist.github.com/2e464372bda59e64858903e01bf01472
- du listing: https://gist.github.com/310a0565ebec0aa5644c80c0d97ffb94
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.
This update was made based on information from https://repology.org/metapackage/logcheck/versions.
These checks were done:
- built on NixOS
- /nix/store/mvacp7nmvc8fg9jyrspb3if7x22wwa9p-logcheck-1.3.19/bin/logcheck-test passed the binary check.
- /nix/store/mvacp7nmvc8fg9jyrspb3if7x22wwa9p-logcheck-1.3.19/bin/logcheck passed the binary check.
- Warning: no invocation of /nix/store/mvacp7nmvc8fg9jyrspb3if7x22wwa9p-logcheck-1.3.19/bin/logtail had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/mvacp7nmvc8fg9jyrspb3if7x22wwa9p-logcheck-1.3.19/bin/logtail2 had a zero exit code or showed the expected version
- 2 of 4 passed binary check by having a zero exit code.
- 0 of 4 passed binary check by having the new version present in output.
- found 1.3.19 with grep in /nix/store/mvacp7nmvc8fg9jyrspb3if7x22wwa9p-logcheck-1.3.19
- directory tree listing: https://gist.github.com/8e0cb190715df3e41d3fe55fb5ea865f
- du listing: https://gist.github.com/42a702aaffbc35973caa3cde9f16868a