ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-18 02:05:51 +03:00
Code Issues Projects Releases Wiki Activity

Reapply "openobserve: 0.7.2 -> 0.8.1"

Browse Source 
This reverts commit ac637ef21e.

The original PR (https://github.com/NixOS/nixpkgs/pull/289522) broke the
`pkgs/by-name` check on master,
so it was reverted in https://github.com/NixOS/nixpkgs/pull/289655.

This reapplies the original commits and makes sure that the
`pkgs/by-name` check works by moving it out of `pkgs/by-name`.
This commit is contained in:
Silvan Mosberger 2024-02-18 14:00:17 +01:00
parent f1c0064801
commit f90974b657
4 changed files with 1149 additions and 884 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2005
pkgs/by-name/op/openobserve/Cargo.lock → pkgs/servers/monitoring/openobserve/Cargo.lock generated
View File

File diff suppressed because it is too large Load Diff

0
pkgs/by-name/op/openobserve/build.rs.patch → pkgs/servers/monitoring/openobserve/build.rs.patch
View File

24
pkgs/by-name/op/openobserve/package.nix → pkgs/servers/monitoring/openobserve/default.nix
View File

@ -1,6 +1,7 @@
{ lib
, rustPlatform
, fetchFromGitHub
, fetchpatch
, pkg-config
, protobuf
, bzip2
@ -10,17 +11,17 @@
, zlib
, zstd
, stdenv
, darwin
, apple_sdk
, buildNpmPackage
}:
let
version = "0.7.2";
version = "0.8.1";
src = fetchFromGitHub {
owner = "openobserve";
repo = "openobserve";
rev = "v${version}";
hash = "sha256-BFLQL3msDuurRSFOCbqN0vK4NrTS9M6k1hNwet/9mnw=";
hash = "sha256-J8TuaWjtuR39XA7tizyI+DFkpOaLFweM+/9VImGj8UE=";
};
web = buildNpmPackage {
inherit src version;
@ -28,7 +29,7 @@ let
sourceRoot = "source/web";
npmDepsHash = "sha256-eYrspgejb5VR51wAXdGr+pSXDdGnRyX5cwwopK3Kex8=";
npmDepsHash = "sha256-RNUCR80ewFt9F/VHv7kXLa87h0fz0YBp+9gSOUhtrdU=";
preBuild = ''
# Patch vite config to not open the browser to visualize plugin composition
@ -37,6 +38,7 @@ let
'';
env = {
NODE_OPTIONS = "--max-old-space-size=8192";
# cypress tries to download binaries otherwise
CYPRESS_INSTALL_BINARY = 0;
};
@ -53,8 +55,14 @@ rustPlatform.buildRustPackage {
pname = "openobserve";
inherit version src;
# prevent using git to determine version info during build time
patches = [
(fetchpatch {
name = "fix-test-hash-partition.patch";
url = "https://github.com/openobserve/openobserve/commit/24919333d6b6696f0f9d9aff0a883431481e8fce.patch";
includes = ["src/common/meta/stream.rs"];
hash = "sha256-GB3Pgmp1swJt6ESgKL2eWOZ3jBcsN0r+5Dxasgg50D4=";
})
# prevent using git to determine version info during build time
./build.rs.patch
];
@ -65,7 +73,6 @@ rustPlatform.buildRustPackage {
lockFile = ./Cargo.lock;
outputHashes = {
"enrichment-0.1.0" = "sha256-FDPSCBkx+DPeWwTBz9+ORcbbiSBC2a8tJaay9Pxwz4w=";
"datafusion-33.0.0" = "sha256-RZAgk7up83zxPbmNzdnzB6M0yjjK9MYms+6TpXVDJ1o=";
};
};
@ -81,8 +88,9 @@ rustPlatform.buildRustPackage {
xz
zlib
zstd
] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
] ++ lib.optionals stdenv.isDarwin (with apple_sdk.frameworks; [
CoreFoundation
CoreServices
IOKit
Security
SystemConfiguration
@ -130,7 +138,7 @@ rustPlatform.buildRustPackage {
];
meta = with lib; {
description = "10x easier, 🚀 140x lower storage cost, 🚀 high performance, 🚀 petabyte scale - Elasticsearch/Splunk/Datadog alternative for 🚀 (logs, metrics, traces";
description = "A cloud-native observability platform built specifically for logs, metrics, traces, analytics & realtime user-monitoring";
homepage = "https://github.com/openobserve/openobserve";
license = licenses.asl20;
maintainers = with maintainers; [ happysalada ];

4
pkgs/top-level/all-packages.nix
View File

@ -11467,6 +11467,10 @@ with pkgs;
openfortivpn = callPackage ../tools/networking/openfortivpn { };
openobserve = darwin.apple_sdk_11_0.callPackage ../servers/monitoring/openobserve {
apple_sdk = darwin.apple_sdk_11_0;
};
obexfs = callPackage ../tools/bluetooth/obexfs { };
obexftp = callPackage ../tools/bluetooth/obexftp { };