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
base: 9f816edc3e55
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 62529a693b13
Choose a head ref
  • 3 commits
  • 5 files changed
  • 2 contributors

Commits on Apr 24, 2018

  1. .version: remove final newline 

    When reading the `nixpkgs` version from `.version` you always have a
`\n` at the end because of the final newline.

This issue exists since b7d15ed and had to be fixed several times
according to the history of `.version`.

Furthermore @infinisil recommended I explicitly configured
`.editorconfig` to avoid newlines in `.version`.
    @Ma27
    Ma27 committed Apr 24, 2018
    2
    Copy the full SHA
    e109784 View commit details
    Browse the repository at this point in the history

  2. osquery: 2.5.2 -> 3.2.2 

    The package was originally broken as reported in #38940 and
osquery/osquery#4257. The latest version (3.x) contains several
important fixes for GCC 7, so now we can compile without a much less
complicated patches.

The following changes were needed to fix the derivation:

* Upgrade `osquery/third-party` to the latest rev to be compliant with
  osquery 3.

* Keep using an override for the AWS SDK (for a lower closure size and
  less compile time), but make the `ec2` API available.

* Added the dependencies `fpm`, `zstd`, `rdkafka`, `rapidjson` to the
  build. `linenoise-ng` is obsolete as it's directly bundled with
  `osquery/third-party`.

* Fixed the linking issue with `gflags` as recommended in the mailing
  list: https://groups.google.com/d/msg/nix-devel/l1blj-mWxtI/J3CwPATBCAAJ

* Dropped the obsolete dependencies `cpp-netlib`, `lz4`, `apt` and
  `devicemapper` (thanks @infinisil).

* Override `OSQUERY_PLATFORM` to provide `nixos:version`
  for sandbox and non-NixOS based builds. The `platform-nixos.patch`
  file is now obsolete (thanks @flokli).

The patch was rebased against the 3.x branch of `osquery` and contains
mostly old changes. Additionally several testing targets were skipped as
they broke the build.

The functionality has been testing using the following command:

```
mkdir /tmp/osq.log/
./result/bin/osqueryd --pidfile /tmp/osq.pid \
  --database_path /tmp/test.db --logger_path /tmp/osq.log
```

With the daemon running the database can be queried easily using
`./result/bin/osqueryi`.

Fixes ticket #38940
See ticket #36453

Further reference can be gathered from the affected Hydra logs for
the master branch: https://hydra.nixos.org/job/nixos/trunk-combined/nixpkgs.osquery.x86_64-linux
    @Ma27
    Ma27 committed Apr 24, 2018
    Copy the full SHA
    3cd2707 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #39336 from Ma27/fix-osquery 

    osquery: 2.5.2 -> 3.2.2
    @Mic92
    Mic92 committed Apr 24, 2018
    Copy the full SHA
    62529a6 View commit details
    Browse the repository at this point in the history