From 7d2f532169ccfeb8881231e0e87868bf466f9d97 Mon Sep 17 00:00:00 2001 From: Luc Perkins Date: Sat, 20 Aug 2022 12:54:22 +0300 Subject: [PATCH] Update node template to use overlay and update all flake.locks --- clojure/flake.lock | 6 +++--- cue/flake.lock | 6 +++--- dhall/flake.lock | 6 +++--- elixir/flake.lock | 6 +++--- elm/flake.lock | 6 +++--- gleam/flake.lock | 6 +++--- go1.17/flake.lock | 6 +++--- go1.18/flake.lock | 6 +++--- hashi/flake.lock | 6 +++--- haskell/flake.lock | 6 +++--- java/flake.lock | 6 +++--- kotlin/flake.lock | 6 +++--- nickel/flake.lock | 6 +++--- nim/flake.lock | 6 +++--- nix/flake.lock | 6 +++--- node/flake.lock | 6 +++--- node/flake.nix | 20 ++++++++++---------- ocaml/flake.lock | 6 +++--- opa/flake.lock | 6 +++--- protobuf/flake.lock | 6 +++--- python/flake.lock | 12 ++++++------ ruby/flake.lock | 6 +++--- rust/flake.lock | 12 ++++++------ scala/flake.lock | 6 +++--- zig/flake.lock | 6 +++--- 25 files changed, 88 insertions(+), 88 deletions(-) diff --git a/clojure/flake.lock b/clojure/flake.lock index cc5eb2f..12feb3c 100644 --- a/clojure/flake.lock +++ b/clojure/flake.lock @@ -6,11 +6,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1660405157, - "narHash": "sha256-5nOan4p/DNLQOLG7csEZdjF5BFYqtImRmWSEhci1Sw8=", + "lastModified": 1660405218, + "narHash": "sha256-brLy2+HlzrFwBX5jMCYgtnCXX3gsXPIQlw0k4DjFOvw=", "owner": "the-nix-way", "repo": "dev-templates", - "rev": "f2d62f1dcf6edc557de80a3b992f1cb9e6b3af50", + "rev": "d66e34d345aaf8e0cbc406483e95cbdb6daa7712", "type": "github" }, "original": { diff --git a/cue/flake.lock b/cue/flake.lock index cc5eb2f..12feb3c 100644 --- a/cue/flake.lock +++ b/cue/flake.lock @@ -6,11 +6,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1660405157, - "narHash": "sha256-5nOan4p/DNLQOLG7csEZdjF5BFYqtImRmWSEhci1Sw8=", + "lastModified": 1660405218, + "narHash": "sha256-brLy2+HlzrFwBX5jMCYgtnCXX3gsXPIQlw0k4DjFOvw=", "owner": "the-nix-way", "repo": "dev-templates", - "rev": "f2d62f1dcf6edc557de80a3b992f1cb9e6b3af50", + "rev": "d66e34d345aaf8e0cbc406483e95cbdb6daa7712", "type": "github" }, "original": { diff --git a/dhall/flake.lock b/dhall/flake.lock index cc5eb2f..12feb3c 100644 --- a/dhall/flake.lock +++ b/dhall/flake.lock @@ -6,11 +6,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1660405157, - "narHash": "sha256-5nOan4p/DNLQOLG7csEZdjF5BFYqtImRmWSEhci1Sw8=", + "lastModified": 1660405218, + "narHash": "sha256-brLy2+HlzrFwBX5jMCYgtnCXX3gsXPIQlw0k4DjFOvw=", "owner": "the-nix-way", "repo": "dev-templates", - "rev": "f2d62f1dcf6edc557de80a3b992f1cb9e6b3af50", + "rev": "d66e34d345aaf8e0cbc406483e95cbdb6daa7712", "type": "github" }, "original": { diff --git a/elixir/flake.lock b/elixir/flake.lock index cc5eb2f..12feb3c 100644 --- a/elixir/flake.lock +++ b/elixir/flake.lock @@ -6,11 +6,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1660405157, - "narHash": "sha256-5nOan4p/DNLQOLG7csEZdjF5BFYqtImRmWSEhci1Sw8=", + "lastModified": 1660405218, + "narHash": "sha256-brLy2+HlzrFwBX5jMCYgtnCXX3gsXPIQlw0k4DjFOvw=", "owner": "the-nix-way", "repo": "dev-templates", - "rev": "f2d62f1dcf6edc557de80a3b992f1cb9e6b3af50", + "rev": "d66e34d345aaf8e0cbc406483e95cbdb6daa7712", "type": "github" }, "original": { diff --git a/elm/flake.lock b/elm/flake.lock index cc5eb2f..12feb3c 100644 --- a/elm/flake.lock +++ b/elm/flake.lock @@ -6,11 +6,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1660405157, - "narHash": "sha256-5nOan4p/DNLQOLG7csEZdjF5BFYqtImRmWSEhci1Sw8=", + "lastModified": 1660405218, + "narHash": "sha256-brLy2+HlzrFwBX5jMCYgtnCXX3gsXPIQlw0k4DjFOvw=", "owner": "the-nix-way", "repo": "dev-templates", - "rev": "f2d62f1dcf6edc557de80a3b992f1cb9e6b3af50", + "rev": "d66e34d345aaf8e0cbc406483e95cbdb6daa7712", "type": "github" }, "original": { diff --git a/gleam/flake.lock b/gleam/flake.lock index cc5eb2f..12feb3c 100644 --- a/gleam/flake.lock +++ b/gleam/flake.lock @@ -6,11 +6,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1660405157, - "narHash": "sha256-5nOan4p/DNLQOLG7csEZdjF5BFYqtImRmWSEhci1Sw8=", + "lastModified": 1660405218, + "narHash": "sha256-brLy2+HlzrFwBX5jMCYgtnCXX3gsXPIQlw0k4DjFOvw=", "owner": "the-nix-way", "repo": "dev-templates", - "rev": "f2d62f1dcf6edc557de80a3b992f1cb9e6b3af50", + "rev": "d66e34d345aaf8e0cbc406483e95cbdb6daa7712", "type": "github" }, "original": { diff --git a/go1.17/flake.lock b/go1.17/flake.lock index cc5eb2f..12feb3c 100644 --- a/go1.17/flake.lock +++ b/go1.17/flake.lock @@ -6,11 +6,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1660405157, - "narHash": "sha256-5nOan4p/DNLQOLG7csEZdjF5BFYqtImRmWSEhci1Sw8=", + "lastModified": 1660405218, + "narHash": "sha256-brLy2+HlzrFwBX5jMCYgtnCXX3gsXPIQlw0k4DjFOvw=", "owner": "the-nix-way", "repo": "dev-templates", - "rev": "f2d62f1dcf6edc557de80a3b992f1cb9e6b3af50", + "rev": "d66e34d345aaf8e0cbc406483e95cbdb6daa7712", "type": "github" }, "original": { diff --git a/go1.18/flake.lock b/go1.18/flake.lock index cc5eb2f..12feb3c 100644 --- a/go1.18/flake.lock +++ b/go1.18/flake.lock @@ -6,11 +6,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1660405157, - "narHash": "sha256-5nOan4p/DNLQOLG7csEZdjF5BFYqtImRmWSEhci1Sw8=", + "lastModified": 1660405218, + "narHash": "sha256-brLy2+HlzrFwBX5jMCYgtnCXX3gsXPIQlw0k4DjFOvw=", "owner": "the-nix-way", "repo": "dev-templates", - "rev": "f2d62f1dcf6edc557de80a3b992f1cb9e6b3af50", + "rev": "d66e34d345aaf8e0cbc406483e95cbdb6daa7712", "type": "github" }, "original": { diff --git a/hashi/flake.lock b/hashi/flake.lock index cc5eb2f..12feb3c 100644 --- a/hashi/flake.lock +++ b/hashi/flake.lock @@ -6,11 +6,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1660405157, - "narHash": "sha256-5nOan4p/DNLQOLG7csEZdjF5BFYqtImRmWSEhci1Sw8=", + "lastModified": 1660405218, + "narHash": "sha256-brLy2+HlzrFwBX5jMCYgtnCXX3gsXPIQlw0k4DjFOvw=", "owner": "the-nix-way", "repo": "dev-templates", - "rev": "f2d62f1dcf6edc557de80a3b992f1cb9e6b3af50", + "rev": "d66e34d345aaf8e0cbc406483e95cbdb6daa7712", "type": "github" }, "original": { diff --git a/haskell/flake.lock b/haskell/flake.lock index cc5eb2f..12feb3c 100644 --- a/haskell/flake.lock +++ b/haskell/flake.lock @@ -6,11 +6,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1660405157, - "narHash": "sha256-5nOan4p/DNLQOLG7csEZdjF5BFYqtImRmWSEhci1Sw8=", + "lastModified": 1660405218, + "narHash": "sha256-brLy2+HlzrFwBX5jMCYgtnCXX3gsXPIQlw0k4DjFOvw=", "owner": "the-nix-way", "repo": "dev-templates", - "rev": "f2d62f1dcf6edc557de80a3b992f1cb9e6b3af50", + "rev": "d66e34d345aaf8e0cbc406483e95cbdb6daa7712", "type": "github" }, "original": { diff --git a/java/flake.lock b/java/flake.lock index cc5eb2f..12feb3c 100644 --- a/java/flake.lock +++ b/java/flake.lock @@ -6,11 +6,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1660405157, - "narHash": "sha256-5nOan4p/DNLQOLG7csEZdjF5BFYqtImRmWSEhci1Sw8=", + "lastModified": 1660405218, + "narHash": "sha256-brLy2+HlzrFwBX5jMCYgtnCXX3gsXPIQlw0k4DjFOvw=", "owner": "the-nix-way", "repo": "dev-templates", - "rev": "f2d62f1dcf6edc557de80a3b992f1cb9e6b3af50", + "rev": "d66e34d345aaf8e0cbc406483e95cbdb6daa7712", "type": "github" }, "original": { diff --git a/kotlin/flake.lock b/kotlin/flake.lock index cc5eb2f..12feb3c 100644 --- a/kotlin/flake.lock +++ b/kotlin/flake.lock @@ -6,11 +6,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1660405157, - "narHash": "sha256-5nOan4p/DNLQOLG7csEZdjF5BFYqtImRmWSEhci1Sw8=", + "lastModified": 1660405218, + "narHash": "sha256-brLy2+HlzrFwBX5jMCYgtnCXX3gsXPIQlw0k4DjFOvw=", "owner": "the-nix-way", "repo": "dev-templates", - "rev": "f2d62f1dcf6edc557de80a3b992f1cb9e6b3af50", + "rev": "d66e34d345aaf8e0cbc406483e95cbdb6daa7712", "type": "github" }, "original": { diff --git a/nickel/flake.lock b/nickel/flake.lock index cc5eb2f..12feb3c 100644 --- a/nickel/flake.lock +++ b/nickel/flake.lock @@ -6,11 +6,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1660405157, - "narHash": "sha256-5nOan4p/DNLQOLG7csEZdjF5BFYqtImRmWSEhci1Sw8=", + "lastModified": 1660405218, + "narHash": "sha256-brLy2+HlzrFwBX5jMCYgtnCXX3gsXPIQlw0k4DjFOvw=", "owner": "the-nix-way", "repo": "dev-templates", - "rev": "f2d62f1dcf6edc557de80a3b992f1cb9e6b3af50", + "rev": "d66e34d345aaf8e0cbc406483e95cbdb6daa7712", "type": "github" }, "original": { diff --git a/nim/flake.lock b/nim/flake.lock index cc5eb2f..12feb3c 100644 --- a/nim/flake.lock +++ b/nim/flake.lock @@ -6,11 +6,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1660405157, - "narHash": "sha256-5nOan4p/DNLQOLG7csEZdjF5BFYqtImRmWSEhci1Sw8=", + "lastModified": 1660405218, + "narHash": "sha256-brLy2+HlzrFwBX5jMCYgtnCXX3gsXPIQlw0k4DjFOvw=", "owner": "the-nix-way", "repo": "dev-templates", - "rev": "f2d62f1dcf6edc557de80a3b992f1cb9e6b3af50", + "rev": "d66e34d345aaf8e0cbc406483e95cbdb6daa7712", "type": "github" }, "original": { diff --git a/nix/flake.lock b/nix/flake.lock index cc5eb2f..12feb3c 100644 --- a/nix/flake.lock +++ b/nix/flake.lock @@ -6,11 +6,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1660405157, - "narHash": "sha256-5nOan4p/DNLQOLG7csEZdjF5BFYqtImRmWSEhci1Sw8=", + "lastModified": 1660405218, + "narHash": "sha256-brLy2+HlzrFwBX5jMCYgtnCXX3gsXPIQlw0k4DjFOvw=", "owner": "the-nix-way", "repo": "dev-templates", - "rev": "f2d62f1dcf6edc557de80a3b992f1cb9e6b3af50", + "rev": "d66e34d345aaf8e0cbc406483e95cbdb6daa7712", "type": "github" }, "original": { diff --git a/node/flake.lock b/node/flake.lock index cc5eb2f..12feb3c 100644 --- a/node/flake.lock +++ b/node/flake.lock @@ -6,11 +6,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1660405157, - "narHash": "sha256-5nOan4p/DNLQOLG7csEZdjF5BFYqtImRmWSEhci1Sw8=", + "lastModified": 1660405218, + "narHash": "sha256-brLy2+HlzrFwBX5jMCYgtnCXX3gsXPIQlw0k4DjFOvw=", "owner": "the-nix-way", "repo": "dev-templates", - "rev": "f2d62f1dcf6edc557de80a3b992f1cb9e6b3af50", + "rev": "d66e34d345aaf8e0cbc406483e95cbdb6daa7712", "type": "github" }, "original": { diff --git a/node/flake.nix b/node/flake.nix index 7fa8611..8ca0060 100644 --- a/node/flake.nix +++ b/node/flake.nix @@ -7,20 +7,20 @@ let inherit (dev.lib) flake-utils nixpkgs; in flake-utils.lib.eachDefaultSystem (system: let - pkgs = import nixpkgs { inherit system; }; - - inherit (pkgs) mkShell node2nix; - - nodejs = pkgs.nodejs-18_x; - pnpm = pkgs.nodePackages.pnpm; - yarn = (pkgs.yarn.override { inherit nodejs; }); + nodeOverlay = self: super: rec { + nodejs = super.nodejs-18_x; + pnpm = super.nodePackages.pnpm; + yarn = (super.yarn.override { inherit nodejs; }); + }; + overlays = [ nodeOverlay ]; + pkgs = import nixpkgs { inherit overlays system; }; in { devShells = { - default = mkShell { - buildInputs = [ node2nix nodejs pnpm yarn ]; + default = pkgs.mkShell { + buildInputs = with pkgs; [ node2nix nodejs pnpm yarn ]; shellHook = '' - echo "node `${nodejs}/bin/node --version`" + echo "node `${pkgs.nodejs}/bin/node --version`" ''; }; }; diff --git a/ocaml/flake.lock b/ocaml/flake.lock index cc5eb2f..12feb3c 100644 --- a/ocaml/flake.lock +++ b/ocaml/flake.lock @@ -6,11 +6,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1660405157, - "narHash": "sha256-5nOan4p/DNLQOLG7csEZdjF5BFYqtImRmWSEhci1Sw8=", + "lastModified": 1660405218, + "narHash": "sha256-brLy2+HlzrFwBX5jMCYgtnCXX3gsXPIQlw0k4DjFOvw=", "owner": "the-nix-way", "repo": "dev-templates", - "rev": "f2d62f1dcf6edc557de80a3b992f1cb9e6b3af50", + "rev": "d66e34d345aaf8e0cbc406483e95cbdb6daa7712", "type": "github" }, "original": { diff --git a/opa/flake.lock b/opa/flake.lock index cc5eb2f..12feb3c 100644 --- a/opa/flake.lock +++ b/opa/flake.lock @@ -6,11 +6,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1660405157, - "narHash": "sha256-5nOan4p/DNLQOLG7csEZdjF5BFYqtImRmWSEhci1Sw8=", + "lastModified": 1660405218, + "narHash": "sha256-brLy2+HlzrFwBX5jMCYgtnCXX3gsXPIQlw0k4DjFOvw=", "owner": "the-nix-way", "repo": "dev-templates", - "rev": "f2d62f1dcf6edc557de80a3b992f1cb9e6b3af50", + "rev": "d66e34d345aaf8e0cbc406483e95cbdb6daa7712", "type": "github" }, "original": { diff --git a/protobuf/flake.lock b/protobuf/flake.lock index cc5eb2f..12feb3c 100644 --- a/protobuf/flake.lock +++ b/protobuf/flake.lock @@ -6,11 +6,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1660405157, - "narHash": "sha256-5nOan4p/DNLQOLG7csEZdjF5BFYqtImRmWSEhci1Sw8=", + "lastModified": 1660405218, + "narHash": "sha256-brLy2+HlzrFwBX5jMCYgtnCXX3gsXPIQlw0k4DjFOvw=", "owner": "the-nix-way", "repo": "dev-templates", - "rev": "f2d62f1dcf6edc557de80a3b992f1cb9e6b3af50", + "rev": "d66e34d345aaf8e0cbc406483e95cbdb6daa7712", "type": "github" }, "original": { diff --git a/python/flake.lock b/python/flake.lock index 31fb1db..1119910 100644 --- a/python/flake.lock +++ b/python/flake.lock @@ -6,11 +6,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1660405157, - "narHash": "sha256-5nOan4p/DNLQOLG7csEZdjF5BFYqtImRmWSEhci1Sw8=", + "lastModified": 1660405218, + "narHash": "sha256-brLy2+HlzrFwBX5jMCYgtnCXX3gsXPIQlw0k4DjFOvw=", "owner": "the-nix-way", "repo": "dev-templates", - "rev": "f2d62f1dcf6edc557de80a3b992f1cb9e6b3af50", + "rev": "d66e34d345aaf8e0cbc406483e95cbdb6daa7712", "type": "github" }, "original": { @@ -56,11 +56,11 @@ "pypi-deps-db": "pypi-deps-db" }, "locked": { - "lastModified": 1659091740, - "narHash": "sha256-aNtnezQfUX1QS/bFno2H5661qIY/Rn7BmHnspuuyI+4=", + "lastModified": 1660767432, + "narHash": "sha256-aFZSd2aAO10IaVLCaff+oXsibm+m2BDlrxapEesW14E=", "owner": "DavHau", "repo": "mach-nix", - "rev": "f15ea8677df951cb4fe608945fd98725dcd033b3", + "rev": "b5614640bc3379408d90db9e375b47345fbc21eb", "type": "github" }, "original": { diff --git a/ruby/flake.lock b/ruby/flake.lock index cc5eb2f..12feb3c 100644 --- a/ruby/flake.lock +++ b/ruby/flake.lock @@ -6,11 +6,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1660405157, - "narHash": "sha256-5nOan4p/DNLQOLG7csEZdjF5BFYqtImRmWSEhci1Sw8=", + "lastModified": 1660405218, + "narHash": "sha256-brLy2+HlzrFwBX5jMCYgtnCXX3gsXPIQlw0k4DjFOvw=", "owner": "the-nix-way", "repo": "dev-templates", - "rev": "f2d62f1dcf6edc557de80a3b992f1cb9e6b3af50", + "rev": "d66e34d345aaf8e0cbc406483e95cbdb6daa7712", "type": "github" }, "original": { diff --git a/rust/flake.lock b/rust/flake.lock index 3c145b4..e83683e 100644 --- a/rust/flake.lock +++ b/rust/flake.lock @@ -6,11 +6,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1660405157, - "narHash": "sha256-5nOan4p/DNLQOLG7csEZdjF5BFYqtImRmWSEhci1Sw8=", + "lastModified": 1660405218, + "narHash": "sha256-brLy2+HlzrFwBX5jMCYgtnCXX3gsXPIQlw0k4DjFOvw=", "owner": "the-nix-way", "repo": "dev-templates", - "rev": "f2d62f1dcf6edc557de80a3b992f1cb9e6b3af50", + "rev": "d66e34d345aaf8e0cbc406483e95cbdb6daa7712", "type": "github" }, "original": { @@ -93,11 +93,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1660358625, - "narHash": "sha256-uv+ZtOAEeM5tw78CLdRQmbZyDZYc0piSflthG2kNnrc=", + "lastModified": 1660963802, + "narHash": "sha256-Qs2jD7UpprYpLVrwNyFp2Xcj/f5NZ9cKUNQxtfoMeMI=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "18354cce8137aaef0d505d6f677e9bbdd542020d", + "rev": "33aaf88ac9f5f7115eca96e784e96e519c670b18", "type": "github" }, "original": { diff --git a/scala/flake.lock b/scala/flake.lock index cc5eb2f..12feb3c 100644 --- a/scala/flake.lock +++ b/scala/flake.lock @@ -6,11 +6,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1660405157, - "narHash": "sha256-5nOan4p/DNLQOLG7csEZdjF5BFYqtImRmWSEhci1Sw8=", + "lastModified": 1660405218, + "narHash": "sha256-brLy2+HlzrFwBX5jMCYgtnCXX3gsXPIQlw0k4DjFOvw=", "owner": "the-nix-way", "repo": "dev-templates", - "rev": "f2d62f1dcf6edc557de80a3b992f1cb9e6b3af50", + "rev": "d66e34d345aaf8e0cbc406483e95cbdb6daa7712", "type": "github" }, "original": { diff --git a/zig/flake.lock b/zig/flake.lock index cc5eb2f..12feb3c 100644 --- a/zig/flake.lock +++ b/zig/flake.lock @@ -6,11 +6,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1660405157, - "narHash": "sha256-5nOan4p/DNLQOLG7csEZdjF5BFYqtImRmWSEhci1Sw8=", + "lastModified": 1660405218, + "narHash": "sha256-brLy2+HlzrFwBX5jMCYgtnCXX3gsXPIQlw0k4DjFOvw=", "owner": "the-nix-way", "repo": "dev-templates", - "rev": "f2d62f1dcf6edc557de80a3b992f1cb9e6b3af50", + "rev": "d66e34d345aaf8e0cbc406483e95cbdb6daa7712", "type": "github" }, "original": {