From 8fae6f6241b172d756ead7247b9a5f071ae29dae Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Wed, 17 Jul 2024 20:17:50 +0100 Subject: [PATCH] Update build configuration files --- flake.nix | 31 ++++++++++++------------------- 1 file changed, 12 insertions(+), 19 deletions(-) diff --git a/flake.nix b/flake.nix index 65cbe052..b2bf3657 100644 --- a/flake.nix +++ b/flake.nix @@ -1,26 +1,19 @@ # Do not edit this file. It is automatically generated by https://www.oliverdavies.uk/build-configs. - { - inputs = { - devshell.url = "github:numtide/devshell"; - nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; - }; + description = "A Nix Flake for oliverdavies-uk"; - outputs = inputs@{ flake-parts, ... }: - flake-parts.lib.mkFlake { inherit inputs; } { - imports = [ inputs.devshell.flakeModule ]; + inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; - systems = [ "x86_64-linux" ]; + outputs = { nixpkgs, ... }: + let + system = "x86_64-linux"; + pkgs = nixpkgs.legacyPackages.${system}; - perSystem = { config, self', inputs', pkgs, system, ... }: { - devshells.default = { - packages = with pkgs; [ - "nodePackages.pnpm" - "nodejs" - "php82" - "php82Packages.composer" - ]; - }; - }; + inherit (pkgs) mkShell; + in { + devShells.${system}.default = + mkShell { buildInputs = with pkgs; [ nodePackages.pnpm nodejs php82 php82Packages.composer ]; }; + + formatter.${system} = pkgs.nixfmt; }; }