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

Commits on Oct 26, 2020

  1. vector: add sinks, sources and transforms as nixpkgs default features 

    Don't include transform-geoip unless this feature is explicitly selected
    Johan Thomsen committed Oct 26, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    primeos Michael Weiss
    GPG key ID: 5BE487C4D4771D83
    Verified
    Learn about vigilant mode
    Copy the full SHA
    a03c8a8 View commit details

Commits on Nov 10, 2020

  1. Merge pull request #101778 from johanot/vector-more-default-features 

    vector: add sinks, sources and transforms as nixpkgs default features
    @thoughtpolice
    thoughtpolice authored Nov 10, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    primeos Michael Weiss
    GPG key ID: 5BE487C4D4771D83
    Verified
    Learn about vigilant mode
    Copy the full SHA
    dd1b7e3 View commit details
Showing with 14 additions and 1 deletion.
  1. +14 −1 pkgs/tools/misc/vector/default.nix
15 changes: 14 additions & 1 deletion pkgs/tools/misc/vector/default.nix
View file
Original file line number Diff line number Diff line change
@@ -4,9 +4,11 @@
, tzdata

, features ?
(if stdenv.isAarch64
((if stdenv.isAarch64
then [ "jemallocator" "rdkafka" "rdkafka/dynamic_linking" ]
else [ "leveldb" "leveldb/leveldb-sys-2" "jemallocator" "rdkafka" "rdkafka/dynamic_linking" ])
++
[ "sinks" "sources" "transforms" ])
, coreutils
, CoreServices
}:
@@ -38,9 +40,20 @@ rustPlatform.buildRustPackage rec {
# vector.dev during the checkPhase, which obviously isn't going to work.
# these tests in the DNS module are trivial though, so stubbing them out is
# fine IMO.
#
# the geoip transform yields maxmindb.so which contains references to rustc.
# neither figured out why the shared object is included in the output
# (it doesn't seem to be a runtime dependencies of the geoip transform),
# nor do I know why it depends on rustc.
# However, in order for the closure size to stay at a reasonable level,
# transforms-geoip is patched out of Cargo.toml for now - unless explicitly asked for.
patchPhase = ''
substituteInPlace ./src/dns.rs \
--replace "#[test]" ""
${lib.optionalString (!builtins.elem "transforms-geoip" features) ''
substituteInPlace ./Cargo.toml --replace '"transforms-geoip",' ""
''}
'';

meta = with stdenv.lib; {