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

Commits on Dec 24, 2018

  1. osquery: fix build 

    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
    @Ma27
    Ma27 committed Dec 24, 2018
    Copy the full SHA
    8934dae View commit details

  2. Merge pull request #52744 from Ma27/fix-osquery 

    osquery: fix build
    @Ma27
    Ma27 authored Dec 24, 2018
    Copy the full SHA
    8ae753e View commit details
Showing with 16 additions and 2 deletions.
  1. +16 −2 pkgs/tools/system/osquery/default.nix
18 changes: 16 additions & 2 deletions pkgs/tools/system/osquery/default.nix
View file
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@
, beecrypt, augeas, libxml2, sleuthkit, yara, lldpd, google-gflags
, thrift, boost, rocksdb_lite, glog, gbenchmark, snappy
, openssl, file, doxygen
, gtest, sqlite, fpm, zstd, rdkafka, rapidjson
, gtest, sqlite, fpm, zstd, rdkafka, rapidjson, fetchgit
}:

let
@@ -43,6 +43,20 @@ stdenv.mkDerivation rec {
gflags' = google-gflags.overrideAttrs (old: {
cmakeFlags = stdenv.lib.filter (f: isNull (builtins.match ".*STATIC.*" f)) old.cmakeFlags;
});

# use older `lvm2` source for osquery, the 2.03 sourcetree
# will break osquery due to the lacking header `lvm2app.h`.
#
# https://github.com/NixOS/nixpkgs/pull/51756#issuecomment-446035295
lvm2' = lvm2.overrideAttrs (old: rec {
name = "lvm2-${version}";
version = "2.02.183";
src = fetchgit {
url = "git://sourceware.org/git/lvm2.git";
rev = "v${version}";
sha256 = "1ny3srcsxd6kj59zq1cman5myj8kzw010wbyc6mrpk4kp823r5nx";
};
});
in [
udev audit

@@ -51,7 +65,7 @@ stdenv.mkDerivation rec {
customMemoryManagement = false;
})

lvm2 libgcrypt libarchive libgpgerror libuuid iptables dpkg
lvm2' libgcrypt libarchive libgpgerror libuuid iptables dpkg
lzma bzip2 rpm beecrypt augeas libxml2 sleuthkit
yara lldpd gflags' thrift boost
glog gbenchmark snappy openssl