From d8f81c4a78464f9bcd0f7df14aafba356a3327d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tristan=20Dani=C3=ABl=20Maat?= Date: Wed, 15 Jun 2022 14:55:26 +0100 Subject: [PATCH] Update to NixOS 22.05 --- flake.lock | 14 +++++++------- flake.nix | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index 6ddeeea..7480828 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "flake-utils": { "locked": { - "lastModified": 1631561581, - "narHash": "sha256-3VQMV5zvxaVLvqqUrNz3iJelLw30mIVSfZmAaauM3dA=", + "lastModified": 1653893745, + "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "7e5bf3925f6fbdfaf50a2a7ca0be2879c4261d19", + "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1", "type": "github" }, "original": { @@ -17,16 +17,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1633267966, - "narHash": "sha256-gFKvZ5AmV/dDTKXVxacPbXe4R0BsFpwtVaQxuIm2nnk=", + "lastModified": 1655200170, + "narHash": "sha256-/yzkX+10sJhYNIcTtZ5ObS+nh/HrJp01XLaubzbRDcU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "7daf35532d2d8bf5e6f7f962e6cd13a66d01a71d", + "rev": "9ff91ce2e4c5d70551d4c8fd8830931c6c6b26b8", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-21.05", + "ref": "nixos-22.05", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index 5b234d4..4963618 100644 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,7 @@ description = "tlater.net web server contents"; inputs = { - nixpkgs.url = "github:nixos/nixpkgs/nixos-21.05"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-22.05"; flake-utils.url = "github:numtide/flake-utils"; }; @@ -14,7 +14,7 @@ overlay = final: prev: { tlaternet-templates = rec { packages = rec { - nodeEnv = prev.callPackage ./nix/override.nix { }; + nodeEnv = prev.callPackage ./nix/override.nix { pkgs = prev; }; templates = prev.callPackage ({ stdenv, nodejs, rename, ... }: let nodeDeps = nodeEnv.shell.nodeDependencies; in stdenv.mkDerivation {