Update node template to use overlay and update all flake.locks

This commit is contained in:
Luc Perkins 2022-08-20 12:54:22 +03:00
parent d66e34d345
commit 7d2f532169
No known key found for this signature in database
GPG key ID: 4F102D0C16E232F2
25 changed files with 88 additions and 88 deletions

View file

@ -6,11 +6,11 @@
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1660405157, "lastModified": 1660405218,
"narHash": "sha256-5nOan4p/DNLQOLG7csEZdjF5BFYqtImRmWSEhci1Sw8=", "narHash": "sha256-brLy2+HlzrFwBX5jMCYgtnCXX3gsXPIQlw0k4DjFOvw=",
"owner": "the-nix-way", "owner": "the-nix-way",
"repo": "dev-templates", "repo": "dev-templates",
"rev": "f2d62f1dcf6edc557de80a3b992f1cb9e6b3af50", "rev": "d66e34d345aaf8e0cbc406483e95cbdb6daa7712",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -6,11 +6,11 @@
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1660405157, "lastModified": 1660405218,
"narHash": "sha256-5nOan4p/DNLQOLG7csEZdjF5BFYqtImRmWSEhci1Sw8=", "narHash": "sha256-brLy2+HlzrFwBX5jMCYgtnCXX3gsXPIQlw0k4DjFOvw=",
"owner": "the-nix-way", "owner": "the-nix-way",
"repo": "dev-templates", "repo": "dev-templates",
"rev": "f2d62f1dcf6edc557de80a3b992f1cb9e6b3af50", "rev": "d66e34d345aaf8e0cbc406483e95cbdb6daa7712",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -6,11 +6,11 @@
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1660405157, "lastModified": 1660405218,
"narHash": "sha256-5nOan4p/DNLQOLG7csEZdjF5BFYqtImRmWSEhci1Sw8=", "narHash": "sha256-brLy2+HlzrFwBX5jMCYgtnCXX3gsXPIQlw0k4DjFOvw=",
"owner": "the-nix-way", "owner": "the-nix-way",
"repo": "dev-templates", "repo": "dev-templates",
"rev": "f2d62f1dcf6edc557de80a3b992f1cb9e6b3af50", "rev": "d66e34d345aaf8e0cbc406483e95cbdb6daa7712",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -6,11 +6,11 @@
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1660405157, "lastModified": 1660405218,
"narHash": "sha256-5nOan4p/DNLQOLG7csEZdjF5BFYqtImRmWSEhci1Sw8=", "narHash": "sha256-brLy2+HlzrFwBX5jMCYgtnCXX3gsXPIQlw0k4DjFOvw=",
"owner": "the-nix-way", "owner": "the-nix-way",
"repo": "dev-templates", "repo": "dev-templates",
"rev": "f2d62f1dcf6edc557de80a3b992f1cb9e6b3af50", "rev": "d66e34d345aaf8e0cbc406483e95cbdb6daa7712",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -6,11 +6,11 @@
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1660405157, "lastModified": 1660405218,
"narHash": "sha256-5nOan4p/DNLQOLG7csEZdjF5BFYqtImRmWSEhci1Sw8=", "narHash": "sha256-brLy2+HlzrFwBX5jMCYgtnCXX3gsXPIQlw0k4DjFOvw=",
"owner": "the-nix-way", "owner": "the-nix-way",
"repo": "dev-templates", "repo": "dev-templates",
"rev": "f2d62f1dcf6edc557de80a3b992f1cb9e6b3af50", "rev": "d66e34d345aaf8e0cbc406483e95cbdb6daa7712",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -6,11 +6,11 @@
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1660405157, "lastModified": 1660405218,
"narHash": "sha256-5nOan4p/DNLQOLG7csEZdjF5BFYqtImRmWSEhci1Sw8=", "narHash": "sha256-brLy2+HlzrFwBX5jMCYgtnCXX3gsXPIQlw0k4DjFOvw=",
"owner": "the-nix-way", "owner": "the-nix-way",
"repo": "dev-templates", "repo": "dev-templates",
"rev": "f2d62f1dcf6edc557de80a3b992f1cb9e6b3af50", "rev": "d66e34d345aaf8e0cbc406483e95cbdb6daa7712",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -6,11 +6,11 @@
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1660405157, "lastModified": 1660405218,
"narHash": "sha256-5nOan4p/DNLQOLG7csEZdjF5BFYqtImRmWSEhci1Sw8=", "narHash": "sha256-brLy2+HlzrFwBX5jMCYgtnCXX3gsXPIQlw0k4DjFOvw=",
"owner": "the-nix-way", "owner": "the-nix-way",
"repo": "dev-templates", "repo": "dev-templates",
"rev": "f2d62f1dcf6edc557de80a3b992f1cb9e6b3af50", "rev": "d66e34d345aaf8e0cbc406483e95cbdb6daa7712",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -6,11 +6,11 @@
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1660405157, "lastModified": 1660405218,
"narHash": "sha256-5nOan4p/DNLQOLG7csEZdjF5BFYqtImRmWSEhci1Sw8=", "narHash": "sha256-brLy2+HlzrFwBX5jMCYgtnCXX3gsXPIQlw0k4DjFOvw=",
"owner": "the-nix-way", "owner": "the-nix-way",
"repo": "dev-templates", "repo": "dev-templates",
"rev": "f2d62f1dcf6edc557de80a3b992f1cb9e6b3af50", "rev": "d66e34d345aaf8e0cbc406483e95cbdb6daa7712",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -6,11 +6,11 @@
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1660405157, "lastModified": 1660405218,
"narHash": "sha256-5nOan4p/DNLQOLG7csEZdjF5BFYqtImRmWSEhci1Sw8=", "narHash": "sha256-brLy2+HlzrFwBX5jMCYgtnCXX3gsXPIQlw0k4DjFOvw=",
"owner": "the-nix-way", "owner": "the-nix-way",
"repo": "dev-templates", "repo": "dev-templates",
"rev": "f2d62f1dcf6edc557de80a3b992f1cb9e6b3af50", "rev": "d66e34d345aaf8e0cbc406483e95cbdb6daa7712",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -6,11 +6,11 @@
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1660405157, "lastModified": 1660405218,
"narHash": "sha256-5nOan4p/DNLQOLG7csEZdjF5BFYqtImRmWSEhci1Sw8=", "narHash": "sha256-brLy2+HlzrFwBX5jMCYgtnCXX3gsXPIQlw0k4DjFOvw=",
"owner": "the-nix-way", "owner": "the-nix-way",
"repo": "dev-templates", "repo": "dev-templates",
"rev": "f2d62f1dcf6edc557de80a3b992f1cb9e6b3af50", "rev": "d66e34d345aaf8e0cbc406483e95cbdb6daa7712",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -6,11 +6,11 @@
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1660405157, "lastModified": 1660405218,
"narHash": "sha256-5nOan4p/DNLQOLG7csEZdjF5BFYqtImRmWSEhci1Sw8=", "narHash": "sha256-brLy2+HlzrFwBX5jMCYgtnCXX3gsXPIQlw0k4DjFOvw=",
"owner": "the-nix-way", "owner": "the-nix-way",
"repo": "dev-templates", "repo": "dev-templates",
"rev": "f2d62f1dcf6edc557de80a3b992f1cb9e6b3af50", "rev": "d66e34d345aaf8e0cbc406483e95cbdb6daa7712",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -6,11 +6,11 @@
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1660405157, "lastModified": 1660405218,
"narHash": "sha256-5nOan4p/DNLQOLG7csEZdjF5BFYqtImRmWSEhci1Sw8=", "narHash": "sha256-brLy2+HlzrFwBX5jMCYgtnCXX3gsXPIQlw0k4DjFOvw=",
"owner": "the-nix-way", "owner": "the-nix-way",
"repo": "dev-templates", "repo": "dev-templates",
"rev": "f2d62f1dcf6edc557de80a3b992f1cb9e6b3af50", "rev": "d66e34d345aaf8e0cbc406483e95cbdb6daa7712",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -6,11 +6,11 @@
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1660405157, "lastModified": 1660405218,
"narHash": "sha256-5nOan4p/DNLQOLG7csEZdjF5BFYqtImRmWSEhci1Sw8=", "narHash": "sha256-brLy2+HlzrFwBX5jMCYgtnCXX3gsXPIQlw0k4DjFOvw=",
"owner": "the-nix-way", "owner": "the-nix-way",
"repo": "dev-templates", "repo": "dev-templates",
"rev": "f2d62f1dcf6edc557de80a3b992f1cb9e6b3af50", "rev": "d66e34d345aaf8e0cbc406483e95cbdb6daa7712",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -6,11 +6,11 @@
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1660405157, "lastModified": 1660405218,
"narHash": "sha256-5nOan4p/DNLQOLG7csEZdjF5BFYqtImRmWSEhci1Sw8=", "narHash": "sha256-brLy2+HlzrFwBX5jMCYgtnCXX3gsXPIQlw0k4DjFOvw=",
"owner": "the-nix-way", "owner": "the-nix-way",
"repo": "dev-templates", "repo": "dev-templates",
"rev": "f2d62f1dcf6edc557de80a3b992f1cb9e6b3af50", "rev": "d66e34d345aaf8e0cbc406483e95cbdb6daa7712",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -6,11 +6,11 @@
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1660405157, "lastModified": 1660405218,
"narHash": "sha256-5nOan4p/DNLQOLG7csEZdjF5BFYqtImRmWSEhci1Sw8=", "narHash": "sha256-brLy2+HlzrFwBX5jMCYgtnCXX3gsXPIQlw0k4DjFOvw=",
"owner": "the-nix-way", "owner": "the-nix-way",
"repo": "dev-templates", "repo": "dev-templates",
"rev": "f2d62f1dcf6edc557de80a3b992f1cb9e6b3af50", "rev": "d66e34d345aaf8e0cbc406483e95cbdb6daa7712",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -6,11 +6,11 @@
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1660405157, "lastModified": 1660405218,
"narHash": "sha256-5nOan4p/DNLQOLG7csEZdjF5BFYqtImRmWSEhci1Sw8=", "narHash": "sha256-brLy2+HlzrFwBX5jMCYgtnCXX3gsXPIQlw0k4DjFOvw=",
"owner": "the-nix-way", "owner": "the-nix-way",
"repo": "dev-templates", "repo": "dev-templates",
"rev": "f2d62f1dcf6edc557de80a3b992f1cb9e6b3af50", "rev": "d66e34d345aaf8e0cbc406483e95cbdb6daa7712",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -7,20 +7,20 @@
let inherit (dev.lib) flake-utils nixpkgs; let inherit (dev.lib) flake-utils nixpkgs;
in flake-utils.lib.eachDefaultSystem (system: in flake-utils.lib.eachDefaultSystem (system:
let let
pkgs = import nixpkgs { inherit system; }; nodeOverlay = self: super: rec {
nodejs = super.nodejs-18_x;
inherit (pkgs) mkShell node2nix; pnpm = super.nodePackages.pnpm;
yarn = (super.yarn.override { inherit nodejs; });
nodejs = pkgs.nodejs-18_x; };
pnpm = pkgs.nodePackages.pnpm; overlays = [ nodeOverlay ];
yarn = (pkgs.yarn.override { inherit nodejs; }); pkgs = import nixpkgs { inherit overlays system; };
in { in {
devShells = { devShells = {
default = mkShell { default = pkgs.mkShell {
buildInputs = [ node2nix nodejs pnpm yarn ]; buildInputs = with pkgs; [ node2nix nodejs pnpm yarn ];
shellHook = '' shellHook = ''
echo "node `${nodejs}/bin/node --version`" echo "node `${pkgs.nodejs}/bin/node --version`"
''; '';
}; };
}; };

View file

@ -6,11 +6,11 @@
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1660405157, "lastModified": 1660405218,
"narHash": "sha256-5nOan4p/DNLQOLG7csEZdjF5BFYqtImRmWSEhci1Sw8=", "narHash": "sha256-brLy2+HlzrFwBX5jMCYgtnCXX3gsXPIQlw0k4DjFOvw=",
"owner": "the-nix-way", "owner": "the-nix-way",
"repo": "dev-templates", "repo": "dev-templates",
"rev": "f2d62f1dcf6edc557de80a3b992f1cb9e6b3af50", "rev": "d66e34d345aaf8e0cbc406483e95cbdb6daa7712",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -6,11 +6,11 @@
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1660405157, "lastModified": 1660405218,
"narHash": "sha256-5nOan4p/DNLQOLG7csEZdjF5BFYqtImRmWSEhci1Sw8=", "narHash": "sha256-brLy2+HlzrFwBX5jMCYgtnCXX3gsXPIQlw0k4DjFOvw=",
"owner": "the-nix-way", "owner": "the-nix-way",
"repo": "dev-templates", "repo": "dev-templates",
"rev": "f2d62f1dcf6edc557de80a3b992f1cb9e6b3af50", "rev": "d66e34d345aaf8e0cbc406483e95cbdb6daa7712",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -6,11 +6,11 @@
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1660405157, "lastModified": 1660405218,
"narHash": "sha256-5nOan4p/DNLQOLG7csEZdjF5BFYqtImRmWSEhci1Sw8=", "narHash": "sha256-brLy2+HlzrFwBX5jMCYgtnCXX3gsXPIQlw0k4DjFOvw=",
"owner": "the-nix-way", "owner": "the-nix-way",
"repo": "dev-templates", "repo": "dev-templates",
"rev": "f2d62f1dcf6edc557de80a3b992f1cb9e6b3af50", "rev": "d66e34d345aaf8e0cbc406483e95cbdb6daa7712",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -6,11 +6,11 @@
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1660405157, "lastModified": 1660405218,
"narHash": "sha256-5nOan4p/DNLQOLG7csEZdjF5BFYqtImRmWSEhci1Sw8=", "narHash": "sha256-brLy2+HlzrFwBX5jMCYgtnCXX3gsXPIQlw0k4DjFOvw=",
"owner": "the-nix-way", "owner": "the-nix-way",
"repo": "dev-templates", "repo": "dev-templates",
"rev": "f2d62f1dcf6edc557de80a3b992f1cb9e6b3af50", "rev": "d66e34d345aaf8e0cbc406483e95cbdb6daa7712",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -56,11 +56,11 @@
"pypi-deps-db": "pypi-deps-db" "pypi-deps-db": "pypi-deps-db"
}, },
"locked": { "locked": {
"lastModified": 1659091740, "lastModified": 1660767432,
"narHash": "sha256-aNtnezQfUX1QS/bFno2H5661qIY/Rn7BmHnspuuyI+4=", "narHash": "sha256-aFZSd2aAO10IaVLCaff+oXsibm+m2BDlrxapEesW14E=",
"owner": "DavHau", "owner": "DavHau",
"repo": "mach-nix", "repo": "mach-nix",
"rev": "f15ea8677df951cb4fe608945fd98725dcd033b3", "rev": "b5614640bc3379408d90db9e375b47345fbc21eb",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -6,11 +6,11 @@
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1660405157, "lastModified": 1660405218,
"narHash": "sha256-5nOan4p/DNLQOLG7csEZdjF5BFYqtImRmWSEhci1Sw8=", "narHash": "sha256-brLy2+HlzrFwBX5jMCYgtnCXX3gsXPIQlw0k4DjFOvw=",
"owner": "the-nix-way", "owner": "the-nix-way",
"repo": "dev-templates", "repo": "dev-templates",
"rev": "f2d62f1dcf6edc557de80a3b992f1cb9e6b3af50", "rev": "d66e34d345aaf8e0cbc406483e95cbdb6daa7712",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -6,11 +6,11 @@
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1660405157, "lastModified": 1660405218,
"narHash": "sha256-5nOan4p/DNLQOLG7csEZdjF5BFYqtImRmWSEhci1Sw8=", "narHash": "sha256-brLy2+HlzrFwBX5jMCYgtnCXX3gsXPIQlw0k4DjFOvw=",
"owner": "the-nix-way", "owner": "the-nix-way",
"repo": "dev-templates", "repo": "dev-templates",
"rev": "f2d62f1dcf6edc557de80a3b992f1cb9e6b3af50", "rev": "d66e34d345aaf8e0cbc406483e95cbdb6daa7712",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -93,11 +93,11 @@
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs_2"
}, },
"locked": { "locked": {
"lastModified": 1660358625, "lastModified": 1660963802,
"narHash": "sha256-uv+ZtOAEeM5tw78CLdRQmbZyDZYc0piSflthG2kNnrc=", "narHash": "sha256-Qs2jD7UpprYpLVrwNyFp2Xcj/f5NZ9cKUNQxtfoMeMI=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "18354cce8137aaef0d505d6f677e9bbdd542020d", "rev": "33aaf88ac9f5f7115eca96e784e96e519c670b18",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -6,11 +6,11 @@
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1660405157, "lastModified": 1660405218,
"narHash": "sha256-5nOan4p/DNLQOLG7csEZdjF5BFYqtImRmWSEhci1Sw8=", "narHash": "sha256-brLy2+HlzrFwBX5jMCYgtnCXX3gsXPIQlw0k4DjFOvw=",
"owner": "the-nix-way", "owner": "the-nix-way",
"repo": "dev-templates", "repo": "dev-templates",
"rev": "f2d62f1dcf6edc557de80a3b992f1cb9e6b3af50", "rev": "d66e34d345aaf8e0cbc406483e95cbdb6daa7712",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -6,11 +6,11 @@
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1660405157, "lastModified": 1660405218,
"narHash": "sha256-5nOan4p/DNLQOLG7csEZdjF5BFYqtImRmWSEhci1Sw8=", "narHash": "sha256-brLy2+HlzrFwBX5jMCYgtnCXX3gsXPIQlw0k4DjFOvw=",
"owner": "the-nix-way", "owner": "the-nix-way",
"repo": "dev-templates", "repo": "dev-templates",
"rev": "f2d62f1dcf6edc557de80a3b992f1cb9e6b3af50", "rev": "d66e34d345aaf8e0cbc406483e95cbdb6daa7712",
"type": "github" "type": "github"
}, },
"original": { "original": {