Compare commits

...

No commits in common. "930a3007e0a252c747dc53108a062eb5c49de080" and "cb7785a2b45d5aebf40ec55f0acd82751074399d" have entirely different histories.

1 changed files with 74 additions and 79 deletions

153
flake.nix
View File

@ -10,97 +10,92 @@
naersk.inputs.nixpkgs.follows = "nixpkgs"; naersk.inputs.nixpkgs.follows = "nixpkgs";
}; };
outputs = { self, nixpkgs, rust-overlay, flake-utils, naersk }: flake-utils.lib.eachDefaultSystem (system: let outputs = { self, nixpkgs, rust-overlay, flake-utils, naersk }: flake-utils.lib.eachDefaultSystem (system:
overlays = [ let
rust-overlay.overlay overlays = [
(final: prev: { rust-overlay.overlay
rustc = final.rust-bin.nightly.latest.default.override { targets = [ "wasm32-unknown-unknown" ]; }; (final: prev: {
cargo = final.rust-bin.nightly.latest.default.override { targets = [ "wasm32-unknown-unknown" ]; }; rustc = final.rust-bin.nightly.latest.default.override { targets = [ "wasm32-unknown-unknown" ]; };
}) cargo = final.rust-bin.nightly.latest.default.override { targets = [ "wasm32-unknown-unknown" ]; };
]; })
pkgs = import nixpkgs { inherit system overlays; }; ];
naerskLib = pkgs.callPackage naersk { }; pkgs = import nixpkgs { inherit system overlays; };
in naerskLib = pkgs.callPackage naersk { };
rec { in
packages = { rec {
backend = naerskLib.buildPackage { packages = {
src = ./backend; backend = naerskLib.buildPackage {
src = ./backend;
nativeBuildInputs = with pkgs; [ nativeBuildInputs = with pkgs; [
wasm-bindgen-cli wasm-bindgen-cli
wasm-pack wasm-pack
]; ];
overrideMain = (o: o // { overrideMain = (o: o // {
buildPhase = '' buildPhase = ''
runHook preBuild runHook preBuild
wasm-pack build --target web --release --mode no-install -- --offline wasm-pack build --target web --release --mode no-install -- --offline
runHook postBuild runHook postBuild
''; '';
installPhase = ''
runHook preInstall
cp -r pkg $out
runHook postInstall
'';
});
};
frontend = pkgs.stdenvNoCC.mkDerivation {
name = "password-hash-self-service";
src = self;
dontBuild = true;
installPhase = '' installPhase = ''
runHook preInstall runHook preInstall
cp -r pkg $out
mkdir $out
cp \
index.html \
style.css \
app.js \
$out
mkdir $out/backend
ln -s ${packages.backend} $out/backend/pkg
runHook postInstall runHook postInstall
''; '';
}); };
}; };
frontend = pkgs.stdenvNoCC.mkDerivation { defaultPackage = packages.frontend;
name = "password-hash-self-service";
src = self; devShell = pkgs.mkShell {
buildInputs = with pkgs; [
dontBuild = true; wasm-pack
(rust-bin.nightly.latest.default.override { targets = [ "wasm32-unknown-unknown" ]; })
installPhase = '' ];
runHook preInstall
mkdir $out
cp \
index.html \
style.css \
app.js \
$out
mkdir $out/backend
ln -s ${packages.backend} $out/backend/pkg
runHook postInstall
'';
}; };
};
defaultPackage = packages.frontend; apps = {
serve = {
devShell = pkgs.mkShell { type = "app";
buildInputs = with pkgs; [ program = toString (pkgs.writeShellScript "serve" ''
wasm-pack ${pkgs.python3}/bin/python3 -m http.server
(rust-bin.nightly.latest.default.override { targets = [ "wasm32-unknown-unknown" ]; }) '');
]; };
};
apps = {
serve = {
type = "app";
program = toString (pkgs.writeShellScript "serve" ''
${pkgs.python3}/bin/python3 -m http.server
'');
}; };
};
hydraJobs = hydraJobs =
if pkgs.lib.elem system [ "x86_64-linux" ] if pkgs.lib.elem system [ "x86_64-linux" ]
then { then {
backend = packages.backend; backend = packages.backend;
frontend = packages.frontend; frontend = packages.frontend;
hydra-product = pkgs.runCommandNoCC "hydra-product" { } '' }
cp -rs ${defaultPackage} $out else { };
chmod +w $out });
mkdir -p $out/nix-support
echo "doc app $out/index.html" >> $out/nix-support/hydra-build-products
'';
}
else { };
});
} }