diff options
author | Austin Seipp <aseipp@pobox.com> | 2019-12-14 20:26:48 -0600 |
---|---|---|
committer | Austin Seipp <aseipp@pobox.com> | 2019-12-14 20:33:59 -0600 |
commit | 1446f6ca3859e18c0e7a353bf071ffa18e6652ec (patch) | |
tree | ff60bf04448c1d20ba218fe5cd201d44256c2773 /pkgs/tools | |
parent | e87cfa048830b217b1266c3e6677dd3da1fafdaf (diff) | |
download | nixpkgs-1446f6ca3859e18c0e7a353bf071ffa18e6652ec.tar nixpkgs-1446f6ca3859e18c0e7a353bf071ffa18e6652ec.tar.gz nixpkgs-1446f6ca3859e18c0e7a353bf071ffa18e6652ec.tar.bz2 nixpkgs-1446f6ca3859e18c0e7a353bf071ffa18e6652ec.tar.lz nixpkgs-1446f6ca3859e18c0e7a353bf071ffa18e6652ec.tar.xz nixpkgs-1446f6ca3859e18c0e7a353bf071ffa18e6652ec.tar.zst nixpkgs-1446f6ca3859e18c0e7a353bf071ffa18e6652ec.zip |
Revert "vector: make some more options override-able"
See the comments in that commit for more information. This reverts commit b964f4b421ff4406667ee66db177def03a3b2158.
Diffstat (limited to 'pkgs/tools')
-rw-r--r-- | pkgs/tools/misc/vector/default.nix | 25 |
1 files changed, 7 insertions, 18 deletions
diff --git a/pkgs/tools/misc/vector/default.nix b/pkgs/tools/misc/vector/default.nix index b5e34165030..8c5ba4100c6 100644 --- a/pkgs/tools/misc/vector/default.nix +++ b/pkgs/tools/misc/vector/default.nix @@ -6,31 +6,20 @@ (if stdenv.isAarch64 then [ "jemallocator" ] else [ "leveldb" "jemallocator" ]) - -# Unfortunately, buildRustPackage does not really support using overrideAttrs -# on the underlying fields, because it doesn't pass them to stdenv.mkDerivation -# as an attr. making it a parameter is the only way to do so. sigh - -, version ? "0.5.0" - -, srcRef ? { - rev = "refs/tags/v${version}"; - sha256 = "0niyxlvphn3awrpfh1hbqy767cckgjzyjrkqjxj844czxhh1hhff"; - } - -, cargoSha256 ? "0bdgan891hrah54g6aaysqizkxrfsbidnxihai0i7h7knzq9gsk5" -, patches ? [] }: rustPlatform.buildRustPackage rec { pname = "vector"; - inherit version cargoSha256 patches; + version = "0.5.0"; + src = fetchFromGitHub { - owner = "timberio"; - repo = pname; - inherit (srcRef) rev sha256; + owner = "timberio"; + repo = pname; + rev = "refs/tags/v${version}"; + sha256 = "0niyxlvphn3awrpfh1hbqy767cckgjzyjrkqjxj844czxhh1hhff"; }; + cargoSha256 = "0bdgan891hrah54g6aaysqizkxrfsbidnxihai0i7h7knzq9gsk5"; buildInputs = [ openssl pkgconfig protobuf ] ++ stdenv.lib.optional stdenv.isDarwin [ Security libiconv ]; |