mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-17 23:36:17 +01:00
Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
d64d75f2f3
18 changed files with 772 additions and 216 deletions
|
|
@ -14714,4 +14714,10 @@
|
|||
github = "npatsakula";
|
||||
githubId = 23001619;
|
||||
};
|
||||
dfithian = {
|
||||
email = "daniel.m.fithian@gmail.com";
|
||||
name = "Daniel Fithian";
|
||||
github = "dfithian";
|
||||
githubId = 8409320;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -20,6 +20,16 @@ in
|
|||
|
||||
enable = mkEnableOption "heartbeat";
|
||||
|
||||
package = mkOption {
|
||||
type = types.package;
|
||||
default = pkgs.heartbeat;
|
||||
defaultText = literalExpression "pkgs.heartbeat";
|
||||
example = literalExpression "pkgs.heartbeat7";
|
||||
description = ''
|
||||
The heartbeat package to use.
|
||||
'';
|
||||
};
|
||||
|
||||
name = mkOption {
|
||||
type = types.str;
|
||||
default = "heartbeat";
|
||||
|
|
@ -67,7 +77,7 @@ in
|
|||
serviceConfig = {
|
||||
User = "nobody";
|
||||
AmbientCapabilities = "cap_net_raw";
|
||||
ExecStart = "${pkgs.heartbeat}/bin/heartbeat -c \"${heartbeatYml}\" -path.data \"${cfg.stateDir}/data\" -path.logs \"${cfg.stateDir}/logs\"";
|
||||
ExecStart = "${cfg.package}/bin/heartbeat -c \"${heartbeatYml}\" -path.data \"${cfg.stateDir}/data\" -path.logs \"${cfg.stateDir}/logs\"";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -85,12 +85,14 @@ let
|
|||
hasDefaultGatewaySet = (cfg.defaultGateway != null && cfg.defaultGateway.address != "")
|
||||
|| (cfg.enableIPv6 && cfg.defaultGateway6 != null && cfg.defaultGateway6.address != "");
|
||||
|
||||
networkLocalCommands = {
|
||||
needNetworkSetup = cfg.resolvconf.enable || cfg.defaultGateway != null || cfg.defaultGateway6 != null;
|
||||
|
||||
networkLocalCommands = lib.mkIf needNetworkSetup {
|
||||
after = [ "network-setup.service" ];
|
||||
bindsTo = [ "network-setup.service" ];
|
||||
};
|
||||
|
||||
networkSetup = lib.mkIf (config.networking.resolvconf.enable || cfg.defaultGateway != null || cfg.defaultGateway6 != null)
|
||||
networkSetup = lib.mkIf needNetworkSetup
|
||||
{ description = "Networking Setup";
|
||||
|
||||
after = [ "network-pre.target" "systemd-udevd.service" "systemd-sysctl.service" ];
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "clusterctl";
|
||||
version = "1.1.5";
|
||||
version = "1.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kubernetes-sigs";
|
||||
repo = "cluster-api";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Nnfy8KOMJqg2sXrNDZlrcrpWfc70sXL1tNlXSgg5ZZg=";
|
||||
sha256 = "sha256-udlIylkaNZIkJS6TgJemmQr/o73i87Nt8pL2Pbe+AqA=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-zRdtd/mE9AQtqw9Z/Tatd9vEx9l/XSFge8sOLbS/Wrs=";
|
||||
vendorSha256 = "sha256-jM5qU/KaBf+CzKKOuVXjawn/QqwrCjXKaQFFomEPndg=";
|
||||
|
||||
subPackages = [ "cmd/clusterctl" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"commit": "0b418fc93e5dd9f19c4ca625c57e2cf984267e90",
|
||||
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/0b418fc93e5dd9f19c4ca625c57e2cf984267e90.tar.gz",
|
||||
"sha256": "0rvx383fyl39spw0qr7a1rpqnyzfsjykakia4y2z3658aw4k72cx",
|
||||
"msg": "Update from Hackage at 2022-07-12T21:40:07Z"
|
||||
"commit": "ed7ce097be7422b359f02c2dc7e829abbdb9a6e8",
|
||||
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/ed7ce097be7422b359f02c2dc7e829abbdb9a6e8.tar.gz",
|
||||
"sha256": "09sz6m2mhb16n5xrp6k96ng2mjb1zsnpw0qxdlbgca1l8ad1pdha",
|
||||
"msg": "Update from Hackage at 2022-07-17T05:56:49Z"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -10,11 +10,11 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "elm-json";
|
||||
version = "0.2.10";
|
||||
version = "0.2.12";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/zwilias/elm-json/archive/v${version}.tar.gz";
|
||||
sha256 = "sha256:03azh7wvl60h6w7ffpvl49s7jr7bxpladcm4fzcasakg26i5a71x";
|
||||
sha256 = "sha256:nlpxlPzWk3wwDgczuMI9T6DFY1YtQpQ1R4BhdPbzZBs=";
|
||||
};
|
||||
|
||||
cargoPatches = [ ./elm-json.patch ];
|
||||
|
|
@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec {
|
|||
curl openssl
|
||||
] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ];
|
||||
|
||||
cargoSha256 = "sha256:01zasrqf1va58i52s3kwdkj1rnwy80gv00xi6npfshjirj3ix07f";
|
||||
cargoSha256 = "sha256:8SOpL8nfhYen9vza0LYpB/5fgVmBwG7vGMmFOaJskIc=";
|
||||
|
||||
# Tests perform networking and therefore can't work in sandbox
|
||||
doCheck = false;
|
||||
|
|
|
|||
|
|
@ -1,24 +1,24 @@
|
|||
diff --git a/Cargo.lock b/Cargo.lock
|
||||
index 5440d72..6e173fa 100644
|
||||
index b9bf434..58cfe81 100644
|
||||
--- a/Cargo.lock
|
||||
+++ b/Cargo.lock
|
||||
@@ -774,15 +774,6 @@ version = "0.1.2"
|
||||
@@ -685,15 +685,6 @@ version = "0.1.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de"
|
||||
checksum = "28988d872ab76095a6e6ac88d99b54fd267702734fd7ffe610ca27f533ddb95a"
|
||||
|
||||
-[[package]]
|
||||
-name = "openssl-src"
|
||||
-version = "111.11.0+1.1.1h"
|
||||
-version = "111.17.0+1.1.1m"
|
||||
-source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "380fe324132bea01f45239fadfec9343adb044615f29930d039bec1ae7b9fa5b"
|
||||
-checksum = "05d6a336abd10814198f66e2a91ccd7336611f30334119ca8ce300536666fcf4"
|
||||
-dependencies = [
|
||||
- "cc",
|
||||
-]
|
||||
-
|
||||
[[package]]
|
||||
name = "openssl-sys"
|
||||
version = "0.9.58"
|
||||
@@ -792,7 +783,6 @@ dependencies = [
|
||||
version = "0.9.72"
|
||||
@@ -703,7 +694,6 @@ dependencies = [
|
||||
"autocfg",
|
||||
"cc",
|
||||
"libc",
|
||||
|
|
@ -27,17 +27,17 @@ index 5440d72..6e173fa 100644
|
|||
"vcpkg",
|
||||
]
|
||||
diff --git a/Cargo.toml b/Cargo.toml
|
||||
index 4d319f2..6f4d0e5 100644
|
||||
index bc97f20..54d3b14 100644
|
||||
--- a/Cargo.toml
|
||||
+++ b/Cargo.toml
|
||||
@@ -21,8 +21,8 @@ colored = "2.0"
|
||||
@@ -17,8 +17,8 @@ colored = "2.0"
|
||||
dialoguer = "0.6"
|
||||
dirs = "3.0"
|
||||
fs2 = "0.4"
|
||||
-isahc = { version = "0.9", features = ["static-ssl"] }
|
||||
-curl = {version = "0.4", features = ["static-curl", "static-ssl", "force-system-lib-on-osx", "http2"]}
|
||||
+isahc = "0.9"
|
||||
+curl = {version = "0.4", features = ["force-system-lib-on-osx", "http2"]}
|
||||
-isahc = { version = "1.6.0", default-features = false, features = ["static-ssl", "static-curl"] }
|
||||
-curl = {version = "0.4.42", default-features = false, features = ["ssl", "static-curl", "static-ssl", "force-system-lib-on-osx"]}
|
||||
+isahc = { version = "1.6.0", default-features = false }
|
||||
+curl = {version = "0.4.42", default-features = false, features = ["ssl", "force-system-lib-on-osx"]}
|
||||
ctrlc = "3.1"
|
||||
console = "0.12"
|
||||
|
||||
anyhow = "1.0"
|
||||
|
|
|
|||
|
|
@ -8,10 +8,10 @@
|
|||
}:
|
||||
mkDerivation {
|
||||
pname = "cabal2nix";
|
||||
version = "unstable-2022-06-20";
|
||||
version = "unstable-2022-07-17";
|
||||
src = fetchzip {
|
||||
url = "https://github.com/NixOS/cabal2nix/archive/9d18320d76e3f29f1787a8377125812150c59021.tar.gz";
|
||||
sha256 = "1gykznb1fl9d9cqksbxc4qsyspp9xazamv57hmv3jpljzl8lq2aq";
|
||||
url = "https://github.com/NixOS/cabal2nix/archive/6c6fa480dd535a8a6909b60e1130a6b5bfc2a2c4.tar.gz";
|
||||
sha256 = "19dagxhj1aflhf19xab8yss5mia6kfpghn4h0na8zshqab8xxgrd";
|
||||
};
|
||||
isLibrary = true;
|
||||
isExecutable = true;
|
||||
|
|
|
|||
|
|
@ -1664,6 +1664,12 @@ self: super: {
|
|||
hspec-meta = self.hspec-meta_2_9_3;
|
||||
};
|
||||
|
||||
# Point hspec 2.7.10 to correct dependencies
|
||||
hspec_2_7_10 = doDistribute (super.hspec_2_7_10.override {
|
||||
hspec-discover = self.hspec-discover_2_7_10;
|
||||
hspec-core = self.hspec-core_2_7_10;
|
||||
});
|
||||
|
||||
# waiting for aeson bump
|
||||
servant-swagger-ui-core = doJailbreak super.servant-swagger-ui-core;
|
||||
|
||||
|
|
@ -2394,7 +2400,11 @@ self: super: {
|
|||
# https://hub.darcs.net/shelarcy/regex-compat-tdfa/issue/3
|
||||
regex-compat-tdfa = appendPatches [
|
||||
./patches/regex-compat-tdfa-ghc-9.0.patch
|
||||
] super.regex-compat-tdfa;
|
||||
] (overrideCabal {
|
||||
# Revision introduces bound base < 4.15
|
||||
revision = null;
|
||||
editedCabalFile = null;
|
||||
} super.regex-compat-tdfa);
|
||||
|
||||
# https://github.com/kowainik/validation-selective/issues/64
|
||||
validation-selective = doJailbreak super.validation-selective;
|
||||
|
|
@ -2572,6 +2582,10 @@ self: super: {
|
|||
lsp = self.lsp_1_5_0_0;
|
||||
};
|
||||
|
||||
# Too strict bounds on hspec
|
||||
# https://github.com/klapaucius/vector-hashtables/issues/11
|
||||
vector-hashtables = doJailbreak super.vector-hashtables;
|
||||
|
||||
} // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super // (let
|
||||
# We need to build purescript with these dependencies and thus also its reverse
|
||||
# dependencies to avoid version mismatches in their dependency closure.
|
||||
|
|
@ -2620,4 +2634,7 @@ in {
|
|||
purescript-ast = purescriptStOverride super.purescript-ast;
|
||||
|
||||
purenix = purescriptStOverride super.purenix;
|
||||
|
||||
# tests use doctest-parallel which produces some errors during testing
|
||||
clash-prelude = dontCheck super.clash-prelude;
|
||||
})
|
||||
|
|
|
|||
|
|
@ -63,6 +63,7 @@ broken-packages:
|
|||
- adp-multi
|
||||
- adtrees
|
||||
- advent-of-code-ocr
|
||||
- aern2-fun
|
||||
- AERN-Basics
|
||||
- aeson-applicative
|
||||
- aeson-bson
|
||||
|
|
@ -870,6 +871,7 @@ broken-packages:
|
|||
- CoreDump
|
||||
- CoreErlang
|
||||
- core-haskell
|
||||
- corenlp-parser
|
||||
- core-telemetry
|
||||
- core-webserver-warp
|
||||
- Coroutine
|
||||
|
|
@ -1891,6 +1893,7 @@ broken-packages:
|
|||
- hack-handler-happstack
|
||||
- hack-handler-kibro
|
||||
- HackMail
|
||||
- hackport
|
||||
- hactor
|
||||
- hactors
|
||||
- haddock-api
|
||||
|
|
@ -2996,6 +2999,7 @@ broken-packages:
|
|||
- libpafe
|
||||
- libpq
|
||||
- librandomorg
|
||||
- libsecp256k1
|
||||
- libsystemd-daemon
|
||||
- libsystemd-journal
|
||||
- libtagc
|
||||
|
|
@ -4079,6 +4083,7 @@ broken-packages:
|
|||
- PriorityChansConverger
|
||||
- priority-queue
|
||||
- probable
|
||||
- prob-fx
|
||||
- Probnet
|
||||
- process-conduit
|
||||
- processing
|
||||
|
|
@ -4457,6 +4462,7 @@ broken-packages:
|
|||
- salvia-protocol
|
||||
- sandlib
|
||||
- sandman
|
||||
- sandwich-hedgehog
|
||||
- sarasvati
|
||||
- sat
|
||||
- satchmo
|
||||
|
|
@ -4662,7 +4668,6 @@ broken-packages:
|
|||
- simple-form
|
||||
- simple-genetic-algorithm
|
||||
- SimpleH
|
||||
- SimpleServer
|
||||
- simple-index
|
||||
- simpleirc
|
||||
- simple-log
|
||||
|
|
@ -4673,6 +4678,7 @@ broken-packages:
|
|||
- simpleprelude
|
||||
- simple-rope
|
||||
- simple-server
|
||||
- SimpleServer
|
||||
- simplesmtpclient
|
||||
- simple-sql-parser
|
||||
- simple-stacked-vm
|
||||
|
|
@ -4999,6 +5005,7 @@ broken-packages:
|
|||
- swearjure
|
||||
- swf
|
||||
- swift-lda
|
||||
- swiss
|
||||
- swiss-ephemeris
|
||||
- SWMMoutGetMB
|
||||
- sws
|
||||
|
|
@ -5505,7 +5512,6 @@ broken-packages:
|
|||
- vector-endian
|
||||
- vector-fftw
|
||||
- vector-functorlazy
|
||||
- vector-hashtables
|
||||
- vector-heterogenous
|
||||
- vector-random
|
||||
- vector-read-instances
|
||||
|
|
|
|||
|
|
@ -427,6 +427,7 @@ dont-distribute-packages:
|
|||
- adict
|
||||
- adjunction
|
||||
- adp-multi-monadiccp
|
||||
- aern2-mfun
|
||||
- aeson-native
|
||||
- aeson-result
|
||||
- affine
|
||||
|
|
@ -856,6 +857,7 @@ dont-distribute-packages:
|
|||
- bytable
|
||||
- bytehash
|
||||
- bytelog
|
||||
- bytepatch
|
||||
- bytestring-builder-varword
|
||||
- bytestring-read
|
||||
- ca
|
||||
|
|
@ -952,18 +954,6 @@ dont-distribute-packages:
|
|||
- claferIG
|
||||
- claferwiki
|
||||
- clash
|
||||
- clash-ghc
|
||||
- clash-lib
|
||||
- clash-lib-hedgehog
|
||||
- clash-multisignal
|
||||
- clash-prelude
|
||||
- clash-prelude-hedgehog
|
||||
- clash-prelude-quickcheck
|
||||
- clash-shake
|
||||
- clash-systemverilog
|
||||
- clash-verilog
|
||||
- clash-vhdl
|
||||
- clashilator
|
||||
- classify-frog
|
||||
- classy-miso
|
||||
- clckwrks
|
||||
|
|
@ -1292,6 +1282,7 @@ dont-distribute-packages:
|
|||
- dph-prim-interface
|
||||
- dph-prim-par
|
||||
- dph-prim-seq
|
||||
- drama
|
||||
- dropbox-sdk
|
||||
- dropsolve
|
||||
- dsh-sql
|
||||
|
|
@ -2303,7 +2294,6 @@ dont-distribute-packages:
|
|||
- hyloutils
|
||||
- hyperpublic
|
||||
- iException
|
||||
- ice40-prim
|
||||
- icepeak
|
||||
- ide-backend
|
||||
- ide-backend-server
|
||||
|
|
@ -2592,7 +2582,6 @@ dont-distribute-packages:
|
|||
- linux-ptrace
|
||||
- lio-eci11
|
||||
- lio-simple
|
||||
- lion
|
||||
- liquid-base
|
||||
- liquid-bytestring
|
||||
- liquid-containers
|
||||
|
|
@ -3373,8 +3362,6 @@ dont-distribute-packages:
|
|||
- restful-snap
|
||||
- restricted-workers
|
||||
- rethinkdb-model
|
||||
- retroclash-lib
|
||||
- retroclash-sim
|
||||
- rewrite
|
||||
- rewriting
|
||||
- rezoom
|
||||
|
|
|
|||
|
|
@ -535,9 +535,7 @@ self: super: builtins.intersectAttrs super {
|
|||
})
|
||||
(addBuildTools (with pkgs.buildPackages; [makeWrapper python3Packages.sphinx]) super.futhark);
|
||||
|
||||
git-annex = let
|
||||
pathForDarwin = pkgs.lib.makeBinPath [ pkgs.coreutils ];
|
||||
in overrideCabal (drv: pkgs.lib.optionalAttrs (!pkgs.stdenv.isLinux) {
|
||||
git-annex = overrideCabal (drv: {
|
||||
# This is an instance of https://github.com/NixOS/nix/pull/1085
|
||||
# Fails with:
|
||||
# gpg: can't connect to the agent: File name too long
|
||||
|
|
@ -545,11 +543,12 @@ self: super: builtins.intersectAttrs super {
|
|||
substituteInPlace Test.hs \
|
||||
--replace ', testCase "crypto" test_crypto' ""
|
||||
'' + (drv.postPatch or "");
|
||||
# On Darwin, git-annex mis-detects options to `cp`, so we wrap the
|
||||
# binary to ensure it uses Nixpkgs' coreutils.
|
||||
# Ensure git-annex uses the exact same coreutils it saw at build-time.
|
||||
# This is especially important on Darwin but also in Linux environments
|
||||
# where non-GNU coreutils are used by default.
|
||||
postFixup = ''
|
||||
wrapProgram $out/bin/git-annex \
|
||||
--prefix PATH : "${pathForDarwin}"
|
||||
--prefix PATH : "${pkgs.lib.makeBinPath (with pkgs; [ coreutils lsof ])}"
|
||||
'' + (drv.postFixup or "");
|
||||
buildTools = [
|
||||
pkgs.buildPackages.makeWrapper
|
||||
|
|
|
|||
804
pkgs/development/haskell-modules/hackage-packages.nix
generated
804
pkgs/development/haskell-modules/hackage-packages.nix
generated
File diff suppressed because it is too large
Load diff
|
|
@ -49,7 +49,36 @@ buildPythonPackage {
|
|||
# ];
|
||||
|
||||
meta = with lib; {
|
||||
broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin;
|
||||
# Adding cmake to nativeBuildInputs and using `dontUseCmakeConfigure = true;`
|
||||
# The following error still happens
|
||||
|
||||
# Compiling arrow2 v0.10.1 (https://github.com/ritchie46/arrow2?branch=polars#da703ae3)
|
||||
# error[E0554]: `#![feature]` may not be used on the stable release channel
|
||||
# --> /build/polars-0.13.19-vendor.tar.gz/arrow2/src/lib.rs:8:39
|
||||
# |
|
||||
# 8 | #![cfg_attr(feature = "simd", feature(portable_simd))]
|
||||
# | ^^^^^^^^^^^^^
|
||||
# error: aborting due to previous error
|
||||
# For more information about this error, try `rustc --explain E0554`.
|
||||
# error: could not compile `arrow2` due to 2 previous errors
|
||||
# warning: build failed, waiting for other jobs to finish...
|
||||
# maturin failed
|
||||
# Caused by: Failed to build a native library through cargo
|
||||
# Caused by: Cargo build finished with "exit status: 101": `cargo rustc --message-format json --manifest-path Cargo.toml -j 8 --frozen --target x86_64-unknown-linux-gnu --release --lib -- -C link-arg=-s`
|
||||
# error: builder for '/nix/store/qfnqi5hs3x4xdb6d4f6rpaf63n1w74yn-python3.10-polars-0.13.19.drv' failed with exit code 1;
|
||||
# last 10 log lines:
|
||||
# > error: aborting due to previous error
|
||||
# >
|
||||
# >
|
||||
# > For more information about this error, try `rustc --explain E0554`.
|
||||
# >
|
||||
# > error: could not compile `arrow2` due to 2 previous errors
|
||||
# > warning: build failed, waiting for other jobs to finish...
|
||||
# > maturin failed
|
||||
# > Caused by: Failed to build a native library through cargo
|
||||
# > Caused by: Cargo build finished with "exit status: 101": `cargo rustc --message-format json --manifest-path Cargo.toml -j 8 --frozen --target x86_64-unknown-linux-gnu --release --lib -- -C link-arg=-s`
|
||||
# For full logs, run 'nix log /nix/store/qfnqi5hs3x4xdb6d4f6rpaf63n1w74yn-python3.10-polars-0.13.19.drv'.
|
||||
broken = true;
|
||||
description = "Fast multi-threaded DataFrame library in Rust | Python | Node.js ";
|
||||
homepage = "https://github.com/pola-rs/polars";
|
||||
license = licenses.asl20;
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
buildDunePackage rec {
|
||||
pname = "ocp-index";
|
||||
version = "1.3.1";
|
||||
version = "1.3.3";
|
||||
|
||||
useDune2 = true;
|
||||
|
||||
|
|
@ -10,7 +10,7 @@ buildDunePackage rec {
|
|||
owner = "OCamlPro";
|
||||
repo = "ocp-index";
|
||||
rev = version;
|
||||
sha256 = "120w72fqymjp6ibicbp31jyx9yv34mdvgkr0zdfpzvfb7lgd8rc7";
|
||||
sha256 = "sha256-ElCXjUR85tkyBLIpIKefDouE1upzJytQnk4xoQt/cb0=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@ let beat = package : extraArgs : buildGoPackage (rec {
|
|||
meta = with lib; {
|
||||
homepage = "https://www.elastic.co/products/beats";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ fadenb basvandijk ];
|
||||
maintainers = with maintainers; [ fadenb basvandijk dfithian ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
} // extraArgs);
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@ let beat = package: extraArgs: buildGoModule (rec {
|
|||
meta = with lib; {
|
||||
homepage = "https://www.elastic.co/products/beats";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ fadenb basvandijk ];
|
||||
maintainers = with maintainers; [ fadenb basvandijk dfithian ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
} // extraArgs);
|
||||
|
|
|
|||
|
|
@ -24,13 +24,13 @@
|
|||
, features ? ([ "sinks" "sources" "transforms" "vrl-cli" ]
|
||||
# the second feature flag is passed to the rdkafka dependency
|
||||
# building on linux fails without this feature flag (both x86_64 and AArch64)
|
||||
++ lib.optionals enableKafka [ "rdkafka?/gssapi-vendored" ]
|
||||
++ lib.optionals enableKafka [ "rdkafka/gssapi-vendored" ]
|
||||
++ lib.optional stdenv.targetPlatform.isUnix "unix")
|
||||
}:
|
||||
|
||||
let
|
||||
pname = "vector";
|
||||
version = "0.23.0";
|
||||
version = "0.22.3";
|
||||
in
|
||||
rustPlatform.buildRustPackage {
|
||||
inherit pname version;
|
||||
|
|
@ -39,10 +39,10 @@ rustPlatform.buildRustPackage {
|
|||
owner = "vectordotdev";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Y1RysuCWvdbqckW54r1uH/K9YTuAZk8T4M3HRGFm0EM=";
|
||||
sha256 = "sha256-62oPttkdahTeMsd9lpd9/tc95kluVJuWxzP94i+gWhA=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-VBmJfRCwSv3t5DPzVj92ajGYk5Ju8xqr4v7IDU17498=";
|
||||
cargoSha256 = "sha256-WWX47pbva7ZmPR6hBstJ5VqOwu3mkhhsHK3LHHqQjDE=";
|
||||
nativeBuildInputs = [ pkg-config cmake perl ];
|
||||
buildInputs = [ oniguruma openssl protobuf rdkafka zstd ]
|
||||
++ lib.optionals stdenv.isDarwin [ Security libiconv coreutils CoreServices ];
|
||||
|
|
|
|||
Loading…
Reference in a new issue