robin/logsmash
1
0
Fork 0
mirror of https://codeberg.org/icewind/logsmash.git synced 2026-06-03 18:14:11 +02:00
Code Issues Projects Releases 3 Packages Wiki Activity Actions

formatting

Browse source
This commit is contained in:
Robin Appelman 2025-05-26 18:42:12 +02:00
commit 2197181ab4
7 changed files with 132 additions and 126 deletions
Download patch file Download diff file Expand all files Collapse all files

13
nix/data-mod.nix
View file

@ -1,9 +1,8 @@
{ packages
, lib
, writeTextDir
,
}:
let
{
packages,
lib,
writeTextDir,
}: let
inherit (builtins) head attrNames concatStringsSep replaceStrings;
inherit (lib.attrsets) mapAttrsToList;
inherit (lib.lists) flatten last;
@ -35,4 +34,4 @@ let
}
'';
in
writeTextDir "mod.rs" code
writeTextDir "mod.rs" code

60
nix/extracted-logs.nix
View file

@ -1,34 +1,36 @@
{ stdenvNoCC
, logging-extractor
, fetchzip
, name
, version
, url
, major
, sha256
, mode ? "json"
,
}:
let
ext = if mode == "rust" then "rs" else "json";
cleanedMajor = builtins.replaceStrings [ "." ] [ "_" ] major;
{
stdenvNoCC,
logging-extractor,
fetchzip,
name,
version,
url,
major,
sha256,
mode ? "json",
}: let
ext =
if mode == "rust"
then "rs"
else "json";
cleanedMajor = builtins.replaceStrings ["."] ["_"] major;
in
stdenvNoCC.mkDerivation rec {
pname = "extractor-logs-${name}-${cleanedMajor}";
inherit version;
stdenvNoCC.mkDerivation rec {
pname = "extractor-logs-${name}-${cleanedMajor}";
inherit version;
src = fetchzip {
inherit url sha256;
};
src = fetchzip {
inherit url sha256;
};
nativeBuildInputs = [ logging-extractor ];
nativeBuildInputs = [logging-extractor];
buildPhase = ''
logging-extractor . ${mode} > logs.${ext}
'';
buildPhase = ''
logging-extractor . ${mode} > logs.${ext}
'';
installPhase = ''
mkdir -p $out
cp logs.* $out/${name}_${cleanedMajor}.${ext}
'';
}
installPhase = ''
mkdir -p $out
cp logs.* $out/${name}_${cleanedMajor}.${ext}
'';
}

29
nix/logging-extractor.nix
View file

@ -1,19 +1,18 @@
{ stdenv
, rustPlatform
, lib
,
}:
let
{
stdenv,
rustPlatform,
lib,
}: let
inherit (lib.sources) sourceByRegex;
src = sourceByRegex ../logging-extractor [ "Cargo.*" "(src|tests|test-data)(/.*)?" ];
src = sourceByRegex ../logging-extractor ["Cargo.*" "(src|tests|test-data)(/.*)?"];
in
rustPlatform.buildRustPackage rec {
pname = "logging-extractor";
version = "0.1.0";
rustPlatform.buildRustPackage rec {
pname = "logging-extractor";
version = "0.1.0";
inherit src;
inherit src;
cargoLock = {
lockFile = ../logging-extractor/Cargo.lock;
};
}
cargoLock = {
lockFile = ../logging-extractor/Cargo.lock;
};
}

39
nix/logsmash.nix
View file

@ -1,29 +1,28 @@
{ stdenv
, makeRustPlatform
, rust-bin
, lib
, extracted-logs-rust
,
}:
let
{
stdenv,
makeRustPlatform,
rust-bin,
lib,
extracted-logs-rust,
}: let
inherit (lib) sourceByRegex readFile;
src = sourceByRegex ../. [ "Cargo.*" "(src|data)(/.*)?" ];
src = sourceByRegex ../. ["Cargo.*" "(src|data)(/.*)?"];
rustPlatform = makeRustPlatform {
cargo = rust-bin.stable.latest.default;
rustc = rust-bin.stable.latest.default;
};
version = (fromTOML (readFile ../Cargo.toml)).package.version;
in
rustPlatform.buildRustPackage rec {
pname = "logsmash";
inherit version src;
rustPlatform.buildRustPackage rec {
pname = "logsmash";
inherit version src;
preBuild = ''
rm -r data/src/data
cp -r ${extracted-logs-rust} data/src/data
'';
preBuild = ''
rm -r data/src/data
cp -r ${extracted-logs-rust} data/src/data
'';
cargoLock = {
lockFile = ../Cargo.lock;
};
}
cargoLock = {
lockFile = ../Cargo.lock;
};
}

14
nix/overlay.nix
View file

@ -1,5 +1,4 @@
final: prev:
let
final: prev: let
inherit (builtins) mapAttrs attrValues map tail;
inherit (prev) symlinkJoin;
inherit (prev.lib) importJSON;
@ -16,19 +15,18 @@ let
inherit (data) url sha256 version;
inherit name major mode;
}));
in
{
logging-extractor = final.callPackage ./logging-extractor.nix { };
in {
logging-extractor = final.callPackage ./logging-extractor.nix {};
extracted-logs-parts = mapAttrs (loggingFor "json") packages;
extracted-logs-parts-rust = mapAttrs (loggingFor "rust") packages;
extracted-logs-rust-mod = final.callPackage ./data-mod.nix { inherit packages; };
extracted-logs-rust-mod = final.callPackage ./data-mod.nix {inherit packages;};
extracted-logs = symlinkJoin {
name = "extracted-logs";
paths = flatten (map attrValues (attrValues final.extracted-logs-parts));
};
extracted-logs-rust = symlinkJoin {
name = "extracted-logs";
paths = (flatten (map attrValues (attrValues final.extracted-logs-parts-rust))) ++ [ final.extracted-logs-rust-mod ];
paths = (flatten (map attrValues (attrValues final.extracted-logs-parts-rust))) ++ [final.extracted-logs-rust-mod];
};
logsmash = final.callPackage ./logsmash.nix { };
logsmash = final.callPackage ./logsmash.nix {};
}