From 94453d9b7f41896577fc8f61efd2977150257573 Mon Sep 17 00:00:00 2001 From: Sam Willcocks Date: Fri, 16 Jun 2023 12:41:27 +0100 Subject: [PATCH] flake: update inputs to fix vscode breakage --- flake.lock | 63 ++++++++++++++++++++++++++++++++++++++++-------------- flake.nix | 2 +- 2 files changed, 48 insertions(+), 17 deletions(-) diff --git a/flake.lock b/flake.lock index 3b47918..6d14e45 100644 --- a/flake.lock +++ b/flake.lock @@ -2,19 +2,17 @@ "nodes": { "devshell": { "inputs": { - "flake-utils": [ - "flake-utils" - ], "nixpkgs": [ "nixpkgs" - ] + ], + "systems": "systems" }, "locked": { - "lastModified": 1671489820, - "narHash": "sha256-qoei5HDJ8psd1YUPD7DhbHdhLIT9L2nadscp4Qk37uk=", + "lastModified": 1686680692, + "narHash": "sha256-SsLZz3TDleraAiJq4EkmdyewSyiv5g0LZYc6vaLZOMQ=", "owner": "numtide", "repo": "devshell", - "rev": "5aa3a8039c68b4bf869327446590f4cdf90bb634", + "rev": "fd6223370774dd9c33354e87a007004b5fd36442", "type": "github" }, "original": { @@ -24,12 +22,15 @@ } }, "flake-utils": { + "inputs": { + "systems": "systems_2" + }, "locked": { - "lastModified": 1667395993, - "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", + "lastModified": 1685518550, + "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=", "owner": "numtide", "repo": "flake-utils", - "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", + "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef", "type": "github" }, "original": { @@ -45,11 +46,11 @@ ] }, "locked": { - "lastModified": 1685599623, - "narHash": "sha256-Tob4CMOVHue0D3RzguDBCtUmX5ji2PsdbQDbIOIKvsc=", + "lastModified": 1686693375, + "narHash": "sha256-1Smjo0E8WI9PeVGmmCjpQWRX04aQvz5gAGXfdanIjgw=", "owner": "nix-community", "repo": "home-manager", - "rev": "93db05480c0c0f30382d3e80779e8386dcb4f9dd", + "rev": "61e5d1c38ef04ba30a9119825b159bce9c6010be", "type": "github" }, "original": { @@ -61,11 +62,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1685789966, - "narHash": "sha256-pyqctu5Cq1jwymO3Os0/RNj5Nm3q5kmRCT24p7gtG70=", + "lastModified": 1686912178, + "narHash": "sha256-4W6M4ZIJwwvr6nqtmqYPLHSb+gnryVuDoDEqu7Ecy/M=", "owner": "nixos", "repo": "nixpkgs", - "rev": "4eaa9e3eb36386de0c6a268ba5da72cafc959619", + "rev": "2decc88392ad88868aba2be221491facd3da6d1f", "type": "github" }, "original": { @@ -82,6 +83,36 @@ "home-manager": "home-manager", "nixpkgs": "nixpkgs" } + }, + "systems": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "systems_2": { + "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 526a414..095839e 100644 --- a/flake.nix +++ b/flake.nix @@ -86,7 +86,7 @@ // (inputs.flake-utils.lib.eachDefaultSystem (system: let pkgs = import inputs.nixpkgs { inherit system; - overlays = overlays ++ [inputs.devshell.overlay]; + overlays = overlays ++ [inputs.devshell.overlays.default]; }; platform = pkgs.lib.systems.elaborate system; in {