From 315e9cc59b27fbf52f38db9ea8ad22348a94d5c4 Mon Sep 17 00:00:00 2001 From: Bryan Jones Date: Mon, 9 Sep 2024 13:34:18 -0400 Subject: [PATCH] upstream input merged --- flake.lock | 103 ++++++++++++++++++++++++++++++++++++++++++++--------- flake.nix | 2 +- 2 files changed, 88 insertions(+), 17 deletions(-) diff --git a/flake.lock b/flake.lock index 60f1d17..3599f74 100644 --- a/flake.lock +++ b/flake.lock @@ -198,7 +198,7 @@ }, "crate2nix_stable_3": { "inputs": { - "flake-utils": "flake-utils" + "flake-utils": "flake-utils_2" }, "locked": { "lastModified": 1702842982, @@ -237,7 +237,7 @@ }, "devshell": { "inputs": { - "flake-utils": "flake-utils_2", + "flake-utils": "flake-utils_3", "nixpkgs": [ "nh-darwin", "crate2nix", @@ -262,7 +262,7 @@ }, "devshell_2": { "inputs": { - "flake-utils": "flake-utils_3", + "flake-utils": "flake-utils_4", "nixpkgs": [ "nh-darwin", "crate2nix", @@ -286,7 +286,7 @@ }, "devshell_3": { "inputs": { - "flake-utils": "flake-utils_4", + "flake-utils": "flake-utils_5", "nixpkgs": [ "nh-darwin", "crate2nix", @@ -541,11 +541,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1694529238, - "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", "type": "github" }, "original": { @@ -559,11 +559,11 @@ "systems": "systems_3" }, "locked": { - "lastModified": 1701680307, - "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", + "lastModified": 1694529238, + "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", "owner": "numtide", "repo": "flake-utils", - "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", + "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", "type": "github" }, "original": { @@ -613,11 +613,11 @@ "systems": "systems_6" }, "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "lastModified": 1701680307, + "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", "owner": "numtide", "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", "type": "github" }, "original": { @@ -648,6 +648,24 @@ "inputs": { "systems": "systems_8" }, + "locked": { + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_8": { + "inputs": { + "systems": "systems_9" + }, "locked": { "lastModified": 1681202837, "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", @@ -755,6 +773,27 @@ "type": "github" } }, + "krewfile": { + "inputs": { + "flake-utils": "flake-utils", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1725897020, + "narHash": "sha256-0mJ37QZpUz44d0uolv9XQKDHwxUwqslz5ZSgwbdxmlo=", + "owner": "brumhard", + "repo": "krewfile", + "rev": "e7773854b19a4288df5502946ccec79c4af57adf", + "type": "github" + }, + "original": { + "owner": "brumhard", + "repo": "krewfile", + "type": "github" + } + }, "mk-naked-shell": { "flake": false, "locked": { @@ -907,10 +946,25 @@ "type": "github" } }, + "nixcord": { + "locked": { + "lastModified": 1725839179, + "narHash": "sha256-ZDl3FmLFHRxcYHVMeoexIS+l03Uy9vuUbZ5fOYJcXTA=", + "owner": "kaylorben", + "repo": "nixcord", + "rev": "52904a199d5643c85d654b6c120bab0619f68819", + "type": "github" + }, + "original": { + "owner": "kaylorben", + "repo": "nixcord", + "type": "github" + } + }, "nixos-wsl": { "inputs": { "flake-compat": "flake-compat_5", - "flake-utils": "flake-utils_6", + "flake-utils": "flake-utils_7", "nixpkgs": "nixpkgs_10" }, "locked": { @@ -1266,7 +1320,7 @@ "crate2nix", "flake-compat" ], - "flake-utils": "flake-utils_5", + "flake-utils": "flake-utils_6", "gitignore": "gitignore_3", "nixpkgs": [ "nh-darwin", @@ -1339,9 +1393,11 @@ "deploy-rs": "deploy-rs", "disko": "disko", "home-manager": "home-manager", + "krewfile": "krewfile", "nh-darwin": "nh-darwin", "nix-darwin": "nix-darwin", "nix-inspect": "nix-inspect", + "nixcord": "nixcord", "nixos-wsl": "nixos-wsl", "nixpkgs": "nixpkgs_11", "nixpkgs-darwin": "nixpkgs-darwin", @@ -1533,6 +1589,21 @@ "type": "github" } }, + "systems_9": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "treefmt": { "inputs": { "nixpkgs": [ @@ -1575,7 +1646,7 @@ }, "vscode-server": { "inputs": { - "flake-utils": "flake-utils_7", + "flake-utils": "flake-utils_8", "nixpkgs": "nixpkgs_12" }, "locked": { diff --git a/flake.nix b/flake.nix index 6e5d33e..915e956 100644 --- a/flake.nix +++ b/flake.nix @@ -27,7 +27,7 @@ nixcord.url = "github:kaylorben/nixcord"; nh-darwin.url = "github:ToyVo/nh-darwin"; krewfile = { - url = "github:ajgon/krewfile?ref=feat/fix-deps"; + url = "github:brumhard/krewfile"; inputs.nixpkgs.follows = "nixpkgs"; }; };