diff options
author | Martin Weinelt <hexa@darmstadt.ccc.de> | 2022-12-04 22:06:42 +0100 |
---|---|---|
committer | Martin Weinelt <hexa@darmstadt.ccc.de> | 2022-12-04 22:06:42 +0100 |
commit | fe8eef1ae448bf3631c9e5be919c8456da35a006 (patch) | |
tree | 6a17c6d6d327504716b74f247362092c35d6e1cb /pkgs/tools/misc | |
parent | 21835cba160d694e75d8ce7cac56b267b36aeb3d (diff) | |
parent | c94cdd0978d707c08ffdfba54e682a8b553263e1 (diff) |
Merge remote-tracking branch 'origin/master' into staging-next
Diffstat (limited to 'pkgs/tools/misc')
-rw-r--r-- | pkgs/tools/misc/3mux/default.nix | 12 | ||||
-rw-r--r-- | pkgs/tools/misc/aaa/default.nix | 24 | ||||
-rw-r--r-- | pkgs/tools/misc/android-tools/default.nix | 7 | ||||
-rw-r--r-- | pkgs/tools/misc/antimicrox/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/misc/git-fire/default.nix | 31 | ||||
-rw-r--r-- | pkgs/tools/misc/git-town/default.nix | 77 | ||||
-rw-r--r-- | pkgs/tools/misc/gitlint/default.nix | 50 | ||||
-rw-r--r-- | pkgs/tools/misc/hyfetch/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/misc/opentimestamps-client/default.nix | 5 | ||||
-rw-r--r-- | pkgs/tools/misc/perccli/default.nix | 42 | ||||
-rw-r--r-- | pkgs/tools/misc/skim/default.nix | 18 | ||||
-rw-r--r-- | pkgs/tools/misc/storcli/default.nix | 45 | ||||
-rw-r--r-- | pkgs/tools/misc/svtplay-dl/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/misc/time-decode/default.nix | 10 | ||||
-rw-r--r-- | pkgs/tools/misc/vector/default.nix | 8 |
15 files changed, 129 insertions, 212 deletions
diff --git a/pkgs/tools/misc/3mux/default.nix b/pkgs/tools/misc/3mux/default.nix index 31787467525fb..9ec4572328e7e 100644 --- a/pkgs/tools/misc/3mux/default.nix +++ b/pkgs/tools/misc/3mux/default.nix @@ -12,18 +12,24 @@ buildGoModule rec { }; patches = [ + # Needed so that the subsequent patch applies. + (fetchpatch { + name = "use-shorter-uuids.patch"; + url = "https://github.com/aaronjanse/3mux/commit/6dd36694586f96e3c82ef7db1a0e7917ceb05794.patch"; + hash = "sha256-FnFupOIIQi66mvjshn3EQ6XRzC4cLx3vGTeTUM1HOwM="; + }) # Fix the build for Darwin when building with Go 1.18. # https://github.com/aaronjanse/3mux/pull/127 (fetchpatch { name = "darwin-go-1.18-fix.patch"; - url = "https://github.com/aaronjanse/3mux/commit/91aed826c50f75a5175b63c72a1fb6a4ad57a008.patch"; - sha256 = "sha256-MOPAyWAYYWrlCCgw1rBaNmHZO9oTIpIQwLJcs0aY/m8="; + url = "https://github.com/aaronjanse/3mux/commit/f2c26c1037927896d6e9a17ea038f8260620fbd4.patch"; + hash = "sha256-RC3p30r0PGUKrxo8uOLL02oyfLqLfhNjBYy6E+OQ2f0="; }) ]; nativeBuildInputs = [ makeWrapper ]; - vendorSha256 = "sha256-qt8MYnvbZMuU1VwdSij6+x4N0r10c1R5Gcm+jDt76uc="; + vendorHash = "sha256-KMcl6mj+cEgvdZMzBxUtGJsgwPdFuXrY3yjmkB3CS4o="; # This is a package used for internally testing 3mux. It's meant for # use by 3mux maintainers/contributors only. diff --git a/pkgs/tools/misc/aaa/default.nix b/pkgs/tools/misc/aaa/default.nix new file mode 100644 index 0000000000000..01b01c7a7f7fc --- /dev/null +++ b/pkgs/tools/misc/aaa/default.nix @@ -0,0 +1,24 @@ +{ lib +, rustPlatform +, fetchFromGitHub +}: + +rustPlatform.buildRustPackage rec { + pname = "aaa"; + version = "1.1.1"; + + src = fetchFromGitHub { + owner = "DomesticMoth"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-gIOlPjZOcmVLi9oOn4gBv6F+3Eq6t5b/3fKzoFqxclw="; + }; + cargoSha256 = "sha256-ugB0r9qiGRurc30GrJH4MKM6fWZ99+f1Gy7/1lSmrwU="; + + meta = with lib; { + description = "Terminal viewer for 3a format"; + homepage = "https://github.com/DomesticMoth/aaa"; + license = with licenses; [ gpl3Only ]; + maintainers = with maintainers; [ DomesticMoth ]; + }; +} diff --git a/pkgs/tools/misc/android-tools/default.nix b/pkgs/tools/misc/android-tools/default.nix index 79b1cf7521db7..f8ab129f789b2 100644 --- a/pkgs/tools/misc/android-tools/default.nix +++ b/pkgs/tools/misc/android-tools/default.nix @@ -35,10 +35,6 @@ stdenv.mkDerivation rec { export GOCACHE=$TMPDIR/go-cache ''; - postInstall = '' - install -Dm755 ../vendor/avb/avbtool.py -t $out/bin - ''; - meta = with lib; { description = "Android SDK platform tools"; longDescription = '' @@ -53,7 +49,8 @@ stdenv.mkDerivation rec { - mke2fs.android (required by fastboot) - simg2img, img2simg, append2simg - lpdump, lpmake, lpadd, lpflash, lpunpack - - mkbootimg, unpack_bootimg, repack_bootimg + - mkbootimg, unpack_bootimg, repack_bootimg, avbtool + - mkdtboimg ''; # https://developer.android.com/studio/command-line#tools-platform # https://developer.android.com/studio/releases/platform-tools diff --git a/pkgs/tools/misc/antimicrox/default.nix b/pkgs/tools/misc/antimicrox/default.nix index ef99986cf04a9..5c7c488af8522 100644 --- a/pkgs/tools/misc/antimicrox/default.nix +++ b/pkgs/tools/misc/antimicrox/default.nix @@ -12,13 +12,13 @@ mkDerivation rec { pname = "antimicrox"; - version = "3.3.1"; + version = "3.3.2"; src = fetchFromGitHub { owner = "AntiMicroX"; repo = pname; rev = version; - sha256 = "sha256-2dCLU+8HR052RfccomOKyyomqaqdPBeq5BxbYtDnlMA="; + sha256 = "sha256-qp9K0lF7joFhfepncUoHvekMS+fZcPaBrsWY2DKmIUs="; }; nativeBuildInputs = [ cmake extra-cmake-modules pkg-config itstool ]; diff --git a/pkgs/tools/misc/git-fire/default.nix b/pkgs/tools/misc/git-fire/default.nix deleted file mode 100644 index bc7e9f4840b71..0000000000000 --- a/pkgs/tools/misc/git-fire/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ lib, stdenv, fetchFromGitHub }: - -stdenv.mkDerivation { - pname = "git-fire"; - version = "unstable-2017-08-27"; - - src = fetchFromGitHub { - owner = "qw3rtman"; - repo = "git-fire"; - rev = "d72b68ed356f726c77c60294f9220275f16c9931"; - sha256 = "1hdwkhyjjx31y0lpjkhbb4f5y9f7g70fnd4c2246cmk2rbsvj5b2"; - }; - - installPhase = '' - install -D -m755 $src/git-fire $out/bin/git-fire - ''; - - meta = with lib; { - description = '' - Push ALL changes in a git repository - ''; - longDescription = '' - In the event of an emergency (fire, etc.), automatically commit all changes/files in a repository, pushing to all known remotes all commits and stashes. - ''; - homepage = "https://github.com/qw3rtman/git-fire"; - license = licenses.mit; - platforms = platforms.all; - maintainers = with maintainers; [ swflint ]; - mainProgram = "git-fire"; - }; -} diff --git a/pkgs/tools/misc/git-town/default.nix b/pkgs/tools/misc/git-town/default.nix deleted file mode 100644 index abca61358d99b..0000000000000 --- a/pkgs/tools/misc/git-town/default.nix +++ /dev/null @@ -1,77 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub, fetchpatch, installShellFiles, git, testers, git-town, makeWrapper }: - -buildGoModule rec { - pname = "git-town"; - version = "7.8.0"; - - src = fetchFromGitHub { - owner = "git-town"; - repo = "git-town"; - rev = "v${version}"; - sha256 = "sha256-g9ooMIMN8DN2FcWYkDC1hICCleQYdHf30PYMCit/NMI="; - }; - - patches = [ - # Fix "go vet" when building using Go 1.18. - (fetchpatch { - name = "fix-go-vet-in-go-1.18.patch"; - url = "https://github.com/git-town/git-town/commit/23eb0aca7b28c6a0afc21db553aa0e35d35891aa.patch"; - sha256 = "sha256-EyfhKVrQxRJNrYqaZI04dJogaXs1J+bbOIu7p8g2Clc="; - }) - ]; - - vendorSha256 = null; - - nativeBuildInputs = [ installShellFiles makeWrapper ]; - - buildInputs = [ git ]; - - ldflags = - let - modulePath = "github.com/git-town/git-town/v${lib.versions.major version}"; in - [ - "-s" - "-w" - "-X ${modulePath}/src/cmd.version=v${version}" - "-X ${modulePath}/src/cmd.buildDate=nix" - ]; - - checkInputs = [ git ]; - preCheck = - let - skippedTests = [ - "TestGodog" - "TestRunner_CreateChildFeatureBranch" - "TestShellRunner_RunStringWith_Dir" - "TestMockingShell_MockCommand" - "TestShellRunner_RunStringWith_Input" - ]; - in - '' - HOME=$(mktemp -d) - # Disable tests requiring local operations - buildFlagsArray+=("-run" "[^(${builtins.concatStringsSep "|" skippedTests})]") - ''; - - postInstall = '' - installShellCompletion --cmd git-town \ - --bash <($out/bin/git-town completion bash) \ - --fish <($out/bin/git-town completion fish) \ - --zsh <($out/bin/git-town completion zsh) - - wrapProgram $out/bin/git-town --prefix PATH : ${lib.makeBinPath [ git ]} - ''; - - passthru.tests.version = testers.testVersion { - package = git-town; - command = "git-town version"; - version = "v${version}"; - }; - - meta = with lib; { - description = "Generic, high-level git support for git-flow workflows"; - homepage = "https://www.git-town.com/"; - license = licenses.mit; - maintainers = with maintainers; [ allonsy blaggacao ]; - }; -} diff --git a/pkgs/tools/misc/gitlint/default.nix b/pkgs/tools/misc/gitlint/default.nix deleted file mode 100644 index 626739864c713..0000000000000 --- a/pkgs/tools/misc/gitlint/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ lib -, buildPythonApplication -, fetchFromGitHub -, gitMinimal -, python3 -}: - -python3.pkgs.buildPythonApplication rec { - pname = "gitlint"; - version = "0.18.0"; - - src = fetchFromGitHub { - owner = "jorisroovers"; - repo = "gitlint"; - rev = "v${version}"; - sha256 = "sha256-MmXzrooN+C9MUaAz4+IEGkGJWHbgvPMSLHgssM0wyN8="; - }; - - # Upstream splitted the project into gitlint and gitlint-core to - # simplify the dependency handling - sourceRoot = "source/gitlint-core"; - - propagatedBuildInputs = with python3.pkgs; [ - arrow - click - sh - ]; - - checkInputs = with python3.pkgs; [ - gitMinimal - pytestCheckHook - ]; - - postPatch = '' - # We don't need gitlint-core - substituteInPlace setup.py \ - --replace "'gitlint-core[trusted-deps]==' + version," "" - ''; - - pythonImportsCheck = [ - "gitlint" - ]; - - meta = with lib; { - description = "Linting for your git commit messages"; - homepage = "https://jorisroovers.com/gitlint/"; - license = licenses.mit; - maintainers = with maintainers; [ ethancedwards8 fab ]; - }; -} diff --git a/pkgs/tools/misc/hyfetch/default.nix b/pkgs/tools/misc/hyfetch/default.nix index adbe7b4adf344..73e630ca23355 100644 --- a/pkgs/tools/misc/hyfetch/default.nix +++ b/pkgs/tools/misc/hyfetch/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "hyfetch"; - version = "1.4.3"; + version = "1.4.4"; format = "setuptools"; src = fetchFromGitHub { owner = "hykilpikonna"; repo = "hyfetch"; rev = "refs/tags/${version}"; - hash = "sha256-ScdcV1ojtVz/OdR7k+y7Wj4VAne++8LY9Vz+wO3CJGI="; + hash = "sha256-wTTvA+/iyDYcgcM1Zg0KcqAwUJgxAWqZVdylF2/+Wn0="; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/tools/misc/opentimestamps-client/default.nix b/pkgs/tools/misc/opentimestamps-client/default.nix index 939e5c8c72fae..6c17cf62a6401 100644 --- a/pkgs/tools/misc/opentimestamps-client/default.nix +++ b/pkgs/tools/misc/opentimestamps-client/default.nix @@ -18,9 +18,10 @@ buildPythonApplication rec { propagatedBuildInputs = [ opentimestamps appdirs GitPython pysocks ]; - meta = { + meta = with lib; { description = "Command-line tool to create and verify OpenTimestamps proofs"; homepage = "https://github.com/opentimestamps/opentimestamps-client"; - license = lib.licenses.lgpl3; + license = licenses.lgpl3; + maintainers = with maintainers; [ erikarvstedt ]; }; } diff --git a/pkgs/tools/misc/perccli/default.nix b/pkgs/tools/misc/perccli/default.nix index 517fffead5334..aca382d504621 100644 --- a/pkgs/tools/misc/perccli/default.nix +++ b/pkgs/tools/misc/perccli/default.nix @@ -1,15 +1,18 @@ { lib , stdenvNoCC -, fetchurl +, fetchzip , rpmextract }: + stdenvNoCC.mkDerivation rec { pname = "perccli"; - version = "7.1910.00"; + version = "7.2110.00"; + + src = fetchzip { + # On pkg update: manually adjust the version in the URL because of the different format. + url = "https://dl.dell.com/FOLDER09074160M/1/PERCCLI_7.211.0_Linux.tar.gz"; + sha256 = "sha256-8gk+0CrgeisfN2hNpaO1oFey57y7KuNy2i6PWTikDls="; - src = fetchurl { - url = "https://dl.dell.com/FOLDER07815522M/1/PERCCLI_${version}_A12_Linux.tar.gz"; - sha256 = "sha256-Gt/kr5schR/IzFmnhXO57gjZpOJ9NSnPX/Sj7zo8Qjk="; # Dell seems to block "uncommon" user-agents, such as Nixpkgs's custom one. # Sending no user-agent at all seems to be fine though. curlOptsList = [ "--user-agent" "" ]; @@ -17,21 +20,32 @@ stdenvNoCC.mkDerivation rec { nativeBuildInputs = [ rpmextract ]; - buildCommand = '' - tar xf $src - rpmextract PERCCLI_*_Linux/perccli-*.noarch.rpm - install -D ./opt/MegaRAID/perccli/perccli64 $out/bin/perccli64 - ln -s perccli64 $out/bin/perccli - - # Not needed because the binary is statically linked - #eval fixupPhase + unpackPhase = '' + rpmextract $src/perccli-00${version}00.0000-1.noarch.rpm ''; + dontPatch = true; + dontConfigure = true; + dontBuild = true; + + installPhase = let + inherit (stdenvNoCC.hostPlatform) system; + platforms = { + x86_64-linux = '' + install -D ./opt/MegaRAID/perccli/perccli64 $out/bin/perccli64 + ln -s perccli64 $out/bin/perccli + ''; + }; + in platforms.${system} or (throw "unsupported system: ${system}"); + + # Not needed because the binary is statically linked + dontFixup = true; + meta = with lib; { description = "Perccli Support for PERC RAID controllers"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; maintainers = with maintainers; [ panicgh ]; - platforms = with platforms; intersectLists x86_64 linux; + platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/tools/misc/skim/default.nix b/pkgs/tools/misc/skim/default.nix index 919099e8e41fa..3a999bb0e2013 100644 --- a/pkgs/tools/misc/skim/default.nix +++ b/pkgs/tools/misc/skim/default.nix @@ -1,4 +1,9 @@ -{ lib, stdenv, fetchCrate, rustPlatform }: +{ lib +, stdenv +, fetchCrate +, rustPlatform +, installShellFiles +}: rustPlatform.buildRustPackage rec { pname = "skim"; @@ -9,6 +14,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-LkPkwYsaSLfaZktHF23Fgaks+fDlbB1S6SRgXtJRBqQ="; }; + nativeBuildInputs = [ installShellFiles ]; + outputs = [ "out" "vim" ]; cargoSha256 = "sha256-lG26dgvjqCZ/4KgzurMrlhl+JKec+xLt/5uA6XcsSPk="; @@ -19,10 +26,15 @@ rustPlatform.buildRustPackage rec { postInstall = '' install -D -m 555 bin/sk-tmux -t $out/bin - install -D -m 644 man/man1/* -t $out/man/man1 - install -D -m 444 shell/* -t $out/share/skim + install -D -m 444 plugin/skim.vim -t $vim/plugin + install -D -m 444 shell/* -t $out/share/skim + install -D shell/key-bindings.fish $out/share/fish/vendor_functions.d/sk_key_bindings.fish + mkdir -p $out/share/fish/vendor_conf.d + echo sk_key_bindings > $out/share/fish/vendor_conf.d/load-sk-key-bindings.fish + installManPage man/man1/* + cat <<SCRIPT > $out/bin/sk-share #! ${stdenv.shell} # Run this script to find the skim shared folder where all the shell diff --git a/pkgs/tools/misc/storcli/default.nix b/pkgs/tools/misc/storcli/default.nix index 03300f46f8c04..e5f01b6926c26 100644 --- a/pkgs/tools/misc/storcli/default.nix +++ b/pkgs/tools/misc/storcli/default.nix @@ -1,35 +1,52 @@ { lib , stdenvNoCC -, fetchurl +, fetchzip , rpmextract -, unzip }: + stdenvNoCC.mkDerivation rec { pname = "storcli"; - version = "7.2106.00"; + version = "7.2309.00"; - src = fetchurl { - url = "https://docs.broadcom.com/docs-and-downloads/raid-controllers/raid-controllers-common-files/00${version}00.0000_Unified_StorCLI.zip"; - sha256 = "sha256-sRMpNXCdcysliVQwRE/1yAeU/cp+y0f2F8BPiWyotxQ="; + src = fetchzip { + url = "https://docs.broadcom.com/docs-and-downloads/raid-controllers/raid-controllers-common-files/Unified_storcli_all_os_${version}00.0000.zip"; + sha256 = "sha256-n2MzT2LHLHWMWhshWXJ/Q28w9EnLrW6t7hLNveltxLo="; }; - nativeBuildInputs = [ rpmextract unzip ]; + nativeBuildInputs = [ rpmextract ]; + + unpackPhase = let + inherit (stdenvNoCC.hostPlatform) system; + platforms = { + x86_64-linux = "Linux"; + aarch64-linux = "ARM/Linux"; + }; + platform = platforms.${system} or (throw "unsupported system: ${system}"); + in '' + rpmextract $src/${platform}/storcli-00${version}00.0000-1.*.rpm + ''; + + dontPatch = true; + dontConfigure = true; + dontBuild = true; - buildCommand = '' - unzip $src - rpmextract Unified_storcli_all_os/Linux/storcli-*.noarch.rpm + installPhase = '' install -D ./opt/MegaRAID/storcli/storcli64 $out/bin/storcli64 ln -s storcli64 $out/bin/storcli - - # Not needed because the binary is statically linked - #eval fixupPhase ''; + # Not needed because the binary is statically linked + dontFixup = true; + meta = with lib; { + # Unfortunately there is no better page for this. + # Filter for downloads, set 100 items per page. Sort by newest does not work. + # Then search manually for the latest version. + homepage = "https://www.broadcom.com/site-search?q=storcli"; description = "Storage Command Line Tool"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; maintainers = with maintainers; [ panicgh ]; - platforms = with platforms; intersectLists x86_64 linux; + platforms = [ "x86_64-linux" "aarch64-linux" ]; }; } diff --git a/pkgs/tools/misc/svtplay-dl/default.nix b/pkgs/tools/misc/svtplay-dl/default.nix index 18a8352d9e71b..1711ef522c1cf 100644 --- a/pkgs/tools/misc/svtplay-dl/default.nix +++ b/pkgs/tools/misc/svtplay-dl/default.nix @@ -15,7 +15,7 @@ let python pytest nose cryptography pyyaml requests mock requests-mock python-dateutil setuptools; - version = "4.15"; + version = "4.17"; in @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { owner = "spaam"; repo = "svtplay-dl"; rev = version; - hash = "sha256-l8cdJWJbIAkp1RRfq1Q5ugJKinIwudd2Ke6esK/hNjc="; + hash = "sha256-1LkWkila0EG3FfjhTohsirpQ/9wXp5IdoTxliRvT4YU="; }; pythonPaths = [ cryptography pyyaml requests ]; diff --git a/pkgs/tools/misc/time-decode/default.nix b/pkgs/tools/misc/time-decode/default.nix index 28fcaea73e7a3..03b2e04dffe8d 100644 --- a/pkgs/tools/misc/time-decode/default.nix +++ b/pkgs/tools/misc/time-decode/default.nix @@ -5,13 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "time-decode"; - version = "4.1.2"; + version = "4.2.0"; + format = "setuptools"; src = fetchFromGitHub { owner = "digitalsleuth"; repo = "time_decode"; rev = "refs/tags/v${version}"; - sha256 = "sha256-79TReAEHvLldp0n3jTvws3mFE/1O1h6TocjMHrurwt4="; + hash = "sha256-6OSa8tOTAzQbi5aYPDJotWApeh8E3wi4V7RN16Go/E4="; }; propagatedBuildInputs = with python3.pkgs; [ @@ -22,11 +23,14 @@ python3.pkgs.buildPythonApplication rec { # Project has no tests doCheck = false; - pythonImportsCheck = [ "time_decode" ]; + pythonImportsCheck = [ + "time_decode" + ]; meta = with lib; { description = "Timestamp and date decoder"; homepage = "https://github.com/digitalsleuth/time_decode"; + changelog = "https://github.com/digitalsleuth/time_decode/releases/tag/v${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/tools/misc/vector/default.nix b/pkgs/tools/misc/vector/default.nix index af53417640ff3..257f036ed0ea8 100644 --- a/pkgs/tools/misc/vector/default.nix +++ b/pkgs/tools/misc/vector/default.nix @@ -23,7 +23,7 @@ # TODO investigate adding "vrl-cli" and various "vendor-*" # "disk-buffer" is using leveldb TODO: investigate how useful # it would be, perhaps only for massive scale? -, features ? ([ "api" "api-client" "sinks" "sources" "transforms" "vrl-cli" ] +, features ? ([ "api" "api-client" "enrichment-tables" "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" ] @@ -32,7 +32,7 @@ let pname = "vector"; - version = "0.25.1"; + version = "0.25.2"; in rustPlatform.buildRustPackage { inherit pname version; @@ -41,10 +41,10 @@ rustPlatform.buildRustPackage { owner = "vectordotdev"; repo = pname; rev = "v${version}"; - hash = "sha256-7iYiSO966o0M9M0ijGCpuRVRgus+tURLBN9S5lPDRb8="; + hash = "sha256-gkhVabfAV250zofss7b/3ulb09Wk5EMGz9GSaS5eCzA="; }; - cargoHash = "sha256-EqK6r/pFFKmnpPPUhqdC3bztYQZ+2w7u7V8Rj+9oWII="; + cargoHash = "sha256-zxwwXFCdcbB+Kx2SNyAIDsII6SN5+QHJQlzOUx+us2o="; nativeBuildInputs = [ pkg-config cmake perl ]; buildInputs = [ oniguruma openssl protobuf rdkafka zstd ] ++ lib.optionals stdenv.isDarwin [ Security libiconv coreutils CoreServices ]; |