style: Switch to nixfmt from nixpkgs-fmt
Most of the ecosystem has moved to this formatter, and many people configured their editors to autoformat it with this formatter. Closes: https://git.snix.dev/snix/snix/issues/62 Change-Id: Icf39e7836c91fc2ae49fbe22a40a639105bfb0bd Reviewed-on: https://cl.snix.dev/c/snix/+/30671 Reviewed-by: Florian Klink <flokli@flokli.de> Tested-by: besadii Autosubmit: Ilan Joselevich <personal@ilanjoselevich.com>
This commit is contained in:
parent
3443e6bd08
commit
91d02d8c84
136 changed files with 39952 additions and 11007 deletions
|
|
@ -1,6 +1,7 @@
|
|||
{ depot
|
||||
, pkgs
|
||||
, ...
|
||||
{
|
||||
depot,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
|
||||
let
|
||||
|
|
@ -13,27 +14,33 @@ let
|
|||
'';
|
||||
# clickhouse has a very odd AWS config concept.
|
||||
# Configure it to be a bit more sane.
|
||||
clickhouseLocalFixedAWS = pkgs.runCommand "clickhouse-local-fixed"
|
||||
{
|
||||
nativeBuildInputs = [ pkgs.makeWrapper ];
|
||||
} ''
|
||||
mkdir -p $out/bin
|
||||
makeWrapper ${pkgs.clickhouse}/bin/clickhouse-local $out/bin/clickhouse-local \
|
||||
--append-flags "-C ${clickhouseConfigAWS}"
|
||||
'';
|
||||
clickhouseLocalFixedAWS =
|
||||
pkgs.runCommand "clickhouse-local-fixed"
|
||||
{
|
||||
nativeBuildInputs = [ pkgs.makeWrapper ];
|
||||
}
|
||||
''
|
||||
mkdir -p $out/bin
|
||||
makeWrapper ${pkgs.clickhouse}/bin/clickhouse-local $out/bin/clickhouse-local \
|
||||
--append-flags "-C ${clickhouseConfigAWS}"
|
||||
'';
|
||||
|
||||
in
|
||||
depot.nix.readTree.drvTargets {
|
||||
inherit clickhouseLocalFixedAWS;
|
||||
|
||||
parse-bucket-logs = pkgs.runCommand "archivist-parse-bucket-logs"
|
||||
{
|
||||
nativeBuildInputs = [ pkgs.makeWrapper ];
|
||||
} ''
|
||||
mkdir -p $out/bin
|
||||
makeWrapper ${(pkgs.writers.writeRust "parse-bucket-logs-unwrapped" {} ./parse_bucket_logs.rs)} $out/bin/archivist-parse-bucket-logs \
|
||||
--prefix PATH : ${pkgs.lib.makeBinPath [ clickhouseLocalFixedAWS ]}
|
||||
'';
|
||||
parse-bucket-logs =
|
||||
pkgs.runCommand "archivist-parse-bucket-logs"
|
||||
{
|
||||
nativeBuildInputs = [ pkgs.makeWrapper ];
|
||||
}
|
||||
''
|
||||
mkdir -p $out/bin
|
||||
makeWrapper ${
|
||||
(pkgs.writers.writeRust "parse-bucket-logs-unwrapped" { } ./parse_bucket_logs.rs)
|
||||
} $out/bin/archivist-parse-bucket-logs \
|
||||
--prefix PATH : ${pkgs.lib.makeBinPath [ clickhouseLocalFixedAWS ]}
|
||||
'';
|
||||
|
||||
# A shell, by default pointing us to the archivist SSO profile / account by default.
|
||||
shell = pkgs.mkShell {
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -1,4 +1,9 @@
|
|||
{ pkgs, depot, lib, ... }:
|
||||
{
|
||||
pkgs,
|
||||
depot,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
|
||||
(pkgs.callPackage ./Cargo.nix {
|
||||
defaultCrateOverrides = (depot.snix.utils.defaultCrateOverridesForPkgs pkgs) // {
|
||||
|
|
@ -10,6 +15,7 @@
|
|||
nativeBuildInputs = [ pkgs.protobuf ];
|
||||
};
|
||||
};
|
||||
}).rootCrate.build.overrideAttrs {
|
||||
meta.ci.extraSteps.crate2nix-check = depot.snix.utils.mkCrate2nixCheck ./Cargo.nix;
|
||||
}
|
||||
}).rootCrate.build.overrideAttrs
|
||||
{
|
||||
meta.ci.extraSteps.crate2nix-check = depot.snix.utils.mkCrate2nixCheck ./Cargo.nix;
|
||||
}
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -6,6 +6,7 @@
|
|||
src = depot.snix.utils.filterRustCrateSrc { root = prev.src.origSrc; };
|
||||
};
|
||||
};
|
||||
}).rootCrate.build.overrideAttrs {
|
||||
meta.ci.extraSteps.crate2nix = depot.snix.utils.mkCrate2nixCheck ./Cargo.nix;
|
||||
}
|
||||
}).rootCrate.build.overrideAttrs
|
||||
{
|
||||
meta.ci.extraSteps.crate2nix = depot.snix.utils.mkCrate2nixCheck ./Cargo.nix;
|
||||
}
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -6,6 +6,7 @@
|
|||
src = depot.snix.utils.filterRustCrateSrc { root = prev.src.origSrc; };
|
||||
};
|
||||
};
|
||||
}).rootCrate.build.overrideAttrs {
|
||||
meta.ci.extraSteps.crate2nix = depot.snix.utils.mkCrate2nixCheck ./Cargo.nix;
|
||||
}
|
||||
}).rootCrate.build.overrideAttrs
|
||||
{
|
||||
meta.ci.extraSteps.crate2nix = depot.snix.utils.mkCrate2nixCheck ./Cargo.nix;
|
||||
}
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -1,4 +1,9 @@
|
|||
{ pkgs, lib, depot, ... }:
|
||||
{
|
||||
pkgs,
|
||||
lib,
|
||||
depot,
|
||||
...
|
||||
}:
|
||||
let
|
||||
pkgsCross = pkgs.pkgsCross.wasm32-unknown-none;
|
||||
in
|
||||
|
|
@ -8,25 +13,26 @@ in
|
|||
src = depot.snix.utils.filterRustCrateSrc { root = prev.src.origSrc; };
|
||||
};
|
||||
};
|
||||
}).rootCrate.build.overrideAttrs (oldAttrs: {
|
||||
installPhase = ''
|
||||
${lib.getExe pkgs.wasm-bindgen-cli} \
|
||||
--target web \
|
||||
--out-dir $out \
|
||||
--out-name ${oldAttrs.crateName} \
|
||||
--no-typescript \
|
||||
target/lib/${oldAttrs.crateName}-${oldAttrs.metadata}.wasm
|
||||
}).rootCrate.build.overrideAttrs
|
||||
(oldAttrs: {
|
||||
installPhase = ''
|
||||
${lib.getExe pkgs.wasm-bindgen-cli} \
|
||||
--target web \
|
||||
--out-dir $out \
|
||||
--out-name ${oldAttrs.crateName} \
|
||||
--no-typescript \
|
||||
target/lib/${oldAttrs.crateName}-${oldAttrs.metadata}.wasm
|
||||
|
||||
mv src/*.{html,css} $out
|
||||
'';
|
||||
mv src/*.{html,css} $out
|
||||
'';
|
||||
|
||||
passthru.serve = pkgs.writeShellScriptBin "snixbolt-serve" ''
|
||||
${lib.getExe pkgs.simple-http-server} \
|
||||
--index \
|
||||
--nocache \
|
||||
"$@" \
|
||||
${depot.contrib.snixbolt}
|
||||
'';
|
||||
passthru.serve = pkgs.writeShellScriptBin "snixbolt-serve" ''
|
||||
${lib.getExe pkgs.simple-http-server} \
|
||||
--index \
|
||||
--nocache \
|
||||
"$@" \
|
||||
${depot.contrib.snixbolt}
|
||||
'';
|
||||
|
||||
meta.ci.extraSteps.crate2nix-check = depot.snix.utils.mkCrate2nixCheck ./Cargo.nix;
|
||||
})
|
||||
meta.ci.extraSteps.crate2nix-check = depot.snix.utils.mkCrate2nixCheck ./Cargo.nix;
|
||||
})
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -6,6 +6,7 @@
|
|||
src = depot.snix.utils.filterRustCrateSrc { root = prev.src.origSrc; };
|
||||
};
|
||||
};
|
||||
}).rootCrate.build.overrideAttrs {
|
||||
meta.ci.extraSteps.crate2nix-check = depot.snix.utils.mkCrate2nixCheck ./Cargo.nix;
|
||||
}
|
||||
}).rootCrate.build.overrideAttrs
|
||||
{
|
||||
meta.ci.extraSteps.crate2nix-check = depot.snix.utils.mkCrate2nixCheck ./Cargo.nix;
|
||||
}
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -6,6 +6,7 @@
|
|||
src = depot.snix.utils.filterRustCrateSrc { root = prev.src.origSrc; };
|
||||
};
|
||||
};
|
||||
}).rootCrate.build.overrideAttrs {
|
||||
meta.ci.extraSteps.crate2nix-check = depot.snix.utils.mkCrate2nixCheck ./Cargo.nix;
|
||||
}
|
||||
}).rootCrate.build.overrideAttrs
|
||||
{
|
||||
meta.ci.extraSteps.crate2nix-check = depot.snix.utils.mkCrate2nixCheck ./Cargo.nix;
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue