diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-08-08 18:02:47 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-08 18:02:47 +0000 |
| commit | 5bb3f62a528edcf62ae4596a05805572b5e9228b (patch) | |
| tree | 8cc865f9de918eea41e8873957d066b5e6915862 | |
| parent | Merge staging-next-21.05 into staging-21.05 (diff) | |
| parent | Merge release-21.05 into staging-next-21.05 (diff) | |
| download | nixpkgs-5bb3f62a528edcf62ae4596a05805572b5e9228b.tar.gz | |
Merge staging-next-21.05 into staging-21.05
| -rw-r--r-- | nixos/modules/services/databases/victoriametrics.nix | 8 | ||||
| -rw-r--r-- | pkgs/applications/science/electronics/vhd2vl/default.nix | 7 |
2 files changed, 13 insertions, 2 deletions
diff --git a/nixos/modules/services/databases/victoriametrics.nix b/nixos/modules/services/databases/victoriametrics.nix index 5b09115bb2fb..9e2c79e61a39 100644 --- a/nixos/modules/services/databases/victoriametrics.nix +++ b/nixos/modules/services/databases/victoriametrics.nix @@ -53,6 +53,14 @@ let cfg = config.services.victoriametrics; in -retentionPeriod ${toString cfg.retentionPeriod} \ ${lib.escapeShellArgs cfg.extraOptions} ''; + # victoriametrics 1.59 with ~7GB of data seems to eventually panic when merging files and then + # begins restart-looping forever. Set LimitNOFILE= to a large number to work around this issue. + # + # panic: FATAL: unrecoverable error when merging small parts in the partition "/var/lib/victoriametrics/data/small/2021_08": + # cannot open source part for merging: cannot open values file in stream mode: + # cannot open file "/var/lib/victoriametrics/data/small/2021_08/[...]/values.bin": + # open /var/lib/victoriametrics/data/small/2021_08/[...]/values.bin: too many open files + LimitNOFILE = 1048576; }; wantedBy = [ "multi-user.target" ]; diff --git a/pkgs/applications/science/electronics/vhd2vl/default.nix b/pkgs/applications/science/electronics/vhd2vl/default.nix index adce30551071..f0dd990a35bc 100644 --- a/pkgs/applications/science/electronics/vhd2vl/default.nix +++ b/pkgs/applications/science/electronics/vhd2vl/default.nix @@ -4,6 +4,7 @@ , bison , flex , verilog +, which }: stdenv.mkDerivation rec { @@ -29,6 +30,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ bison flex + which ]; buildInputs = [ @@ -36,8 +38,9 @@ stdenv.mkDerivation rec { ]; installPhase = '' - mkdir -p $out/bin - cp src/vhd2vl $out/bin/ + runHook preInstall + install -D -m755 src/vhd2vl $out/bin/vdh2vl + runHook postInstall ''; meta = with lib; { |