tlaternet/tlaternet-webserver
1
0
Fork 0
Code Issues5 Pull requests Releases Wiki Activity

treewide: Update and adapt to new dream2nix project.toml

Browse source
This commit is contained in:
Tristan Daniël Maat 2023-01-05 02:13:13 +00:00
parent f034fbe7e4
commit b2894e4fef
Signed by: tlater
GPG key ID: 49670FD774E43268
4 changed files with 97 additions and 103 deletions

12
flake.nix
View file

@ -16,15 +16,15 @@
nixpkgs,
dream2nix,
fenix,
}: let
} @ flake-inputs: let
# At the moment, we only deploy to x86_64-linux. Update when we
# care about another platform.
system = "x86_64-linux";
flakeOutputs = import ./nix/packages.nix {inherit nixpkgs dream2nix fenix system;};
flakeOutputs = nixpkgs.lib.callPackageWith flake-inputs (import ./nix/packages.nix) {inherit system;};
in {
packages.${system} = {
server = flakeOutputs.server.packages.${system}.default;
templates = flakeOutputs.templates.packages.${system}.default;
server = flakeOutputs.packages.${system}.tlaternet-webserver;
templates = flakeOutputs.packages.${system}.tlaternet;
};
apps.${system}.default = let
@ -40,7 +40,7 @@
nixosModules.default = import ./nix/module.nix {inherit self system;};
devShells.${system} = {
templates = flakeOutputs.templates.devShells.${system}.default.overrideAttrs (old: {
templates = flakeOutputs.devShells.${system}.default.overrideAttrs (old: {
buildInputs = with nixpkgs.legacyPackages.${system};
[
yj
@ -50,7 +50,7 @@
server = nixpkgs.legacyPackages.${system}.mkShell {
packages = [
(flakeOutputs.server.rust-toolchain.withComponents [
(flakeOutputs.rust-toolchain.withComponents [
"rustc"
"cargo"
"rustfmt"