cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Revert "openobserve: 0.7.2 -> 0.8.1"

Browse source 
This reverts commit a8a7369c36
This reverts commit 8979c17031
This commit is contained in:
adisbladis 2024-02-18 16:56:09 +13:00
parent 573cead3dd
commit ac637ef21e
3 changed files with 879 additions and 1142 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1995
pkgs/by-name/op/openobserve/Cargo.lock generated
View file

File diff suppressed because it is too large Load diff

24
pkgs/by-name/op/openobserve/package.nix
View file

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

2
pkgs/top-level/all-packages.nix
View file

@ -11467,8 +11467,6 @@ with pkgs;
openfortivpn = callPackage ../tools/networking/openfortivpn { }; openfortivpn = callPackage ../tools/networking/openfortivpn { };
openobserve = darwin.apple_sdk_11_0.callPackage ../by-name/op/openobserve/package.nix { apple_sdk = darwin.apple_sdk_11_0; };
obexfs = callPackage ../tools/bluetooth/obexfs { }; obexfs = callPackage ../tools/bluetooth/obexfs { };
obexftp = callPackage ../tools/bluetooth/obexftp { }; obexftp = callPackage ../tools/bluetooth/obexftp { };