From f1147264b57e59b4db44f238827b0dfcaec4e0c9 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Sun, 24 Sep 2023 18:09:32 +0100 Subject: [PATCH] build: use build-configs --- .envrc | 2 ++ build.yaml | 11 ++++++++++ flake.lock | 58 +++++++++++++++++++++++++-------------------------- flake.nix | 15 ++++++++++--- tsconfig.json | 2 ++ 5 files changed, 56 insertions(+), 32 deletions(-) create mode 100644 build.yaml diff --git a/.envrc b/.envrc index 3550a30f..9f9f90b2 100644 --- a/.envrc +++ b/.envrc @@ -1 +1,3 @@ +# Do not edit this file. It is automatically generated by https://www.oliverdavies.uk/build-configs. + use flake diff --git a/build.yaml b/build.yaml new file mode 100644 index 00000000..bed59937 --- /dev/null +++ b/build.yaml @@ -0,0 +1,11 @@ +name: oliverdavies-uk +type: astro +language: typescript + +flake: + devshell: + packages: + - awscli + - just + - nodejs_20 + - yarn diff --git a/flake.lock b/flake.lock index f9d3e95e..03e17ddf 100644 --- a/flake.lock +++ b/flake.lock @@ -2,15 +2,15 @@ "nodes": { "devshell": { "inputs": { - "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs" + "nixpkgs": "nixpkgs", + "systems": "systems" }, "locked": { - "lastModified": 1678957337, - "narHash": "sha256-Gw4nVbuKRdTwPngeOZQOzH/IFowmz4LryMPDiJN/ah4=", + "lastModified": 1695195896, + "narHash": "sha256-pq9q7YsGXnQzJFkR5284TmxrLNFc0wo4NQ/a5E93CQU=", "owner": "numtide", "repo": "devshell", - "rev": "3e0e60ab37cd0bf7ab59888f5c32499d851edb47", + "rev": "05d40d17bf3459606316e3e9ec683b784ff28f16", "type": "github" }, "original": { @@ -24,11 +24,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1680392223, - "narHash": "sha256-n3g7QFr85lDODKt250rkZj2IFS3i4/8HBU2yKHO3tqw=", + "lastModified": 1693611461, + "narHash": "sha256-aPODl8vAgGQ0ZYFIRisxYG5MOGSkIczvu2Cd8Gb9+1Y=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "dcc36e45d054d7bb554c9cdab69093debd91a0b5", + "rev": "7f53fdb7bdc5bb237da7fefef12d099e4fd611ca", "type": "github" }, "original": { @@ -36,21 +36,6 @@ "type": "indirect" } }, - "flake-utils": { - "locked": { - "lastModified": 1642700792, - "narHash": "sha256-XqHrk7hFb+zBvRg6Ghl+AZDq03ov6OshJLiSWOoX5es=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "846b2ae0fc4cc943637d3d1def4454213e203cba", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "nixpkgs": { "locked": { "lastModified": 1677383253, @@ -70,11 +55,11 @@ "nixpkgs-lib": { "locked": { "dir": "lib", - "lastModified": 1680213900, - "narHash": "sha256-cIDr5WZIj3EkKyCgj/6j3HBH4Jj1W296z7HTcWj1aMA=", + "lastModified": 1693471703, + "narHash": "sha256-0l03ZBL8P1P6z8MaSDS/MvuU8E75rVxe5eE1N6gxeTo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e3652e0735fbec227f342712f180f4f21f0594f2", + "rev": "3e52e76b70d5508f3cec70b882a29199f4d1ee85", "type": "github" }, "original": { @@ -87,11 +72,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1680213900, - "narHash": "sha256-cIDr5WZIj3EkKyCgj/6j3HBH4Jj1W296z7HTcWj1aMA=", + "lastModified": 1695360818, + "narHash": "sha256-JlkN3R/SSoMTa+CasbxS1gq+GpGxXQlNZRUh9+LIy/0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e3652e0735fbec227f342712f180f4f21f0594f2", + "rev": "e35dcc04a3853da485a396bdd332217d0ac9054f", "type": "github" }, "original": { @@ -107,6 +92,21 @@ "flake-parts": "flake-parts", "nixpkgs": "nixpkgs_2" } + }, + "systems": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index ff1c2125..e495e50d 100644 --- a/flake.nix +++ b/flake.nix @@ -1,6 +1,10 @@ +# Do not edit this file. It is automatically generated by https://www.oliverdavies.uk/build-configs. + { - inputs.devshell.url = "github:numtide/devshell"; - inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + inputs = { + devshell.url = "github:numtide/devshell"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + }; outputs = inputs@{ flake-parts, ... }: flake-parts.lib.mkFlake { inherit inputs; } { @@ -10,7 +14,12 @@ perSystem = { config, self', inputs', pkgs, system, ... }: { devshells.default = { - packages = with pkgs; [ just nodejs-19_x yarn ]; + packages = with pkgs; [ + "awscli" + "just" + "nodejs_20" + "yarn" + ]; }; }; }; diff --git a/tsconfig.json b/tsconfig.json index 3a34ec41..1f617ba1 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,3 +1,5 @@ +// Do not edit this file. It is automatically generated by https://www.oliverdavies.uk/build-configs. + { "extends": "astro/tsconfigs/strict", "compilerOptions": {